summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2022-02-20 20:27:48 -0800
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2022-02-20 20:27:48 -0800
commita048d189f63235e3dd947b08163295a45e3c0fcd (patch)
treeea84bede2f8344a1b3850828fb9935ddbc047056
parentUpdated to 2022-02-15-0614. (diff)
downloadcataclysm-bn-a048d189f63235e3dd947b08163295a45e3c0fcd.tar.xz
Updated to 2022-02-19-2349
Disable tests as workaround for tests broken on updated glibc
-rw-r--r--PKGBUILD18
1 files changed, 10 insertions, 8 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 51b7b82..4869373 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,8 +13,8 @@ pkgbase=cataclysm-bn
pkgname=(cataclysm-bn cataclysm-bn-tiles)
pkgname=cataclysm-bn
_pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202202150614
-_pkgver=2022-02-15-0614
+pkgver=202202192349
+_pkgver=2022-02-19-2349
pkgrel=1
pkgdesc="A post-apocalyptic roguelike."
#url="http://cataclysmrl.blogspot.com/"
@@ -118,10 +118,11 @@ 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=('e5f7ad41b43bce265f4fbd29b74af8d6a875c11dca94b500bf81c81198621eeedbf65afc403320e69d6c32f5d641c367b0e7f04ec05b4c87a74ebb6963376d31'
+b2sums=('12f8b5dac86c42ca1207e854dd1682d7c617dfbd6e50d19eb47807a7ae062f757edfbfa5ff71c927861a94c7a4cf692f4bdb79044b537ba4799378abbed25081'
'069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
'6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
+ 'efe8b9b633c4e707b05ed1e4656ccd5b1553d97f11a976f0771d1e8d67d09310552546defea2c66eb754ee7707baaca46bcf31f01252224a001b40b7ef77367d'
'839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
'5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
'32f7c7090c094bcf87c116ccc4843f63c2f7600f591e26ab7d5a31d7c3abfcc5dec0edf5a9750dba07fe087c3880bbd6d322d0435ebbce06c930bd32c9c814d9'
@@ -182,9 +183,9 @@ b2sums=('e5f7ad41b43bce265f4fbd29b74af8d6a875c11dca94b500bf81c81198621eeedbf65af
'4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
'1de3fed057adb6c0d41c97bbb5af2b753147ea8f8ac7023759684054aead266100dc8c8e0cc261c7a5cf922e4194e8cabaf626fb5f7974c6036edc64f25cc8f9'
- '89241aa3a25d9f8b8e18ebde0687c23445ee24121a4ddc146be8106696ebf2af6a2f9d20bacf5718e5bdef6ed1cbb3cab2c8aeb00edac228413b74733e435926'
+ '41c36f0ccbf382feb7091c07d6195642e93622dcaadb779f05a1b87f08b607538370cda3946b6b6cc3e699035aa918c347d6874e0e4923af761ca772060c4d9e'
'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
- '26a1e5a583a30687da3534a3846f5e316954bdc5a5fc36ed0a7eeda6f642644a74ae459f90d6ab80879813d500b4dfa6c68d38508e4cef3a0feba1c057e3b09a'
+ '478dcbaf71c7d2a4245f55f232525be1fdfc6d7f1c339777a9ba6df2606551c3c011ca5686ec0864db8a17874efb9731b52a645b5c0b7d4ae7ac36e34932f735'
'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
prepare() {
@@ -202,7 +203,7 @@ prepare() {
sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
# Fix version
- sed -i 's|VERSION = unstable|VERSION = 2022-02-15-0614|' Makefile
+ sed -i 's|VERSION = unstable|VERSION = 2022-02-19-2349|' Makefile
# # # Hotfixes
@@ -226,6 +227,7 @@ prepare() {
#patch -NRp1 -i "$srcdir"/revert-05_JSONize-ranged-bash-reinforced-glass-letting-bullets.patch
+
# # # Various fixes for bugs I came across
# # Ammo fixes
echo "Applying ammo fixes"
@@ -503,7 +505,7 @@ build() {
# DYNAMIC_LINKING appears to be a windows flag?
# 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
+ make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 TILES=1 SOUND=1
./lang/compile_mo.sh
}
@@ -541,7 +543,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 RUNTESTS=0 install
+ make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LTO=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 TILES=1 SOUND=1 install
# Icon