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

[Antonio Rojas]

    Date: Friday, February 17, 2017 @ 23:16:51
  Author: arojas
Revision: 289123

Provide pure Qt version (FS#52990)

Modified:
  marble/trunk/PKGBUILD

----------+
 PKGBUILD |   76 +++++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-02-17 23:00:10 UTC (rev 289122)
+++ PKGBUILD	2017-02-17 23:16:51 UTC (rev 289123)
@@ -3,18 +3,19 @@
 # Maintainer: Felix Yan <felixonmars at archlinux.org>
 # Contributor: Andrea Scarpino <andrea at archlinux.org>
 # Contributor: Gustavo Alvarez <sl1pkn07 at gmail.com>
+# Contributor: Balló György <ballogyor+arch at gmail dot com>
 
 pkgbase=marble
-pkgname=(marble marble-data)
+pkgname=(marble-data marble-common marble-qt marble)
 pkgver=16.12.2
-pkgrel=2
+pkgrel=3
 pkgdesc="Desktop Globe"
 arch=(i686 x86_64)
 url="https://www.kde.org/applications/system/marble"
 license=(GPL)
-makedepends=(extra-cmake-modules gpsd libwlocate phonon-qt5 qt5-webkit krunner
-             kparts knewstuff qt5-tools kdoctools qt5-serialport plasma-workspace)
-source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgname-$pkgver.tar.xz"{,.sig})
+makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner libwlocate phonon-qt5
+             plasma-workspace qt5-serialport qt5-tools qt5-webkit shapelib)
+source=("http://download.kde.org/stable/applications/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
 md5sums=('83bc30b139eca4f4e511e3ea2587dd0d'
          'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7) # Albert Astals Cid <aacid at kde.org>
@@ -21,13 +22,6 @@
 
 prepare() {
   mkdir -p build
-
-  # only build the KDE app
-  sed -e '/mobile/d' \
-      -e '/qt/d'  \
-      -e '/Quick/d' \
-      -e '/touch/d' \
-      -i $pkgname-$pkgver/src/apps/CMakeLists.txt
 }
 
 build() {
@@ -45,28 +39,52 @@
   make
 }
 
-package_marble() {
-  depends=(marble-data qt5-webkit kparts knewstuff)
+package_marble-data() {
+  pkgdesc='Data for Marble'
+  depends=(hicolor-icon-theme)
+  conflicts=(kdeedu-marble)
+
+  cd build
+  make -C doc DESTDIR="$pkgdir" install
+  make -C data DESTDIR="$pkgdir" install
+}
+
+package_marble-common() {
+  pkgdesc='Common libraries and plugins for Marble'
+  depends=(marble-data qt5-svg qt5-webkit phonon-qt5)
   optdepends=('gpsd: GPS based geolocation'
-            'qt5-serialport: APRS plugin'
-            'libwlocate: WLAN based geolocation'
-            'krunner: Krunner plugin')
-  conflicts=('kdeedu-marble<15.04.3-3' marble-qt libastro libmarble4)
-  replaces=(kdeedu-marble 'marble-qt<15.07' libastro)
-  groups=(kde-applications kdeedu)
+              'libwlocate: WLAN based geolocation'
+              'qt5-serialport: APRS plugin'
+              'shapelib: SHP plugin')
+  conflicts=(kdeedu-marble libastro libmarble4)
+  replaces=(libastro)
 
   cd build
-  make DESTDIR="$pkgdir" install
+  make -C src/lib/marble DESTDIR="$pkgdir" install
+  make -C src/lib/astro DESTDIR="$pkgdir" install
+  make -C src/lib/marble/declarative DESTDIR="$pkgdir" install
+  make -C src/plugins DESTDIR="$pkgdir" install
+}
 
-# provided by marble-data
-  rm -r "$pkgdir"/usr/share/{icons,marble/data,mime}
+package_marble-qt() {
+  pkgdesc+=' (Qt version)'
+  depends=(marble-common)
+
+  cd build
+  make -C src/apps/marble-qt DESTDIR="$pkgdir" install
 }
 
-package_marble-data() {
-  pkgdesc='Data for Marble'
-  depends=(hicolor-icon-theme)
-  conflicts=('kdeedu-marble<15.07' 'marble<15.07.80-3' marble-qt)
+package_marble() {
+  depends=(marble-common knewstuff kparts)
+  optdepends=('krunner: Krunner plugin')
+  conflicts=(kdeedu-marble)
+  replaces=(kdeedu-marble)
+  groups=(kde-applications kdeedu)
 
-  cd build/data
-  make DESTDIR="$pkgdir" install
+  cd build
+  make -C src/apps/marble-kde DESTDIR="$pkgdir" install
+  make -C src/plasma DESTDIR="$pkgdir" install
+  make -C src/plasmarunner DESTDIR="$pkgdir" install
+  make -C src/thumbnailer DESTDIR="$pkgdir" install
+  rm -r "$pkgdir"/usr/share/icons
 }