6 files changed, 194 insertions, 58 deletions

diff --git a/astro/kosmindoormap/Makefile b/astro/kosmindoormap/Makefile
index 20205b0b7f69..a964d2a5ab4e 100644
--- a/astro/kosmindoormap/Makefile
+++ b/astro/kosmindoormap/Makefile
@@ -1,19 +1,18 @@
 PORTNAME=	kosmindoormap
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	7
 CATEGORIES=	astro kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Library and QML component for rendering multi-level OSM indoor maps
 WWW=		https://marble.kde.org/
 
-LIB_DEPENDS=	libprotobuf.so:devel/protobuf
+LIB_DEPENDS=	libprotobuf.so:devel/protobuf \
+		libKOpeningHours.so:devel/kopeninghours
 
-USES=		bison cmake compiler:c++11-lang kde:5 qt:5 tar:xz
-USE_KDE=	i18n kpublictransport \
+USES=		bison cmake compiler:c++11-lang gettext kde:6 qt:6 tar:xz
+USE_KDE=	coreaddons i18n kirigami2 kpublictransport service \
 		ecm:build
-USE_QT=		core declarative gui network quick3d \
-		buildtools:build qmake:build
+USE_QT=		base
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/astro/kosmindoormap/distinfo b/astro/kosmindoormap/distinfo
index 3c1c9041c654..41daa15de241 100644
--- a/astro/kosmindoormap/distinfo
+++ b/astro/kosmindoormap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707889450
-SHA256 (KDE/release-service/23.08.5/kosmindoormap-23.08.5.tar.xz) = 647bd4e37536502543494c8db8fcaa2f0a485c396920ee69e5238f367a48ab03
-SIZE (KDE/release-service/23.08.5/kosmindoormap-23.08.5.tar.xz) = 384948
+TIMESTAMP = 1734460014
+SHA256 (KDE/release-service/24.12.0/kosmindoormap-24.12.0.tar.xz) = f2a648d8dab8e568448fddcddd2bcc76387b6231cd6aca355030491aa6a336c1
+SIZE (KDE/release-service/24.12.0/kosmindoormap-24.12.0.tar.xz) = 693112
diff --git a/astro/kosmindoormap/pkg-plist b/astro/kosmindoormap/pkg-plist
index 31f60432645f..cc7e7d31f6aa 100644
--- a/astro/kosmindoormap/pkg-plist
+++ b/astro/kosmindoormap/pkg-plist
@@ -1,13 +1,23 @@
+include/KOSM/AbstractReader
+include/KOSM/AbstractWriter
 include/KOSM/Datatypes
 include/KOSM/Element
+include/KOSM/IO
+include/KOSM/Languages
 include/KOSMIndoorMap/EquipmentModel
 include/KOSMIndoorMap/FloorLevelModel
 include/KOSMIndoorMap/GateModel
 include/KOSMIndoorMap/HitDetector
+include/KOSMIndoorMap/MapCSSElementState
+include/KOSMIndoorMap/MapCSSLoader
 include/KOSMIndoorMap/MapCSSParser
+include/KOSMIndoorMap/MapCSSProperty
+include/KOSMIndoorMap/MapCSSResult
 include/KOSMIndoorMap/MapCSSStyle
+include/KOSMIndoorMap/MapCSSTypes
 include/KOSMIndoorMap/MapData
 include/KOSMIndoorMap/MapLoader
+include/KOSMIndoorMap/NetworkAccessManagerFactory
 include/KOSMIndoorMap/OverlaySource
 include/KOSMIndoorMap/PainterRenderer
 include/KOSMIndoorMap/Platform
@@ -16,20 +26,37 @@ include/KOSMIndoorMap/SceneController
 include/KOSMIndoorMap/SceneGraph
 include/KOSMIndoorMap/SceneGraphItem
 include/KOSMIndoorMap/View
+include/KOSMIndoorRouting/NavMesh
+include/KOSMIndoorRouting/NavMeshBuilder
+include/KOSMIndoorRouting/NavMeshTransform
+include/KOSMIndoorRouting/Route
+include/KOSMIndoorRouting/RoutingArea
+include/KOSMIndoorRouting/RoutingJob
+include/KOSMIndoorRouting/RoutingProfile
+include/kosm/abstractreader.h
+include/kosm/abstractwriter.h
 include/kosm/datatypes.h
 include/kosm/element.h
 include/kosm/internal.h
+include/kosm/io.h
 include/kosm/kosm_export.h
+include/kosm/languages.h
 include/kosm/stringpool.h
 include/kosmindoormap/equipmentmodel.h
 include/kosmindoormap/floorlevelmodel.h
 include/kosmindoormap/gatemodel.h
 include/kosmindoormap/hitdetector.h
 include/kosmindoormap/kosmindoormap_export.h
+include/kosmindoormap/mapcsselementstate.h
+include/kosmindoormap/mapcssloader.h
 include/kosmindoormap/mapcssparser.h
+include/kosmindoormap/mapcssproperty.h
+include/kosmindoormap/mapcssresult.h
 include/kosmindoormap/mapcssstyle.h
+include/kosmindoormap/mapcsstypes.h
 include/kosmindoormap/mapdata.h
 include/kosmindoormap/maploader.h
+include/kosmindoormap/networkaccessmanagerfactory.h
 include/kosmindoormap/overlaysource.h
 include/kosmindoormap/painterrenderer.h
 include/kosmindoormap/platform.h
@@ -39,6 +66,14 @@ include/kosmindoormap/scenegraph.h
 include/kosmindoormap/scenegraphitem.h
 include/kosmindoormap/view.h
 include/kosmindoormap_version.h
+include/kosmindoorrouting/kosmindoorrouting_export.h
+include/kosmindoorrouting/navmesh.h
+include/kosmindoorrouting/navmeshbuilder.h
+include/kosmindoorrouting/navmeshtransform.h
+include/kosmindoorrouting/route.h
+include/kosmindoorrouting/routingarea.h
+include/kosmindoorrouting/routingjob.h
+include/kosmindoorrouting/routingprofile.h
 lib/cmake/KOSMIndoorMap/KOSMIndoorMapConfig.cmake
 lib/cmake/KOSMIndoorMap/KOSMIndoorMapConfigVersion.cmake
 lib/cmake/KOSMIndoorMap/KOSMIndoorMapTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -49,22 +84,53 @@ lib/libKOSM.so.%%KDE_APPLICATIONS_VERSION%%
 lib/libKOSMIndoorMap.so
 lib/libKOSMIndoorMap.so.1
 lib/libKOSMIndoorMap.so.%%KDE_APPLICATIONS_VERSION%%
+lib/libKOSMIndoorRouting.so
+lib/libKOSMIndoorRouting.so.1
+lib/libKOSMIndoorRouting.so.%%KDE_APPLICATIONS_VERSION%%
+%%QT_QMLDIR%%/org/kde/kosmindoormap/AmenityListDelegate.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/AmenitySearchDialog.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/FloorLevelSelector.qml
 %%QT_QMLDIR%%/org/kde/kosmindoormap/IndoorMap.qml
 %%QT_QMLDIR%%/org/kde/kosmindoormap/IndoorMapAttributionLabel.qml
 %%QT_QMLDIR%%/org/kde/kosmindoormap/IndoorMapScale.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/OSMElementInformationDialog.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/OSMElementInformationDialogAddressDelegate.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/OSMElementInformationDialogImageDelegate.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/OSMElementInformationDialogLinkDelegate.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/OSMElementInformationDialogOpeningHoursDelegate.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/OSMElementInformationDialogStringDelegate.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/RoomSearchDialog.qml
+%%QT_QMLDIR%%/org/kde/kosmindoormap/kde-qmlmodule.version
+%%QT_QMLDIR%%/org/kde/kosmindoormap/kosmindoormapquickplugin.qmltypes
+%%QT_QMLDIR%%/org/kde/kosmindoormap/kpublictransport/kde-qmlmodule.version
+%%QT_QMLDIR%%/org/kde/kosmindoormap/kpublictransport/kosmindoormap_kpublictransport_integration_plugin.qmltypes
 %%QT_QMLDIR%%/org/kde/kosmindoormap/kpublictransport/libkosmindoormap_kpublictransport_integration_plugin.so
 %%QT_QMLDIR%%/org/kde/kosmindoormap/kpublictransport/qmldir
 %%QT_QMLDIR%%/org/kde/kosmindoormap/libkosmindoormapquickplugin.so
 %%QT_QMLDIR%%/org/kde/kosmindoormap/qmldir
+%%QT_QMLDIR%%/org/kde/kosmindoorrouting/kde-qmlmodule.version
+%%QT_QMLDIR%%/org/kde/kosmindoorrouting/kosmindoorroutingquickplugin.qmltypes
+%%QT_QMLDIR%%/org/kde/kosmindoorrouting/libkosmindoorroutingquickplugin.so
+%%QT_QMLDIR%%/org/kde/kosmindoorrouting/qmldir
+%%QT_QMLDIR%%/org/kde/osm/editorcontroller/kde-qmlmodule.version
+%%QT_QMLDIR%%/org/kde/osm/editorcontroller/kosmeditorcontrollerplugin.qmltypes
+%%QT_QMLDIR%%/org/kde/osm/editorcontroller/libkosmeditorcontrollerplugin.so
+%%QT_QMLDIR%%/org/kde/osm/editorcontroller/qmldir
+share/locale/ar/LC_MESSAGES/kosmindoormap.mo
+share/locale/ast/LC_MESSAGES/kosmindoormap.mo
 share/locale/ca/LC_MESSAGES/kosmindoormap.mo
 share/locale/ca@valencia/LC_MESSAGES/kosmindoormap.mo
 share/locale/cs/LC_MESSAGES/kosmindoormap.mo
 share/locale/de/LC_MESSAGES/kosmindoormap.mo
 share/locale/en_GB/LC_MESSAGES/kosmindoormap.mo
+share/locale/eo/LC_MESSAGES/kosmindoormap.mo
 share/locale/es/LC_MESSAGES/kosmindoormap.mo
 share/locale/eu/LC_MESSAGES/kosmindoormap.mo
 share/locale/fi/LC_MESSAGES/kosmindoormap.mo
 share/locale/fr/LC_MESSAGES/kosmindoormap.mo
+share/locale/gl/LC_MESSAGES/kosmindoormap.mo
+share/locale/he/LC_MESSAGES/kosmindoormap.mo
+share/locale/ia/LC_MESSAGES/kosmindoormap.mo
 share/locale/it/LC_MESSAGES/kosmindoormap.mo
 share/locale/ja/LC_MESSAGES/kosmindoormap.mo
 share/locale/ka/LC_MESSAGES/kosmindoormap.mo
@@ -82,4 +148,4 @@ share/locale/tr/LC_MESSAGES/kosmindoormap.mo
 share/locale/uk/LC_MESSAGES/kosmindoormap.mo
 share/locale/zh_CN/LC_MESSAGES/kosmindoormap.mo
 share/locale/zh_TW/LC_MESSAGES/kosmindoormap.mo
-share/qlogging-categories5/org_kde_kosmindoormap.categories
+share/qlogging-categories6/org_kde_kosmindoormap.categories
diff --git a/astro/marble/Makefile b/astro/marble/Makefile
index d737ac0ac34d..0a5581a3f433 100644
--- a/astro/marble/Makefile
+++ b/astro/marble/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	marble
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	8
 CATEGORIES=	astro education kde kde-applications
 
 MAINTAINER=	kde@FreeBSD.org
@@ -13,16 +12,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 USES=		cmake compiler:c++11-lang desktop-file-utils gettext \
-		kde:5 qt:5 shared-mime-info tar:xz xorg
+		kde:6 qt:6 shared-mime-info tar:xz xorg
 USE_KDE=	auth codecs completion config configwidgets coreaddons \
-		crash doctools i18n jobwidgets kio package parts phonon \
-		plasma-framework plasma-workspace-wallpapers runner service solid \
+		crash doctools i18n jobwidgets kio kirigami-addons package \
+		parts phonon plasma-workspace-wallpapers runner service solid \
 		sonnet textwidgets widgetsaddons windowsystem xmlgui \
 		ecm:build
 USE_LDCONFIG=	yes
-USE_QT=		concurrent core dbus declarative designer gui network \
-		printsupport serialport sql svg widgets xml \
-		buildtools:build qmake:build testlib:build
+USE_QT=		base declarative positioning svg
 USE_XORG=	x11
 
 CMAKE_OFF=	MOBILE
@@ -41,8 +38,8 @@ GPS_USE=		QT=location
 GPS_LIB_DEPENDS=	libgps.so:astro/gpsd
 GPS_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_libgps
 
-WEBENGINE_DESC=		Build various plugins that require qt5-webengine
+WEBENGINE_DESC=		Build various plugins that require qt6-webengine
 WEBENGINE_USE=		QT=location,webchannel,webengine
-WEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets
+WEBENGINE_CMAKE_BOOL_OFF=	CMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets
 
 .include <bsd.port.mk>
diff --git a/astro/marble/distinfo b/astro/marble/distinfo
index a9934b4867a4..324af4f2468f 100644
--- a/astro/marble/distinfo
+++ b/astro/marble/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1707889449
-SHA256 (KDE/release-service/23.08.5/marble-23.08.5.tar.xz) = 856cff312725f9644b05cc92d3e437712311d96927e6aa008a44df1c0f4a0b88
-SIZE (KDE/release-service/23.08.5/marble-23.08.5.tar.xz) = 53786140
+TIMESTAMP = 1734460017
+SHA256 (KDE/release-service/24.12.0/marble-24.12.0.tar.xz) = a347f134d1428bd46b886bb41a292a2fec4aea4de274bff73cd8b8994f920576
+SIZE (KDE/release-service/24.12.0/marble-24.12.0.tar.xz) = 53635296
diff --git a/astro/marble/pkg-plist b/astro/marble/pkg-plist
index 9f06434b4090..1557207f4560 100644
--- a/astro/marble/pkg-plist
+++ b/astro/marble/pkg-plist
@@ -1,5 +1,6 @@
 bin/marble
-bin/marble-qt
+bin/marble-behaim
+bin/marble-maps
 include/astro/astr2lib.h
 include/astro/astro_version.h
 include/astro/astrolib.h
@@ -96,7 +97,6 @@ include/marble/MapWizard.h
 include/marble/MarbleAboutDialog.h
 include/marble/MarbleColors.h
 include/marble/MarbleDebug.h
-include/marble/MarbleDeclarativePlugin.h
 include/marble/MarbleDirs.h
 include/marble/MarbleGlobal.h
 include/marble/MarbleGraphicsGridLayout.h
@@ -166,7 +166,6 @@ include/marble/ViewportParams.h
 include/marble/WaitEditWidget.h
 include/marble/WidgetGraphicsItem.h
 include/marble/geodata_export.h
-include/marble/marble_declarative_export.h
 include/marble/marble_export.h
 include/marble/marble_version.h
 lib/cmake/Astro/AstroConfig.cmake
@@ -179,11 +178,10 @@ lib/cmake/Marble/MarbleTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Marble/MarbleTargets.cmake
 lib/libastro.so
 lib/libastro.so.1
-lib/libastro.so.%%KDE_APPLICATIONS_SHLIB_VER%%
-lib/libmarbledeclarative.so
-lib/libmarblewidget-qt5.so
-lib/libmarblewidget-qt5.so.%%KDE_APPLICATIONS_SHLIB_VER%%
-lib/libmarblewidget-qt5.so.28
+lib/libastro.so.%%KDE_APPLICATIONS_VERSION%%
+lib/libmarblewidget-qt6.so
+lib/libmarblewidget-qt6.so.28
+lib/libmarblewidget-qt6.so.%%KDE_APPLICATIONS_VERSION%%
 lib/marble/plugins/AnnotatePlugin.so
 lib/marble/plugins/AprsPlugin.so
 lib/marble/plugins/AtmospherePlugin.so
@@ -233,7 +231,7 @@ lib/marble/plugins/PntPlugin.so
 lib/marble/plugins/PositionMarker.so
 lib/marble/plugins/PostalCode.so
 lib/marble/plugins/ProgressFloatItem.so
-%%GPS%%lib/marble/plugins/QtPositioningPositionProviderPlugin.so
+lib/marble/plugins/QtPositioningPositionProviderPlugin.so
 lib/marble/plugins/RoutingPlugin.so
 lib/marble/plugins/RoutinoPlugin.so
 lib/marble/plugins/SatellitesPlugin.so
@@ -247,19 +245,29 @@ lib/plugins/designer/LatLonEditPlugin.so
 lib/plugins/designer/MarbleNavigatorPlugin.so
 lib/plugins/designer/MarbleWidgetPlugin.so
 %%QT_MKSPECDIR%%/modules/qt_Marble.pri
-%%QT_PLUGINDIR%%/kf5/krunner/plasma_runner_marble.so
+%%QT_PLUGINDIR%%/kf6/krunner/plasma_runner_marble.so
 %%QT_PLUGINDIR%%/libmarble_part.so
 %%QT_PLUGINDIR%%/marblethumbnail.so
-%%QT_QMLDIR%%/org/kde/marble/private/plasma/libmarblequick.so
-%%QT_QMLDIR%%/org/kde/marble/private/plasma/qmldir
+%%QT_QMLDIR%%/org/kde/marble/imageprovider/kde-qmlmodule.version
+%%QT_QMLDIR%%/org/kde/marble/imageprovider/libmarbleimageprovider.so
+%%QT_QMLDIR%%/org/kde/marble/imageprovider/marbleimageprovider.qmltypes
+%%QT_QMLDIR%%/org/kde/marble/imageprovider/qmldir
+%%QT_QMLDIR%%/org/kde/marble/kde-qmlmodule.version
+%%QT_QMLDIR%%/org/kde/marble/libmarbledeclarative.so
+%%QT_QMLDIR%%/org/kde/marble/marbledeclarative.qmltypes
+%%QT_QMLDIR%%/org/kde/marble/qmldir
 share/applications/marble_geo.desktop
 share/applications/marble_geojson.desktop
 share/applications/marble_gpx.desktop
 share/applications/marble_kml.desktop
 share/applications/marble_kmz.desktop
+share/applications/marble_thumbnail_kml.desktop
+share/applications/marble_thumbnail_kmz.desktop
+share/applications/marble_thumbnail_osm.desktop
 share/applications/marble_worldwind.desktop
-share/applications/org.kde.marble-qt.desktop
+share/applications/org.kde.marble.behaim.desktop
 share/applications/org.kde.marble.desktop
+share/applications/org.kde.marble.maps.desktop
 share/config.kcfg/marble.kcfg
 share/icons/hicolor/128x128/apps/marble.png
 share/icons/hicolor/16x16/apps/marble.png
@@ -267,259 +275,336 @@ share/icons/hicolor/22x22/apps/marble.png
 share/icons/hicolor/32x32/apps/marble.png
 share/icons/hicolor/48x48/apps/marble.png
 share/icons/hicolor/64x64/apps/marble.png
-share/kservices5/marble_part.desktop
-share/kservices5/marble_thumbnail_geojson.desktop
-share/kservices5/marble_thumbnail_gpx.desktop
-share/kservices5/marble_thumbnail_kml.desktop
-share/kservices5/marble_thumbnail_kmz.desktop
-share/kservices5/marble_thumbnail_osm.desktop
-share/kservices5/plasma-applet-org.kde.plasma.worldclock.desktop
-share/kservices5/plasma-wallpaper-org.kde.plasma.worldmap.desktop
+share/icons/hicolor/scalable/apps/org.kde.marble.behaim.svg
+share/icons/hicolor/scalable/apps/org.kde.marble.maps.svg
 share/kxmlgui5/marble/marble_part.rc
 share/kxmlgui5/marble/marbleui.rc
+share/locale/ar/LC_MESSAGES/marble-maps.mo
 share/locale/ar/LC_MESSAGES/marble.mo
 share/locale/ar/LC_MESSAGES/marble_qt.qm
 share/locale/ar/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ar/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ar/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/be/LC_MESSAGES/marble-maps.mo
 share/locale/be/LC_MESSAGES/marble.mo
 share/locale/be/LC_MESSAGES/marble_qt.qm
+share/locale/bg/LC_MESSAGES/marble-behaim.mo
+share/locale/bg/LC_MESSAGES/marble-maps.mo
 share/locale/bg/LC_MESSAGES/marble.mo
 share/locale/bg/LC_MESSAGES/marble_qt.qm
 share/locale/bg/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/bg/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/bg/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/bs/LC_MESSAGES/marble-maps.mo
 share/locale/bs/LC_MESSAGES/marble.mo
 share/locale/bs/LC_MESSAGES/marble_qt.qm
 share/locale/bs/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/ca/LC_MESSAGES/marble-behaim.mo
+share/locale/ca/LC_MESSAGES/marble-maps.mo
 share/locale/ca/LC_MESSAGES/marble.mo
 share/locale/ca/LC_MESSAGES/marble_qt.qm
 share/locale/ca/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ca/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ca/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/ca@valencia/LC_MESSAGES/marble-behaim.mo
+share/locale/ca@valencia/LC_MESSAGES/marble-maps.mo
 share/locale/ca@valencia/LC_MESSAGES/marble.mo
 share/locale/ca@valencia/LC_MESSAGES/marble_qt.qm
 share/locale/ca@valencia/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ca@valencia/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ca@valencia/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/cs/LC_MESSAGES/marble-behaim.mo
+share/locale/cs/LC_MESSAGES/marble-maps.mo
 share/locale/cs/LC_MESSAGES/marble.mo
 share/locale/cs/LC_MESSAGES/marble_qt.qm
 share/locale/cs/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/cs/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/cs/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/da/LC_MESSAGES/marble-maps.mo
 share/locale/da/LC_MESSAGES/marble.mo
 share/locale/da/LC_MESSAGES/marble_qt.qm
 share/locale/da/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/da/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/da/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/de/LC_MESSAGES/marble-behaim.mo
+share/locale/de/LC_MESSAGES/marble-maps.mo
 share/locale/de/LC_MESSAGES/marble.mo
 share/locale/de/LC_MESSAGES/marble_qt.qm
 share/locale/de/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/de/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/de/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/el/LC_MESSAGES/marble-maps.mo
 share/locale/el/LC_MESSAGES/marble.mo
 share/locale/el/LC_MESSAGES/marble_qt.qm
 share/locale/el/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/el/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/el/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/en/LC_MESSAGES/marble-maps.mo
 share/locale/en/LC_MESSAGES/marble_qt.qm
+share/locale/en_GB/LC_MESSAGES/marble-behaim.mo
+share/locale/en_GB/LC_MESSAGES/marble-maps.mo
 share/locale/en_GB/LC_MESSAGES/marble.mo
 share/locale/en_GB/LC_MESSAGES/marble_qt.qm
 share/locale/en_GB/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/en_GB/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/en_GB/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/eo/LC_MESSAGES/marble-maps.mo
 share/locale/eo/LC_MESSAGES/marble.mo
 share/locale/eo/LC_MESSAGES/marble_qt.qm
 share/locale/eo/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/eo/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/eo/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/es/LC_MESSAGES/marble-behaim.mo
+share/locale/es/LC_MESSAGES/marble-maps.mo
 share/locale/es/LC_MESSAGES/marble.mo
 share/locale/es/LC_MESSAGES/marble_qt.qm
 share/locale/es/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/es/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/es/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/et/LC_MESSAGES/marble-maps.mo
 share/locale/et/LC_MESSAGES/marble.mo
 share/locale/et/LC_MESSAGES/marble_qt.qm
 share/locale/et/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/et/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/et/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/eu/LC_MESSAGES/marble-behaim.mo
+share/locale/eu/LC_MESSAGES/marble-maps.mo
 share/locale/eu/LC_MESSAGES/marble.mo
 share/locale/eu/LC_MESSAGES/marble_qt.qm
 share/locale/eu/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/eu/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/eu/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/fi/LC_MESSAGES/marble-behaim.mo
+share/locale/fi/LC_MESSAGES/marble-maps.mo
 share/locale/fi/LC_MESSAGES/marble.mo
 share/locale/fi/LC_MESSAGES/marble_qt.qm
 share/locale/fi/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/fi/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/fi/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/fr/LC_MESSAGES/marble-behaim.mo
+share/locale/fr/LC_MESSAGES/marble-maps.mo
 share/locale/fr/LC_MESSAGES/marble.mo
 share/locale/fr/LC_MESSAGES/marble_qt.qm
 share/locale/fr/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/fr/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/fr/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/ga/LC_MESSAGES/marble-maps.mo
 share/locale/ga/LC_MESSAGES/marble.mo
 share/locale/ga/LC_MESSAGES/marble_qt.qm
 share/locale/ga/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/gl/LC_MESSAGES/marble-behaim.mo
+share/locale/gl/LC_MESSAGES/marble-maps.mo
 share/locale/gl/LC_MESSAGES/marble.mo
 share/locale/gl/LC_MESSAGES/marble_qt.qm
 share/locale/gl/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/gl/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/gl/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/gu/LC_MESSAGES/marble-maps.mo
 share/locale/gu/LC_MESSAGES/marble.mo
 share/locale/gu/LC_MESSAGES/marble_qt.qm
+share/locale/he/LC_MESSAGES/marble-maps.mo
 share/locale/he/LC_MESSAGES/marble.mo
 share/locale/he/LC_MESSAGES/marble_qt.qm
+share/locale/he/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/hi/LC_MESSAGES/marble-maps.mo
 share/locale/hi/LC_MESSAGES/marble.mo
 share/locale/hi/LC_MESSAGES/marble_qt.qm
 share/locale/hne/LC_MESSAGES/marble.mo
+share/locale/hr/LC_MESSAGES/marble-maps.mo
 share/locale/hr/LC_MESSAGES/marble.mo
 share/locale/hr/LC_MESSAGES/marble_qt.qm
+share/locale/hu/LC_MESSAGES/marble-maps.mo
 share/locale/hu/LC_MESSAGES/marble.mo
 share/locale/hu/LC_MESSAGES/marble_qt.qm
 share/locale/hu/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/id/LC_MESSAGES/marble-maps.mo
 share/locale/id/LC_MESSAGES/marble.mo
 share/locale/id/LC_MESSAGES/marble_qt.qm
 share/locale/id/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/id/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/id/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/is/LC_MESSAGES/marble-maps.mo
 share/locale/is/LC_MESSAGES/marble.mo
 share/locale/is/LC_MESSAGES/marble_qt.qm
 share/locale/is/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/is/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/is/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/it/LC_MESSAGES/marble-behaim.mo
+share/locale/it/LC_MESSAGES/marble-maps.mo
 share/locale/it/LC_MESSAGES/marble.mo
 share/locale/it/LC_MESSAGES/marble_qt.qm
 share/locale/it/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/it/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/it/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/ja/LC_MESSAGES/marble-maps.mo
 share/locale/ja/LC_MESSAGES/marble.mo
 share/locale/ja/LC_MESSAGES/marble_qt.qm
 share/locale/ja/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ja/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ja/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/ka/LC_MESSAGES/marble-behaim.mo
+share/locale/ka/LC_MESSAGES/marble-maps.mo
 share/locale/ka/LC_MESSAGES/marble.mo
 share/locale/ka/LC_MESSAGES/marble_qt.qm
 share/locale/ka/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ka/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ka/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/kk/LC_MESSAGES/marble-maps.mo
 share/locale/kk/LC_MESSAGES/marble.mo
 share/locale/kk/LC_MESSAGES/marble_qt.qm
 share/locale/kk/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/km/LC_MESSAGES/marble-maps.mo
 share/locale/km/LC_MESSAGES/marble.mo
 share/locale/km/LC_MESSAGES/marble_qt.qm
+share/locale/ko/LC_MESSAGES/marble-maps.mo
 share/locale/ko/LC_MESSAGES/marble.mo
 share/locale/ko/LC_MESSAGES/marble_qt.qm
 share/locale/ko/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ko/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ko/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/lt/LC_MESSAGES/marble-maps.mo
 share/locale/lt/LC_MESSAGES/marble.mo
 share/locale/lt/LC_MESSAGES/marble_qt.qm
 share/locale/lt/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/lt/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/lt/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/lv/LC_MESSAGES/marble-behaim.mo
+share/locale/lv/LC_MESSAGES/marble-maps.mo
 share/locale/lv/LC_MESSAGES/marble.mo
 share/locale/lv/LC_MESSAGES/marble_qt.qm
+share/locale/lv/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/lv/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/lv/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/mai/LC_MESSAGES/marble.mo
+share/locale/ml/LC_MESSAGES/marble-maps.mo
 share/locale/ml/LC_MESSAGES/marble.mo
 share/locale/ml/LC_MESSAGES/marble_qt.qm
 share/locale/ml/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ml/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ml/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/mr/LC_MESSAGES/marble-maps.mo
 share/locale/mr/LC_MESSAGES/marble.mo
 share/locale/mr/LC_MESSAGES/marble_qt.qm
 share/locale/mr/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/nb/LC_MESSAGES/marble-maps.mo
 share/locale/nb/LC_MESSAGES/marble.mo
 share/locale/nb/LC_MESSAGES/marble_qt.qm
 share/locale/nb/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/nds/LC_MESSAGES/marble-maps.mo
 share/locale/nds/LC_MESSAGES/marble.mo
 share/locale/nds/LC_MESSAGES/marble_qt.qm
 share/locale/nds/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/nl/LC_MESSAGES/marble-behaim.mo
+share/locale/nl/LC_MESSAGES/marble-maps.mo
 share/locale/nl/LC_MESSAGES/marble.mo
 share/locale/nl/LC_MESSAGES/marble_qt.qm
 share/locale/nl/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/nl/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/nl/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/nn/LC_MESSAGES/marble-maps.mo
 share/locale/nn/LC_MESSAGES/marble.mo
 share/locale/nn/LC_MESSAGES/marble_qt.qm
 share/locale/nn/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/nn/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/nn/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/oc/LC_MESSAGES/marble-maps.mo
 share/locale/oc/LC_MESSAGES/marble.mo
 share/locale/oc/LC_MESSAGES/marble_qt.qm
+share/locale/pa/LC_MESSAGES/marble-maps.mo
 share/locale/pa/LC_MESSAGES/marble.mo
 share/locale/pa/LC_MESSAGES/marble_qt.qm
 share/locale/pa/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/pl/LC_MESSAGES/marble-behaim.mo
+share/locale/pl/LC_MESSAGES/marble-maps.mo
 share/locale/pl/LC_MESSAGES/marble.mo
 share/locale/pl/LC_MESSAGES/marble_qt.qm
 share/locale/pl/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/pl/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/pl/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/pt/LC_MESSAGES/marble-maps.mo
 share/locale/pt/LC_MESSAGES/marble.mo
 share/locale/pt/LC_MESSAGES/marble_qt.qm
 share/locale/pt/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/pt/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/pt/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/pt_BR/LC_MESSAGES/marble-maps.mo
 share/locale/pt_BR/LC_MESSAGES/marble.mo
 share/locale/pt_BR/LC_MESSAGES/marble_qt.qm
 share/locale/pt_BR/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/pt_BR/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/pt_BR/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/ro/LC_MESSAGES/marble-maps.mo
 share/locale/ro/LC_MESSAGES/marble.mo
 share/locale/ro/LC_MESSAGES/marble_qt.qm
 share/locale/ro/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
+share/locale/ru/LC_MESSAGES/marble-maps.mo
 share/locale/ru/LC_MESSAGES/marble.mo
 share/locale/ru/LC_MESSAGES/marble_qt.qm
 share/locale/ru/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/ru/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/ru/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/se/LC_MESSAGES/marble-maps.mo
 share/locale/se/LC_MESSAGES/marble.mo
 share/locale/se/LC_MESSAGES/marble_qt.qm
+share/locale/si/LC_MESSAGES/marble-maps.mo
 share/locale/si/LC_MESSAGES/marble.mo
 share/locale/si/LC_MESSAGES/marble_qt.qm
+share/locale/sk/LC_MESSAGES/marble-behaim.mo
+share/locale/sk/LC_MESSAGES/marble-maps.mo
 share/locale/sk/LC_MESSAGES/marble.mo
 share/locale/sk/LC_MESSAGES/marble_qt.qm
 share/locale/sk/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/sk/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/sk/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/sl/LC_MESSAGES/marble-behaim.mo
+share/locale/sl/LC_MESSAGES/marble-maps.mo
 share/locale/sl/LC_MESSAGES/marble.mo
 share/locale/sl/LC_MESSAGES/marble_qt.qm
 share/locale/sl/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/sl/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/sl/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/sv/LC_MESSAGES/marble-behaim.mo
+share/locale/sv/LC_MESSAGES/marble-maps.mo
 share/locale/sv/LC_MESSAGES/marble.mo
 share/locale/sv/LC_MESSAGES/marble_qt.qm
 share/locale/sv/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/sv/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/sv/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 share/locale/th/LC_MESSAGES/marble.mo
+share/locale/tr/LC_MESSAGES/marble-behaim.mo
+share/locale/tr/LC_MESSAGES/marble-maps.mo
 share/locale/tr/LC_MESSAGES/marble.mo
 share/locale/tr/LC_MESSAGES/marble_qt.qm
 share/locale/tr/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/tr/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/tr/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/ug/LC_MESSAGES/marble-maps.mo
 share/locale/ug/LC_MESSAGES/marble.mo
 share/locale/ug/LC_MESSAGES/marble_qt.qm
 share/locale/ug/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/uk/LC_MESSAGES/marble-behaim.mo
+share/locale/uk/LC_MESSAGES/marble-maps.mo
 share/locale/uk/LC_MESSAGES/marble.mo
 share/locale/uk/LC_MESSAGES/marble_qt.qm
 share/locale/uk/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/uk/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/uk/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/wa/LC_MESSAGES/marble-maps.mo
 share/locale/wa/LC_MESSAGES/marble.mo
 share/locale/wa/LC_MESSAGES/marble_qt.qm
+share/locale/zh_CN/LC_MESSAGES/marble-behaim.mo
+share/locale/zh_CN/LC_MESSAGES/marble-maps.mo
 share/locale/zh_CN/LC_MESSAGES/marble.mo
 share/locale/zh_CN/LC_MESSAGES/marble_qt.qm
 share/locale/zh_CN/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/zh_CN/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/zh_TW/LC_MESSAGES/marble-maps.mo
 share/locale/zh_TW/LC_MESSAGES/marble.mo
 share/locale/zh_TW/LC_MESSAGES/marble_qt.qm
 share/locale/zh_TW/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_runner_marble.mo
 share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
-%%DATADIR%%/data/LICENSE.txt
 %%DATADIR%%/data/audio/KDE-Sys-App-Positive.ogg
 %%DATADIR%%/data/audio/KDE-Sys-List-End.ogg
 %%DATADIR%%/data/bitmaps/airport.png
@@ -1796,18 +1881,7 @@ share/locale/zh_TW/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 %%DATADIR%%/data/weather/weather-storm.png
 %%DATADIR%%/data/weather/wind-arrows.svgz
 share/metainfo/org.kde.marble.appdata.xml
-share/metainfo/org.kde.plasma.worldclock.appdata.xml
-share/metainfo/org.kde.plasma.worldmap.appdata.xml
+share/metainfo/org.kde.marble.behaim.appdata.xml
+share/metainfo/org.kde.marble.maps.appdata.xml
 share/mime/packages/geo.xml
-share/plasma/plasmoids/org.kde.plasma.worldclock/contents/config/config.qml
-share/plasma/plasmoids/org.kde.plasma.worldclock/contents/config/main.xml
-share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/configMapDisplay.qml
-share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/configTimeZones.qml
-share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/main.qml
-share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.desktop
-share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.json
-share/plasma/wallpapers/org.kde.plasma.worldmap/contents/config/main.xml
-share/plasma/wallpapers/org.kde.plasma.worldmap/contents/ui/config.qml
-share/plasma/wallpapers/org.kde.plasma.worldmap/contents/ui/main.qml
-share/plasma/wallpapers/org.kde.plasma.worldmap/metadata.desktop
-share/plasma/wallpapers/org.kde.plasma.worldmap/metadata.json
+share/qlogging-categories6/marble.categories