diff options
| -rw-r--r-- | groups/261.native_packages_x11.group | 6 | ||||
| -rw-r--r-- | patches/xcb-1.12.local.patch | 55 |
2 files changed, 3 insertions, 58 deletions
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group index 77f78e86..673c110d 100644 --- a/groups/261.native_packages_x11.group +++ b/groups/261.native_packages_x11.group @@ -213,9 +213,9 @@ xeyes xorgproto Xrender xterm xtrans xwd xwin")"; : ${PKG_UTIL_MACROS_VERSION:=1.19.2}; : ${PKG_UTIL_MACROS_URL:=https://www.x.org/archive/individual/util/util-macros-${PKG_UTIL_MACROS_VERSION}.tar.bz2}; : ${PKG_XCB_DEPENDS:="libpthread_stubs libXau xcb_proto"}; -: ${PKG_XCB_SHA256SUM:=4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b}; -: ${PKG_XCB_VERSION:=1.12}; -: ${PKG_XCB_URL:=https://www.x.org/releases/individual/xcb/libxcb-${PKG_XCB_VERSION}.tar.bz2}; +: ${PKG_XCB_SHA256SUM:=cc38744f817cf6814c847e2df37fcb8997357d72fa4bcbc228ae0fe47219a059}; +: ${PKG_XCB_VERSION:=1.15}; +: ${PKG_XCB_URL:=https://www.x.org/releases/individual/xcb/libxcb-${PKG_XCB_VERSION}.tar.xz}; : ${PKG_XCB_CFLAGS_CONFIGURE_EXTRA:=-std=gnu99}; : ${PKG_XCB_CONFIG_CACHE_EXTRA:="ac_cv_search_sendmsg=no"}; : ${PKG_XCB_CONFIGURE_ARGS_EXTRA:=--disable-randr}; diff --git a/patches/xcb-1.12.local.patch b/patches/xcb-1.12.local.patch deleted file mode 100644 index bbac9a96..00000000 --- a/patches/xcb-1.12.local.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <wiz@NetBSD.org> -Date: Thu, 19 May 2016 17:31:18 +0200 -Subject: Fix inconsistent use of tabs vs. space. - -Needed for at least python-3.5.x. - -Signed-off-by: Thomas Klausner <wiz@NetBSD.org> -Signed-off-by: Uli Schlachter <psychon@znc.in> - -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'" --- -cgit v0.10.2 - |