summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpike292023-05-04 12:00:30 +0200
committerSpike292023-05-04 12:00:30 +0200
commite652cf5112d6e201789c7a04ec1ff6c4a0ad5188 (patch)
treecf8a447af9cd082005ebad33daaccd3f539ecca7
parent4ee0bfcdaa15b7d5f059b4f3df86e521129fa396 (diff)
downloadaur-e652cf5112d6e201789c7a04ec1ff6c4a0ad5188.tar.gz
Add a patch to fix the compilation with gcc 13
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD15
-rw-r--r--build_with_gcc13.diff12
3 files changed, 25 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0f8961e2e381..49d22ff11027 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = netradiant-git
pkgdesc = The open source, cross platform level editor for idtech games (GtkRadiant fork)
- pkgver = r2274.77fe8cf1
+ pkgver = r2536.fa4a5cca
pkgrel = 1
epoch = 1
url = https://netradiant.gitlab.io/
@@ -28,6 +28,8 @@ pkgbase = netradiant-git
provides = h2data
conflicts = netradiant-custom
source = netradiant-git::git+https://gitlab.com/xonotic/netradiant.git
+ source = build_with_gcc13.diff
sha256sums = SKIP
+ sha256sums = cc0b3a6e3a8064c4eb1b9153748869c5177d427c0f9a6d5044c9e9e197a7a71f
pkgname = netradiant-git
diff --git a/PKGBUILD b/PKGBUILD
index e2f24a64220c..32d1ff2f4326 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: J0k3r <moebius282 at gmail dot com>
pkgname=netradiant-git
-pkgver=r2274.77fe8cf1
+pkgver=r2536.fa4a5cca
pkgrel=1
epoch=1
pkgdesc='The open source, cross platform level editor for idtech games (GtkRadiant fork)'
@@ -14,8 +14,10 @@ depends=('gtk2' 'gtkglext' 'minizip' 'libjpeg-turbo' 'libwebp')
makedepends=('git' 'svn' 'wget' 'unzip' 'cmake' 'make')
provides=('netradiant' 'q3map2' 'q3data' 'q2map' 'qdata3' 'h2data')
conflicts=('netradiant-custom')
-source=("${pkgname}::git+https://gitlab.com/xonotic/netradiant.git")
-sha256sums=('SKIP')
+source=("${pkgname}::git+https://gitlab.com/xonotic/netradiant.git"
+ "build_with_gcc13.diff")
+sha256sums=('SKIP'
+ 'cc0b3a6e3a8064c4eb1b9153748869c5177d427c0f9a6d5044c9e9e197a7a71f')
pkgver() {
cd "${srcdir}/${pkgname}/"
@@ -23,8 +25,11 @@ pkgver() {
}
prepare() {
- cd "${srcdir}/${pkgname}/"
- # Fetch the Crunch submodule (it is compiled when present)
+ # Fix compilation with gcc 13
+ patch -d ${srcdir}/${pkgname} -p1 < build_with_gcc13.diff
+
+ cd "${srcdir}/${pkgname}"
+ # Fetch the Crunch submodule
git submodule update --init --recursive
}
diff --git a/build_with_gcc13.diff b/build_with_gcc13.diff
new file mode 100644
index 000000000000..60127e99e2bd
--- /dev/null
+++ b/build_with_gcc13.diff
@@ -0,0 +1,12 @@
+diff --git a/libs/uilib/uilib.h b/libs/uilib/uilib.h
+index d8f41c85..abefc9e5 100644
+--- a/libs/uilib/uilib.h
++++ b/libs/uilib/uilib.h
+@@ -1,6 +1,7 @@
+ #ifndef INCLUDED_UILIB_H
+ #define INCLUDED_UILIB_H
+
++#include <cstdint>
+ #include <string>
+ #include <glib-object.h>
+