diff -u libxcb-1.15/debian/changelog libxcb-1.15/debian/changelog
--- libxcb-1.15/debian/changelog
+++ libxcb-1.15/debian/changelog
@@ -1,3 +1,17 @@
+libxcb (1.15-1ubuntu2) noble; urgency=medium
+
+  * libxcb-dpms0.symbols: Updated, as a rebuild is done against a newer
+    xcb-proto now.
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 18 Apr 2024 17:21:22 +0300
+
+libxcb (1.15-1ubuntu1) noble; urgency=medium
+
+  * Cherry-pick a commit to fix FTBFS.
+    - Fix handling of documented enum parameters
+
+ -- Timo Aaltonen <tjaalton@debian.org>  Thu, 18 Apr 2024 14:08:17 +0300
+
 libxcb (1.15-1) unstable; urgency=medium
 
   * New upstream release.
diff -u libxcb-1.15/debian/libxcb-dpms0.symbols libxcb-1.15/debian/libxcb-dpms0.symbols
--- libxcb-1.15/debian/libxcb-dpms0.symbols
+++ libxcb-1.15/debian/libxcb-dpms0.symbols
@@ -19,4 +19,6 @@
  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
only in patch2:
unchanged:
--- libxcb-1.15.orig/src/c_client.py
+++ libxcb-1.15/src/c_client.py
@@ -2266,13 +2266,13 @@
             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,8 @@
                     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.