[SCM] KDE Plasma Addons module packaging branch, kde4.8, updated. debian/4.7.4-1-8-g7719dc3

[Pino Toscano]

The following commit has been merged in the kde4.8 branch:
commit 7719dc3c62cb9e270b01078fbb0833a06b0c702e
Author: Pino Toscano <pino at debian.org>
Date:   Wed Feb 15 18:11:37 2012 +0100

    make the marble wallpaper compile also with marble 4.7
    
    add patch marble-4.7-compat.diff for it
---
 debian/changelog                      |    4 ++++
 debian/patches/marble-4.7-compat.diff |   31 +++++++++++++++++++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 834a3a8..6895d48 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,10 @@ kdeplasma-addons (4:4.8.0-0r0) UNRELEASED; urgency=low
   * Update not-installed files.
   * Update installed files.
   * Add libdbusmenu-qt-dev to build dependecies to support icontasks widget.
+
+  [ Pino Toscano ]
+  * Add marble-4.7-compat.diff to make the marble plasma wallpaper compile
+    also with marble 4.7.
   
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 25 Jan 2012 11:39:58 +0100
 
diff --git a/debian/patches/marble-4.7-compat.diff b/debian/patches/marble-4.7-compat.diff
new file mode 100644
index 0000000..975914c
--- /dev/null
+++ b/debian/patches/marble-4.7-compat.diff
@@ -0,0 +1,31 @@
+Author: Pino Toscano <pino at debian.org>
+Description: compatibility with Marble < 0.13
+Forwarded: not-needed
+Last-Update: 2012-02-15
+
+--- a/wallpapers/marble/marble.cpp
++++ b/wallpapers/marble/marble.cpp
+@@ -80,8 +80,13 @@ void MarbleWallpaper::init(const KConfig
+ 
+         // These settings apply to Marble's "satellite" view mostly, e.g. make it beautiful
+         m_map->setShowClouds(true);
++#if MARBLE_VERSION >= 0x000d00
+         m_map->setShowCityLights(false);
+         m_map->setShowSunShading(true);
++#else
++        m_map->model()->sunLocator()->setCitylights(false);
++        m_map->model()->sunLocator()->setShow(true);
++#endif
+ 
+         // Disable all render plugins (scale bar, compass, etc.) except the "stars" plugin
+         foreach (RenderPlugin *item, m_map->renderPlugins()) {
+@@ -137,6 +142,9 @@ QWidget *MarbleWallpaper::createConfigur
+     m_ui.showPlacemarks->setChecked(m_showPlacemarks);
+ 
+     MapThemeManager themeManager;
++#if MARBLE_VERSION < 0x000d00
++    themeManager.updateMapThemeModel();
++#endif
+     // FIXME: Going manually through the model is ugly as hell, but plugging the
+     //        model into the view didn't work for me
+     for (int i = 0; i < themeManager.mapThemeModel()->rowCount(); i++) {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..05cb868
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+marble-4.7-compat.diff

-- 
KDE Plasma Addons module packaging