[SCM] marble packaging branch, master, updated. debian/4.13.1-2-10-g1122faf

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b84e7d3d592bab5e87ba1da7773e7f2a5b3c5bfe
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sun Jul 27 10:56:33 2014 +0200

    New patch: dummy_setContent_preserve_abi
---
 debian/changelog                             |  1 +
 debian/patches/dummy_setContent_preserve_abi | 30 ++++++++++++++++++++++++++++
 debian/patches/series                        |  1 +
 3 files changed, 32 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d4210cf..f27b444 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ marble (4:4.13.3-1) UNRELEASED; urgency=medium
   * Remove patch: upstream_tests-fix-build-when-qreal-double.patch
     applied upstream.
   * Update symbols with previous build logs.
+  * New patch: dummy_setContent_preserve_abi
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Jul 2014 13:15:55 +0200
 
diff --git a/debian/patches/dummy_setContent_preserve_abi b/debian/patches/dummy_setContent_preserve_abi
new file mode 100644
index 0000000..501cc5c
--- /dev/null
+++ b/debian/patches/dummy_setContent_preserve_abi
@@ -0,0 +1,30 @@
+Index: marble/src/lib/marble/layers/PopupLayer.cpp
+===================================================================
+--- marble.orig/src/lib/marble/layers/PopupLayer.cpp	2014-07-27 17:01:40.008809868 +0200
++++ marble/src/lib/marble/layers/PopupLayer.cpp	2014-07-27 17:04:47.793423920 +0200
+@@ -122,6 +122,11 @@
+     m_popupItem->setUrl( url );
+ }
+ 
++void PopupLayer::setContent( const QString &html )
++{
++    setContent(html, QUrl());
++}
++
+ void PopupLayer::setContent( const QString &html, const QUrl &baseUrl )
+ {
+     m_popupItem->setContent( html, baseUrl );
+Index: marble/src/lib/marble/layers/PopupLayer.h
+===================================================================
+--- marble.orig/src/lib/marble/layers/PopupLayer.h	2014-07-27 17:02:57.149775764 +0200
++++ marble/src/lib/marble/layers/PopupLayer.h	2014-07-27 17:05:26.763891129 +0200
+@@ -127,7 +127,8 @@
+      *
+      * @param html content (in html format)
+      */
+-    void setContent( const QString &html, const QUrl & baseUrl = QUrl() );
++    void setContent( const QString &html );
++    void setContent( const QString &html, const QUrl & baseUrl );
+ 
+     /**
+      * @brief Sets style and content of the browser
diff --git a/debian/patches/series b/debian/patches/series
index a2ff3c0..288d2b1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_qmake_fallback.diff
 do_not_install_private_headers
+dummy_setContent_preserve_abi

-- 
marble packaging