[SCM] marble packaging branch, master, updated. debian/4.13.3-2-8-ga864877

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 365118b17232df44627d15ad864fe337a868a9f2
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Aug 20 21:42:24 2014 +0200

    Remove obsolete patch
---
 debian/patches/dummy_setContent_preserve_abi | 30 ----------------------------
 1 file changed, 30 deletions(-)

diff --git a/debian/patches/dummy_setContent_preserve_abi b/debian/patches/dummy_setContent_preserve_abi
deleted file mode 100644
index 501cc5c..0000000
--- a/debian/patches/dummy_setContent_preserve_abi
+++ /dev/null
@@ -1,30 +0,0 @@
-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

-- 
marble packaging