summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch62
-rw-r--r--meta/recipes-graphics/xorg-lib/libxcb_1.13.bb (renamed from meta/recipes-graphics/xorg-lib/libxcb_1.12.bb)6
2 files changed, 3 insertions, 65 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch b/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch
deleted file mode 100644
index 8992386359..0000000000
--- a/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch
+++ /dev/null
@@ -1,62 +0,0 @@
1From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001
2From: Thomas Klausner <wiz@NetBSD.org>
3Date: Thu, 19 May 2016 17:31:18 +0200
4Subject: [PATCH] Fix inconsistent use of tabs vs. space.
5
6Needed for at least python-3.5.x.
7
8Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
9Signed-off-by: Uli Schlachter <psychon@znc.in>
10
11Upstream-Status: Backport
12
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14---
15 src/c_client.py | 14 +++++++-------
16 1 file changed, 7 insertions(+), 7 deletions(-)
17
18diff --git a/src/c_client.py b/src/c_client.py
19index 57de3fb..043338d 100644
20--- a/src/c_client.py
21+++ b/src/c_client.py
22@@ -1364,7 +1364,7 @@ def _c_serialize(context, self):
23 _c(' unsigned int xcb_align_to = 0;')
24 if self.is_switch:
25 _c(' unsigned int xcb_padding_offset = %d;',
26- self.get_align_offset() )
27+ self.get_align_offset() )
28 prefix = [('_aux', '->', self)]
29 aux_ptr = 'xcb_out'
30
31@@ -1390,7 +1390,7 @@ def _c_serialize(context, self):
32 _c(' unsigned int xcb_align_to = 0;')
33 if self.is_switch:
34 _c(' unsigned int xcb_padding_offset = %d;',
35- self.get_align_offset() )
36+ self.get_align_offset() )
37
38 elif 'sizeof' == context:
39 param_names = [p[2] for p in params]
40@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field):
41 # from the request size and divide that by the member size
42 return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))'
43 else:
44- # use the accessor to get the start of the list, then
45- # compute the length of it by subtracting it from
46+ # use the accessor to get the start of the list, then
47+ # compute the length of it by subtracting it from
48 # the adress of the first byte after the end of the
49 # request
50- after_end_of_request = '(((char*)R) + R->length * 4)'
51- start_of_list = '%s(R)' % (field.c_accessor_name)
52+ after_end_of_request = '(((char*)R) + R->length * 4)'
53+ start_of_list = '%s(R)' % (field.c_accessor_name)
54 bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list)
55- return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
56+ return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype)
57 else:
58 raise Exception(
59 "lengthless lists with varsized members are not supported. Fieldname '%s'"
60--
612.9.0
62
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb
index a38bdea5df..04b58ea49f 100644
--- a/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb
+++ b/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb
@@ -13,10 +13,10 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \
13 file://xcbincludedir.patch \ 13 file://xcbincludedir.patch \
14 file://disable-check.patch \ 14 file://disable-check.patch \
15 file://gcc-mips-pr68302-mips-workaround.patch \ 15 file://gcc-mips-pr68302-mips-workaround.patch \
16 file://Fix-inconsistent-use-of-tabs-vs.-space.patch \
17 " 16 "
18SRC_URI[md5sum] = "28e552bd78bc1050b6b26ca1db0e5bb6" 17
19SRC_URI[sha256sum] = "4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b" 18SRC_URI[md5sum] = "c2b6cf928afa16b0047c974e7aaa783f"
19SRC_URI[sha256sum] = "188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b851daa"
20 20
21BBCLASSEXTEND = "native nativesdk" 21BBCLASSEXTEND = "native nativesdk"
22 22