From b5a316b0602add49619f86c47934848b156ac8b2 Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 2 Jul 2022 11:29:24 +0800
Subject: [PATCH 1/2] texinfo: remove unneeded sed

It works out of box with glibc-2.35.  I think this issue is already
fixed at glibc side, by the commit:

commit 0b5ca7c3e551e5502f3be3b06453324fe8604e82
Author: Paul Eggert <eggert@cs.ucla.edu>
Date:   Tue Sep 21 07:47:45 2021 -0700

    regex: copy back from Gnulib

    Copy regex-related files back from Gnulib, to fix a problem with
    static checking of regex calls noted by Martin Sebor.  This merges the
    following changes:

    * New macro __attribute_nonnull__ in misc/sys/cdefs.h, for use later
    when copying other files back from Gnulib.

    ... ... (unrelated things trimmed)
---
 chapter07/texinfo.xml | 5 -----
 chapter08/texinfo.xml | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/chapter07/texinfo.xml b/chapter07/texinfo.xml
index 8f769c064..34a386416 100644
--- a/chapter07/texinfo.xml
+++ b/chapter07/texinfo.xml
@@ -43,11 +43,6 @@
   <sect2 role="installation">
     <title>Installation of Texinfo</title>
 
-    <para>First, fix an issue building the package with Glibc-2.34 or later:</para>
-
-<screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
-    -i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
-
     <para>Prepare Texinfo for compilation:</para>
 
 <screen><userinput remap="configure">./configure --prefix=/usr</userinput></screen>
diff --git a/chapter08/texinfo.xml b/chapter08/texinfo.xml
index 42e81feae..5eebeb0e3 100644
--- a/chapter08/texinfo.xml
+++ b/chapter08/texinfo.xml
@@ -62,11 +62,6 @@
     </variablelist>
 -->
 
-    <para>Again, fix an issue building the package with Glibc-2.34 or later:</para>
-
-<screen><userinput remap="pre">sed -e 's/__attribute_nonnull__/__nonnull/' \
-    -i gnulib/lib/malloc/dynarray-skeleton.c</userinput></screen>
-
     <para>Compile the package:</para>
 
 <screen><userinput remap="make">make</userinput></screen>

From af3cf8ded1774b9cce4466ac67939411501d317f Mon Sep 17 00:00:00 2001
From: Xi Ruoyao <xry111@xry111.site>
Date: Sat, 2 Jul 2022 11:32:28 +0800
Subject: [PATCH 2/2] python: mention that --force-reinstall needs --no-deps

---
 chapter08/python.xml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/chapter08/python.xml b/chapter08/python.xml
index b7f2da6b9..2fb847042 100644
--- a/chapter08/python.xml
+++ b/chapter08/python.xml
@@ -126,8 +126,9 @@
         command to upgrade a module (for example, from meson-0.61.3 to
         meson-0.62.0), insert the option <parameter>--upgrade</parameter> into
         the command line.  If it's really necessary to downgrade a module or
-        reinstall the same version for some reason, insert 
-        <parameter>--force-reinstall</parameter> into the command line.
+        reinstall the same version for some reason, insert
+        <parameter>--force-reinstall --no-deps</parameter> into the command
+        line.
       </para>
     </important>