04/04: gnu: libxcb: Update to 1.13.

[Marius Bakke]

mbakke pushed a commit to branch core-updates
in repository guix.

commit 236b7aed8267c1493b6ab76482a774643c1e11d5
Author: Marius Bakke <address@hidden>
Date:   Thu Mar 8 18:24:19 2018 +0100

    gnu: libxcb: Update to 1.13.
    
    * gnu/packages/xorg.scm (libxcb): Update to 1.13.
    [source](patches): Remove.
    * gnu/packages/patches/libxcb-python-3.5-compat.patch: Delete file.
    * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
 gnu/local.mk                                       |  1 -
 .../patches/libxcb-python-3.5-compat.patch         | 64 ----------------------
 gnu/packages/xorg.scm                              |  6 +-
 3 files changed, 2 insertions(+), 69 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 6fb9a3a..a29a811 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -864,7 +864,6 @@ dist_patch_DATA =                                           
\
   %D%/packages/patches/libvorbis-CVE-2017-14632.patch          \
   %D%/packages/patches/libvorbis-CVE-2017-14633.patch          \
   %D%/packages/patches/libvpx-CVE-2016-2818.patch              \
-  %D%/packages/patches/libxcb-python-3.5-compat.patch          \
   %D%/packages/patches/libxslt-generated-ids.patch             \
   %D%/packages/patches/libxt-guix-search-paths.patch           \
   %D%/packages/patches/lierolibre-check-unaligned-access.patch \
diff --git a/gnu/packages/patches/libxcb-python-3.5-compat.patch 
b/gnu/packages/patches/libxcb-python-3.5-compat.patch
deleted file mode 100644
index f652498..0000000
--- a/gnu/packages/patches/libxcb-python-3.5-compat.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-Fix compatibility issue with Python 3.5.
-
-Patch copied from upstream source repository:
-
-https://cgit.freedesktop.org/xcb/libxcb/commit/?id=8740a288ca468433141341347aa115b9544891d3
-
-From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
-From: Thomas Klausner <address@hidden>
-Date: Thu, 19 May 2016 17:31:18 +0200
-Subject: [PATCH] Fix inconsistent use of tabs vs. space.
-
-Needed for at least python-3.5.x.
-
-Signed-off-by: Thomas Klausner <address@hidden>
-Signed-off-by: Uli Schlachter <address@hidden>
----
- src/c_client.py | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/c_client.py b/src/c_client.py
-index 57de3fb..043338d 100644
---- a/src/c_client.py
-+++ b/src/c_client.py
-@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
-             _c('    unsigned int xcb_align_to = 0;')
-         if self.is_switch:
-             _c('    unsigned int xcb_padding_offset = %d;',
--             self.get_align_offset() )
-+               self.get_align_offset() )
-         prefix = [('_aux', '->', self)]
-         aux_ptr = 'xcb_out'
- 
-@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
-         _c('    unsigned int xcb_align_to = 0;')
-         if self.is_switch:
-             _c('    unsigned int xcb_padding_offset = %d;',
--             self.get_align_offset() )
-+               self.get_align_offset() )
- 
-     elif 'sizeof' == context:
-         param_names = [p[2] for p in params]
-@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
-                     # from the request size and divide that by the member size
-                     return '(((R->length * 4) - sizeof('+ self.c_type + 
'))/'+'sizeof('+field.type.member.c_wiretype+'))'
-                 else:
--                  # use the accessor to get the start of the list, then
--                  # compute the length of it by subtracting it from
-+                    # use the accessor to get the start of the list, then
-+                    # compute the length of it by subtracting it from
-                     # the adress of the first byte after the end of the
-                     # request
--                  after_end_of_request = '(((char*)R) + R->length * 4)'
--                  start_of_list = '%s(R)' % (field.c_accessor_name)
-+                    after_end_of_request = '(((char*)R) + R->length * 4)'
-+                    start_of_list = '%s(R)' % (field.c_accessor_name)
-                     bytesize_of_list = '%s - (char*)(%s)' % 
(after_end_of_request, start_of_list)
--                  return '(%s) / sizeof(%s)' % (bytesize_of_list, 
field.type.member.c_wiretype)
-+                    return '(%s) / sizeof(%s)' % (bytesize_of_list, 
field.type.member.c_wiretype)
-             else:
-                 raise Exception(
-                     "lengthless lists with varsized members are not 
supported. Fieldname '%s'"
--- 
-2.11.1
-
diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm
index d4d1b7b..14f08b2 100644
--- a/gnu/packages/xorg.scm
+++ b/gnu/packages/xorg.scm
@@ -5042,7 +5042,7 @@ protocol.")
 (define-public libxcb
   (package
     (name "libxcb")
-    (version "1.12")
+    (version "1.13")
     (source
       (origin
         (method url-fetch)
@@ -5050,9 +5050,7 @@ protocol.")
                             name "-" version ".tar.bz2"))
         (sha256
           (base32
-           "0nvv0la91cf8p5qqlb3r5xnmg1jn2wphn4fb5jfbr6byqsvv3psa"))
-        (patches
-         (search-patches "libxcb-python-3.5-compat.patch"))))
+           "1ahxhmdqp4bhb90zmc275rmf5wixqra4bnw9pqnzyl1w3598g30q"))))
     (build-system gnu-build-system)
     (propagated-inputs
       `(("libpthread-stubs" ,libpthread-stubs)