[SCM] kiconthemes packaging branch, master, updated. debian/5.28.0-1-5-g58234cb

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit b4ef46d4fd0f2afb256ace3d53a16ab2c764512f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Apr 3 12:30:26 2017 +0200

    Add new upstream patch: Inform-QIconLoader-also-when-the-desktop-icon-theme-is-ch.patch
---
 ...er-also-when-the-desktop-icon-theme-is-ch.patch | 48 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 49 insertions(+)

diff --git a/debian/patches/Inform-QIconLoader-also-when-the-desktop-icon-theme-is-ch.patch b/debian/patches/Inform-QIconLoader-also-when-the-desktop-icon-theme-is-ch.patch
new file mode 100644
index 0000000..40b2fd0
--- /dev/null
+++ b/debian/patches/Inform-QIconLoader-also-when-the-desktop-icon-theme-is-ch.patch
@@ -0,0 +1,48 @@
+From: Michael Pyne <mpyne at kde.org>
+Date: Tue, 20 Dec 2016 19:57:18 -0500
+Subject: Inform QIconLoader also when the desktop icon theme is changed.
+
+This change is needed because KIconTheme will defer to QIconLoader's
+concept of the current icon theme in preference to our own global
+config, if that current icon theme is set.
+
+Qt normally leaves it unset but once it starts loading icons through our
+platform plugin, it will remember which theme was in use.
+
+This means when we change the configured icon theme, that we would
+sometimes accidentally continue to load icons from the old icon theme
+(the one remembered by Qt).
+
+Thanks to Wolfgang Bauer for debugging the issue, narrowing the
+potential causes of the bug was instrumental in fixing it!
+
+BUG:365363
+FIXED-IN:5.30
+---
+ src/kiconloader.cpp | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/kiconloader.cpp b/src/kiconloader.cpp
+index 5315ea4..726b43f 100644
+--- a/src/kiconloader.cpp
++++ b/src/kiconloader.cpp
+@@ -541,7 +541,18 @@ void KIconLoaderPrivate::drawOverlays(const KIconLoader *iconLoader, KIconLoader
+ 
+ void KIconLoaderPrivate::_k_refreshIcons(int group)
+ {
+-    KSharedConfig::openConfig()->reparseConfiguration();
++    KSharedConfig::Ptr sharedConfig = KSharedConfig::openConfig();
++    sharedConfig->reparseConfiguration();
++
++    const QString newThemeName = sharedConfig->group("Icons")
++                                               .readEntry("Theme", QString());
++    if (!newThemeName.isEmpty()) {
++        // If we're refreshing icons the Qt platform plugin has probably
++        // already cached the old theme, which will accidentally filter back
++        // into KIconTheme unless we reset it
++        QIcon::setThemeName(newThemeName);
++    }
++
+     q->newIconLoader();
+     mIconAvailability.clear();
+     emit q->iconChanged(group);
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0257d03
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Inform-QIconLoader-also-when-the-desktop-icon-theme-is-ch.patch

-- 
kiconthemes packaging