Tue Aug 7 23:24:17 UTC 201820180807232417

a/btrfs-progs-v4.17.1-x86_64-1.txz:  Upgraded.
a/sysvinit-scripts-2.1-noarch-16.txz:  Rebuilt.
  rc.M: call update-gdk-pixbuf-loaders with HOME=/root to prevent creating
  a .cache directory in /. Thanks to Konrad Rzepecki.
n/NetworkManager-1.12.2-x86_64-2.txz:  Rebuilt.
  Fix libnm compile errors due to NM_AVAILABLE_IN_1_12_2 macro.
x/xorg-server-1.20.1-x86_64-1.txz:  Upgraded.
x/xorg-server-xephyr-1.20.1-x86_64-1.txz:  Upgraded.
x/xorg-server-xnest-1.20.1-x86_64-1.txz:  Upgraded.
x/xorg-server-xvfb-1.20.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.16-x86_64-1.txz:  Upgraded.

3 files changed, 0 insertions, 118 deletions

diff --git a/source/x/x11/patch/xorg-server.patch b/source/x/x11/patch/xorg-server.patch
index bd48d5a0..2f47985b 100644
--- a/source/x/x11/patch/xorg-server.patch
+++ b/source/x/x11/patch/xorg-server.patch
@@ -22,9 +22,3 @@ zcat $CWD/patch/xorg-server/0001-autobind-GPUs-to-the-screen.patch.gz | patch -p
 # Reference: https://bugs.freedesktop.org/show_bug.cgi?id=94844
 # Added here 2018/7.
 zcat $CWD/patch/xorg-server/0001-xfree86-use-modesetting-driver-by-default-on-GeForce.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
-# Glamor patches that synchronize what the drivers and server expect. Written by
-# one of the ATI devs, so might improve things with that driver, but be on the
-# lookout for issues. Added 2018/7.
-zcat $CWD/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch.gz| patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-zcat $CWD/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch.gz | patch -p1 --verbose || { touch ${SLACK_X_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch b/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
deleted file mode 100644
index 32672f2b..00000000
--- a/source/x/x11/patch/xorg-server/xserver-1-2-glamor-Always-return-0-from-glamor_fds_from_pixmap-on-error.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From patchwork Wed May 23 09:43:32 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [xserver,
- 1/2] glamor: Always return 0 from glamor_fds_from_pixmap on error
-From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net>
-X-Patchwork-Id: 224909
-Message-Id: <20180523094333.11076-1-michel@daenzer.net>
-To: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>,
- Daniel Stone <daniels@collabora.com>
-Cc: xorg-devel@lists.x.org
-Date: Wed, 23 May 2018 11:43:32 +0200
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-This matches what glamor_egl_fds_from_pixmap and dri3_fds_from_pixmap do
-and what proc_dri3_buffers_from_pixmap expects.
-
-Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
-                     BuffersFromPixmap"
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
----
- glamor/glamor.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index d984d20f3..e2c74d17a 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -836,20 +836,20 @@ glamor_fds_from_pixmap(ScreenPtr screen, PixmapPtr pixmap, int *fds,
-         glamor_get_screen_private(pixmap->drawable.pScreen);
- 
-     if (!glamor_priv->dri3_enabled)
--        return -1;
-+        return 0;
-     switch (pixmap_priv->type) {
-     case GLAMOR_TEXTURE_DRM:
-     case GLAMOR_TEXTURE_ONLY:
-         if (!glamor_pixmap_ensure_fbo(pixmap, pixmap->drawable.depth == 30 ?
-                                       GL_RGB10_A2 : GL_RGBA, 0))
--            return -1;
-+            return 0;
-         return glamor_egl_fds_from_pixmap(screen, pixmap, fds,
-                                           strides, offsets,
-                                           modifier);
-     default:
-         break;
-     }
--    return -1;
-+    return 0;
- }
- 
- _X_EXPORT int
diff --git a/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch b/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
deleted file mode 100644
index ab92d3fc..00000000
--- a/source/x/x11/patch/xorg-server/xserver-2-2-glamor-Propagate-glamor_fds_from_pixmap-error-in-glamor_fd_from_pixmap.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From patchwork Wed May 23 09:43:33 2018
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 8bit
-Subject: [xserver, 2/2] glamor: Propagate glamor_fds_from_pixmap error in
- glamor_fd_from_pixmap
-From: =?utf-8?q?Michel_D=C3=A4nzer?= <michel@daenzer.net>
-X-Patchwork-Id: 224910
-Message-Id: <20180523094333.11076-2-michel@daenzer.net>
-To: =?UTF-8?q?Louis-Francis=20Ratt=C3=A9-Boulianne?= <lfrb@collabora.com>,
- Daniel Stone <daniels@collabora.com>
-Cc: xorg-devel@lists.x.org
-Date: Wed, 23 May 2018 11:43:33 +0200
-
-From: Michel Dänzer <michel.daenzer@amd.com>
-
-glamor_fds_from_pixmap returns 0 on error, but we were treating that as
-success, continuing with uninitialized stride and fd values.
-
-Also bail if the offset isn't 0, same as in dri3_fd_from_pixmap.
-
-Fixes: c8c276c9569b "glamor: Implement PixmapFromBuffers and
-                     BuffersFromPixmap"
-Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
-Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
----
- glamor/glamor.c | 16 +++++++---------
- 1 file changed, 7 insertions(+), 9 deletions(-)
-
-diff --git a/glamor/glamor.c b/glamor/glamor.c
-index e2c74d17a..63f0947fa 100644
---- a/glamor/glamor.c
-+++ b/glamor/glamor.c
-@@ -865,17 +865,15 @@ glamor_fd_from_pixmap(ScreenPtr screen,
-                                  &modifier);
- 
-     /* Pixmaps with multi-planes/modifier are not supported in this interface */
--    if (ret > 1) {
--        while (ret > 0)
--            close(fds[--ret]);
--        return -1;
-+    if (ret == 1 && offsets[0] == 0) {
-+        *stride = strides[0];
-+        *size = pixmap->drawable.height * *stride;
-+        return fds[0];
-     }
- 
--    ret = fds[0];
--    *stride = strides[0];
--    *size = pixmap->drawable.height * *stride;
--
--    return ret;
-+    while (ret > 0)
-+        close(fds[--ret]);
-+    return -1;
- }
- 
- _X_EXPORT int