Update to KDE SC 4.14.3

5 files changed, 90 insertions, 56 deletions

diff --git a/misc/marble/Makefile b/misc/marble/Makefile
index de92bf7c662..6bfd0e4af35 100644
--- a/misc/marble/Makefile
+++ b/misc/marble/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.27 2014/11/07 19:39:25 adam Exp $
+# $NetBSD: Makefile,v 1.28 2014/11/13 19:19:06 markd Exp $
 
 DISTNAME=	marble-${_KDE_VERSION}
-PKGREVISION=	5
 CATEGORIES=	misc
 COMMENT=	KDE desktop globe
 
diff --git a/misc/marble/PLIST b/misc/marble/PLIST
index 4fc6f8dec07..e10271dc86d 100644
--- a/misc/marble/PLIST
+++ b/misc/marble/PLIST
@@ -1,9 +1,15 @@
-@comment $NetBSD: PLIST,v 1.5 2014/02/01 02:20:50 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2014/11/13 19:19:06 markd Exp $
 bin/marble
+bin/marble-mobile
 bin/marble-qt
 bin/marble-touch
-bin/routing-instructions
-bin/tilecreator
+include/astro/astr2lib.h
+include/astro/astrolib.h
+include/astro/astrolib_export.h
+include/astro/attlib.h
+include/astro/eclsolar.h
+include/astro/planetarySats.h
+include/astro/solarsystem.h
 include/marble/AbstractDataPlugin.h
 include/marble/AbstractDataPluginItem.h
 include/marble/AbstractDataPluginModel.h
@@ -17,12 +23,10 @@ include/marble/BillboardGraphicsItem.h
 include/marble/BookmarkManager.h
 include/marble/ClipPainter.h
 include/marble/CurrentLocationWidget.h
-include/marble/CylindricalProjection.h
 include/marble/DialogConfigurationInterface.h
 include/marble/DownloadRegion.h
 include/marble/DownloadRegionDialog.h
 include/marble/ElevationModel.h
-include/marble/EquirectProjection.h
 include/marble/FileViewWidget.h
 include/marble/FrameGraphicsItem.h
 include/marble/GeoDataAbstractView.h
@@ -42,6 +46,7 @@ include/marble/GeoDataItemIcon.h
 include/marble/GeoDataLabelStyle.h
 include/marble/GeoDataLatLonAltBox.h
 include/marble/GeoDataLatLonBox.h
+include/marble/GeoDataLatLonQuad.h
 include/marble/GeoDataLineString.h
 include/marble/GeoDataLineStyle.h
 include/marble/GeoDataLinearRing.h
@@ -56,6 +61,7 @@ include/marble/GeoDataPoint.h
 include/marble/GeoDataPolyStyle.h
 include/marble/GeoDataPolygon.h
 include/marble/GeoDataRegion.h
+include/marble/GeoDataSnippet.h
 include/marble/GeoDataStyle.h
 include/marble/GeoDataStyleMap.h
 include/marble/GeoDataStyleSelector.h
@@ -82,33 +88,38 @@ 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
 include/marble/MarbleGraphicsGridLayout.h
 include/marble/MarbleGraphicsItem.h
+include/marble/MarbleInputHandler.h
+include/marble/MarbleLocale.h
 include/marble/MarbleMap.h
 include/marble/MarbleModel.h
 include/marble/MarbleNavigator.h
-include/marble/MarbleRunnerManager.h
 include/marble/MarbleWebView.h
 include/marble/MarbleWidget.h
 include/marble/MarbleWidgetInputHandler.h
-include/marble/MercatorProjection.h
+include/marble/MarbleWidgetPopupMenu.h
 include/marble/NavigationWidget.h
 include/marble/ParseRunnerPlugin.h
 include/marble/ParsingRunner.h
+include/marble/ParsingRunnerManager.h
 include/marble/Planet.h
-include/marble/PluginManager.h
-include/marble/PositionProviderPlugin.h
 include/marble/PluginAboutDialog.h
 include/marble/PluginInterface.h
+include/marble/PluginManager.h
+include/marble/PositionProviderPlugin.h
 include/marble/PositionProviderPluginInterface.h
 include/marble/PositionTracking.h
 include/marble/QtMarbleConfigDialog.h
 include/marble/Quaternion.h
 include/marble/RenderPlugin.h
 include/marble/RenderPluginInterface.h
+include/marble/RenderState.h
 include/marble/ReverseGeocodingRunner.h
+include/marble/ReverseGeocodingRunnerManager.h
 include/marble/ReverseGeocodingRunnerPlugin.h
 include/marble/Route.h
 include/marble/RouteRequest.h
@@ -117,13 +128,14 @@ include/marble/RoutingManager.h
 include/marble/RoutingModel.h
 include/marble/RoutingProfile.h
 include/marble/RoutingRunner.h
+include/marble/RoutingRunnerManager.h
 include/marble/RoutingRunnerPlugin.h
 include/marble/RoutingWidget.h
 include/marble/ScreenGraphicsItem.h
 include/marble/SearchRunner.h
+include/marble/SearchRunnerManager.h
 include/marble/SearchRunnerPlugin.h
 include/marble/Serializable.h
-include/marble/SphericalProjection.h
 include/marble/SunLocator.h
 include/marble/TileCoordsPyramid.h
 include/marble/TileCreator.h
@@ -131,21 +143,29 @@ include/marble/TileCreatorDialog.h
 include/marble/TileId.h
 include/marble/TileLevelRangeWidget.h
 include/marble/TinyWebBrowser.h
+include/marble/TourPlayback.h
+include/marble/TourWidget.h
 include/marble/ViewportParams.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
@@ -153,6 +173,7 @@ 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
@@ -193,34 +214,32 @@ 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/libastro.so
+lib/libastro.so.0.17.20
+lib/libastro.so.1
 lib/libmarblewidget.so
-lib/libmarblewidget.so.0.16.5
-lib/libmarblewidget.so.16
+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
-qt4/imports/org/kde/edu/marble/qtcomponents/FileDialog.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/FileOpenDialog.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/FileSaveDialog.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/MarbleMenuLayout.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/MarbleToolIcon.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/MenuItemSwitch.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/PlacemarkEditor.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/RouteEditor.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/SearchField.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/ViaPointEditor.qml
-qt4/imports/org/kde/edu/marble/qtcomponents/libQtComponentsPlugin.so
-qt4/imports/org/kde/edu/marble/qtcomponents/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
+share/applications/kde4/marble_worldwind.desktop
 share/doc/kde/HTML/en/marble/common
 share/doc/kde/HTML/en/marble/configure-cacheproxy.png
 share/doc/kde/HTML/en/marble/configure-dateandtime.png
 share/doc/kde/HTML/en/marble/configure-navigation.png
 share/doc/kde/HTML/en/marble/configure-plugins.png
 share/doc/kde/HTML/en/marble/configure-routing.png
+share/doc/kde/HTML/en/marble/configure-synchronization.png
 share/doc/kde/HTML/en/marble/configure-view.png
 share/doc/kde/HTML/en/marble/download-region-1.png
 share/doc/kde/HTML/en/marble/download-region-2.png
@@ -251,9 +270,13 @@ share/kde/apps/marble/data/audio/KDE-Sys-App-Positive.ogg
 share/kde/apps/marble/data/audio/KDE-Sys-List-End.ogg
 share/kde/apps/marble/data/bitmaps/airport.png
 share/kde/apps/marble/data/bitmaps/annotation.png
+share/kde/apps/marble/data/bitmaps/antarctic_shelves.png
+share/kde/apps/marble/data/bitmaps/audio-x-generic.png
 share/kde/apps/marble/data/bitmaps/bookmark.png
 share/kde/apps/marble/data/bitmaps/border_1.png
 share/kde/apps/marble/data/bitmaps/border_2.png
+share/kde/apps/marble/data/bitmaps/border_disputed.png
+share/kde/apps/marble/data/bitmaps/border_maritime.png
 share/kde/apps/marble/data/bitmaps/city_1_orange.png
 share/kde/apps/marble/data/bitmaps/city_1_red.png
 share/kde/apps/marble/data/bitmaps/city_1_white.png
@@ -281,9 +304,11 @@ share/kde/apps/marble/data/bitmaps/cursor_tc.png
 share/kde/apps/marble/data/bitmaps/cursor_tl.png
 share/kde/apps/marble/data/bitmaps/cursor_tr.png
 share/kde/apps/marble/data/bitmaps/default_location.png
+share/kde/apps/marble/data/bitmaps/document-edit.png
 share/kde/apps/marble/data/bitmaps/earth_apollo.jpg
 share/kde/apps/marble/data/bitmaps/flag.png
 share/kde/apps/marble/data/bitmaps/folder.png
+share/kde/apps/marble/data/bitmaps/glacier.png
 share/kde/apps/marble/data/bitmaps/highway_footway.png
 share/kde/apps/marble/data/bitmaps/highway_motorway.png
 share/kde/apps/marble/data/bitmaps/highway_path.png
@@ -294,13 +319,17 @@ share/kde/apps/marble/data/bitmaps/highway_track.png
 share/kde/apps/marble/data/bitmaps/highway_trunk.png
 share/kde/apps/marble/data/bitmaps/highway_unclassified.png
 share/kde/apps/marble/data/bitmaps/lake.png
+share/kde/apps/marble/data/bitmaps/lake_historic.png
 share/kde/apps/marble/data/bitmaps/manned_landing.png
+share/kde/apps/marble/data/bitmaps/media-playback-pause.png
 share/kde/apps/marble/data/bitmaps/mountain_1.png
 share/kde/apps/marble/data/bitmaps/nation.png
 share/kde/apps/marble/data/bitmaps/observatory.png
 share/kde/apps/marble/data/bitmaps/ocean.png
 share/kde/apps/marble/data/bitmaps/osm.png
 share/kde/apps/marble/data/bitmaps/other.png
+share/kde/apps/marble/data/bitmaps/playa.png
+share/kde/apps/marble/data/bitmaps/player-time.png
 share/kde/apps/marble/data/bitmaps/poi/accommodation_camping.p.16.png
 share/kde/apps/marble/data/bitmaps/poi/accommodation_hostel.p.16.png
 share/kde/apps/marble/data/bitmaps/poi/accommodation_hotel2.p.16.png
@@ -397,6 +426,7 @@ share/kde/apps/marble/data/bitmaps/turn-slight-left.png
 share/kde/apps/marble/data/bitmaps/turn-slight-right.png
 share/kde/apps/marble/data/bitmaps/unmanned_hard_landing.png
 share/kde/apps/marble/data/bitmaps/unmanned_soft_landing.png
+share/kde/apps/marble/data/bitmaps/urban_area.png
 share/kde/apps/marble/data/bitmaps/valley.png
 share/kde/apps/marble/data/bitmaps/volcano_1.png
 share/kde/apps/marble/data/bitmaps/waypoint.png
@@ -740,6 +770,8 @@ share/kde/apps/marble/data/maps/earth/openstreetmap/openstreetmap-preview.png
 share/kde/apps/marble/data/maps/earth/openstreetmap/openstreetmap.dgml
 share/kde/apps/marble/data/maps/earth/plain/plain-preview.png
 share/kde/apps/marble/data/maps/earth/plain/plain.dgml
+share/kde/apps/marble/data/maps/earth/political/political-preview.png
+share/kde/apps/marble/data/maps/earth/political/political.dgml
 share/kde/apps/marble/data/maps/earth/precip-dec/precip-dec-preview.png
 share/kde/apps/marble/data/maps/earth/precip-dec/precip-dec.dgml
 share/kde/apps/marble/data/maps/earth/precip-dec/precip-dec.jpg
@@ -941,6 +973,7 @@ share/kde/apps/marble/data/maps/moon/clementine/clementine-preview.png
 share/kde/apps/marble/data/maps/moon/clementine/clementine.dgml
 share/kde/apps/marble/data/maps/moon/clementine/clementine.jpg
 share/kde/apps/marble/data/maps/moon/clementine/legend.html
+share/kde/apps/marble/data/maps/moon/clementine/tour.kml
 share/kde/apps/marble/data/mwdbii/DATELINE.PNT
 share/kde/apps/marble/data/mwdbii/PCOAST.PNT
 share/kde/apps/marble/data/mwdbii/PDIFFBORDER.PNT
@@ -950,12 +983,24 @@ share/kde/apps/marble/data/mwdbii/PLAKE.PNT
 share/kde/apps/marble/data/mwdbii/PLAKEISLAND.PNT
 share/kde/apps/marble/data/mwdbii/PUSA48.DIFF.PNT
 share/kde/apps/marble/data/mwdbii/RIVER.PNT
-share/kde/apps/marble/data/naturalearth/50m-urban-area.pn2
-share/kde/apps/marble/data/naturalearth/50m_glaciated_areas.pn2
-share/kde/apps/marble/data/naturalearth/50m_lakes.pn2
-share/kde/apps/marble/data/naturalearth/50m_land.pn2
 share/kde/apps/marble/data/naturalearth/ne_10m_admin_0_boundary_lines_land.pn2
 share/kde/apps/marble/data/naturalearth/ne_10m_rivers_lake_centerlines.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_boundary_lines_land.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_boundary_lines_maritime_indicator.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_breakaway_disputed_areas.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_countries.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_0_pacific_groupings.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_admin_1_states_provinces_lines.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_antarctic_ice_shelves_lines.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_antarctic_ice_shelves_polys.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_coastline.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_glaciated_areas.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_lakes.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_lakes_historic.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_land.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_playas.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_rivers_lake_centerlines.pn2
+share/kde/apps/marble/data/naturalearth/ne_50m_urban_areas.pn2
 share/kde/apps/marble/data/placemarks/baseplacemarks.cache
 share/kde/apps/marble/data/placemarks/boundaryplacemarks.cache
 share/kde/apps/marble/data/placemarks/cityplacemarks.cache
@@ -968,11 +1013,13 @@ share/kde/apps/marble/data/seacolors.leg
 share/kde/apps/marble/data/stars/constellations.dat
 share/kde/apps/marble/data/stars/deepsky.png
 share/kde/apps/marble/data/stars/dso.dat
+share/kde/apps/marble/data/stars/names.csv
 share/kde/apps/marble/data/stars/stars.dat
 share/kde/apps/marble/data/svg/application-x-marble-gray.png
 share/kde/apps/marble/data/svg/application-x-marble.png
 share/kde/apps/marble/data/svg/application-x-marble.svg
 share/kde/apps/marble/data/svg/coordinate.svg
+share/kde/apps/marble/data/svg/glow.png
 share/kde/apps/marble/data/svg/lunarmap.svg
 share/kde/apps/marble/data/svg/marble-logo-32dpi.png
 share/kde/apps/marble/data/svg/marble-logo-72dpi.png
@@ -981,6 +1028,7 @@ share/kde/apps/marble/data/svg/marble-logo-inverted-72dpi.png
 share/kde/apps/marble/data/svg/marble-logo.png
 share/kde/apps/marble/data/svg/marble-logo.svg
 share/kde/apps/marble/data/svg/marsmap.svg
+share/kde/apps/marble/data/svg/moon.png
 share/kde/apps/marble/data/svg/sun.png
 share/kde/apps/marble/data/svg/sunshine.png
 share/kde/apps/marble/data/svg/track_turtle.svg
@@ -1022,6 +1070,9 @@ share/kde4/services/marble_part.desktop
 share/kde4/services/marble_part_gpx.desktop
 share/kde4/services/marble_part_kml.desktop
 share/kde4/services/marble_part_osm.desktop
+share/kde4/services/marble_thumbnail_gpx.desktop
+share/kde4/services/marble_thumbnail_kml.desktop
+share/kde4/services/marble_thumbnail_osm.desktop
 share/kde4/services/plasma-applet-kworldclock.desktop
 share/kde4/services/plasma-runner-marble.desktop
 share/mime/packages/geo.xml
diff --git a/misc/marble/distinfo b/misc/marble/distinfo
index d2465814c6f..9dad6a8ad24 100644
--- a/misc/marble/distinfo
+++ b/misc/marble/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2014/02/01 02:20:50 markd Exp $
+$NetBSD: distinfo,v 1.9 2014/11/13 19:19:06 markd Exp $
 
-SHA1 (marble-4.11.5.tar.xz) = b1aeaab423b553e6e18298fd76ec7bee843dcdb4
-RMD160 (marble-4.11.5.tar.xz) = 38a08a7e7b1b5bd016aedd930c392aa47d116627
-Size (marble-4.11.5.tar.xz) = 18950820 bytes
-SHA1 (patch-src_plugins_render_satellites_mex_astrolib.h) = acc3477ca16f20f02c3fcdbb8285d9e9a3ec1706
-SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 0c12eb09d4bd7601236bde2e586000afd2fef18d
+SHA1 (marble-4.14.3.tar.xz) = e2b039e61bdf828e30dd078c5bd5b55df0f5ef2b
+RMD160 (marble-4.14.3.tar.xz) = 13f10ab9fc4d0e963eb258854102172ade68bc91
+Size (marble-4.14.3.tar.xz) = 19709200 bytes
+SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 06fdce98d53db7a74e972dcc39459016646246d0
diff --git a/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h b/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h
deleted file mode 100644
index a3356d8627e..00000000000
--- a/misc/marble/patches/patch-src_plugins_render_satellites_mex_astrolib.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_plugins_render_satellites_mex_astrolib.h,v 1.1 2013/06/24 06:52:52 jperkin Exp $
-
-Avoid 'sun' clash.
-
---- src/plugins/render/satellites/mex/astrolib.h.orig	2013-05-03 04:38:26.036168912 +0000
-+++ src/plugins/render/satellites/mex/astrolib.h
-@@ -13,6 +13,8 @@
- 
- #include "attlib.h"
- 
-+#undef sun
-+
- double ddd (int d, int m, double s); // deg, min, sec -> decimal degrees
- void dms (double dd, int &d, int &m, double &s); // dec deg -> deg, min, sec
- double mjd (int day, int month, int year, double hour); // modified Julian date
diff --git a/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp b/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
index 6d72e7c52d2..2d9a503d2b7 100644
--- a/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
+++ b/misc/marble/patches/patch-src_plugins_render_stars_StarsPlugin.cpp
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_plugins_render_stars_StarsPlugin.cpp,v 1.1 2013/06/24 06:52:52 jperkin Exp $
+$NetBSD: patch-src_plugins_render_stars_StarsPlugin.cpp,v 1.2 2014/11/13 19:19:06 markd Exp $
 
 Avoid 'sun' clash.
 
---- src/plugins/render/stars/StarsPlugin.cpp.orig	2013-05-03 04:38:26.039168883 +0000
+--- src/plugins/render/stars/StarsPlugin.cpp.orig	2014-10-23 21:53:08.000000000 +0000
 +++ src/plugins/render/stars/StarsPlugin.cpp
-@@ -23,6 +23,8 @@
- #include "SunLocator.h"
- #include "ViewportParams.h"
+@@ -34,6 +34,8 @@
+ 
+ #include "src/lib/astro/solarsystem.h"
  
 +#undef sun
 +