Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock
Dear release team,
I've backported two fixes in kjobwidgets for stretch that I consider
important enough, the first one affects apps using remote files:
Don't focus progress windows (16a449c) KDE#333934
-> Added as debian/patches/Don-t-focus-progress-windows.patch
the next one is a user facing issue:
don't replace existing icon if QIcon::fromTheme() fails (fd32254)
-> Added as
debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
I uploaded 5.28.0-2 with these patches and it already built in all the release
architectures.
I'm attaching the corresponding debdiff.
Happy hacking,
Please unblock package kjobwidgets
unblock kjobwidgets/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)
diff -Nru kjobwidgets-5.28.0/debian/changelog
kjobwidgets-5.28.0/debian/changelog
--- kjobwidgets-5.28.0/debian/changelog 2016-11-18 16:04:16.000000000 +0100
+++ kjobwidgets-5.28.0/debian/changelog 2017-04-05 11:27:15.000000000 +0200
@@ -1,3 +1,13 @@
+kjobwidgets (5.28.0-2) unstable; urgency=medium
+
+ * Add new upstream patch: Don-t-focus-progress-windows.patch
+ to improve the use of remote files
+ * Add new upstream patch:
+ don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
+ to keep the window icon if the themed one fails
+
+ -- Maximiliano Curia <m...@debian.org> Wed, 05 Apr 2017 11:27:15 +0200
+
kjobwidgets (5.28.0-1) unstable; urgency=medium
[ Automatic packaging ]
diff -Nru kjobwidgets-5.28.0/debian/patches/Don-t-focus-progress-windows.patch
kjobwidgets-5.28.0/debian/patches/Don-t-focus-progress-windows.patch
--- kjobwidgets-5.28.0/debian/patches/Don-t-focus-progress-windows.patch
1970-01-01 01:00:00.000000000 +0100
+++ kjobwidgets-5.28.0/debian/patches/Don-t-focus-progress-windows.patch
2017-04-05 11:27:15.000000000 +0200
@@ -0,0 +1,28 @@
+From: "Martin T. H. Sandsmark" <martin.sandsm...@kde.org>
+Date: Mon, 26 Dec 2016 15:58:47 +0100
+Subject: Don't focus progress windows
+
+Show the job tracking widget without stealing focus, e. g. from Kate
+when saving to FTP. This is especially important since there's a 0.5s
+delay before the window is shown so people often start interacting with
+the original window when the job progress is shown.
+
+BUG: 333934
+REVIEW: 129706
+---
+ src/kwidgetjobtracker.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/kwidgetjobtracker.cpp b/src/kwidgetjobtracker.cpp
+index 585867a..dbea4a4 100644
+--- a/src/kwidgetjobtracker.cpp
++++ b/src/kwidgetjobtracker.cpp
+@@ -53,6 +53,8 @@ void KWidgetJobTracker::Private::_k_showProgressWidget()
+ QWidget *widget = q->widget(job);
+
+ if (widget) {
++ // Don't steal the focus from the current widget (e. g. Kate)
++ widget->setAttribute(Qt::WA_ShowWithoutActivating);
+ widget->show();
+ }
+ }
diff -Nru
kjobwidgets-5.28.0/debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
kjobwidgets-5.28.0/debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
---
kjobwidgets-5.28.0/debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
1970-01-01 01:00:00.000000000 +0100
+++
kjobwidgets-5.28.0/debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
2017-04-05 11:27:15.000000000 +0200
@@ -0,0 +1,21 @@
+From: "R.J.V. Bertin" <rjvber...@gmail.com>
+Date: Thu, 16 Mar 2017 17:34:40 +0100
+Subject: don't replace existing icon if QIcon::fromTheme() fails
+
+---
+ src/kwidgetjobtracker.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kwidgetjobtracker.cpp b/src/kwidgetjobtracker.cpp
+index dbea4a4..93338ec 100644
+--- a/src/kwidgetjobtracker.cpp
++++ b/src/kwidgetjobtracker.cpp
+@@ -467,7 +467,7 @@ void
KWidgetJobTracker::Private::ProgressWidget::closeEvent(QCloseEvent *event)
+
+ void KWidgetJobTracker::Private::ProgressWidget::init()
+ {
+- setWindowIcon(QIcon::fromTheme(QStringLiteral("document-save")));
++ setWindowIcon(QIcon::fromTheme(QStringLiteral("document-save"),
windowIcon()));
+
+ QVBoxLayout *topLayout = new QVBoxLayout(this);
+
diff -Nru kjobwidgets-5.28.0/debian/patches/series
kjobwidgets-5.28.0/debian/patches/series
--- kjobwidgets-5.28.0/debian/patches/series 1970-01-01 01:00:00.000000000
+0100
+++ kjobwidgets-5.28.0/debian/patches/series 2017-04-05 11:27:15.000000000
+0200
@@ -0,0 +1,2 @@
+Don-t-focus-progress-windows.patch
+don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
