[arch-commits] Commit in lib32-libxcb/repos/multilib-x86_64 (6 files)
Laurent Carlier
lcarlier at archlinux.org
Tue Jun 7 07:39:11 UTC 2016
Date: Tuesday, June 7, 2016 @ 09:39:10
Author: lcarlier
Revision: 178085
archrelease: copy trunk to multilib-x86_64
Added:
lib32-libxcb/repos/multilib-x86_64/PKGBUILD
(from rev 178084, lib32-libxcb/trunk/PKGBUILD)
lib32-libxcb/repos/multilib-x86_64/libxcb-1.1-no-pthread-stubs.patch
(from rev 178084, lib32-libxcb/trunk/libxcb-1.1-no-pthread-stubs.patch)
lib32-libxcb/repos/multilib-x86_64/python-35x-fixes.patch
(from rev 178084, lib32-libxcb/trunk/python-35x-fixes.patch)
Deleted:
lib32-libxcb/repos/multilib-x86_64/PKGBUILD
lib32-libxcb/repos/multilib-x86_64/libxcb-1.1-no-pthread-stubs.patch
lib32-libxcb/repos/multilib-x86_64/python-35x-fixes.patch
-----------------------------------+
PKGBUILD | 112 ++++++++++++++++++------------------
libxcb-1.1-no-pthread-stubs.patch | 22 +++----
python-35x-fixes.patch | 84 +++++++++++++--------------
3 files changed, 110 insertions(+), 108 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2016-06-07 07:39:04 UTC (rev 178084)
+++ PKGBUILD 2016-06-07 07:39:10 UTC (rev 178085)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Alexander Baldeck <alexander at archlinux.org>
-# Contributor: Jan de Groot <jgc at archlinux.org>
-
-_pkgbasename=libxcb
-pkgname=lib32-$_pkgbasename
-pkgver=1.12
-pkgrel=1
-pkgdesc="X11 client-side library (32-bit)"
-arch=(x86_64)
-url="http://xcb.freedesktop.org/"
-depends=('lib32-libxdmcp' 'lib32-libxau' $_pkgbasename)
-makedepends=('pkgconfig' 'libxslt' 'python' 'xorg-util-macros' 'gcc-multilib'
- 'autoconf')
-license=('custom')
-source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2
- libxcb-1.1-no-pthread-stubs.patch
- python-35x-fixes.patch)
-sha256sums=('4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b'
- '37debaf892235a516a50a4975e6229538d3b4696b4571a8dea05eed774004aff'
- 'e66140ac2270b47e940db82975e2d28d3536ca1bd0eae63bce3b900ed81fa517')
-
-prepare() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch
- patch -Np1 -i ../python-35x-fixes.patch
- autoreconf -vfi
-}
-
-build() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- export CC="gcc -m32"
- export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
- ./autogen.sh \
- --prefix=/usr \
- --enable-xinput \
- --enable-xkb \
- --libdir=/usr/lib32 \
- --disable-static
- make
-}
-
-package() {
- cd "${srcdir}/${_pkgbasename}-${pkgver}"
-
- make DESTDIR="${pkgdir}" install
-
- rm -rf "${pkgdir}"/usr/{include,share}
-
- mkdir -p "$pkgdir/usr/share/licenses"
- ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
Copied: lib32-libxcb/repos/multilib-x86_64/PKGBUILD (from rev 178084, lib32-libxcb/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2016-06-07 07:39:10 UTC (rev 178085)
@@ -0,0 +1,57 @@
+# $Id$
+# Maintainer: Alexander Baldeck <alexander at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+
+_pkgbasename=libxcb
+pkgname=lib32-$_pkgbasename
+pkgver=1.12
+pkgrel=2
+pkgdesc="X11 client-side library (32-bit)"
+arch=(x86_64)
+url="http://xcb.freedesktop.org/"
+depends=('lib32-libxdmcp' 'lib32-libxau' $_pkgbasename)
+makedepends=('pkgconfig' 'libxslt' 'python' 'xorg-util-macros' 'gcc-multilib'
+ 'autoconf')
+license=('custom')
+source=(${url}/dist/${_pkgbasename}-${pkgver}.tar.bz2
+ libxcb-1.1-no-pthread-stubs.patch
+ python-35x-fixes.patch)
+sha256sums=('4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b'
+ '37debaf892235a516a50a4975e6229538d3b4696b4571a8dea05eed774004aff'
+ 'e66140ac2270b47e940db82975e2d28d3536ca1bd0eae63bce3b900ed81fa517')
+
+prepare() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+ patch -Np1 -i ../libxcb-1.1-no-pthread-stubs.patch
+ patch -Np1 -i ../python-35x-fixes.patch
+ autoreconf -vfi
+}
+
+build() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+ export CC="gcc -m32"
+ export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
+ # workaround for FS#49560
+ export CFLAGS="${CFLAGS} -O1"
+
+ ./autogen.sh \
+ --prefix=/usr \
+ --enable-xinput \
+ --enable-xkb \
+ --libdir=/usr/lib32 \
+ --disable-static
+ make
+}
+
+package() {
+ cd "${srcdir}/${_pkgbasename}-${pkgver}"
+
+ make DESTDIR="${pkgdir}" install
+
+ rm -rf "${pkgdir}"/usr/{include,share}
+
+ mkdir -p "$pkgdir/usr/share/licenses"
+ ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
+}
Deleted: libxcb-1.1-no-pthread-stubs.patch
===================================================================
--- libxcb-1.1-no-pthread-stubs.patch 2016-06-07 07:39:04 UTC (rev 178084)
+++ libxcb-1.1-no-pthread-stubs.patch 2016-06-07 07:39:10 UTC (rev 178085)
@@ -1,11 +0,0 @@
---- 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 @@
-
- # Checks for pkg-config packages
- 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)
-
- have_xdmcp="no"
Copied: lib32-libxcb/repos/multilib-x86_64/libxcb-1.1-no-pthread-stubs.patch (from rev 178084, lib32-libxcb/trunk/libxcb-1.1-no-pthread-stubs.patch)
===================================================================
--- libxcb-1.1-no-pthread-stubs.patch (rev 0)
+++ libxcb-1.1-no-pthread-stubs.patch 2016-06-07 07:39:10 UTC (rev 178085)
@@ -0,0 +1,11 @@
+--- 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 @@
+
+ # Checks for pkg-config packages
+ 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)
+
+ have_xdmcp="no"
Deleted: python-35x-fixes.patch
===================================================================
--- python-35x-fixes.patch 2016-06-07 07:39:04 UTC (rev 178084)
+++ python-35x-fixes.patch 2016-06-07 07:39:10 UTC (rev 178085)
@@ -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'"
Copied: lib32-libxcb/repos/multilib-x86_64/python-35x-fixes.patch (from rev 178084, lib32-libxcb/trunk/python-35x-fixes.patch)
===================================================================
--- python-35x-fixes.patch (rev 0)
+++ python-35x-fixes.patch 2016-06-07 07:39:10 UTC (rev 178085)
@@ -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'"
More information about the arch-commits
mailing list