Fix build error with xcb-proto 1.16.0

debian/changelog

@@ -1,3 +1,9 @@
+libxcb (1.15-ok2) nile; urgency=medium
+
+  * Fix build error with xcb-proto 1.16.0.
+
+ -- zhouganqing <zhouganqing@kylinos.cn>  Tue, 16 Jul 2024 15:18:14 +0800
+
 libxcb (1.15-ok1) nile; urgency=medium
 
   * Build for openKylin.

debian/control

@@ -2,7 +2,6 @@ Source: libxcb
 Priority: optional
 Section: libdevel
 Maintainer: Openkylin Developers <packaging@lists.openkylin.top>
-Uploaders: Julien Cristau <jcristau@debian.org>
 Build-Depends: automake,
                check (>= 0.9.4-2) <!nocheck>,
                dctrl-tools,
@@ -21,8 +20,8 @@ Build-Depends: automake,
 Build-Depends-Indep: doxygen, graphviz
 Standards-Version: 4.5.0
 Homepage: https://xcb.freedesktop.org
-Vcs-Git: https://salsa.debian.org/xorg-team/lib/libxcb.git
-Vcs-Browser: https://salsa.debian.org/xorg-team/lib/libxcb
+Vcs-Git: https://gitee.com/openkylin/libxcb.git
+Vcs-Browser: https://gitee.com/openkylin/libxcb
 
 Package: libxcb1
 Section: libs

debian/libxcb-dpms0.symbols

@@ -18,5 +18,7 @@ libxcb-dpms.so.0 libxcb-dpms0 #MINVER#
  xcb_dpms_info@Base 0
  xcb_dpms_info_reply@Base 0
  xcb_dpms_info_unchecked@Base 0
+ xcb_dpms_select_input@Base 1.15
+ xcb_dpms_select_input_checked@Base 1.15
  xcb_dpms_set_timeouts@Base 0
  xcb_dpms_set_timeouts_checked@Base 0

src/c_client.py

@@ -2266,13 +2266,13 @@ def _c_request_helper(self, name, void, regular, aux=False, reply_fds=False):
             elif base_func_name == 'xcb_create_window' and field.c_field_name == 'value_mask':
                 field.enum = 'CW'
             if field.enum:
-                # XXX: why the 'xcb' prefix?
-                key = ('xcb', field.enum)
+                assert 2 <= len(self.name) <= 3
+                key = (*self.name[:-1], field.enum)
 
                 tname = _t(key)
                 if namecount[tname] > 1:
                     tname = _t(key + ('enum',))
-                _h(' * @param %s A bitmask of #%s values.' % (field.c_field_name, tname))
+                _h(' * @param %s A bitmask of #%s values.', field.c_field_name, tname)
 
             if self.doc and field.field_name in self.doc.fields:
                 desc = self.doc.fields[field.field_name]
@@ -2280,7 +2280,7 @@ def _c_request_helper(self, name, void, regular, aux=False, reply_fds=False):
                     desc = desc.replace('`%s`' % name, '\\a %s' % (name))
                 desc = desc.split("\n")
                 desc = [line if line != '' else '\\n' for line in desc]
-                _h(' * @param %s %s' % (field.c_field_name, "\n * ".join(desc)))
+                _h(' * @param %s %s', field.c_field_name, "\n * ".join(desc))
             # If there is no documentation yet, we simply don't generate an
             # @param tag. Doxygen will then warn about missing documentation.