Attachment 176700 Details for Bug 214281 – x11/libxcb: Backport py3k regression fixes

[patch] x11/libxcb: Backport py3k regression fixes

patch-x11_libxcb-1.12-1.txt (text/plain), 4.06 KB, created by John W. O'Brien on 2016-11-06 19:34:40 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John W. O'Brien

Created: 2016-11-06 19:34:40 UTC

Size: 4.06 KB

patch

obsolete

>Index: x11/libxcb/Makefile
>===================================================================
>--- x11/libxcb/Makefile	(revision 425443)
>+++ x11/libxcb/Makefile	(working copy)
>@@ -3,11 +3,12 @@
> 
> PORTNAME=	libxcb
> PORTVERSION=	1.12
>+PORTREVISION=	1
> CATEGORIES=	x11 python
> MASTER_SITES=	http://xcb.freedesktop.org/dist/
> 
> MAINTAINER=	x11@FreeBSD.org
>-COMMENT=	The X protocol C-language Binding (XCB) library
>+COMMENT=	X protocol C-language Binding (XCB) library
> 
> LICENSE=	MIT
> LICENSE_FILE=	${WRKSRC}/COPYING
>Index: x11/libxcb/files/patch-src_c__client.py
>===================================================================
>--- x11/libxcb/files/patch-src_c__client.py	(nonexistent)
>+++ x11/libxcb/files/patch-src_c__client.py	(working copy)
>@@ -0,0 +1,44 @@
>+Obtained from:
>+
>+https://cgit.freedesktop.org/xcb/libxcb/commit/src/c_client.py?id=8740a288ca468433141341347aa115b9544891d3
>+
>+--- src/c_client.py.orig	2016-05-09 16:10:55 UTC
>++++ 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'"
>
>Property changes on: x11/libxcb/files/patch-src_c__client.py
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: x11/libxcb/files/patch-tests-check_public.c
>===================================================================
>--- x11/libxcb/files/patch-tests-check_public.c	(revision 425443)
>+++ x11/libxcb/files/patch-tests-check_public.c	(working copy)
>@@ -1,6 +1,6 @@
>---- tests/check_public.c.orig	Wed Jan 24 15:16:59 2007
>-+++ tests/check_public.c	Wed Jan 24 15:22:33 2007
>-@@ -70,7 +70,10 @@
>+--- tests/check_public.c.orig	2011-07-02 20:20:42 UTC
>++++ tests/check_public.c
>+@@ -30,7 +30,10 @@ static void parse_display_pass(const cha
>  		else if(test_type == TEST_ENVIRONMENT)
>  		{
>  			argument = 0;
>@@ -12,7 +12,7 @@
>  		}
>  
>  		got_host = (char *) -1;
>-@@ -148,7 +151,7 @@
>+@@ -150,7 +153,7 @@ END_TEST
>  
>  START_TEST(parse_display_negative)
>  {

Flags:

john: maintainer-approval?

Actions: View | Diff

Attachments on bug 214281: 176699 | 176700