diff options
Diffstat (limited to 'source')
-rw-r--r-- | source/kde/kde/build/kidletime | 2 | ||||
-rw-r--r-- | source/kde/kde/patch/kidletime.patch | 1 | ||||
-rw-r--r-- | source/kde/kde/patch/kidletime/a0da010b8c4c97792543d24f6597ba1c1b3ceaef.patch | 56 | ||||
-rwxr-xr-x | source/l/v4l-utils/v4l-utils.SlackBuild | 5 | ||||
-rw-r--r-- | source/x/x11/build/xbitmaps | 2 | ||||
-rw-r--r-- | source/x/x11/build/xcursor-themes | 2 | ||||
-rw-r--r-- | source/x/x11/build/xf86-video-amdgpu | 2 |
7 files changed, 66 insertions, 4 deletions
diff --git a/source/kde/kde/build/kidletime b/source/kde/kde/build/kidletime index d00491fd7..0cfbf0888 100644 --- a/source/kde/kde/build/kidletime +++ b/source/kde/kde/build/kidletime @@ -1 +1 @@ -1 +2 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 + diff --git a/source/l/v4l-utils/v4l-utils.SlackBuild b/source/l/v4l-utils/v4l-utils.SlackBuild index 9fc5dd8d7..03d71f81b 100755 --- a/source/l/v4l-utils/v4l-utils.SlackBuild +++ b/source/l/v4l-utils/v4l-utils.SlackBuild @@ -79,6 +79,10 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +if [ "$ARCH" = "i586" -o "$ARCH" = "i686" ]; then + TRACER="--disable-v4l2-tracer" +fi + # Configure: CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ @@ -89,6 +93,7 @@ CXXFLAGS="$SLKCFLAGS" \ --mandir=/usr/man \ --infodir=/usr/info \ --disable-static \ + $TRACER \ --build=$ARCH-slackware-linux || exit 1 # Build and install: diff --git a/source/x/x11/build/xbitmaps b/source/x/x11/build/xbitmaps index b8626c4cf..d00491fd7 100644 --- a/source/x/x11/build/xbitmaps +++ b/source/x/x11/build/xbitmaps @@ -1 +1 @@ -4 +1 diff --git a/source/x/x11/build/xcursor-themes b/source/x/x11/build/xcursor-themes index 00750edc0..d00491fd7 100644 --- a/source/x/x11/build/xcursor-themes +++ b/source/x/x11/build/xcursor-themes @@ -1 +1 @@ -3 +1 diff --git a/source/x/x11/build/xf86-video-amdgpu b/source/x/x11/build/xf86-video-amdgpu index 0cfbf0888..d00491fd7 100644 --- a/source/x/x11/build/xf86-video-amdgpu +++ b/source/x/x11/build/xf86-video-amdgpu @@ -1 +1 @@ -2 +1 |