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

[Andreas Radke]

    Date: Tuesday, March 6, 2018 @ 19:12:19
  Author: andyrtr
Revision: 317923

upgpkg: libxcb 1.13-1

upstream update 1.13

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

-----------------------------------+
 PKGBUILD                          |   15 ++++++------
 libxcb-1.1-no-pthread-stubs.patch |    8 +++---
 python-35x-fixes.patch            |   42 ------------------------------------
 3 files changed, 11 insertions(+), 54 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-03-06 18:52:50 UTC (rev 317922)
+++ PKGBUILD	2018-03-06 19:12:19 UTC (rev 317923)
@@ -4,7 +4,7 @@
 # Contributor: Alexander Baldeck <alexander at archlinux.org>
 
 pkgname=libxcb
-pkgver=1.12
+pkgver=1.13
 pkgrel=1
 pkgdesc="X11 client-side library"
 arch=('x86_64')
@@ -12,17 +12,16 @@
 depends=('xcb-proto>=1.12' 'libxdmcp' 'libxau')
 makedepends=('libxslt' 'python' 'xorg-util-macros')
 license=('custom')
-source=($url/dist/$pkgname-$pkgver.tar.bz2
-        libxcb-1.1-no-pthread-stubs.patch
-        python-35x-fixes.patch)
-sha256sums=('4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b'
-            '37debaf892235a516a50a4975e6229538d3b4696b4571a8dea05eed774004aff'
-            'e66140ac2270b47e940db82975e2d28d3536ca1bd0eae63bce3b900ed81fa517')
+source=($url/dist/$pkgname-$pkgver.tar.bz2{,.sig}
+        libxcb-1.1-no-pthread-stubs.patch)
+sha512sums=('d99bbe386a65f60fcc0cc2935e4a365bc0577b5e90433e18778a665a5aee8ebc8e9e8cb0aedac0ac4a276147c0507e759a716874ea4f80792b2fc18eefbc128c'
+            'SKIP'
+            '19f3a5d740dd21e1060d84c5028ae575c0a69166a125dea62633193a87c387cfd108809dc7cf50b46880286e0830952b9b8d685be4a0303d9bb410eda07647cf')
+validpgpkeys=('A66D805F7C9329B4C5D82767CCC4F07FAC641EFF') # "Daniel Stone <daniels at collabora.com>"
 
 prepare() {
   cd "$pkgname-$pkgver"
   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	2018-03-06 18:52:50 UTC (rev 317922)
+++ libxcb-1.1-no-pthread-stubs.patch	2018-03-06 19:12:19 UTC (rev 317923)
@@ -1,9 +1,9 @@
---- libxcb-1.8.1/configure.ac	2012-03-09 15:38:38.000000000 +0100
-+++ libxcb-1.8.1/configure.ac.new	2012-03-09 16:50:40.107109896 +0100
-@@ -43,7 +43,7 @@
+--- libxcb-1.13/configure.ac	2018-03-05 10:21:04.000000000 +0100
++++ libxcb-1.13/configure.ac.new	2018-03-06 20:04:40.316910088 +0100
+@@ -51,7 +51,7 @@
  
  # Checks for pkg-config packages
- PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.12)
+ PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.13)
 -NEEDED="pthread-stubs xau >= 0.99.2"
 +NEEDED="xau >= 0.99.2"
  PKG_CHECK_MODULES(NEEDED, $NEEDED)

Deleted: python-35x-fixes.patch
===================================================================
--- python-35x-fixes.patch	2018-03-06 18:52:50 UTC (rev 317922)
+++ python-35x-fixes.patch	2018-03-06 19:12:19 UTC (rev 317923)
@@ -1,42 +0,0 @@
-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'"