summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorSpike292019-06-19 18:54:23 +0200
committerSpike292019-06-19 18:54:23 +0200
commita810c702be9d3ec529b6bd40c9cedd2ad9fb75c7 (patch)
treebcd4c51feae5caa7348045e0eef79f5b239b61cf
parent7019e28c679f661ba9eff7dc61ace4a9cfbe1424 (diff)
downloadaur-a810c702be9d3ec529b6bd40c9cedd2ad9fb75c7.tar.gz
Remove the second cmake configure step, as it is no longer needed
Also, remove the last part of the PKGBUILD about fixing enginepaths, as the files in question no longer exist. It is possible to fix the paths from the NetRadiant preferences anyway.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD18
2 files changed, 2 insertions, 18 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f4487ee98665..ab1045178bbe 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) - git version
- pkgver = r1838.92e4e444
+ pkgver = r1875.9cd54a17
pkgrel = 1
epoch = 1
url = https://gitlab.com/xonotic/netradiant
diff --git a/PKGBUILD b/PKGBUILD
index d5cb6d671b35..85d8f7775f16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: J0k3r <moebius282 at gmail dot com>
pkgname=netradiant-git
-pkgver=r1838.92e4e444
+pkgver=r1875.9cd54a17
pkgrel=1
epoch=1
pkgdesc='The open source, cross platform level editor for idtech games (GTKRadiant fork) - git version'
@@ -39,9 +39,6 @@ build() {
-DGAMEPACKS_NAME_LIST=none
cmake --build build -- -j$(nproc)
-
- # This step is needed again for CMake to detect the gamepacks it has to install
- cmake -H. -Bbuild
}
package() {
@@ -53,17 +50,4 @@ package() {
# Map mime type doesn't work and produces a pacman warning
rm -r ${pkgdir}/usr/share/mime/
-
- # Fix (some of) the included gamepacks so they work with the official
- # Archlinux packages. Normally we would do this in prepare(), but this
- # is not an viable option, as the Makefile initiates the download and
- # update of the gamepacks. So we would need to call the referenced
- # download script ourselves in prepare() and modify the Makefile so it
- # doesn't try to do it in build() too. Not worth it. Don't forget to
- # comment the lines for the gamepacks that you don't use, otherwise
- # the sed command will fail.
-
- sed -i -e '/enginepath_linux/c\ enginepath_linux="/usr/share/nexuiz/"' "${pkgdir}/usr/share/netradiant/games/nexuiz.game"
- sed -i -e '/enginepath_linux/c\ enginepath_linux="/opt/warsow/"' "${pkgdir}/usr/share/netradiant/games/warsow.game"
- sed -i -e '/enginepath_linux/c\ enginepath_linux="/usr/share/xonotic/"' "${pkgdir}/usr/share/netradiant/games/xonotic.game"
}