diff --git a/0003-System-Tray-Increase-maximum-icon-size.patch b/0003-System-Tray-Increase-maximum-icon-size.patch new file mode 100644 index 0000000..c56b27c --- /dev/null +++ b/0003-System-Tray-Increase-maximum-icon-size.patch @@ -0,0 +1,29 @@ +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.spec b/plasma-workspace.spec index 3357ad1..7dc2521 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -7,7 +7,7 @@ Name: plasma-workspace Summary: Plasma workspace, applications and applets Version: 5.7.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://quickgit.kde.org/?p=%{name}.git @@ -43,6 +43,9 @@ 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 @@ -71,10 +74,9 @@ BuildRequires: xcb-util-wm-devel BuildRequires: xcb-util-devel BuildRequires: glib2-devel BuildRequires: fontconfig-devel -BuildRequires: python-devel +# can remove when kf5-ki18n-5.24.0-2 lands +BuildRequires: python BuildRequires: boost-devel -#BuildRequires: akonadi-qt5-devel -#BuildRequires: kdepimlibs-devel BuildRequires: libusb-devel BuildRequires: libbsd-devel BuildRequires: pam-devel @@ -85,6 +87,9 @@ BuildRequires: libraw1394-devel %endif BuildRequires: gpsd-devel BuildRequires: libqalculate-devel +%if 0%{?fedora} > 23 +BuildRequires: kf5-kholidays-devel +%endif %if 0%{?prison} BuildRequires: kf5-prison-devel %endif @@ -227,6 +232,7 @@ Requires: kde-platform-plugin%{?_isa} %endif # Oxygen +# TODO: review if oxygen-fonts, oxygen-icon-theme are still needed (I suspect not) -- rex Requires: oxygen-icon-theme Requires: oxygen-sound-theme >= %{majmin_ver} Requires: oxygen-fonts @@ -383,7 +389,7 @@ Requires: f24-kde-theme %setup -q ## upstream patches - +%patch3 -p1 -R %if 0%{?fedora} > 23 # dnf debuginfo-install %patch2 -p1 -b .installdgbsymbols @@ -636,6 +642,10 @@ fi %changelog +* Thu Jul 14 2016 Rex Dieter - 5.7.1-2 +- BR: kf5-kholidays-devel +- revert recent upstream systray icon resize (kde#365570) + * Tue Jul 12 2016 Rex Dieter - 5.7.1-1 - 5.7.1