From fc24f598ad36e47aab995d49043759db8a3c08c6 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Fri, 8 Sep 2023 20:46:14 -0700 Subject: Updated to 2023-08-28-1640 Revert mainline rivtech ammo Remove obsolete bionic price patch Disable Lua support --- PKGBUILD | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'PKGBUILD') diff --git a/PKGBUILD b/PKGBUILD index 12b108a..186f5a6 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -17,9 +17,9 @@ pkgbase=cataclysm-bn pkgname=(cataclysm-bn cataclysm-bn-tiles) pkgname=cataclysm-bn _pkgname=Cataclysm-BN-cbn-experimental -pkgver=202308231412 -_pkgver=2023-08-23-1412 -pkgrel=2 +pkgver=202308281640 +_pkgver=2023-08-28-1640 +pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" #url="http://www.cataclysm.glyphgryph.com/" @@ -50,6 +50,7 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "revert-13_fix-i18n-metric-bullets-part-2-rename-.308-7.62x51mm.patch" "revert-14_Removed-unrelated-references-2738.patch" "revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch" + "revert-17_Rivtech-mainline-3092.patch" "ammo-01_inconsistent-ammo-names.patch" "ammo-02_fix-20x66mm-loudness.patch" @@ -64,7 +65,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm- "armor-02_fix-survivor-fingerless-gloves-warmth.patch" "bionics-01_npc-can-use-more-bionics.patch" - "bionics-02_fix-bionic-prices.patch" "faction-01_more-factions.patch" "faction-03_fix-food-supply-calculations.patch" @@ -154,7 +154,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=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c404e09c494c7c44731783b66479815138a42f7f344e39cb8fbf85a4be77' +b2sums=('9f6de7733c6956ded2f5780517eb27e1bb5dc292146c3e30d8e3f41e59677d0bae4b2e0ee11852553d455b85d3fcbf92fc9ed0361860f70cf5899c08c3d9e842' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -173,6 +173,7 @@ b2sums=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c40 'c7d0ed3da809a930896ccb1067b52d78defc0428ed6c1d4b72bea0f32ccc3590374f268b9a1763de0265ddf1c8cd011f4e910c0d6384251699103af48fe1bb3c' '3999499f63c50ab9fb38edab7592bcba4f8ab9a51b63d96445a9a6af843d5c5a36f36838735528fc42e5eec5c9e375e704fab1aa55df03f5a804e54d247edaa5' '2de96509a572c1eca36d63f1a049a27583cd0f2df53605b927c9b5112d4e2385bccc82ba1a37af06fe756f96cc1e8c9d4b6cd081ad70651ec09ac57b93cee84f' + '02b3ff03cd2f6b74e65c31874a0ed91918cab1bb7272516c7565f7f68f0a96a9a3a837f19f2431470da455084dea6d481875258f01a45e9249aafac879007746' 'ea9e227eff0a9470a06effc35d8e991c0e21d5521e0325317ab36760b5bb3256676fee29dd948fcc7f4b09ce9235c2d859cd22d6839ebf14deb369cdf97b20f0' '6dbcf4833dabb68443e50a644cc26309785593f757f7484771a101873aeb02d2e8f3869c0679132a6883ea86bd5fd47494281d0f70dcae9f4bec9b06a7d69b19' '124893f23b7d865709fa87a9fade8fb01e596c1f31b0811ab32d5e730e1101c62af672eaf5fe9cdefa338fc25164407023f4c7dcc7cacdb0c86b4713180d345d' @@ -184,7 +185,6 @@ b2sums=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c40 '0884229f513f843099dbd397d96fd8b37aad2d1ae0aee2771f57f54188241d6ed0ede8750780b9564bd9e3dc8d215039d409081a8eb46ce25b90edb196eb6bf4' 'f4ad4c90cfcf11af42c6cfc6d2027b21af3f58ac274b9bd0852a52ef60b606476766f194b281f6baf12f81647b384a98f745519bb48bc2e4f5fe03984c7c0e65' '172c611008cb8893a8a8cbf83ef929f5727fbf341f3303c6f38749e3742f96ba7352624112ac231a8df7be9031649e41d54cc52152776e52e3a7a620ea8f33e3' - 'ee31032c9d960e4290dea08a97037f8566e35743e949d3d38f6e9ae76a736118d23c34ce7cd1b99d40460047f9fb6e54c52b156587bb76458942139e18dd82d8' '1ce956dbcd0af3e16c336ce15995a7df19b8bed78765890304ff9dcaf6d30c602580bef050d6c659fdff945a31dce880f5f4042dfc295cdef44c34155a3e644c' '804cea67bb0a2fab62dd9cf633d1959a3fe59b3e24f0c2e01a6db951100fa4426ae946a90a93fa7fd6a7d0ece478633d0091144c2fa776858157edec1310f837' 'a611964c224c7751c3afeaadb159135e5ed5d87d3ed254be63b4b12450f4f63f414c90f8e29f3d14c0b854f4c9938bf5d12db69d2e258f1947e353302ca07da7' @@ -236,7 +236,7 @@ b2sums=('9336f68048436ec5cbe3fd02d6d91afe9b7f51676c2f7f9d7f0bea8115bfc183ac17c40 '209387731490549d7b3d546ab149cea22e0ea1291356884f358cd87ca7d5425ca9a72f6f2cb7af46956634ffdb1a61d1ebfbfdbb5a2fc9fdc26d29acdc2ab0c0' 'a357104e814cde6669ab0b76d8d869ddd7fb03cf38bf1b32993780a31ac07e50cfc5d1af3e87d969ca3f9650ea3aefba3c55bf626c4c40502205a130a86c25a5' 'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994' - 'f428818d1d4df4e46ec844458cfd5f9eef5d19a89778837502eb74ed6d421113ae9a9bc2fd4fb2bcf41d433635c34912e90b90a8993e92164e6a1efe0ebae82f' + 'e6044d7238be1cba2a083b6eb17335e10be3c8116234c67f006c7b6e5a9e25e107412ae2f5a636b01efa70cb54032f5c3da46ec7f0e92917334e72a492f739f8' 'b41ce5db19de2f4a5857debe31560b7b8216412e5df795032363839429f732b2d2359b3679a795c55a997913588f7d495c300df402529317ef2d03de24a74273' '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a' '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34' @@ -286,7 +286,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-08-23-1412"|' Makefile + sed -i 's|VERSION = unstable|VERSION = "0.2-experimental 2023-08-28-1640"|' Makefile # # # Hotfixes @@ -295,6 +295,9 @@ prepare() { # # # Reverts echo "Applying revert patches" + # # Revert mainline craftable rivtech ammo + patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-17_Rivtech-mainline-3092.patch + # # More reverts for generic night vision patch -NREp1 --no-backup-if-mismatch -i "$srcdir"/revert-15_Fix-mutant-scenarios-adding-an-obsoleted-trait-2929.patch @@ -398,10 +401,6 @@ prepare() { # ie, soporific inducer, gasoline fuel cell, enhanced hearing, surgical scalpels. patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-01_npc-can-use-more-bionics.patch - # Fix some CBMs having excessively high price_postapoc values: - # All other CBMs are fixed to 1000, so these now are too. - patch -Np1 --no-backup-if-mismatch -i "$srcdir"/bionics-02_fix-bionic-prices.patch - # # faction fixes echo "Applying faction fixes" @@ -713,15 +712,15 @@ build() { export CXXFLAGS="$(echo $CXXFLAGS | sed 's/-Wp,-D_GLIBCXX_ASSERTIONS//')" #echo $CXXFLAGS - make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 CCACHE=0 - make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 CCACHE=0 TILES=1 SOUND=1 + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=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 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 TILES=1 SOUND=1 ./lang/compile_mo.sh } package_cataclysm-bn() { cd "${_pkgname}-${_pkgver}" - make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 CCACHE=0 install + make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 install # Docs install -d "$pkgdir/usr/share/doc/cataclysm-bn" @@ -752,7 +751,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 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 CCACHE=0 TILES=1 SOUND=1 install + make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 PCH=0 LUA=0 CCACHE=0 TILES=1 SOUND=1 install # Icon -- cgit v1.2.1