summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO17
-rw-r--r--PKGBUILD49
-rw-r--r--trenchbroom.desktop3
3 files changed, 41 insertions, 28 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 48b5fa62a213..19a54730b6d0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,30 @@
-pkgbase = trenchbroom-git
+pkgbase = trenchbroom
pkgdesc = TrenchBroom is a modern cross-platform level editor for Quake-engine based games.
- pkgver = r5067.769b7e04d
- pkgrel = 3
+ pkgver = v2020.1.RC1.r5.ga817c7bb8
+ pkgrel = 1
url = http://kristianduske.com/trenchbroom
arch = i686
arch = x86_64
license = GPLv3
makedepends = git
makedepends = pandoc
+ makedepends = qt5-base
+ makedepends = cmake
+ makedepends = ninja
depends = freeimage
depends = freetype2
- depends = wxgtk2-dev
depends = mesa
depends = libgl
depends = freeglut
depends = libxxf86vm
depends = glew
depends = glm
+ provides = trenchbroom
conflicts = trenchbroom
- source = git://github.com/kduske/TrenchBroom.git
+ source = trenchbroom::git+https://github.com/kduske/TrenchBroom.git#branch=master
+ source = trenchbroom.desktop
sha1sums = SKIP
+ sha1sums = 34e2e1168624a61358c01cecfad170d435952740
-pkgname = trenchbroom-git
+pkgname = trenchbroom
diff --git a/PKGBUILD b/PKGBUILD
index 4b51304ec90d..1eca05919efe 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,35 +1,44 @@
# Maintainer: Cosku Bas <cosku.bas@gmail.com>
-pkgname=trenchbroom-git
-pkgver=r5270.738291588
+pkgname=trenchbroom
+pkgver=v2020.1.RC1.r5.ga817c7bb8
pkgrel=1
pkgdesc="TrenchBroom is a modern cross-platform level editor for Quake-engine based games."
-arch=('i686' 'x86_64')
+arch=("i686" "x86_64")
url="http://kristianduske.com/trenchbroom"
-license=('GPLv3')
+license=("GPLv3")
-makedepends=('git' 'pandoc')
-depends=('freeimage' 'freetype2' 'wxgtk2-dev' 'wxgtk-common-dev' 'mesa' 'libgl' 'freeglut' 'libxxf86vm' 'glew' 'glm')
-conflicts=('trenchbroom')
+makedepends=("git" "pandoc" "qt5-base" "cmake" "ninja")
+depends=("freeimage" "freetype2" "mesa" "libgl" "freeglut" "libxxf86vm" "glew" "glm")
+conflicts=("trenchbroom")
+provides=("trenchbroom")
-source=(git://github.com/kduske/TrenchBroom.git)
-sha1sums=('SKIP')
+source=("trenchbroom::git+https://github.com/kduske/TrenchBroom.git#branch=master"
+ trenchbroom.desktop)
-build() {
- mkdir TrenchBroom/build
- cd TrenchBroom/build
- cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release -DwxWidgets_PREFIX=/usr
- cmake --build . --target TrenchBroom
-}
+sha1sums=('SKIP'
+ '34e2e1168624a61358c01cecfad170d435952740')
pkgver() {
- cd TrenchBroom
- printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+ cd "$pkgname"
+ git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+ cd trenchbroom
+ git submodule update --init --recursive
+}
+
+build() {
+ mkdir trenchbroom/build
+ cd trenchbroom/build
+ cmake .. -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release
+ cmake --build . --target TrenchBroom
}
package() {
- cd TrenchBroom/build
+ cd trenchbroom/build
make DESTDIR=${pkgdir} install
- install -Dm644 "${srcdir}/TrenchBroom/app/resources/linux/trenchbroom.desktop" "${pkgdir}/usr/share/applications/trenchbroom.desktop"
- install -Dm644 "${srcdir}/TrenchBroom/app/resources/linux/icons/icon_256.png" "${pkgdir}/usr/share/pixmaps/trenchbroom.png"
+ install -Dm644 ../../../trenchbroom.desktop "${pkgdir}/usr/share/applications/trenchbroom.desktop"
+ install -Dm644 "${srcdir}/trenchbroom/app/resources/linux/icons/icon_256.png" "${pkgdir}/usr/share/pixmaps/trenchbroom.png"
}
diff --git a/trenchbroom.desktop b/trenchbroom.desktop
index 8a13d3de9d87..4f046973c034 100644
--- a/trenchbroom.desktop
+++ b/trenchbroom.desktop
@@ -1,5 +1,5 @@
[Desktop Entry]
-Exec=/opt/trenchbroom/TrenchBroom
+Exec=env LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/wxgtk2-tb/lib trenchbroom
GenericName=Level Editor
Comment=Level Editor
Icon=trenchbroom
@@ -8,4 +8,3 @@ Terminal=0
Type=Application
Categories=Game
Keywords=quake;level;editor;
-