Accepting request 1243849 from KDE:Applications

KDE release gear 24.12.2 (forwarded request 1243167 from krop)

OBS-URL: https://build.opensuse.org/request/show/1243849
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/marble?expand=0&rev=186

marble-24.08.1.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:7be7d040d18d5cb55f3b39ed2f16f8239c31d5ad124cd1d2bc124ae69c7a4c7c
-size 52448796

marble-24.08.1.tar.xz.sig

@@ -1,16 +0,0 @@
------BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmbf+XcACgkQu0YzUNbv
-Me8mBA/8CQTsjdFwZDFk0QUTM2AoZ2TR6bYLlvzUiOhx6aMRqJBoT0cSOo6xOuQI
-hshTzcQobRxfNh4TK3ZeBcqDYMj0Zup4EPdI3CbM/2nG5yUtEEZI4bgW5LiJDyJa
-OYVFDlFtS2CHlV9UpKxwldPKS4SEMiMjgxthg9QOEn74p0Hd+Gft6oXbxMFdWwWF
-WRvAsDazWQzh2Ul+YgMl339tvKXxc87kaFF6r9rbeRWVfLJPYV/8vsknwg+gVb+B
-+a3aEiSNghv9L5ga1u5D9y9MBNQNJLzRjAR6MEEX/K3faNP38z6VsIONPaM80sp5
-G1iz63OYF7bex9pTmpRKEd5otJaoCMJtdI7vVJhgBqbbUkGn2jOgpm8QAi9hKNFi
-htVVzo/3z5OewOgCxrRrxdcsiQz5gyQiUO8oxxfK12gI4p5/XFOoo5Bu759cNeMS
-SiIbjHutExJzuIn6LHeK6HnBJ1HL1YW0WW1/KkmHnYjeGAKkkmE61dTtxXCDbSp9
-3fqyyth/io5EVd2QGtOz/tsJIrZrljrTC8fOxfSK5GfQXpWeHYCr8bPiQlyR/2gw
-ZvWkjyOTjea6djQPvk5UEn9ENHO3KK5e13uHQBC4UNtyJpKd2m8+1YatWbyx/Hnm
-ODCCkj+N1kJWfHKgQhdMIq2WbR7dOUNcADIgx6eRGn/VDUw9V7I=
-=gvGw
------END PGP SIGNATURE-----

marble-24.12.2.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:83d0a459dc87a7ac0e421c4b5e634f14b8d513a1f93fa8ff1bb43cdc87b8db9f
+size 53627908

marble-24.12.2.tar.xz.sig

@@ -0,0 +1,16 @@
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEE2BwMs463Je9mkcOFu0YzUNbvMe8FAmehvfsACgkQu0YzUNbv
+Me8NYA//Uk4Hm5Zd4cQDfXAqeUgIIJwxFpJ6wMMg6ru08aWahAMuIzTgU6EZUh8q
+9Tqj0DUnHHKtYeGDHYbFCxK/Jmcw0sV0Yx3W1Pqhb5r7Giet4stpNqToHP/DnJzm
+faLEqwEhNVS8KopJPPxpV4WHkRrZQw+B5SrI5E35WdGdkSWNoK041OwSc7+P6umO
+4rc8FJzrSQbm7uHRywnfpXTg8010iT/shsFUvRPiCn9ZSwU/1ib2V5KwomV7s43Q
+FIzRk9A1zcl3nzrtHZMGKLRZ22D7d022SPYyjB2b/UUGPjg/GbS0HJTyZi1sATEo
+gBatUIR+wzeHLUlvaF7VhFsu+QXFI/Ku29TLsuZk34aKCbgHAdr4JmAMFC4F0rB0
+RodSJGXKkqb6I6CrmImAbiX+/zYcTIGQMT61i5zlUT0Ompl2i+/FXOEU2yS31cw9
+gn/3zlidfyvBIKcDyDawzAhgfBi0CMrCryjcXNtVdsyDG7t/rZoKVVjiPCj0n6oB
+cenPKR2yjuQ/02zfflUo7eQ6w2vfKCXt+b1JT1udL57ZlPMHufVzfawNjlbg2do0
+++tGvjisLwT2Y7ha2NmXbV1DcRoFmBKhS4nFlqG7KeErIeLwR3R9HnD5M16+i698
+tAWYlF46W18vCRqyT+CWnnx688cD2RCOZ/kVU8NpKWrs+2l/h/8=
+=FFPi
+-----END PGP SIGNATURE-----

marble.changes

@@ -1,3 +1,68 @@
+-------------------------------------------------------------------
+Tue Feb  4 12:30:14 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.12.2
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.12.2/
+- No code change since 24.12.1
+
+-------------------------------------------------------------------
+Tue Jan  7 18:53:53 UTC 2025 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.12.1
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.12.1/
+- Changes since 24.12.0:
+  * Fix translation for Marble Maps
+  * Remove usage of some Qt CMake usage with ECMQmlModule
+  * Don't build behaim or marble-maps targets in non-KF builds
+
+-------------------------------------------------------------------
+Sun Dec  8 09:28:26 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.12.0
+  * New feature release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.12.0/
+- No code change since 24.11.90
+
+-------------------------------------------------------------------
+Mon Dec  2 08:43:56 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.11.90
+  * New feature release
+- Changes since 24.11.80:
+  * behaim: fix Exec in desktop file
+
+-------------------------------------------------------------------
+Sat Nov 16 17:30:37 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.11.80
+  * New feature release
+- Too many changes to list here.
+
+-------------------------------------------------------------------
+Tue Nov  5 10:44:10 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.08.3
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.08.3/
+- Changes since 24.08.2:
+  * Add the capability to query the centerLongitude/Latitude inside the MarbleQuickItem.
+
+-------------------------------------------------------------------
+Tue Oct  8 12:02:25 UTC 2024 - Christophe Marin <christophe@krop.fr>
+
+- Update to 24.08.2
+  * New bugfix release
+  * For more details please see:
+  * https://kde.org/announcements/gear/24.08.2/
+- Changes since 24.08.1:
+  * MarbleQuickItem: set background fill color
+
 -------------------------------------------------------------------
 Tue Sep 10 14:11:38 UTC 2024 - Christophe Marin <christophe@krop.fr>
 

marble.spec

@@ -18,9 +18,17 @@
 
 %define _so -28
 %define _so_astro 1
+
+%define kf6_version 6.6.0
+%define qt6_version 6.6.0
+
+%ifarch x86_64 aarch64 riscv64
+%define with_webengine 1
+%endif
+
 %bcond_without released
 Name:           marble
-Version:        24.08.1
+Version:        24.12.2
 Release:        0
 Summary:        Generic map viewer
 # License note: the tools directory contains GPL-3 tools, but they are neither built nor installed by the package
@@ -31,66 +39,62 @@ Source0:        https://download.kde.org/stable/release-service/%{version}/src/%
 Source1:        https://download.kde.org/stable/release-service/%{version}/src/%{name}-%{version}.tar.xz.sig
 Source2:        applications.keyring
 %endif
-BuildRequires:  extra-cmake-modules
 BuildRequires:  fdupes
-%if 0%{?suse_version} == 1500
-BuildRequires:  gcc13-c++
-BuildRequires:  gcc13-PIE
-%endif
-BuildRequires:  libqt5-qtlocation-devel
-BuildRequires:  libshp-devel
+BuildRequires:  kf6-extra-cmake-modules >= %{kf6_version}
 BuildRequires:  perl
 BuildRequires:  pkgconfig
-BuildRequires:  cmake(KF5Config)
-BuildRequires:  cmake(KF5CoreAddons)
-BuildRequires:  cmake(KF5Crash)
-BuildRequires:  cmake(KF5DocTools)
-BuildRequires:  cmake(KF5I18n)
-BuildRequires:  cmake(KF5NewStuff)
-BuildRequires:  cmake(KF5Parts)
-BuildRequires:  cmake(KF5Plasma)
-BuildRequires:  cmake(KF5Runner)
-BuildRequires:  cmake(KF5Service)
-BuildRequires:  cmake(KF5Wallet)
-BuildRequires:  cmake(KF5WindowSystem)
-BuildRequires:  cmake(Phonon4Qt5)
-BuildRequires:  cmake(Qt5Concurrent)
-BuildRequires:  cmake(Qt5Core)
-BuildRequires:  cmake(Qt5DBus)
-BuildRequires:  cmake(Qt5Designer)
-BuildRequires:  cmake(Qt5Network)
-BuildRequires:  cmake(Qt5OpenGL)
-BuildRequires:  cmake(Qt5PrintSupport)
-BuildRequires:  cmake(Qt5Quick)
-BuildRequires:  cmake(Qt5Script)
-BuildRequires:  cmake(Qt5SerialPort)
-BuildRequires:  cmake(Qt5Sql)
-BuildRequires:  cmake(Qt5Svg)
-BuildRequires:  cmake(Qt5Test)
-BuildRequires:  cmake(Qt5Widgets)
-BuildRequires:  cmake(Qt5Xml)
-BuildRequires:  pkgconfig(Qgpsmm)
+BuildRequires:  cmake(KF6Config) >= %{kf6_version}
+BuildRequires:  cmake(KF6CoreAddons) >= %{kf6_version}
+BuildRequires:  cmake(KF6Crash) >= %{kf6_version}
+BuildRequires:  cmake(KF6DocTools) >= %{kf6_version}
+BuildRequires:  cmake(KF6I18n) >= %{kf6_version}
+BuildRequires:  cmake(KF6KIO) >= %{kf6_version}
+BuildRequires:  cmake(KF6Parts) >= %{kf6_version}
+BuildRequires:  cmake(KF6Runner) >= %{kf6_version}
+BuildRequires:  cmake(Phonon4Qt6)
+BuildRequires:  cmake(Plasma) >= 6.0.0
+BuildRequires:  cmake(Qt6Concurrent) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Core) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Core5Compat) >= %{qt6_version}
+BuildRequires:  cmake(Qt6DBus) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Designer) >= %{qt6_version}
+BuildRequires:  cmake(Qt6LinguistTools) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Network) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Positioning) >= %{qt6_version}
+BuildRequires:  cmake(Qt6PrintSupport) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Quick) >= %{qt6_version}
+BuildRequires:  cmake(Qt6SerialPort) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Sql) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Svg) >= %{qt6_version}
+BuildRequires:  cmake(Qt6SvgWidgets) >= %{qt6_version}
+BuildRequires:  cmake(Qt6WebChannel) >= %{qt6_version}
+%if 0%{?with_webengine}
+# Only include WebEngine on platforms where it is available
+BuildRequires:  cmake(Qt6WebEngineQuick) >= %{qt6_version}
+BuildRequires:  cmake(Qt6WebEngineWidgets) >= %{qt6_version}
+%endif
+BuildRequires:  cmake(Qt6Widgets) >= %{qt6_version}
+BuildRequires:  cmake(Qt6Xml) >= %{qt6_version}
+BuildRequires:  cmake(absl)
 BuildRequires:  pkgconfig(libgps)
 BuildRequires:  pkgconfig(protobuf)
-Requires:       %{name}-data = %{version}
+BuildRequires:  pkgconfig(Qgpsmm)
+BuildRequires:  pkgconfig(shapelib)
+BuildRequires:  pkgconfig(zlib)
 Requires:       libastro%{_so_astro} = %{version}
-Requires:       libmarblewidget-qt5%{_so} = %{version}
+Requires:       libmarblewidget-qt6%{_so} = %{version}
+Requires:       marble-data = %{version}
 Requires:       marble-frontend = %{version}
-Recommends:     %{name}-doc = %{version}
+Recommends:     marble-doc = %{version}
 Obsoletes:      marble5 < %{version}
 Provides:       marble5 < %{version}
-%ifarch %{ix86} x86_64 %{x86_64} %{arm} aarch64
-# Only include WebEngine on platforms where it is available
-BuildRequires:  cmake(Qt5WebEngineWidgets)
-%endif
-
 
 %description
 Marble is a viewer of map data.
 
 %package qt
 Summary:        Qt Frontend for Marble
-Requires:       %{name} = %{version}
+Requires:       marble = %{version}
 Conflicts:      marble-frontend
 Provides:       marble-frontend = %{version}
 
@@ -99,8 +103,8 @@ The Qt frontend for the Marble map viewer
 
 %package kde
 Summary:        The KDE optimized frontend for Marble and several Plasmoids/Wallpapers
-Requires:       %{name} = %{version}
-Supplements:    (marble and plasma5-desktop)
+Requires:       marble = %{version}
+Supplements:    (marble and plasma6-desktop)
 Conflicts:      marble-frontend
 Provides:       marble-frontend = %{version}
 
@@ -109,7 +113,7 @@ The KDE frontend for the Marble map viewer. It also includes several plasmoids a
 
 %package data
 Summary:        Generic map viewer: data
-Requires:       %{name} = %{version}
+Requires:       marble = %{version}
 Obsoletes:      marble5-data < %{version}
 Provides:       marble5-data < %{version}
 BuildArch:      noarch
@@ -120,21 +124,22 @@ Marble is a viewer of map data. This package contains its data.
 %package devel
 Summary:        Generic map viewer: Build Environment
 Requires:       libastro%{_so_astro} = %{version}
-Requires:       libmarblewidget-qt5%{_so} = %{version}
-Requires:       cmake(Qt5Widgets)
-Requires:       cmake(Qt5Xml)
+Requires:       libmarblewidget-qt6%{_so} = %{version}
+Requires:       cmake(Qt6Core5Compat) >= %{qt6_version}
+%if 0%{?with_webengine}
+Requires:       cmake(Qt6WebEngineWidgets) >= %{qt6_version}
+%endif
+Requires:       cmake(Qt6Widgets) >= %{qt6_version}
+Requires:       cmake(Qt6Xml) >= %{qt6_version}
 Obsoletes:      marble5-devel < %{version}
 Provides:       marble5-devel = %{version}
-%ifarch %{ix86} x86_64 %{x86_64} %{arm} aarch64
-Requires:       cmake(Qt5WebEngineWidgets)
-%endif
 
 %description devel
 Development headers and libraries for Marble.
 
 %package doc
 Summary:        Marble documentation
-Requires:       %{name} = %{version}
+Requires:       marble = %{version}
 Obsoletes:      marble5-doc < %{version}
 Provides:       marble5-doc = %{version}
 BuildArch:      noarch
@@ -142,15 +147,15 @@ BuildArch:      noarch
 %description doc
 Marble is a viewer of map data. This package contains its documentation.
 
-%package -n libmarblewidget-qt5%{_so}
+%package -n libmarblewidget-qt6%{_so}
 Summary:        Generic map viewer: Shared Library
 
-%description -n libmarblewidget-qt5%{_so}
+%description -n libmarblewidget-qt6%{_so}
 The shared library for the MarbleWidget shared library.
 
 %package -n libastro%{_so_astro}
 Summary:        Astronomy: Shared Library
-Requires:       libmarblewidget-qt5%{_so}
+Requires:       libmarblewidget-qt6%{_so}
 Obsoletes:      libastro-qt5-%{_so_astro} < %{version}
 Provides:       libastro-qt5-%{_so_astro} = %{version}
 
@@ -164,92 +169,99 @@ The astronomy library for the satellites plugin.
 
 %build
 export SUSE_ASNEEDED=0
-%if 0%{?suse_version} == 1500
-  export CXX=g++-13
-%endif
 
 %ifarch ppc ppc64
   export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %endif
 
-%cmake_kf5 -d build -- -DBUILD_MARBLE_TESTS=NO -DMOBILE=OFF -DQT_PLUGINS_DIR=%{_kf5_plugindir}
-%cmake_build
+%cmake_kf6 \
+  -DMOBILE:BOOL=FALSE \
+  -DQT_PLUGINS_DIR:STRING=%{_kf6_plugindir} \
+  -DBUILD_QT_AND_KDE:BOOL=TRUE
+
+%kf6_build
 
 %install
-%kf5_makeinstall -C build
+%kf6_install
 
-%find_lang %{name} --with-man --all-name --with-qt
-%{kf5_find_htmldocs}
+%find_lang %{name} --with-html --all-name --with-qt
 
 %fdupes %{buildroot}
 
-%ldconfig_scriptlets -n libmarblewidget-qt5%{_so}
+%ldconfig_scriptlets -n libmarblewidget-qt6%{_so}
 %ldconfig_scriptlets -n libastro%{_so_astro}
 
 %files
 %license COPYING* LICENSE*
 %doc CREDITS ChangeLog MANIFESTO.txt
-%exclude %{_datadir}/marble/data
-%dir %{_kf5_plugindir}/kf5/
-%dir %{_kf5_plugindir}/kf5/krunner/
-%{_kf5_applicationsdir}/marble_geo.desktop
-%{_kf5_applicationsdir}/marble_geojson.desktop
-%{_kf5_applicationsdir}/marble_gpx.desktop
-%{_kf5_applicationsdir}/marble_kml.desktop
-%{_kf5_applicationsdir}/marble_kmz.desktop
-%{_kf5_applicationsdir}/marble_shp.desktop
-%{_kf5_applicationsdir}/marble_worldwind.desktop
-%{_kf5_appstreamdir}/org.kde.marble.appdata.xml
-%{_kf5_appstreamdir}/org.kde.plasma.worldclock.appdata.xml
-%{_kf5_appstreamdir}/org.kde.plasma.worldmap.appdata.xml
-%{_kf5_configkcfgdir}/marble.kcfg
-%{_kf5_debugdir}/marble.categories
-%{_kf5_iconsdir}/hicolor/*/apps/marble.*
-%{_kf5_kxmlguidir}/marble/
-%{_kf5_libdir}/libmarbledeclarative.so
-%{_kf5_libdir}/marble/
-%{_kf5_plugindir}/designer/
-%{_kf5_plugindir}/kf5/krunner/plasma_runner_marble.so
-%{_kf5_plugindir}/libmarble*so
-%{_kf5_plugindir}/marblethumbnail.so
-%{_kf5_qmldir}/org/kde/marble/
-%{_kf5_servicesdir}/*desktop
-%{_kf5_sharedir}/marble/
-%{_kf5_sharedir}/mime/packages/geo.xml
+%{_kf6_applicationsdir}/marble_geo.desktop
+%{_kf6_applicationsdir}/marble_geojson.desktop
+%{_kf6_applicationsdir}/marble_gpx.desktop
+%{_kf6_applicationsdir}/marble_kml.desktop
+%{_kf6_applicationsdir}/marble_kmz.desktop
+%{_kf6_applicationsdir}/marble_shp.desktop
+%{_kf6_applicationsdir}/marble_worldwind.desktop
+%{_kf6_appstreamdir}/org.kde.marble.appdata.xml
+%{_kf6_appstreamdir}/org.kde.marble.behaim.appdata.xml
+%{_kf6_appstreamdir}/org.kde.marble.maps.appdata.xml
+%{_kf6_appstreamdir}/org.kde.plasma.worldclock.appdata.xml
+%{_kf6_appstreamdir}/org.kde.plasma.worldmap.appdata.xml
+%{_kf6_configkcfgdir}/marble.kcfg
+%{_kf6_debugdir}/marble.categories
+%{_kf6_iconsdir}/hicolor/*/apps/marble.*
+%{_kf6_iconsdir}/hicolor/scalable/apps/org.kde.marble.{behaim,maps}.svg
+%{_kf6_kxmlguidir}/marble/
+%{_kf6_libdir}/marble/
+%{_kf6_plugindir}/designer/
+%dir %{_kf6_plugindir}/kf6/krunner/
+%{_kf6_plugindir}/kf6/krunner/plasma_runner_marble.so
+%{_kf6_plugindir}/libmarble_part.so
+%{_kf6_plugindir}/marblethumbnail.so
+%{_kf6_qmldir}/org/kde/marble/
+%{_kf6_sharedir}/mime/packages/geo.xml
 
 %files devel
 %doc BUGS CODING
 %{_includedir}/astro/
 %{_includedir}/marble/
-%{_kf5_cmakedir}/Astro/
-%{_kf5_cmakedir}/Marble/
-%{_kf5_libdir}/libastro.so
-%{_kf5_libdir}/libmarblewidget-qt5.so
-%{_kf5_mkspecsdir}/qt_Marble.pri
+%{_kf6_cmakedir}/Astro/
+%{_kf6_cmakedir}/Marble/
+%{_kf6_libdir}/libastro.so
+%{_kf6_libdir}/libmarblewidget-qt6.so
+%{_kf6_mkspecsdir}/qt_Marble.pri
 
 %files data
-%{_datadir}/marble/data
+%dir %{_kf6_sharedir}/marble
+%{_kf6_sharedir}/marble/data/
 
 %files doc
-%doc %lang(en) %{_kf5_htmldir}/en/marble/
+%doc %lang(en) %{_kf6_htmldir}/en/marble/
 
-%files -n libmarblewidget-qt5%{_so}
-%{_kf5_libdir}/libmarblewidget-qt5.so.*
+%files -n libmarblewidget-qt6%{_so}
+%{_kf6_libdir}/libmarblewidget-qt6.so.*
 
 %files -n libastro%{_so_astro}
-%{_kf5_libdir}/libastro.so.*
+%{_kf6_libdir}/libastro.so.*
 
 %files qt
-%{_kf5_applicationsdir}/org.kde.marble-qt.desktop
-%{_kf5_bindir}/marble-qt
+%{_kf6_applicationsdir}/org.kde.marble-qt.desktop
+%{_kf6_bindir}/marble-qt
 
 %files kde
-%{_kf5_applicationsdir}/org.kde.marble.desktop
-%{_kf5_bindir}/marble
-%dir %{_datadir}/plasma
-%{_datadir}/plasma/plasmoids/
-%{_datadir}/plasma/wallpapers/
+%{_kf6_applicationsdir}/marble_thumbnail_kml.desktop
+%{_kf6_applicationsdir}/marble_thumbnail_kmz.desktop
+%{_kf6_applicationsdir}/marble_thumbnail_osm.desktop
+%{_kf6_applicationsdir}/marble_thumbnail_shp.desktop
+%{_kf6_applicationsdir}/org.kde.marble.behaim.desktop
+%{_kf6_applicationsdir}/org.kde.marble.desktop
+%{_kf6_applicationsdir}/org.kde.marble.maps.desktop
+%{_kf6_bindir}/marble
+%{_kf6_bindir}/marble-behaim
+%{_kf6_bindir}/marble-maps
+%{_kf6_plasmadir}/plasmoids/org.kde.plasma.worldclock
+%{_kf6_plasmadir}/wallpapers/
 
 %files lang -f %{name}.lang
+%exclude %{_kf6_htmldir}/en/marble/
 
 %changelog