From 950d9c8f454a2e0619697b0819f2a49b42edf723 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 24 Aug 2016 07:07:14 -0500 Subject: [PATCH 1/3] 5.7.4 --- .gitignore | 2 +- plasma-workspace-5.7.2-systray_iconSizes.patch | 12 ------------ plasma-workspace-5.7.4-systray_iconSizes.patch | 12 ++++++++++++ plasma-workspace.spec | 10 +++++++--- sources | 2 +- 5 files changed, 21 insertions(+), 17 deletions(-) delete mode 100644 plasma-workspace-5.7.2-systray_iconSizes.patch create mode 100644 plasma-workspace-5.7.4-systray_iconSizes.patch diff --git a/.gitignore b/.gitignore index 5581f46..bd03f31 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -/plasma-workspace-5.7.3.tar.xz +/plasma-workspace-5.7.4.tar.xz diff --git a/plasma-workspace-5.7.2-systray_iconSizes.patch b/plasma-workspace-5.7.2-systray_iconSizes.patch deleted file mode 100644 index 07bbf1a..0000000 --- a/plasma-workspace-5.7.2-systray_iconSizes.patch +++ /dev/null @@ -1,12 +0,0 @@ -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-5.7.4-systray_iconSizes.patch b/plasma-workspace-5.7.4-systray_iconSizes.patch new file mode 100644 index 0000000..82f005f --- /dev/null +++ b/plasma-workspace-5.7.4-systray_iconSizes.patch @@ -0,0 +1,12 @@ +diff -up plasma-workspace-5.7.4/applets/systemtray/package/contents/ui/main.qml.orig plasma-workspace-5.7.4/applets/systemtray/package/contents/ui/main.qml +--- plasma-workspace-5.7.4/applets/systemtray/package/contents/ui/main.qml.orig 2016-08-24 06:15:17.781268751 -0500 ++++ plasma-workspace-5.7.4/applets/systemtray/package/contents/ui/main.qml 2016-08-24 06:17:35.647239516 -0500 +@@ -31,7 +31,7 @@ MouseArea { + Layout.minimumHeight: vertical ? tasksRow.implicitHeight + (expander.visible ? expander.implicitHeight : 0) + 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 902d26c..a6fa0d7 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.3 -Release: 2%{?dist} +Version: 5.7.4 +Release: 1%{?dist} License: GPLv2+ URL: https://quickgit.kde.org/?p=%{name}.git @@ -36,7 +36,7 @@ Patch11: plasma-workspace-5.3.0-set-fedora-default-look-and-feel.patch 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 +Patch14: plasma-workspace-5.7.4-systray_iconSizes.patch # default to folderview (instead of desktop) containment, see also # https://mail.kde.org/pipermail/distributions/2016-July/000133.html # and example, @@ -415,6 +415,7 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee %patch12 -p1 -b .startkde %patch13 -p1 -b .startplasmacompositor %patch14 -p1 +%patch15 -p1 # highlight the use of wayland sed -i.plasmawayland -e "s|Plasma|Plasma (Wayland)|g" plasmawayland.desktop.cmake @@ -663,6 +664,9 @@ fi %changelog +* Tue Aug 23 2016 Rex Dieter - 5.7.4-1 +- 5.7.4 + * Tue Aug 02 2016 Rex Dieter - 5.7.3-2 - adapt to upstream looknfeel/default-layout changes - BR: iso-codes (technically only runtime dep, but can't hurt) diff --git a/sources b/sources index 6f69bff..356a95e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ed64282b5aa36bb77bd3a89334b851d plasma-workspace-5.7.3.tar.xz +c2639e1838538df7a07d30fe99998796 plasma-workspace-5.7.4.tar.xz From ca76c311419d2ee0e6a086de8fcef43eb46ad874 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 24 Aug 2016 09:40:38 -0500 Subject: [PATCH 2/3] update %%files --- plasma-workspace.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index a6fa0d7..83082e2 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -2,7 +2,7 @@ # repo or arch where there's no package that would provide plasmashell #define bootstrap 1 -%global kf5_version 5.23.0 +%global kf5_version 5.25.0 Name: plasma-workspace Summary: Plasma workspace, applications and applets @@ -109,7 +109,7 @@ BuildRequires: qt5-qtdeclarative-devel BuildRequires: qt5-qtwebkit-devel BuildRequires: phonon-qt5-devel -BuildRequires: kf5-rpm-macros +BuildRequires: kf5-rpm-macros >= %{kf5_version} BuildRequires: extra-cmake-modules BuildRequires: kf5-baloo-devel >= %{kf5_version} BuildRequires: kf5-kcmutils-devel >= %{kf5_version} @@ -545,6 +545,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %{_kf5_datadir}/knotifications5/*.notifyrc %{_kf5_datadir}/config.kcfg/* %{_kf5_datadir}/kio_desktop/ +%{_kf5_metainfodir}/*.xml %{_datadir}/applications/org.kde.klipper.desktop %{_datadir}/applications/plasma-windowed.desktop %{_datadir}/xsessions/plasma.desktop From 0ae00f5ac3e2d0190ccbd10b51cc9508ce086f41 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 9 Sep 2016 07:43:43 -0500 Subject: [PATCH 3/3] drop support for f22 (plasma theme) --- plasma-workspace.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/plasma-workspace.spec b/plasma-workspace.spec index 83082e2..ccedf9b 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.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ URL: https://quickgit.kde.org/?p=%{name}.git @@ -435,7 +435,8 @@ make install/fast DESTDIR=%{buildroot} -C %{_target_platform} chrpath --delete %{buildroot}%{_kf5_qtplugindir}/phonon_platform/kde.so -%if 0%{?fedora} > 21 +#if 0%{?fedora} > 21 +%if 0 # Create Fedora Twenty Two look and feel package from the Breeze one cp -r %{buildroot}%{_datadir}/plasma/look-and-feel/{org.kde.breeze.desktop,org.fedoraproject.fedora.twenty.two} install -m 0644 %{SOURCE12} %{buildroot}%{_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.twenty.two/metadata.desktop @@ -527,7 +528,8 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/{plasma-windowed,org. %{_kf5_datadir}/plasma/wallpapers/ %dir %{_kf5_datadir}/plasma/look-and-feel/ %{_kf5_datadir}/plasma/look-and-feel/org.kde.breeze.desktop/ -%if 0%{?fedora} > 21 +#if 0%{?fedora} > 21 +%if 0 %{_kf5_datadir}/plasma/look-and-feel/org.fedoraproject.fedora.twenty.two/ %endif %if 0%{?fedora} > 22 @@ -665,6 +667,9 @@ fi %changelog +* Fri Sep 09 2016 Rex Dieter - 5.7.4-2 +- drop support for f22 (plasma theme) + * Tue Aug 23 2016 Rex Dieter - 5.7.4-1 - 5.7.4