[SCM] marble packaging branch, master, updated. debian/4.13.3-2-8-ga864877
Maximiliano Curia
maxy at moszumanska.debian.org
Mon Aug 25 02:48:07 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/marble.git;a=commitdiff;h=74c0c6f
The following commit has been merged in the master branch:
commit 74c0c6fb8ac8cdad09c6d7ec86f881af10e029a8
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Aug 20 21:08:38 2014 +0200
Refresh patches and remove upstream patch
---
debian/changelog | 3 +
debian/patches/do_not_install_private_headers | 14 ++--
debian/patches/fix_qmake_fallback.diff | 4 +-
debian/patches/series | 3 +-
...-relative-local-resources-in-popup-dialog.patch | 98 ----------------------
5 files changed, 13 insertions(+), 109 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3f80bfe..292e3e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
marble (4:4.14.0-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Refresh patches.
+ * Remove upstream patch: upstream_revert-fix-loading-of-relative-
+ local-resources-in-popup-dialog.patch
-- Maximiliano Curia <maxy at debian.org> Mon, 18 Aug 2014 18:28:16 +0200
diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
index 46af01d..6531afb 100644
--- a/debian/patches/do_not_install_private_headers
+++ b/debian/patches/do_not_install_private_headers
@@ -1,9 +1,9 @@
Index: marble/src/lib/marble/CMakeLists.txt
===================================================================
---- marble.orig/src/lib/marble/CMakeLists.txt 2014-05-21 18:25:38.407320940 +0200
-+++ marble/src/lib/marble/CMakeLists.txt 2014-05-21 18:26:12.077979025 +0200
-@@ -417,11 +417,9 @@
- MarbleAboutDialog.h
+--- marble.orig/src/lib/marble/CMakeLists.txt 2014-08-20 21:03:48.326829715 +0200
++++ marble/src/lib/marble/CMakeLists.txt 2014-08-20 21:03:48.322829876 +0200
+@@ -436,11 +436,9 @@
+ MarbleInputHandler.h
MarbleWidgetInputHandler.h
MarbleWidgetPopupMenu.h
- TileId.h
@@ -14,7 +14,7 @@ Index: marble/src/lib/marble/CMakeLists.txt
global.h
MarbleColors.h
MarbleGlobal.h
-@@ -447,7 +445,6 @@
+@@ -467,7 +465,6 @@
geodata/data/GeoDataFeature.h
geodata/data/GeoDataFolder.h
geodata/data/GeoDataGeometry.h
@@ -22,11 +22,11 @@ Index: marble/src/lib/marble/CMakeLists.txt
geodata/data/GeoDataHotSpot.h
geodata/data/GeoDataIconStyle.h
geodata/data/GeoDataItemIcon.h
-@@ -501,7 +498,6 @@
+@@ -521,7 +518,6 @@
RoutingRunner.h
SearchRunnerPlugin.h
ReverseGeocodingRunnerPlugin.h
- RoutingRunnerPlugin.h
ParseRunnerPlugin.h
LayerInterface.h
- PluginAboutDialog.h
+ RenderState.h
diff --git a/debian/patches/fix_qmake_fallback.diff b/debian/patches/fix_qmake_fallback.diff
index 48af712..e8a0986 100644
--- a/debian/patches/fix_qmake_fallback.diff
+++ b/debian/patches/fix_qmake_fallback.diff
@@ -8,8 +8,8 @@ Forwarded: no
Index: marble/src/CMakeLists.txt
===================================================================
---- marble.orig/src/CMakeLists.txt 2014-02-07 16:12:19.098716609 +0100
-+++ marble/src/CMakeLists.txt 2014-02-07 16:12:19.094716515 +0100
+--- marble.orig/src/CMakeLists.txt 2014-08-20 21:03:46.646897871 +0200
++++ marble/src/CMakeLists.txt 2014-08-20 21:03:46.646897871 +0200
@@ -9,7 +9,7 @@
if( QT_QTDECLARATIVE_FOUND OR Qt5Quick_FOUND )
diff --git a/debian/patches/series b/debian/patches/series
index 42e6355..b4b6e11 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
fix_qmake_fallback.diff
-do_not_install_private_headers
-upstream_revert-fix-loading-of-relative-local-resources-in-popup-dialog.patch
+# do_not_install_private_headers
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
deleted file mode 100644
index c8ecac5..0000000
--- a/debian/patches/upstream_revert-fix-loading-of-relative-local-resources-in-popup-dialog.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-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
More information about the pkg-kde-commits
mailing list