svn commit: r555201 - in head/x11-wm/xfce4-wm: . files
Guido Falsi
madpilot at FreeBSD.org
Sun Nov 15 12:25:31 UTC 2020
Author: madpilot
Date: Sun Nov 15 12:25:30 2020
New Revision: 555201
URL: https://svnweb.freebsd.org/changeset/ports/555201
Log:
Import upstream patch to avoid crash due to unhandled XError in
XKillClient()
PR: 251136
Submitted by: rozhuk.im at gmail.com
Obtained from: https://gitlab.xfce.org/xfce/xfwm4/-/commit/e2fbfac304beace0297d071f7de0aceba4f0016a
MFH: 2020Q4
Added:
head/x11-wm/xfce4-wm/files/
head/x11-wm/xfce4-wm/files/patch-XKillClient-XError (contents, props changed)
Modified:
head/x11-wm/xfce4-wm/Makefile
Modified: head/x11-wm/xfce4-wm/Makefile
==============================================================================
--- head/x11-wm/xfce4-wm/Makefile Sun Nov 15 12:18:49 2020 (r555200)
+++ head/x11-wm/xfce4-wm/Makefile Sun Nov 15 12:25:30 2020 (r555201)
@@ -3,6 +3,7 @@
PORTNAME= xfce4-wm
PORTVERSION= 4.14.6
+PORTREVISION= 1
CATEGORIES= x11-wm xfce
MASTER_SITES= XFCE
DISTNAME= xfwm4-${DISTVERSIONFULL}
Added: head/x11-wm/xfce4-wm/files/patch-XKillClient-XError
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/x11-wm/xfce4-wm/files/patch-XKillClient-XError Sun Nov 15 12:25:30 2020 (r555201)
@@ -0,0 +1,24 @@
+diff --git a/src/client.c b/src/client.c
+index c90c7ada710b482a847e80a1e835adf54fe97f34..13acc44f75455b1c9de70255a73cf4457dfb7531 100644
+--- src/client.c
++++ src/client.c
+@@ -2705,10 +2705,18 @@ clientClose (Client *c)
+ void
+ clientKill (Client *c)
+ {
++ ScreenInfo *screen_info;
++ DisplayInfo *display_info;
++
+ g_return_if_fail (c != NULL);
+ TRACE ("client \"%s\" (0x%lx)", c->name, c->window);
+
+- XKillClient (clientGetXDisplay (c), c->window);
++ screen_info = c->screen_info;
++ display_info = screen_info->display_info;
++
++ myDisplayErrorTrapPush (display_info);
++ XKillClient (display_info->dpy, c->window);
++ myDisplayErrorTrapPopIgnored (display_info);
+ }
+
+ void
More information about the svn-ports-all
mailing list