Switch to CMake

2 files changed, 27 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 687a3e3a268a..9ec9fb1659d3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Mon Dec 24 13:41:21 UTC 2018
 pkgbase = qml-xwayland-git
 	pkgdesc = XWayland support for QtQuick Wayland compositors
-	pkgver = 20180924.67.8ffd882
+	pkgver = r69.cb7d7a7
 	pkgrel = 1
 	url = https://liri.io
 	arch = i686
@@ -10,7 +12,7 @@ pkgbase = qml-xwayland-git
 	groups = liri-git
 	license = GPL3
 	makedepends = git
-	makedepends = liri-qbs-shared-git
+	makedepends = liri-cmake-shared-git
 	makedepends = xcb-util-cursor
 	makedepends = libxcursor
 	depends = qt5-declarative
diff --git a/PKGBUILD b/PKGBUILD
index 12d399cc9c86..a674400c279e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 
 pkgname=qml-xwayland-git
-pkgver=20180924.67.8ffd882
+pkgver=r69.cb7d7a7
 pkgrel=1
 pkgdesc="XWayland support for QtQuick Wayland compositors"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url='https://liri.io'
 license=('GPL3')
 depends=('qt5-declarative' 'qt5-wayland' 'xorg-server-xwayland')
-makedepends=('git' 'liri-qbs-shared-git' 'xcb-util-cursor' 'libxcursor')
+makedepends=('git' 'liri-cmake-shared-git' 'xcb-util-cursor' 'libxcursor')
 options=(debug !strip)
 conflicts=('qml-xwayland')
 replaces=('qml-xwayland')
@@ -23,21 +23,31 @@ md5sums=('SKIP')
 
 pkgver() {
 	cd ${srcdir}/${_gitname}
-	echo "$(git log -1 --format="%cd" --date=short | tr -d '-').$(git rev-list --count HEAD).$(git log -1 --format="%h")"
+	( set -o pipefail
+		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+	)
+}
+
+prepare() {
+	mkdir -p build
 }
 
 build() {
-	cd ${srcdir}/${_gitname}
-	qbs setup-toolchains --type gcc /usr/bin/g++ gcc
-	qbs setup-qt /usr/bin/qmake-qt5 qt5
-	qbs config profiles.qt5.baseProfile gcc
-	qbs build --no-install -d build profile:qt5 \
-		modules.lirideployment.prefix:/usr \
-		modules.lirideployment.qmlDir:/usr/lib/qt/qml \
-		modules.lirideployment.pluginsDir:/usr/lib/qt/plugins
+	cd build
+	cmake ../${_gitname} \
+		-DCMAKE_BUILD_TYPE=Release \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DBUILD_TESTING:BOOL=OFF \
+		-DINSTALL_SYSCONFDIR=/etc \
+		-DINSTALL_LIBDIR=/usr/lib \
+		-DINSTALL_LIBEXECDIR=/usr/lib \
+		-DINSTALL_QMLDIR=/usr/lib/qt/qml \
+		-DINSTALL_PLUGINSDIR=/usr/lib/qt/plugins
+	make
 }
 
 package() {
-	cd ${srcdir}/${_gitname}
-	qbs install -d build --no-build -v --install-root $pkgdir profile:qt5
+	cd build
+	make DESTDIR="$pkgdir" install
 }