[arch-commits] Commit in fluid/trunk (PKGBUILD)

[Felix Yan]

    Date: Tuesday, March 10, 2020 @ 11:44:42
  Author: felixonmars
Revision: 593520

upgpkg: fluid 1.2.0-1

Modified:
  fluid/trunk/PKGBUILD

----------+
 PKGBUILD |   26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-03-10 11:43:45 UTC (rev 593519)
+++ PKGBUILD	2020-03-10 11:44:42 UTC (rev 593520)
@@ -1,38 +1,34 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=fluid
-pkgver=1.1.0
+pkgver=1.2.0
 pkgrel=1
 pkgdesc="Library for QtQuick apps with Material Design and Universal"
 arch=('x86_64')
 url='https://github.com/lirios/fluid'
 license=('MPL')
-depends=('qt5-graphicaleffects' 'qt5-quickcontrols2' 'qt5-svg')
-makedepends=('liri-qbs-shared' 'nodejs-material-design-icons' 'qt5-tools' 'clang')
+depends=('qt5-graphicaleffects' 'qt5-quickcontrols2' 'qt5-svg' 'qt5-wayland')
+# clang: for qdoc
+makedepends=('liri-cmake-shared' 'nodejs-material-design-icons' 'qt5-tools' 'clang')
 replaces=('qml-material')
 groups=('liri')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/lirios/fluid/archive/v$pkgver.tar.gz")
-sha512sums=('73796930c6273c2fcc89cfe54d1b5cb34a98a3f4af5f564da305efa83e4ef4e451d1244f3b59edaa76a17ef09de066966598f85f67f0dd7442f2ca0e123d55a9')
+sha512sums=('01eae32283e8078baa11a9a2a802ec64cf22f37b2cace8d6ab1a4ac6c8d752ee0fae823cccba586fe0336165a72f66a59be8b613897ded01693b6e38cba8f536')
 
 prepare() {
-  cd fluid-$pkgver
+  cd $pkgname-$pkgver
   ln -s /usr/lib/node_modules/material-design-icons
   sed -e '/git clone/d' -e '/rm -rf/d' -i scripts/fetch_icons.sh
   scripts/fetch_icons.sh
+  mkdir -p build
 }
 
 build() {
-  export QT_VER=5.12
-
-  cd fluid-$pkgver
-  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 $pkgname-$pkgver/build
+  cmake -DCMAKE_INSTALL_PREFIX=/usr -DFLUID_USE_SYSTEM_LCS:BOOL=ON ..
 }
 
 package() {
-  cd fluid-$pkgver
-  qbs install -d build --no-build -v --install-root "$pkgdir" profile:qt5
+  cd $pkgname-$pkgver/build
+  make DESTDIR="$pkgdir" install
 }