diff --git a/.gitignore b/.gitignore index 01f8c1d..60a6fb7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /plasma-workspace-5.8.6.tar.xz /plasma-workspace-5.9.3.tar.xz /breeze-fedora-1.0.tar.gz +/breeze-fedora-0.2.tar.gz diff --git a/plasma-workspace-5.7.4-systray_iconSizes.patch b/plasma-workspace-5.7.4-systray_iconSizes.patch deleted file mode 100644 index 82f005f..0000000 --- a/plasma-workspace-5.7.4-systray_iconSizes.patch +++ /dev/null @@ -1,12 +0,0 @@ -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 d3eda99..8d34992 100644 --- a/plasma-workspace.spec +++ b/plasma-workspace.spec @@ -44,9 +44,6 @@ Patch100: plasma-workspace-5.7.95-konsole-in-contextmenu.patch Patch101: 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 Patch102: startkde.patch -# revert (semi) regresssion wrt systray icon sizes, http://bugs.kde.org/365570 -# FIXME/TODO: port patch or drop it -- rex (probably drop at this point) -Patch104: 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, @@ -457,7 +454,6 @@ sed -i -e "s|@DEFAULT_LOOKANDFEEL@|%{?default_lookandfeel}%{!?default_lookandfee shell/packageplugins/lookandfeel/lookandfeel.cpp %endif %patch102 -p1 -b .startkde -#patch104 -p1 %patch105 -p1 %if 0%{?fedora} > 21 @@ -717,6 +713,7 @@ fi %files -n sddm-breeze %{_datadir}/sddm/themes/breeze/ %{_datadir}/sddm/themes/01-breeze-fedora/ +%config(noreplace) %{_datadir}/sddm/themes/01-breeze-fedora/theme.conf.user %files wayland %{_kf5_bindir}/startplasmacompositor diff --git a/sources b/sources index ab2cd3b..b4e83cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (plasma-workspace-5.9.3.tar.xz) = 2b8f5281a683d5fac8bb8245997ff865054889cfbd467981530b6f329837b5e6f7b31cb506936a475bc640fb084fb11ec2eedc9a2189df238f6bee242ce782b6 SHA512 (breeze-fedora-1.0.tar.gz) = ebfc7d66ba7042f2247a7dc679b8b9764c501f68b842a6b6a835b3cd990138f4881c09f8690c80c593c75a347adb2cae19f00a7ae5511cdf88d71544692b5d29 +SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8 diff --git a/sources.keep b/sources.keep index ab9de7e..58c0216 100644 --- a/sources.keep +++ b/sources.keep @@ -1 +1 @@ -SHA512 (breeze-fedora-1.0.tar.gz) = ebfc7d66ba7042f2247a7dc679b8b9764c501f68b842a6b6a835b3cd990138f4881c09f8690c80c593c75a347adb2cae19f00a7ae5511cdf88d71544692b5d29 +SHA512 (breeze-fedora-0.2.tar.gz) = ff800e686b0dcb498f321bb94d3a8274c89c092f5408ef1ec3fc65333f046aea43444144ecaf166792f807014383af87b1180dc7540905fc10dc375309f8b2a8