From e07c6f9648d478943b5ecd6f1c42cc91cae0f547 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Dec 2024 02:01:58 +0000 Subject: gentoo auto-resync : 16:12:2024 - 02:01:58 --- kde-apps/Manifest.gz | Bin 36358 -> 36357 bytes kde-apps/marble/Manifest | 4 +- ...-cmake-behaim-marble-maps-kf6-conditional.patch | 29 +++++++ .../marble-24.12.0-cmake-drop-qt_policy.patch | 69 +++++++++++++++ kde-apps/marble/marble-24.12.0-r1.ebuild | 96 +++++++++++++++++++++ kde-apps/marble/marble-24.12.0.ebuild | 89 ------------------- 6 files changed, 197 insertions(+), 90 deletions(-) create mode 100644 kde-apps/marble/files/marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch create mode 100644 kde-apps/marble/files/marble-24.12.0-cmake-drop-qt_policy.patch create mode 100644 kde-apps/marble/marble-24.12.0-r1.ebuild delete mode 100644 kde-apps/marble/marble-24.12.0.ebuild (limited to 'kde-apps') diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz index 6c9270499d73..11f1188fbbac 100644 Binary files a/kde-apps/Manifest.gz and b/kde-apps/Manifest.gz differ diff --git a/kde-apps/marble/Manifest b/kde-apps/marble/Manifest index 017f00e309df..9d557f35a745 100644 --- a/kde-apps/marble/Manifest +++ b/kde-apps/marble/Manifest @@ -1,5 +1,7 @@ +AUX marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch 877 BLAKE2B cfd5386a05423f4cd70d246ad9eedbd587e65a9a963edb1220228e38acc39868a6aa7ac95edba353513ef61aa1fd385f0b11a85fa61f5f84a6264aa73a6d2ae1 SHA512 c75bfd78b058d4e85a062673c6f1087135fe06826fb8dd2cb023b5cbe3d8d2cbbb3a144e64c6ba237bab40e7420083e4efac89ee8f2eb0dd49d88e7002725cfc +AUX marble-24.12.0-cmake-drop-qt_policy.patch 2302 BLAKE2B f479e07c8e9340efec34dca67192707afdca2683b2f6646408d25df8e746105bb77f6f0e0fc1634113a95fc396e3e1cc03f4dff5c384c1fb3072f3a360fa2ffb SHA512 28ba6be0484b87e4d4de63e5cba434bb2ff525b84d12a818eeb6a0d140802b146b8a165098817be776f23bcd429d21a14b22b5a4a6222e8e1f48466e64183c4e DIST marble-24.08.3.tar.xz 52449740 BLAKE2B 8d2712b0aad3dd092245d6e3a6a5df5cb883fa0fbfb928e172bb6c43fe6ad5021a663b6f4e08e83666bc10d5dafd8a4e932d60b2b0381e3ae067a7410cde3f4c SHA512 8b39bfe6622c0a8377fdc0dc83b73453f877289717d0b8bada637001da7bf4ead26532c6bc2754647ff680a72b89ed217afdd80d3efb17aa5dda9be786a9d763 DIST marble-24.12.0.tar.xz 53635296 BLAKE2B 96a54ec1d94bb2dbeab24c4d69baa5917a6d729c7992a00b5c0cfae5192a2815c344aa88f26efaa7a4f8c79c2a2682fbbfa94b8cfd2251a409acdac74799ee71 SHA512 196b4fde279bf05f50fc4cce40153d2be47e0d69ef7a7e6eefa97a13d4163fac92748759981f7f76a11014fbeb9c02c363f3c1bd35a9deac88bbff258b457fdd EBUILD marble-24.08.3.ebuild 2792 BLAKE2B 84c9eea800ef9f2376820d2a113b9671e037b1081b0961901eb5762703859f03584c6eb75aab2ba2d1b8dd61da6bcaadc2aeec3a7257667413cc0d81994900d9 SHA512 f61ebb0c97f1086cd2a34530dde22804dc9c7f2c74230ae09b91373b6f033cc42b9be2302c070bcec4102c3cf37af72045350859772969d3059ae3b31deeb7d4 -EBUILD marble-24.12.0.ebuild 2452 BLAKE2B 04d3594fdf22e90a0da7ef0e2b8c4cd4ef1eb36bd06b4cdda8167806d18a00c12169c4cd45a0c43038753d6a84f56966e6cc749fd88e5839982a319cfce7f2f3 SHA512 abc4b3cc0335a1aaf779d17f626e63dbae2cea5e04f01513a716c72c4d4201b794773692bcab05883d3d63286da66eeec51ed80c7902501bc597181bff8f9ecf +EBUILD marble-24.12.0-r1.ebuild 2681 BLAKE2B 43221b6f64b73a1a7a2e45b0b40326077bc367a258762fc61fe3232eb695c2431606578e4e5cef8b1ee3965e4a1992a49032f4ceb293aad8b6d97a1d0d394bc3 SHA512 c348e13869e70bb62a5f19f0851a548f50756a321727ff22d1c893522f5e71fcf03dfef378bd00f425766d866404b67c2459485b731fdad36535017605ba6eb9 MISC metadata.xml 910 BLAKE2B a37a5cc007ea6af8f319dcc827d85bea57ed7cfd6daae76ef19b1f35f89a86df08ecd767f86655c769f86350310c2972be8841e8a594916e33baa8069f462bc6 SHA512 47bc8f365cddd40247b4c4ecdd7932bcd7a833d1c0ff46fe4d9c6722ee063d11bbede81623e8b9a572691330b868c2cdebdd8f1785c95418af6b64c73af0396f diff --git a/kde-apps/marble/files/marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch b/kde-apps/marble/files/marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch new file mode 100644 index 000000000000..3db739a8c82b --- /dev/null +++ b/kde-apps/marble/files/marble-24.12.0-cmake-behaim-marble-maps-kf6-conditional.patch @@ -0,0 +1,29 @@ +From 5a6bf3c71cd017f3e43a74d9ac39efa3921c6d99 Mon Sep 17 00:00:00 2001 +From: Joshua Goins +Date: Sat, 14 Dec 2024 20:18:24 -0500 +Subject: [PATCH] Don't build behaim or marble-maps targets in non-KF builds + +These depend on KDE frameworks, so don't try to build them when don't +have them. +--- + src/apps/CMakeLists.txt | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/apps/CMakeLists.txt b/src/apps/CMakeLists.txt +index 6f9dc25420..013cd3c52f 100644 +--- a/src/apps/CMakeLists.txt ++++ b/src/apps/CMakeLists.txt +@@ -11,6 +11,8 @@ if(BUILD_MARBLE_APPS) + endif() + endif() + +- add_subdirectory(behaim) +- add_subdirectory(marble-maps) ++ if (TARGET KF6::Config AND TARGET KF6::I18n AND TARGET KF6::CoreAddons) ++ add_subdirectory(behaim) ++ add_subdirectory(marble-maps) ++ endif() + endif() +-- +GitLab + diff --git a/kde-apps/marble/files/marble-24.12.0-cmake-drop-qt_policy.patch b/kde-apps/marble/files/marble-24.12.0-cmake-drop-qt_policy.patch new file mode 100644 index 000000000000..71f721043c4d --- /dev/null +++ b/kde-apps/marble/files/marble-24.12.0-cmake-drop-qt_policy.patch @@ -0,0 +1,69 @@ +From 98d2d37dcec8ec8b5b7f4c24c85120ed9468a33a Mon Sep 17 00:00:00 2001 +From: Joshua Goins +Date: Sat, 14 Dec 2024 20:08:44 -0500 +Subject: [PATCH] Remove usage of some Qt CMake usage with ECMQmlModule + +We use this, so we don't need to set qt_policy ourselves or +ecm_add_qml_module. Also fixes non-KF6 builds. +--- + CMakeLists.txt | 2 -- + examples/cpp/marbleQuick2/CMakeLists.txt | 2 +- + src/apps/behaim/CMakeLists.txt | 2 +- + src/apps/marble-maps/CMakeLists.txt | 2 +- + 4 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 0681500d06..f708cacd52 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -110,8 +110,6 @@ set_package_properties(KF6 PROPERTIES + TYPE RECOMMENDED + ) + +-qt_policy(SET QTP0001 NEW) +- + find_package(Protobuf) + set_package_properties(Protobuf PROPERTIES TYPE OPTIONAL PURPOSE "Parsing of OSM PBF files.") + +diff --git a/examples/cpp/marbleQuick2/CMakeLists.txt b/examples/cpp/marbleQuick2/CMakeLists.txt +index c9c3809e85..493684f409 100644 +--- a/examples/cpp/marbleQuick2/CMakeLists.txt ++++ b/examples/cpp/marbleQuick2/CMakeLists.txt +@@ -5,7 +5,7 @@ add_executable(marbleQuick2 main.cpp) + + target_link_libraries(marbleQuick2 PUBLIC Qt::Quick Qt::Widgets) + +-qt_add_qml_module(marbleQuick2 ++ecm_add_qml_module(marbleQuick2 + URI org.kde.marble.quick + QML_FILES + Main.qml +diff --git a/src/apps/behaim/CMakeLists.txt b/src/apps/behaim/CMakeLists.txt +index 8011e0bc52..13219b663a 100644 +--- a/src/apps/behaim/CMakeLists.txt ++++ b/src/apps/behaim/CMakeLists.txt +@@ -19,7 +19,7 @@ if(NOT MARBLE_NO_WEBKITWIDGETS) + add_definitions(-DMARBLE_WEBKITWIDGETS=1) + endif() + +-qt_add_qml_module(marble-behaim ++ecm_add_qml_module(marble-behaim + URI org.kde.marble.behaim + QML_FILES + MainScreen.qml +diff --git a/src/apps/marble-maps/CMakeLists.txt b/src/apps/marble-maps/CMakeLists.txt +index 39f9940322..79a4897304 100644 +--- a/src/apps/marble-maps/CMakeLists.txt ++++ b/src/apps/marble-maps/CMakeLists.txt +@@ -22,7 +22,7 @@ if(NOT ANDROID) + target_link_libraries(marble-maps PUBLIC KF6::Crash) + endif() + +-qt_add_qml_module(marble-maps ++ecm_add_qml_module(marble-maps + URI org.kde.marble.maps + QML_FILES + MainScreen.qml +-- +GitLab + diff --git a/kde-apps/marble/marble-24.12.0-r1.ebuild b/kde-apps/marble/marble-24.12.0-r1.ebuild new file mode 100644 index 000000000000..28c09b6f130a --- /dev/null +++ b/kde-apps/marble/marble-24.12.0-r1.ebuild @@ -0,0 +1,96 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt +ECM_TEST="true" +KFMIN=6.5.0 +QTMIN=6.7.2 +inherit ecm gear.kde.org + +DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" +HOMEPAGE="https://marble.kde.org/" + +LICENSE="GPL-2" # TODO: CHECK +SLOT="6/$(ver_cut 1-2)" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" + +# bug 588320 +RESTRICT="test" + +# FIXME (new package): libwlocate, WLAN-based geolocation +DEPEND=" + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus?,gui,network,sql,widgets,xml] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=dev-qt/qtsvg-${QTMIN}:6 + sys-libs/zlib + aprs? ( >=dev-qt/qtserialport-${QTMIN}:6 ) + designer? ( >=dev-qt/qttools-${QTMIN}:6[designer] ) + geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:6 ) + gps? ( sci-geosciences/gpsd:= ) + kde? ( + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kcrash-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kparts-${KFMIN}:6 + >=kde-frameworks/krunner-${KFMIN}:6 + ) + pbf? ( dev-libs/protobuf:= ) + phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) + shapefile? ( sci-libs/shapelib:= ) + webengine? ( + >=dev-qt/qtwebchannel-${QTMIN}:6 + >=dev-qt/qtwebengine-${QTMIN}:6[widgets] + ) +" +RDEPEND="${DEPEND} + kde? ( + dev-libs/kirigami-addons:6 + >=dev-qt/qt5compat-${QTMIN}:6[qml] + >=kde-frameworks/kirigami-${KFMIN}:6 + ) +" +BDEPEND=" + >=dev-qt/qttools-${QTMIN}:6[linguist] + aprs? ( dev-lang/perl ) +" + +PATCHES=( # bug 946470 + "${FILESDIR}/${P}-cmake-drop-qt_policy.patch" + "${FILESDIR}/${P}-cmake-behaim-marble-maps-kf6-conditional.patch" +) + +src_prepare() { + ecm_src_prepare + + rm -r src/3rdparty/zlib || die "Failed to remove bundled libs" +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package aprs Perl) + $(cmake_use_find_package geolocation Qt6Positioning) + -DBUILD_WITH_DBUS=$(usex dbus) + -DWITH_DESIGNER_PLUGIN=$(usex designer) + -DWITH_libgps=$(usex gps) + $(cmake_use_find_package pbf Protobuf) + -DWITH_Phonon4Qt6=$(usex phonon) + -DWITH_libshp=$(usex shapefile) + $(cmake_use_find_package webengine Qt6WebEngineWidgets) + -DWITH_libwlocate=OFF + # bug 608890 + -DKDE_INSTALL_CONFDIR="/etc/xdg" + ) + # KF6KIO: src/thumbnailer/CMakeLists.txt + # KF6Runner: src/plasmarunner/CMakeLists.txt + for x in CoreAddons I18n Config Crash KIO Parts Runner; do + mycmakeargs+=( $(cmake_use_find_package kde KF6${x}) ) + done + ecm_src_configure +} diff --git a/kde-apps/marble/marble-24.12.0.ebuild b/kde-apps/marble/marble-24.12.0.ebuild deleted file mode 100644 index 346e7374c220..000000000000 --- a/kde-apps/marble/marble-24.12.0.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt -ECM_TEST="forceoptional" -KFMIN=6.5.0 -QTMIN=6.7.2 -inherit ecm gear.kde.org - -DESCRIPTION="Virtual Globe and World Atlas to learn more about Earth" -HOMEPAGE="https://marble.kde.org/" - -LICENSE="GPL-2" # TODO: CHECK -SLOT="6/$(ver_cut 1-2)" -KEYWORDS="~amd64 ~arm64 ~riscv ~x86" -IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile +webengine" - -# bug 588320 -RESTRICT="test" - -# FIXME (new package): libwlocate, WLAN-based geolocation -DEPEND=" - >=dev-qt/qt5compat-${QTMIN}:6 - >=dev-qt/qtbase-${QTMIN}:6[concurrent,dbus?,gui,network,sql,widgets,xml] - >=dev-qt/qtdeclarative-${QTMIN}:6 - >=dev-qt/qtsvg-${QTMIN}:6 - sys-libs/zlib - aprs? ( >=dev-qt/qtserialport-${QTMIN}:6 ) - designer? ( >=dev-qt/qttools-${QTMIN}:6[designer] ) - geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:6 ) - gps? ( sci-geosciences/gpsd:= ) - kde? ( - >=kde-frameworks/kconfig-${KFMIN}:6 - >=kde-frameworks/kconfigwidgets-${KFMIN}:6 - >=kde-frameworks/kcoreaddons-${KFMIN}:6 - >=kde-frameworks/kcrash-${KFMIN}:6 - >=kde-frameworks/ki18n-${KFMIN}:6 - >=kde-frameworks/kio-${KFMIN}:6 - >=kde-frameworks/knewstuff-${KFMIN}:6 - >=kde-frameworks/kparts-${KFMIN}:6 - >=kde-frameworks/krunner-${KFMIN}:6 - >=kde-frameworks/kservice-${KFMIN}:6 - >=kde-frameworks/kwallet-${KFMIN}:6 - ) - pbf? ( dev-libs/protobuf:= ) - phonon? ( >=media-libs/phonon-4.12.0[qt6(+)] ) - shapefile? ( sci-libs/shapelib:= ) - webengine? ( - >=dev-qt/qtwebchannel-${QTMIN}:6 - >=dev-qt/qtwebengine-${QTMIN}:6[widgets] - ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=dev-qt/qttools-${QTMIN}:6[linguist] - aprs? ( dev-lang/perl ) -" - -src_prepare() { - ecm_src_prepare - - rm -rf src/3rdparty/zlib || die "Failed to remove bundled libs" -} - -src_configure() { - local mycmakeargs=( - $(cmake_use_find_package aprs Perl) - $(cmake_use_find_package geolocation Qt6Positioning) - -DBUILD_MARBLE_TESTS=$(usex test) - -DBUILD_WITH_DBUS=$(usex dbus) - -DWITH_DESIGNER_PLUGIN=$(usex designer) - -DWITH_libgps=$(usex gps) - -DWITH_KF6=$(usex kde) - $(cmake_use_find_package pbf Protobuf) - -DWITH_Phonon4Qt6=$(usex phonon) - -DWITH_libshp=$(usex shapefile) - $(cmake_use_find_package webengine Qt6WebEngineWidgets) - -DWITH_libwlocate=OFF - # bug 608890 - -DKDE_INSTALL_CONFDIR="/etc/xdg" - ) - if use kde; then - ecm_src_configure - else - cmake_src_configure - fi -} -- cgit v1.2.3