Updated to 2023-05-05-1323

Fix build with gcc13.

1 files changed, 8 insertions, 9 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 18facae..c4fdb67 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,4 +1,5 @@
 # Maintainer: jc_gargma <jc_gargma@iserlohn-fortress.net>
+# Contributor: aqua <aqua@iserlohn-fortress.net>
 # Maintainer (Arch): Kyle Keen <keenerd@gmail.com>
 
 # # I maintain this because:
@@ -17,7 +18,7 @@ pkgname=cataclysm-bn
 _pkgname=Cataclysm-BN-cbn-experimental
 pkgver=202305051323
 _pkgver=2023-05-05-1323
-pkgrel=1
+pkgrel=2
 pkgdesc="A post-apocalyptic roguelike."
 #url="http://cataclysmrl.blogspot.com/"
 #url="http://www.cataclysm.glyphgryph.com/"
@@ -27,12 +28,14 @@ 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' 'gcc12')
+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"
         "cataclysm-bn.desktop"
         "cataclysm-bn-tiles.desktop"
         "icon_128x128.png"
 
+        "0001-Fix-build-with-gcc13.patch"
+
         "revert-01_removed-traits.patch"
         "revert-02_revert-book-revamp.patch"
         "revert-03_generic-nv.patch"
@@ -150,6 +153,7 @@ b2sums=('9425448b02a6b561a9acfc757f1b23b5a7c052811f39b897bdab3f42ed4493b84325c15
         '069ecde58859b3d44cd687c4b6e718610cefb693ff86e66f199ebfb1b3072023ad2b6f0c28e27ef9c1ce4997f6a5b2ca0d45046996b3ff35a4aeaeb1a7cf9421'
         'ad88bc6c1e3c8183a313b5eec42f98d6956afea349feff34a86e4536c9921fa99d2594282caf27de8ebb7ffb56376ed2e76d572227bfd6d8173c7bb1f01e23b8'
         '6f70e90359a14e4839d9a2683debb88850e5dd387add911ad68fd87e5512cfcdd435da63e1e370358153673fd5a72a9b1e9c94f1979edb7948b4da8c82407bad'
+        'cac44870cb913e328aa20fdcce66fbc6047918bdef5ba44418e69ed2388448d3e592517ae830480a3c64c119725f71766720076d1c8f3f8c0122796025180898'
         'fdef1f81084e7b08203b8464f37a00e2efc8b11d423c6e6b82e612392d91047160d2bc472b63c836ebc48adee0b4f2b3434c3e07eed5876275b234e69d7f6b9c'
         'b143b75105f875159b7766b316c6e36feeba21bc5151fc11bb85785949e905dd964ec14b818e9424cc94773a001eb406cd5ef50fe1f73aacc7f2f82a3545b7ee'
         'e417a1786fbafb685099431f7f9926201ab80636bf3812da67acc341c7ef2b6a3853734d5b8b1bc355acbd5c0bedefb0401f8854aa5cb00032550afc8a7b9ebe'
@@ -276,7 +280,8 @@ prepare() {
 
 
   # # # Hotfixes
-  #echo "Applying hotfixes"
+  echo "Applying hotfixes"
+  patch -Np1 --no-backup-if-mismatch -i "$srcdir"/0001-Fix-build-with-gcc13.patch
 
 
   # # # Reverts
@@ -662,12 +667,6 @@ prepare() {
 build() {
   cd "${_pkgname}-${_pkgver}"
 
-  export CC=gcc-12
-  export CXX=g++-12
-  export AR=gcc-ar-12
-  export NM=gcc-nm-12
-  export RANLIB=gcc-ranlib-12
-
   #export CFLAGS="$CFLAGS -fPIE"
   export CXXFLAGS="$CXXFLAGS -fPIE"
   export LDFLAGS="$LDFLAGS,-pie"