forked from pool/plasma6-workspace
Accepting request 1157732 from KDE:Frameworks
Plasma 6.0.2 + libksysguard5-helper upgrade fix + icon upgrade fix + gtk theme fix (forwarded request 1157674 from Vogtinator) OBS-URL: https://build.opensuse.org/request/show/1157732 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma6-workspace?expand=0&rev=2
This commit is contained in:
Ana Guerrero
Git OBS Bridge
commit
8beb9c57ee
@ -1,39 +0,0 @@
|
||||
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
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:d4c35cb168b990487b39f1b7eb1946909c5e74f0200d0de2d317659c16f15a0c
|
||||
size 19944828
|
||||
@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmXnnpsACgkQ11dEg7tX
|
||||
sY0dLQ/8CqcvsgBjuqNv/xAEUrhKCTMnwnv8D7ib0wyMEeW4LYkUeuxhdk2M2wfu
|
||||
/9ajPsyzBm3MPO+Ouu7O6Vvh4x9737rlMQFgOsqw84XNFCsLWammc8I9eHN6Us0w
|
||||
ykvf+zcM07hC/M3pQECZgOjh/ISM39b06XD/2EKO8yrcQDbm7l5KZdwj85C0+Pl4
|
||||
Fg5JTIOwE7xWSv0XqBGHuVLPEw9tM8DAMPhZTrD0pRrX3XqR1yWihSftqmDIYnHL
|
||||
/llOjwuoMDaIngK0UUg9BKwFJgrOhrrlgaLOjBSsxvnJ7kN5bVy9ElEu4xw4LSd0
|
||||
ITve8+9G41VaDmLpslznmxNybVTMyNRKChSm24CAbBtlqc2e1zVVYPFpf4EYSFdg
|
||||
usrFpKZPWC+6XvZm3zVEEkBRC0YHHL1KxTZ7gdtb0JcthAWBsafZyTc32562vfIf
|
||||
RufYoaIR2E5Bk/M8vqTmQ1N3iqQHfzAbX2a9jbFtCIUumqUNz1NzBp6JkdsBwpZZ
|
||||
UUmXbfbm1GNyUltFicBsas530icKoC33bSdQrzOAjYj192Hz1P8NFXI1gDfK/qsg
|
||||
XJVY4CMNwKdGbQ454O1mKQcVjYeDe9GPHa8PW4gbBoCeGKU6wu8du1uXuT0+3edO
|
||||
BhK+YUxNz9DT9Q4p6KJ+EDJv2oK+vxbr1xiwJ74FjN8N9olxMMc=
|
||||
=fdhH
|
||||
-----END PGP SIGNATURE-----
|
||||
3
plasma-workspace-6.0.2.tar.xz
Normal file
3
plasma-workspace-6.0.2.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9cceb4e2bce045970fc177bf2847ffae58bd397806b8ccf44da5820a3bd600ce
|
||||
size 19949364
|
||||
16
plasma-workspace-6.0.2.tar.xz.sig
Normal file
16
plasma-workspace-6.0.2.tar.xz.sig
Normal file
@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmXwTnUACgkQ11dEg7tX
|
||||
sY3m1xAApEOgB4dCZ6Jno/g787I5YIf0NMOMfK55iVMjXJubvM+F60BU4U4NOTOm
|
||||
6Ee60VUGPqVBSPq8DkjuoxWlQctuJ2XhVdTuJh7gW3Uja+fOh2RilB3vQWS4jKaG
|
||||
KmHnc7C056C1RlGYG0FuNZzbSD6qFG03DHMbOmB0f/ZJQkrUFbo4vYdtDVKmP/yi
|
||||
zA9X/lpx2PtH8ilyj2htsiUOS7NpYd3oFPLASkQ5T5RUh52Djj0EfDPaGZkWmdMv
|
||||
zL5Jrr5LDPVqlNuJVIATHl+mHeYRIaCwBeSwlBXSM2sygZzosPd/W+bhKVxSv7gU
|
||||
vchvIWzq0CA280JIqhY5pxAXzS+WJqHK0mGAKxHfxgN75YR0wRC2b+AIiDW//PkA
|
||||
wqe66mk67SyEgpegxmjOX5MiXFZGfENpiF3r2idmZ6nC7zL9TaK/UdrrVZc5VUhs
|
||||
hlCShw5vm6PVO/Z/fN01tIcP+LsOLuRxrSvZXLATDqAvpL0mj3YwF6h3OZCNCI+k
|
||||
Lv6WMCdbbpEOuch80Kle7LiP1R8N7EAgNN6xGLVFKjXb1Ewj+bgWmfGYoSqCdAny
|
||||
PJk6XnjSl/mfwMS6+GW+uzs7utswhhPgaIdA/hXmZZUxqVn1j2SQzRoLV+DIy0wf
|
||||
xM6Uzp5vHTjEC0ckKJzwb+xa81/szg8FJgD+DiiPRxJayD3wHio=
|
||||
=ZmWy
|
||||
-----END PGP SIGNATURE-----
|
||||
@ -1,3 +1,36 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 13 09:10:27 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 6.0.2:
|
||||
* New bugfix release
|
||||
* For more details see https://kde.org/announcements/plasma/6/6.0.2
|
||||
- Changes since 6.0.1:
|
||||
* update version for new release
|
||||
* kcms/wallpaper: check if config ui has saveConfig
|
||||
* kcms/wallpaper: format main.qml
|
||||
* shell: properly demarshall DBus argument for color
|
||||
* libkmpris: always update active player index on rows inserted (kde#483027)
|
||||
* libkmpris: work around nonstandard players (kde#482603)
|
||||
* [applets/systemtray] Load icons with Plasma palette (kde#482645)
|
||||
* applets/battery: hide battery percentage option when no batteries available (kde#482089)
|
||||
* wallpapers/image: save the last position for slideshow on exit (kde#482543)
|
||||
* PanelView: Remove redundant reading of the same config key
|
||||
* Fix panels being set to floating by upgrades
|
||||
* libkmpris: assert active player always matches active index
|
||||
* libkmpris: set active player index to -1 when no player matches active player (kde#482756)
|
||||
* libkmpris: fix container not being deleted when its identity is empty
|
||||
* runners/services: Increase category relevance when service name starts with query
|
||||
* libkmpris: prevent an empty icon from being used (kde#482908)
|
||||
* appiumtests: move kcm tests to their own folder
|
||||
* shell: read wallpaper config from plugin instead of local file (kde#481741)
|
||||
* wallpapers/image: remove unused connection
|
||||
* shell: Avoid reserving a screen edge if no surface role has been created yet (kde#482399)
|
||||
* kcm/regionandlang: fix Setting LANG to C mangles preview strings (kde#482234)
|
||||
* update version for new release
|
||||
- Redirect stdout in waitforkded.conf
|
||||
- Drop patches, now upstream:
|
||||
* 0001-Fix-panels-being-set-to-floating-by-upgrades.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 10 19:08:46 UTC 2024 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package plasma6-workspace
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -30,7 +30,7 @@
|
||||
%{!?_plasma6_version: %define _plasma6_version %(echo %{_plasma6_bugfix} | awk -F. '{print $1"."$2}')}
|
||||
%bcond_without released
|
||||
Name: plasma6-workspace
|
||||
Version: 6.0.1
|
||||
Version: 6.0.2
|
||||
Release: 0
|
||||
Summary: The KDE Plasma Workspace Components
|
||||
License: GPL-2.0-or-later
|
||||
@ -43,8 +43,6 @@ Source2: plasma.keyring
|
||||
Source3: sddm.conf
|
||||
Source4: waitforkded.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
|
||||
@ -175,8 +173,8 @@ Requires: kactivitymanagerd6
|
||||
Requires: kde-cli-tools6 >= %{_plasma6_bugfix}
|
||||
Requires: kf6-kded
|
||||
Requires: kf6-kquickcharts
|
||||
Requires: kirigami-addons6 >= 0.10.0
|
||||
Requires: kglobalacceld6 >= %{_plasma6_bugfix}
|
||||
Requires: kirigami-addons6 >= 0.10.0
|
||||
Requires: kscreen6 >= %{_plasma6_bugfix}
|
||||
Requires: kscreenlocker6 >= %{_plasma6_bugfix}
|
||||
Requires: kwin6 >= %{_plasma6_bugfix}
|
||||
@ -282,12 +280,12 @@ Development files.
|
||||
Summary: KDE Plasma 6 Session
|
||||
Requires: breeze6 >= %{_plasma6_bugfix}
|
||||
Requires: breeze6-decoration >= %{_plasma6_bugfix}
|
||||
Requires: kf6-kwindowsystem >= %{kf6_version}
|
||||
Requires: plasma6-desktop >= %{_plasma6_bugfix}
|
||||
Requires: plasma6-workspace >= %{_plasma6_bugfix}
|
||||
Requires: polkit-kde-agent-6 >= %{_plasma6_bugfix}
|
||||
Requires: powerdevil6 >= %{_plasma6_bugfix}
|
||||
Requires: systemsettings6 >= %{_plasma6_bugfix}
|
||||
Requires: kf6-kwindowsystem >= %{kf6_version}
|
||||
# For KF5 kwayland (!)
|
||||
Requires: (kwayland-integration6 if kwayland)
|
||||
Requires: qt6-wayland
|
||||
@ -311,10 +309,10 @@ Plasma 6 session.
|
||||
|
||||
%package -n plasma6-session-x11
|
||||
Summary: KDE Plasma 6 Session on X11
|
||||
Requires: xf86-input-libinput
|
||||
Requires: xorg-x11-server
|
||||
Requires: kwin6-x11 >= %{_plasma6_bugfix}
|
||||
Requires: plasma6-session = %{version}
|
||||
Requires: xf86-input-libinput
|
||||
Requires: xorg-x11-server
|
||||
Requires(post): update-alternatives
|
||||
Requires(postun): update-alternatives
|
||||
|
||||
|
||||
@ -1,3 +1,3 @@
|
||||
[Service]
|
||||
# Wait for kded to be up, which implies that kconf_update is done (kde#483136)
|
||||
ExecStartPre=/usr/bin/qdbus6 org.kde.kded6 /kded org.kde.kded6.loadedModules
|
||||
ExecStartPre=/bin/sh -c "exec /usr/bin/qdbus6 org.kde.kded6 /kded org.kde.kded6.loadedModules >/dev/null"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user