Changeset 72729a79

Timestamp:

09/10/2023 06:17:18 PM (8 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.1, ken/TL2024, ken/tuningfonts, lazarus, plabs/newcss, python3.11, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18

Children:

9ec8e6a

Parents:

87e1d46 (diff), 3b411d49 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'trunk' of git.linuxfromscratch.org:blfs into trunk

Files:

• general/prog/python-dependencies/sphinxcontrib-serializinghtml.xml (modified) (1 diff)
• multimedia/libdriv/alsa-utils.xml (modified) (1 diff)
• x/installing/libxcb.xml (modified) (2 diffs)

general/prog/python-dependencies/sphinxcontrib-serializinghtml.xml

@@ -79 +79 @@
       <title>Installation of Sphinxcontrib-serializinghtml</title>
 
-    <para> Build the module: </para>
+      <para>
+        First remove a spurious circular dependency:
+      </para>
+
+<screen><userinput>sed /^dependencies/,+2d -i pyproject.toml</userinput></screen>
+
+      <para> Build the module: </para>
 
 <screen><userinput>pip3 wheel -w dist --no-build-isolation --no-deps $PWD</userinput></screen>
 
-    <para>
-      Now, as the <systemitem class="username">root</systemitem> user:
-    </para>
+      <para>
+        Now, as the <systemitem class="username">root</systemitem> user:
+      </para>
 
 <screen role="root"><userinput>pip3 install --no-index --find-links dist --no-cache-dir --no-user sphinxcontrib-serializinghtml</userinput></screen>
 
       <para>
-        To test the installation, run <command>pytest</command>.
+        To test the installation, first install <xref linkend="sphinx"/>, then
+        run <command>pytest</command>.
       </para>
 

multimedia/libdriv/alsa-utils.xml

@@ -173 +173 @@
 
       <para>
-        As the &root; user, apply the default setting for the sound card:
-      </para>
-
-<screen role="root"><userinput>alsactl init</userinput></screen>
+        As the &root; user, apply the default setting for the sound card.
+        Note that this command may return an exit code of 99 although the
+        card is correctly initialized:
+      </para>
+
+<screen role="nodump"><userinput>alsactl init</userinput></screen>
 
       <para>

x/installing/libxcb.xml

@@ -101 +101 @@
             --without-doxygen \
             --docdir='${datadir}'/doc/libxcb-&libxcb-version; &&
-make</userinput></screen>
+LC_ALL=en_US.UTF-8 make</userinput></screen>
 
     <para>
@@ -126 +126 @@
     <title>Command Explanations</title>
 
-<!-- No longer needed with 1.16, it now requires Python-3.0 or higher.
+    <!-- https://gitlab.freedesktop.org/xorg/lib/libxcb/-/issues/72 -->
     <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.
+      <envar>LC_ALL=en_US.UTF-8</envar>: Some Python 3 script in the
+      building system of this package may fail with certain system
+      locale settings.  This environment variable forces a locale setting
+      known to work.
     </para>
--->
 
     <para>