summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Rehfeld2021-02-18 23:06:09 +0100
committerHauke Rehfeld2021-02-18 23:06:09 +0100
commit40fb1ba7cf0b0ebd9170be79a6043381a1663390 (patch)
tree8f0ac4008a8ed683de025e9c7dba4fabdb1272d7
parent73327aa9840663be3c738260d672666756e280eb (diff)
downloadaur-40fb1ba7cf0b0ebd9170be79a6043381a1663390.tar.gz
fix: don't force headless build, remove xorg-server-xvfb makedep
-rw-r--r--.SRCINFO1
-rw-r--r--PKGBUILD7
2 files changed, 5 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d97092bb51d8..76437fc3eec1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -13,7 +13,6 @@ pkgbase = trenchbroom-git
makedepends = ninja
makedepends = qt5-svg
makedepends = libxcb
- makedepends = xorg-server-xvfb
depends = freeimage
depends = freetype2
depends = mesa
diff --git a/PKGBUILD b/PKGBUILD
index 5498065291d7..4b9941af529d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -8,7 +8,7 @@ arch=("i686" "x86_64")
url="http://kristianduske.com/trenchbroom"
license=("GPLv3")
-makedepends=("git" "pandoc" "qt5-base" "cmake" "ninja" "qt5-svg" "libxcb" "xorg-server-xvfb")
+makedepends=("git" "pandoc" "qt5-base" "cmake" "ninja" "qt5-svg" "libxcb")
depends=("freeimage" "freetype2" "mesa" "libgl" "freeglut" "libxxf86vm" "glew" "glm")
conflicts=("trenchbroom")
provides=("trenchbroom")
@@ -35,7 +35,10 @@ build() {
mkdir -p "$_BUILDDIR"
cd "$_BUILDDIR"
cmake "$srcdir/trenchbroom" -DCMAKE_INSTALL_PREFIX:PATH=/usr -DCMAKE_BUILD_TYPE=Release
- QT_QPA_PLATFORM=offscreen cmake --build . --target TrenchBroom
+ # we were running into weird xcb errors, which made this necessary to force headless builds
+ # might be useful incase you ARE building on a headless system
+ #QT_QPA_PLATFORM=offscreen cmake --build . --target TrenchBroom
+ cmake --build . --target TrenchBroom
}
package() {