From d95febcd86434686f76c091282743d0c3c026b25 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 17 May 2021 20:57:26 -0700
Subject: Add patch and seds to compile with gcc11

---
 PKGBUILD    | 10 ++++++++++
 gcc11.patch |  9 +++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 gcc11.patch

diff --git a/PKGBUILD b/PKGBUILD
index 3ba0016..1ab3953 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -26,6 +26,7 @@ makedepends=('sdl2_image' 'sdl2_ttf' 'sdl2_mixer' 'freetype2' 'astyle')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-BN/archive/refs/tags/$pkgver.tar.gz"
         "cataclysm-bn.desktop"
         "cataclysm-bn-tiles.desktop"
+        "gcc11.patch"
 
         "0.F_backport-tacoma-barn-door-position.patch"
         "0.F_backport-make-firestation-shelter-wells-npc-drinkable.patch"
@@ -67,6 +68,7 @@ source=("$pkgname-$pkgver.tar.gz::https://github.com/cataclysmbnteam/Cataclysm-B
 b2sums=('9506e22590c26d87e9fbb47e3cfabd975ac36268eba7db36a034743a45d417d3499497d67a6ec7909eb964de41053594c9c2826ad4c4341d1604eb7ff19cbd4d'
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
+        '96c1c66079ec3e0a5ed19f22318f7db826d88fecd0a42181388454bce6781a5b5703dd492430fcb6a0a663e3fddfb1b5cee0bbfb29cdcf0c5f41d789781a8c23'
         'ce0dd5121e814e0fcd79d68362c80a83bfe70f970be9d5d6f6fe5f6a56ed3f041be4d560aaf02225c3ce7c457dc63bc3adf0709d4b89a81c18184ff5341eb5d3'
         '2cdcf9ab03eb92f384caf1a2d90f82c75f880cb6286811e83217c883e421c116e7844ca193a010dc35e12eec46ede3663171a2f45f660ef5a8be95c474f61bfc'
         '9e2c26bf0e2bb4fd60de8cad1f9c05f329d99a56c64189bc2747915c48d208b63038d45a90f7a1c8e8bb0ac33461f217acf7e57f752f0acff117e2062459e9bb'
@@ -120,6 +122,14 @@ prepare() {
   sed -i 's|VERSION = the-fork|VERSION = 1834|' Makefile
 
 
+  # gcc11 support
+  patch -Np1 -i "$srcdir"/gcc11.patch
+  sed -i 's|-Wzero-as-null-pointer-constant \\|-Wzero-as-null-pointer-constant|' Makefile
+  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
+
+
   # Backports from 0.F
   # Fix tacoma barn doors being placed in the same spot twice
   patch -Np1 -i "$srcdir"/0.F_backport-tacoma-barn-door-position.patch
diff --git a/gcc11.patch b/gcc11.patch
new file mode 100644
index 0000000..09f20c4
--- /dev/null
+++ b/gcc11.patch
@@ -0,0 +1,9 @@
+--- 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"
-- 
cgit v1.2.1