Added patch to fix build with GCC 14.

3 files changed, 29 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f39da58bbeac..ee8fcf4dc7fe 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = toppler-git
 	pkgdesc = A reimplementation of the classic jump & run game "Nebulus"
 	pkgver = 1.3+8+r542.20220323.c8bf02b
-	pkgrel = 1
+	pkgrel = 2
 	url = https://gitlab.com/roever/toppler/
 	arch = i686
 	arch = x86_64
@@ -21,8 +21,10 @@ pkgbase = toppler-git
 	conflicts = toppler
 	replaces = toppler-darcs
 	source = toppler::git+https://gitlab.com/roever/toppler.git
+	source = fix-for-gcc14.patch
 	source = toppler.desktop
 	sha256sums = SKIP
+	sha256sums = 25753ed79c12e9635d5ef8cb3f1ec380998f5ccaec37818b056b0541c9cd4c9f
 	sha256sums = 828b4f8f6901e757de8cce76473caa1064b2db1375330eee370b0eff79909e9a
 
 pkgname = toppler-git
diff --git a/PKGBUILD b/PKGBUILD
index 880983da23c0..15af58b971a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=toppler
 pkgname="${_pkgname}-git"
 pkgver=1.3+8+r542.20220323.c8bf02b
-pkgrel=1
+pkgrel=2
 pkgdesc='A reimplementation of the classic jump & run game "Nebulus"'
 arch=('i686' 'x86_64')
 url="https://gitlab.com/roever/toppler/"
@@ -19,17 +19,25 @@ conflicts=("${_pkgname}")
 replaces=("${_pkgname}-darcs")
 source=(
   "${_pkgname}::git+https://gitlab.com/roever/toppler.git"
+  "fix-for-gcc14.patch"
   "${_pkgname}.desktop"
 )
 
 sha256sums=(
-  'SKIP'
-  '828b4f8f6901e757de8cce76473caa1064b2db1375330eee370b0eff79909e9a'
+  'SKIP'                                                              # Upstream git source
+  '25753ed79c12e9635d5ef8cb3f1ec380998f5ccaec37818b056b0541c9cd4c9f'  # fix-for-gcc14.patch
+  '828b4f8f6901e757de8cce76473caa1064b2db1375330eee370b0eff79909e9a'  # ${_pkgname}.desktop
+
 )
 
 prepare() {
   cd "${srcdir}/${_pkgname}"
 
+  for _patch in "${srcdir}"/fix-for-gcc14.patch; do
+    printf "   > Applying patch $(basename "${_patch}") ..."
+    patch -Np1 --follow-symlinks -i "${_patch}"
+  done
+
   git log > git.log
 }
 
diff --git a/fix-for-gcc14.patch b/fix-for-gcc14.patch
new file mode 100644
index 000000000000..be0a26687aa6
--- /dev/null
+++ b/fix-for-gcc14.patch
@@ -0,0 +1,15 @@
+diff -rU1 toppler.orig/src/decl.cc toppler/src/decl.cc
+--- toppler.orig/src/decl.cc	2024-05-22 14:48:10.274030769 +0200
++++ toppler/src/decl.cc	2024-05-22 14:51:58.627373253 +0200
+@@ -23,2 +23,3 @@
+ 
++#include <algorithm>
+ #include <cstdlib>
+diff -rU1 toppler.orig/src/level.cc toppler/src/level.cc
+--- toppler.orig/src/level.cc	2024-05-22 14:48:10.274030769 +0200
++++ toppler/src/level.cc	2024-05-22 14:53:17.674043103 +0200
+@@ -18,2 +18,4 @@
+ 
++#include <algorithm>
++
+ #ifndef CREATOR