summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD26
2 files changed, 17 insertions, 17 deletions
diff --git a/.SRCINFO b/.SRCINFO
index dec93a5c3c1a..1fba9b265cd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,5 +1,5 @@
# Generated by mksrcinfo v8
-# Mon Jan 30 23:25:56 UTC 2017
+# Sun May 14 19:13:46 UTC 2017
pkgbase = liri-shell-git
pkgdesc = QtQuick and Wayland based shell for convergence
pkgver = 20161016.c2269e8
@@ -12,13 +12,15 @@ pkgbase = liri-shell-git
groups = liri-git
license = GPL3
makedepends = git
- makedepends = extra-cmake-modules
+ makedepends = qbs
depends = qt5-tools
depends = qt5-wayland
depends = qt5-accountsservice-git
+ depends = qt5-gsettings-git
+ depends = libqtxdg
depends = pam
depends = liri-wayland-git
- depends = vibe-git
+ depends = libliri-git
depends = liri-workspace-git
optdepends = weston: nested mode support
provides = liri-shell
diff --git a/PKGBUILD b/PKGBUILD
index daf46c88c50c..503007f8f205 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,10 +7,10 @@ pkgdesc="QtQuick and Wayland based shell for convergence"
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
url='https://liri.io'
license=('GPL3')
-depends=('qt5-tools' 'qt5-wayland' 'qt5-accountsservice-git'
- 'pam' 'liri-wayland-git' 'vibe-git' 'liri-workspace-git')
+depends=('qt5-tools' 'qt5-wayland' 'qt5-accountsservice-git' 'qt5-gsettings-git'
+ 'libqtxdg' 'pam' 'liri-wayland-git' 'libliri-git' 'liri-workspace-git')
optdepends=('weston: nested mode support')
-makedepends=('git' 'extra-cmake-modules')
+makedepends=('git' 'qbs')
conflicts=('hawaii-shell-git' 'papyros-shell-git' 'liri-shell')
replaces=('hawaii-shell-git' 'papyros-shell-git' 'liri-shell')
provides=('liri-shell')
@@ -28,21 +28,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 \
- -DBUILD_HACK=ON
- 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 lirideployment.pluginsDir:lib/qt/plugins
}
package() {
- cd build
- make DESTDIR="${pkgdir}" install
+ cd ${srcdir}/${_gitname}
+ qbs install -d build --no-build -v --install-root $pkgdir/usr profile:qt5
}