Update to xcb-proto 1.14.1. No functional changes.

7 files changed, 26 insertions, 6 deletions

diff --git a/proto/xcb-proto/NEWS b/proto/xcb-proto/NEWS
index 9bab62be7..064453e2f 100644
--- a/proto/xcb-proto/NEWS
+++ b/proto/xcb-proto/NEWS
@@ -1,3 +1,8 @@
+Release 1.14.1 (2020-10-08)
+===========================
+* Python 3.9 compatibility (stop using removed interfaces)
+* Fix handling of enum attributes in fields
+
 Release 1.14 (2020-02-22)
 =========================
 * Fix size computation of imported lists
diff --git a/proto/xcb-proto/configure.ac b/proto/xcb-proto/configure.ac
index 14a7c2d08..ac0581287 100644
--- a/proto/xcb-proto/configure.ac
+++ b/proto/xcb-proto/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([XCB Proto],
-        1.14,
+        1.14.1,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb-proto.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-xz])
diff --git a/proto/xcb-proto/src/xproto.xml b/proto/xcb-proto/src/xproto.xml
index dea48dfed..116781e8c 100644
--- a/proto/xcb-proto/src/xproto.xml
+++ b/proto/xcb-proto/src/xproto.xml
@@ -2624,7 +2624,7 @@ void my_example(xcb_connection_t *conn, xcb_screen_t *screen, xcb_cursor_t curso
     if ((reply = xcb_grab_pointer_reply(conn, cookie, NULL))) {
         if (reply->status == XCB_GRAB_STATUS_SUCCESS)
             printf("successfully grabbed the pointer\\n");
-        free(preply);
+        free(reply);
     }
 }
       ]]></example>
diff --git a/proto/xcb-proto/xcbgen/align.py b/proto/xcb-proto/xcbgen/align.py
index d4c12ee40..5c4f5177d 100644
--- a/proto/xcb-proto/xcbgen/align.py
+++ b/proto/xcb-proto/xcbgen/align.py
@@ -2,7 +2,12 @@
 This module contains helper classes for alignment arithmetic and checks
 '''
 
-from fractions import gcd
+from sys import version_info
+
+if version_info[:2] >= (3, 5):
+    from math import gcd
+else:
+    from fractions import gcd
 
 class Alignment(object):
 
diff --git a/proto/xcb-proto/xcbgen/matcher.py b/proto/xcb-proto/xcbgen/matcher.py
index 97a8b43bb..0d5768501 100644
--- a/proto/xcb-proto/xcbgen/matcher.py
+++ b/proto/xcb-proto/xcbgen/matcher.py
@@ -7,7 +7,12 @@ we do not create a new type object, we just record the existing one under a new
 '''
 
 from os.path import join
-from xml.etree.cElementTree import parse
+from sys import version_info
+
+if version_info[:2] >= (3, 3):
+    from xml.etree.ElementTree import parse
+else:
+    from xml.etree.cElementTree import parse
 
 from xcbgen.xtypes import *
 
diff --git a/proto/xcb-proto/xcbgen/state.py b/proto/xcb-proto/xcbgen/state.py
index 0dbecdc7b..ffbfc14ee 100644
--- a/proto/xcb-proto/xcbgen/state.py
+++ b/proto/xcb-proto/xcbgen/state.py
@@ -2,7 +2,12 @@
 This module contains the namespace class and the singleton module class.
 '''
 from os.path import dirname, basename
-from xml.etree.cElementTree import parse
+from sys import version_info
+
+if version_info[:2] >= (3, 3):
+    from xml.etree.ElementTree import parse
+else:
+    from xml.etree.cElementTree import parse
 
 from xcbgen import matcher
 from xcbgen.error import *
diff --git a/proto/xcb-proto/xcbgen/xtypes.py b/proto/xcb-proto/xcbgen/xtypes.py
index 3afc812a4..e47189d17 100644
--- a/proto/xcb-proto/xcbgen/xtypes.py
+++ b/proto/xcb-proto/xcbgen/xtypes.py
@@ -528,10 +528,10 @@ class ComplexType(Type):
     def resolve(self, module):
         if self.resolved:
             return
-        enum = None
 
         # Resolve all of our field datatypes.
         for child in list(self.elt):
+            enum = None
             if child.tag == 'pad':
                 field_name = 'pad' + str(module.pads)
                 fkey = 'CARD8'