diff --git a/TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch b/TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch new file mode 100644 index 0000000..65e2d15 --- /dev/null +++ b/TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch @@ -0,0 +1,44 @@ +From: David Rosca +Date: Fri, 19 Feb 2016 16:20:00 +0100 +Subject: [PATCH 519/545] TaskManager: Don't use Plasma theme icons in task + icon + +Summary: +Also disable animation for icon in tooltip (normal Plasma tooltips +no longer have animated icon too). + +BUG: 359387 + +Reviewers: #plasma, hein + +Reviewed By: hein + +Subscribers: plasma-devel + +Projects: #plasma + +Differential Revision: https://phabricator.kde.org/D991 +-- +diff -up plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml.0519 plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml +--- plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml.0519 2016-02-29 11:45:49.595021502 -0600 ++++ plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/Task.qml 2016-02-29 11:49:00.288093610 -0600 +@@ -258,6 +258,7 @@ MouseArea { + + active: task.containsMouse + enabled: true ++ usesPlasmaTheme: false + + source: model.DecorationRole + +diff -up plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml.0519 plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml +--- plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml.0519 2016-01-26 13:39:46.000000000 -0600 ++++ plasma-desktop-5.5.4/applets/taskmanager/package/contents/ui/ToolTipDelegate.qml 2016-02-29 11:45:49.595021502 -0600 +@@ -142,6 +142,8 @@ Column { + x: _s + width: units.iconSizes.desktop + height: width ++ animated: false ++ usesPlasmaTheme: false + source: icon + } + } diff --git a/plasma-desktop.spec b/plasma-desktop.spec index 497c134..a30cfc1 100644 --- a/plasma-desktop.spec +++ b/plasma-desktop.spec @@ -1,10 +1,10 @@ -%global kf5_version 5.13.0 +%global kf5_version 5.19.0 Name: plasma-desktop Summary: Plasma Desktop shell Version: 5.5.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ and (GPLv2 or GPLv3) URL: https://projects.kde.org/plasma-desktop @@ -31,6 +31,9 @@ Patch102: plasma-desktop-fedora_layout.patch # http://bugs.kde.org/359837 Patch14: 0014-Kickoff-Add-removeApplicationCommand-from-Kicker.patch +## upstream patches (master branch) +Patch519: TaskManager-Don-t-use-Plasma-theme-icons-in-task-ico.patch + ## upstreamable patches # missing '#include ' means PK never used Patch50: plasma-desktop-PackageKit.patch @@ -62,6 +65,7 @@ Recommends: muon-discover >= %{majmin_ver} BuildRequires: kf5-rpm-macros BuildRequires: extra-cmake-modules BuildRequires: kf5-plasma-devel >= %{kf5_version} +Requires: kf5-plasma >= %{kf5_version} BuildRequires: kf5-kdoctools-devel >= %{kf5_version} BuildRequires: kf5-ki18n-devel >= %{kf5_version} BuildRequires: kf5-kcmutils-devel >= %{kf5_version} @@ -161,6 +165,7 @@ BuildArch: noarch %setup -q %patch14 -p1 -b .0014 +%patch519 -p1 %patch50 -p1 -b .PackageKit %if 0%{?fedora} > 22 @@ -308,6 +313,9 @@ fi %changelog +* Mon Feb 29 2016 Rex Dieter 5.5.4-4 +- (backport) wrong breeze icons used ... in taskmanager (#359387) + * Fri Feb 26 2016 Rex Dieter 5.5.4-3 - fix kickoff "right click => remove app" packagekit integration (#359837)