diff options
Diffstat (limited to 'PKGBUILD')
| -rw-r--r-- | PKGBUILD | 47 |
1 files changed, 36 insertions, 11 deletions
@@ -13,8 +13,8 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202202041939 -_pkgver=2022-02-04-1939 +pkgver=202202150614 +_pkgver=2022-02-15-0614 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -34,6 +34,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "revert-02_revert-book-revamp.patch" "revert-03_generic-nv.patch" "revert-04_telescopic-lenses.patch" + #"revert-05_JSONize-ranged-bash-reinforced-glass-letting-bullets.patch" "ammo-01_inconsistent-ammo-names.patch" "ammo-02_fix-20x66mm-loudness.patch" @@ -48,6 +49,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "bionics-01_npc-can-use-more-bionics.patch" "faction-01_more-factions.patch" + #"faction-02_more-monster-factions.patch" "foods-01_fix-food-materials.patch" "foods-02_fix-food-naming.patch" @@ -59,6 +61,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "meds-01_antibiotics-unhealthy.patch" "monsters-01_medical-zombies-called-zombies.patch" + #"monsters-02_power-leech-update.patch" "mutations-01_nerf-lightstep.patch" "mutations-02_fix-evac3-background-visible.patch" @@ -71,8 +74,10 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "npc-05_kindred-update.patch" "npc-06_lapin-update.patch" "npc-07_lighthouse-family_v2.patch" + "npc-08_nurse-takes-more-meds.patch" + "npc-09_broker-takes-more-foods.patch" #"npc-nn_refugee.patch" - #"npc-nn_robofac.patch" + #"npc-nn_robofac-v2.patch" "npc-10_dialogue-fixes.patch" "recipes-01_4570-dragon-can-be-dismantled.patch" @@ -113,7 +118,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "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=('e63a887564927e1bef9e7f01656c46576f8ed76d7003d47e7c3b1b02619f1c7ef53cf8e45c5f6630133f59cbf111155ec7ab5ef8c834ea57db080db1c68f08e1' +b2sums=('e5f7ad41b43bce265f4fbd29b74af8d6a875c11dca94b500bf81c81198621eeedbf65afc403320e69d6c32f5d641c367b0e7f04ec05b4c87a74ebb6963376d31' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -148,6 +153,8 @@ b2sums=('e63a887564927e1bef9e7f01656c46576f8ed76d7003d47e7c3b1b02619f1c7ef53cf8e 'd3d582336519191f73c8cf3c7bbb0a8df8ecbb333d864a32ad4b263daaeb193f771aa4b9cbf00ab929b4296da6db31fd575bdb2b337148147a76e25459f703ad' '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb' 'd2c149bb48e3152100b02d138471ec107e172f282a05ee4bae321ef0828c758d0cf1f7a6e9bbb02bca14148d59d61f92abcbc5ddb9a7a0b7cba8db9cef22c391' + '026fb478045b82e3b329a53c023c8c3ee29e792ca2e77c285a67b3655853cd6a960a8e27a65c9ad6988d8000333f6b8f8bf77ea6656b879519fc74a475d8aef7' + '9f34e372124b23bbc0598f42a1331f5a37f6ca4bfa3117d8b83fc804446a0d55f7fe3f462ff924bfa563100127338713bf27241a4244b1a37d9cca9b5da79bca' 'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e' '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f' 'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e' @@ -175,7 +182,7 @@ b2sums=('e63a887564927e1bef9e7f01656c46576f8ed76d7003d47e7c3b1b02619f1c7ef53cf8e '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b' 'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e' '1de3fed057adb6c0d41c97bbb5af2b753147ea8f8ac7023759684054aead266100dc8c8e0cc261c7a5cf922e4194e8cabaf626fb5f7974c6036edc64f25cc8f9' - 'fb41ab2c313bf7e76179490b15aadd6c530a246d993ec974d961394efcef08a3306df5a34aa992f1f9a895d8fc2fe3eabe23747bbce44f265d2710bdb48242f5' + '89241aa3a25d9f8b8e18ebde0687c23445ee24121a4ddc146be8106696ebf2af6a2f9d20bacf5718e5bdef6ed1cbb3cab2c8aeb00edac228413b74733e435926' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' '26a1e5a583a30687da3534a3846f5e316954bdc5a5fc36ed0a7eeda6f642644a74ae459f90d6ab80879813d500b4dfa6c68d38508e4cef3a0feba1c057e3b09a' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') @@ -195,7 +202,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = 2022-02-04-1939|' Makefile + sed -i 's|VERSION = unstable|VERSION = 2022-02-15-0614|' Makefile # # # Hotfixes @@ -215,6 +222,9 @@ prepare() { # Revert the Infection Immune Trait and Revert Infection Resistant to as before. Also keep Truthteller. patch -Np1 -i "$srcdir"/revert-01_removed-traits.patch + # Revert bullet penetration patch til the bug with viewing over tables is fixed + #patch -NRp1 -i "$srcdir"/revert-05_JSONize-ranged-bash-reinforced-glass-letting-bullets.patch + # # # Various fixes for bugs I came across # # Ammo fixes @@ -264,6 +274,9 @@ prepare() { # Backport the factions.json updates from DDA patch -Np1 -i "$srcdir"/faction-01_more-factions.patch + # Backport the monster_factions.json updates from DDA + #patch -Np1 -i "$srcdir"/faction-02_more-monster-factions.patch + # # food fixes echo "Applying food fixes" @@ -304,6 +317,9 @@ prepare() { # It just felt weird seeing "nurse" in the enemy list. patch -Np1 -i "$srcdir"/monsters-01_medical-zombies-called-zombies.patch + # Port the updates to power leeches from DDA + #patch -Np1 -i "$srcdir"/monsters-02_power-leech-update.patch + # # mutation fixes echo "Applying mutation fixes" @@ -342,13 +358,21 @@ prepare() { # Hack in some effects to use as timers and probe NPC mechanic skill. patch -Np1 -i "$srcdir"/npc-07_lighthouse-family_v2.patch + # Update the Tacoma Nurse to buy almost every non-dangerous, non-electrical, and non-expensive medicine. + # Also remove acceptance for various tools that are not correctly taken, such as first aid kits. + patch -Np1 -i "$srcdir"/npc-08_nurse-takes-more-meds.patch + + # Update the FMC broker to buy most preserved foods. + # Also update the dialogue to specify that he buys more types. + patch -Np1 -i "$srcdir"/npc-09_broker-takes-more-foods.patch + # Port the updates to Free Merchant Center from DDA # Relies on new json functions :/ #patch -Np1 -i "$srcdir"/npc-nn_refugee.patch # Port the updates to Hub 01 from DDA # Relies on new json functions :/ - #patch -Np1 -i "$srcdir"/npc-nn_robofac.patch + #patch -Np1 -i "$srcdir"/zz_npc-nn_robofac-v2.patch # Assorted typos in NPC dialogue. # Fix Jack Isherwood mission listing 10 jars, when it is actually 20. @@ -477,15 +501,16 @@ build() { # 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 + # TESTS disabled due to gcc 11.2 bug + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 RUNTESTS=0 ./lang/compile_mo.sh } package_cataclysm-bn() { cd "${_pkgname}-${_pkgver}" - 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 LTO=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 install # Docs install -d "$pkgdir/usr/share/doc/cataclysm-bn" @@ -516,7 +541,7 @@ package_cataclysm-bn-tiles() { depends=('cataclysm-bn' 'sdl2_image' 'sdl2_ttf' 'freetype2' 'sdl2_mixer') cd "${_pkgname}-${_pkgver}" - 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 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 RUNTESTS=0 install # Icon |