summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPier Luigi Fiorini2017-04-08 07:09:59 +0200
committerPier Luigi Fiorini2017-04-08 07:09:59 +0200
commit595ba8d782e40ee8d55c6dc1c2f11afeb99927d2 (patch)
tree57add080c75edc844470af276f47fe5efc1345b6
parentb07fede521b540160269573cb8c36b54a38b2975 (diff)
downloadaur-595ba8d782e40ee8d55c6dc1c2f11afeb99927d2.tar.gz
Use qmake
Patch from Andrew Penkrat.
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD15
2 files changed, 10 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 40f6b64d5cfe..249b1c625873 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun Jan 29 21:22:01 UTC 2017
+# Sat Apr 8 05:09:58 UTC 2017
pkgbase = fluid-git
pkgdesc = Components for Qt Quick applications with Material Design and Universal
- pkgver = 20170129.edc9025
+ pkgver = 20170321.59b33b6
pkgrel = 1
url = https://liri.io
arch = i686
@@ -12,7 +12,7 @@ pkgbase = fluid-git
groups = liri-git
license = MPL2
makedepends = git
- makedepends = extra-cmake-modules
+ makedepends = qt5-tools
depends = qt5-quickcontrols2
depends = qt5-graphicaleffects
depends = qt5-svg
diff --git a/PKGBUILD b/PKGBUILD
index 45ee24e4c9b8..ecdea5281484 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
pkgname=fluid-git
-pkgver=20170129.edc9025
+pkgver=20170321.59b33b6
pkgrel=1
pkgdesc="Components for Qt Quick applications with Material Design and Universal"
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
url='https://liri.io'
license=('MPL2')
depends=('qt5-quickcontrols2' 'qt5-graphicaleffects' 'qt5-svg')
-makedepends=('git' 'extra-cmake-modules')
+makedepends=('git' 'qt5-tools')
conflicts=('fluid')
replaces=('fluid')
provides=('fluid')
@@ -34,15 +34,14 @@ prepare() {
build() {
cd build
- cmake ../${_gitname} \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_BUILD_TYPE=Release \
- -DKDE_INSTALL_LIBDIR=lib \
- -DKDE_INSTALL_LIBEXECDIR=lib
+ qmake \
+ CONFIG+=use_qt_paths \
+ CONFIG-=create_prl \
+ ../${_gitname}
make
}
package() {
cd build
- make DESTDIR="${pkgdir}" install
+ make INSTALL_ROOT="${pkgdir}" install
}