pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/misc/marble marble: update to 19.08.3 qt5/kf5 version



details:   https://anonhg.NetBSD.org/pkgsrc/rev/64ac6f5ad25d
branches:  trunk
changeset: 405173:64ac6f5ad25d
user:      markd <markd%pkgsrc.org@localhost>
date:      Sun Nov 24 03:41:55 2019 +0000

description:
marble: update to 19.08.3   qt5/kf5 version

diffstat:

 misc/marble/DESCR                                       |    21 +-
 misc/marble/Makefile                                    |    47 +-
 misc/marble/PLIST                                       |  2699 +++++++++-----
 misc/marble/buildlink3.mk                               |     7 +-
 misc/marble/distinfo                                    |    12 +-
 misc/marble/patches/patch-src_lib_astro_solarsystem.cpp |    14 +-
 6 files changed, 1846 insertions(+), 954 deletions(-)

diffs (truncated from 2978 to 300 lines):

diff -r b163eb83be6c -r 64ac6f5ad25d misc/marble/DESCR
--- a/misc/marble/DESCR Sun Nov 24 03:15:11 2019 +0000
+++ b/misc/marble/DESCR Sun Nov 24 03:41:55 2019 +0000
@@ -1,1 +1,20 @@
-KDE desktop globe
+Marble is an application that displays a view of the earth.  It is
+both a valuable application in its own right, but also an example
+program that shows how you can use the Marble widgets in your own
+applications.
+
+The Marble application makes use of the following classes and widgets:
+
+1. MarbleWidget, the main widget in any application using the Marble
+   framework.  This widget displays a view of the earth or any other
+   globe, depending on which dataset is used.  The user can navigate
+   the globe using either a control widget, e.g. the MarbleNavigator,
+   or the mouse.
+
+2. MarbleModel, the data storage class that holds the data that is
+   visualized in the MarbleWidget. The MarbleModel is created internally
+   and can be accessed using the model() method.
+
+These two classes provide the core of the classes that comprise the
+Marble framework.  You can use only them and get a very capable
+application.
diff -r b163eb83be6c -r 64ac6f5ad25d misc/marble/Makefile
--- a/misc/marble/Makefile      Sun Nov 24 03:15:11 2019 +0000
+++ b/misc/marble/Makefile      Sun Nov 24 03:41:55 2019 +0000
@@ -1,21 +1,44 @@
-# $NetBSD: Makefile,v 1.45 2019/11/03 17:04:24 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2019/11/24 03:41:55 markd Exp $
+
+DISTNAME=      marble-${KAPPSVER}
+CATEGORIES=    misc
 
-DISTNAME=      marble-${_KDE_VERSION}
-PKGREVISION=   14
-CATEGORIES=    misc
+HOMEPAGE=      https://kde.org/applications/system/marble/
 COMMENT=       KDE desktop globe
+LICENSE=       gnu-lgpl-v2 AND gnu-gpl-v3 AND gnu-fdl-v1.2
+
+.include "../../meta-pkgs/kde/applications.mk"
+
+BUILD_DEPENDS+=        kdoctools>=${KF5VER}:../../devel/kdoctools
+
+USE_TOOLS+=    msgmerge perl
 
-# .../src/apps/marble-kde/marble_part.cpp:106:10: fatal error: 'settings.h' file not found
-MAKE_JOBS_SAFE=        no
-
-.include "../../meta-pkgs/kde4/Makefile.kde4"
+SUBST_CLASSES+=                fix-moc
+SUBST_STAGE.fix-moc=   post-configure
+SUBST_MESSAGE.fix-moc= Cleaning up MOC includes
+#SUBST_FILES.fix-moc=  _KDE_build/src/plugins/*/*/CMakeFiles/*_autogen.dir/AutogenInfo.cmake
+SUBST_FILES.fix-moc=   _KDE_build/src/apps/*/CMakeFiles/*_autogen.dir/AutogenInfo.cmake
+SUBST_SED.fix-moc=     -e 's,;${PREFIX}/include;,;,g'
 
-CMAKE_ARGS+=   -DWITH_libgps:BOOL=OFF
+SUBST_CLASSES+=                xdg
+SUBST_STAGE.xdg=       pre-configure
+SUBST_MESSAGE.xdg=     Install via examples dir.
+SUBST_FILES.xdg=       src/apps/marble-kde/CMakeLists.txt
+SUBST_SED.xdg=         -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
 
-.include "../../meta-pkgs/kde4/kde4.mk"
+MAKE_DIRS+=    ${PKG_SYSCONFDIR}/xdg
+CONF_FILES+=   ${PREFIX}/share/examples/kde-xdg/marble.knsrc \
+               ${PKG_SYSCONFDIR}/xdg/marble.knsrc
 
+.include "../../devel/kparts/buildlink3.mk"
+.include "../../devel/krunner/buildlink3.mk"
+.include "../../geography/gpsd/buildlink3.mk"
+.include "../../geography/shapelib/buildlink3.mk"
+.include "../../net/knewstuff/buildlink3.mk"
+.include "../../multimedia/phonon-qt5/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
-
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtserialport/buildlink3.mk"
+#.include "../../x11/qt5-qtwebengine/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r b163eb83be6c -r 64ac6f5ad25d misc/marble/PLIST
--- a/misc/marble/PLIST Sun Nov 24 03:15:11 2019 +0000
+++ b/misc/marble/PLIST Sun Nov 24 03:41:55 2019 +0000
@@ -1,8 +1,6 @@
-@comment $NetBSD: PLIST,v 1.6 2014/11/13 19:19:06 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2019/11/24 03:41:55 markd Exp $
 bin/marble
-bin/marble-mobile
 bin/marble-qt
-bin/marble-touch
 include/astro/astr2lib.h
 include/astro/astrolib.h
 include/astro/astrolib_export.h
@@ -17,17 +15,22 @@
 include/marble/AbstractMarbleGraphicsLayout.h
 include/marble/AbstractProjection.h
 include/marble/AbstractWorkerThread.h
+include/marble/AddLinkDialog.h
 include/marble/AlternativeRoutesModel.h
 include/marble/AutoNavigation.h
 include/marble/BillboardGraphicsItem.h
 include/marble/BookmarkManager.h
+include/marble/CelestialSortFilterProxyModel.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
 include/marble/DialogConfigurationInterface.h
 include/marble/DownloadRegion.h
 include/marble/DownloadRegionDialog.h
+include/marble/EditPlacemarkDialog.h
 include/marble/ElevationModel.h
 include/marble/FileViewWidget.h
+include/marble/FlyToEditWidget.h
+include/marble/FormattedTextWidget.h
 include/marble/FrameGraphicsItem.h
 include/marble/GeoDataAbstractView.h
 include/marble/GeoDataAccuracy.h
@@ -61,6 +64,7 @@
 include/marble/GeoDataPolyStyle.h
 include/marble/GeoDataPolygon.h
 include/marble/GeoDataRegion.h
+include/marble/GeoDataRelation.h
 include/marble/GeoDataSnippet.h
 include/marble/GeoDataStyle.h
 include/marble/GeoDataStyleMap.h
@@ -70,11 +74,13 @@
 include/marble/GeoDataTimeStamp.h
 include/marble/GeoDataTrack.h
 include/marble/GeoDataTreeModel.h
+include/marble/GeoDataTypes.h
 include/marble/GeoDocument.h
 include/marble/GeoGraphicsItem.h
 include/marble/GeoGraphicsScene.h
 include/marble/GeoPainter.h
 include/marble/GeoWriter.h
+include/marble/HttpDownloadManager.h
 include/marble/LabelGraphicsItem.h
 include/marble/LatLonBoxWidget.h
 include/marble/LatLonEdit.h
@@ -83,11 +89,11 @@
 include/marble/Maneuver.h
 include/marble/MapThemeDownloadDialog.h
 include/marble/MapThemeManager.h
+include/marble/MapViewItemDelegate.h
 include/marble/MapViewWidget.h
 include/marble/MapWizard.h
 include/marble/MarbleAboutDialog.h
 include/marble/MarbleColors.h
-include/marble/MarbleControlBox.h
 include/marble/MarbleDebug.h
 include/marble/MarbleDirs.h
 include/marble/MarbleGlobal.h
@@ -96,17 +102,21 @@
 include/marble/MarbleInputHandler.h
 include/marble/MarbleLocale.h
 include/marble/MarbleMap.h
+include/marble/MarbleMath.h
 include/marble/MarbleModel.h
 include/marble/MarbleNavigator.h
-include/marble/MarbleWebView.h
 include/marble/MarbleWidget.h
 include/marble/MarbleWidgetInputHandler.h
 include/marble/MarbleWidgetPopupMenu.h
-include/marble/NavigationWidget.h
+include/marble/NullMarbleWebView.h
+include/marble/NullTinyWebBrowser.h
+include/marble/OsmcSymbol.h
 include/marble/ParseRunnerPlugin.h
 include/marble/ParsingRunner.h
 include/marble/ParsingRunnerManager.h
+include/marble/PlacemarkEditHeader.h
 include/marble/Planet.h
+include/marble/PlanetFactory.h
 include/marble/PluginAboutDialog.h
 include/marble/PluginInterface.h
 include/marble/PluginManager.h
@@ -115,6 +125,7 @@
 include/marble/PositionTracking.h
 include/marble/QtMarbleConfigDialog.h
 include/marble/Quaternion.h
+include/marble/RemoveItemEditWidget.h
 include/marble/RenderPlugin.h
 include/marble/RenderPluginInterface.h
 include/marble/RenderState.h
@@ -136,943 +147,1783 @@
 include/marble/SearchRunnerManager.h
 include/marble/SearchRunnerPlugin.h
 include/marble/Serializable.h
+include/marble/SoundCueEditWidget.h
 include/marble/SunLocator.h
 include/marble/TileCoordsPyramid.h
 include/marble/TileCreator.h
 include/marble/TileCreatorDialog.h
 include/marble/TileId.h
 include/marble/TileLevelRangeWidget.h
-include/marble/TinyWebBrowser.h
+include/marble/TourControlEditWidget.h
+include/marble/TourItemDelegate.h
 include/marble/TourPlayback.h
 include/marble/TourWidget.h
 include/marble/ViewportParams.h
+include/marble/WaitEditWidget.h
 include/marble/WidgetGraphicsItem.h
 include/marble/geodata_export.h
-include/marble/global.h
 include/marble/marble_export.h
-lib/kde4/libmarble_part.so
-lib/kde4/marblethumbnail.so
-lib/kde4/plasma_applet_worldclock.so
-lib/kde4/plasma_runner_marble.so
-lib/kde4/plugins/designer/LatLonEditPlugin.so
-lib/kde4/plugins/designer/MarbleNavigatorPlugin.so
-lib/kde4/plugins/designer/MarbleWidgetPlugin.so
-lib/kde4/plugins/marble/AnnotatePlugin.so
-lib/kde4/plugins/marble/AprsPlugin.so
-lib/kde4/plugins/marble/AtmospherePlugin.so
-lib/kde4/plugins/marble/CachePlugin.so
-lib/kde4/plugins/marble/CompassFloatItem.so
-lib/kde4/plugins/marble/CrosshairsPlugin.so
-lib/kde4/plugins/marble/CycleStreetsPlugin.so
-lib/kde4/plugins/marble/EarthquakePlugin.so
-lib/kde4/plugins/marble/EclipsesPlugin.so
-lib/kde4/plugins/marble/ElevationProfileFloatItem.so
-lib/kde4/plugins/marble/ElevationProfileMarker.so
-lib/kde4/plugins/marble/FlightGearPositionProviderPlugin.so
-lib/kde4/plugins/marble/FoursquarePlugin.so
-lib/kde4/plugins/marble/GosmoreReverseGeocodingPlugin.so
-lib/kde4/plugins/marble/GosmoreRoutingPlugin.so
-lib/kde4/plugins/marble/GpsInfo.so
-lib/kde4/plugins/marble/GpsbabelPlugin.so
-lib/kde4/plugins/marble/GpxPlugin.so
-lib/kde4/plugins/marble/GraticulePlugin.so
-lib/kde4/plugins/marble/HostipPlugin.so
-lib/kde4/plugins/marble/JsonPlugin.so
-lib/kde4/plugins/marble/KmlPlugin.so
-lib/kde4/plugins/marble/LatLonPlugin.so
-lib/kde4/plugins/marble/License.so
-lib/kde4/plugins/marble/LocalDatabasePlugin.so
-lib/kde4/plugins/marble/LocalOsmSearchPlugin.so
-lib/kde4/plugins/marble/LogPlugin.so
-lib/kde4/plugins/marble/MapQuestPlugin.so
-lib/kde4/plugins/marble/MapScaleFloatItem.so
-lib/kde4/plugins/marble/MeasureTool.so
-lib/kde4/plugins/marble/MonavPlugin.so
-lib/kde4/plugins/marble/NavigationFloatItem.so
-lib/kde4/plugins/marble/NominatimReverseGeocodingPlugin.so
-lib/kde4/plugins/marble/NominatimSearchPlugin.so
-lib/kde4/plugins/marble/OSRMPlugin.so
-lib/kde4/plugins/marble/OpenCachingComPlugin.so
-lib/kde4/plugins/marble/OpenDesktopPlugin.so
-lib/kde4/plugins/marble/OpenRouteServicePlugin.so
-lib/kde4/plugins/marble/OsmPlugin.so
-lib/kde4/plugins/marble/OverviewMap.so
-lib/kde4/plugins/marble/Photo.so
-lib/kde4/plugins/marble/PlacemarkPositionProviderPlugin.so
-lib/kde4/plugins/marble/Pn2Plugin.so
-lib/kde4/plugins/marble/PntPlugin.so
-lib/kde4/plugins/marble/PositionMarker.so
-lib/kde4/plugins/marble/PostalCode.so
-lib/kde4/plugins/marble/ProgressFloatItem.so
-lib/kde4/plugins/marble/RouteSimulationPositionProviderPlugin.so
-lib/kde4/plugins/marble/RoutingPlugin.so
-lib/kde4/plugins/marble/RoutinoPlugin.so
-lib/kde4/plugins/marble/SatellitesPlugin.so
-lib/kde4/plugins/marble/Speedometer.so
-lib/kde4/plugins/marble/StarsPlugin.so
-lib/kde4/plugins/marble/SunPlugin.so
-lib/kde4/plugins/marble/Weather.so
-lib/kde4/plugins/marble/Wikipedia.so
-lib/kde4/plugins/marble/YoursPlugin.so
+lib/cmake/Astro/AstroConfig.cmake
+lib/cmake/Astro/AstroConfigVersion.cmake
+lib/cmake/Astro/AstroTargets-noconfig.cmake
+lib/cmake/Astro/AstroTargets.cmake
+lib/cmake/Marble/MarbleConfig.cmake
+lib/cmake/Marble/MarbleConfigVersion.cmake
+lib/cmake/Marble/MarbleTargets-noconfig.cmake
+lib/cmake/Marble/MarbleTargets.cmake
 lib/libastro.so
 lib/libastro.so.0.17.20
 lib/libastro.so.1
-lib/libmarblewidget.so
-lib/libmarblewidget.so.0.19.2
-lib/libmarblewidget.so.19
-qt4/imports/org/kde/edu/marble/MarbleSettings.qml
-qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
-qt4/imports/org/kde/edu/marble/qmldir
-share/appdata/marble.appdata.xml
-share/applications/kde4/marble-mobile.desktop
-share/applications/kde4/marble-qt.desktop
-share/applications/kde4/marble-touch.desktop
-share/applications/kde4/marble.desktop
-share/applications/kde4/marble_geo.desktop
-share/applications/kde4/marble_gpx.desktop
-share/applications/kde4/marble_kml.desktop
-share/applications/kde4/marble_osm.desktop



Home | Main Index | Thread Index | Old Index