From 516f8c0519b9b86537ab73e70ed2b3d5c44716d3 Mon Sep 17 00:00:00 2001
From: bill-auger <mr.j.spam.me@gmail.com>
Date: Thu, 14 Jan 2021 22:31:42 -0500
Subject: housekeeping

---
 libre/marble/PKGBUILD | 38 +++++++++++++++++++++++---------------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'libre/marble/PKGBUILD')

diff --git a/libre/marble/PKGBUILD b/libre/marble/PKGBUILD
index f6202d3aa..f342282d9 100644
--- a/libre/marble/PKGBUILD
+++ b/libre/marble/PKGBUILD
@@ -1,8 +1,14 @@
-# Maintainer (Arch): Antonio Rojas <arojas@archlinux.org>
-# Maintainer (Arch): Felix Yan <felixonmars@archlinux.org>
-# Contributor (Arch): Andrea Scarpino <andrea@archlinux.org>
-# Contributor (Arch): Gustavo Alvarez <sl1pkn07@gmail.com>
-# Contributor (Arch): Balló György <ballogyor+arch at gmail dot com>
+# Maintainer (arch): Antonio Rojas <arojas@archlinux.org>
+# Maintainer (arch): Felix Yan <felixonmars@archlinux.org>
+# Contributor (arch): Andrea Scarpino <andrea@archlinux.org>
+# Contributor (arch): Gustavo Alvarez <sl1pkn07@gmail.com>
+# Contributor (arch): Balló György <ballogyor+arch at gmail dot com>
+# Contributor: bill-auger <bill-auger@programmer.net>
+
+
+# parabola changes and rationale:
+#  - replaced qt5-webengine dependency with qt5-webkit
+
 
 pkgbase=marble
 pkgname=(marble-common)
@@ -11,11 +17,12 @@ pkgrel=2
 pkgrel+=.parabola1
 pkgdesc="Desktop Globe"
 arch=(x86_64)
-arch+=(i686 armv7h)
+arch+=(armv7h i686)
 url="https://www.kde.org/applications/system/marble"
 license=(GPL)
 makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner libwlocate phonon-qt5
-             plasma-workspace qt5-serialport qt5-tools qt5-webkit shapelib)
+             plasma-workspace qt5-serialport qt5-tools qt5-webengine shapelib protobuf)
+makedepends=(${makedepends[@]/qt5-webengine/qt5-webkit})
 source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
 sha256sums=('65c936ceefdd368494778e55a921f9d111e6fabab718b948f3f59ede5f446970'
             'SKIP')
@@ -36,18 +43,19 @@ build() {
 
 package_marble-common() {
   pkgdesc='Common libraries and plugins for Marble'
-  depends=(qt5-svg qt5-webkit phonon-qt5 protobuf)
+  depends=(qt5-svg qt5-webengine phonon-qt5 protobuf)
+  depends=(${depends[@]/qt5-webengine/qt5-webkit})
   optdepends=('gpsd: GPS based geolocation'
               'libwlocate: WLAN based geolocation'
               'qt5-serialport: APRS plugin'
               'shapelib: SHP plugin')
 
   DESTDIR="$pkgdir" cmake --install build
-  rm -rf "$pkgdir"/usr/share/{config.kcfg,kxmlgui5,metainfo,plasma} \
-         "$pkgdir"/usr/bin \
-         "$pkgdir"/usr/share/knsrcfiles \
-         "$pkgdir"/usr/lib/qt/{qml,plugins/*.so} \
-         "$pkgdir"/usr/share/applications/{marble_geo.desktop,marble_worldwind.desktop,org.kde.marble*.desktop} \
-         "$pkgdir"/usr/share/kservices5/{marble_part.desktop,plasma*} \
-         "$pkgdir"/usr/share/locale/*/LC_MESSAGES/*.mo
+  rm -r "$pkgdir"/usr/share/{config.kcfg,kxmlgui5,metainfo,plasma} \
+        "$pkgdir"/usr/bin \
+        "$pkgdir"/usr/share/knsrcfiles \
+        "$pkgdir"/usr/lib/qt/{qml,plugins/*.so} \
+        "$pkgdir"/usr/share/applications/{marble_geo.desktop,marble_worldwind.desktop,org.kde.marble*.desktop} \
+        "$pkgdir"/usr/share/kservices5/{marble_part.desktop,plasma*} \
+        "$pkgdir"/usr/share/locale/*/LC_MESSAGES/*.mo
 }
-- 
cgit v1.2.3