[arch-commits] Commit in lib32-libxcb/trunk (3 files)

[Laurent Carlier]

    Date: Sunday, May 22, 2016 @ 23:09:22
  Author: lcarlier
Revision: 176112

upgpkg: lib32-libxcb 1.12-1

upstream update 1.12

Added:
  lib32-libxcb/trunk/python-35x-fixes.patch
Modified:
  lib32-libxcb/trunk/PKGBUILD
  lib32-libxcb/trunk/libxcb-1.1-no-pthread-stubs.patch

-----------------------------------+
 PKGBUILD                          |   13 ++++++-----
 libxcb-1.1-no-pthread-stubs.patch |    2 -
 python-35x-fixes.patch            |   42 ++++++++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-05-22 21:07:28 UTC (rev 176111)
+++ PKGBUILD	2016-05-22 21:09:22 UTC (rev 176112)
@@ -4,7 +4,7 @@
 
 _pkgbasename=libxcb
 pkgname=lib32-$_pkgbasename
-pkgver=1.11.1
+pkgver=1.12
 pkgrel=1
 pkgdesc="X11 client-side library (32-bit)"
 arch=(x86_64)
@@ -14,14 +14,17 @@
              'autoconf')
 license=('custom')
 source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch)
-sha256sums=('b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30'
-            '3923bcb1930b851012968435909597d8d5251c72153511cb2982636c97100cc3')
+        libxcb-1.1-no-pthread-stubs.patch
+        python-35x-fixes.patch)
+sha256sums=('4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b'
+            '37debaf892235a516a50a4975e6229538d3b4696b4571a8dea05eed774004aff'
+            'e66140ac2270b47e940db82975e2d28d3536ca1bd0eae63bce3b900ed81fa517')
 
 prepare() {
   cd "${srcdir}/${_pkgbasename}-${pkgver}"
 
-  patch -Np1 -i "${srcdir}/libxcb-1.1-no-pthread-stubs.patch"
+  patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch
+  patch -Np1 -i ../python-35x-fixes.patch
   autoreconf -vfi
 }
 

Modified: libxcb-1.1-no-pthread-stubs.patch
===================================================================
--- libxcb-1.1-no-pthread-stubs.patch	2016-05-22 21:07:28 UTC (rev 176111)
+++ libxcb-1.1-no-pthread-stubs.patch	2016-05-22 21:09:22 UTC (rev 176112)
@@ -3,7 +3,7 @@
 @@ -43,7 +43,7 @@
  
  # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.11)
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.12)
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"
  PKG_CHECK_MODULES(NEEDED, $NEEDED)

Added: python-35x-fixes.patch
===================================================================
--- python-35x-fixes.patch	                        (rev 0)
+++ python-35x-fixes.patch	2016-05-22 21:09:22 UTC (rev 176112)
@@ -0,0 +1,42 @@
+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'"