diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 361 |
1 files changed, 107 insertions, 254 deletions
@@ -1,21 +1,24 @@ # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net> +# Contributor: aqua <aqua@iserlohn-fortress.net> # Maintainer (Arch): Kyle Keen <keenerd@gmail.com> # # I maintain this because: # Arch version is not BN +# BN version has done enough changes I dislike to force me to fork # Arch version has non-functional desktop file # Arch version lacks additional optimization and hardening flags -# Arch version lacks the MSX++UnDeadPeopleEdition tileset -# Arch version lacks the @ soundpack -# Arch version lacks the CO.AG musicpack +# Arch version segfaults due to -Wp,-D_GLIBCXX_ASSERTIONS pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn -_pkgname=Cataclysm-BN-cbn-experimental -pkgver=202107310434 -_pkgver=2021-07-31-0434 -pkgrel=1 +#_pkgname=Cataclysm-BN-cbn +#_pkgname=Cataclysm-BN +#pkgver=0.6.0 +pkgver=0.6.3 +#pkgver=202310040030 +#_pkgver=2023-10-04-0030 +pkgrel=2 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -23,267 +26,122 @@ pkgdesc="A post-apocalyptic roguelike." 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/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-experimental-$_pkgver.tar.gz" +options=('lto') +depends=( + 'gettext' + 'hicolor-icon-theme' + 'ncurses' +) +makedepends=( + 'astyle' + 'freetype2' + 'lzip' + 'sdl2_image' + 'sdl2_mixer' + 'sdl2_ttf' +) +#source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-experimental-$_pkgver.tar.gz" +#source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-$pkgver.tar.gz" # Pre 0.5.2 +#source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/v$pkgver.tar.gz" +source=( + "cataclysm-jc-0.0.3.tar.lz" "cataclysm-bn.desktop" "cataclysm-bn-tiles.desktop" "icon_128x128.png" - "0.F_backport-tacoma-barn-door-position.patch" - "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch" - "0.F_backport-inhaler-mission-no-autofail.patch" - "0.F_backport-radio-can-use-ups.patch" - - "0001-quiverfull-house-correct-stairs.patch" - "0002-ankle-ammo-pouch-is-not-a-backpack.patch" - "0003-inconsistent-ammo-names.patch" - "0004-tacoma-clinic-add-missing-floor.patch" - "0005-lumbermill-gasoline-not-spilled.patch" - "0006-community-garden-fertilizer-not-spilled.patch" - "0007-oxyacetylene-from-oxygen.patch" - "0008-npc-can-use-more-bionics.patch" - "0009-22-casings-can-stack.patch" - "0010-4570-dragon-can-be-dismantled.patch" - "0011-add-missing-mre.patch" - "0012-fix-doors-for-npcs.patch" - "0013-fix-20x66mm-loudness.patch" - "0014-portable-generator-engine.patch" - "0015-normalize-drone-volume.patch" - "0016-medical-zombies-called-zombies.patch" - "0017-nerf-lightstep.patch" - "0018-rehide-redacted.patch" - "0019-derelict-shed-is-s.patch" - "0020-hk46-is-milspec.patch" - "0021-foldable-bottle-is-container.patch" - "0022-fix-evac3-background-visible.patch" - "0023-fix-rubbersplosion.patch" - "0024-ammo-order-fix.patch" - - "jc_ammo-loudness-ap-times-2.patch" - "jc_allow-bio-firestarter-on-smoker.patch" - "jc_npcs-eat-when-hungry.patch" - "jc_stop-non-faction-npc-sleep-depirvation.patch" - "jc_stop-non-faction-npc-malnourishment.patch" - "jc_stop-sleeping-on-tables.patch" - "jc_allow-hacker-laptop.patch" - "jc_restore-inf-immune.patch" - - "custom.patch" - - "cataclysm-dda-tileset_undeadpeople.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-tileset_undeadpeople.git/snapshot/cataclysm-dda-tileset_undeadpeople-master.tar.xz" - "cataclysm-dda-mod_battle-maid-redone-tileset.tar.xz::https://library.iserlohn-fortress.net/cataclysm-dda-mod_battle-maid-redone-tileset.git/snapshot/cataclysm-dda-mod_battle-maid-redone-tileset-master.tar.xz" - "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" + #"src-18-v7_monsters-can-go-up-stairs.patch" + #"src-19_triffids-do-not-burrow-v2.patch" + #"src-20_prevent-holstering-gunmods.patch" + + "vampirism.patch" ) -b2sums=('ebb0aba2614372af488322cf9b445ea20c17e76699cd019ecb73b7dc07ecdd7d1ef98fc4bab3cb67d88dec6c45034323d80b8ed79ded32c32a04342d6cf8e3df' +b2sums=('8d66556c1f16a34f885c231922ae797bd38fd0de9d914f132e759e0d8329a89bab5c678177f253e9006158923a8ae26a8df11a975f661ade37135237dd4b85b4' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' - 'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3' - '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc' - '9e2c26bf0e2bb4fd60de8cad1f9c05f329d99a56c64189bc2747915c48d208b63038d45a90f7a1c8e8bb0ac33461f217acf7e57f752f0acff117e2062459e9bb' - '51b1324506179f7fadd8bc187eb8db939494483597b0b7b63909cec66f4e94b27888ccfa926bbd2ff8b0e80108ecc373118c202a177fc2ebd4f5231f87f09a83' - '8232c6a10fd1f608304982ae7f03eb8afc663be76cdc00aee46ecb58de838e21fdc8673841266ccd00153263f7b15b59dcd1fc6ece86834509d7ccb2cacf08fa' - '025213998583972e7551bd7bd7376ab65857e28d4338fab60ae792a6b3bd48983aec77e5143baaa63d4f3feb7cd590c4bded529c410e4d18f2b8c5813f25daa3' - '57e830004122ad835f84fd45c0965b7801b7355dcfef22c4e83969460f181d86110a7e37cc87a196238aa745ac8c9db99f97cf87edf7ef0fd8cfd16cf38d22cc' - 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' - '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8' - '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501' - 'd34d673fe04d4317ef3c1ac3f088b6614f7c20414cfe44aa0ff71bdc932c517c4e6295492f158ced84232af8f54d1672ae56078b156593d58bf8fe7ffc3d475d' - 'f3bdbaac5dbe9384571fe5ec14d2d25035f227a977c25349b8188e7343804e3973b898b44c34f9abe9318666294f4fdfe780fd516dcbdb29c4ac52f6d0ed6cad' - '67cdb7e097bbb46da5cf04708bc2858b080d1a85742afc4c088da3e4e3fdeb6e4c51240fc5a6b9a1c7d927b30b3d251236e025ee4e5496142a7716d4ba51b82c' - '9ad2986261e6613e80b4bb61b89e2d0c703d7c4d28fda98e58fbcc2623a05c05e253cd2045e64c140e5de99aa2278165948e717739eb803849ea17745e974620' - '417cd957f188b2b06e41d5413bea5f13481c6d5bfa8f184157379d5ac2afa9ba6f7ebc966856f50603f89b9173b6fbfdb3ccf4e3cc0b1bedb53f935591e4a35c' - '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3' - 'c1b6e59c840aee812570d9fb30f045b371473282c2289aaefe66483e6aae995fb93549882811fcb869d77f1c27a62ba4e486a8e20327846fd0602926739296ae' - '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a' - '8203bb062d72559da908a5020963503303c0aaa4a2ab61e57cfb713f58de40f1cb50b8b6dfbeec3a9addc41cbec5ae17fbf57230c3614f9b69fe6b0c55bf3fad' - '7e49f473cd5c5811ff6456b58be6f8cb438ec712b388c156902f837b556550710bb79924f94f6818a6332e653ec0740d7688165ca105b159faeeeeec2b105dd6' - '08f4746882b927bdff6b728630cf1e04a2b79924f694ca2d841e3115c3399feb87a8d363e4d2a0f59179c109cb6be6e840f912aadd44abb0bdb35afd2838cc4d' - '651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3' - '7e41fc3a95073008ca2d71c2266d6d1a17af7803d493b447d40b15a86184c8ce3728b8d3d36765d408b1c46633d1bfa980d878cbac2e04b51ef518d44dfb7295' - '76c816df10aceec8f1a7d1356220eb3f00b16fac455e84eb8aefe76db29cd037dc74fb5cfa344b8d283b188951bd100c26e351ce2e27c16c836a547fe2c99e46' - '7cae5e42b6e16f3c4bf64dca3c7573c1b552424ff70bb6da0a21f121b53b2546b239c87953a090cd90f46a1c3c124e2fe19c560b1830b11334f8e64c92fb614d' - 'ab35d6663b864449d46da4a9e1c51e11956ff4c38e16db58c831b71f7b964fc25b0283122dbc8aa0549f240f01c4a910fb5c6c82937258c6b736c05b54bcf768' - 'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994' - 'c47d002dc55af6c74a830205626eab57922f3f79143a5e1ddbc9ac8dc75c1ef4f2adf6a1816f8abe0b43e9a81a9021d1c9c7f62d76fdf67fa5fe00bbeca73962' - '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' - 'edfccb4ccb70e174648101d68432ea14ee1e7cc9304d4545dddb65184eeafb708a898cc90778e44cf7464c82c9d350209e5ad262c50a50fa0b8ae3a22fca9ff9' - '8e9bf6ff4bafc6397c6631392aaddd2866537943ae3bbdb95282945acba385d66f6d9879fd283eeafbb8df4e927f3ecc061fb36ecb5d38dbddecd2fd9c735e56' - 'ce82294e480ad42f0001c799fd8131b60024b6097653f3c57564c75e54596616e376f0d7f1cf4e54d8c302a61ef164b4323f795bfa19b2c13ab9e927d37f1600' - 'e5d7b75d3bced70d5f77bd8860c53f888b1f2495b4a6bf0b1284e3fc1e831a58bc691b4a11419cd7d14427165158d7ebf3f5c690733e4f3ee5194b9bf9bd001a' - 'd723fcc6cce65aa296bc519a07a5d003122ad698a73a3d046dac3780ea5a00fef28f78da251bb46f80f2e0577baa26a6ae13cabf525f22a7a742435e95716dae' - 'e9c8decf0ab74ac2dd02ddd537ca80ad2aa02d97faf6cfcb983965b4c3f400b47b2e0517f2927d1b2463c14370fd1a0bad5b4d00710b2b415b45d1a81724a9c9' - '0bc675f798113cc744337ac2864c54510af89fc59450a3bf250cc49c1a1b17ebeddc007e38491978d367555ed7f4895266d68f50f01d30f79a7cacdc01f0f207' - '0dc275d5e1aa79b2cf73f7e997ea2b602690787ae15e3abdd3b9195bb409d511c74d4f7dca4bf1753a9afb4618f04cb462769c24999357dea62593a379411f42' - '59665e75f28e04a7c1da4dca3242626bab8298849fec5af099550fc3ee36cc6badd7794aaad7b8b3f1b85790df3b89b4d0bb91dcda809b109bf729bb40b0a972' - 'ba0bd9be874e134914334a5baaef843162003adc0253dae32f1a052da6da59e108808852f51b05350ae6ae074f8d15d88cfcf93f49174c47b924f0f9d7fbd206' - '2b506d69016b5eac7b72341d30900dded43b5c54471547db43968c7b8724d95aff622aa133afb161e200b1b8e470b47422966230458e7b41a112d47fdcdf27f0' - 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') + '11ed6cc089964c4dc171b91f83f5ac041ced4b480151f77b21febafe392342ba4931af9c71266d4694a0ed236012ce2cbbb6ad58ff32721766cc4b88f9abe7e4') prepare() { - cd "${_pkgname}-${_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|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|' src/path_info.cpp + #cd "${_pkgname}-${pkgver}" + cd "repo" + + # Assorted workarounds + sed \ + -e 's/-Werror//' \ + -e 's/shell git/shell false/' \ + -i Makefile + + # Disable default optimizations + sed \ + -e 's/-Os/-O3/' \ + -e 's/-O0/-O3/' \ + -e 's/-Og/-O3/' \ + -i Makefile # Fix version - sed -i 's|VERSION = unstable|VERSION = 2021-07-31-0434|' Makefile - - - # 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 - - # Fix npcs with the inhaler mission instantly dying upon mission acceptance - patch -Np1 -i "$srcdir"/0.F_backport-inhaler-mission-no-autofail.patch - - # Fix radio, e-ink reader music, tactical tonfa not working with UPS - patch -Np1 -i "$srcdir"/0.F_backport-radio-can-use-ups.patch - - - # Various other fixes for bugs I came across - # Fix Quiverfull house to have the correct stairs that modify json - patch -Np1 -i "$srcdir"/0001-quiverfull-house-correct-stairs.patch - - # Fix Ankle Ammo Pouch to not look like a backpack - patch -Np1 -i "$srcdir"/0002-ankle-ammo-pouch-is-not-a-backpack.patch - - # Fix mulitple inconsistent ammuntion names and handloaded status - patch -Np1 -i "$srcdir"/0003-inconsistent-ammo-names.patch - - # Fix missing floor in tacoma clinic - patch -Np1 -i "$srcdir"/0004-tacoma-clinic-add-missing-floor.patch - - # Fix lumbermill gasoline being spilled instead of being inside the gas pump - patch -Np1 -i "$srcdir"/0005-lumbermill-gasoline-not-spilled.patch - - # Fix community garden liquid fertilizer being in a pit instead of in the storage tanks - patch -Np1 -i "$srcdir"/0006-community-garden-fertilizer-not-spilled.patch - - # Fix oxyacetylene to be craftable from oxygen tanks - patch -Np1 -i "$srcdir"/0007-oxyacetylene-from-oxygen.patch - - # Fix npc not being able to install some additional CBMs: - # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels - patch -Np1 -i "$srcdir"/0008-npc-can-use-more-bionics.patch - - # Fix .22 casings not stacking when every other casing stacks - patch -Np1 -i "$srcdir"/0009-22-casings-can-stack.patch - - # Fix reloaded 45-70 rounds and reloaded dragon shot were not allowing dismantling when every other non-caseless does - patch -Np1 -i "$srcdir"/0010-4570-dragon-can-be-dismantled.patch - - # Fix the pepperjack beef and burrito bowl MREs never dropping - patch -Np1 -i "$srcdir"/0011-add-missing-mre.patch - - # Fix some doors being unusable by npcs (incorrect door flag) - patch -Np1 -i "$srcdir"/0012-fix-doors-for-npcs.patch - - # Fix the loudness of 20x66mm shotgun shells like other shotguns - patch -Np1 -i "$srcdir"/0013-fix-20x66mm-loudness.patch - - # Replace the portable generator twin engine with a large 1 cylinder so it can actually function as is - patch -Np1 -i "$srcdir"/0014-portable-generator-engine.patch +# sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-10-04-0030"|' Makefile +# sed -i 's|VERSION = unstable|VERSION = "0.6.0"|' Makefile + sed -i 's|VERSION = 0.6.0|VERSION = "0.0.3"|' Makefile - # Normalize the manhack volumes to that of the base grenade/explosive - patch -Np1 -i "$srcdir"/0015-normalize-drone-volume.patch - # Prefix medical zombies with "zombie" like other zombies. - patch -Np1 -i "$srcdir"/0016-medical-zombies-called-zombies.patch + # # # Hotfixes + #echo "Applying hotfixes" - # Light Step feels too powerful in Bright Nights - patch -Np1 -i "$srcdir"/0017-nerf-lightstep.patch - # Re-hide something that feels like spoilers - patch -Np1 -i "$srcdir"/0018-rehide-redacted.patch + # # # Various other fixes for bugs I came across that modify src + #echo "Applying source code fixes" - # Set the overmap note for Derelict Shed to s to better match use of the first letter - patch -Np1 -i "$srcdir"/0019-derelict-shed-is-s.patch + # Fix monsters not travelling up stairs: (Still in testing) FIXME + #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-18-v7_monsters-can-go-up-stairs.patch - # Stop police and SWAT carrying 4.6mm magazines despite having no compatible weapons - patch -Np1 -i "$srcdir"/0020-hk46-is-milspec.patch + # Fix triffid queens from destroying terrain and burrowing to the center of the Earth: FIXME + # The growplants function was destroying the terrain, not the furniture. + # And since p is somehow being lost, the new terrain was never added. + # This workaround has the side effect of making triffid terraforming silent, but its better than burrowing. + #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-19_triffids-do-not-burrow.patch - # Mark the foldable plastic bottle and steel water bottle as containers - patch -Np1 -i "$srcdir"/0021-foldable-bottle-is-container.patch + # Prevent gunmods from being holstered: (Still in testing) FIXME + # This is a hack fix due to how drawing a holstered gunmod that accepts magazines crashes the game. + #patch -Np1 --no-backup-if-mismatch -i "$srcdir"/src-20_prevent-holstering-gunmods.patch - # Fix Evacuee 3 background 3 being player visible - patch -Np1 -i "$srcdir"/0022-fix-evac3-background-visible.patch - - # Fix rubber items dismantling into 10x item volume of rubber - patch -Np1 -i "$srcdir"/0023-fix-rubbersplosion.patch - - # Fix ammo ordering so as to not prevent those items being modded - patch -Np1 -i "$srcdir"/0024-ammo-order-fix.patch - - - # Various other fixes for bugs I came across that modify src - # Fix ammo loudness mulitplying by six instead of two - patch -Np1 -i "$srcdir"/jc_ammo-loudness-ap-times-2.patch - - # Fix smoker racks not accepting bionic firestarter - patch -Np1 -i "$srcdir"/jc_allow-bio-firestarter-on-smoker.patch - - # Fix NPCs not eating until they drop below normal weight and not becoming full from eating the basecamp stockpile - patch -Np1 -i "$srcdir"/jc_npcs-eat-when-hungry.patch - - # Fix Non-Player facton NPCs from becoming sleep deprived - patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-sleep-depirvation.patch - - # Fix Non-Player facton NPCs from becoming malnourished - patch -Np1 -i "$srcdir"/jc_stop-non-faction-npc-malnourishment.patch - - # Fix NPCs preferring tables to cots or woodstoves to the floor - patch -Np1 -i "$srcdir"/jc_stop-sleeping-on-tables.patch - - # Allow the hacker_laptop to utilize the extra functions - patch -Np1 -i "$srcdir"/jc_allow-hacker-laptop.patch - - # Restore the Infection Immune Trait and Revert Infection Resistant to as before - patch -Np1 -i "$srcdir"/jc_restore-inf-immune.patch - - - # Some personal quirks that simply lack a means short of patching the source - patch -Np1 -i "$srcdir"/custom.patch + # # # Additional changes + echo "Applying vampirism patch" + # Add vampire mutation lines and modify a number of functions to facilitate these traits. + patch -Np1 --no-backup-if-mismatch -i "$srcdir"/vampirism.patch } build() { - cd "${_pkgname}-${_pkgver}" + #cd "${_pkgname}-${pkgver}" + cd "repo" #export CFLAGS="$CFLAGS -fPIE" export CXXFLAGS="$CXXFLAGS -fPIE" export LDFLAGS="$LDFLAGS,-pie" - # tests "ifdef TILES" so "TILES=0" will enable tiles! - # DYNAMIC_LINKING appears to be a windows flag? - make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all - make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 - ./lang/compile_mo.sh + # Prevent segfaults when examine tile->search returns no results. + #export CXXFLAGS="$(echo $CXXFLAGS | sed -i 's/-Wp,-D_GLIBCXX_ASSERTIONS//' - )" # No longer works + export CXXFLAGS="$(echo $CXXFLAGS | sed 's/-Wp,-D_GLIBCXX_ASSERTIONS//')" + #echo $CXXFLAGS + + # Disable astyle until I can custom build a copy of 3.1 + # And disable json linting for the moment + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 ASTYLE=0 LINTJSON=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 ASTYLE=0 LINTJSON=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 TILES=1 SOUND=1 + #./lang/compile_mo.sh } package_cataclysm-bn() { - cd "${_pkgname}-${_pkgver}" + #cd "${_pkgname}-${pkgver}" + cd "repo" - make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LTO=1 LOCALIZE=1 LANGUAGES=all install + make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 ASTYLE=0 LINTJSON=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 install # Docs 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-bn/JSON_LOADING_ORDER.md" - cp --reflink 'data/json/LOADING_ORDER.md' "$pkgdir/usr/share/doc/cataclysm-bn/JSON_LOADING_ORDER.md" + + # Fix tileset readme being duplicated in curses package + rm "$pkgdir/usr/share/cataclysm-bn/json/external_tileset/README.md" # License install -Dm644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" @@ -304,45 +162,40 @@ package_cataclysm-bn() { package_cataclysm-bn-tiles() { pkgdesc="A graphical post-apocalyptic roguelike." - depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer') - cd "${_pkgname}-${_pkgver}" + depends=( + 'cataclysm-bn' + 'freetype2' + 'sdl2_image' + 'sdl2_mixer' + 'sdl2_ttf' + ) + #cd "${_pkgname}-${pkgver}" + cd "repo" - make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 install + make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 ASTYLE=0 LINTJSON=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 TILES=1 SOUND=1 install # 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 "${srcdir}/icon_128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" - install -D "${srcdir}/icon_128x128.png" "$pkgdir/usr/share/pixmaps/$pkgname.png" + install -Dm644 "${srcdir}/icon_128x128.png" "$pkgdir/usr/share/icons/hicolor/128x128/apps/$pkgname.png" + install -Dm644 "${srcdir}/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" - # Tileset - mv "$srcdir/cataclysm-dda-tileset_undeadpeople-master" "$srcdir/undeadpeople" - cp --reflink -r "$srcdir/undeadpeople" "$pkgdir/usr/share/cataclysm-bn/gfx" + # Remove unmaintained UDP tileset + # Use my forked cataclysm-bn-tileset package for a working UDP tileset 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-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" - - - # Sound - mv "$srcdir/cataclysm-dda-soundpack_jcsoundpack-master" "$srcdir/jcsoundpack" - 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-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-bn" find . -type f -exec rm -f "$pkgdir"/{} \; cd "$pkgdir" find . -type d -empty -delete + + # Fix mapgen readme being duplicated in tileset package + rm "$pkgdir/usr/share/cataclysm-bn/json/mapgen/lab/README.md" } |