[SCM] khtml packaging branch, master, updated. debian/5.28.0-1-6-gdfa4878

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/khtml.git;a=commitdiff;h=53718f1

The following commit has been merged in the master branch:
commit 53718f101c0d514a967a70642a30791fd4e87369
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Apr 3 11:25:49 2017 +0200

    Add new upstream patch: Error-page-correctly-load-the-image-with-a-real-URL.patch
---
 ...-correctly-load-the-image-with-a-real-URL.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/Error-page-correctly-load-the-image-with-a-real-URL.patch b/debian/patches/Error-page-correctly-load-the-image-with-a-real-URL.patch
new file mode 100644
index 0000000..4ba5c75
--- /dev/null
+++ b/debian/patches/Error-page-correctly-load-the-image-with-a-real-URL.patch
@@ -0,0 +1,41 @@
+From: Luigi Toscano <luigi.toscano at tiscali.it>
+Date: Sat, 18 Mar 2017 23:16:28 +0100
+Subject: Error page, correctly load the image (with a real URL)
+
+Summary:
+The local address to the image is injected into an HTML page (the
+error page). This address needs to be a proper URL with file:///,
+not just the absolute path to the image file - otherwise
+KIO::SimpleJobPrivate::simpleJobInit complains with "Invalid URL".
+
+Test Plan:
+Compiles, and when trying to load an invalid address in Konqueror
+with the KHTML part, the warning picture on the top-left corner is
+now visible.
+
+Reviewers: mpyne
+
+Reviewed By: mpyne
+
+Subscribers: mpyne, #frameworks
+
+Tags: #frameworks
+
+Differential Revision: https://phabricator.kde.org/D5104
+---
+ src/khtml_part.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/khtml_part.cpp b/src/khtml_part.cpp
+index d5f8d7f..3561ada 100644
+--- a/src/khtml_part.cpp
++++ b/src/khtml_part.cpp
+@@ -1916,7 +1916,7 @@ void KHTMLPart::htmlError(int errorCode, const QString &text, const QUrl &reqUrl
+ 
+     html.replace(QLatin1String("TITLE"), i18n("Error: %1 - %2", errorName, url));
+     html.replace(QLatin1String("DIRECTION"), QApplication::isRightToLeft() ? "rtl" : "ltr");
+-    html.replace(QLatin1String("ICON_PATH"), KIconLoader::global()->iconPath("dialog-warning", -KIconLoader::SizeHuge));
++    html.replace(QLatin1String("ICON_PATH"), QUrl::fromLocalFile(KIconLoader::global()->iconPath("dialog-warning", -KIconLoader::SizeHuge)).url());
+ 
+     QString doc = QLatin1String("<h1>");
+     doc += i18n("The requested operation could not be completed");
diff --git a/debian/patches/series b/debian/patches/series
index 2000f78..0c1b5fe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 java-set-names-in-permission-dialog.patch
 java-apply-the-names-to-the-right-buttons.patch
+Error-page-correctly-load-the-image-with-a-real-URL.patch

-- 
khtml packaging