From 223d06db4de4d4752193413e12b8a3b3f909457d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 19 Jul 2016 10:40:47 -0500 Subject: [PATCH] 5.7.2 --- .gitignore | 1 + ...stem-Tray-Increase-maximum-icon-size.patch | 29 ------------------- ...ma-workspace-5.7.2-systray_iconSizes.patch | 12 ++++++++ plasma-workspace.spec | 14 +++++---- sources | 2 +- 5 files changed, 22 insertions(+), 36 deletions(-) delete mode 100644 0003-System-Tray-Increase-maximum-icon-size.patch create mode 100644 plasma-workspace-5.7.2-systray_iconSizes.patch diff --git a/.gitignore b/.gitignore index b843c1f..311b129 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /plasma-workspace-5.6.95.tar.xz /plasma-workspace-5.7.0.tar.xz /plasma-workspace-5.7.1.tar.xz +/plasma-workspace-5.7.2.tar.xz diff --git a/0003-System-Tray-Increase-maximum-icon-size.patch b/0003-System-Tray-Increase-maximum-icon-size.patch deleted file mode 100644 index c56b27c..0000000 --- a/0003-System-Tray-Increase-maximum-icon-size.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1ba0e6e5ddd598e9b0cf87a654467f97c06b26c5 Mon Sep 17 00:00:00 2001 -From: Kai Uwe Broulik -Date: Wed, 6 Jul 2016 11:26:48 +0200 -Subject: [PATCH 03/19] [System Tray] Increase maximum icon size - -BUG: 364431 -FIXED-IN: 5.7.1 - -Differential Revision: https://phabricator.kde.org/D2097 ---- - applets/systemtray/package/contents/ui/main.qml | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/applets/systemtray/package/contents/ui/main.qml b/applets/systemtray/package/contents/ui/main.qml -index 20fd211..fa710ed 100644 ---- a/applets/systemtray/package/contents/ui/main.qml -+++ b/applets/systemtray/package/contents/ui/main.qml -@@ -31,7 +31,7 @@ MouseArea { - Layout.minimumHeight: vertical ? tasksRow.implicitHeight+ expander.implicitHeight + units.smallSpacing : units.smallSpacing - - property bool vertical: plasmoid.formFactor == PlasmaCore.Types.Vertical -- property int itemSize: Math.min(Math.min(width, height), units.iconSizes.smallMedium) -+ property int itemSize: Math.min(Math.min(width, height), units.iconSizes.medium) - property int hiddenItemSize: units.iconSizes.smallMedium - property alias expanded: dialog.visible - property Item activeApplet --- -2.7.4 - diff --git a/plasma-workspace-5.7.2-systray_iconSizes.patch b/plasma-workspace-5.7.2-systray_iconSizes.patch new file mode 100644 index 0000000..07bbf1a --- /dev/null +++ b/plasma-workspace-5.7.2-systray_iconSizes.patch @@ -0,0 +1,12 @@ +diff -up plasma-workspace-5.7.2/applets/systemtray/package/contents/ui/main.qml.orig plasma-workspace-5.7.2/applets/systemtray/package/contents/ui/main.qml +--- plasma-workspace-5.7.2/applets/systemtray/package/contents/ui/main.qml.orig 2016-07-19 10:36:25.219419321 -0500 ++++ plasma-workspace-5.7.2/applets/systemtray/package/contents/ui/main.qml 2016-07-19 10:38:42.199898555 -0500 +@@ -31,7 +31,7 @@ MouseArea { + Layout.minimumHeight: vertical ? tasksRow.implicitHeight+ expander.implicitHeight + units.smallSpacing : units.smallSpacing + + property bool vertical: plasmoid.formFactor == PlasmaCore.Types.Vertical +- property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes.medium)) ++ property int itemSize: units.roundToIconSize(Math.min(Math.min(width, height), units.iconSizes.smallMedium)) + property int hiddenItemSize: units.iconSizes.smallMedium + property alias expanded: dialog.visible + property Item activeApplet diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 42e8e47..dcc98f4 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -6,8 +6,8 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets -Version: 5.7.1 -Release: 3%{?dist} +Version: 5.7.2 +Release: 1%{?dist} License: GPLv2+ URL: https://quickgit.kde.org/?p=%{name}.git @@ -35,6 +35,8 @@ Patch11: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch # remove stuff we don't want or need, plus a minor bit of customization --rex Patch12: startkde.patch Patch13: startplasmacompositor.patch +# revert (semi) regresssion wrt systray icon sizes, http://bugs.kde.org/365570 +Patch14: plasma-workspace-5.7.2-systray_iconSizes.patch ## upstreamable Patches # (yum) debuginfo-install improvements @@ -43,9 +45,6 @@ Patch1: kde-runtime-4.9.0-installdbgsymbols.patch Patch2: plasma-workspace-5.6.4-installdbgsymbols.patch ## upstream Patches -# introduces (semi) regression, http://bugs.kde.org/365570 -# revert for now -Patch3: 0003-System-Tray-Increase-maximum-icon-size.patch ## master branch Patches @@ -392,7 +391,6 @@ Requires: f24-kde-theme %setup -q ## upstream patches -%patch3 -p1 -R %if 0%{?fedora} > 23 # dnf debuginfo-install %patch2 -p1 -b .installdgbsymbols @@ -408,6 +406,7 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee %endif %patch12 -p1 -b .startkde %patch13 -p1 -b .startplasmacompositor +%patch14 -p1 sed -i.plasmawayland -e "s|Plasma|Plasma (Wayland)|g" plasmawayland.desktop.cmake @@ -648,6 +647,9 @@ fi %changelog +* Tue Jul 19 2016 Rex Dieter - 5.7.2-1 +- 5.7.2 + * Tue Jul 19 2016 Rex Dieter - 5.7.1-3 - BR: qt5-qtbase-private-devel diff --git a/sources b/sources index 2fe63b1..64133ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb1dafa3e888bb2eb3d472180dac1c7c plasma-workspace-5.7.1.tar.xz +2649ef60cc1ce18295e162ce937db3cc plasma-workspace-5.7.2.tar.xz