[90544] trunk/dports/x11/xorg-xcb-proto/files/ 0001-xcbgen-Address-API-incompatability-between-xcb-proto.patch

jeremyhu at macports.org jeremyhu at macports.org
Thu Mar 8 10:34:07 PST 2012


Revision: 90544
          http://trac.macports.org/changeset/90544
Author:   jeremyhu at macports.org
Date:     2012-03-08 10:34:06 -0800 (Thu, 08 Mar 2012)
Log Message:
-----------
xorg-xcb-proto: Add the patch required by the previous commit

Added Paths:
-----------
    trunk/dports/x11/xorg-xcb-proto/files/0001-xcbgen-Address-API-incompatability-between-xcb-proto.patch

Added: trunk/dports/x11/xorg-xcb-proto/files/0001-xcbgen-Address-API-incompatability-between-xcb-proto.patch
===================================================================
--- trunk/dports/x11/xorg-xcb-proto/files/0001-xcbgen-Address-API-incompatability-between-xcb-proto.patch	                        (rev 0)
+++ trunk/dports/x11/xorg-xcb-proto/files/0001-xcbgen-Address-API-incompatability-between-xcb-proto.patch	2012-03-08 18:34:06 UTC (rev 90544)
@@ -0,0 +1,44 @@
+From 140262f2291d09863e23fc587bb0034f5bddf571 Mon Sep 17 00:00:00 2001
+From: Jeremy Huddleston <jeremyhu at apple.com>
+Date: Sat, 3 Mar 2012 21:53:59 -0800
+Subject: [PATCH] xcbgen: Address API incompatability between xcb-proto-1.6
+ and xcb-proto-1.7
+
+Regression From: 76ca2c0b1527541be59c344118c538ba055ad9d8
+
+Signed-off-by: Jeremy Huddleston <jeremyhu at apple.com>
+---
+ xcbgen/xtypes.py |    9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py
+index 14c318a..faf2463 100644
+--- a/xcbgen/xtypes.py
++++ b/xcbgen/xtypes.py
+@@ -159,6 +159,10 @@ class ListType(Type):
+         Type.__init__(self, member.name)
+         self.is_list = True
+         self.member = member
++
++        # We store both parent and parents for API compatability
++        # <1.6 used parent (which is deprecated) and 1.7 used parents
++        self.parent = list(parent)
+         self.parents = list(parent)
+ 
+         if elt.tag == 'list':
+@@ -357,7 +361,12 @@ class SwitchType(ComplexType):
+ 
+     def __init__(self, name, elt, *parents):
+         ComplexType.__init__(self, name, elt)
++
++        # We store both parent and parents for API compatability
++        # <1.6 used parent (which is deprecated) and 1.7 used parents
++        self.parent = parents
+         self.parents = parents
++
+         # FIXME: switch cannot store lenfields, so it should just delegate the parents
+         self.lenfield_parent = list(parents) + [self]
+         # self.fields contains all possible fields collected from the Bitcase objects, 
+-- 
+1.7.9.2
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120308/4e6b987c/attachment.html>


More information about the macports-changes mailing list