Merged with official ABS marble PKGBUILD

2 files changed, 154 insertions, 137 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 9f3f99d33e5b..9275571a85d8 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,74 +1,79 @@
 pkgbase = marble-git
-	pkgdesc = Desktop Globe. (GIT version)
-	pkgver = 20.12.3.454.g2edf1673f
+	pkgdesc = Desktop Globe
+	pkgver = 24.04.70_r13851.gab23c211a
 	pkgrel = 1
-	url = https://www.kde.org/applications/system/marble
-	arch = i686
+	url = https://github.com/KDE/marble
 	arch = x86_64
-	license = GPL
+	license = GPL-2.0-or-later
 	makedepends = git
-	makedepends = quazip
-	makedepends = shapelib
+	makedepends = extra-cmake-modules-git
+	makedepends = gpsd
+	makedepends = kdoctools5
+	makedepends = knewstuff5
+	makedepends = kparts5
+	makedepends = krunner5
 	makedepends = libwlocate
-	makedepends = phonon-qt5
-	makedepends = extra-cmake-modules
-	makedepends = krunner
-	makedepends = python
-	makedepends = qt5-webengine
-	makedepends = qt5-tools
+	makedepends = phonon-qt5-git
+	makedepends = protobuf
 	makedepends = qt5-serialport
-	makedepends = kparts
-	makedepends = knewstuff
-	makedepends = opencv
-	makedepends = hicolor-icon-theme
-	source = git+https://invent.kde.org/education/marble.git
+	makedepends = qt5-tools
+	makedepends = qt5-webengine
+	makedepends = shapelib
+	makedepends = kirigami2-git
+	provides = marble
+	conflicts = marble
+	source = git+https://github.com/KDE/marble.git
 	sha256sums = SKIP
 
 pkgname = marble-git
-	groups = kde-applications
-	groups = kdeedu
+	groups = kde-applications-git
+	groups = kde-education-git
+	depends = gcc-libs
+	depends = glibc
+	depends = kconfig5
+	depends = kconfigwidgets5
+	depends = kcoreaddons5
+	depends = kcrash5
+	depends = ki18n5
+	depends = kio5
+	depends = kparts5
+	depends = kwidgetsaddons5
+	depends = kxmlgui5
 	depends = marble-common-git
-	depends = gpsd
-	depends = qt5-serialport
-	depends = krunner
-	depends = qt5-webengine
+	depends = qt5-base
+	depends = qt5-declarative
+	optdepends = krunner5: Krunner plugin
+
+pkgname = marble-common-git
+	pkgdesc = Common libraries and plugins for Marble
+	depends = gcc-libs
+	depends = glibc
+	depends = phonon-qt5-git
 	depends = protobuf
-	depends = knewstuff
-	depends = kparts
-	depends = shapelib
-	depends = libwlocate
-	depends = phonon-qt5
+	depends = qt5-base
+	depends = qt5-declarative
 	depends = qt5-location
+	depends = qt5-svg
 	depends = qt5-webchannel
-	depends = gcc-libs
-	provides = marble
-	conflicts = kdeedu-marble<15.04.3-3
-	conflicts = marble-qt
-	conflicts = marble
+	depends = qt5-webengine
+	depends = zlib
+	optdepends = gpsd: GPS based geolocation
+	optdepends = libwlocate: WLAN based geolocation
+	optdepends = qt5-serialport: APRS plugin
+	optdepends = shapelib: SHP plugin
 
-pkgname = libastro-git
-	pkgdesc = Marble astronomy library
+pkgname = marble-maps-git
+	pkgdesc = OpenStreetMap Navigation
 	depends = gcc-libs
-	provides = libastro
-	conflicts = kdeedu-marble<15.07
-	conflicts = marble-qt
-	conflicts = libastro
-
-pkgname = marble-data-git
-	pkgdesc = Data for Marble
-	arch = any
-	depends = hicolor-icon-theme
-	provides = marble-data
-	conflicts = kdeedu-marble<15.07
-	conflicts = marble<15.07.80-3
-	conflicts = marble-qt
-	conflicts = marble-data
+	depends = glibc
+	depends = kirigami2-git
+	depends = marble-common-git
+	depends = qt5-base
+	depends = qt5-declarative
 
-pkgname = marble-common-git
-	pkgdesc = metapackage providing 'marble-common'-dependency
-	arch = any
-	depends = libastro-git
-	depends = marble-git
-	depends = marble-data-git
-	provides = marble-common=20.12.3.454.g2edf1673f
-	conflicts = marble-common
+pkgname = marble-qt-git
+	pkgdesc = Desktop Globe (Qt version)
+	depends = gcc-libs
+	depends = glibc
+	depends = marble-common-git
+	depends = qt5-base
diff --git a/PKGBUILD b/PKGBUILD
index f0fb96e329a8..68a9c8a8b3f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,106 +1,118 @@
+# Merged with official ABS marble PKGBUILD by João, 2024/03/30 (all respective contributors apply herein)
+# Maintainer: João Figueiredo & chaotic-aur <islandc0der@chaotic.cx>
 # Contributor: Gustavo Alvarez <sl1pkn07@gmail.com>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 
 pkgbase=marble-git
-pkgname=('marble-git'
-         'libastro-git'
-         'marble-data-git'
-	 'marble-common-git')
-pkgver=20.12.3.454.g2edf1673f
+pkgname=(marble-git
+         marble-common-git
+         marble-maps-git
+         marble-qt-git)
+pkgver=24.04.70_r13851.gab23c211a
 pkgrel=1
-pkgdesc="Desktop Globe. (GIT version)"
-arch=('i686' 'x86_64')
-url='https://www.kde.org/applications/system/marble'
-license=('GPL')
-makedepends=('git' 'quazip' 'shapelib' 'libwlocate' 'phonon-qt5'
-	     'extra-cmake-modules' 'krunner' 'python' 'qt5-webengine'
-	     'qt5-tools' 'qt5-serialport' 'kparts' 'knewstuff' 'opencv'
-	     'hicolor-icon-theme')
-source=('git+https://invent.kde.org/education/marble.git')
+pkgdesc='Desktop Globe'
+arch=($CARCH)
+url="https://github.com/KDE/${pkgbase%-git}"
+license=(GPL-2.0-or-later)
+makedepends=(git extra-cmake-modules-git gpsd kdoctools5 knewstuff5 kparts5 krunner5 libwlocate phonon-qt5-git protobuf qt5-serialport qt5-tools qt5-webengine shapelib kirigami2-git)
+conflicts=(${pkgbase%-git})
+provides=(${pkgbase%-git})
+source=("git+$url.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd marble
-  git describe --tags | cut -c2- |tr - .
+  cd ${pkgbase%-git}
+  _major_ver="$(grep -m1 'set *(RELEASE_SERVICE_VERSION_MAJOR' CMakeLists.txt | cut -d '"' -f2)"
+  _minor_ver="$(grep -m1 'set *(RELEASE_SERVICE_VERSION_MINOR' CMakeLists.txt | cut -d '"' -f2)"
+  _micro_ver="$(grep -m1 'set *(RELEASE_SERVICE_VERSION_MICRO' CMakeLists.txt | cut -d '"' -f2)"
+  echo "${_major_ver}.${_minor_ver}.${_micro_ver}_r$(git rev-list --count HEAD).g$(git rev-parse --short HEAD)"
 }
 
-prepare() {
-   mkdir -p build
-
-   # only build the KDE app
-   sed -e '/mobile/d' \
-       -e '/kde/d'  \
-       -e '/Quick/d' \
-       -e '/touch/d' \
-       -i marble/src/apps/CMakeLists.txt
- }
-
 build() {
-  cd build
-  LANG=C
-  cmake ../marble \
-    -DCMAKE_BUILD_TYPE=Release \
+  cmake -B build -S ${pkgbase%-git} \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+    -DCMAKE_CXX_STANDARD=17 \
     -DQT_PLUGINS_DIR=lib/qt/plugins \
     -DBUILD_TESTING=OFF \
-    -DCMAKE_CXX_STANDARD=17 \
+    -DBUILD_TOUCH=ON \
     -DBUILD_MARBLE_EXAMPLES=OFF \
-    -DBUILD_MARBLE_TOOLS=ON \
-    -DBUILD_MARBLE_TESTS=ON \
+    -DBUILD_MARBLE_TESTS=OFF \
     -DMOBILE=OFF
-  make
+  cmake --build build
 }
 
-package_libastro-git() {
-  pkgdesc='Marble astronomy library'
-  depends=('gcc-libs')
-  conflicts=('kdeedu-marble<15.07'
- 'marble-qt'
- 'libastro'
- )
-  provides=('libastro')
+package_marble-common-git() {
+  pkgdesc='Common libraries and plugins for Marble'
+  depends=(gcc-libs
+           glibc
+           phonon-qt5-git
+           protobuf
+           qt5-base
+           qt5-declarative
+           qt5-location
+           qt5-svg
+           qt5-webchannel
+           qt5-webengine
+           zlib)
+  optdepends=('gpsd: GPS based geolocation'
+              'libwlocate: WLAN based geolocation'
+              'qt5-serialport: APRS plugin'
+              'shapelib: SHP plugin')
 
-  make -C build/src/lib/astro DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" cmake --install build
+  rm -r "$pkgdir"/usr/share/{config.kcfg,kxmlgui5,metainfo,plasma} \
+        "$pkgdir"/usr/bin \
+        "$pkgdir"/usr/lib/qt/{qml,plugins/*.so,plugins/kf5} \
+        "$pkgdir"/usr/share/applications/{marble_geo.desktop,marble_worldwind.desktop,org.kde.marble*.desktop} \
+        "$pkgdir"/usr/share/kservices5/{plasma-*,marble_part.desktop} \
+        "$pkgdir"/usr/share/locale/*/LC_MESSAGES/*.mo
 }
 
-package_marble-git() {
-  depends=('marble-common-git' 'gpsd' 'qt5-serialport' 'krunner' 'qt5-webengine'
-	   'protobuf' 'knewstuff' 'kparts' 'shapelib' 'libwlocate' 'phonon-qt5'
-	   'qt5-location' 'qt5-webchannel' 'gcc-libs')
-  conflicts=('kdeedu-marble<15.04.3-3' 'marble-qt' 'marble')
-  provides=('marble')
-  groups=('kde-applications' 'kdeedu')
+package_marble-qt-git() {
+  pkgdesc+=' (Qt version)'
+  depends=(gcc-libs
+           glibc
+           marble-common-git
+           qt5-base)
 
-  make -C build DESTDIR="${pkgdir}" install
-
-  # provided by libastro-git
-  rm -fr "${pkgdir}/usr/include/astro"
-  rm -fr "${pkgdir}/usr/lib/"libastro.*
-  rm -fr "${pkgdir}/usr/lib/cmake/Astro"
-
-  # provided by marble-data-git
-  rm -fr "${pkgdir}/usr/share/"{icons,mime,marble}
+  DESTDIR="$pkgdir" cmake --install build/src/apps/marble-qt
 }
 
-package_marble-data-git() {
-  pkgdesc='Data for Marble'
-  arch=('any')
-  depends=('hicolor-icon-theme')
-  conflicts=('kdeedu-marble<15.07'
- 'marble<15.07.80-3'
- 'marble-qt'
- 'marble-data'
- )
-  provides=('marble-data')
+package_marble-git() {
+  depends=(gcc-libs
+           glibc
+           kconfig5
+           kconfigwidgets5
+           kcoreaddons5
+           kcrash5
+           ki18n5
+           kio5
+           kparts5
+           kwidgetsaddons5
+           kxmlgui5
+           marble-common-git
+           qt5-base
+           qt5-declarative)
+  optdepends=('krunner5: Krunner plugin')
+  groups=(kde-applications-git
+          kde-education-git)
 
-  make -C build/data DESTDIR="${pkgdir}" install
+  DESTDIR="$pkgdir" cmake --install build/src/apps/marble-kde
+  DESTDIR="$pkgdir" cmake --install build/src/plasma
+  DESTDIR="$pkgdir" cmake --install build/src/plasmarunner
+  DESTDIR="$pkgdir" cmake --install build/src/thumbnailer
+  rm -r "$pkgdir"/usr/share/{icons,doc}
 }
 
-package_marble-common-git() {
-  pkgdesc="metapackage providing 'marble-common'-dependency"
-  arch=('any')
-  depends=('libastro-git' 'marble-git' 'marble-data-git')
-  conflicts=("marble-common")
-  provides=("marble-common=${pkgver}")
+package_marble-maps-git() {
+  pkgdesc='OpenStreetMap Navigation'
+  depends=(gcc-libs
+           glibc
+           kirigami2-git
+           marble-common-git
+           qt5-base
+           qt5-declarative)
+
+  DESTDIR="$pkgdir" cmake --install build/src/apps/marble-maps
 }