diff options
Diffstat (limited to 'source/kde/kde/patch')
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 + |