Merge remote branch 'nutyx-attapu/master'

3 files changed, 67 insertions, 23 deletions

diff --git a/kde/marble/.footprint b/kde/marble/.footprint
index 4dc3c2edf..9cb639159 100644
--- a/kde/marble/.footprint
+++ b/kde/marble/.footprint
@@ -9,57 +9,55 @@ drwxr-xr-x	root/root	usr/include/marble/
 -rw-r--r--	root/root	usr/include/marble/AbstractDataPluginItem.h
 -rw-r--r--	root/root	usr/include/marble/AbstractDataPluginModel.h
 -rw-r--r--	root/root	usr/include/marble/AbstractFloatItem.h
--rw-r--r--	root/root	usr/include/marble/AbstractLayerInterface.h
+-rw-r--r--	root/root	usr/include/marble/AbstractMarbleGraphicsLayout.h
 -rw-r--r--	root/root	usr/include/marble/AbstractProjection.h
+-rw-r--r--	root/root	usr/include/marble/AbstractWorkerThread.h
 -rw-r--r--	root/root	usr/include/marble/ClipPainter.h
+-rw-r--r--	root/root	usr/include/marble/DownloadRegionDialog.h
 -rw-r--r--	root/root	usr/include/marble/EquirectProjection.h
--rw-r--r--	root/root	usr/include/marble/ExtDateTime.h
+-rw-r--r--	root/root	usr/include/marble/FrameGraphicsItem.h
+-rw-r--r--	root/root	usr/include/marble/GeoDataAbstractView.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataAccuracy.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataColorStyle.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataContainer.h
--rw-r--r--	root/root	usr/include/marble/GeoDataContainer_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataCoordinates.h
--rw-r--r--	root/root	usr/include/marble/GeoDataCoordinates_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataDocument.h
--rw-r--r--	root/root	usr/include/marble/GeoDataDocument_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataFeature.h
--rw-r--r--	root/root	usr/include/marble/GeoDataFeature_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataFolder.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataGeometry.h
--rw-r--r--	root/root	usr/include/marble/GeoDataGeometry_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataHotSpot.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataIconStyle.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataLabelStyle.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataLatLonAltBox.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataLatLonBox.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataLineString.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLineString_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataLineStyle.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataLinearRing.h
--rw-r--r--	root/root	usr/include/marble/GeoDataLinearRing_p.h
+-rw-r--r--	root/root	usr/include/marble/GeoDataLod.h
+-rw-r--r--	root/root	usr/include/marble/GeoDataLookAt.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataMultiGeometry.h
--rw-r--r--	root/root	usr/include/marble/GeoDataMultiGeometry_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataObject.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataPlacemark.h
--rw-r--r--	root/root	usr/include/marble/GeoDataPlacemark_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataPoint.h
--rw-r--r--	root/root	usr/include/marble/GeoDataPoint_p.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataPolyStyle.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataPolygon.h
--rw-r--r--	root/root	usr/include/marble/GeoDataPolygon_p.h
+-rw-r--r--	root/root	usr/include/marble/GeoDataRegion.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataStyle.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataStyleMap.h
 -rw-r--r--	root/root	usr/include/marble/GeoDataStyleSelector.h
 -rw-r--r--	root/root	usr/include/marble/GeoDocument.h
 -rw-r--r--	root/root	usr/include/marble/GeoGraphicsItem.h
 -rw-r--r--	root/root	usr/include/marble/GeoPainter.h
+-rw-r--r--	root/root	usr/include/marble/LabelGraphicsItem.h
+-rw-r--r--	root/root	usr/include/marble/LatLonBoxWidget.h
 -rw-r--r--	root/root	usr/include/marble/LatLonEdit.h
+-rw-r--r--	root/root	usr/include/marble/LayerInterface.h
 -rw-r--r--	root/root	usr/include/marble/MapThemeManager.h
--rw-r--r--	root/root	usr/include/marble/MapThemeSortFilterProxyModel.h
 -rw-r--r--	root/root	usr/include/marble/MarbleAboutDialog.h
 -rw-r--r--	root/root	usr/include/marble/MarbleControlBox.h
 -rw-r--r--	root/root	usr/include/marble/MarbleDataFacade.h
 -rw-r--r--	root/root	usr/include/marble/MarbleDirs.h
+-rw-r--r--	root/root	usr/include/marble/MarbleGraphicsGridLayout.h
 -rw-r--r--	root/root	usr/include/marble/MarbleGraphicsItem.h
 -rw-r--r--	root/root	usr/include/marble/MarbleMap.h
 -rw-r--r--	root/root	usr/include/marble/MarbleModel.h
@@ -68,7 +66,9 @@ drwxr-xr-x	root/root	usr/include/marble/
 -rw-r--r--	root/root	usr/include/marble/MarbleWidgetInputHandler.h
 -rw-r--r--	root/root	usr/include/marble/MercatorProjection.h
 -rw-r--r--	root/root	usr/include/marble/Planet.h
+-rw-r--r--	root/root	usr/include/marble/PluginAboutDialog.h
 -rw-r--r--	root/root	usr/include/marble/PluginInterface.h
+-rw-r--r--	root/root	usr/include/marble/QtMarbleConfigDialog.h
 -rw-r--r--	root/root	usr/include/marble/Quaternion.h
 -rw-r--r--	root/root	usr/include/marble/RenderPlugin.h
 -rw-r--r--	root/root	usr/include/marble/RenderPluginInterface.h
@@ -76,10 +76,14 @@ drwxr-xr-x	root/root	usr/include/marble/
 -rw-r--r--	root/root	usr/include/marble/Serializable.h
 -rw-r--r--	root/root	usr/include/marble/SphericalProjection.h
 -rw-r--r--	root/root	usr/include/marble/SunLocator.h
+-rw-r--r--	root/root	usr/include/marble/TileCoordsPyramid.h
 -rw-r--r--	root/root	usr/include/marble/TileCreator.h
 -rw-r--r--	root/root	usr/include/marble/TileCreatorDialog.h
+-rw-r--r--	root/root	usr/include/marble/TileLevelRangeWidget.h
+-rw-r--r--	root/root	usr/include/marble/TinyWebBrowser.h
 -rw-r--r--	root/root	usr/include/marble/ViewParams.h
 -rw-r--r--	root/root	usr/include/marble/ViewportParams.h
+-rw-r--r--	root/root	usr/include/marble/WidgetGraphicsItem.h
 -rw-r--r--	root/root	usr/include/marble/geodata_export.h
 -rw-r--r--	root/root	usr/include/marble/global.h
 -rw-r--r--	root/root	usr/include/marble/marble_export.h
@@ -89,6 +93,7 @@ drwxr-xr-x	root/root	usr/lib/kde4/
 -rwxr-xr-x	root/root	usr/lib/kde4/plasma_applet_worldclock.so
 drwxr-xr-x	root/root	usr/lib/kde4/plugins/
 drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/AprsPlugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/CompassFloatItem.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/CrosshairsPlugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/GeoRendererPlugin.so
@@ -98,12 +103,15 @@ drwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/NavigationFloatItem.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/OverviewMap.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Photo.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/PositionMarker.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/ProgressFloatItem.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/QNamNetworkPlugin.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/StarsPlugin.so
+-rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Weather.so
 -rwxr-xr-x	root/root	usr/lib/kde4/plugins/marble/Wikipedia.so
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so -> libmarblewidget.so.4
-lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so.4 -> libmarblewidget.so.4.4.0
--rwxr-xr-x	root/root	usr/lib/libmarblewidget.so.4.4.0
+lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so -> libmarblewidget.so.11
+-rwxr-xr-x	root/root	usr/lib/libmarblewidget.so.0.11.0
+lrwxrwxrwx	root/root	usr/lib/libmarblewidget.so.11 -> libmarblewidget.so.0.11.0
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/applications/
 drwxr-xr-x	root/root	usr/share/applications/kde4/
@@ -117,11 +125,9 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/
 -rw-r--r--	root/root	usr/share/apps/marble/data/LICENSE.txt
 drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/airport.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/annotation.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/border_1.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/border_2.png
--rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/checkbox_checked.png
--rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/checkbox_disabled.png
--rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/checkbox_empty.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/city_1_orange.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/city_1_red.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/city_1_white.png
@@ -150,6 +156,7 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/cursor_tr.xpm
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/default_location.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/earth_apollo.jpg
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/hand.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/lake.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/manned_landing.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/mountain_1.png
@@ -162,6 +169,9 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/bitmaps/
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/pole_2.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/river.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/robotic_rover.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/routing_pick.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/routing_remove.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/routing_step.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/shipwreck.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/unmanned_hard_landing.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/bitmaps/unmanned_soft_landing.png
@@ -418,6 +428,8 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/flags/
 -rw-r--r--	root/root	usr/share/apps/marble/data/landcolors.leg
 -rw-r--r--	root/root	usr/share/apps/marble/data/legend.css
 -rw-r--r--	root/root	usr/share/apps/marble/data/legend.html
+drwxr-xr-x	root/root	usr/share/apps/marble/data/licenses/
+-rw-r--r--	root/root	usr/share/apps/marble/data/licenses/lgpl2.txt
 drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/
 drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/
 drwxr-xr-x	root/root	usr/share/apps/marble/data/maps/earth/bluemarble/
@@ -725,15 +737,47 @@ drwxr-xr-x	root/root	usr/share/apps/marble/data/svg/
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/application-x-marble.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/application-x-marble.svg
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/compass.svg
+-rw-r--r--	root/root	usr/share/apps/marble/data/svg/configure.svgz
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/coordinate.svg
+-rw-r--r--	root/root	usr/share/apps/marble/data/svg/help-about.svgz
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/lunarmap.svg
+-rw-r--r--	root/root	usr/share/apps/marble/data/svg/marble-logo-32dpi.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/marble-logo-72dpi.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/svg/marble-logo-inverted-32dpi.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/marble-logo-inverted-72dpi.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/marble-logo.png
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/marble-logo.svg
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/wikipedia.svg
+-rw-r--r--	root/root	usr/share/apps/marble/data/svg/wikipedia_shadow.svg
 -rw-r--r--	root/root	usr/share/apps/marble/data/svg/worldmap.svg
 -rw-r--r--	root/root	usr/share/apps/marble/data/tempcolors.leg
+drwxr-xr-x	root/root	usr/share/apps/marble/data/weather/
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/bbc-stations.xml
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-clear-night.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-clear.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-clouds-night.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-clouds.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-few-clouds-night.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-few-clouds.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-hail.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-many-clouds.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-mist.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-none-available.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-showers-day.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-showers-night.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-showers-scattered-day.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-showers-scattered-night.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-showers-scattered.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-showers.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-snow-rain.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-snow-scattered-day.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-snow-scattered-night.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-snow-scattered.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-snow.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-storm-day.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-storm-night.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/weather-storm.png
+-rw-r--r--	root/root	usr/share/apps/marble/data/weather/wind-arrows.svgz
 -rw-r--r--	root/root	usr/share/apps/marble/marble.knsrc
 -rw-r--r--	root/root	usr/share/apps/marble/marbleui.rc
 drwxr-xr-x	root/root	usr/share/apps/marble_part/
diff --git a/kde/marble/.md5sum b/kde/marble/.md5sum
index 6bd0e5c72..e69de29bb 100644
--- a/kde/marble/.md5sum
+++ b/kde/marble/.md5sum
@@ -1 +0,0 @@
-c73432d6bd68ae12bd1816be20084f78  marble-0.8.0_rev1005857.tar.gz
diff --git a/kde/marble/Pkgfile b/kde/marble/Pkgfile
index 6a218bbf2..45224272a 100644
--- a/kde/marble/Pkgfile
+++ b/kde/marble/Pkgfile
@@ -5,11 +5,12 @@
 # Depends on: kdelibs, gpsd, qt, cmake
 
 name=marble
-version=0.8.0
+version=0.9.2
 release=1
-source=(http://developer.kde.org/~tackat/marble/marble-${version}_rev1005857.tar.gz)
+#source=(http://developer.kde.org/~tackat/marble/marble-${version}_rev1005857.tar.gz)
 
 build() {
+	svn co svn://anonsvn.kde.org/home/kde/trunk/KDE/kdeedu/marble
         cd $name
         cmake ../$name -DCMAKE_INSTALL_PREFIX=/usr
         make