summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhaarp <main.haarp@gmail.com>2016-04-02 19:02:06 +0200
committerhaarp <main.haarp@gmail.com>2016-04-02 19:02:06 +0200
commit815e84c72f6c843e191046cf34a8f70d539cc95e (patch)
treee70b07d4d381b71091b13f33615717e61b99c0f2
parentRemove baobab. mate-disk-usage-anaylzer in mate-utils is a suitable replacement (diff)
downloadhaarp-815e84c72f6c843e191046cf34a8f70d539cc95e.tar.gz
haarp-815e84c72f6c843e191046cf34a8f70d539cc95e.tar.bz2
haarp-815e84c72f6c843e191046cf34a8f70d539cc95e.zip
Fix Zandronum's NETGAMEVERSION (yet again)
-rw-r--r--games-fps/zandronum/Manifest2
-rw-r--r--games-fps/zandronum/zandronum-2.1.2.ebuild14
2 files changed, 8 insertions, 8 deletions
diff --git a/games-fps/zandronum/Manifest b/games-fps/zandronum/Manifest
index aec853a..b9225a6 100644
--- a/games-fps/zandronum/Manifest
+++ b/games-fps/zandronum/Manifest
@@ -4,5 +4,5 @@ DIST sqlite-amalgamation-3080600.zip 1516814 SHA256 a5fe9106659fead86ac06c980e45
DIST zandronum-1.3.tar.bz2 4679173 SHA256 ebbf97636330aa8a507c2a5537fcb85984a3bf77f65d97fd7b33cd0db1b5ec91 SHA512 10e1d1e934e787488622b28c83580fe873e334a544a50f2da55dc1aef97162504a8f1d1eacd492112c088469399df155847cc9c3579ec481fec083973a3dc187 WHIRLPOOL fc96b2e1441760d5a68fc44a1d5d767c81b652529cd3481f1bb74f45438e6f3ffa43fbe95e708152dd56df24fd89e838023577f7299576ecd2d942a98b88c861
DIST zandronum-2.1.2.tar.bz2 5135007 SHA256 e47add83bd58b13571521ee4be68c45e34cb08f18cb1b23262870fa5fa6dd8e9 SHA512 7d48e5a24002c79585c128336d3797c69b9ffcff192b8a86e2404afe40a9d1b05aeb5e8b43390f0e7d556489da65efc553dfd5a017f3f54e648ffa60fb9dcbf8 WHIRLPOOL 3af2073a80227feeb675a96d983dffa321ec89d9a31de15068bc0441910f54f9e0211cb01fbdf4a2722c0cad621041579f5ff10ea9373fe56a004568ad99a603
EBUILD zandronum-1.3.ebuild 3176 SHA256 fda8dc8e956465b95f5c88b71c7d57a099043242d332dc7bd52fb15fac12b793 SHA512 78c36f8e07c7c22db0d85bd21bfe6c08e03c44f62b29439be0b6092b39fc44eccf2934a18e406ca191d4261f9449ac55877cf3f8c8c306fdbc698f441c822101 WHIRLPOOL 28e14f66149596c279100ce0ba141d7ef21f96fd5402a87f13d4126a52301476c7bfa07e8232f099cf2d169ce97845f964520f0b646583d96a36063c470c195b
-EBUILD zandronum-2.1.2.ebuild 3626 SHA256 80f9e6885b93c8b02d8949f1c085ae1d157c05a12687d6c04d8043222167e331 SHA512 494a920f6903d42b95f729ea08132f6bf0789907ada6a0cf67bb36d65ff3da67ba7e1ce43ecd77c1d355ca3ebd90078e43abf8ce635b3493490250f7df4f1d71 WHIRLPOOL aff68a2181f8ce2792ee8c29a154ce65af5018833afe1924d2e648a3f618811f55ed8322241ae30ac1a59a2627733f13fdeeaa5e4fe773659f63241fb1774438
+EBUILD zandronum-2.1.2.ebuild 3573 SHA256 2654643a742b3af15a2dfaf3fdd6f960817dc198084b6a9ab6529194bbf7a99c SHA512 fd470bfbe815fb4305fe2354a44feaa34b326b925dd7a60563e1949e5b4c1849149d76596b4cb8b7291e0fe401e71aaefc0fc269aa98aea56a57bf5ece88e5ac WHIRLPOOL 9408e1f4600ae9079a23eb3ab7c10a65c3123a8c2388d423b1e2aa2d643d78a1121996e99b6a041ad85cbe51f66973676b288a8c29825924acfadb1f2cfd107e
MISC LICENSE.txt 2409 SHA256 87083bc46a835899eed1ccfdebce3b279be47dcae48b4b8b7c9a045c0c9a853f SHA512 3f738aefc2e85f7a76e04c5de73ada76a39b7c701f37176b76b9320f469a7163785731a843391643b12687135d6b4f2c1b770f89086b0c26a595eb0a01e1a583 WHIRLPOOL 0bc96dec4e0519c119c4f4116fe2b4b5afea776e9a4e473ac518b9f42b0bfcfa5c0a7471cc7d00058ccbdac70aa01037ade34882cebb317d41d0c6ed4303c564
diff --git a/games-fps/zandronum/zandronum-2.1.2.ebuild b/games-fps/zandronum/zandronum-2.1.2.ebuild
index f856b44..3758022 100644
--- a/games-fps/zandronum/zandronum-2.1.2.ebuild
+++ b/games-fps/zandronum/zandronum-2.1.2.ebuild
@@ -43,17 +43,17 @@ src_unpack() {
}
src_prepare() {
- # Fix NETGAMEVERSION for online play, but without Mercurial
- # normally Mercurial would generate svnversion.h, which defines it
+ # Normally Mercurial would generate gitinfo.h for NETGAMEVERSION
+ # let's do it without Mercurial
local url="https://bitbucket.org/api/1.0/repositories/${OWNER}/${PN}-stable/changesets/${MY_COMMIT}?format=yaml"
local timestamp=$(wget -q "$url" -O - | awk -F\' '/utctimestamp/{print $2}')
- test -z "${timestamp}" && die "Couldn't grab NETGAMEVERSION!"
+ test -z "${timestamp}" && die "Couldn't grab commit timestamp!"
local unixtimestamp=$(date +%s -d "${timestamp}")
- local netgameversion=$(printf 0x%x $(( $unixtimestamp % 256 )) )
- elog "Using NETGAMEVERSION=${netgameversion}"
- sed -i -e "s:(SVN_REVISION_NUMBER % 256):${netgameversion}:" src/version.h
+ echo "#define SVN_REVISION_NUMBER ${unixtimestamp}" > src/gitinfo.h
+ echo "#define SVN_REVISION_STRING \"0\"" >> src/gitinfo.h
+ echo "#define HG_REVISION_HASH_STRING \"0\"" >> src/gitinfo.h
- # Use the dynamically-linked system-sqlite instead
+ # Use the system sqlite
sed -i -e "/add_subdirectory( sqlite )/d" CMakeLists.txt
# Use default game data path