Switch to CMake

2 files changed, 24 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0398d99694c8..29d0957d214a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Tue Dec 25 14:12:18 UTC 2018
 pkgbase = liri-terminal-git
 	pkgdesc = Terminal application and modules for Liri OS
-	pkgver = 20181016.176.4cb236a
+	pkgver = v0.2.0.r46.g15759fc
 	pkgrel = 1
 	url = https://liri.io
 	install = liri-terminal-git.install
@@ -11,7 +13,7 @@ pkgbase = liri-terminal-git
 	groups = liri-git
 	license = GPL3
 	makedepends = git
-	makedepends = liri-qbs-shared-git
+	makedepends = liri-cmake-shared-git
 	depends = qt5-gsettings-git
 	depends = glib2
 	depends = dconf
diff --git a/PKGBUILD b/PKGBUILD
index 0ee4787eae42..1b8462062f71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
 # Maintainer: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
 
 pkgname=liri-terminal-git
-pkgver=20181016.176.4cb236a
+pkgver=v0.2.0.r46.g15759fc
 pkgrel=1
 pkgdesc="Terminal application and modules for Liri OS"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url='https://liri.io'
 license=('GPL3')
 depends=('qt5-gsettings-git' 'glib2' 'dconf')
-makedepends=('git' 'liri-qbs-shared-git')
+makedepends=('git' 'liri-cmake-shared-git')
 conflicts=('hawaii-terminal-git' 'papyros-terminal-git' 'papyros-qmltermwidget-git' 'liri-terminal')
 replaces=('hawaii-terminal-git' 'papyros-terminal-git' 'papyros-qmltermwidget-git' 'liri-terminal')
 options=(debug !strip)
@@ -24,25 +24,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() {
-	cd ${srcdir}/${_gitname}
-	git submodule update --init
+	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
+	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
 }