[SCM] marble packaging branch, master, updated. debian/4.13.1-2-16-g1d8adb8

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/marble.git;a=commitdiff;h=9aa7444

The following commit has been merged in the master branch:
commit 9aa744423ece24e3ee6d3bd5e67b1c6ffe18a807
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jul 30 11:34:34 2014 +0200

    Import upstream revert of abi change
---
 debian/changelog                                   |  4 +-
 debian/patches/series                              |  2 +-
 ...-relative-local-resources-in-popup-dialog.patch | 98 ++++++++++++++++++++++
 3 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f125ca4..f1705fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 marble (4:4.13.3-2~) UNRELEASED; urgency=medium
 
-  * 
+  * New upstream patch: upstream_revert-fix-loading-of-relative-local-
+    resources-in-popup-dialog.patch
+  * Remove patch: dummy_setContent_preserve_abi
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 28 Jul 2014 15:42:59 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 288d2b1..42e6355 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
 fix_qmake_fallback.diff
 do_not_install_private_headers
-dummy_setContent_preserve_abi
+upstream_revert-fix-loading-of-relative-local-resources-in-popup-dialog.patch
diff --git a/debian/patches/upstream_revert-fix-loading-of-relative-local-resources-in-popup-dialog.patch b/debian/patches/upstream_revert-fix-loading-of-relative-local-resources-in-popup-dialog.patch
new file mode 100644
index 0000000..c8ecac5
--- /dev/null
+++ b/debian/patches/upstream_revert-fix-loading-of-relative-local-resources-in-popup-dialog.patch
@@ -0,0 +1,98 @@
+commit 1b02b31c72702d685e92bf07e127dd7200d128d3
+Author: Dennis Nienhüser <earthwings at gentoo.org>
+Date:   Tue Jul 29 20:34:32 2014 +0200
+
+    Revert "Fix loading of relative local resources in popup dialog"
+    
+    Not ABI compatible. Thanks to Nicolas Alvarez for reporting.
+    
+    This reverts commit 459a1c83100de62069405ab838a5c81647e82c6c.
+
+diff --git a/src/lib/marble/PopupItem.cpp b/src/lib/marble/PopupItem.cpp
+index 22f508c..c07e083 100644
+--- a/src/lib/marble/PopupItem.cpp
++++ b/src/lib/marble/PopupItem.cpp
+@@ -103,11 +103,10 @@ void PopupItem::setUrl( const QUrl &url )
+     requestUpdate();
+ }
+ 
+-void PopupItem::setContent( const QString &html, const QUrl &baseUrl )
++void PopupItem::setContent( const QString &html )
+ {
+     m_content = html;
+-    m_baseUrl = baseUrl;
+-    m_ui.webView->setHtml( html, baseUrl );
++    m_ui.webView->setHtml( html );
+ 
+     requestUpdate();
+ }
+@@ -359,7 +358,7 @@ void PopupItem::updateBackButton()
+ void PopupItem::goBack()
+ {
+     if ( m_ui.webView->history()->currentItemIndex() == 1 && !m_content.isEmpty() ) {
+-        m_ui.webView->setHtml( m_content, m_baseUrl );
++        m_ui.webView->setHtml( m_content );
+     } else {
+         m_ui.webView->back();
+     }
+diff --git a/src/lib/marble/PopupItem.h b/src/lib/marble/PopupItem.h
+index 173b4d9..a52aa74 100644
+--- a/src/lib/marble/PopupItem.h
++++ b/src/lib/marble/PopupItem.h
+@@ -89,7 +89,7 @@ public:
+      *
+      * @param html custom html for popup
+      */
+-    void setContent( const QString &html, const QUrl & baseUrl = QUrl() );
++    void setContent( const QString &html );
+ 
+     /**
+      * @brief Sets text color of the header
+@@ -177,7 +177,6 @@ private:
+     QColor m_textColor;
+     QColor m_backColor;
+     bool m_needMouseRelease;
+-    QUrl m_baseUrl;
+ };
+ 
+ }
+diff --git a/src/lib/marble/layers/PopupLayer.cpp b/src/lib/marble/layers/PopupLayer.cpp
+index 018bfbd..bb5eb21 100644
+--- a/src/lib/marble/layers/PopupLayer.cpp
++++ b/src/lib/marble/layers/PopupLayer.cpp
+@@ -122,9 +122,9 @@ void PopupLayer::setUrl( const QUrl &url )
+     m_popupItem->setUrl( url );
+ }
+ 
+-void PopupLayer::setContent( const QString &html, const QUrl &baseUrl )
++void PopupLayer::setContent( const QString &html )
+ {
+-    m_popupItem->setContent( html, baseUrl );
++    m_popupItem->setContent( html );
+     emit repaintNeeded();
+ }
+ 
+@@ -170,9 +170,7 @@ void PopupLayer::setPlacemark( const GeoDataPlacemark *placemark )
+         // @TODO: implement the line calculation, so that snippet().maxLines actually has effect.
+         content = content.replace("$[snippet]", placemark->snippet().text(), Qt::CaseInsensitive);
+         content = content.replace("$[id]", QString::number(placemark->id()), Qt::CaseInsensitive);
+-        QString const basePath = placemark->resolvePath(".");
+-        QUrl const baseUrl = basePath != "." ? QUrl::fromLocalFile( basePath + "/" ) : QUrl();
+-        m_popupItem->setContent(content, baseUrl );
++        m_popupItem->setContent(content);
+     }
+     m_popupItem->setBackgroundColor(placemark->style()->balloonStyle().backgroundColor());
+     m_popupItem->setTextColor(placemark->style()->balloonStyle().textColor());
+diff --git a/src/lib/marble/layers/PopupLayer.h b/src/lib/marble/layers/PopupLayer.h
+index b426b88..ed74503 100644
+--- a/src/lib/marble/layers/PopupLayer.h
++++ b/src/lib/marble/layers/PopupLayer.h
+@@ -127,7 +127,7 @@ public:
+      *
+      * @param html content (in html format)
+      */
+-    void setContent( const QString &html, const QUrl & baseUrl = QUrl() );
++    void setContent( const QString &html );
+ 
+     /**
+      * @brief Sets style and content of the browser

-- 
marble packaging