summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorIyán Méndez Veiga2023-09-30 20:52:39 +0200
committerIyán Méndez Veiga2023-09-30 20:52:39 +0200
commitdc074a7b8f352d5d1912adb71fe28ac432447bf1 (patch)
treed5c1b7091c34fe573b2968f1fb37c390db3d092c
parent7e110579115f758ab81a77a7e2a53b166a218cc1 (diff)
downloadaur-openjk-git.tar.gz
upgpkg: openjk-git r3732.26b871955-1
Upstream now includes the patch to compile with gcc 13
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD10
2 files changed, 2 insertions, 12 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2bb212683191..9f83ab68b496 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = openjk-git
pkgdesc = Open Source Jedi Knight II + III Engine
- pkgver = r3722.802c9b1b0
+ pkgver = r3732.26b871955
pkgrel = 1
url = https://github.com/JACoders/OpenJK
arch = x86_64
@@ -14,7 +14,6 @@ pkgbase = openjk-git
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
@@ -22,7 +21,6 @@ pkgbase = openjk-git
source = openja.desktop
source = openjo.desktop
b2sums = SKIP
- b2sums = 5b7fac065e7613065b6ee0c16a891338d8770bf6af5e6c2b00414c867637ae9a43b3cdbd1bac18dbcf94467567a2e894cd2fef83a07b329ef3d9655e86a9c5b4
b2sums = b38394fdd39de7b9cb2dc32322effedfb157c51811d36c9e26c4bc41105a0915669f22e038a8bcfdce3f6226b0abef5eb123bec405eb4a63ea9f064de92639b5
b2sums = 37b0a14fb3951e6c3823f9f3c7ab6c98a7ef8ee9458a6cf8f10c8659b66a14a6d46da8d2c2105d2ccd47065e64c292e42a94a3ebd05b0bc3ed988c90bd322e29
b2sums = eca10a82232e9c0cebf60fa2577f519947cde8091072794a997a54b9c7109cc08d38b0e4119dda0e7ee9340b9b06b540b9e40ec0c7c27ec8868eea9e62d19a8c
diff --git a/PKGBUILD b/PKGBUILD
index 2a4a9f3c79c4..c5bdda06effa 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,9 +3,8 @@
# 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=r3722.802c9b1b0
+pkgver=r3732.26b871955
pkgrel=1
pkgdesc="Open Source Jedi Knight II + III Engine"
arch=("x86_64")
@@ -27,7 +26,6 @@ conflicts=(
)
source=(
"${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'
@@ -37,7 +35,6 @@ source=(
)
b2sums=(
'SKIP'
- '5b7fac065e7613065b6ee0c16a891338d8770bf6af5e6c2b00414c867637ae9a43b3cdbd1bac18dbcf94467567a2e894cd2fef83a07b329ef3d9655e86a9c5b4'
'b38394fdd39de7b9cb2dc32322effedfb157c51811d36c9e26c4bc41105a0915669f22e038a8bcfdce3f6226b0abef5eb123bec405eb4a63ea9f064de92639b5'
'37b0a14fb3951e6c3823f9f3c7ab6c98a7ef8ee9458a6cf8f10c8659b66a14a6d46da8d2c2105d2ccd47065e64c292e42a94a3ebd05b0bc3ed988c90bd322e29'
'eca10a82232e9c0cebf60fa2577f519947cde8091072794a997a54b9c7109cc08d38b0e4119dda0e7ee9340b9b06b540b9e40ec0c7c27ec8868eea9e62d19a8c'
@@ -53,11 +50,6 @@ pkgver() {
"$(git rev-parse --short HEAD)"
}
-prepare() {
- # Fix building error with GCC 13
- patch --directory="$pkgname" --forward --strip=1 --input="${srcdir}/fix-gcc13.patch"
-}
-
build() {
cmake -B build -S "$pkgname" \
-DCMAKE_BUILD_TYPE=Release \