summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2022-01-17 22:44:42 +0000
committer Eric Hameleers <alien@slackware.com>2022-01-18 08:59:56 +0100
commit387bf82d1caf0cb8c6e4407796b3fabe587be38e (patch)
tree8a135ebf9f79d0872c3dcf6132fb24bf8f18a73b /source/kde/kde/patch
parent54efc574732f81aa298dd8ea253200222d32f1b2 (diff)
downloadcurrent-387bf82d1caf0cb8c6e4407796b3fabe587be38e.tar.gz
current-387bf82d1caf0cb8c6e4407796b3fabe587be38e.tar.xz
Mon Jan 17 22:44:42 UTC 202220220117224442
Things haven't quite settled down yet with more bugfixes and a couple of safe upgrades, so not today folks. But enjoy Slackware's half-birthday anyway! ;-) ap/slackpkg-15.0.10-noarch-1.txz: Upgraded. Fix mirrors.ucr.ac.cr link address (Emmet Ford) Remove wroc.pl mirrors (Emmet Ford) Remove kddilabs.jp from mirrors (Emmet Ford) Unattended usage improvements (PiterPUNK) Create file to flag if the system needs restart (PiterPUNK) Thanks to Robby Workman. kde/kstars-3.5.7-x86_64-1.txz: Upgraded. kde/kwin-5.23.5-x86_64-2.txz: Rebuilt. [PATCH] Bypass wayland interface blacklisting. Thanks to LuckyCyborg. kde/plasma-workspace-5.23.5-x86_64-3.txz: Rebuilt. [PATCH 1/2] Revert "Drop setupX11 from startplasma-waylandsession." [PATCH 2/2] Revert "Drop X11 root properties for KDE full session." Thanks to LuckyCyborg. l/libical-3.0.13-x86_64-1.txz: Upgraded. n/p11-kit-0.24.1-x86_64-1.txz: Upgraded. n/stunnel-5.62-x86_64-1.txz: Upgraded. x/xterm-370-x86_64-4.txz: Rebuilt. Fixed XTerm-console (previously XTerm.linux.console). Renamed XTerm.upstream.default to XTerm-upstream. Thanks to GazL. xap/fluxbox-1.3.7-x86_64-6.txz: Rebuilt. [PATCH] replace FbRootWindow::depth with maxDepth. Thanks to OldHolborn. xap/geeqie-1.7.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde/kde/patch')
-rw-r--r--source/kde/kde/patch/kwin.patch1
-rw-r--r--source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch26
-rw-r--r--source/kde/kde/patch/plasma-workspace.patch3
-rw-r--r--source/kde/kde/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch30
-rw-r--r--source/kde/kde/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch86
5 files changed, 145 insertions, 1 deletions
diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch
new file mode 100644
index 000000000..829028e5b
--- /dev/null
+++ b/source/kde/kde/patch/kwin.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch b/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch
new file mode 100644
index 000000000..7968887a6
--- /dev/null
+++ b/source/kde/kde/patch/kwin/0001-Bypass-wayland-interface-blacklisting.patch
@@ -0,0 +1,26 @@
+From 76abce728d3abb94c71076e6211a0da655397b0f Mon Sep 17 00:00:00 2001
+From: Fabian Vogt <fabian@ritter-vogt.de>
+Date: Tue, 12 Nov 2019 13:18:26 +0100
+Subject: [PATCH] Bypass wayland interface blacklisting
+
+Currently the check isn't worth anything and it breaks some applications.
+See discussion on https://phabricator.kde.org/D22571 and https://phabricator.kde.org/T4437#207062.
+---
+ src/wayland_server.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/wayland_server.cpp b/src/wayland_server.cpp
+index e93d51911..95f3a746a 100644
+--- a/src/wayland_server.cpp
++++ b/src/wayland_server.cpp
+@@ -130,6 +130,7 @@ public:
+ QSet<QString> m_reported;
+
+ bool allowInterface(KWaylandServer::ClientConnection *client, const QByteArray &interfaceName) override {
++ return true;
+ if (client->processId() == getpid()) {
+ return true;
+ }
+--
+2.25.1
+
diff --git a/source/kde/kde/patch/plasma-workspace.patch b/source/kde/kde/patch/plasma-workspace.patch
index d6d7d971b..7d2b9d398 100644
--- a/source/kde/kde/patch/plasma-workspace.patch
+++ b/source/kde/kde/patch/plasma-workspace.patch
@@ -1,4 +1,5 @@
-# [PATCH] Revert "No icons on the desktop by default":
cat $CWD/patch/plasma-workspace/0001-Revert-No-icons-on-the-desktop-by-default.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
cat $CWD/patch/plasma-workspace/70d23b89.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
cat $CWD/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch b/source/kde/kde/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch
new file mode 100644
index 000000000..4ed7dc6fa
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch
@@ -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
+
diff --git a/source/kde/kde/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch b/source/kde/kde/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch
new file mode 100644
index 000000000..3f6d71970
--- /dev/null
+++ b/source/kde/kde/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch
@@ -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
+