From 9e057d3816e0b3e9dc955fe71ce7111ceaebf814 Mon Sep 17 00:00:00 2001 From: jc_gargma Date: Thu, 12 Jan 2023 07:55:52 -0800 Subject: Updated to 2022-10-19-1354 --- PKGBUILD | 22 +++++++++++----------- vampirism.patch | 2 +- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 584faf6..c703da4 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=202210152049 -_pkgver=2022-10-15-2049 +pkgver=202210191354 +_pkgver=2022-10-19-1354 pkgrel=1 pkgdesc="A post-apocalyptic roguelike." #url="http://cataclysmrl.blogspot.com/" @@ -129,7 +129,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=('7d35b9999a9da3c7eb1e53517b139fd69560f09dd08706dd9cf2053872e1fef374b189d693216df932ec5ca7c6feb455d6f95af3d09a0fc7711fc6214e43b0dc' +b2sums=('7416b059357e8dbacd194d2fee297305d418204547cd9c36771b3fe21b6e3f3b2db4f7dfa816d613b0cf1611830376a1029e0d4210727f17d270e833cf867e03' '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421' 'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8' '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad' @@ -200,10 +200,10 @@ b2sums=('7d35b9999a9da3c7eb1e53517b139fd69560f09dd08706dd9cf2053872e1fef374b189d 'e3302d903d053f25aa666d572f74a8bbd3b65dde40eedcbf46e537ceb2294ac22b3772087fce04c4a780c2f18e855179c6ddc8af12d72a89b82957ce09deb52f' '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b' 'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e' - '8b2a4afdaabc62787e1a33efe2b19cd5083c250f1160cf6452da2eeda581b05becd9d0b65cdc052834905f511d899309ef8f7a8be46d8fc5406d1dcb9ff5d416' - 'cc60c877c422bc61fd152066d1fb489fad9543a61f43e1b22b5db1ef862e93693e5db8e2033cea0c54cc736aa895844d0465afed2bb06c6e2b9b77f0b110bc74' + 'd7545632ba4288a54273cad2f7ceec2f6c4da0b7da5a9d583592c992cea6296ee286b59a9f548b97b961a7e8b1bf22a435b4f7462dc564376b2e49b2c7d50424' + '6dc43b50b3c8b90eb9f774d3aec739eb0b7ced6daacbe1e681095e2def240ef210359ee5cd1175a875a57b2839be94477744504701939a06db212650a8e30058' 'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596' - 'ab67483296320c0b577f5a68a2058ca49ea2350346c21c47bb29871589a59096330859993fd7cfcd7e0e7389727b15519f196c5a58dee9f7acca721302265ff1' + '8051661008b91d2cfd1cc9837be7679a2967e19761ed8888af3afa17f79c4f8910cdaeea4761382e5184c8f488d044b00be4dad2490c1e76529293e2913f4d63' 'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb') prepare() { @@ -237,7 +237,7 @@ prepare() { sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp # Fix version - sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-10-15-2049"|' Makefile + sed -i 's|VERSION = unstable|VERSION = "0.1-experimental 2022-10-19-1354"|' Makefile # # # Hotfixes @@ -582,15 +582,15 @@ build() { # tests "ifdef TILES" so "TILES=0" will enable tiles! # 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 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 USE_PCH_HEADER=0 - make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 USE_PCH_HEADER=0 TILES=1 SOUND=1 + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 + make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 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 USE_PCH_HEADER=0 install + make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 install # Docs install -d "$pkgdir/usr/share/doc/cataclysm-bn" @@ -621,7 +621,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 USE_PCH_HEADER=0 TILES=1 SOUND=1 install + make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 VERBOSE=1 TILES=1 SOUND=1 install # Icon diff --git a/vampirism.patch b/vampirism.patch index 298496a..fe2d535 100644 --- a/vampirism.patch +++ b/vampirism.patch @@ -672,7 +672,7 @@ "has_fume": true, - "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ] }, + "immunity_data": { "body_part_env_resistance": [ [ "mouth", 15 ] ], "traits": [ "VAMP_SKIN" ] }, - "priority": 8, + "priority": -1, "half_life": "10 minutes", "phase": "gas" @@ -1245,7 +1245,7 @@ -- cgit v1.2.1