From 8223937f4c12139f9209fe79e23a5d28383c448f Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 1 Nov 2023 16:18:43 +0800
Subject: setuptools: Fix installed directory list

---
 chapter08/setuptools.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/chapter08/setuptools.xml b/chapter08/setuptools.xml
index dac35c5ef..257a50328 100644
--- a/chapter08/setuptools.xml
+++ b/chapter08/setuptools.xml
@@ -57,8 +57,10 @@
 
       <seglistitem>
          <seg>
-            /usr/lib/python&python-minor;/site-packages/flit_core and
-            /usr/lib/python&python-minor;/site-packages/flit_core-&setuptools-version;.dist-info
+            /usr/lib/python&python-minor;/site-packages/_distutils_hack,
+            /usr/lib/python&python-minor;/site-packages/pkg_resources,
+            /usr/lib/python&python-minor;/site-packages/setuptools, and
+            /usr/lib/python&python-minor;/site-packages/setuptools-&setuptools-version;.dist-info
          </seg>
       </seglistitem>
     </segmentedlist>
-- 
cgit v1.2.3-54-g00ecf


From fe2791d41951ef7ec790a458de6c07ebf3fef029 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 1 Nov 2023 16:33:36 +0800
Subject: dependencies: Add Setuptools

By the way, complete the dependencies on Wheel too.
---
 appendices/dependencies.xml | 49 +++++++++++++++++++++++++++++++++++++++------
 1 file changed, 43 insertions(+), 6 deletions(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 2bec3dd93..9ed06a9b7 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1501,7 +1501,7 @@
       <segmentedlist id="jinja2-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>MarkupSafe and Python</seg>
+          <seg>MarkupSafe, Python, Setuptools, and Wheel</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2141,7 +2141,7 @@
       <segmentedlist id="markupsafe-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Python</seg>
+          <seg>Python, Setuptools, and Wheel</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2179,7 +2179,7 @@
       <segmentedlist id="meson-depends">
         <segtitle>&dependencies;</segtitle>
         <seglistitem>
-          <seg>Ninja and Python</seg>
+          <seg>Ninja, Python, Setuptools, and Wheel</seg>
         </seglistitem>
       </segmentedlist>
 
@@ -2741,6 +2741,44 @@
         </seglistitem>
       </segmentedlist>
 
+<!-- Begin Setuptools dependency info -->
+  <bridgehead renderas="sect2" id="setuptools-dep">Setuptools</bridgehead>
+
+      <segmentedlist id="setuptools-depends">
+        <segtitle>&dependencies;</segtitle>
+        <seglistitem>
+          <seg>Python and Wheel</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-rundeps">
+        <segtitle>&runtime;</segtitle>
+        <seglistitem>
+          <seg>Python</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-testdeps">
+        <segtitle>&testsuites;</segtitle>
+        <seglistitem>
+          <seg>No test suite available</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-before">
+        <segtitle>&before;</segtitle>
+        <seglistitem>
+          <seg>Jinja2, MarkupSafe, and Meson</seg>
+        </seglistitem>
+      </segmentedlist>
+
+      <segmentedlist id="setuptools-optdeps">
+        <segtitle>&external;</segtitle>
+        <seglistitem>
+          <seg>None</seg>
+        </seglistitem>
+      </segmentedlist>
+
 <!-- Begin Shadow dependency info -->
   <bridgehead renderas="sect2" id="shadow-dep">Shadow</bridgehead>
 
@@ -3216,7 +3254,7 @@
       </segmentedlist>
 
 <!-- Begin Wheel dependency info -->
-  <bridgehead renderas="sect2" id="wheel-dep">wheel</bridgehead>
+  <bridgehead renderas="sect2" id="wheel-dep">Wheel</bridgehead>
 
       <segmentedlist id="wheel-depends">
         <segtitle>&dependencies;</segtitle>
@@ -3243,8 +3281,7 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>
-            <phrase revision='sysv'>None</phrase>
-            <phrase revision='systemd'>Jinja2</phrase>
+            <phrase>Jinja2, MarkupSafe, Meson, and Setuptools</phrase>
           </seg>
         </seglistitem>
       </segmentedlist>
-- 
cgit v1.2.3-54-g00ecf


From c62883bd83304032893b8a98a5e6c1792352628c Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 1 Nov 2023 17:30:18 +0800
Subject: dependencies: Remove useless <phrase>

---
 appendices/dependencies.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 9ed06a9b7..73194612c 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -3281,7 +3281,7 @@
         <segtitle>&before;</segtitle>
         <seglistitem>
           <seg>
-            <phrase>Jinja2, MarkupSafe, Meson, and Setuptools</phrase>
+            Jinja2, MarkupSafe, Meson, and Setuptools
           </seg>
         </seglistitem>
       </segmentedlist>
-- 
cgit v1.2.3-54-g00ecf


From 23d67d844b95075f27ee04dcebb7e87c8655092c Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Wed, 1 Nov 2023 21:34:44 +0800
Subject: python: Remove --with-system-ffi

This option is removed by upstream in 3.12.

Link: https://github.com/python/cpython/pull/100544
---
 chapter08/python.xml | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/chapter08/python.xml b/chapter08/python.xml
index a4bfeaf91..f7bc19d47 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -48,7 +48,6 @@
 <screen><userinput remap="configure">./configure --prefix=/usr        \
             --enable-shared      \
             --with-system-expat  \
-            --with-system-ffi    \
             --enable-optimizations</userinput></screen>
 
     <variablelist>
@@ -62,14 +61,6 @@
        </listitem>
      </varlistentry>
 
-    <varlistentry>
-      <term><parameter>--with-system-ffi</parameter></term>
-      <listitem>
-        <para>This switch enables linking against the system version of
-        <filename class='libraryfile'>libffi.so</filename>.</para>
-      </listitem>
-    </varlistentry>
-
     <varlistentry>
       <term><parameter>--enable-optimizations</parameter></term>
       <listitem>
-- 
cgit v1.2.3-54-g00ecf