pool/plasma5-workspace
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 926668 from home:Vogtinator:plasma5.23

Browse Source 
- 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

OBS-URL: https://build.opensuse.org/request/show/926668
OBS-URL: https://build.opensuse.org/package/show/KDE:Frameworks5/plasma5-workspace?expand=0&rev=619
This commit is contained in:
Fabian Vogt 2021-10-21 12:29:44 +00:00 committed by Git OBS Bridge
parent 9655b771e8
commit a6320a1b7e
4 changed files with 126 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch Normal file
View File

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

86
0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch Normal file
View File

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

8
plasma5-workspace.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
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>

2
plasma5-workspace.spec
View File

@ -44,6 +44,8 @@ Source2: plasma.keyring
# 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