[arch-commits] Commit in marble/repos/kde-unstable-x86_64 (6 files)
Antonio Rojas
arojas at gemini.archlinux.org
Fri Aug 5 16:48:02 UTC 2022
Date: Friday, August 5, 2022 @ 16:48:01
Author: arojas
Revision: 452172
archrelease: copy kde-unstable to kde-unstable-x86_64
Added:
marble/repos/kde-unstable-x86_64/PKGBUILD
(from rev 452171, marble/kde-unstable/PKGBUILD)
marble/repos/kde-unstable-x86_64/keys/
marble/repos/kde-unstable-x86_64/no-knewstuff.patch
(from rev 452171, marble/kde-unstable/no-knewstuff.patch)
Deleted:
marble/repos/kde-unstable-x86_64/PKGBUILD
marble/repos/kde-unstable-x86_64/keys/
marble/repos/kde-unstable-x86_64/no-knewstuff.patch
--------------------+
PKGBUILD | 170 +++++++++++++++++++++++++--------------------------
no-knewstuff.patch | 104 +++++++++++++++----------------
2 files changed, 137 insertions(+), 137 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-08-05 16:47:46 UTC (rev 452171)
+++ PKGBUILD 2022-08-05 16:48:01 UTC (rev 452172)
@@ -1,85 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-# 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-common marble-qt marble-maps marble)
-pkgver=22.07.80
-pkgrel=1
-pkgdesc='Desktop Globe'
-arch=(x86_64)
-url='https://apps.kde.org/marble/'
-license=(GPL)
-makedepends=(extra-cmake-modules gpsd kdoctools kparts krunner libwlocate phonon-qt5
- plasma-workspace qt5-serialport qt5-tools qt5-webengine shapelib protobuf)
-source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz{,.sig}
- no-knewstuff.patch)
-sha256sums=('932fa7023760ee57f8ac8be22fc6cc159e9203f00735a52e5eaeb05aef6e80a2'
- 'SKIP'
- '4718d89d5f0dc79969196ea7afc71bfd37ed9570c3e2718f0c54549bbb0991a1')
-validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
- F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cfeck at kde.org>
- D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
-options=(debug)
-
-prepare() {
- patch -d $pkgbase-$pkgver -p1 < no-knewstuff.patch # Drop unused dependency
-}
-
-build() {
- cmake -B build -S $pkgbase-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DCMAKE_INSTALL_SYSCONFDIR=/etc \
- -DQT_PLUGINS_DIR=lib/qt/plugins \
- -DBUILD_TESTING=OFF \
- -DBUILD_TOUCH=ON \
- -DBUILD_MARBLE_EXAMPLES=OFF \
- -DBUILD_MARBLE_TESTS=OFF \
- -DMOBILE=OFF
- cmake --build build
-}
-
-package_marble-common() {
- pkgdesc='Common libraries and plugins for Marble'
- depends=(qt5-svg qt5-webengine phonon-qt5 protobuf)
- optdepends=('gpsd: GPS based geolocation'
- 'libwlocate: WLAN based geolocation'
- 'qt5-serialport: APRS plugin'
- 'shapelib: SHP plugin')
-
- 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-qt() {
- pkgdesc+=' (Qt version)'
- depends=(marble-common)
-
- DESTDIR="$pkgdir" cmake --install build/src/apps/marble-qt
-}
-
-package_marble() {
- depends=(marble-common kparts)
- optdepends=('krunner: Krunner plugin')
- groups=(kde-applications kde-education)
-
- 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-maps() {
- pkgdesc='OpenStreetMap Navigation'
- depends=(marble-common kirigami2)
-
- DESTDIR="$pkgdir" cmake --install build/src/apps/marble-maps
-}
Copied: marble/repos/kde-unstable-x86_64/PKGBUILD (from rev 452171, marble/kde-unstable/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-08-05 16:48:01 UTC (rev 452172)
@@ -0,0 +1,85 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+# 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-common marble-qt marble-maps marble)
+pkgver=22.07.90
+pkgrel=1
+pkgdesc='Desktop Globe'
+arch=(x86_64)
+url='https://apps.kde.org/marble/'
+license=(GPL)
+makedepends=(extra-cmake-modules gpsd kdoctools kparts krunner libwlocate phonon-qt5
+ plasma-workspace qt5-serialport qt5-tools qt5-webengine shapelib protobuf)
+source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgbase-$pkgver.tar.xz{,.sig}
+ no-knewstuff.patch)
+sha256sums=('9abcdaae532e6f0649bdc80d3a4ed61b84a1ac0a012e130e8c71094ac9fa6c2b'
+ 'SKIP'
+ '4718d89d5f0dc79969196ea7afc71bfd37ed9570c3e2718f0c54549bbb0991a1')
+validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7 # Albert Astals Cid <aacid at kde.org>
+ F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87 # Christoph Feck <cfeck at kde.org>
+ D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at kde.org>
+options=(debug)
+
+prepare() {
+ patch -d $pkgbase-$pkgver -p1 < no-knewstuff.patch # Drop unused dependency
+}
+
+build() {
+ cmake -B build -S $pkgbase-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_INSTALL_SYSCONFDIR=/etc \
+ -DQT_PLUGINS_DIR=lib/qt/plugins \
+ -DBUILD_TESTING=OFF \
+ -DBUILD_TOUCH=ON \
+ -DBUILD_MARBLE_EXAMPLES=OFF \
+ -DBUILD_MARBLE_TESTS=OFF \
+ -DMOBILE=OFF
+ cmake --build build
+}
+
+package_marble-common() {
+ pkgdesc='Common libraries and plugins for Marble'
+ depends=(qt5-svg qt5-webengine phonon-qt5 protobuf)
+ optdepends=('gpsd: GPS based geolocation'
+ 'libwlocate: WLAN based geolocation'
+ 'qt5-serialport: APRS plugin'
+ 'shapelib: SHP plugin')
+
+ 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-qt() {
+ pkgdesc+=' (Qt version)'
+ depends=(marble-common)
+
+ DESTDIR="$pkgdir" cmake --install build/src/apps/marble-qt
+}
+
+package_marble() {
+ depends=(marble-common kparts)
+ optdepends=('krunner: Krunner plugin')
+ groups=(kde-applications kde-education)
+
+ 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-maps() {
+ pkgdesc='OpenStreetMap Navigation'
+ depends=(marble-common kirigami2)
+
+ DESTDIR="$pkgdir" cmake --install build/src/apps/marble-maps
+}
Deleted: no-knewstuff.patch
===================================================================
--- no-knewstuff.patch 2022-08-05 16:47:46 UTC (rev 452171)
+++ no-knewstuff.patch 2022-08-05 16:48:01 UTC (rev 452172)
@@ -1,52 +0,0 @@
-diff --git a/src/apps/marble-kde/CMakeLists.txt b/src/apps/marble-kde/CMakeLists.txt
-index 8548aac73..e764163ee 100644
---- a/src/apps/marble-kde/CMakeLists.txt
-+++ b/src/apps/marble-kde/CMakeLists.txt
-@@ -2,7 +2,7 @@ if(NOT ECM_FOUND)
- return()
- endif()
-
--macro_optional_find_package(KF5 ${REQUIRED_KF5_MIN_VERSION} QUIET COMPONENTS Crash NewStuff Parts CoreAddons I18n)
-+macro_optional_find_package(KF5 ${REQUIRED_KF5_MIN_VERSION} QUIET COMPONENTS Crash Parts CoreAddons I18n)
-
- if(NOT KF5_FOUND)
- return()
-@@ -22,7 +22,6 @@ set_target_properties(marble_part PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREF
- target_link_libraries(marble_part
- marbleui
- marblewidget
-- KF5::NewStuff
- KF5::Parts
- KF5::CoreAddons
- KF5::I18n
-@@ -31,11 +30,6 @@ target_link_libraries(marble_part
- install(TARGETS marble_part DESTINATION ${KDE_INSTALL_PLUGINDIR})
- install(FILES marble_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
- install(FILES marble_part.rc marbleui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/marble)
--if(KF5NewStuff_VERSION VERSION_GREATER "5.56.0")
-- install(FILES marble.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
--else()
-- install(FILES marble.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
--endif()
-
- ki18n_wrap_ui(marble_kde_SRCS ${marble_UI})
- kconfig_add_kcfg_files(marble_kde_SRCS settings.kcfgc)
-@@ -55,7 +49,6 @@ target_link_libraries (
- marbleui
- marblewidget
- astro
-- KF5::NewStuff
- KF5::Parts
- KF5::Crash
- KF5::CoreAddons
-diff --git a/src/apps/marble-kde/marble.knsrc b/src/apps/marble-kde/marble.knsrc
-deleted file mode 100644
-index b695f4521..000000000
---- a/src/apps/marble-kde/marble.knsrc
-+++ /dev/null
-@@ -1,5 +0,0 @@
--[KNewStuff3]
--ProvidersUrl=http://edu.kde.org/marble/newstuff/providers-4.5.xml
--Categories=Marble Map
--XdgTargetDir=marble/maps
--Uncompress=archive
Copied: marble/repos/kde-unstable-x86_64/no-knewstuff.patch (from rev 452171, marble/kde-unstable/no-knewstuff.patch)
===================================================================
--- no-knewstuff.patch (rev 0)
+++ no-knewstuff.patch 2022-08-05 16:48:01 UTC (rev 452172)
@@ -0,0 +1,52 @@
+diff --git a/src/apps/marble-kde/CMakeLists.txt b/src/apps/marble-kde/CMakeLists.txt
+index 8548aac73..e764163ee 100644
+--- a/src/apps/marble-kde/CMakeLists.txt
++++ b/src/apps/marble-kde/CMakeLists.txt
+@@ -2,7 +2,7 @@ if(NOT ECM_FOUND)
+ return()
+ endif()
+
+-macro_optional_find_package(KF5 ${REQUIRED_KF5_MIN_VERSION} QUIET COMPONENTS Crash NewStuff Parts CoreAddons I18n)
++macro_optional_find_package(KF5 ${REQUIRED_KF5_MIN_VERSION} QUIET COMPONENTS Crash Parts CoreAddons I18n)
+
+ if(NOT KF5_FOUND)
+ return()
+@@ -22,7 +22,6 @@ set_target_properties(marble_part PROPERTIES PREFIX "${CMAKE_SHARED_LIBRARY_PREF
+ target_link_libraries(marble_part
+ marbleui
+ marblewidget
+- KF5::NewStuff
+ KF5::Parts
+ KF5::CoreAddons
+ KF5::I18n
+@@ -31,11 +30,6 @@ target_link_libraries(marble_part
+ install(TARGETS marble_part DESTINATION ${KDE_INSTALL_PLUGINDIR})
+ install(FILES marble_part.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR})
+ install(FILES marble_part.rc marbleui.rc DESTINATION ${KDE_INSTALL_KXMLGUI5DIR}/marble)
+-if(KF5NewStuff_VERSION VERSION_GREATER "5.56.0")
+- install(FILES marble.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR})
+-else()
+- install(FILES marble.knsrc DESTINATION ${KDE_INSTALL_CONFDIR})
+-endif()
+
+ ki18n_wrap_ui(marble_kde_SRCS ${marble_UI})
+ kconfig_add_kcfg_files(marble_kde_SRCS settings.kcfgc)
+@@ -55,7 +49,6 @@ target_link_libraries (
+ marbleui
+ marblewidget
+ astro
+- KF5::NewStuff
+ KF5::Parts
+ KF5::Crash
+ KF5::CoreAddons
+diff --git a/src/apps/marble-kde/marble.knsrc b/src/apps/marble-kde/marble.knsrc
+deleted file mode 100644
+index b695f4521..000000000
+--- a/src/apps/marble-kde/marble.knsrc
++++ /dev/null
+@@ -1,5 +0,0 @@
+-[KNewStuff3]
+-ProvidersUrl=http://edu.kde.org/marble/newstuff/providers-4.5.xml
+-Categories=Marble Map
+-XdgTargetDir=marble/maps
+-Uncompress=archive
More information about the arch-commits
mailing list