From c1fa09f3af88bac9b28b6fc3d4f25657288e2788 Mon Sep 17 00:00:00 2001
From: David Ludovino <dllud@riseup.net>
Date: Tue, 12 Jan 2021 16:41:28 +0000
Subject: libre/marble: update marble-common to 20.12.1

Signed-off-by: David Ludovino <dllud@riseup.net>
---
 libre/marble/PKGBUILD | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/libre/marble/PKGBUILD b/libre/marble/PKGBUILD
index 2a829ca94..f6202d3aa 100644
--- a/libre/marble/PKGBUILD
+++ b/libre/marble/PKGBUILD
@@ -6,8 +6,8 @@
 
 pkgbase=marble
 pkgname=(marble-common)
-pkgver=20.04.1
-pkgrel=1
+pkgver=20.12.1
+pkgrel=2
 pkgrel+=.parabola1
 pkgdesc="Desktop Globe"
 arch=(x86_64)
@@ -17,42 +17,35 @@ license=(GPL)
 makedepends=(extra-cmake-modules gpsd kdoctools knewstuff kparts krunner libwlocate phonon-qt5
              plasma-workspace qt5-serialport qt5-tools qt5-webkit shapelib)
 source=("https://download.kde.org/stable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz"{,.sig})
-sha256sums=('28cdf7161e8f3a2f00fd35cc4a384e29e7875c7177c27ff6d5dd8f8f53bcaa67'
+sha256sums=('65c936ceefdd368494778e55a921f9d111e6fabab718b948f3f59ede5f446970'
             'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87) # Christoph Feck <cfeck@kde.org>
 
-prepare() {
-  mkdir -p build
-}
-
 build() {
-  cd build
-  cmake ../$pkgbase-$pkgver \
+  cmake -B build -S $pkgbase-$pkgver \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
     -DQT_PLUGINS_DIR=lib/qt/plugins \
     -DBUILD_TESTING=OFF \
     -DBUILD_MARBLE_EXAMPLES=OFF \
     -DBUILD_MARBLE_TESTS=OFF \
     -DMOBILE=OFF
-  make
+  cmake --build build
 }
 
 package_marble-common() {
   pkgdesc='Common libraries and plugins for Marble'
-  depends=(qt5-svg qt5-webkit phonon-qt5 desktop-file-utils)
+  depends=(qt5-svg qt5-webkit phonon-qt5 protobuf)
   optdepends=('gpsd: GPS based geolocation'
               'libwlocate: WLAN based geolocation'
               'qt5-serialport: APRS plugin'
               'shapelib: SHP plugin')
 
-  cd build
-  make DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" cmake --install build
   rm -rf "$pkgdir"/usr/share/{config.kcfg,kxmlgui5,metainfo,plasma} \
          "$pkgdir"/usr/bin \
-         "$pkgdir"/etc \
+         "$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*} \
-- 
cgit v1.2.3