From c8e7f95cf3dd4b9d71d15a38f16a6610b5fe981a Mon Sep 17 00:00:00 2001
From: zhang-liang-pengkun <zhangliangpengkun@xfusion.com>
Date: Tue, 5 Dec 2023 18:23:17 +0800
Subject: [PATCH] xfixes: Add ClientDisconnectMode

Signed-off-by: zhang-liang-pengkun <zhangliangpengkun@xfusion.com>
---
 0004-xfixes-Add-ClientDisconnectMode.patch | 68 ++++++++++++++++++++++
 xcb-proto.spec                             |  6 +-
 2 files changed, 73 insertions(+), 1 deletion(-)
 create mode 100644 0004-xfixes-Add-ClientDisconnectMode.patch

diff --git a/0004-xfixes-Add-ClientDisconnectMode.patch b/0004-xfixes-Add-ClientDisconnectMode.patch
new file mode 100644
index 0000000..eee8bbf
--- /dev/null
+++ b/0004-xfixes-Add-ClientDisconnectMode.patch
@@ -0,0 +1,68 @@
+From 78d0652ac33b774c824eaeff82d504e4fe618176 Mon Sep 17 00:00:00 2001
+From: Olivier Fourdan <ofourdan@redhat.com>
+Date: Wed, 17 Mar 2021 14:11:28 +0100
+Subject: [PATCH] xfixes: Add ClientDisconnectMode
+
+The Xserver itself is capable of terminating itself once all X11 clients
+are gone, yet in a typical full session, there are a number of X11
+clients running continuously (e.g. the Xsettings daemon, IBus, etc.).
+
+Those always-running clients will prevent the Xserver from terminating,
+because the actual number of X11 clients will never drop to 0.
+
+To solve this issue directly at the Xserver level, this add new entries
+to the XFixes extension to let the X11 clients themselves specify the
+disconnect mode they expect.
+
+Typically, those X11 daemon clients would specify the disconnect mode
+XFixesClientDisconnectFlagTerminate to let the Xserver know that they
+should not be accounted for when checking the remaining clients prior
+to terminate.
+
+Signed-off-by: Olivier Fourdan <ofourdan@redhat.com>
+Reviewed-by: Simon Ser <contact@emersion.fr>
+---
+ src/xfixes.xml | 22 +++++++++++++++++++++-
+ 1 file changed, 21 insertions(+), 1 deletion(-)
+
+diff --git a/src/xfixes.xml b/src/xfixes.xml
+index 0a3d5ff..a01cd7b 100644
+--- a/src/xfixes.xml
++++ b/src/xfixes.xml
+@@ -26,7 +26,7 @@ authorization from the authors.
+ -->
+ <!-- This file describes version 4 of XFixes. -->
+ <xcb header="xfixes" extension-xname="XFIXES" extension-name="XFixes"
+-    major-version="5" minor-version="0">
++    major-version="6" minor-version="0">
+   <import>xproto</import>
+   <import>render</import>
+   <import>shape</import>
+@@ -359,4 +359,24 @@ authorization from the authors.
+   <request name="DeletePointerBarrier" opcode="32">
+     <field type="BARRIER" name="barrier" />
+   </request>
++
++  <!-- Version 6 -->
++
++  <enum name="ClientDisconnectFlags">
++    <item name="Default"><value>0</value></item>
++    <item name="Terminate"><bit>0</bit></item>
++  </enum>
++
++  <request name="SetClientDisconnectMode" opcode="33">
++    <field type="CARD32" name="disconnect_mode" mask="ClientDisconnectFlags" />
++  </request>
++
++  <request name="GetClientDisconnectMode" opcode="34">
++    <reply>
++      <pad bytes="1" />
++      <field type="CARD32" name="disconnect_mode" mask="ClientDisconnectFlags" />
++      <pad bytes="20" />
++    </reply>
++  </request>
++
+ </xcb>
+-- 
+2.39.0.windows.2
+
diff --git a/xcb-proto.spec b/xcb-proto.spec
index 145b7a7..d864fce 100644
--- a/xcb-proto.spec
+++ b/xcb-proto.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:           xcb-proto
 Version:        1.14
-Release:        5
+Release:        6
 Summary:        XCB protocol descriptions
 License:        MIT
 URL:            https://gitlab.freedesktop.org/xorg/proto/xcbproto/
@@ -9,6 +9,7 @@ Source0:        https://xcb.freedesktop.org/dist/%{name}-%{version}.tar.gz
 Patch01:        0001-Parse-a-field-s-enum-correctly.patch
 Patch02:        0002-xcbgen-Use-math.gcd-for-Python-3.5.patch
 Patch03:        0003-xcbgen-xml.etree.cElementTree-has-been-dropped-in-Py.patch
+Patch04:        0004-xfixes-Add-ClientDisconnectMode.patch
 BuildArch:      noarch
 
 BuildRequires:	python3-devel
@@ -39,6 +40,9 @@ export PYTHON="python3"
 %{python3_sitelib}/xcbgen
 
 %changelog
+* Tue Dec 05 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 1.14-6
+- xfixes: Add ClientDisconnectMode
+
 * Wed Nov 01 2023 zhangliangpengkun<zhangliangpengkun@xfusion.com> - 1.14-5
 - xcbgen: xml.etree.cElementTree has been dropped in Python 3.9.
 
-- 
Gitee