Updated to 2021-07-21-0710

gcc11 patch and seds no longer required.

2 files changed, 6 insertions, 25 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 855c68f..e414150 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=202107190945
-_pkgver=2021-07-19-0945
+pkgver=202107210710
+_pkgver=2021-07-21-0710
 pkgrel=1
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
@@ -29,7 +29,6 @@ source=("$pkgname-$_pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-
         "cataclysm-bn.desktop"
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
-        "gcc11.patch"
 
         "0.F_backport-tacoma-barn-door-position.patch"
         "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch"
@@ -73,12 +72,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=('b75f5dadcccaf8f6e6ad68c7a84250e8180c52e45bf25a422fa8630bfeebb3732048c747162ebaa2d14a7d474447b1c966ba9461adaf24923d6629256cda9175'
+b2sums=('a4b16f4502a3e6394f2d39a080ca6b11daf25d33a64684bf076a5a43cfd5f32145ad134e469407fc57aca9fbc7d7f1a9e731862daa972055a147376790efdac2'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
-        '96c1c66079ec3e0a5ed19f22318f7db826d88fecd0a42181388454bce6781a5b5703dd492430fcb6a0a663e3fddfb1b5cee0bbfb29cdcf0c5f41d789781a8c23'
-        '2a2dc08f0d7855ef3c0f60b826b9760ac5fdd110f8d5bec404fb89fa82153f67190d1917a3149144902c244f91acec068904e38998feb20355fe622efd5de987'
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         '9e2c26bf0e2bb4fd60de8cad1f9c05f329d99a56c64189bc2747915c48d208b63038d45a90f7a1c8e8bb0ac33461f217acf7e57f752f0acff117e2062459e9bb'
@@ -132,14 +129,7 @@ prepare() {
   sed -i 's|cataclysm-dda|cataclysm-bn|' src/path_info.cpp
 
   # Fix version
-  sed -i 's|VERSION = unstable|VERSION = 2021-07-19-0945|' Makefile
-
-
-  # gcc11 support
-  patch -Np1 -i "$srcdir"/gcc11.patch
-  sed -i 's|-Wno-unknown-warning-option||' Makefile
-  sed -i 's|-Wzero-as-null-pointer-constant \\|-Wzero-as-null-pointer-constant")|' CMakeLists.txt
-  sed -i 's|-Wno-unknown-warning-option")||' CMakeLists.txt
+  sed -i 's|VERSION = unstable|VERSION = 2021-07-21-0710|' Makefile
 
 
   # Backports from 0.F
@@ -258,8 +248,8 @@ build() {
 
   # tests "ifdef TILES" so "TILES=0" will enable tiles!
   # DYNAMIC_LINKING appears to be a windows flag?
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all LINTJSON=0
-  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1 LINTJSON=0
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all
+  make PREFIX=/usr RELEASE=1 USE_XDG_DIR=1 BACKTRACE=0 LTO=1 LOCALIZE=1 LANGUAGES=all TILES=1 SOUND=1
   ./lang/compile_mo.sh
 }
 
diff --git a/gcc11.patch b/gcc11.patch
deleted file mode 100644
index 09f20c4..0000000
--- a/gcc11.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- a/src/units_volume.h
-+++ b/src/units_volume.h
-@@ -3,6 +3,7 @@
- #define CATA_SRC_UNITS_VOLUME_H
- 
- #include <algorithm>
-+#include <limits>
- 
- #include "units_def.h"