diff options
Diffstat (limited to 'source/x')
| -rw-r--r-- | source/x/x11/build/xcompmgr | 2 | ||||
| -rw-r--r-- | source/x/x11/patch/xcompmgr.patch | 2 | ||||
| -rw-r--r-- | source/x/x11/patch/xcompmgr/patch-XFixesSetPictureClipRegion-shadow-fix-xcompmgr.c.diff | 28 |
3 files changed, 1 insertions, 31 deletions
diff --git a/source/x/x11/build/xcompmgr b/source/x/x11/build/xcompmgr index 0cfbf0888..d00491fd7 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 33c43a524..6097b12a3 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 39b8ac725..000000000 --- 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; |