MFH: r553863 r555201

Update xfce4-wm to 4.14.6

Import upstream patch to avoid crash due to unhandled XError in
XKillClient()

PR:		251136
Submitted by:	rozhuk.im@gmail.com
Obtained from:	e2fbfac304

Approved by:	ports-secteam (riggs, fluffy)

x11-wm/xfce4-wm/Makefile

@@ -2,7 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-wm
-PORTVERSION=	4.14.5
+PORTVERSION=	4.14.6
+PORTREVISION=	1
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DISTNAME=	xfwm4-${DISTVERSIONFULL}

x11-wm/xfce4-wm/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1596989339
-SHA256 (xfce4/xfwm4-4.14.5.tar.bz2) = d7a7c63fa42ec6d7cb3caab130d6f496be5bd7689b775d20e8786b7f3e282930
-SIZE (xfce4/xfwm4-4.14.5.tar.bz2) = 1165140
+TIMESTAMP = 1604253744
+SHA256 (xfce4/xfwm4-4.14.6.tar.bz2) = ac6fa8b09d34090fb9ad81d8b7fb0455a10eccf500396b644afa2b9c2444142f
+SIZE (xfce4/xfwm4-4.14.6.tar.bz2) = 1167818

x11-wm/xfce4-wm/files/patch-XKillClient-XError

@@ -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