CVS commit: pkgsrc/misc/marble

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/misc/marble
From: "Mark Davies" <markd%netbsd.org@localhost>
Date: Sun, 21 Dec 2025 14:38:39 +0000

Module Name:    pkgsrc
Committed By:   markd
Date:           Sun Dec 21 14:38:39 UTC 2025

Modified Files:
        pkgsrc/misc/marble: Makefile PLIST buildlink3.mk distinfo
        pkgsrc/misc/marble/patches: patch-src_lib_astro_astrolib.cpp
            patch-src_lib_astro_astrolib.h patch-src_lib_astro_solarsystem.cpp
Removed Files:
        pkgsrc/misc/marble/patches: patch-src_lib_marble_VectorTileModel.cpp

Log Message:
marble: update to 25.08.3

Qt6/KF6 version - Two years of development.


To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 pkgsrc/misc/marble/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/misc/marble/PLIST
cvs rdiff -u -r1.60 -r1.61 pkgsrc/misc/marble/buildlink3.mk
cvs rdiff -u -r1.24 -r1.25 pkgsrc/misc/marble/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.cpp \
    pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.h
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/misc/marble/patches/patch-src_lib_marble_VectorTileModel.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/misc/marble/Makefile
diff -u pkgsrc/misc/marble/Makefile:1.117 pkgsrc/misc/marble/Makefile:1.118
--- pkgsrc/misc/marble/Makefile:1.117   Sun Nov 23 13:27:42 2025
+++ pkgsrc/misc/marble/Makefile Sun Dec 21 14:38:38 2025
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.117 2025/11/23 13:27:42 gdt Exp $
+# $NetBSD: Makefile,v 1.118 2025/12/21 14:38:38 markd Exp $
 
 DISTNAME=      marble-${KAPPSVER}
-PKGREVISION=   18
 CATEGORIES=    misc
 
 HOMEPAGE=      https://marble.kde.org/
@@ -10,7 +9,7 @@ LICENSE=       gnu-lgpl-v2 AND gnu-gpl-v3 AND 
 
 .include "../../meta-pkgs/kde/applications.mk"
 
-TOOL_DEPENDS+= kdoctools>=5.19.0:../../devel/kdoctools
+TOOL_DEPENDS+= kf6-kdoctools>=5.19.0:../../devel/kf6-kdoctools
 
 USE_TOOLS+=    msgmerge perl pkg-config
 
@@ -24,17 +23,19 @@ SUBST_FILES.fix-moc=        _KDE_build/src/apps
 SUBST_NOOP_OK.fix-moc= yes
 SUBST_SED.fix-moc=     -e 's;"${PREFIX}/include",;;g'
 
-.include "../../devel/kparts/buildlink3.mk"
-.include "../../devel/krunner/buildlink3.mk"
+.include "../../devel/kf6-kparts/buildlink3.mk"
+.include "../../devel/kf6-krunner/buildlink3.mk"
 .include "../../devel/protobuf/buildlink3.mk"
+.include "../../devel/qt6-qt5compat/buildlink3.mk"
 .include "../../geography/gpsd/buildlink3.mk"
+.include "../../geography/qt6-qtpositioning/buildlink3.mk"
 .include "../../geography/shapelib/buildlink3.mk"
-.include "../../net/knewstuff/buildlink3.mk"
-.include "../../multimedia/phonon-qt5/buildlink3.mk"
+.include "../../net/kf6-knewstuff/buildlink3.mk"
+.include "../../multimedia/phonon-qt6/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/qt5-qtbase/buildlink3.mk"
-.include "../../x11/qt5-qtserialport/buildlink3.mk"
-CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets:BOOL=TRUE
-#.include "../../x11/qt5-qtwebengine/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
+.include "../../x11/qt6-qtserialport/buildlink3.mk"
+CMAKE_CONFIGURE_ARGS+= -DCMAKE_DISABLE_FIND_PACKAGE_Qt6WebEngineWidgets:BOOL=TRUE
+#.include "../../www/qt6-qtwebengine/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/misc/marble/PLIST
diff -u pkgsrc/misc/marble/PLIST:1.13 pkgsrc/misc/marble/PLIST:1.14
--- pkgsrc/misc/marble/PLIST:1.13       Tue Feb  6 11:17:37 2024
+++ pkgsrc/misc/marble/PLIST    Sun Dec 21 14:38:38 2025
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.13 2024/02/06 11:17:37 markd Exp $
+@comment $NetBSD: PLIST,v 1.14 2025/12/21 14:38:38 markd Exp $
 bin/marble
-bin/marble-qt
+bin/marble-behaim
+bin/marble-maps
 include/astro/astr2lib.h
 include/astro/astro_version.h
 include/astro/astrolib.h
@@ -97,7 +98,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
@@ -165,7 +165,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
@@ -178,11 +177,10 @@ lib/cmake/Marble/MarbleTargets-noconfig.
 lib/cmake/Marble/MarbleTargets.cmake
 lib/libastro.so
 lib/libastro.so.1
-lib/libastro.so.23.8.4
-lib/libmarbledeclarative.so
-lib/libmarblewidget-qt5.so
-lib/libmarblewidget-qt5.so.23.8.4
-lib/libmarblewidget-qt5.so.28
+lib/libastro.so.${PKGVERSION}
+lib/libmarblewidget-qt6.so
+lib/libmarblewidget-qt6.so.${PKGVERSION}
+lib/libmarblewidget-qt6.so.28
 lib/marble/plugins/AnnotatePlugin.so
 lib/marble/plugins/AprsPlugin.so
 lib/marble/plugins/AtmospherePlugin.so
@@ -239,24 +237,35 @@ lib/marble/plugins/Speedometer.so
 lib/marble/plugins/StarsPlugin.so
 lib/marble/plugins/SunPlugin.so
 lib/marble/plugins/YoursPlugin.so
-qt5/mkspecs/modules/qt_Marble.pri
-qt5/plugins/designer/LatLonEditPlugin.so
-qt5/plugins/designer/MarbleNavigatorPlugin.so
-qt5/plugins/designer/MarbleWidgetPlugin.so
-qt5/plugins/kf5/krunner/plasma_runner_marble.so
-qt5/plugins/libmarble_part.so
-qt5/plugins/marblethumbnail.so
-qt5/qml/org/kde/marble/private/plasma/libmarblequick.so
-qt5/qml/org/kde/marble/private/plasma/qmldir
+qt6/mkspecs/modules/qt_Marble.pri
+qt6/plugins/designer/LatLonEditPlugin.so
+qt6/plugins/designer/MarbleNavigatorPlugin.so
+qt6/plugins/designer/MarbleWidgetPlugin.so
+qt6/plugins/kf6/krunner/plasma_runner_marble.so
+qt6/plugins/libmarble_part.so
+qt6/plugins/marblethumbnail.so
+qt6/qml/org/kde/marble/imageprovider/kde-qmlmodule.version
+qt6/qml/org/kde/marble/imageprovider/libmarbleimageprovider.so
+qt6/qml/org/kde/marble/imageprovider/marbleimageprovider.qmltypes
+qt6/qml/org/kde/marble/imageprovider/qmldir
+qt6/qml/org/kde/marble/kde-qmlmodule.version
+qt6/qml/org/kde/marble/libmarbledeclarative.so
+qt6/qml/org/kde/marble/marbledeclarative.qmltypes
+qt6/qml/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_shp.desktop
+share/applications/marble_thumbnail_kml.desktop
+share/applications/marble_thumbnail_kmz.desktop
+share/applications/marble_thumbnail_osm.desktop
+share/applications/marble_thumbnail_shp.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/doc/HTML/ca/marble/configure-cacheproxy.png
 share/doc/HTML/ca/marble/configure-dateandtime.png
@@ -275,22 +284,6 @@ share/doc/HTML/ca/marble/quick-1.png
 share/doc/HTML/ca/marble/routing-6.png
 share/doc/HTML/ca/marble/search-1.png
 share/doc/HTML/ca/marble/search-2.png
-share/doc/HTML/de/marble/configure-cacheproxy.png
-share/doc/HTML/de/marble/configure-navigation.png
-share/doc/HTML/de/marble/configure-plugins.png
-share/doc/HTML/de/marble/configure-view.png
-share/doc/HTML/de/marble/download-region-3.png
-share/doc/HTML/de/marble/index.cache.bz2
-share/doc/HTML/de/marble/index.docbook
-share/doc/HTML/de/marble/mapview-1.png
-share/doc/HTML/de/marble/measure-1.png
-share/doc/HTML/de/marble/quick-1.png
-share/doc/HTML/de/marble/routing-1.png
-share/doc/HTML/de/marble/routing-2.png
-share/doc/HTML/de/marble/routing-3.png
-share/doc/HTML/de/marble/routing-4.png
-share/doc/HTML/de/marble/search-1.png
-share/doc/HTML/de/marble/search-2.png
 share/doc/HTML/en/marble/configure-cacheproxy.png
 share/doc/HTML/en/marble/configure-dateandtime.png
 share/doc/HTML/en/marble/configure-navigation.png
@@ -327,8 +320,6 @@ share/doc/HTML/es/marble/measure-1.png
 share/doc/HTML/es/marble/quick-1.png
 share/doc/HTML/es/marble/search-1.png
 share/doc/HTML/es/marble/search-2.png
-share/doc/HTML/et/marble/index.cache.bz2
-share/doc/HTML/et/marble/index.docbook
 share/doc/HTML/fr/marble/configure-cacheproxy.png
 share/doc/HTML/fr/marble/configure-navigation.png
 share/doc/HTML/fr/marble/configure-plugins.png
@@ -348,8 +339,6 @@ share/doc/HTML/fr/marble/routing-5.png
 share/doc/HTML/fr/marble/routing-6.png
 share/doc/HTML/fr/marble/search-1.png
 share/doc/HTML/fr/marble/search-2.png
-share/doc/HTML/gl/marble/index.cache.bz2
-share/doc/HTML/gl/marble/index.docbook
 share/doc/HTML/it/marble/index.cache.bz2
 share/doc/HTML/it/marble/index.docbook
 share/doc/HTML/lt/marble/configure-cacheproxy.png
@@ -381,17 +370,6 @@ share/doc/HTML/nl/marble/search-1.png
 share/doc/HTML/nl/marble/search-2.png
 share/doc/HTML/pt/marble/index.cache.bz2
 share/doc/HTML/pt/marble/index.docbook
-share/doc/HTML/pt_BR/marble/configure-cacheproxy.png
-share/doc/HTML/pt_BR/marble/configure-navigation.png
-share/doc/HTML/pt_BR/marble/configure-plugins.png
-share/doc/HTML/pt_BR/marble/configure-view.png
-share/doc/HTML/pt_BR/marble/index.cache.bz2
-share/doc/HTML/pt_BR/marble/index.docbook
-share/doc/HTML/pt_BR/marble/mapview-1.png
-share/doc/HTML/pt_BR/marble/measure-1.png
-share/doc/HTML/pt_BR/marble/quick-1.png
-share/doc/HTML/pt_BR/marble/search-1.png
-share/doc/HTML/pt_BR/marble/search-2.png
 share/doc/HTML/ru/marble/configure-cacheproxy.png
 share/doc/HTML/ru/marble/configure-navigation.png
 share/doc/HTML/ru/marble/configure-plugins.png
@@ -441,260 +419,355 @@ share/icons/hicolor/22x22/apps/marble.pn
 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/marble_thumbnail_shp.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-behaim.mo
+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-behaim.mo
+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_applet_org.kde.plasma.worldclock.mo
+share/locale/he/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/he/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
+share/locale/hi/LC_MESSAGES/marble-behaim.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/hi/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
+share/locale/hi/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/hi/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.mo
 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_applet_org.kde.plasma.worldclock.mo
 share/locale/hu/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/hu/LC_MESSAGES/plasma_wallpaper_org.kde.plasma.worldmap.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-behaim.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-behaim.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/sa/LC_MESSAGES/marble-behaim.mo
+share/locale/sa/LC_MESSAGES/marble-maps.mo
+share/locale/sa/LC_MESSAGES/marble.mo
+share/locale/sa/LC_MESSAGES/marble_qt.qm
+share/locale/sa/LC_MESSAGES/plasma_applet_org.kde.plasma.worldclock.mo
+share/locale/sa/LC_MESSAGES/plasma_runner_marble.mo
+share/locale/sa/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
-share/marble/data/LICENSE.txt
 share/marble/data/audio/KDE-Sys-App-Positive.ogg
 share/marble/data/audio/KDE-Sys-List-End.ogg
 share/marble/data/bitmaps/airport.png
@@ -1971,18 +2044,7 @@ share/marble/data/weather/weather-storm-
 share/marble/data/weather/weather-storm.png
 share/marble/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

Index: pkgsrc/misc/marble/buildlink3.mk
diff -u pkgsrc/misc/marble/buildlink3.mk:1.60 pkgsrc/misc/marble/buildlink3.mk:1.61
--- pkgsrc/misc/marble/buildlink3.mk:1.60       Thu Oct 23 20:38:26 2025
+++ pkgsrc/misc/marble/buildlink3.mk    Sun Dec 21 14:38:38 2025
@@ -1,15 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.60 2025/10/23 20:38:26 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.61 2025/12/21 14:38:38 markd Exp $
 
 BUILDLINK_TREE+=       marble
 
 .if !defined(MARBLE_BUILDLINK3_MK)
 MARBLE_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.marble+= marble>=19.08.3
-BUILDLINK_ABI_DEPENDS.marble?= marble>=23.08.4nb17
+BUILDLINK_API_DEPENDS.marble+= marble>=25.08.2
+BUILDLINK_ABI_DEPENDS.marble?= marble>=25.08.2
 BUILDLINK_PKGSRCDIR.marble?=   ../../misc/marble
 
-.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt6-qtbase/buildlink3.mk"
 .endif # MARBLE_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -marble

Index: pkgsrc/misc/marble/distinfo
diff -u pkgsrc/misc/marble/distinfo:1.24 pkgsrc/misc/marble/distinfo:1.25
--- pkgsrc/misc/marble/distinfo:1.24    Tue Feb  6 11:17:38 2024
+++ pkgsrc/misc/marble/distinfo Sun Dec 21 14:38:39 2025
@@ -1,10 +1,9 @@
-$NetBSD: distinfo,v 1.24 2024/02/06 11:17:38 markd Exp $
+$NetBSD: distinfo,v 1.25 2025/12/21 14:38:39 markd Exp $
 
-BLAKE2s (marble-23.08.4.tar.xz) = f86ef1c7f309ba5a934fb8501f4de6801cae0bd2e00d6413f174f3a5248f4c09
-SHA512 (marble-23.08.4.tar.xz) = a51c9ea45fdbddcda104000cc8781052737cbaa936097dcedef43e64be6072cf57658ed3167922ba80be8c27b53ba1eb5c6ef84d8f927ae7defed1db17968651
-Size (marble-23.08.4.tar.xz) = 53784524 bytes
-SHA1 (patch-src_lib_astro_astrolib.cpp) = 541b39516af740b0ff8e485e9e4e8a339ca5d7f4
-SHA1 (patch-src_lib_astro_astrolib.h) = 4123af9f32a35400e05943598e7dceff84899928
-SHA1 (patch-src_lib_astro_solarsystem.cpp) = 1e00e5edf7ac5b38a1d4d29ccf4847470b6f4906
-SHA1 (patch-src_lib_marble_VectorTileModel.cpp) = 37694434914e9f067f7bf5112b4a9596baa8e889
+BLAKE2s (marble-25.08.3.tar.xz) = 5e0562fce2171db860a76ac4a9eec3777d5f38d1139bc404534198f91f0caa81
+SHA512 (marble-25.08.3.tar.xz) = ef9a104e8823bd4a0de231f2c69d8ccdb98a04f905515acd71d98ac90876afb13cc1df50c4c76efeb3837325c1ea29654ae894a617b4e9103bf6160ce88bcefd
+Size (marble-25.08.3.tar.xz) = 53790288 bytes
+SHA1 (patch-src_lib_astro_astrolib.cpp) = 9397c966a9b94977e6dc1e24a377d95421663670
+SHA1 (patch-src_lib_astro_astrolib.h) = 6f4566d0b82b16724ef9391b43f45743d06ee94c
+SHA1 (patch-src_lib_astro_solarsystem.cpp) = 8d181861e25b555779cd17efab277cc8c34cc855
 SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 06fdce98d53db7a74e972dcc39459016646246d0

Index: pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.cpp
diff -u pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.cpp:1.1 pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.cpp:1.2
--- pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.cpp:1.1     Wed Jan  7 13:14:30 2015
+++ pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.cpp Sun Dec 21 14:38:39 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_lib_astro_astrolib.cpp,v 1.1 2015/01/07 13:14:30 jperkin Exp $
+$NetBSD: patch-src_lib_astro_astrolib.cpp,v 1.2 2025/12/21 14:38:39 markd Exp $
 
 Avoid 'sun' definition.
 
---- src/lib/astro/astrolib.cpp.orig    2014-10-23 21:53:08.000000000 +0000
+--- src/lib/astro/astrolib.cpp.orig    2025-10-06 03:25:22.000000000 +0000
 +++ src/lib/astro/astrolib.cpp
-@@ -2137,7 +2137,7 @@ void Eclipse::equ_sun_moon(double jd, do
-       Mat3 mx;
+@@ -2183,7 +2183,7 @@ void Eclipse::equ_sun_moon(double jd, do
+     Mat3 mx;
  
-       t = julcent (jd) + tdut / 3.15576e9;  // =(86400.0 * 36525.0);
--      rs = sun.position(t);
-+      rs = msun.position(t);
-       rm = moon.position(t);
-       rs = eclequ(t,rs);
-       rm = eclequ(t,rm);
+     t = julcent(jd) + tdut / 3.15576e9; // =(86400.0 * 36525.0);
+-    rs = sun.position(t);
++    rs = msun.position(t);
+     rm = moon.position(t);
+     rs = eclequ(t, rs);
+     rm = eclequ(t, rm);
Index: pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.h
diff -u pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.h:1.1 pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.h:1.2
--- pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.h:1.1       Wed Jan  7 13:14:30 2015
+++ pkgsrc/misc/marble/patches/patch-src_lib_astro_astrolib.h   Sun Dec 21 14:38:39 2025
@@ -1,15 +1,15 @@
-$NetBSD: patch-src_lib_astro_astrolib.h,v 1.1 2015/01/07 13:14:30 jperkin Exp $
+$NetBSD: patch-src_lib_astro_astrolib.h,v 1.2 2025/12/21 14:38:39 markd Exp $
 
 Avoid 'sun' definition.
 
---- src/lib/astro/astrolib.h.orig      2014-10-23 21:53:08.000000000 +0000
+--- src/lib/astro/astrolib.h.orig      2025-10-06 03:25:22.000000000 +0000
 +++ src/lib/astro/astrolib.h
-@@ -139,7 +139,7 @@ class ASTROLIB_EXPORT Eclipse      // Ec
-    int lunar (double jd, double tdut);
+@@ -118,7 +118,7 @@ public:
+     int lunar(double jd, double tdut);
  
-   private: 
--   Sun200 sun;
-+   Sun200 msun;
-    Moon200 moon;
-    Vec3 rs, rm;   // position of the Sun and the Moon
-    Vec3 eshadow;  // unit vector in direction of shadow
+ private:
+-    Sun200 sun;
++    Sun200 msun;
+     Moon200 moon;
+     Vec3 rs, rm; // position of the Sun and the Moon
+     Vec3 eshadow; // unit vector in direction of shadow

Index: pkgsrc/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp
diff -u pkgsrc/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp:1.2 pkgsrc/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp:1.3
--- pkgsrc/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp:1.2  Sun Nov 24 03:41:55 2019
+++ pkgsrc/misc/marble/patches/patch-src_lib_astro_solarsystem.cpp      Sun Dec 21 14:38:39 2025
@@ -1,42 +1,42 @@
-$NetBSD: patch-src_lib_astro_solarsystem.cpp,v 1.2 2019/11/24 03:41:55 markd Exp $
+$NetBSD: patch-src_lib_astro_solarsystem.cpp,v 1.3 2025/12/21 14:38:39 markd Exp $
 
 Avoid 'sun' definition.
 
---- src/lib/astro/solarsystem.cpp.orig 2019-11-04 06:55:40.000000000 +0000
+--- src/lib/astro/solarsystem.cpp.orig 2025-10-06 03:25:22.000000000 +0000
 +++ src/lib/astro/solarsystem.cpp
-@@ -431,7 +431,7 @@ void SolarSystem::updateSolar()
+@@ -399,7 +399,7 @@ void SolarSystem::updateSolar()
  
-   const double ae = 23454.77992; // 149597870.0/6378.14 =  1AE -> Earth Radii
-   double dt, eps2;
--  Sun200 sun;
-+  Sun200 msun;
-   Moon200 moon;
-   Plan200 pln;
-   Vec3 coff, r1, v1;
-@@ -442,7 +442,7 @@ void SolarSystem::updateSolar()
-   // get positions in ecliptic coordinates of date
-   dt = ss_time + ss_del_tdut/86400.0;
-   dt = julcent (dt);
--  ss_rs = sun.position(dt);
-+  ss_rs = msun.position(dt);
-   ss_rm = moon.position(dt)/ae;
-   ss_pmer = pln.Mercury(dt);
-   ss_pven = pln.Venus(dt);
-@@ -1515,7 +1515,7 @@ Vec3 SolarSystem::SnPos (double &ep2, do
-   // return the apparent position of the Sun
-   // and the Nutation ep2 value and the ecliptic longitude of the Sun els
+     const double ae = 23454.77992; // 149597870.0/6378.14 =  1AE -> Earth Radii
+     double dt, eps2;
+-    Sun200 sun;
++    Sun200 msun;
+     Moon200 moon;
+     Plan200 pln;
+     Vec3 coff, r1, v1;
+@@ -410,7 +410,7 @@ void SolarSystem::updateSolar()
+     // get positions in ecliptic coordinates of date
+     dt = ss_time + ss_del_tdut / 86400.0;
+     dt = julcent(dt);
+-    ss_rs = sun.position(dt);
++    ss_rs = msun.position(dt);
+     ss_rm = moon.position(dt) / ae;
+     ss_pmer = pln.Mercury(dt);
+     ss_pven = pln.Venus(dt);
+@@ -1535,7 +1535,7 @@ Vec3 SolarSystem::SnPos(double &ep2, dou
+     // return the apparent position of the Sun
+     // and the Nutation ep2 value and the ecliptic longitude of the Sun els
  
--  Sun200 sun;
-+  Sun200 msun;
-   Mat3 mx;
-   Vec3 rs, s;
-   double t;
-@@ -1523,7 +1523,7 @@ Vec3 SolarSystem::SnPos (double &ep2, do
-   t = ss_time + ss_del_tdut/86400.0;
-   t = julcent (t);
+-    Sun200 sun;
++    Sun200 msun;
+     Mat3 mx;
+     Vec3 rs, s;
+     double t;
+@@ -1543,7 +1543,7 @@ Vec3 SolarSystem::SnPos(double &ep2, dou
+     t = ss_time + ss_del_tdut / 86400.0;
+     t = julcent(t);
  
--  rs = sun.position(t);
-+  rs = msun.position(t);
-   s = carpol(rs);
-   els = s[1];
+-    rs = sun.position(t);
++    rs = msun.position(t);
+     s = carpol(rs);
+     els = s[1];

Prev by Date: CVS commit: pkgsrc/misc/libkeduvocdocument
Next by Date: CVS commit: pkgsrc/misc/parley
Previous by Thread: CVS commit: pkgsrc/misc/libkeduvocdocument
Next by Thread: CVS commit: pkgsrc/misc/parley
Indexes:

Home | Main Index | Thread Index | Old Index