Accepting request 926765 from KDE:Frameworks5
- Add back X11 root window properties until firefox is adjusted (boo#1191825): * 0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch * 0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch (forwarded request 926668 from Vogtinator) OBS-URL: https://build.opensuse.org/request/show/926765 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plasma5-workspace?expand=0&rev=177
This commit is contained in:
Git OBS Bridge
@@ -0,0 +1,30 @@
|
||||
From 5db85cf17cd11236f8ee44ba95dd56b81087c6aa Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Date: Thu, 21 Oct 2021 08:20:33 +0200
|
||||
Subject: [PATCH 1/2] Revert "Drop setupX11 from startplasma-waylandsession"
|
||||
|
||||
This reverts commit 8bf0e43620de3416e783c307ba10111c6964757b.
|
||||
---
|
||||
startkde/startplasma-waylandsession.cpp | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
|
||||
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
|
||||
index 3a054a04f..ed496cc24 100644
|
||||
--- a/startkde/startplasma-waylandsession.cpp
|
||||
+++ b/startkde/startplasma-waylandsession.cpp
|
||||
@@ -19,6 +19,12 @@ int main(int argc, char **argv)
|
||||
|
||||
out << "startplasma-waylandsession: Starting up...";
|
||||
|
||||
+ if (qEnvironmentVariableIsSet("DISPLAY")) {
|
||||
+ setupX11();
|
||||
+ } else {
|
||||
+ qWarning() << "running kwin without Xwayland support";
|
||||
+ }
|
||||
+
|
||||
if (!syncDBusEnvironment()) {
|
||||
out << "Could not sync environment to dbus.\n";
|
||||
return 2;
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@@ -1,49 +0,0 @@
|
||||
From d5a3e749a30613294f41386180aaf31dfb1a9bee Mon Sep 17 00:00:00 2001
|
||||
From: Nate Graham <nate@kde.org>
|
||||
Date: Thu, 14 Oct 2021 15:44:33 -0600
|
||||
Subject: [PATCH] sddm-theme: fix missing password field on "Other" page
|
||||
|
||||
On this page there is no concept of the user being passwordless because
|
||||
no username has been specified by the user yet; we cannot know ahead of
|
||||
time. As a result, userList.currentItem.needsPassword is blank so the
|
||||
password field gets hidden.
|
||||
|
||||
We should just assume that in username/password entry mode, all users
|
||||
have a password set. For any users where this is not the case, they can
|
||||
just leave the password blank, and it's not any worse than it was in
|
||||
Plasma 5.22.
|
||||
|
||||
BUG: 443737
|
||||
FIXED-IN: 5.23.1
|
||||
|
||||
|
||||
(cherry picked from commit f038ab3f494f26b443b10ff5dc9f156e1ec16341)
|
||||
---
|
||||
sddm-theme/Login.qml | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/sddm-theme/Login.qml b/sddm-theme/Login.qml
|
||||
index 8829666f1..6d3d62804 100644
|
||||
--- a/sddm-theme/Login.qml
|
||||
+++ b/sddm-theme/Login.qml
|
||||
@@ -83,7 +83,7 @@ SessionManagementScreen {
|
||||
}
|
||||
}
|
||||
|
||||
- visible: userList.currentItem.needsPassword
|
||||
+ visible: root.showUsernamePrompt || userList.currentItem.needsPassword
|
||||
|
||||
Keys.onEscapePressed: {
|
||||
mainStack.currentItem.forceActiveFocus();
|
||||
@@ -119,7 +119,7 @@ SessionManagementScreen {
|
||||
|
||||
icon.name: text.length == 0 ? "go-next" : ""
|
||||
|
||||
- text: userList.currentItem.needsPassword ? "" : i18n("Log In")
|
||||
+ text: root.showUsernamePrompt || userList.currentItem.needsPassword ? "" : i18n("Log In")
|
||||
onClicked: startLogin();
|
||||
}
|
||||
}
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
From 075b2f27722d2f28a5c3d4e201c7e7e787cb68de Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fabian@ritter-vogt.de>
|
||||
Date: Thu, 21 Oct 2021 08:20:38 +0200
|
||||
Subject: [PATCH 2/2] Revert "Drop X11 root properties for KDE full session /
|
||||
session version"
|
||||
|
||||
This reverts commit 9a4e3d39c2a9ca48f39a60ae2ea88e9921723cec.
|
||||
---
|
||||
startkde/startplasma-waylandsession.cpp | 1 +
|
||||
startkde/startplasma-x11.cpp | 1 +
|
||||
startkde/startplasma.cpp | 22 ++++++++++++++++++++++
|
||||
startkde/startplasma.h | 1 +
|
||||
4 files changed, 25 insertions(+)
|
||||
|
||||
diff --git a/startkde/startplasma-waylandsession.cpp b/startkde/startplasma-waylandsession.cpp
|
||||
index ed496cc24..d0c83bf5a 100644
|
||||
--- a/startkde/startplasma-waylandsession.cpp
|
||||
+++ b/startkde/startplasma-waylandsession.cpp
|
||||
@@ -41,6 +41,7 @@ int main(int argc, char **argv)
|
||||
// Keep for KF5; remove in KF6 (KInit will be gone then)
|
||||
runSync(QStringLiteral("kdeinit5_shutdown"), {});
|
||||
|
||||
+ cleanupX11();
|
||||
out << "startplasma-waylandsession: Done.\n";
|
||||
|
||||
return 0;
|
||||
diff --git a/startkde/startplasma-x11.cpp b/startkde/startplasma-x11.cpp
|
||||
index d6b2c5439..7ddf7b3ea 100644
|
||||
--- a/startkde/startplasma-x11.cpp
|
||||
+++ b/startkde/startplasma-x11.cpp
|
||||
@@ -93,6 +93,7 @@ int main(int argc, char **argv)
|
||||
runSync(QStringLiteral("kdeinit5_shutdown"), {});
|
||||
|
||||
cleanupPlasmaEnvironment(oldSystemdEnvironment);
|
||||
+ cleanupX11();
|
||||
|
||||
out << "startkde: Done.\n";
|
||||
|
||||
diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
|
||||
index 8d0b0ba89..5f78e7016 100644
|
||||
--- a/startkde/startplasma.cpp
|
||||
+++ b/startkde/startplasma.cpp
|
||||
@@ -336,6 +336,28 @@ void setupX11()
|
||||
// so don't move this up.
|
||||
|
||||
runSync(QStringLiteral("xsetroot"), {QStringLiteral("-cursor_name"), QStringLiteral("left_ptr")});
|
||||
+ runSync(QStringLiteral("xprop"),
|
||||
+ {QStringLiteral("-root"),
|
||||
+ QStringLiteral("-f"),
|
||||
+ QStringLiteral("KDE_FULL_SESSION"),
|
||||
+ QStringLiteral("8t"),
|
||||
+ QStringLiteral("-set"),
|
||||
+ QStringLiteral("KDE_FULL_SESSION"),
|
||||
+ QStringLiteral("true")});
|
||||
+ runSync(QStringLiteral("xprop"),
|
||||
+ {QStringLiteral("-root"),
|
||||
+ QStringLiteral("-f"),
|
||||
+ QStringLiteral("KDE_SESSION_VERSION"),
|
||||
+ QStringLiteral("32c"),
|
||||
+ QStringLiteral("-set"),
|
||||
+ QStringLiteral("KDE_SESSION_VERSION"),
|
||||
+ QStringLiteral("5")});
|
||||
+}
|
||||
+
|
||||
+void cleanupX11()
|
||||
+{
|
||||
+ runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_FULL_SESSION")});
|
||||
+ runSync(QStringLiteral("xprop"), {QStringLiteral("-root"), QStringLiteral("-remove"), QStringLiteral("KDE_SESSION_VERSION")});
|
||||
}
|
||||
|
||||
void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment)
|
||||
diff --git a/startkde/startplasma.h b/startkde/startplasma.h
|
||||
index e8684be74..00c5c1570 100644
|
||||
--- a/startkde/startplasma.h
|
||||
+++ b/startkde/startplasma.h
|
||||
@@ -26,6 +26,7 @@ void importSystemdEnvrionment();
|
||||
void runEnvironmentScripts();
|
||||
void setupPlasmaEnvironment();
|
||||
void cleanupPlasmaEnvironment(const std::optional<QStringList> &oldSystemdEnvironment);
|
||||
+void cleanupX11();
|
||||
bool syncDBusEnvironment();
|
||||
void setupFontDpi();
|
||||
QProcess *setupKSplash();
|
||||
--
|
||||
2.33.0
|
||||
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:49abcb19639a72eb5ffa916d5eca0a925d32a36e4a02658cc73ab479dea39965
|
||||
size 8995284
|
||||
@@ -1,16 +0,0 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmFe3toACgkQ11dEg7tX
|
||||
sY0Qmw/+Iycidd50mPqACLZFoc0mwJJztRBJCXA8M896sAK4fumdIHKiei/EP5mS
|
||||
gXqLeCs8ONWNvfJl/JWAEw7vin0crVaHIF+IRF49k5Kj87KKKFi5oNN38lS8v0I3
|
||||
kSakRpBDBjBAspTipYJSgswt+RHGXC7GPU0XLuRED0dV08ibnFNfsn10ODD2vEdq
|
||||
YXEUPO1w+DHxfswyO+mV+qDwDdWqY2dyJMOXroTGEpsRPsAmnFH09sxGtFGctvGD
|
||||
S+3OntGXfpT8FAhtg4jIHQVb8954iRwuehJvrMsE5Pqwdli/LTwRB9YQU5Du+sFy
|
||||
pcS1Lfv+KahJMgVj5jftsDkvoX+ckf4zboYA/AFrRtw96QWp5Js2W9f/Fv+Mi/l3
|
||||
YdaQL4QjrVYbJ6XEytIAlwbS9ISI8TMlyb02JJUXFK1yQ/V4BzIsO3wVUUHKH7sk
|
||||
zOm8WfYM+deTbbe1p9Jq6zpObWrcGZ0sfAdzC8cgX8ppKOxyqz/2a2XNPwcEDZ8O
|
||||
7MIwIj/Va0WhjABOUDtltNCf2JpOUejPnjsa0IeGGpjCneuoDtqW5nINSvKjinx9
|
||||
s41haMZ3gYySHJP7tg0uwADSLRg1TjdwIx060vhdiVgSrI0w5fKZGstt+CW6sew2
|
||||
qKFOAgocwqG6RNa4WXKHIJkrNeeOGl3FUuGjFJ3G7pA1Eqed/GE=
|
||||
=3o/N
|
||||
-----END PGP SIGNATURE-----
|
||||
3
plasma-workspace-5.23.1.tar.xz
Normal file
3
plasma-workspace-5.23.1.tar.xz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:fbf979f857b3cdcc8fe6dc45c3a1d9dfe297e1120aa551a02faa339abb81efad
|
||||
size 9001244
|
||||
16
plasma-workspace-5.23.1.tar.xz.sig
Normal file
16
plasma-workspace-5.23.1.tar.xz.sig
Normal file
@@ -0,0 +1,16 @@
|
||||
-----BEGIN PGP SIGNATURE-----
|
||||
|
||||
iQIzBAABCgAdFiEE4KPrIC+OV1KOE+cv11dEg7tXsY0FAmFuwekACgkQ11dEg7tX
|
||||
sY21Ng/9GlTMjCYzeGe0kH2yiAexQCLDvX1EnbZS/FbmrpKKyedwI2+Amg1ycBA7
|
||||
7ofsiqQH1Rk5i7tJdGfV4i4KBldbmAbi1nk9IrvdiLM+MTGzwlJNP1yjCnPLDWXp
|
||||
tX8HbV+6ZIcWGq+MLuVoIs2t/g5uWcfcD6yrtqcnWcGR/jKwvZuhb4hkck6gsNz1
|
||||
KVkSqCZsgM6sM6nQni0JOxC8E83m16/EgcR3alf0PMO5Qty4+yuRD2eQy7K5CL8/
|
||||
MjdkVqbujsBUy8iSIu7jjNepUyIFsBmMUvmM32WK56GrIIlFY8v8JUiU5OuYnL2q
|
||||
I1Jo/arVglaBYRXienfFk/Pvozts7MC1+rdt5BOYoMANNFFkJ8FraTtlxygs6mRc
|
||||
oRKnj+8hHJYprgTi3pwGQuwiNOo+4cYJ4AGtNHobuSi2IGmU3bB2uwK1FIPCmaYN
|
||||
J+pYDL7Faqgg6NN3hA3xKcLyI/8jrmZxjN+bUk1MeRbrZRCBPZQg9mEEU5ssyiNL
|
||||
esYwkdryol0VYlumHxMvBvVi9GI+Tfs6FvyDgoImhOmR4dcUnbmwUoCSOC0XI33x
|
||||
TDwolm7QvR6MotsaqBc2E8w5+6vYnX4SIDJULnXJS/22Z4OEsCs6xl1bbZk89+L0
|
||||
0M/x2iodY/1FpMFAJZ/gHMOrCaOo5OO6RoXmrsA4HL4884Zc3fM=
|
||||
=s3r/
|
||||
-----END PGP SIGNATURE-----
|
||||
@@ -1,3 +1,29 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Oct 21 06:28:20 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Add back X11 root window properties until firefox is adjusted
|
||||
(boo#1191825):
|
||||
* 0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch
|
||||
* 0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Oct 19 14:05:44 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
- Update to 5.23.1
|
||||
* New bugfix release
|
||||
* For more details please see:
|
||||
* https://kde.org/announcements/plasma/5/5.23.1
|
||||
- Changes since 5.23.0:
|
||||
* [freespacenotifier] impr: no notification for ro filesystems
|
||||
* kcms/colors: Don't apply header accent colors to non-Header color schemes (kde#443786)
|
||||
* [kcms/colors] Notify global settings change after saving
|
||||
* krdb: Fix removal of Xft.dpi from Xresources (kde#350039)
|
||||
* sddm-theme: fix missing password field on "Other" page (kde#443737)
|
||||
* pipewire: Report DRM_FORMAT_MOD_INVALID when no modifiers are offered
|
||||
* [digital-clock] Do not assign undefined when agenda is not visible (kde#443380)
|
||||
- Drop patches, now upstream:
|
||||
* 0001-sddm-theme-fix-missing-password-field-on-Other-page.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 15 08:54:29 UTC 2021 - Fabian Vogt <fabian@ritter-vogt.de>
|
||||
|
||||
|
||||
@@ -30,7 +30,7 @@ Name: plasma5-workspace
|
||||
%{!?_plasma5_bugfix: %global _plasma5_bugfix %{version}}
|
||||
# Latest ABI-stable Plasma (e.g. 5.8 in KF5, but 5.9.1 in KUF)
|
||||
%{!?_plasma5_version: %define _plasma5_version %(echo %{_plasma5_bugfix} | awk -F. '{print $1"."$2}')}
|
||||
Version: 5.23.0
|
||||
Version: 5.23.1
|
||||
Release: 0
|
||||
Summary: The KDE Plasma Workspace Components
|
||||
License: GPL-2.0-or-later
|
||||
@@ -41,11 +41,11 @@ Source: plasma-workspace-%{version}.tar.xz
|
||||
Source1: plasma-workspace-%{version}.tar.xz.sig
|
||||
Source2: plasma.keyring
|
||||
%endif
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch1: 0001-sddm-theme-fix-missing-password-field-on-Other-page.patch
|
||||
# PATCHES 501-??? are PATCH-FIX-OPENSUSE
|
||||
Patch501: 0001-Use-qdbus-qt5.patch
|
||||
Patch502: 0001-Ignore-default-sddm-face-icons.patch
|
||||
Patch503: 0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch
|
||||
Patch504: 0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch
|
||||
# PATCH-FEATURE-OPENSUSE
|
||||
Patch506: 0001-Revert-No-icons-on-the-desktop-by-default.patch
|
||||
BuildRequires: breeze5-icons
|
||||
|
||||
Reference in New Issue
Block a user