[SCM] khtml packaging branch, master, updated. debian/5.28.0-2-14-g3c73beb

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 49ac9bb096a542ce8d6f2f23230e029dd24102e0
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Jul 2 12:39:06 2017 +0200

    Drop upstream patches
---
 ...-correctly-load-the-image-with-a-real-URL.patch | 41 ----------------------
 ...java-apply-the-names-to-the-right-buttons.patch | 32 -----------------
 .../java-set-names-in-permission-dialog.patch      | 34 ------------------
 debian/patches/series                              |  3 --
 4 files changed, 110 deletions(-)

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
deleted file mode 100644
index 4ba5c75..0000000
--- a/debian/patches/Error-page-correctly-load-the-image-with-a-real-URL.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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/java-apply-the-names-to-the-right-buttons.patch b/debian/patches/java-apply-the-names-to-the-right-buttons.patch
deleted file mode 100644
index b0419b2..0000000
--- a/debian/patches/java-apply-the-names-to-the-right-buttons.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 26 Nov 2016 09:22:23 +0100
-Subject: java: apply the names to the right buttons
-
-Fixes commit 856a96852f566ed7eb855810e347f95003c25017.
----
- src/java/kjavaappletserver.cpp | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/java/kjavaappletserver.cpp b/src/java/kjavaappletserver.cpp
-index 7ddb48f..d0538e1 100644
---- a/src/java/kjavaappletserver.cpp
-+++ b/src/java/kjavaappletserver.cpp
-@@ -831,15 +831,15 @@ QString PermissionDialog::exec(const QString &cert, const QString &perm)
-     buttonLayout->addWidget(no);
- 
-     QPushButton *const reject = new QPushButton(i18n("&Reject All"), dialog);
--    no->setObjectName("reject");
-+    reject->setObjectName("reject");
-     buttonLayout->addWidget(reject);
- 
-     QPushButton *const yes = new QPushButton(i18n("&Yes"), dialog);
--    no->setObjectName("yes");
-+    yes->setObjectName("yes");
-     buttonLayout->addWidget(yes);
- 
-     QPushButton *const grant = new QPushButton(i18n("&Grant All"), dialog);
--    no->setObjectName("grant");
-+    grant->setObjectName("grant");
-     buttonLayout->addWidget(grant);
-     dialogLayout->addLayout(buttonLayout);
-     dialog->resize(dialog->minimumSizeHint());
diff --git a/debian/patches/java-set-names-in-permission-dialog.patch b/debian/patches/java-set-names-in-permission-dialog.patch
deleted file mode 100644
index 76d5fb6..0000000
--- a/debian/patches/java-set-names-in-permission-dialog.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Pino Toscano <pino at kde.org>
-Date: Sat, 26 Nov 2016 09:12:18 +0100
-Subject: java: set names in permission dialog
-
-This makes sure the reply from the user is used and sent back.
----
- src/java/kjavaappletserver.cpp | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/java/kjavaappletserver.cpp b/src/java/kjavaappletserver.cpp
-index 39d43f3..7ddb48f 100644
---- a/src/java/kjavaappletserver.cpp
-+++ b/src/java/kjavaappletserver.cpp
-@@ -826,16 +826,20 @@ QString PermissionDialog::exec(const QString &cert, const QString &perm)
-     buttonLayout->setObjectName("buttonLayout");
- 
-     QPushButton *const no = new QPushButton(i18n("&No"), dialog);
-+    no->setObjectName("no");
-     no->setDefault(true);
-     buttonLayout->addWidget(no);
- 
-     QPushButton *const reject = new QPushButton(i18n("&Reject All"), dialog);
-+    no->setObjectName("reject");
-     buttonLayout->addWidget(reject);
- 
-     QPushButton *const yes = new QPushButton(i18n("&Yes"), dialog);
-+    no->setObjectName("yes");
-     buttonLayout->addWidget(yes);
- 
-     QPushButton *const grant = new QPushButton(i18n("&Grant All"), dialog);
-+    no->setObjectName("grant");
-     buttonLayout->addWidget(grant);
-     dialogLayout->addLayout(buttonLayout);
-     dialog->resize(dialog->minimumSizeHint());
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0c1b5fe..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-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