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

Felix Yan felixonmars at archlinux.org
Thu May 17 08:23:25 UTC 2018


    Date: Thursday, May 17, 2018 @ 08:23:25
  Author: felixonmars
Revision: 323466

upgpkg: fluid 1.0.0-1

Modified:
  fluid/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-17 08:22:57 UTC (rev 323465)
+++ PKGBUILD	2018-05-17 08:23:25 UTC (rev 323466)
@@ -2,39 +2,35 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 
 pkgname=fluid
-pkgver=0.10.0
-pkgrel=2
+pkgver=1.0.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=('extra-cmake-modules' 'nodejs-material-design-icons')
+makedepends=('liri-qbs-shared' 'nodejs-material-design-icons' 'qt5-tools')
 replaces=('qml-material')
+groups=('liri')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/lirios/fluid/archive/v$pkgver.tar.gz")
-sha256sums=('67990122229349f4d36f561ee4a818359480bb88987e03d8bb40523284fc3cd5')
+sha512sums=('a9f59c7d77c40d57bd66370bd5302db583fea58e23b0830eea5e9edd002b41d3f21bdfb17748c1d31916aba15c0d5cf63335dc89ce398105a37d81311810b0b8')
 
 prepare() {
-  mkdir -p build
-
   cd fluid-$pkgver
   ln -s /usr/lib/node_modules/material-design-icons
-  sed -i '/git submodule/d' scripts/fetch_icons.sh
+  sed -e '/git clone/d' -e '/rm -rf/d' -i scripts/fetch_icons.sh
   scripts/fetch_icons.sh
 }
 
 build() {
-  cd build
-  cmake "$srcdir"/fluid-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DKDE_INSTALL_LIBDIR=lib \
-    -DKDE_INSTALL_LIBEXECDIR=lib \
-    -DKDE_INSTALL_QMLDIR=lib/qt/qml \
-    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON
-  make
+  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
 }
 
 package() {
-  cd build
-  make DESTDIR="$pkgdir" install
+  cd fluid-$pkgver
+  qbs install -d build --no-build -v --install-root "$pkgdir" profile:qt5
 }



More information about the arch-commits mailing list