diff options
Diffstat (limited to 'openttd-git')
| -rwxr-xr-x | openttd-git/PKGBUILD | 20 | ||||
| -rw-r--r-- | openttd-git/version.patch | 54 |
2 files changed, 4 insertions, 70 deletions
diff --git a/openttd-git/PKGBUILD b/openttd-git/PKGBUILD index b853e40e7..3df5d5f1b 100755 --- a/openttd-git/PKGBUILD +++ b/openttd-git/PKGBUILD @@ -34,12 +34,10 @@ options=() source=( "${pkgname}::git://github.com/OpenTTD/OpenTTD.git" #commit=${_commit}" "everything.patch" - "version.patch" "clipboard.grf" ) sha512sums=('SKIP' '20231f23f0c0ec5df710b541b628b3a479299368975b0bd8c28d979b94c7dc376f55018f470d1559bfdc732a4de82793a82e79751fc7e3a10feb2b5eecfb7598' - '69ac38abc75d728ae3a4b131e819223f496f3e6554d2e8e35e6950c6ceb41a293af2aec6df2ef4b82a9e5d12ed87026e85e181adb0fc142407da94ad4d70d2b6' 'aa1f5d5c4fd9ff487bc03ed5c10701e99ae9fd29ae0cd65a06171486298558d1c26ced49ac8687acc5b1003a6538f6c83917992348cbd2b7426afdf0759cb1a5') pkgver() { @@ -56,24 +54,14 @@ prepare() { cd "${srcdir}/${pkgname}" - cat ${srcdir}/everything.patch | \ - ( - read zeile - while read zeile - do - [[ "${zeile}" == "diff --git a/"* ]] && break - done - echo "${zeile}" - cat - ) | \ - patch -p1 - - patch -p2 < $srcdir/version.patch + git apply < ${srcdir}/everything.patch + sed -i ' + s/readme\.txt/README.md/g + ' Makefile.bundle.in } build() { -return 5 cd "${srcdir}/${pkgname}" ./configure ${_targetHost} \ diff --git a/openttd-git/version.patch b/openttd-git/version.patch deleted file mode 100644 index b09e08d3a..000000000 --- a/openttd-git/version.patch +++ /dev/null @@ -1,54 +0,0 @@ ---- a/trunk/findversion.sh 2016-04-04 13:46:56.085550989 +0200 -+++ b/trunk/findversion.sh 2016-04-04 14:01:08.537965131 +0200 -@@ -128,10 +128,12 @@ - exit - else - # We don't know -- MODIFIED="1" -- BRANCH="" -- REV="" -- REV_NR="" -+ MODIFIED="2" -+ HASH="$(find $ROOT_DIR/{src,bin} -type f -exec sha512sum {} \; | sha512sum - | cut)" -+ BRANCH="r27534-hard-game-by-ewe" -+ REV="g`echo $HASH | cut -c1-8`" -+ REV_NR="27534" -+ TAG="" - fi - - if [ "$MODIFIED" -eq "2" ]; then ---- a/trunk/config.lib 2016-04-04 14:04:14.881840501 +0200 -+++ b/trunk/config.lib 2016-04-04 14:04:25.561871556 +0200 -@@ -1040,32 +1040,6 @@ - fi - fi - -- if [ -d "$ROOT_DIR/.svn" ] && [ -n "`svn help 2>/dev/null`" ]; then -- log 1 "checking revision... svn detection" -- elif [ -d "$ROOT_DIR/../.svn" ] && [ -n "`svn help 2>/dev/null`" ] && [ -n "`LC_ALL=C svn info $ROOT_DIR/.. | grep '^URL:.*tags$'`" ]; then -- # subversion changed its behaviour; now not all folders have a .svn folder, -- # but only the root folder. Since making tags requires a (sparse) checkout -- # of the tags folder, the folder of the tag does not have a .svn folder -- # anymore and this fails to detect the subversion repository checkout. -- log 1 "checking revision... svn detection (tag)" -- elif [ -d "$ROOT_DIR/.git" ] && [ -n "`git help 2>/dev/null`" ]; then -- log 1 "checking revision... git detection" -- elif [ -d "$ROOT_DIR/.hg" ] && [ -n "`HGPLAIN= hg help 2>/dev/null`" ]; then -- log 1 "checking revision... hg detection" -- elif [ -f "$ROOT_DIR/.ottdrev" ]; then -- log 1 "checking revision... source tarball" -- else -- log 1 "checking revision... no detection" -- log 1 "WARNING: there is no means to determine the version." -- log 1 "WARNING: please use a subversion, mercurial, or git checkout of OpenTTD." -- log 1 "WARNING: you can only join game servers that have been compiled without" -- log 1 "WARNING: version detection." -- log 1 "WARNING: there is a great chance you desync." -- log 1 "WARNING: USE WITH CAUTION!" -- -- sleep 5 -- fi -- - if [ "$doc_dir" = "1" ]; then - if [ "$os" = "UNIX" ] || [ "$os" = "FREEBSD" ] || [ "$os" = "DRAGONFLY" ] || [ "$os" = "OPENBSD" ] || [ "$os" = "NETBSD" ] || [ "$os" = "HPUX" ] || [ "$os" = "SUNOS" ]; then - doc_dir="share/doc/openttd" |