summaryrefslogtreecommitdiffstats
path: root/source/kde/kde/patch
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2023-02-23 20:47:06 +0000
committer Eric Hameleers <alien@slackware.com>2023-02-23 22:38:18 +0100
commitb2b4f6942b1e8d10c8df8b4f60f3d5c84bd55d33 (patch)
treea90c2cea0d867cc485d4006fadcb54c2fdd372e1 /source/kde/kde/patch
parente62cfd9d2522bd362046428e4a00e30a1fed17e8 (diff)
downloadcurrent-b2b4f6942b1e8d10c8df8b4f60f3d5c84bd55d33.tar.gz
current-b2b4f6942b1e8d10c8df8b4f60f3d5c84bd55d33.tar.xz
Thu Feb 23 20:47:06 UTC 202320230223204706
ap/sqlite-3.41.0-x86_64-1.txz: Upgraded. d/parallel-20230222-noarch-1.txz: Upgraded. kde/kidletime-5.103.0-x86_64-2.txz: Rebuilt. [PATCH] wayland: Guard wayland object destructors. Thanks to marav. l/glib2-2.74.6-x86_64-1.txz: Upgraded. l/nodejs-19.7.0-x86_64-1.txz: Upgraded. l/v4l-utils-1.24.0-x86_64-1.txz: Upgraded. n/NetworkManager-1.42.2-x86_64-1.txz: Upgraded. x/font-util-1.4.0-x86_64-1.txz: Upgraded. x/mesa-22.3.6-x86_64-1.txz: Upgraded. x/xbitmaps-1.1.3-x86_64-1.txz: Upgraded. x/xcursor-themes-1.0.7-noarch-1.txz: Upgraded. x/xf86-video-amdgpu-23.0.0-x86_64-1.txz: Upgraded. x/xorg-cf-files-1.0.8-x86_64-1.txz: Upgraded. xap/gimp-2.10.34-x86_64-1.txz: Upgraded. xap/gparted-1.5.0-x86_64-1.txz: Upgraded. xfce/thunar-4.18.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/kde/kde/patch')
-rw-r--r--source/kde/kde/patch/kidletime.patch1
-rw-r--r--source/kde/kde/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch56
2 files changed, 57 insertions, 0 deletions
diff --git a/source/kde/kde/patch/kidletime.patch b/source/kde/kde/patch/kidletime.patch
new file mode 100644
index 000000000..5d8e5e302
--- /dev/null
+++ b/source/kde/kde/patch/kidletime.patch
@@ -0,0 +1 @@
+cat $CWD/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/kde/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch b/source/kde/kde/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch
new file mode 100644
index 000000000..da2faa692
--- /dev/null
+++ b/source/kde/kde/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch
@@ -0,0 +1,56 @@
+From a0da010b8c4c97792543d24f6597ba1c1b3ceaef Mon Sep 17 00:00:00 2001
+From: David Redondo <kde@david-redondo.de>
+Date: Thu, 16 Feb 2023 12:16:03 +0100
+Subject: [PATCH] wayland: Guard wayland object destructors
+
+Kidletime is a singleton and the client API works by supplying ints to add
+or remove timeouts. When not all timeouts are removed before program exits,
+trying to destroy the wayland objects will crash since the lifetime of the
+wayland connection is tied to the QGuiApplication.
+BUG:465801
+FIXED-IN:5.104
+
+
+(cherry picked from commit 53779a8d8fb177762d0435634c8ca45b0a47f1db)
+---
+ src/plugins/wayland/poller.cpp | 10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/plugins/wayland/poller.cpp b/src/plugins/wayland/poller.cpp
+index 918766b..9c1d7ad 100644
+--- a/src/plugins/wayland/poller.cpp
++++ b/src/plugins/wayland/poller.cpp
+@@ -50,7 +50,9 @@ public:
+
+ ~IdleTimeoutKwin()
+ {
+- release();
++ if (qGuiApp) {
++ release();
++ }
+ }
+
+ protected:
+@@ -74,7 +76,9 @@ public:
+
+ ~IdleTimeoutExt()
+ {
+- destroy();
++ if (qGuiApp) {
++ destroy();
++ }
+ }
+
+ protected:
+@@ -120,7 +124,7 @@ public:
+ }
+ ~IdleManagerExt()
+ {
+- if (isActive()) {
++ if (qGuiApp && isActive()) {
+ destroy();
+ }
+ }
+--
+GitLab
+