From 3b7e089bdda55791198b67eb80a3945c4eb9668a Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Mar 2019 22:36:26 +0000
Subject: Mon Mar 25 22:36:26 UTC 2019

ap/nano-4.0-x86_64-1.txz:  Upgraded.
l/Mako-1.0.8-x86_64-1.txz:  Upgraded.
l/imagemagick-6.9.10_35-x86_64-1.txz:  Upgraded.
l/libedit-20190324_3.1-x86_64-1.txz:  Upgraded.
l/shared-mime-info-1.12-x86_64-1.txz:  Upgraded.
x/xcompmgr-1.1.8-x86_64-1.txz:  Upgraded.
xap/mozilla-thunderbird-60.6.1-x86_64-1.txz:  Upgraded.
  This release contains security fixes and improvements.
  For more information, see:
    https://www.mozilla.org/en-US/thunderbird/60.6.1/releasenotes/
    https://www.mozilla.org/security/known-vulnerabilities/thunderbird.html
  (* Security fix *)
---
 source/x/x11/build/xcompmgr                        |  2 +-
 source/x/x11/patch/xcompmgr.patch                  |  2 --
 ...SetPictureClipRegion-shadow-fix-xcompmgr.c.diff | 28 ----------------------
 3 files changed, 1 insertion(+), 31 deletions(-)
 delete mode 100644 source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff

(limited to 'source/x')

diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr
index 0cfbf088..d00491fd 100644
--- a/source/x/x11/build/xcompmgr
+++ b/source/x/x11/build/xcompmgr
@@ -1 +1 @@
-2
+1
diff --git a/source/x/x11/patch/xcompmgr.patch b/source/x/x11/patch/xcompmgr.patch
index 33c43a52..6097b12a 100644
--- a/source/x/x11/patch/xcompmgr.patch
+++ b/source/x/x11/patch/xcompmgr.patch
@@ -1,4 +1,2 @@
 zcat $CWD/patch/xcompmgr/xcompmgr-follow-icccm-spec.diff.gz | patch -p1 --verbose \
      || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff.gz | patch -p0 --verbose \
-     || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff b/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff
deleted file mode 100644
index 39b8ac72..00000000
--- a/source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff
+++ /dev/null
@@ -1,28 +0,0 @@
---- xcompmgr.c	2011-11-19 01:49:52.000000000 -0600
-+++ xcompmgr.c	2012-08-11 21:58:58.000000000 -0500
-@@ -1028,7 +1028,6 @@
- 	{
- 	    w->borderClip = XFixesCreateRegion (dpy, NULL, 0);
- 	    XFixesCopyRegion (dpy, w->borderClip, region);
--	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
- 	}
- 	w->prev_trans = t;
- 	t = w;
-@@ -1080,6 +1079,8 @@
- 	if (w->mode == WINDOW_TRANS)
- 	{
- 	    int	x, y, wid, hei;
-+	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
-+	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
- #if HAS_NAME_WINDOW_PIXMAP
- 	    x = w->a.x;
- 	    y = w->a.y;
-@@ -1099,6 +1100,8 @@
- 	else if (w->mode == WINDOW_ARGB)
- 	{
- 	    int	x, y, wid, hei;
-+	    XFixesIntersectRegion(dpy, w->borderClip, w->borderClip, w->borderSize);
-+	    XFixesSetPictureClipRegion(dpy, rootBuffer, 0, 0, w->borderClip);
- #if HAS_NAME_WINDOW_PIXMAP
- 	    x = w->a.x;
- 	    y = w->a.y;
-- 
cgit v1.2.3