summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch
diff options
context:
space:
mode:
Diffstat (limited to 'source/kde/kde/patch')
-rw-r--r--source/kde/kde/patch/kwin.patch3
-rw-r--r--source/kde/kde/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch35
-rw-r--r--source/kde/kde/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch34
-rw-r--r--source/kde/kde/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch27
4 files changed, 99 insertions, 0 deletions
diff --git a/source/kde/kde/patch/kwin.patch b/source/kde/kde/patch/kwin.patch
new file mode 100644
index 000000000..c98d53e37
--- /dev/null
+++ b/source/kde/kde/patch/kwin.patch
@@ -0,0 +1,3 @@
+cat $CWD/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+cat $CWD/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch b/source/kde/kde/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch
new file mode 100644
index 000000000..8a4de9426
--- /dev/null
+++ b/source/kde/kde/patch/kwin/2339f7bfb7872e05fbdbd931850a74a3441b3292.patch
@@ -0,0 +1,35 @@
+From 2339f7bfb7872e05fbdbd931850a74a3441b3292 Mon Sep 17 00:00:00 2001
+From: Xaver Hugl <xaver.hugl@gmail.com>
+Date: Wed, 26 Oct 2022 21:43:41 +0200
+Subject: [PATCH] x11window: revert more from 3a28c02f
+
+BUG: 461032
+
+
+(cherry picked from commit 2997fb24bb8171145ce1107df85eb3a3a4c0cf74)
+---
+ src/x11window.cpp | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/src/x11window.cpp b/src/x11window.cpp
+index c02d33b338..b7a180d317 100644
+--- a/src/x11window.cpp
++++ b/src/x11window.cpp
+@@ -4519,11 +4519,10 @@ void X11Window::changeMaximize(bool horizontal, bool vertical, bool adjust)
+ }
+ }
+ r.moveTopLeft(rules()->checkPosition(r.topLeft()));
+- // The above code tries to center align the window followed by setting top and bottom
+- // it's possible that we're in between two pixels
+- r.setX(Xcb::nativeFloor(r.x()));
+- r.setY(Xcb::nativeFloor(r.y()));
+ }
++ // The above code tries to center align the window followed by setting top and bottom
++ // it's possible that we're in between two pixels
++ r = Xcb::nativeFloor(r);
+
+ moveResize(r);
+ if (options->electricBorderMaximize() && r.top() == clientArea.top()) {
+--
+GitLab
+
diff --git a/source/kde/kde/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch b/source/kde/kde/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch
new file mode 100644
index 000000000..9de1f3db1
--- /dev/null
+++ b/source/kde/kde/patch/kwin/4c5830ba149ec4462587a95f78624dfc981d281c.patch
@@ -0,0 +1,34 @@
+From 4c5830ba149ec4462587a95f78624dfc981d281c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Patron?= <priv.luk@gmail.com>
+Date: Tue, 25 Oct 2022 15:49:27 +0200
+Subject: [PATCH] x11: Don't force QT_NO_GLIB=1
+
+This breaks certain apps, e.g. KDE System Settings when launched from
+overview effect.
+
+BUG: 460980
+
+
+(cherry picked from commit c2b4f03f9671c0ad9fc1929426df5f79db414aa7)
+---
+ src/main_x11.cpp | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/src/main_x11.cpp b/src/main_x11.cpp
+index 21cfab94b3..c175d8729e 100644
+--- a/src/main_x11.cpp
++++ b/src/main_x11.cpp
+@@ -337,10 +337,6 @@ int main(int argc, char *argv[])
+
+ signal(SIGPIPE, SIG_IGN);
+
+- // Disable the glib event loop integration, since it seems to be responsible
+- // for several bug reports about high CPU usage (bug #239963)
+- setenv("QT_NO_GLIB", "1", true);
+-
+ // enforce xcb plugin, unfortunately command line switch has precedence
+ setenv("QT_QPA_PLATFORM", "xcb", true);
+
+--
+GitLab
+
diff --git a/source/kde/kde/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch b/source/kde/kde/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch
new file mode 100644
index 000000000..0fbb74fed
--- /dev/null
+++ b/source/kde/kde/patch/kwin/a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd.patch
@@ -0,0 +1,27 @@
+From a9acef8573ca44ce9649a6ced42e19ef6d4ee3fd Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C5=81ukasz=20Patron?= <priv.luk@gmail.com>
+Date: Thu, 27 Oct 2022 00:42:24 +0200
+Subject: [PATCH] x11: Don't force QT_QPA_PLATFORM=xcb
+
+This is basically a cherry pick of 77ec43d5e (Don't force
+QT_QPA_PLATFORM=wayland), except for X11.
+---
+ src/main_x11.cpp | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/main_x11.cpp b/src/main_x11.cpp
+index bb722bf5d8..66e0341f1c 100644
+--- a/src/main_x11.cpp
++++ b/src/main_x11.cpp
+@@ -362,6 +362,8 @@ int main(int argc, char *argv[])
+
+ KWin::ApplicationX11 a(argc, argv);
+ a.setupTranslator();
++ // reset QT_QPA_PLATFORM so we don't propagate it to our children (e.g. apps launched from the overview effect)
++ qunsetenv("QT_QPA_PLATFORM");
+
+ KSignalHandler::self()->watchSignal(SIGTERM);
+ KSignalHandler::self()->watchSignal(SIGINT);
+--
+GitLab
+