Hello community, here is the log from the commit of package plasma5-desktop for openSUSE:Factory checked in at 2016-08-29 15:33:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plasma5-desktop (Old) and /work/SRC/openSUSE:Factory/.plasma5-desktop.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plasma5-desktop" Changes: -------- --- /work/SRC/openSUSE:Factory/plasma5-desktop/plasma5-desktop.changes 2016-08-12 15:40:55.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma5-desktop.changes 2016-08-29 15:33:35.000000000 +0200 @@ -1,0 +2,22 @@ +Sat Aug 27 01:29:30 UTC 2016 - [email protected] + +- Don't try to remove kactivities5.po anymore, they have been + removed upstream + +------------------------------------------------------------------- +Fri Aug 26 20:36:41 UTC 2016 - [email protected] + +- Update to 5.7.4 + * New bugfix release + * For more details please see: + https://www.kde.org/announcements/plasma-5.7.4.php + +------------------------------------------------------------------- +Fri Aug 26 09:59:11 UTC 2016 - [email protected] + +- Add use-iconName-if-possible.patch: adjust the application menu's + search function to use the iconName if set, and change the + included runners to set the iconName instead of an icon to + prevent threading issues and speed up things (boo#994983) + +------------------------------------------------------------------- Old: ---- plasma-desktop-5.7.3.tar.xz New: ---- plasma-desktop-5.7.4.tar.xz use-iconName-if-possible.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plasma5-desktop.spec ++++++ --- /var/tmp/diff_new_pack.JqYc6n/_old 2016-08-29 15:33:38.000000000 +0200 +++ /var/tmp/diff_new_pack.JqYc6n/_new 2016-08-29 15:33:38.000000000 +0200 @@ -18,7 +18,7 @@ %bcond_without lang Name: plasma5-desktop -Version: 5.7.3 +Version: 5.7.4 Release: 0 Summary: The KDE Plasma Workspace Components License: GPL-2.0 @@ -28,6 +28,7 @@ Patch0: 0001-Require-xorg-evdev-2.8.99.1.patch # PATCHES 100-200 and above are from upstream 5.7 branch # PATCHES 201-300 and above are from upstream master/5.8 branch +Patch201: use-iconName-if-possible.patch BuildRequires: boost-devel BuildRequires: extra-cmake-modules >= 1.8.0 BuildRequires: fdupes @@ -176,8 +177,7 @@ %if 0%{?suse_version} > 1314 && "%{suse_version}" != "1320" %patch0 -Rp1 %endif -# conflict with kactivitimanagerd lang (and unused) -rm -rf po/*/kactivities5.po +%patch201 -p1 %build %cmake_kf5 -d build -- -DCMAKE_INSTALL_LOCALEDIR=%{_kf5_localedir} @@ -308,10 +308,9 @@ %if %{with lang} %files lang -f %{name}.lang -%doc %lang(ca) %{_kf5_htmldir}/ca/ %doc %lang(cs) %{_kf5_htmldir}/cs/ +%doc %lang(de) %{_kf5_htmldir}/de/ %doc %lang(it) %{_kf5_htmldir}/it/ -#doc %%lang(de) %%{_kf5_htmldir}/de/ %doc %lang(nl) %{_kf5_htmldir}/nl/ %doc %lang(pt_BR) %{_kf5_htmldir}/pt_BR/ %doc %lang(ru) %{_kf5_htmldir}/ru/ ++++++ plasma-desktop-5.7.3.tar.xz -> plasma-desktop-5.7.4.tar.xz ++++++ /work/SRC/openSUSE:Factory/plasma5-desktop/plasma-desktop-5.7.3.tar.xz /work/SRC/openSUSE:Factory/.plasma5-desktop.new/plasma-desktop-5.7.4.tar.xz differ: char 25, line 1 ++++++ use-iconName-if-possible.patch ++++++ From: Kai Uwe Broulik <[email protected]> Date: Fri, 17 Jun 2016 19:07:50 +0000 Subject: [Kicker RunnerMatchesModel] Use iconName() if possible X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=6fd35500d5cc46301f49d3fa452a51cb2c78cdae --- [Kicker RunnerMatchesModel] Use iconName() if possible Also bump Frameworks version requirement to 5.24 for that Differential Revision: https://phabricator.kde.org/D1923 --- --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ Concurrent ) -set(KF5_MIN_VERSION "5.20.0") +set(KF5_MIN_VERSION "5.24.0") find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Auth Plasma --- a/applets/kicker/plugin/runnermatchesmodel.cpp +++ b/applets/kicker/plugin/runnermatchesmodel.cpp @@ -54,6 +54,10 @@ if (role == Qt::DisplayRole) { return match.text(); } else if (role == Qt::DecorationRole) { + if (!match.iconName().isEmpty()) { + return match.iconName(); + } + return match.icon(); } else if (role == Kicker::DescriptionRole) { return match.subtext(); From: Kai Uwe Broulik <[email protected]> Date: Fri, 17 Jun 2016 19:28:17 +0000 Subject: Use iconName instead of icon in all kwin and plasma-desktop runner X-Git-Url: http://quickgit.kde.org/?p=plasma-desktop.git&a=commitdiff&h=f7c41dba58ab7a50c3ff38a9f7701ab2c03b81b2 --- Use iconName instead of icon in all kwin and plasma-desktop runner --- --- a/runners/kwin/kwin-runner.cpp +++ b/runners/kwin/kwin-runner.cpp @@ -22,8 +22,6 @@ #include <QDBusConnection> #include <QDBusServiceWatcher> #include <QDBusConnectionInterface> - -#include <QIcon> #include <KLocalizedString> @@ -56,7 +54,7 @@ Plasma::QueryMatch match(this); match.setId("kwin"); match.setType(Plasma::QueryMatch::ExactMatch); - match.setIcon(QIcon::fromTheme("kwin")); + match.setIconName(QStringLiteral("kwin")); match.setText(i18n("Open KWin debug console")); match.setRelevance(1.0); context.addMatch(match); --- a/runners/plasma-desktop/plasma-desktop-runner.cpp +++ b/runners/plasma-desktop/plasma-desktop-runner.cpp @@ -23,7 +23,6 @@ #include <QDBusConnectionInterface> #include <QDebug> -#include <QIcon> #include <KLocalizedString> @@ -58,7 +57,7 @@ Plasma::QueryMatch match(this); match.setId("plasma-desktop-console"); match.setType(Plasma::QueryMatch::ExactMatch); - match.setIcon(QIcon::fromTheme("plasma")); + match.setIconName(QStringLiteral("plasma")); match.setText(i18n("Open Plasma desktop interactive console")); match.setRelevance(1.0); context.addMatch(match); @@ -67,7 +66,7 @@ Plasma::QueryMatch match(this); match.setId("plasma-desktop-console"); match.setType(Plasma::QueryMatch::ExactMatch); - match.setIcon(QIcon::fromTheme("kwin")); + match.setIconName(QStringLiteral("kwin")); match.setText(i18n("Open KWin interactive console")); match.setRelevance(1.0); context.addMatch(match);
