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
This commit is contained in:
Fabian Vogt 2024-03-10 13:41:57 +00:00 committed by Git OBS Bridge
parent f421feccc4
commit 651785516f
3 changed files with 48 additions and 0 deletions

View File

@ -0,0 +1,39 @@
From 458b00f83a9de81edfacb30b2a0ed3ac9b681809 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fabian@ritter-vogt.de>
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

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Sat Mar 9 21:20:25 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
- 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 <fabian@ritter-vogt.de>

View File

@ -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