diff options
Diffstat (limited to 'source/kde/kde/patch/plasma-workspace')
4 files changed, 0 insertions, 206 deletions
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 deleted file mode 100644 index 4ed7dc6fa..000000000 --- a/source/kde/kde/patch/plasma-workspace/0001-Revert-Drop-setupX11-from-startplasma-waylandsession.patch +++ /dev/null @@ -1,30 +0,0 @@ -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 deleted file mode 100644 index 3f6d71970..000000000 --- a/source/kde/kde/patch/plasma-workspace/0002-Revert-Drop-X11-root-properties-for-KDE-full-session.patch +++ /dev/null @@ -1,86 +0,0 @@ -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 - diff --git a/source/kde/kde/patch/plasma-workspace/70d23b89.patch b/source/kde/kde/patch/plasma-workspace/70d23b89.patch deleted file mode 100644 index 2d9c2a0f8..000000000 --- a/source/kde/kde/patch/plasma-workspace/70d23b89.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 70d23b891e95bc6911389773f320a4406a12bd87 Mon Sep 17 00:00:00 2001 -From: Lufan Zhong <lufanzhong@gmail.com> -Date: Sun, 26 Dec 2021 19:33:09 +0000 -Subject: [PATCH] runners/shell: Port from KToolInvocation::invokeTerminal to - KTerminalLauncherJob - -kinit is being deprecated; this change will allow it to open a terminal and execute -commands normally without kinit being present. - -BUG: 437131 -FIXED-IN: 5.24 ---- - runners/shell/shellrunner.cpp | 15 +++++++++++++-- - 1 file changed, 13 insertions(+), 2 deletions(-) - -diff --git a/runners/shell/shellrunner.cpp b/runners/shell/shellrunner.cpp -index 03b54e1f1..be4058acf 100644 ---- a/runners/shell/shellrunner.cpp -+++ b/runners/shell/shellrunner.cpp -@@ -12,8 +12,9 @@ - #include <KLocalizedString> - #include <KNotificationJobUiDelegate> - #include <KShell> --#include <KToolInvocation> -+#include <KTerminalLauncherJob> - #include <QAction> -+#include <QProcessEnvironment> - #include <QRegularExpression> - #include <QStandardPaths> - -@@ -62,7 +63,17 @@ void ShellRunner::run(const Plasma::RunnerContext &context, const Plasma::QueryM - { - if (match.selectedAction()) { - const QVariantList data = match.data().toList(); -- KToolInvocation::invokeTerminal(data.at(0).toString(), data.at(1).toStringList()); -+ const QStringList list = data.at(1).toStringList(); -+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); -+ for (const auto& str : list) -+ { -+ const int pos = str.indexOf('='); -+ env.insert(str.left(pos), str.mid(pos+1)); -+ } -+ auto job = new KTerminalLauncherJob(data.at(0).toString()); -+ job->setProcessEnvironment(env); -+ job->setUiDelegate(new KNotificationJobUiDelegate(KJobUiDelegate::AutoHandlingEnabled)); -+ job->start(); - return; - } - --- -GitLab - diff --git a/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch b/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch deleted file mode 100644 index 4c30b8dec..000000000 --- a/source/kde/kde/patch/plasma-workspace/926f864756e5586f38574c166abdb5befa3dc771.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 926f864756e5586f38574c166abdb5befa3dc771 Mon Sep 17 00:00:00 2001 -From: David Edmundson <kde@davidedmundson.co.uk> -Date: Wed, 8 Dec 2021 13:08:43 +0000 -Subject: [PATCH] [libtaskmanager] Increase buffer for pipewire format - negotiation - -Libtaskmanager's buffer for spa_builder is too small on certain -configurations. Because podBuilder->state.offset is never reset, the -buffer space can run out when EGL returns a long list of dma_buf -modifiers, causing PipeWire negotiation to fail. - -An example is when EGL returns 20 modifiers. There are 6 formats defined -in pipewiresourcestream.cpp, for each format it will construct 2 frames, -one with 21*8=168 bytes long of modifiers. The modifier lists for all -frames will be 6*168=1008 bytes (only 16 bytes left of 1024 bytes), let -alone other frames. - -BUG: 446061 ---- - libtaskmanager/declarative/pipewiresourcestream.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libtaskmanager/declarative/pipewiresourcestream.cpp b/libtaskmanager/declarative/pipewiresourcestream.cpp -index a6713ae76..f1d3032a5 100644 ---- a/libtaskmanager/declarative/pipewiresourcestream.cpp -+++ b/libtaskmanager/declarative/pipewiresourcestream.cpp -@@ -260,7 +260,7 @@ bool PipeWireSourceStream::createStream(uint nodeid) - pwNodeId = nodeid; - pw_stream_add_listener(pwStream, &streamListener, &pwStreamEvents, this); - -- uint8_t buffer[1024]; -+ uint8_t buffer[4096]; - spa_pod_builder podBuilder = SPA_POD_BUILDER_INIT(buffer, sizeof(buffer)); - - const QVector<spa_video_format> formats = --- -GitLab - |