Updated to 2022-06-20-2237

Fix FMC merchant patch.

3 files changed, 28 insertions, 38 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 110e305..d65c2ba 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=202206102134
-_pkgver=2022-06-10-2134
-pkgrel=2
+pkgver=202206202237
+_pkgver=2022-06-20-2237
+pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -23,15 +23,14 @@ pkgdesc="A post-apocalyptic roguelike."
 url="https://github.com/cataclysmbnteam/Cataclysm-BN"
 arch=('x86_64' 'aarch64')
 license=("CCPL:by-sa")
+options=(lto)
 depends=('ncurses' 'hicolor-icon-theme' 'gettext')
-makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle')
+makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle' 'gcc11')
 source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/cbn-experimental-$_pkgver.tar.gz"
         "cataclysm-bn.desktop"
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
-        "hotfix-01_save-stomach-contents.patch"
-
         "revert-01_removed-traits.patch"
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
@@ -130,11 +129,10 @@ 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=('503e046ff99bb831d6b050789ab8121457a746dd4033d00d2244b44339ff581810a971559c17b2856799a7bcd9978313fa64e0cde576cbf0df879dc4629e2bc1'
+b2sums=('bc9f5a30a0f38012aaad981136d468ed92a60b5e2f45c959ccd15225df07bbfc95070b963b4ca0f3dd4e53d1aced9c7970487129292ff49ee6184668af5a2ab7'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        '6eb5c097290987791acd21585ea63279bc8296fe852c2068f218355ba9f0b6d6086fda2204fdd91443829c97ce7bd78faf829898d3080bb5420e024df3cde317'
         '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
         '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
@@ -172,7 +170,7 @@ b2sums=('503e046ff99bb831d6b050789ab8121457a746dd4033d00d2244b44339ff581810a9715
         '17ded8bdfccef7555cc01727984c768ecc601878319bc8cc959cff51b5091335dd43f45cf69ec12dfd478644ccceab48c7a49c3469bbe3eee9ec9b380cfac7fb'
         'd2c149bb48e3152100b02d138471ec107e172f282a05ee4bae321ef0828c758d0cf1f7a6e9bbb02bca14148d59d61f92abcbc5ddb9a7a0b7cba8db9cef22c391'
         'c21ffa9f0dd9dc290fac733bbfbc341eee6c2b754d543108f9933c5e1746a8a102b616f01adf2318e7d21b9714ec5d4a99fea28a13d0535c51b1a510f1167806'
-        '9f34e372124b23bbc0598f42a1331f5a37f6ca4bfa3117d8b83fc804446a0d55f7fe3f462ff924bfa563100127338713bf27241a4244b1a37d9cca9b5da79bca'
+        'df7ff9e051cc43e9a7ffe2f6b6fb53e1d69c302870eb0ed3d7f877ba00517080bed2cefcd441642e7322af113b334e65e396af8b9f49a685dcf73843319fbed0'
         '9bb382d203bfb6534b38ce54e53046f4a25a08b53620453f04b71b72b6994d55e9348306d9ea1186180dbce25811fdfce938f7b6e45286e523540fb3c22ab9bc'
         'adcf0b46ad57390488b3932910fba5a5be8152f91b45864bf078a2b8d92dc89e9944c320dafb7a0d4786e1fce48bedea714d671feefe565ffbbb74baca21d98e'
         '3373939e76f1ddb788b45424533c2e7687bbacae840fb3e6b1d49034e18315297af66dddf1b13d4f42033608123929b78819f38cca6cbc6c5ecca09bc67ab69f'
@@ -203,7 +201,7 @@ b2sums=('503e046ff99bb831d6b050789ab8121457a746dd4033d00d2244b44339ff581810a9715
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'd05c48c376f23dd7fda2b5249b5985665de8344774f420a95151f7484ab33c38fb78b2ff279cedf762877dca3abd91c4d9e4900547e9c31e7636e1d90cc13d2b'
-        '2d22e3a85df0854a93aebc49b4031c71bb87bd5344e99bb25bb5e599d77876cddcb7915ed03f3842a096b9ab6d08828daad29ec18dbeb95cfb8c5137c8d6983a'
+        '07ba27cd584d3e1c5635a7af3fe49c9db715e356de08efcf0c057f261d8d5f795b9dd63de3fc15119cf0cf9cd00d0f042337383391a6684db44835394eba74dc'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ce10e7d8457ad71d7bad75c68b32c60f4ea12ddf52407816f27ff05677bc789f6af33dabb734d17fbb5037d58c6041673752f332d2bf676604565f8d60e8078c'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -214,6 +212,9 @@ prepare() {
   sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile
   sed -i 's/shell git/shell false/' Makefile
   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
 
   # Fix filenames
   sed -i 's|cataclysm-dda|cataclysm-bn|' CMakeLists.txt
@@ -228,8 +229,6 @@ prepare() {
 
   # # # Hotfixes
   #echo "Applying hotfixes"
-  # Fix stomach contents not being saved, leading to excess hunger on game load
-  patch -Np1 -i "$srcdir"/hotfix-01_save-stomach-contents.patch
 
 
   # # # Reverts
@@ -553,22 +552,31 @@ prepare() {
 build() {
   cd "${_pkgname}-${_pkgver}"
 
+  #export CXXFLAGS="$(echo $CXXFLAGS | sed -i 's/-Wp,-D_GLIBCXX_ASSERTIONS//' - )"
+
   #export CFLAGS="$CFLAGS -fPIE"
   export CXXFLAGS="$CXXFLAGS -fPIE"
   export LDFLAGS="$LDFLAGS,-pie"
 
+  # Use gcc11 until game-breaking liquid segfaults are fixed.
+  export CC=gcc-11
+  export CXX=g++-11
+  export AR=gcc-ar-11
+  export NM=gcc-nm-11
+  export RANLIB=gcc-ranlib-11
+
   # 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 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 RUNTESTS=0 TILES=1 SOUND=1
+  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
   ./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 RUNTESTS=0 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 USE_HOME_DIR=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 install
 
   # Docs
   install -d "$pkgdir/usr/share/doc/cataclysm-bn"
@@ -599,7 +607,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 RUNTESTS=0 TILES=1 SOUND=1 install
+  make DESTDIR="$pkgdir" PREFIX="/usr" RELEASE=1 LOCALIZE=1 LANGUAGES=all RUNTESTS=0 TILES=1 SOUND=1 install
 
 
   # Icon
diff --git a/hotfix-01_save-stomach-contents.patch b/hotfix-01_save-stomach-contents.patch
deleted file mode 100644
index f65f0e1..0000000
--- a/hotfix-01_save-stomach-contents.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- a/src/savegame_json.cpp
-+++ b/src/savegame_json.cpp
-@@ -608,6 +608,7 @@
-         overmap_time_array.read_next( tdr );
-         overmap_time[pt] = tdr;
-     }
-+    data.read( "stomach", stomach );
-     data.read( "automoveroute", auto_move_route );
- 
-     known_traps.clear();
-@@ -740,6 +741,7 @@
-         }
-         json.end_array();
-     }
-+    json.member( "stomach", stomach );
-     json.member( "automoveroute", auto_move_route );
-     json.member( "known_traps" );
-     json.start_array();
diff --git a/npc-09_broker-takes-more-foods.patch b/npc-09_broker-takes-more-foods.patch
index 980873a..268bf00 100644
--- a/npc-09_broker-takes-more-foods.patch
+++ b/npc-09_broker-takes-more-foods.patch
@@ -1,6 +1,6 @@
---- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
+--- a/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json	
 +++ b/data/json/npcs/refugee_center/surface_staff/NPC_free_merchant_broker.json
-@@ -75,20 +75,93 @@
+@@ -88,20 +88,89 @@
      "dynamic_line": "Excellent.  What've you brought us?",
      "repeat_responses": {
        "for_item": [
@@ -98,7 +98,7 @@
        ],
        "response": { "text": "Delivering <topic_item>.", "topic": "TALK_DELIVER_ASK" }
      },
-@@ -128,7 +225,7 @@
+@@ -141,7 +210,7 @@
    {
      "type": "talk_topic",
      "id": "TALK_FREE_MERCHANT_STOCKS_WHY",
@@ -107,7 +107,7 @@
      "responses": [
        { "text": "Are you looking to buy anything else?", "topic": "TALK_FREE_MERCHANT_STOCKS_ALL" },
        { "text": "Very well… let's talk about something else.", "topic": "TALK_FREE_MERCHANT_STOCKS" }
-@@ -142,7 +239,7 @@
+@@ -155,7 +224,7 @@
    {
      "type": "talk_topic",
      "id": "TALK_FREE_MERCHANT_STOCKS_ALL",