From 5a86470b8b5d00dcd8c0d769088f435937eec757 Mon Sep 17 00:00:00 2001
From: "Douglas R. Reno" <renodr@linuxfromscratch.org>
Date: Tue, 18 May 2021 17:50:14 -0500
Subject: [PATCH] libxcb: Force the usage of python3 if python2 is installed,
 and also add command explanations

---
 introduction/welcome/changelog.xml |  4 ++++
 x/installing/libxcb.xml            | 15 ++++++++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index e7a8e22200..8a00ceacb6 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -44,6 +44,10 @@
     <listitem>
       <para>May 18th, 2021</para>
       <itemizedlist>
+        <listitem>
+          <para>[renodr] - Force libxcb to use python3, even if python2 is
+          present on the system.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Adapt some scripts in subversion to python3.</para>
         </listitem>
diff --git a/x/installing/libxcb.xml b/x/installing/libxcb.xml
index 401a02a6e8..66d2fe2055 100644
--- a/x/installing/libxcb.xml
+++ b/x/installing/libxcb.xml
@@ -103,7 +103,9 @@
       commands:
     </para>
 
-<screen><userinput>CFLAGS="${CFLAGS:--O2 -g} -Wno-error=format-extra-args" ./configure $XORG_CONFIG      \
+<screen><userinput>CFLAGS="${CFLAGS:--O2 -g} -Wno-error=format-extra-args" \
+PYTHON=python3                \
+./configure $XORG_CONFIG      \
             --without-doxygen \
             --docdir='${datadir}'/doc/libxcb-&libxcb-version; &amp;&amp;
 make</userinput></screen>
@@ -123,6 +125,17 @@ make</userinput></screen>
   <sect2 role="commands">
     <title>Command Explanations</title>
 
+    <para>
+      <parameter>CFLAGS=...</parameter>: This variable fixes building this
+      package with GCC-10 and later.
+    </para>
+
+    <para>
+      <parameter>PYTHON=python3</parameter>: This variable forces configure to
+      use python3 instead of python2. The configure script for this package
+      will automatically default to python2 if it is present.
+    </para>
+
     <para>
       <parameter>--without-doxygen</parameter>: Do not use doxygen to
       generate API documentation (default: auto). Without it, if