[SCM] kjobwidgets packaging branch, master, updated. debian/5.28.0-2-11-g1fa53ab

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kjobwidgets.git;a=commitdiff;h=35a9a74

The following commit has been merged in the master branch:
commit 35a9a74d973a270fb37efe0d136805b83280e101
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jun 29 16:17:39 2017 +0200

    Drop upstream patches
---
 debian/patches/Don-t-focus-progress-windows.patch  | 28 ----------------------
 ...ce-existing-icon-if-QIcon-fromTheme-fails.patch | 21 ----------------
 debian/patches/series                              |  2 --
 3 files changed, 51 deletions(-)

diff --git a/debian/patches/Don-t-focus-progress-windows.patch b/debian/patches/Don-t-focus-progress-windows.patch
deleted file mode 100644
index fb9fa29..0000000
--- a/debian/patches/Don-t-focus-progress-windows.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: "Martin T. H. Sandsmark" <martin.sandsmark at 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 --git a/debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch b/debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
deleted file mode 100644
index 9da33b4..0000000
--- a/debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "R.J.V. Bertin" <rjvbertin at 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 --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 0684266..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-Don-t-focus-progress-windows.patch
-don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch

-- 
kjobwidgets packaging