upgpkg: openjk-git fix gcc13 compile error

2 files changed, 78 insertions, 61 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 20237b6487a4..2bb212683191 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,32 +1,33 @@
 pkgbase = openjk-git
 	pkgdesc = Open Source Jedi Knight II + III Engine
-	pkgver = r3661.ec5fa44a8
+	pkgver = r3722.802c9b1b0
 	pkgrel = 1
 	url = https://github.com/JACoders/OpenJK
 	arch = x86_64
 	license = GPL2
 	makedepends = cmake
 	makedepends = git
-	makedepends = libpng
-	depends = sdl2
 	depends = libjpeg
 	depends = libpng
+	depends = sdl2
 	provides = openjk
 	conflicts = openjk
+	conflicts = openjk-bin
 	source = openjk-git::git+https://github.com/JACoders/OpenJK.git
+	source = fix-gcc13.patch::https://github.com/JACoders/OpenJK/pull/1155.patch
 	source = openjkmp.png
 	source = openja.png
 	source = openjo.png
 	source = openjkmp.desktop
 	source = openja.desktop
 	source = openjo.desktop
-	sha256sums = SKIP
-	sha256sums = 3e9d36b3f982cc29fb3e4385ddc46e431be9fa045b32a811346f4254fa8d372c
-	sha256sums = 0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969
-	sha256sums = afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903
-	sha256sums = d3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc
-	sha256sums = 698792f86b75311a5c96d0b1310d97e242107559d341ea23a705f259e20a5ec2
-	sha256sums = 08812c7d1791b86a842401ecc54f29117d3d8b77369ad04db520561d57df41dd
+	b2sums = SKIP
+	b2sums = 5b7fac065e7613065b6ee0c16a891338d8770bf6af5e6c2b00414c867637ae9a43b3cdbd1bac18dbcf94467567a2e894cd2fef83a07b329ef3d9655e86a9c5b4
+	b2sums = b38394fdd39de7b9cb2dc32322effedfb157c51811d36c9e26c4bc41105a0915669f22e038a8bcfdce3f6226b0abef5eb123bec405eb4a63ea9f064de92639b5
+	b2sums = 37b0a14fb3951e6c3823f9f3c7ab6c98a7ef8ee9458a6cf8f10c8659b66a14a6d46da8d2c2105d2ccd47065e64c292e42a94a3ebd05b0bc3ed988c90bd322e29
+	b2sums = eca10a82232e9c0cebf60fa2577f519947cde8091072794a997a54b9c7109cc08d38b0e4119dda0e7ee9340b9b06b540b9e40ec0c7c27ec8868eea9e62d19a8c
+	b2sums = ef77412eb197af5874c61e4b8d6b41629d2715ff8e144fae44a8d03a8e93fb780b8bb4d4f6e81181c7057fe8a6801bb6c17f153cc974e46e94cef8e8e4273399
+	b2sums = 3ad946ceb3f0065e2ec85316c1649bd1f6f96880aa26371c55ce99dc5edecb82995a2db3489b89e6960c0c7479be02baa3e5da32063b71ee1c7b9213de387ba2
+	b2sums = 2a31ef14a1fc662a186779083fa27325fba9500749c42b0475840a59a33841e3c8fd36bad041ffd2d2b9b419fefd1a2a0963b0c25619667c2250edd5acc6da7b
 
 pkgname = openjk-git
-
diff --git a/PKGBUILD b/PKGBUILD
index c79a6f07055a..2a4a9f3c79c4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,85 +1,101 @@
-# Maintainer: Zanny <lordzanny@gmail.com>
+# Maintainer:  Iyán Méndez Veiga <me (at) iyanmv (dot) com>
+# Contributor: Zanny <lordzanny@gmail.com>
 # Contributor: Pavel Lymarev <x-user at bk dot ru>
 # Contributor: Jameson Pugh <imntreal@gmail.com>
 # Contributor: Rene Schoebel (wesley) <schoebel.r at gmail dot com>
 
-pkgname='openjk-git'
-pkgver=r3661.ec5fa44a8
+pkgname=openjk-git
+pkgver=r3722.802c9b1b0
 pkgrel=1
 pkgdesc="Open Source Jedi Knight II + III Engine"
-arch=(x86_64)
+arch=("x86_64")
 url="https://github.com/JACoders/OpenJK"
 license=(GPL2)
-depends=(sdl2 libjpeg libpng)
-makedepends=(cmake git libpng)
-provides=(openjk)
-conflicts=(openjk)
+depends=(
+    "libjpeg"
+    "libpng"
+    "sdl2"
+)
+makedepends=(
+    "cmake"
+    "git"
+)
+provides=("openjk")
+conflicts=(
+    "openjk"
+    "openjk-bin"
+)
 source=(
-  "${pkgname}::git+https://github.com/JACoders/OpenJK.git"
-  'openjkmp.png'
-  'openja.png'
-  'openjo.png'
-  'openjkmp.desktop'
-  'openja.desktop'
-  'openjo.desktop'
+    "${pkgname}::git+https://github.com/JACoders/OpenJK.git"
+    "fix-gcc13.patch::https://github.com/JACoders/OpenJK/pull/1155.patch"
+    'openjkmp.png'
+    'openja.png'
+    'openjo.png'
+    'openjkmp.desktop'
+    'openja.desktop'
+    'openjo.desktop'
 )
-sha256sums=(
-  'SKIP'
-  '3e9d36b3f982cc29fb3e4385ddc46e431be9fa045b32a811346f4254fa8d372c'
-  '0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969'
-  'afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903'
-  'd3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc'
-  '698792f86b75311a5c96d0b1310d97e242107559d341ea23a705f259e20a5ec2'
-  '08812c7d1791b86a842401ecc54f29117d3d8b77369ad04db520561d57df41dd'
+b2sums=(
+    'SKIP'
+    '5b7fac065e7613065b6ee0c16a891338d8770bf6af5e6c2b00414c867637ae9a43b3cdbd1bac18dbcf94467567a2e894cd2fef83a07b329ef3d9655e86a9c5b4'
+    'b38394fdd39de7b9cb2dc32322effedfb157c51811d36c9e26c4bc41105a0915669f22e038a8bcfdce3f6226b0abef5eb123bec405eb4a63ea9f064de92639b5'
+    '37b0a14fb3951e6c3823f9f3c7ab6c98a7ef8ee9458a6cf8f10c8659b66a14a6d46da8d2c2105d2ccd47065e64c292e42a94a3ebd05b0bc3ed988c90bd322e29'
+    'eca10a82232e9c0cebf60fa2577f519947cde8091072794a997a54b9c7109cc08d38b0e4119dda0e7ee9340b9b06b540b9e40ec0c7c27ec8868eea9e62d19a8c'
+    'ef77412eb197af5874c61e4b8d6b41629d2715ff8e144fae44a8d03a8e93fb780b8bb4d4f6e81181c7057fe8a6801bb6c17f153cc974e46e94cef8e8e4273399'
+    '3ad946ceb3f0065e2ec85316c1649bd1f6f96880aa26371c55ce99dc5edecb82995a2db3489b89e6960c0c7479be02baa3e5da32063b71ee1c7b9213de387ba2'
+    '2a31ef14a1fc662a186779083fa27325fba9500749c42b0475840a59a33841e3c8fd36bad041ffd2d2b9b419fefd1a2a0963b0c25619667c2250edd5acc6da7b'
 )
 
 pkgver() {
     cd "$pkgname"
-    
     printf "r%s.%s"                  \
-    "$(git rev-list --count HEAD)"   \
-    "$(git rev-parse --short HEAD)"
+        "$(git rev-list --count HEAD)"   \
+        "$(git rev-parse --short HEAD)"
 }
 
-build() {
+prepare() {
+    # Fix building error with GCC 13
+    patch --directory="$pkgname" --forward --strip=1 --input="${srcdir}/fix-gcc13.patch"
+}
 
-  cmake -B build -S "$pkgname" \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX="/opt/${pkgname/-git}" \
-    -DBuildJK2SPEngine=on \
-    -DBuildJK2SPGame=on \
-    -DBuildJK2SPRdVanilla=on
-  cmake --build build
+build() {
+    cmake -B build -S "$pkgname" \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX="/opt/${pkgname/-git}" \
+        -DBuildJK2SPEngine=on \
+        -DBuildJK2SPGame=on \
+        -DBuildJK2SPRdVanilla=on
+    cmake --build build
 }
 
 package() {
-  DESTDIR="$pkgdir" cmake --install build
+    DESTDIR="$pkgdir" cmake --install build
 
-  _jkarch="${CARCH}"
-  echo "${_jkarch}"
+    _jkarch="${CARCH}"
+    echo "${_jkarch}"
 
-  install -m 755 -d "${pkgdir}/usr/bin"
+    install -m 755 -d "${pkgdir}/usr/bin"
 
-  for _bin in 'openjk' 'openjk_sp' 'openjkded'; do
-    cat > "${pkgdir}/usr/bin/${_bin}" << EOF
+    for _bin in 'openjk' 'openjk_sp' 'openjkded'; do
+        cat > "${pkgdir}/usr/bin/${_bin}" << EOF
 #!/bin/bash
 cd /opt/${pkgname/-git}/JediAcademy
 exec ./${_bin}.${_jkarch} \s@
 EOF
-    chmod +x ${pkgdir}/usr/bin/${_bin}
-  done
+        chmod +x ${pkgdir}/usr/bin/${_bin}
+    done
 
-  cat > "${pkgdir}/usr/bin/openjo" << EOF
+    cat > "${pkgdir}/usr/bin/openjo" << EOF
 #!/bin/bash
 cd /opt/${pkgname/-git}/JediOutcast
 exec ./openjo_sp.${_jkarch} \s@
 EOF
-  chmod +x ${pkgdir}/usr/bin/openjo
+    chmod +x ${pkgdir}/usr/bin/openjo
 
-  install -Dm644 "${srcdir}/openjkmp.png" "${pkgdir}/usr/share/pixmaps/openjkmp.png"
-  install -Dm644 "${srcdir}/openja.png" "${pkgdir}/usr/share/pixmaps/openja.png"
-  install -Dm644 "${srcdir}/openjo.png" "${pkgdir}/usr/share/pixmaps/openjo.png"
-  install -Dm755 "${srcdir}/openjkmp.desktop" "${pkgdir}/usr/share/applications/openjkmp.desktop"
-  install -Dm755 "${srcdir}/openja.desktop" "${pkgdir}/usr/share/applications/openja.desktop"
-  install -Dm755 "${srcdir}/openjo.desktop" "${pkgdir}/usr/share/applications/openjo.desktop"
+    install -Dm644 "${srcdir}/openjkmp.png" "${pkgdir}/usr/share/pixmaps/openjkmp.png"
+    install -Dm644 "${srcdir}/openja.png" "${pkgdir}/usr/share/pixmaps/openja.png"
+    install -Dm644 "${srcdir}/openjo.png" "${pkgdir}/usr/share/pixmaps/openjo.png"
+    install -Dm755 "${srcdir}/openjkmp.desktop" "${pkgdir}/usr/share/applications/openjkmp.desktop"
+    install -Dm755 "${srcdir}/openja.desktop" "${pkgdir}/usr/share/applications/openja.desktop"
+    install -Dm755 "${srcdir}/openjo.desktop" "${pkgdir}/usr/share/applications/openjo.desktop"
 }