diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2021-01-15 19:37:22 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2021-01-16 08:59:49 +0100 |
| commit | cdbbea4bb74a0bfd04f1484609c725d222b40abd (patch) | |
| tree | 6ada61c286ae383f4fef546174ecb58fa76f2eba /source/xfce/xfwm4 | |
| parent | ec86cffd8eec12d657afec63d5da1ad84b43d510 (diff) | |
| download | current-cdbbea4bb74a0bfd04f1484609c725d222b40abd.tar.gz | |
Fri Jan 15 19:37:22 UTC 202120210115193722
a/elogind-246.9.2-x86_64-1.txz: Upgraded.
a/minicom-2.8-x86_64-1.txz: Upgraded.
kde/kdiagram-2.8.0-x86_64-1.txz: Upgraded.
n/getmail-6.14-x86_64-1.txz: Upgraded.
n/nftables-0.9.7-x86_64-2.txz: Rebuilt.
Rebuilt using --with-python-bin=python3. Thanks to walecha.
xfce/xfwm4-4.16.1-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xfce/xfwm4')
| -rw-r--r-- | source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch | 36 | ||||
| -rwxr-xr-x | source/xfce/xfwm4/xfwm4.SlackBuild | 3 |
2 files changed, 0 insertions, 39 deletions
diff --git a/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch b/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch deleted file mode 100644 index 200432b3..00000000 --- a/source/xfce/xfwm4/0001-compositor-Ignore-XError-when-changing-background-pi.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 56d273ee48fffc7fed67ec7b22afd8e4b1c23c6e Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan <fourdan@xfce.org> -Date: Fri, 25 Dec 2020 18:39:52 +0100 -Subject: [PATCH] compositor: Ignore XError when changing background picture - -If xfwm4 is compiled with support for the root pixmap in the compositor, -changing the background image may cause an XError if the external pixmap -is already freed. - -Guard against such XError. - -Signed-off-by: Olivier Fourdan <fourdan@xfce.org> -Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/476 ---- - src/compositor.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/src/compositor.c b/src/compositor.c -index 9c5ceb454..8ff0dad42 100644 ---- a/src/compositor.c -+++ b/src/compositor.c -@@ -3774,8 +3774,11 @@ compositorHandlePropertyNotify (DisplayInfo *display_info, XPropertyEvent *ev) - ScreenInfo *screen_info = myDisplayGetScreenFromRoot (display_info, ev->window); - if ((screen_info) && (screen_info->compositor_active) && (screen_info->rootTile)) - { -+ myDisplayErrorTrapPush (display_info); - XClearArea (display_info->dpy, screen_info->output, 0, 0, 0, 0, TRUE); - XRenderFreePicture (display_info->dpy, screen_info->rootTile); -+ myDisplayErrorTrapPopIgnored (display_info); -+ - screen_info->rootTile = None; - damage_screen (screen_info); - --- -2.29.2 - diff --git a/source/xfce/xfwm4/xfwm4.SlackBuild b/source/xfce/xfwm4/xfwm4.SlackBuild index 6a5b3b67..bb5fd18f 100755 --- a/source/xfce/xfwm4/xfwm4.SlackBuild +++ b/source/xfce/xfwm4/xfwm4.SlackBuild @@ -80,9 +80,6 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -# Fix Issue 476 -zcat $CWD/0001-compositor-Ignore-XError-when-changing-background-pi.patch.gz | patch -p1 --verbose || exit 1 - # Configure: CFLAGS="$SLKCFLAGS" \ ./configure \ |