Bug#859521: unblock: khtml/5.28.0-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512
Dear release team,
I've backported 2 fixes (with 3 patches) in khtml for stretch that I consider
important enough, the first two fix the java permission dialogs for khtml
widgets, the main user for these dialogs is the konqueror version that is not
currently in stretch, but we might want to add it to stretch-backports in the
future:
java: set names in permission dialog (856a968)
java: apply the names to the right buttons (bd4be07)
Following that, an UX fix:
Error page, correctly load the image (with a real URL) (ce81d9c)
Also, I've change the ssl build-dependency of khtml to libssl1.0-dev to follow
the qt5 decission to stay with it (#856004).
And uploaded 5.28.0-2 with these changes.
I'm attaching the corresponding debdiff, the version 5.28.0-2 is already in
sid, and built in all the release archs.
Happy hacking,
Please unblock package khtml
unblock khtml/5.28.0-2
- -- System Information:
Debian Release: 9.0
APT prefers unstable-debug
APT policy: (500, 'unstable-debug'), (500, 'testing-debug'), (500, 'testing'), (500, 'stable'), (50, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386, armhf
Kernel: Linux 4.9.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash
Init: systemd (via /run/systemd/system)
-----BEGIN PGP SIGNATURE-----
iQJEBAEBCgAuFiEE+JIdOnQEyG4RNSIVxxl2mbKbIyoFAljjx3gQHG1heHlAZGVi
aWFuLm9yZwAKCRDHGXaZspsjKpX5EAC/ukHA4zHChkXk433VhrGNg1xFMqww0pIR
iTJCR90yfp26V7dtm3kp2JQMW4omg/SXY7BY/W5cEy6lEgHgQxAzEB8+Pa8/XdbR
kuHD7vwmtf6o8E81MspFahI+3NPLYfiXiMGyGvle/IcJv3aFko2/6eB90SJRX/G3
XQlneFk/bIVXr6CBt4prwl6wZrp2mSLwYLiP/ed+pgK/+lBj1vyJg0dkbi7abTF0
R7BKyTBOFCgAKvsycpob15Fksre4xgO7XX7tzlKBo0KP+aYgsTGQEuw2y2wQno6z
A2KQHdsawfHTjxFoOdt8djBdJEoUMx5pRZXzHoYUkg6uCLcfDUiwb193d+I/JMPg
Tcybw9km3laeACnZu/UHyccBNj2L52/mcEADLprr0BfZxIg1256KHJ5/W1FVVFrq
hK1Q4agKf2SkYIo8LG7EQHx9q6d3FEx70/SEYytb4PzWTEcl59DZqyQ7zTxrvQZJ
pi+o51Y1NAgBgFyotMJW19ZlTwDomkyqWAVIuQLHtStGV1mSFJ0qBmroBi0tbhIZ
A85EgieVudGe1f1AevEWR32ssyOD8rgE2ah0b7ISEJeb0rMy66Nj6y46UoQA1dCR
BdmKygSR4Y8cEmDQNE6zRXkymwVn1RmMOUFDdBDj1SEmovaKpA+ASPOxEe6FhOqR
zXIZzK+zbw==
=ZUOr
-----END PGP SIGNATURE-----
diff -Nru khtml-5.28.0/debian/changelog khtml-5.28.0/debian/changelog
--- khtml-5.28.0/debian/changelog 2016-11-18 16:08:04.000000000 +0100
+++ khtml-5.28.0/debian/changelog 2017-04-03 12:46:47.000000000 +0200
@@ -1,3 +1,17 @@
+khtml (5.28.0-2) unstable; urgency=medium
+
+ * Change libssl-dev build dependency to libssl1.0-dev to follow qt5.
+ Thanks to Sebastian Andrzej Siewior for reporting and many others for the
+ follow ups
+ (Closes: 856004)
+ * Add upstream patches for the java permission dialog:
+ java-set-names-in-permission-dialog.patch
+ java-apply-the-names-to-the-right-buttons.patch
+ * Add new upstream patch:
+ Error-page-correctly-load-the-image-with-a-real-URL.patch
+
+ -- Maximiliano Curia <maxy@debian.org> Mon, 03 Apr 2017 12:46:47 +0200
+
khtml (5.28.0-1) unstable; urgency=medium
[ Automatic packaging ]
diff -Nru khtml-5.28.0/debian/control khtml-5.28.0/debian/control
--- khtml-5.28.0/debian/control 2016-11-18 16:08:04.000000000 +0100
+++ khtml-5.28.0/debian/control 2017-04-03 12:46:47.000000000 +0200
@@ -28,7 +28,7 @@
libphonon4qt5experimental-dev (>= 4:4.6.0),
libpng-dev,
libqt5x11extras5-dev (>= 5.5.0~),
- libssl-dev,
+ libssl1.0-dev,
pkg-config,
pkg-kde-tools (>= 0.15.15ubuntu1~),
qtbase5-dev (>= 5.5.0~),
diff -Nru khtml-5.28.0/debian/patches/Error-page-correctly-load-the-image-with-a-real-URL.patch khtml-5.28.0/debian/patches/Error-page-correctly-load-the-image-with-a-real-URL.patch
--- khtml-5.28.0/debian/patches/Error-page-correctly-load-the-image-with-a-real-URL.patch 1970-01-01 01:00:00.000000000 +0100
+++ khtml-5.28.0/debian/patches/Error-page-correctly-load-the-image-with-a-real-URL.patch 2017-04-03 12:46:47.000000000 +0200
@@ -0,0 +1,41 @@
+From: Luigi Toscano <luigi.toscano@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 -Nru khtml-5.28.0/debian/patches/java-apply-the-names-to-the-right-buttons.patch khtml-5.28.0/debian/patches/java-apply-the-names-to-the-right-buttons.patch
--- khtml-5.28.0/debian/patches/java-apply-the-names-to-the-right-buttons.patch 1970-01-01 01:00:00.000000000 +0100
+++ khtml-5.28.0/debian/patches/java-apply-the-names-to-the-right-buttons.patch 2017-04-03 12:46:47.000000000 +0200
@@ -0,0 +1,32 @@
+From: Pino Toscano <pino@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 -Nru khtml-5.28.0/debian/patches/java-set-names-in-permission-dialog.patch khtml-5.28.0/debian/patches/java-set-names-in-permission-dialog.patch
--- khtml-5.28.0/debian/patches/java-set-names-in-permission-dialog.patch 1970-01-01 01:00:00.000000000 +0100
+++ khtml-5.28.0/debian/patches/java-set-names-in-permission-dialog.patch 2017-04-03 12:46:47.000000000 +0200
@@ -0,0 +1,34 @@
+From: Pino Toscano <pino@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 -Nru khtml-5.28.0/debian/patches/series khtml-5.28.0/debian/patches/series
--- khtml-5.28.0/debian/patches/series 1970-01-01 01:00:00.000000000 +0100
+++ khtml-5.28.0/debian/patches/series 2017-04-03 12:46:47.000000000 +0200
@@ -0,0 +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
Reply to: