diff options
author | Spike29 | 2023-05-05 14:25:37 +0200 |
---|---|---|
committer | Spike29 | 2023-05-05 14:25:37 +0200 |
commit | ec292d38d3e6e2496fa78598201904761fd45762 (patch) | |
tree | cdf9fd4d192506e457fcc6c4e496003fdb0252de | |
parent | e652cf5112d6e201789c7a04ec1ff6c4a0ad5188 (diff) | |
download | aur-ec292d38d3e6e2496fa78598201904761fd45762.tar.gz |
The patch is no longer needed
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 11 | ||||
-rw-r--r-- | build_with_gcc13.diff | 12 |
3 files changed, 4 insertions, 23 deletions
@@ -1,6 +1,6 @@ pkgbase = netradiant-git pkgdesc = The open source, cross platform level editor for idtech games (GtkRadiant fork) - pkgver = r2536.fa4a5cca + pkgver = r2538.9404124f pkgrel = 1 epoch = 1 url = https://netradiant.gitlab.io/ @@ -28,8 +28,6 @@ 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 @@ -3,7 +3,7 @@ # Contributor: J0k3r <moebius282 at gmail dot com> pkgname=netradiant-git -pkgver=r2536.fa4a5cca +pkgver=r2538.9404124f pkgrel=1 epoch=1 pkgdesc='The open source, cross platform level editor for idtech games (GtkRadiant fork)' @@ -14,10 +14,8 @@ 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" - "build_with_gcc13.diff") -sha256sums=('SKIP' - 'cc0b3a6e3a8064c4eb1b9153748869c5177d427c0f9a6d5044c9e9e197a7a71f') +source=("${pkgname}::git+https://gitlab.com/xonotic/netradiant.git") +sha256sums=('SKIP') pkgver() { cd "${srcdir}/${pkgname}/" @@ -25,9 +23,6 @@ pkgver() { } prepare() { - # 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 deleted file mode 100644 index 60127e99e2bd..000000000000 --- a/build_with_gcc13.diff +++ /dev/null @@ -1,12 +0,0 @@ -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> - |