Updated to 2022-10-10-2310

Merge two movecost patches together.
Updated price_postapoc patch.
Clean up sed scripts.
Fix broken D_GLIBCXX_ASSERTIONS removal sed script.
Enable new VERBOSE=1 build flag.

1 files changed, 42 insertions, 33 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 3ea079f..f6629b7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,9 +13,9 @@ pkgbase=cataclysm-bn
 pkgname=(cataclysm-bn cataclysm-bn-tiles)
 pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
-pkgver=202209291442
-_pkgver=2022-09-29-1442
-pkgrel=1
+pkgver=202210102310
+_pkgver=2022-10-10-2310
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -23,7 +23,7 @@ pkgdesc="A post-apocalyptic roguelike."
 url="https://github.com/cataclysmbnteam/Cataclysm-BN"
 arch=('x86_64' 'aarch64')
 license=("CCPL:by-sa")
-options=(lto)
+options=('lto')
 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"
@@ -90,11 +90,11 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
 
         "recipes-01_4570-dragon-can-be-dismantled.patch"
 
-        "terrain-01_migo-platform-landing-pad.patch"
+        "terrain-01_fix-movecost.patch"
+        "terrain-02_fix-doors-for-npcs.patch"
         "terrain-03_tacoma-clinic-add-missing-floor.patch"
         "terrain-04_lumbermill-gasoline-not-spilled.patch"
         "terrain-05_community-garden-fertilizer-not-spilled.patch"
-        "terrain-06_fix-doors-for-npcs.patch"
         "terrain-07_rehide-redacted.patch"
         "terrain-08_derelict-shed-is-s.patch"
         "terrain-09_make-firestation-shelter-wells-npc-drinkable.patch"
@@ -128,7 +128,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=('0dfc19a8fa2199d218b674b46f1b577d15b1df2b0d8fcb28d60fedf667d82300191a7e457ae41a6a4709a3769cad99e079942b59a90f6e71e9d88ebccf7f5abb'
+b2sums=('f65d766e92f419f9e7ebc3ed63cccaff6758301dbd9963c014c4c41ed0c4a3ff1516ed112d4e9bf70dfa8a16c16584635abfc5a2173d7e2cee242562ae2db797'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
@@ -172,11 +172,11 @@ b2sums=('0dfc19a8fa2199d218b674b46f1b577d15b1df2b0d8fcb28d60fedf667d82300191a7e4
         '88dd4e6a53b948ddd5bdf9a567a116f70047cc6cf5fb695b72b9ab571641e9af52e386c6e0b442c9dd794de39d57b26891dc8bb83e4c92506547f395d340915b'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
-        '0b34beb3afa14605d73d84f1d75bf8182ff0fcb2396e82d06e170cf0dc0d30386071959bd1be3553182c37bb5661a81cf6be8c4e0a14e4df0b01889cfe7edaf1'
+        '24c12ac534e8895ca34a4bb882822069aca16e9ede6655057c5b6d6de7b777e13b5fb327f83b4ef8401671b817d0fe7884e1933c372ecd953cba18ab26d070d1'
+        '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3'
         'b8a64accada87ee5be989c5307805610c9b5c0327bc107aab237ac3225dd9e4c51b6c79a2a7de15fe187d3c32d7cbe1c462f9b0e9fb5d5a55a74236c7061e96e'
         '85aeb5920ee5879848be4057324153a077fe907bed527ed8f9b80a3c5ee1ef64786f63ee2999f5ba74e80a43e99ded3280ce27759c1f7b73259a6e2b5e584aa8'
         '58a94409205f7b670ab5745b8cbc234a38efd6a6217cef4efb7e397f091092e3e0c7790706b0a42accaa83d7509b8e244a98b9f0ba78349ee85f3164745c3501'
-        '80da2c341d8564a47bc460fcdaf9196ac3bb77f0f2ba56bd71089e80e7481728a3ccbdcfcbc3bf70a9c9e5d9d9b01f2ca6615b67c7ab61003808ce00f6545ba3'
         '651de880cefd51665d854414c451cc80a33ed8f34e7559a95514abd81a2f58348c37dd75f272468eefd56562ba8c99093a6dd9af3ea57796a9db15164a40eda3'
         '7e41fc3a95073008ca2d71c2266d6d1a17af7803d493b447d40b15a86184c8ce3728b8d3d36765d408b1c46633d1bfa980d878cbac2e04b51ef518d44dfb7295'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
@@ -187,7 +187,7 @@ b2sums=('0dfc19a8fa2199d218b674b46f1b577d15b1df2b0d8fcb28d60fedf667d82300191a7e4
         '77bfba77f3548d267dc8142125bf26608c723bbdb2834317b3ea031ac64d9ff49bb4d75e29e2c759c03a662955697576d1c93153e9fb3e5dee86466bc29c78e1'
         '74a51f04237fba3caa25b2e0d49659f2e8330ce82288de866943d06b53690f31d48a77a4dd2e57db1f435b715fbca792268f2e191ffb59e57170d327ed41ac0a'
         'e1d03f68918d03f980f4c2dd966e3788afe63f14e2d18dbd4dab2cdbfa1253e4823c0f5daa3a579e47319a3c2af35bc5af0a390e2ba91fe7621f6db8b1a60994'
-        '59907554ca4304bf338e7fee9c4df144cc58db1f836ca9d43b2f9ce59c88f9136c2ce31a6c549f598c2f9217c80be00ec63b5f4ff6f713d2ce94faec699fb3ba'
+        '989a8c00cba128496272e1f4aedd7a88099c93e8ac4ba7aebe2100907d3223affbcb21ba6290a50d9c0b3afb0a38d059774bebc63aeb7d0d337afdae2466ec27'
         '06c5652eb2c70b8aba6d788415089b740c3510cd9c570838f656202ba2dc65d4f3289f6695413665de930e84fe287ef035ed8e83a0610a5a316e76a17442683a'
         '92cde696eec00e6758b58e73e8bc60ad1a73bb2a18d4fdfd24a19b5be715305a047943a02d94a9703c101ca0c769dbeb816f1f28809345bae0fec42fbc27bb34'
         '3f65bf65f730101b215a38101e2a01b4be85746ec5e691d0f1e0f43f1ea1fd47de203299fe7c505160fe831987bd091879243878d91b88ed9ab14712837bd786'
@@ -199,27 +199,33 @@ b2sums=('0dfc19a8fa2199d218b674b46f1b577d15b1df2b0d8fcb28d60fedf667d82300191a7e4
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         '8b2a4afdaabc62787e1a33efe2b19cd5083c250f1160cf6452da2eeda581b05becd9d0b65cdc052834905f511d899309ef8f7a8be46d8fc5406d1dcb9ff5d416'
-        '5f674f0cf9fca45f7231287d2779aa72500b19f3746f8b6ab2ae25903aceca06f76d15f8fd5fdda240a94b7ac11a26730ae7c230c80ce0284168efc517eccf23'
+        'cc60c877c422bc61fd152066d1fb489fad9543a61f43e1b22b5db1ef862e93693e5db8e2033cea0c54cc736aa895844d0465afed2bb06c6e2b9b77f0b110bc74'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ab67483296320c0b577f5a68a2058ca49ea2350346c21c47bb29871589a59096330859993fd7cfcd7e0e7389727b15519f196c5a58dee9f7acca721302265ff1'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
 
 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 \
+  -e 's/-Werror//' \
+  -e 's/ncursesw5-config/ncursesw6-config/' \
+  -e 's/shell git/shell false/' \
+  -i Makefile
 
   # Disable default optimizations
-  sed -i 's/-Os/-O3/' Makefile
-  sed -i 's/-O0/-O3/' Makefile
-  sed -i 's/-Og/-O3/' Makefile
-  sed -i 's/CXXFLAGS += -ffast-math/#CXXFLAGS += -ffast-math/' Makefile
+  sed \
+  -e 's/-Os/-O3/' \
+  -e 's/-O0/-O3/' \
+  -e 's/-Og/-O3/' \
+  -e 's/CXXFLAGS += -ffast-math/#CXXFLAGS += -ffast-math/' \
+  -i Makefile
 
   # Remove non-existent flags generating warnings
-  sed -i 's/-Wzero-as-null-pointer-constant \\/-Wzero-as-null-pointer-constant/' Makefile
-  sed -i 's/-Wno-range-loop-analysis/#-Wno-range-loop-analysis/' Makefile
-  sed -i 's/-Wno-unknown-warning-option/#-Wno-unknown-warning-option/' Makefile
+  sed \
+  -e 's/-Wzero-as-null-pointer-constant \\/-Wzero-as-null-pointer-constant/' \
+  -e 's/-Wno-range-loop-analysis/#-Wno-range-loop-analysis/' \
+  -e 's/-Wno-unknown-warning-option/#-Wno-unknown-warning-option/' \
+  -i Makefile
 
   # Fix filenames and paths
   sed -i 's|cataclysm-dda|cataclysm-bn|' CMakeLists.txt
@@ -229,7 +235,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-09-29-1442|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-10-10-2310|' Makefile
 
 
   # # # Hotfixes
@@ -439,9 +445,14 @@ prepare() {
   # # terrain and overmap fixes
   echo "Applying terrain and overmap fixes"
 
-  # Set t_platform_resin movecost to 2:
+  # Fix several tiles to movecost 2:
   # This allows helicopters to land on the mi-go landing pad.
-  patch -Np1 -i "$srcdir"/terrain-01_migo-platform-landing-pad.patch
+  # Also allows dragging shopping carts through open subway gates.
+  patch -Np1 -i "$srcdir"/terrain-01_fix-movecost.patch
+
+  # Fix some doors being unusable by npcs (incorrect door flag):
+  # The DOOR flag is for terrain that can be opened, not those already open.
+  patch -Np1 -i "$srcdir"/terrain-02_fix-doors-for-npcs.patch
 
   # Fix missing floor in the tacoma clinic:
   # The hospital is still a mess. :/
@@ -455,10 +466,6 @@ prepare() {
   # I'm pretty sure that having it all dumped in a pit was not intentional.
   patch -Np1 -i "$srcdir"/terrain-05_community-garden-fertilizer-not-spilled.patch
 
-  # Fix some doors being unusable by npcs (incorrect door flag):
-  # The DOOR flag is for terrain that can be opened, not those already open.
-  patch -Np1 -i "$srcdir"/terrain-06_fix-doors-for-npcs.patch
-
   # Re-hide something that feels like spoilers.
   patch -Np1 -i "$srcdir"/terrain-07_rehide-redacted.patch
 
@@ -560,20 +567,22 @@ build() {
   export LDFLAGS="$LDFLAGS,-pie"
 
   # Prevent segfaults when examine tile->search returns no results.
-  export CXXFLAGS="$(echo $CXXFLAGS | sed -i 's/-Wp,-D_GLIBCXX_ASSERTIONS//' - )"
+  #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
 
   # 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
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LOCALIZE=1 LANGUAGES=all RUNTESTS=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 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"
@@ -604,7 +613,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 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