Index: branches/2020Q4/x11-wm/xfce4-wm/Makefile
===================================================================
--- branches/2020Q4/x11-wm/xfce4-wm/Makefile	(revision 556599)
+++ branches/2020Q4/x11-wm/xfce4-wm/Makefile	(revision 556600)
@@ -1,54 +1,54 @@
 # Created by: James Earl <jdearl@telus.net>
 # $FreeBSD$
 
 PORTNAME=	xfce4-wm
 PORTVERSION=	4.14.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-wm xfce
 MASTER_SITES=	XFCE
 DISTNAME=	xfwm4-${DISTVERSIONFULL}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
 COMMENT=	Xfce's window manager
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libepoxy.so:graphics/libepoxy
 
 USES=		compiler:c11 gettext-tools gmake gnome pkgconfig tar:bzip2 \
 		xfce xorg
 USE_GNOME=	cairo gtk30 intltool libwnck3
 USE_XFCE=	libmenu xfconf
 USE_XORG=	ice sm x11 xcomposite xdamage xext xfixes xi xinerama \
 		xorgproto xpresent xrandr xrender xres
 
 CONFIGURE_ARGS=	--enable-xsync \
 		--enable-render \
 		--enable-randr \
 		--enable-compositor \
 		--enable-xpresent \
 		--disable-kde-systray
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 DATADIR=	${PREFIX}/share/xfwm4
 
 PORTSCOUT=	limitw:1,even
 
 OPTIONS_DEFINE=		NLS STARTUP
 OPTIONS_DEFAULT=	STARTUP
 OPTIONS_SUB=		yes
 
 STARTUP_DESC=		Startup notification
 
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext-runtime
 
 STARTUP_CONFIGURE_ENABLE=	startup-notification
 STARTUP_LIB_DEPENDS=	libstartup-notification-1.so:x11/startup-notification
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|Default|Greybird|' \
 		${WRKSRC}/settings-dialogs/xfwm4-settings.c
 
 .include <bsd.port.mk>
Index: branches/2020Q4/x11-wm/xfce4-wm/files/patch-XFixes-XError
===================================================================
--- branches/2020Q4/x11-wm/xfce4-wm/files/patch-XFixes-XError	(nonexistent)
+++ branches/2020Q4/x11-wm/xfce4-wm/files/patch-XFixes-XError	(revision 556600)
@@ -0,0 +1,44 @@
+From c255a406bd353a24a9143b152f91e5eb39f69f1f Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan@xfce.org>
+Date: Sat, 28 Nov 2020 21:16:20 +0100
+Subject: [PATCH] compositor: Handle XFixes XError
+
+XFixesSetPictureClipRegion() with the region from the client window can
+cause a RenderBadPicture error.
+
+Make sure to include it within the XError trap.
+
+Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
+https://gitlab.xfce.org/xfce/xfwm4/-/issues/460
+---
+ src/compositor.c | 9 +++++----
+ 1 file changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/compositor.c b/src/compositor.c
+index 5110f29c2..25baaabe5 100644
+--- src/compositor.c
++++ src/compositor.c
+@@ -781,15 +781,16 @@ border_size (CWindow *cw)
+     myDisplayErrorTrapPush (display_info);
+     border = XFixesCreateRegionFromWindow (display_info->dpy,
+                                            cw->id, WindowRegionBounding);
+-    if ((myDisplayErrorTrapPop (display_info) != Success) || (border == None))
+-    {
+-        return None;
+-    }
+     XFixesSetPictureClipRegion (display_info->dpy, cw->picture, 0, 0, border);
+     XFixesTranslateRegion (display_info->dpy, border,
+                            cw->attr.x + cw->attr.border_width,
+                            cw->attr.y + cw->attr.border_width);
+ 
++    if (myDisplayErrorTrapPop (display_info) != Success)
++    {
++        return None;
++    }
++
+     return border;
+ }
+ 
+-- 
+GitLab
+

Property changes on: branches/2020Q4/x11-wm/xfce4-wm/files/patch-XFixes-XError
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4/x11-wm/xfce4-wm/files/patch-Xsync-XError
===================================================================
--- branches/2020Q4/x11-wm/xfce4-wm/files/patch-Xsync-XError	(nonexistent)
+++ branches/2020Q4/x11-wm/xfce4-wm/files/patch-Xsync-XError	(revision 556600)
@@ -0,0 +1,30 @@
+From 6b3c1ef155a01b61443b832b1922b560ef42ce24 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <fourdan@xfce.org>
+Date: Sat, 21 Nov 2020 14:05:04 +0100
+Subject: [PATCH] xsync: Handle XError
+
+XSync can fail, handle the XError gracefully.
+
+Signed-off-by: Olivier Fourdan <fourdan@xfce.org>
+Closes: https://gitlab.xfce.org/xfce/xfwm4/-/issues/448
+---
+ src/xsync.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/xsync.c b/src/xsync.c
+index 920dfdc17..e1c379f9d 100644
+--- src/xsync.c
++++ src/xsync.c
+@@ -113,7 +113,9 @@ clientDestroyXSyncAlarm (Client *c)
+         screen_info = c->screen_info;
+         display_info = screen_info->display_info;
+ 
++        myDisplayErrorTrapPush (display_info);
+         XSyncDestroyAlarm (display_info->dpy, c->xsync_alarm);
++        myDisplayErrorTrapPopIgnored (display_info);
+         c->xsync_alarm = None;
+     }
+ }
+-- 
+GitLab
+

Property changes on: branches/2020Q4/x11-wm/xfce4-wm/files/patch-Xsync-XError
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2020Q4
===================================================================
--- branches/2020Q4	(revision 556599)
+++ branches/2020Q4	(revision 556600)

Property changes on: branches/2020Q4
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r556577