Update to KDE SC 4.11.3

bugfixes, many new features, improved stability and performance.

3 files changed, 96 insertions, 12 deletions

diff --git a/misc/marble/Makefile b/misc/marble/Makefile
index 533e2d86751..c14a729ada7 100644
--- a/misc/marble/Makefile
+++ b/misc/marble/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.18 2013/07/05 13:29:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2013/11/07 12:35:41 markd Exp $
 
 DISTNAME=	marble-${_KDE_VERSION}
-PKGREVISION=	4
 CATEGORIES=	misc
 COMMENT=	KDE desktop globe
 
diff --git a/misc/marble/PLIST b/misc/marble/PLIST
index aaf7785a8a2..fb3fc41a932 100644
--- a/misc/marble/PLIST
+++ b/misc/marble/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2013/04/03 10:51:55 markd Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/11/07 12:35:41 markd Exp $
 bin/marble
+bin/marble-qt
 bin/marble-touch
 bin/routing-instructions
 bin/tilecreator
@@ -26,6 +27,7 @@ include/marble/FileViewWidget.h
 include/marble/FrameGraphicsItem.h
 include/marble/GeoDataAbstractView.h
 include/marble/GeoDataAccuracy.h
+include/marble/GeoDataBalloonStyle.h
 include/marble/GeoDataColorStyle.h
 include/marble/GeoDataContainer.h
 include/marble/GeoDataCoordinates.h
@@ -36,12 +38,14 @@ include/marble/GeoDataGeometry.h
 include/marble/GeoDataGroundOverlay.h
 include/marble/GeoDataHotSpot.h
 include/marble/GeoDataIconStyle.h
+include/marble/GeoDataItemIcon.h
 include/marble/GeoDataLabelStyle.h
 include/marble/GeoDataLatLonAltBox.h
 include/marble/GeoDataLatLonBox.h
 include/marble/GeoDataLineString.h
 include/marble/GeoDataLineStyle.h
 include/marble/GeoDataLinearRing.h
+include/marble/GeoDataListStyle.h
 include/marble/GeoDataLod.h
 include/marble/GeoDataLookAt.h
 include/marble/GeoDataMultiGeometry.h
@@ -55,6 +59,9 @@ include/marble/GeoDataRegion.h
 include/marble/GeoDataStyle.h
 include/marble/GeoDataStyleMap.h
 include/marble/GeoDataStyleSelector.h
+include/marble/GeoDataTimePrimitive.h
+include/marble/GeoDataTimeSpan.h
+include/marble/GeoDataTimeStamp.h
 include/marble/GeoDataTrack.h
 include/marble/GeoDataTreeModel.h
 include/marble/GeoDocument.h
@@ -68,11 +75,12 @@ include/marble/LatLonEdit.h
 include/marble/LayerInterface.h
 include/marble/LegendWidget.h
 include/marble/Maneuver.h
+include/marble/MapThemeDownloadDialog.h
 include/marble/MapThemeManager.h
 include/marble/MapViewWidget.h
 include/marble/MapWizard.h
 include/marble/MarbleAboutDialog.h
-include/marble/MarbleAbstractRunner.h
+include/marble/MarbleColors.h
 include/marble/MarbleControlBox.h
 include/marble/MarbleDirs.h
 include/marble/MarbleGlobal.h
@@ -82,11 +90,13 @@ 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/NavigationWidget.h
 include/marble/ParseRunnerPlugin.h
+include/marble/ParsingRunner.h
 include/marble/Planet.h
 include/marble/PluginAboutDialog.h
 include/marble/PluginInterface.h
@@ -96,6 +106,7 @@ include/marble/QtMarbleConfigDialog.h
 include/marble/Quaternion.h
 include/marble/RenderPlugin.h
 include/marble/RenderPluginInterface.h
+include/marble/ReverseGeocodingRunner.h
 include/marble/ReverseGeocodingRunnerPlugin.h
 include/marble/Route.h
 include/marble/RouteRequest.h
@@ -103,9 +114,11 @@ include/marble/RouteSegment.h
 include/marble/RoutingManager.h
 include/marble/RoutingModel.h
 include/marble/RoutingProfile.h
+include/marble/RoutingRunner.h
 include/marble/RoutingRunnerPlugin.h
 include/marble/RoutingWidget.h
 include/marble/ScreenGraphicsItem.h
+include/marble/SearchRunner.h
 include/marble/SearchRunnerPlugin.h
 include/marble/Serializable.h
 include/marble/SphericalProjection.h
@@ -124,6 +137,7 @@ include/marble/marble_export.h
 lib/kde4/libmarble_part.so
 lib/kde4/plasma_applet_worldclock.so
 lib/kde4/plasma_runner_marble.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
@@ -143,6 +157,7 @@ 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
@@ -154,17 +169,18 @@ 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/QNamNetworkPlugin.so
 lib/kde4/plugins/marble/RouteSimulationPositionProviderPlugin.so
 lib/kde4/plugins/marble/RoutingPlugin.so
 lib/kde4/plugins/marble/RoutinoPlugin.so
@@ -176,8 +192,8 @@ lib/kde4/plugins/marble/Weather.so
 lib/kde4/plugins/marble/Wikipedia.so
 lib/kde4/plugins/marble/YoursPlugin.so
 lib/libmarblewidget.so
-lib/libmarblewidget.so.0.15.0
-lib/libmarblewidget.so.15
+lib/libmarblewidget.so.0.16.2
+lib/libmarblewidget.so.16
 qt4/imports/org/kde/edu/marble/MarbleSettings.qml
 qt4/imports/org/kde/edu/marble/libMarbleDeclarativePlugin.so
 qt4/imports/org/kde/edu/marble/qmldir
@@ -199,6 +215,7 @@ share/applications/kde4/marble_kml.desktop
 share/applications/kde4/marble_osm.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
@@ -265,7 +282,6 @@ share/kde/apps/marble/data/bitmaps/default_location.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/hand.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
@@ -346,7 +362,22 @@ share/kde/apps/marble/data/bitmaps/routing_pick.png
 share/kde/apps/marble/data/bitmaps/routing_remove.png
 share/kde/apps/marble/data/bitmaps/routing_step.png
 share/kde/apps/marble/data/bitmaps/satellite.png
+share/kde/apps/marble/data/bitmaps/shadowframe.png
 share/kde/apps/marble/data/bitmaps/shipwreck.png
+share/kde/apps/marble/data/bitmaps/stars/star_0_blue.png
+share/kde/apps/marble/data/bitmaps/stars/star_0_bluewhite.png
+share/kde/apps/marble/data/bitmaps/stars/star_0_garnetred.png
+share/kde/apps/marble/data/bitmaps/stars/star_0_orange.png
+share/kde/apps/marble/data/bitmaps/stars/star_0_red.png
+share/kde/apps/marble/data/bitmaps/stars/star_0_white.png
+share/kde/apps/marble/data/bitmaps/stars/star_0_yellow.png
+share/kde/apps/marble/data/bitmaps/stars/star_3_blue.png
+share/kde/apps/marble/data/bitmaps/stars/star_3_bluewhite.png
+share/kde/apps/marble/data/bitmaps/stars/star_3_garnetred.png
+share/kde/apps/marble/data/bitmaps/stars/star_3_orange.png
+share/kde/apps/marble/data/bitmaps/stars/star_3_red.png
+share/kde/apps/marble/data/bitmaps/stars/star_3_white.png
+share/kde/apps/marble/data/bitmaps/stars/star_3_yellow.png
 share/kde/apps/marble/data/bitmaps/turn-around.png
 share/kde/apps/marble/data/bitmaps/turn-continue.png
 share/kde/apps/marble/data/bitmaps/turn-exit-left.png
@@ -645,6 +676,50 @@ share/kde/apps/marble/data/maps/earth/openstreetmap/legend/bridleway.png
 share/kde/apps/marble/data/maps/earth/openstreetmap/legend/byway.png
 share/kde/apps/marble/data/maps/earth/openstreetmap/legend/cycleway.png
 share/kde/apps/marble/data/maps/earth/openstreetmap/legend/footway.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/accommodation_hotel2.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/accommodation_motel.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_court.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_firestation.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_library.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_playground.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_post_office.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_public_building.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/amenity_toilets.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/education_college.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/education_nursery.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/education_school.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/education_university.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_bar.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_biergarten.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_cafe.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_drinkingtap.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_fastfood.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_ice_cream.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_pub.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/food_restaurant.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_dentist.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_doctors.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_hospital.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_pharmacy.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/health_veterinary.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/money_atm.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/money_bank.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/money_currency_exchange.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/place_of_worship_christian.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/place_of_worship_unknown.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/poi_embassy.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/power_station_gas.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_alcohol.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_bakery.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_book.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_car.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_clothes.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_convenience.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/shopping_gift.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/tourist_cinema.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/tourist_monument.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/tourist_ruin.p.12.png
+share/kde/apps/marble/data/maps/earth/openstreetmap/legend/mapicons/tourist_theatre.p.12.png
 share/kde/apps/marble/data/maps/earth/openstreetmap/legend/motorway.png
 share/kde/apps/marble/data/maps/earth/openstreetmap/legend/primaryroad.png
 share/kde/apps/marble/data/maps/earth/openstreetmap/legend/railway.png
@@ -873,6 +948,12 @@ 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/placemarks/baseplacemarks.cache
 share/kde/apps/marble/data/placemarks/boundaryplacemarks.cache
 share/kde/apps/marble/data/placemarks/cityplacemarks.cache
@@ -882,6 +963,9 @@ share/kde/apps/marble/data/placemarks/moonterrain.cache
 share/kde/apps/marble/data/placemarks/otherplacemarks.cache
 share/kde/apps/marble/data/precipcolors.leg
 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/stars.dat
 share/kde/apps/marble/data/svg/application-x-marble-gray.png
 share/kde/apps/marble/data/svg/application-x-marble.png
@@ -894,6 +978,7 @@ share/kde/apps/marble/data/svg/marble-logo-inverted-32dpi.png
 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/sun.png
 share/kde/apps/marble/data/svg/sunshine.png
 share/kde/apps/marble/data/svg/track_turtle.svg
diff --git a/misc/marble/distinfo b/misc/marble/distinfo
index 510314cfd3a..ac0bf89f654 100644
--- a/misc/marble/distinfo
+++ b/misc/marble/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.6 2013/06/24 06:52:52 jperkin Exp $
+$NetBSD: distinfo,v 1.7 2013/11/07 12:35:41 markd Exp $
 
-SHA1 (marble-4.10.3.tar.xz) = 814fffa64d91bec647c3f7e5cb130a2027dd6815
-RMD160 (marble-4.10.3.tar.xz) = f8fe39d776d6d67b1f2b42bb17a8cf6868f08354
-Size (marble-4.10.3.tar.xz) = 19449908 bytes
+SHA1 (marble-4.11.3.tar.xz) = b0b0cf06b4c60262861e748c6815d62513df13a7
+RMD160 (marble-4.11.3.tar.xz) = 35bed4c5ef017a5728da14e538ffbd1ab10edf6f
+Size (marble-4.11.3.tar.xz) = 19060368 bytes
 SHA1 (patch-src_plugins_render_satellites_mex_astrolib.h) = acc3477ca16f20f02c3fcdbb8285d9e9a3ec1706
 SHA1 (patch-src_plugins_render_stars_StarsPlugin.cpp) = 0c12eb09d4bd7601236bde2e586000afd2fef18d