From 651785516fc0aba50f213d7a408ff999195c4dea46e826d17384fdf03de8f45c Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Sun, 10 Mar 2024 13:41:57 +0000 Subject: [PATCH] Accepting request 1156723 from home:Vogtinator:plasma6 - Add patch to fix panels floating after upgrade: * 0001-Fix-panels-being-set-to-floating-by-upgrades.patch OBS-URL: https://build.opensuse.org/request/show/1156723 OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks/plasma6-workspace?expand=0&rev=6 --- ...ls-being-set-to-floating-by-upgrades.patch | 39 +++++++++++++++++++ plasma6-workspace.changes | 6 +++ plasma6-workspace.spec | 3 ++ 3 files changed, 48 insertions(+) create mode 100644 0001-Fix-panels-being-set-to-floating-by-upgrades.patch diff --git a/0001-Fix-panels-being-set-to-floating-by-upgrades.patch b/0001-Fix-panels-being-set-to-floating-by-upgrades.patch new file mode 100644 index 0000000..4c31e60 --- /dev/null +++ b/0001-Fix-panels-being-set-to-floating-by-upgrades.patch @@ -0,0 +1,39 @@ +From 458b00f83a9de81edfacb30b2a0ed3ac9b681809 Mon Sep 17 00:00:00 2001 +From: Fabian Vogt +Date: Sat, 9 Mar 2024 22:16:35 +0100 +Subject: [PATCH] Fix panels being set to floating by upgrades + +The floating setting is independent of resolution so it's read from the +[PlasmaViews][Panel 42] group directly. +--- + ...keep-default-floating-setting-for-plasma-5-panels.cpp | 9 ++------- + 1 file changed, 2 insertions(+), 7 deletions(-) + +diff --git a/shell/kconf_update/plasmashell-6.0-keep-default-floating-setting-for-plasma-5-panels.cpp b/shell/kconf_update/plasmashell-6.0-keep-default-floating-setting-for-plasma-5-panels.cpp +index ed7c7774c3..2e7be85962 100644 +--- a/shell/kconf_update/plasmashell-6.0-keep-default-floating-setting-for-plasma-5-panels.cpp ++++ b/shell/kconf_update/plasmashell-6.0-keep-default-floating-setting-for-plasma-5-panels.cpp +@@ -35,18 +35,13 @@ int main() + } + + KConfigGroup panelConfigGroup(&views, name); +- if (!panelConfigGroup.hasGroup(u"Defaults"_s)) { +- continue; +- } +- +- KConfigGroup defaultConfigGroup(&panelConfigGroup, u"Defaults"_s); +- if (defaultConfigGroup.hasKey("floating")) { ++ if (panelConfigGroup.hasKey("floating")) { + // Respect the manual setting + continue; + } + + // Explicitly set the old default floating setting for panels from Plasma 5 +- defaultConfigGroup.writeEntry("floating", 0); ++ panelConfigGroup.writeEntry("floating", 0); + } + + return configPtr->sync() ? EXIT_SUCCESS : EXIT_FAILURE; +-- +2.43.0 + diff --git a/plasma6-workspace.changes b/plasma6-workspace.changes index 9f4480c..7a8749f 100644 --- a/plasma6-workspace.changes +++ b/plasma6-workspace.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sat Mar 9 21:20:25 UTC 2024 - Fabian Vogt + +- Add patch to fix panels floating after upgrade: + * 0001-Fix-panels-being-set-to-floating-by-upgrades.patch + ------------------------------------------------------------------- Wed Mar 6 08:40:33 UTC 2024 - Fabian Vogt diff --git a/plasma6-workspace.spec b/plasma6-workspace.spec index 0853ccb..dd7f750 100644 --- a/plasma6-workspace.spec +++ b/plasma6-workspace.spec @@ -41,6 +41,9 @@ Source1: https://download.kde.org/stable/plasma/%{version}/%{rname}-%{ver Source2: plasma.keyring %endif Source3: sddm.conf +# PATCH-FIX-UPSTREAM +# https://invent.kde.org/plasma/plasma-workspace/-/merge_requests/4030 +Patch1: 0001-Fix-panels-being-set-to-floating-by-upgrades.patch # PATCHES 501-??? are PATCH-FIX-OPENSUSE Patch501: 0001-Use-qdbus6.patch Patch502: 0001-Ignore-default-sddm-face-icons.patch