summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorPier Luigi Fiorini2018-12-25 05:28:10 +0100
committerPier Luigi Fiorini2018-12-25 05:28:10 +0100
commit3dbfc5cd22afbaf8d529d99e71471234751ff5bd (patch)
tree22fb0b417d4055eb096005d9e0245d47312523ad
parentead2032d60981664e1f208f438d4e971a9dfc9d7 (diff)
downloadaur-3dbfc5cd22afbaf8d529d99e71471234751ff5bd.tar.gz
Switch to CMake
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD33
2 files changed, 24 insertions, 15 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 46b934d04163..c15820cb030b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Tue Dec 25 04:28:07 UTC 2018
pkgbase = liri-calculator-git
pkgdesc = A cross-platform material design calculator
- pkgver = 20181015.123.6f90e9a
+ pkgver = r133.fe7a193
pkgrel = 1
url = https://liri.io
arch = i686
@@ -10,7 +12,7 @@ pkgbase = liri-calculator-git
groups = liri-git
license = GPL3
makedepends = git
- makedepends = liri-qbs-shared-git
+ makedepends = liri-cmake-shared-git
depends = fluid-git
provides = liri-calculator
conflicts = liri-calculator
diff --git a/PKGBUILD b/PKGBUILD
index 2d3d3901271f..76b4fb8bd6ef 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,14 +1,14 @@
# Maintainer: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
pkgname=liri-calculator-git
-pkgver=20181015.123.6f90e9a
+pkgver=r133.fe7a193
pkgrel=1
pkgdesc="A cross-platform material design calculator"
arch=('i686' 'x86_64' 'armv6h' 'armv7h')
url='https://liri.io'
license=('GPL3')
depends=('fluid-git')
-makedepends=('git' 'liri-qbs-shared-git')
+makedepends=('git' 'liri-cmake-shared-git')
conflicts=('liri-calculator')
replaces=('liri-calculator')
provides=('liri-calculator')
@@ -22,24 +22,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
+ 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
}