Hello community,
here is the log from the commit of package plasma-framework for
openSUSE:Factory checked in at 2016-03-07 13:36:57
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plasma-framework (Old)
and /work/SRC/openSUSE:Factory/.plasma-framework.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma-framework"
Changes:
--------
--- /work/SRC/openSUSE:Factory/plasma-framework/plasma-framework.changes
2016-02-24 18:57:55.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.plasma-framework.new/plasma-framework.changes
2016-03-07 13:36:59.000000000 +0100
@@ -1,0 +2,12 @@
+Tue Mar 1 18:04:31 UTC 2016 - hrvoje.sen...@gmail.com
+
+- Added 0001-Theme-Discard-pixmap-cache-when-changing-theme.patch
+ (kde#359924)
+
+-------------------------------------------------------------------
+Mon Feb 29 17:12:54 UTC 2016 - hrvoje.sen...@gmail.com
+
+- Add 0001-if-path-is-passed-pick-the-tail.patch -- fix loading
+ of c++ based applets
+
+-------------------------------------------------------------------
New:
----
0001-Theme-Discard-pixmap-cache-when-changing-theme.patch
0001-if-path-is-passed-pick-the-tail.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plasma-framework.spec ++++++
--- /var/tmp/diff_new_pack.W9NsJr/_old 2016-03-07 13:37:00.000000000 +0100
+++ /var/tmp/diff_new_pack.W9NsJr/_new 2016-03-07 13:37:00.000000000 +0100
@@ -32,6 +32,10 @@
Patch0: kde357895.patch
# PATCH-FIX-UPSTREAM fix-IconItem-regression.patch -- kde#359388
Patch1: fix-IconItem-regression.patch
+# PATCH-FIX-UPSTREAM 0001-if-path-is-passed-pick-the-tail.patch
+Patch2: 0001-if-path-is-passed-pick-the-tail.patch
+# PATCH-FIX-UPSTREAM 0001-Theme-Discard-pixmap-cache-when-changing-theme.patch
+Patch3: 0001-Theme-Discard-pixmap-cache-when-changing-theme.patch
BuildRequires: extra-cmake-modules >= %{_tar_path}
BuildRequires: fdupes
BuildRequires: kactivities5-devel >= %{_tar_path}
@@ -127,6 +131,8 @@
%setup -q
%patch0
%patch1 -p1
+%patch2 -p1
+%patch3 -p1
%build
%cmake_kf5 -d build
++++++ 0001-Theme-Discard-pixmap-cache-when-changing-theme.patch ++++++
>From 60af310cfc456558648c9af73d35c8a7dbee3011 Mon Sep 17 00:00:00 2001
From: David Rosca <now...@gmail.com>
Date: Tue, 1 Mar 2016 00:06:15 +0100
Subject: [PATCH 1/4] Theme: Discard pixmap cache when changing theme
Changing theme also changes color scheme making the pixmap cache
invalid for monochrome icons.
CCBUG: 359924
REVIEW: 127226
---
src/plasma/private/theme_p.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/plasma/private/theme_p.cpp b/src/plasma/private/theme_p.cpp
index cca11f3..943d3af 100644
--- a/src/plasma/private/theme_p.cpp
+++ b/src/plasma/private/theme_p.cpp
@@ -772,7 +772,7 @@ void ThemePrivate::setThemeName(const QString
&tempThemeName, bool writeSettings
}
if(emitChanged) {
- scheduleThemeChangeNotification(SvgElementsCache);
+ scheduleThemeChangeNotification(PixmapCache | SvgElementsCache);
}
}
--
2.6.2
++++++ 0001-if-path-is-passed-pick-the-tail.patch ++++++
>From 40b99a91222f59a6172b8673536c3c15c0458bf6 Mon Sep 17 00:00:00 2001
From: Marco Martin <notm...@gmail.com>
Date: Mon, 29 Feb 2016 17:31:38 +0100
Subject: [PATCH 1/1] if path is passed, pick the tail
PluginLoader::loadApplet works both by passing a simple plugin
name and a full path of a plasmoid package.
However, when loading the optional C++ plugin, we have to look
in the standard plasmoid plugin path, so only consider the
tail of the path name, as is guaranteed that part is equal to
the plugin name.
BUG:359902
Change-Id: Ic7300b7c12d7693bcb5590e29de780109a8ff81c
---
src/plasma/pluginloader.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/plasma/pluginloader.cpp b/src/plasma/pluginloader.cpp
index 6691980..0915e46 100644
--- a/src/plasma/pluginloader.cpp
+++ b/src/plasma/pluginloader.cpp
@@ -186,11 +186,13 @@ Applet *PluginLoader::loadApplet(const QString &name,
uint appletId, const QVari
}
+ //if name wasn't a path, pluginName == name
+ const QString pluginName = name.split('/').last();
// Look for C++ plugins first
- auto filter = [&name](const KPluginMetaData &md) -> bool
+ auto filter = [&pluginName](const KPluginMetaData &md) -> bool
{
- return md.pluginId() == name;
+ return md.pluginId() == pluginName;
};
QVector<KPluginMetaData> plugins =
KPluginLoader::findPlugins(PluginLoaderPrivate::s_plasmoidsPluginDir, filter);
--
2.6.2
