Updated to 2022-07-11-1024.

Add gcc12 support hotfix.
Disable several non-existent build flags to reduce build warnings.

1 files changed, 19 insertions, 7 deletions

diff --git a/PKGBUILD b/PKGBUILD
index c08f0ce..810b97d 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=202207062051
-_pkgver=2022-07-06-2051
+pkgver=202207111024
+_pkgver=2022-07-11-1024
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -31,6 +31,8 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
+        "hotfix-01_gcc12-support.patch"
+
         "revert-01_removed-traits.patch"
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
@@ -127,10 +129,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=('a8f9d5453737070e5c012a0c741fc648b2a09fc9d64c308ec8a6739ca3dd1badc71daa74208b2c5574a03e0e5b1b21918df2714fafc6a13dc80d7c6497c89125'
+b2sums=('3a7fd7a5e7d6e1b9f476a21f139c2125fcce079293d752df03e958fbc88cf8fbbabc60283228f783127139de2ef5144980a69e16420f8353776557311485b584'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
+        'acde8c7be1ffed6a11898dc783619dfc17115730d2fb477d386713ad730620dec5eb8925180d79bb4acd418b42fd4a049014d988fcd805f4587cc75801bbd409'
         '839c92715bfd1f63d94d6d252813a19e6093ded3e45f9efbbc4953ab85adfb886bcdfcfa41c9bb9ed422c0a32917a1ac75f98019e7de946b840e345cd3969d19'
         '5a33531c5742bbee44b1b3edec89cfceb6e0f161a5e0f0b131149fec010be4ab45095fdc558d0dd0023182cde66200f387f819aa392410dd317c0bc8dddb6294'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
@@ -198,7 +201,7 @@ b2sums=('a8f9d5453737070e5c012a0c741fc648b2a09fc9d64c308ec8a6739ca3dd1badc71daa7
         '4bd44cbe85c53902b8a360509703e3d38e8a5da75dd2c534a77f03ce6440632f6c83c92939069c60473c88ffb3abab0fbf11e39271f44f813b9f6432ea5f9a6b'
         'f115314dd2bb1da07bba7a90fec5c3acb7ccb5145efaea03d6806942e24d402c9a144a2fd07b82e727a0b79dedd4bdd87de0bbaf0944236563164fb6f117965e'
         'd05c48c376f23dd7fda2b5249b5985665de8344774f420a95151f7484ab33c38fb78b2ff279cedf762877dca3abd91c4d9e4900547e9c31e7636e1d90cc13d2b'
-        '98dc920e6a9593e63e5d0ef761a55ec38f2520dc2e92e632ca5b570e2abebe53a04f200f277740f15819c3e597601d3c14048ed58d00ac92f19c2908a8b63044'
+        'dcc38c094ceab3c2bca77e0c06866f230daf781a7a888c73d47a300509646e8d8590b7066618d530bbd2b12485af833d0fc3105b0a5feb305d3a37315e784bab'
         'a56efdaae0344726debf5b74846edce8df7aa2357fbc7a05a3d369d1f457b02934a0d0ce2330072e03f1ac901e06e333c9393f795c761f8440307e7649ed5596'
         'ab67483296320c0b577f5a68a2058ca49ea2350346c21c47bb29871589a59096330859993fd7cfcd7e0e7389727b15519f196c5a58dee9f7acca721302265ff1'
         'b9309da09b165fb57e83f84e3584d2479bd3336ed86e181e5df2d27daa92bd55d03d7f3fc226f03696af5f0f32d8e0e7ecd26ae7e50eed0200d0b0feaad07efb')
@@ -208,12 +211,19 @@ prepare() {
   sed -i 's/-Werror//' Makefile
   sed -i 's/ncursesw5-config/ncursesw6-config/' Makefile
   sed -i 's/shell git/shell false/' 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
 
-  # Fix filenames
+  # 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
+
+  # Fix filenames and paths
   sed -i 's|cataclysm-dda|cataclysm-bn|' CMakeLists.txt
   sed -i 's|TARGET_NAME = cataclysm|TARGET_NAME = cataclysm-bn|' Makefile
   sed -i 's|cataclysm.a|cataclysm-bn.a|' Makefile
@@ -221,11 +231,13 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2022-07-06-2051|' Makefile
+  sed -i 's|VERSION = unstable|VERSION = 2022-07-11-1024|' Makefile
 
 
   # # # Hotfixes
-  #echo "Applying hotfixes"
+  echo "Applying hotfixes"
+  # Fix gcc12 builds
+  patch -Np1 -i "$srcdir"/hotfix-01_gcc12-support.patch
 
 
   # # # Reverts