commit: 726f7adb66e7f0c2c4ea05e666730f0971c876b8
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 21 13:57:56 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 21 14:09:22 2024 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=726f7adb
kde-apps/marble: Port to KF6
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
eclass/gear.kde.org.eclass | 1 +
kde-apps/marble/marble-9999.ebuild | 68 +++++++++++++++++---------------------
2 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/eclass/gear.kde.org.eclass b/eclass/gear.kde.org.eclass
index f630c26a7a..b62497e69b 100644
--- a/eclass/gear.kde.org.eclass
+++ b/eclass/gear.kde.org.eclass
@@ -291,6 +291,7 @@ if $(ver_test -gt 24.10.75); then
case ${PN} in
kalzium | \
kwave | \
+ marble | \
minuet | \
step)
RDEPEND+=" !${CATEGORY}/${PN}:5" ;;
diff --git a/kde-apps/marble/marble-9999.ebuild
b/kde-apps/marble/marble-9999.ebuild
index 357ceb040b..6f7db8d670 100644
--- a/kde-apps/marble/marble-9999.ebuild
+++ b/kde-apps/marble/marble-9999.ebuild
@@ -5,15 +5,15 @@ EAPI=8
ECM_HANDBOOK="optional" # see src/apps/marble-kde/CMakeLists.txt
ECM_TEST="forceoptional"
-KFMIN=5.115.0
-QTMIN=5.15.12
+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="5/$(ver_cut 1-2)"
+SLOT="6/$(ver_cut 1-2)"
KEYWORDS=""
IUSE="aprs +dbus designer +geolocation gps +kde +pbf phonon shapefile
+webengine"
@@ -22,45 +22,39 @@ RESTRICT="test"
# FIXME (new package): libwlocate, WLAN-based geolocation
DEPEND="
- >=dev-qt/qtconcurrent-${QTMIN}:5
- >=dev-qt/qtdeclarative-${QTMIN}:5
- >=dev-qt/qtgui-${QTMIN}:5
- >=dev-qt/qtnetwork-${QTMIN}:5
- >=dev-qt/qtprintsupport-${QTMIN}:5
- >=dev-qt/qtsql-${QTMIN}:5
- >=dev-qt/qtsvg-${QTMIN}:5
- >=dev-qt/qtwidgets-${QTMIN}:5
- >=dev-qt/qtxml-${QTMIN}:5
+ >=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}:5 )
- dbus? ( >=dev-qt/qtdbus-${QTMIN}:5 )
- designer? ( >=dev-qt/designer-${QTMIN}:5 )
- geolocation? ( >=dev-qt/qtpositioning-${QTMIN}:5 )
- gps? ( sci-geosciences/gpsd )
+ 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}:5
- >=kde-frameworks/kconfigwidgets-${KFMIN}:5
- >=kde-frameworks/kcoreaddons-${KFMIN}:5
- >=kde-frameworks/kcrash-${KFMIN}:5
- >=kde-frameworks/ki18n-${KFMIN}:5
- >=kde-frameworks/kio-${KFMIN}:5
- >=kde-frameworks/knewstuff-${KFMIN}:5
- >=kde-frameworks/kparts-${KFMIN}:5
- >=kde-frameworks/krunner-${KFMIN}:5
- >=kde-frameworks/kservice-${KFMIN}:5
- >=kde-frameworks/kwallet-${KFMIN}:5
+ >=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[qt5(-)] )
+ phonon? ( >=media-libs/phonon-4.12.0[qt6(-)] )
shapefile? ( sci-libs/shapelib:= )
webengine? (
- >=dev-qt/qtwebchannel-${QTMIN}:5
- >=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+ >=dev-qt/qtwebchannel-${QTMIN}:6
+ >=dev-qt/qtwebengine-${QTMIN}:6[widgets]
)
"
RDEPEND="${DEPEND}"
BDEPEND="
- >=dev-qt/linguist-tools-${QTMIN}:5
+ >=dev-qt/qttools-${QTMIN}:6[linguist]
aprs? ( dev-lang/perl )
"
@@ -75,16 +69,16 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package aprs Perl)
- $(cmake_use_find_package geolocation Qt5Positioning)
+ $(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_KF5=$(usex kde)
+ -DWITH_KF6=$(usex kde)
$(cmake_use_find_package pbf Protobuf)
- -DWITH_Phonon4Qt5=$(usex phonon)
+ -DWITH_Phonon4Qt6=$(usex phonon)
-DWITH_libshp=$(usex shapefile)
- $(cmake_use_find_package webengine Qt5WebEngine)
- $(cmake_use_find_package webengine Qt5WebEngineWidgets)
+ $(cmake_use_find_package webengine Qt6WebEngineWidgets)
-DWITH_libwlocate=OFF
# bug 608890
-DKDE_INSTALL_CONFDIR="/etc/xdg"
