Build with qbs

2 files changed, 18 insertions, 27 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 38597cae885c..c9a2e2f64f86 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 # Generated by mksrcinfo v8
-# Sun Jan 29 21:22:59 UTC 2017
+# Sun May 14 15:27:33 UTC 2017
 pkgbase = vibe-git
-	pkgdesc = A collection of core classes used throughout Liri
+	pkgdesc = A collection of QML plugins used throughout Liri
 	pkgver = 20161016.cb539a7
 	pkgrel = 1
 	url = https://liri.io
@@ -12,7 +12,7 @@ pkgbase = vibe-git
 	groups = liri-git
 	license = LGPL3
 	makedepends = git
-	makedepends = extra-cmake-modules
+	makedepends = qbs
 	depends = qt5-base
 	depends = qt5-declarative
 	depends = qt5-tools
@@ -21,18 +21,10 @@ pkgbase = vibe-git
 	depends = networkmanager-qt
 	depends = modemmanager-qt
 	depends = pulseaudio
-	depends = libqtxdg
 	depends = fluid-git
+	depends = libliri-git
 	provides = vibe
-	conflicts = libhawaii
-	conflicts = libhawaii-git
-	conflicts = libpapyros
-	conflicts = libpapyros-git
 	conflicts = vibe
-	replaces = libhawaii
-	replaces = libhawaii-git
-	replaces = libpapyros
-	replaces = libpapyros-git
 	replaces = vibe
 	source = vibe::git://github.com/lirios/vibe.git#branch=develop
 	md5sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index 8fbf0253bc88..187c7c732c07 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,15 +3,15 @@
 pkgname=vibe-git
 pkgver=20161016.cb539a7
 pkgrel=1
-pkgdesc="A collection of core classes used throughout Liri"
+pkgdesc="A collection of QML plugins used throughout Liri"
 arch=('i686' 'x86_64' 'armv6h' 'armv7h')
 url="https://liri.io"
 license=('LGPL3')
 depends=('qt5-base' 'qt5-declarative' 'qt5-tools' 'kwallet' 'solid' 'networkmanager-qt'
-         'modemmanager-qt' 'pulseaudio' 'libqtxdg' 'fluid-git')
-makedepends=('git' 'extra-cmake-modules')
-conflicts=('libhawaii' 'libhawaii-git' 'libpapyros' 'libpapyros-git' 'vibe')
-replaces=('libhawaii' 'libhawaii-git' 'libpapyros' 'libpapyros-git' 'vibe')
+         'modemmanager-qt' 'pulseaudio' 'fluid-git' 'libliri-git')
+makedepends=('git' 'qbs')
+conflicts=('vibe')
+replaces=('vibe')
 provides=('vibe')
 groups=('liri-git')
 
@@ -27,20 +27,19 @@ pkgver() {
 }
 
 prepare() {
-	mkdir -p build
+	cd ${srcdir}/${_gitname}
+	git submodule update --init
 }
 
 build() {
-	cd build
-	cmake ../${_gitname} \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE_INSTALL_LIBDIR=lib \
-		-DKDE_INSTALL_LIBEXECDIR=lib
-	make
+	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 qbs.installRoot:/usr lirideployment.qmlDir:lib/qt/qml
 }
 
 package() {
-	cd build
-	make DESTDIR="${pkgdir}" install
+	cd ${srcdir}/${_gitname}
+	qbs install -d build --no-build -v --install-root $pkgdir/usr profile:qt5
 }