[SCM] kjobwidgets packaging branch, master, updated. debian/5.28.0-1-4-g3ea7ead

Maximiliano Curia maxy at moszumanska.debian.org
Wed Apr 5 09:31:03 UTC 2017


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

The following commit has been merged in the master branch:
commit 2643a3b89a3315d637d36baead8803465e25ba4c
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Apr 5 11:07:39 2017 +0200

    Add new upstream patch: don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch to keep the window icon if the themed one fails
---
 ...ace-existing-icon-if-QIcon-fromTheme-fails.patch | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 2 files changed, 22 insertions(+)

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
new file mode 100644
index 0000000..9da33b4
--- /dev/null
+++ b/debian/patches/don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch
@@ -0,0 +1,21 @@
+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
index 5b45ab2..0684266 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 Don-t-focus-progress-windows.patch
+don-t-replace-existing-icon-if-QIcon-fromTheme-fails.patch

-- 
kjobwidgets packaging



More information about the pkg-kde-commits mailing list