From 78d25de32af498c44813199c4799e6ce5d3da931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vr=C3=A1til?= Date: Tue, 16 Feb 2016 21:20:24 +0100 Subject: [PATCH] Pull upstream patch for 359388 --- ...iconitem-not-loading-non-theme-icons.patch | 29 +++++++++++++++++++ kf5-plasma.spec | 6 +++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-fix-iconitem-not-loading-non-theme-icons.patch diff --git a/0001-fix-iconitem-not-loading-non-theme-icons.patch b/0001-fix-iconitem-not-loading-non-theme-icons.patch new file mode 100644 index 0000000..10f02d1 --- /dev/null +++ b/0001-fix-iconitem-not-loading-non-theme-icons.patch @@ -0,0 +1,29 @@ +commit 525bf2d377c21b41971a72d694a507bf2af0ada6 +Author: Dan Vrátil +Date: Tue Feb 16 17:59:32 2016 +0100 + + Fix IconItem not loading non-theme icons with name + + Commit 5184ac introduced a small regression that caused IconItem + to no longer load non-theme icons with name set, for instance icons + coming from sni-qt, causing sni-qt apps to not show in systray. + + BUG: 359388 + FIXED-IN: 5.20 + REVIEW: 127091 + +diff --git a/src/declarativeimports/core/iconitem.cpp b/src/declarativeimports/core/iconitem.cpp +index 1d7921a..085f284 100644 +--- a/src/declarativeimports/core/iconitem.cpp ++++ b/src/declarativeimports/core/iconitem.cpp +@@ -148,6 +148,10 @@ void IconItem::setSource(const QVariant &source) + //fail, use QIcon + } else { + m_icon = QIcon::fromTheme(sourceString); ++ if (m_icon.isNull()) { ++ // fallback for non-theme icons ++ m_icon = source.value(); ++ } + delete m_svgIcon; + m_svgIcon = 0; + m_imageIcon = QImage(); diff --git a/kf5-plasma.spec b/kf5-plasma.spec index 846dd7d..38799d5 100644 --- a/kf5-plasma.spec +++ b/kf5-plasma.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.19.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: KDE Frameworks 5 Tier 3 framework is foundation to build a primary user interface License: GPLv2+ and LGPLv2+ and BSD @@ -21,6 +21,7 @@ Source0: http://download.kde.org/%{stable}/frameworks/%{versiondir}/%{framework} Source10: fedora-plasma-cache.sh.in ## upstream patches +Patch0: 0001-fix-iconitem-not-loading-non-theme-icons.patch BuildRequires: extra-cmake-modules >= %{version} BuildRequires: kf5-kactivities-devel >= %{version} @@ -141,6 +142,9 @@ sed -e "s|@@VERSION@@|%{version}|g" fedora-plasma-cache.sh.in > \ %changelog +* Thu Feb 16 2016 Daniel Vrátil - 5.19.0-2 +- pull upstream patch for BKO#359388 + * Thu Feb 11 2016 Daniel Vrátil - 5.19.0-1 - KDE Frameworks 5.19.0