| 1 |
commit: eb9f8511dd89af8f737307ae9eb3498dfa80e595 |
| 2 |
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 29 22:58:53 2016 +0000 |
| 4 |
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 29 22:58:53 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb9f8511 |
| 7 |
|
| 8 |
x11-libs/libxcb: add patch file that was mistakenly not committed |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
...bxcb-1.12-fix-inconsistent-use-tabs-space.patch | 55 ++++++++++++++++++++++ |
| 13 |
1 file changed, 55 insertions(+) |
| 14 |
|
| 15 |
diff --git a/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch |
| 16 |
new file mode 100644 |
| 17 |
index 0000000..bbac9a9 |
| 18 |
--- /dev/null |
| 19 |
+++ b/x11-libs/libxcb/files/libxcb-1.12-fix-inconsistent-use-tabs-space.patch |
| 20 |
@@ -0,0 +1,55 @@ |
| 21 |
+From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001 |
| 22 |
+From: Thomas Klausner <wiz@××××××.org> |
| 23 |
+Date: Thu, 19 May 2016 17:31:18 +0200 |
| 24 |
+Subject: Fix inconsistent use of tabs vs. space. |
| 25 |
+ |
| 26 |
+Needed for at least python-3.5.x. |
| 27 |
+ |
| 28 |
+Signed-off-by: Thomas Klausner <wiz@××××××.org> |
| 29 |
+Signed-off-by: Uli Schlachter <psychon@×××.in> |
| 30 |
+ |
| 31 |
+diff --git a/src/c_client.py b/src/c_client.py |
| 32 |
+index 57de3fb..043338d 100644 |
| 33 |
+--- a/src/c_client.py |
| 34 |
++++ b/src/c_client.py |
| 35 |
+@@ -1364,7 +1364,7 @@ def _c_serialize(context, self): |
| 36 |
+ _c(' unsigned int xcb_align_to = 0;') |
| 37 |
+ if self.is_switch: |
| 38 |
+ _c(' unsigned int xcb_padding_offset = %d;', |
| 39 |
+- self.get_align_offset() ) |
| 40 |
++ self.get_align_offset() ) |
| 41 |
+ prefix = [('_aux', '->', self)] |
| 42 |
+ aux_ptr = 'xcb_out' |
| 43 |
+ |
| 44 |
+@@ -1390,7 +1390,7 @@ def _c_serialize(context, self): |
| 45 |
+ _c(' unsigned int xcb_align_to = 0;') |
| 46 |
+ if self.is_switch: |
| 47 |
+ _c(' unsigned int xcb_padding_offset = %d;', |
| 48 |
+- self.get_align_offset() ) |
| 49 |
++ self.get_align_offset() ) |
| 50 |
+ |
| 51 |
+ elif 'sizeof' == context: |
| 52 |
+ param_names = [p[2] for p in params] |
| 53 |
+@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field): |
| 54 |
+ # from the request size and divide that by the member size |
| 55 |
+ return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))' |
| 56 |
+ else: |
| 57 |
+- # use the accessor to get the start of the list, then |
| 58 |
+- # compute the length of it by subtracting it from |
| 59 |
++ # use the accessor to get the start of the list, then |
| 60 |
++ # compute the length of it by subtracting it from |
| 61 |
+ # the adress of the first byte after the end of the |
| 62 |
+ # request |
| 63 |
+- after_end_of_request = '(((char*)R) + R->length * 4)' |
| 64 |
+- start_of_list = '%s(R)' % (field.c_accessor_name) |
| 65 |
++ after_end_of_request = '(((char*)R) + R->length * 4)' |
| 66 |
++ start_of_list = '%s(R)' % (field.c_accessor_name) |
| 67 |
+ bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list) |
| 68 |
+- return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) |
| 69 |
++ return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) |
| 70 |
+ else: |
| 71 |
+ raise Exception( |
| 72 |
+ "lengthless lists with varsized members are not supported. Fieldname '%s'" |
| 73 |
+-- |
| 74 |
+cgit v0.10.2 |
| 75 |
+ |
Archives