From 8790ccae1394b742dfbe1e7e0c78d5b30ad204f6 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 7 May 2021 00:42:44 -0700 Subject: Port to Bright Nights --- PKGBUILD | 116 +++++++++++++++++++++++++++++++++++---------------------------- 1 file changed, 64 insertions(+), 52 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index b7ecadc..fa277a3 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -7,30 +7,28 @@ # Arch version lacks the MSX++UnDeadPeopleEdition Legacy tileset # Arch version lacks the @ soundpack # Arch version lacks the CO.AG musicpack +# Arch version is not BN -pkgbase=cataclysm-dda -pkgname=(cataclysm-dda cataclysm-dda-tiles) -pkgname=cataclysm-dda -pkgver=0.E.3 -_pkgver=0.E-3 -pkgrel=2.10 +pkgbase=cataclysm-bn +pkgname=(cataclysm-bn cataclysm-bn-tiles) +pkgname=cataclysm-bn +pkgver=1710 +pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" #url="http://en.cataclysmdda.com/" -url="https://cataclysmdda.org/" +url="https://github.com/cataclysmbnteam/Cataclysm-BN" arch=('x86_64' 'aarch64') license=("CCPL:by-sa") depends=('ncurses' 'hicolor-icon-theme' 'gettext') makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle') -source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/archive/$_pkgver.tar.gz" - "cataclysm-dda.desktop" - "cataclysm-dda-tiles.desktop" +source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/$pkgver.tar.gz" + "cataclysm-bn.desktop" + "cataclysm-bn-tiles.desktop" - "0.F_backport-vehicle-heater-cooler-intensity-reduced.patch" "0.F_backport-tacoma-barn-door-position.patch" "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch" - "0.F_backport-map-note-colours.patch" "0001-quiverfull-house-correct-stairs.patch" "0002-ankle-ammo-pouch-is-not-a-backpack.patch" @@ -63,22 +61,20 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/CleverRaven/Cataclysm-DDA/ "cataclysm-dda-soundpack_jcsoundpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-soundpack_jcsoundpack.git/snapshot/cataclysm-dda-soundpack_jcsoundpack-master.tar.xz" "cataclysm-dda-musicpack_coag-musicpack.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-musicpack_coag-musicpack.git/snapshot/cataclysm-dda-musicpack_coag-musicpack-master.tar.xz" ) -b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0dd45e3d81a46b908b08e07b58a11a42ece4dd306f3e282805da121299f' - '8cff87d80bf30b86f995f77a97cc1ddb7b809148d100f3c0d74e706fe59eac52de55710fb7aed1abd59836c05f2474c7d68455736aac4f229d1cdf806d7240a1' - '8ffff827ed464af678497da5129eb69d3d1a4c6994bbcc00ef7f7b240cd04e7961c3c0ac52d6940252241406c04e647fac19c9327847afced33988eb15973ba8' - '3659d59eec3167bdb647cb622f15fe899516980ac92972393589574db23a580368b449812ec75ec74cfb86082a1c12896fc9f26b7c16c36ed9ad8506d41eac67' +b2sums=('117ac58ac4190370bd77611b7e528baf629323b5a3f90ef97119a67e0991564be7eea8f143b0f9d7594d56efe473669c6daa63f7b8ff723796351c08ac370dcf' + '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' + 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' 'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3' '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc' - 'd429bdf583ba6a69814f3a33a983650bcaa61b8edaed6560491972478515adb996482af248b10df8b4435bfad487ecba6c2ca0a249a4daee54994117a2742055' '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa' '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3' - '33a6f33ca9066ea7e190f017e0d57bd23b0ffb458944bd2a6f20f04ec7e1db43c34b64e606f2c0207ce500957230325116e9e00d92c51be280bda899c34d5580' + '0b1fdf70fd02d76d35e223ac3313453ad4aae6737c0fb24f17725b0b87159883753267b95bd739b87fb709ef6cd8268ad895af5d335f45c938b29713851e7f20' 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8' '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501' 'd34d673fe04d4317ef3c1ac3f088b6614f7c20414cfe44aa0ff71bdc932c517c4e6295492f158ced84232af8f54d1672ae56078b156593d58bf8fe7ffc3d475d' - '23a13fccf6514caa6ca23476fe2ce6df180720038c4bb2caa971ef42b31f214b07ed95650d2cb3df173590c8bec02986aced516a6b266cff557b5dcfb7d8ce48' - 'dd36b2b64e4999c0f188c837dae1f9c76d537a08b1c5996827a4d3028b688fe023be3711380189ed5c05316b17d6ab3e59669114ec699a3a0ee32808394ad12c' + 'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad' + '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c' 'c0d32a5edb420de5b2d95d1fed8753e9a6f45ab406aa2861dd5f038409c762ab40acdeec64b51713b71aa1453c0489a62af76534652a5c4d9634ac7e0eb431b4' '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c' '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3' @@ -86,11 +82,11 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a' '8203bb062d72559da908a5020963503303c0aaa4a2ab61e57cfb713f58de40f1cb50b8b6dfbeec3a9addc41cbec5ae17fbf57230c3614f9b69fe6b0c55bf3fad' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' - 'c2ff7458d4f71a3c328a49795804b89c75ac6c4f4ec193c899501346afdba9673b8624bf60ffa3aea5256412248ff304e8731914971b074aee644b2c465ac483' - 'b256081baa22b6c0f2a56c4151393146451fe119cd724fc4d883331643e420348e6e6c54c4f32e34d287090e917f9223cac23b6275677e4c3d23cf4b38229904' + 'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9' + '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56' 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600' 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' - '8e5dbd01fff578c594b14f13c9108857888fe31169683692c17d813ccbac735c0cd68ac07b6c8351ea59457effa8f758b542f5e2c0a07568cb53b0a448c1620e' + '8d2085a7c7f0a38ea4feb213a99f2bd93ec98e91aa564f3aa54e39b9ed1dd901f0629c3c0715ce00d84286f3831e8901131eecd0e0e9e79bbbe7928673f4e081' 'b6a6c9c1791bc625b773aa1d0b90f98f0821aa06807353f1c179cbbb9090391e9ab7fe8d567a029bcf94dddf31c40d3e525d1033d2de81520726c0e69021f278' '89a5a7548bb0d47c78e12db3c915f1f9647ebba66baf8e3f4ab9579f8023585a1ca8e4c33224b4290d37a6b97aaa2bca3d785b1c6a066a661fac80d80c4dea21' '020f01c7cafede24e9eca44facf3beb638b51248ece3ff0d6f27af385c980c4a4c31cd9d69f1082c0204d13cddc39415c72d88e489ef689d72e35f6070f60b40' @@ -98,26 +94,32 @@ b2sums=('7a825d8ce8827ccb45afb6005d4f33c6810e33e2fa375f2f7d1c878565fd61e00362e0d 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') prepare() { - cd "Cataclysm-DDA-$_pkgver" + cd "Cataclysm-BN-$pkgver" sed -i 's/-Werror//' Makefile sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile sed -i 's/shell git/shell false/' Makefile sed -i 's/-Os/-O3/' Makefile + # Fix filenames + sed -i 's|cataclysm-dda|cataclysm-bn|' CMakeLists.txt + sed -i 's|cataclysm-dda|cataclysm-bn|' Makefile + sed -i 's|TARGET_NAME = cataclysm|TARGET_NAME = cataclysm-bn|' Makefile + sed -i 's|cataclysm.a|cataclysm-bn.a|' Makefile + sed -i 's|cataclysm.a|cataclysm-bn.a|' tests/Makefile + sed -i 's|cataclysm-dda|cataclysm-bn|' lang/CMakeLists.txt + sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp + + # Fix version + sed -i 's|VERSION = the-fork|VERSION = 1710|' Makefile - # Backports from 0.F - # Fix Vehicle Heater and Cooler to be less severe - patch -Np1 -i "$srcdir"/0.F_backport-vehicle-heater-cooler-intensity-reduced.patch + # Backports from 0.F # Fix tacoma barn doors being placed in the same spot twice patch -Np1 -i "$srcdir"/0.F_backport-tacoma-barn-door-position.patch # Fix npcs unable to drink from firestation and shelter basecamps wells patch -Np1 -i "$srcdir"/0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch - # Map note colour and symbols - patch -Np1 -i "$srcdir"/0.F_backport-map-note-colours.patch - # Various other fixes for bugs I came across # Fix Quiverfull house to have the correct stairs that modify json @@ -189,7 +191,7 @@ prepare() { } build() { - cd "Cataclysm-DDA-$_pkgver" + cd "Cataclysm-BN-$pkgver" #export CFLAGS="$CFLAGS -fPIE" export CXXFLAGS="$CXXFLAGS -fPIE" @@ -202,17 +204,20 @@ build() { ./lang/compile_mo.sh } -package_cataclysm-dda() { - cd "Cataclysm-DDA-$_pkgver" +package_cataclysm-bn() { + cd "Cataclysm-BN-$pkgver" make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 ZLEVELS=1 USE_HOME_DIR=1 LTO=1 LOCALIZE=1 LANGUAGES=all install + # Fix binary names + #mv "$pkgdir/usr/bin/cataclysm" "$pkgdir/usr/bin/cataclysm-bn" + # Docs - install -d "$pkgdir/usr/share/doc/cataclysm-dda" - cp --reflink -r doc/* "$pkgdir/usr/share/doc/cataclysm-dda" + install -d "$pkgdir/usr/share/doc/cataclysm-bn" + cp --reflink -r doc/* "$pkgdir/usr/share/doc/cataclysm-bn" # undo symlink - rm "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md" - cp --reflink 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-dda/JSON_LOADING_ORDER.md" + rm "$pkgdir/usr/share/doc/cataclysm-bn/JSON_LOADING_ORDER.md" + cp --reflink 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-bn/JSON_LOADING_ORDER.md" # License install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -221,7 +226,7 @@ package_cataclysm-dda() { cd lang/mo for i in *; do install -d "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES" - cp "${i}/LC_MESSAGES/cataclysm-dda.mo" "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES" + cp "${i}/LC_MESSAGES/cataclysm-bn.mo" "${pkgdir}/usr/share/locale/${i}/LC_MESSAGES" done # Help @@ -231,46 +236,53 @@ package_cataclysm-dda() { # install -Dm644 "${srcdir}/${pkgname}.desktop" "${pkgdir}/usr/share/applications/${pkgname}.desktop" } -package_cataclysm-dda-tiles() { +package_cataclysm-bn-tiles() { pkgdesc="A graphical post-apocalyptic roguelike." - depends=('cataclysm-dda' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer') - cd "Cataclysm-DDA-$_pkgver" + depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer') + cd "Cataclysm-BN-$pkgver" make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 ZLEVELS=1 TILES=1 SOUND=1 LTO=1 LOCALIZE=1 LANGUAGES=all install + + # Fix binary names + #mkmv "$pkgdir/usr/bin/cataclysm-tiles" "$pkgdir/usr/bin/cataclysm-bn-tiles" # Icon - install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" - install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/pixmaps/$pkgname.png" + #install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" + #install -D 'data/osx/AppIcon.iconset/icon_128x128.png' "$pkgdir/usr/share/pixmaps/$pkgname.png" install -Dm644 "${srcdir}/$pkgname.desktop" "${pkgdir}/usr/share/applications/$pkgname.desktop" install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" + # Tilesset (Legacy) mv "$srcdir/cataclysm-dda-tileset_undeadpeople-legacy-master" "$srcdir/undeadpeople-legacy" - cp --reflink -r "$srcdir/undeadpeople-legacy" "$pkgdir/usr/share/cataclysm-dda/gfx" + cp --reflink -r "$srcdir/undeadpeople-legacy" "$pkgdir/usr/share/cataclysm-bn/gfx" # Tileset mv "$srcdir/cataclysm-dda-tileset_undeadpeople-master" "$srcdir/undeadpeople" - cp --reflink -r "$srcdir/undeadpeople" "$pkgdir/usr/share/cataclysm-dda/gfx" + cp --reflink -r "$srcdir/undeadpeople" "$pkgdir/usr/share/cataclysm-bn/gfx" + rm -rf "$pkgdir/usr/share/cataclysm-bn/gfx/MSX++UndeadPeopleEdition" #mv "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master" "$srcdir/battle-maid-redone-tileset" - cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt1" "$pkgdir/usr/share/cataclysm-dda/mods" - cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt2" "$pkgdir/usr/share/cataclysm-dda/mods" + cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt1" "$pkgdir/usr/share/cataclysm-bn/mods" + cp --reflink -r "$srcdir/cataclysm-dda-mod_battle-maid-redone-tileset-master/battle-maid-redone-tileset-pt2" "$pkgdir/usr/share/cataclysm-bn/mods" #mv "$srcdir/cataclysm-dda-mod_vampire-stuff-redone-tileset-master" "$srcdir/vampire-stuff-redone-tileset" - #cp --reflink -r "$srcdir/vampire-stuff-redone-tileset" "$pkgdir/usr/share/cataclysm-dda/mods" + #cp --reflink -r "$srcdir/vampire-stuff-redone-tileset" "$pkgdir/usr/share/cataclysm-bn/mods" + # Sound mv "$srcdir/cataclysm-dda-soundpack_jcsoundpack-master" "$srcdir/jcsoundpack" - cp --reflink -r "$srcdir/jcsoundpack" "$pkgdir/usr/share/cataclysm-dda/sound" + cp --reflink -r "$srcdir/jcsoundpack" "$pkgdir/usr/share/cataclysm-bn/sound" # Music mv "$srcdir/cataclysm-dda-musicpack_coag-musicpack-master" "$srcdir/coag-musicpack" - install -Dm644 "$srcdir/coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-dda/sound/jcsoundpack/musicset.json" - cp --reflink -r "$srcdir/coag-musicpack/music" "$pkgdir/usr/share/cataclysm-dda/sound/jcsoundpack" + install -Dm644 "$srcdir/coag-musicpack/musicset.json" "$pkgdir/usr/share/cataclysm-bn/sound/jcsoundpack/musicset.json" + cp --reflink -r "$srcdir/coag-musicpack/music" "$pkgdir/usr/share/cataclysm-bn/sound/jcsoundpack" + # hack: remove overlapping files - cd "$pkgdir/../cataclysm-dda" + cd "$pkgdir/../cataclysm-bn" find . -type f -exec rm -f "$pkgdir"/{} \; cd "$pkgdir" find . -type d -empty -delete -- cgit v1.2.1