Merge branch 'trunk' into xry111/docbook-xsl-ns

7 files changed, 67 insertions, 27 deletions

diff --git a/general/genlib/spidermonkey.xml b/general/genlib/spidermonkey.xml
index b244f63c8b..5b2b3f440d 100644
--- a/general/genlib/spidermonkey.xml
+++ b/general/genlib/spidermonkey.xml
@@ -188,22 +188,43 @@ cd    obj &&
 make</userinput></screen>
 
     <para>
+      If running the test suite, adapt it to be compatible with Python
+      3.13.0 or newer:
+    </para>
+
+    <screen remap='test'><userinput>sed 's/pipes/shlex/' -i ../js/src/tests/lib/results.py</userinput></screen>
+
+    <para>
       To run the SpiderMonkey test suite, issue:
-      <command>make -C js/src check-jstests
-      JSTESTS_EXTRA_ARGS="--timeout 300 --wpt=disabled"</command>.
-      It's recommended to redirect the output into a log.
-      <!-- recheck when ICU gets upgraded -->
+    </para>
+
+    <screen remap='test'><userinput>make -C js/src check-jstests \
+     JSTESTS_EXTRA_ARGS="--timeout 300 --wpt=disabled" | tee jstest.log</userinput></screen>
+
+    <para>
       Because we are building with system ICU, 45 tests
       (out of a total of more than 50,000) are known to fail.
+      The list of failed tests can be extracted via
+      <command>grep 'UNEXPECTED-FAIL' jstest.log</command>.
+      Pass the <option>-c</option> option to <command>grep</command> if
+      you only want the total number of failed tests.
+    </para>
+
+    <para>
       The test suite is executed with all CPU cores available: even in a
       cgroup with less cores assigned, it still attempts to spawn as many
       testing jobs as the number of <emphasis>all</emphasis> cores in the
       system; fortunately the kernel still won't run these jobs on cores
       not assigned to the cgroup so the CPU usage is still controlled.
     </para>
+
+    <para>
+      To run the JIT test suite, issue:
+    </para>
+
+    <screen remap='test'><userinput>make -C js/src check-jit-test JSTESTS_EXTRA_ARGS="--timeout 300"</userinput></screen>
+
     <para>
-      To run the JIT test suite, issue: <command>make -C js/src
-      check-jit-test JITTEST_EXTRA_ARGS="--timeout 300"</command>.
       Like the SpiderMonkey test suite, the number of test jobs is same as
       the number of all CPU cores in the system even if a cgroup is used. To
       make things worse, there are six tests which will use 3 GB each
@@ -214,9 +235,8 @@ make</userinput></screen>
       <option>-jN</option> after <option>--timeout 300</option> with N
       replaced by the number of parallel test jobs you want to start.  For
       example, if you have 16 GB system memory available and 8 CPU cores,
-      issue <command>make -C js/src check-jit-test
-      JITTEST_EXTRA_ARGS="--timeout=300 -j5"</command> to run the test with
-      5 parallel jobs so the memory usage won't exceed 15 GB.
+      use <option>JITTEST_EXTRA_ARGS="--timeout=300 -j5"</option> to run the
+      test suite with 5 parallel jobs so the memory usage won't exceed 15 GB.
       <!-- TL;DR: DO NOT REMOVE MEMORY USAGE NOTE W/O MY CONFIRMATION!
 
            "six tests": bug1782468-ptrdiff-veclen.js, it's ran with 6
diff --git a/general/graphlib/babl.xml b/general/graphlib/babl.xml
index d47517c252..c07b4db1e7 100644
--- a/general/graphlib/babl.xml
+++ b/general/graphlib/babl.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY babl-download-http "https://download.gimp.org/pub/babl/0.1/babl-&babl-version;.tar.xz">
   <!ENTITY babl-download-ftp  " ">
-  <!ENTITY babl-md5sum        "749169721b551882332a64ac17735de6">
+  <!ENTITY babl-md5sum        "647708858d0c217579dec462b5f202a2">
   <!ENTITY babl-size          "312 KB">
-  <!ENTITY babl-buildsize     "13 MB (with tests)">
+  <!ENTITY babl-buildsize     "14 MB (with tests)">
   <!ENTITY babl-time          "0.1 SBU (Using parallelism=4; with tests)">
 ]>
 
diff --git a/general/prog/python3.xml b/general/prog/python3.xml
index 8a17212b54..55ec35c931 100644
--- a/general/prog/python3.xml
+++ b/general/prog/python3.xml
@@ -7,17 +7,17 @@
   <!ENTITY python3-download-http
            "https://www.python.org/ftp/python/&python3-version;/Python-&python3-version;.tar.xz">
   <!ENTITY python3-download-ftp  " ">
-  <!ENTITY python3-md5sum        "c6c933c1a0db52597cb45a7910490f93">
-  <!ENTITY python3-size          "19 MB">
-  <!ENTITY python3-buildsize     "337 MB (add 60 MB for tests)">
-  <!ENTITY python3-time          "1.5 SBU (add 0.7 SBU for tests; both using parallelism=4)">
+  <!ENTITY python3-md5sum        "726e5b829fcf352326874c1ae599abaa">
+  <!ENTITY python3-size          "21 MB">
+  <!ENTITY python3-buildsize     "354 MB (add 58 MB for tests)">
+  <!ENTITY python3-time          "1.5 SBU (add 1.6 SBU for tests; both using parallelism=4)">
   <!--
   Note: Size does not reflect docs that were installed in LFS.
   Test time measured with 60 second timeout.
   -->
   <!ENTITY python3htmldoc-download-http
   "https://www.python.org/ftp/python/doc/&python3-version;/python-&python3-version;-docs-html.tar.bz2">
-  <!ENTITY python3-docs-md5sum "dc8310645d00143661062779196e551e" >
+  <!ENTITY python3-docs-md5sum "afbf0a2319b7ac7561c52969bd0f5148" >
 ]>
 
 <sect1 id="python3" xreflabel="Python-&python3-version;">
@@ -189,9 +189,13 @@ make</userinput></screen>
          Total tests: run=41,778 skipped=1,155
          Total test files: run=485/488 skipped=24 resource_denied=3
 
-         For Python-3.13.4 
+         For Python-3.12.4 
          Total tests: run=42,152 failures=6 skipped=1,234
          Total test files: run=487/489 failed=4 skipped=17 resource_denied=6 rerun=4
+
+         For Python-3.13.0
+         Total tests: run=44,153 skipped=1,640
+         Total test files: run=479/478 failed=3 skipped=20 resource_denied=2 rerun=3
     -->
 
     <para>
@@ -203,8 +207,8 @@ make</userinput></screen>
     </para>
 
     <para>
-      Of over 42,000 tests, the following are known to fail: test__xxsubinterpreters,
-      test_import, test_interpreters, and test_threading.
+      Of over 44,000 tests, the following are known to fail: 
+      test_idle, test_tkinter, and test_ttk.
     </para>
 
     <para>
diff --git a/general/prog/subversion.xml b/general/prog/subversion.xml
index 86a9536b6c..4cb8856178 100644
--- a/general/prog/subversion.xml
+++ b/general/prog/subversion.xml
@@ -171,12 +171,12 @@ make</userinput></screen>
 <command>make swig-rb</command> # for <application>Ruby</application></screen>
 
     <para>
-      To test the results, issue: <command>make check</command>. Four tests in
+      To test the results, issue: <command>make check</command>. <!-- Four tests in
       the <filename>commit_tests.py</filename>,
       <filename>prop_tests.py</filename>, and
       <filename>update_tests.py</filename> suites are known to fail. Due to
       changes in Python-3.12, you can expect to see around 200 Syntax Warnings
-      during the test suite due to invalid escape sequences.
+      during the test suite due to invalid escape sequences.-->
     </para>
 
     <para>
diff --git a/gnome/platform/nautilus.xml b/gnome/platform/nautilus.xml
index 697aba8d01..b6959356b8 100644
--- a/gnome/platform/nautilus.xml
+++ b/gnome/platform/nautilus.xml
@@ -124,12 +124,14 @@ meson setup --prefix=/usr       \
 ninja</userinput></screen>
 
     <para>
-      If you wish to generate and install the API documentation, issue the
-      following commands:
+      If you have <xref linkend='gi-docgen'/> installed and you wish to
+      generate and install the API documentation, issue the following
+      commands:
     </para>
 
 <screen><userinput remap="doc">sed "/docdir =/s@\$@ / 'nautilus-&nautilus-version;'@" -i ../meson.build &amp;&amp;
-meson configure -D docs=true</userinput></screen>
+meson configure -D docs=true &amp;&amp;
+ninja</userinput></screen>
 
     <para>
       To test the results, issue: <command>ninja test</command>. The tests
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 06d4876475..b2ef9402c7 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -39,6 +39,20 @@
     </listitem>
     -->
     <listitem>
+      <para>October 26th, 2024</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Upgrade to Python-3.13.0. Fixes
+          <ulink url="&blfs-ticket-root;20491">#20491</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Upgrade to babl-0.1.110. Fixes
+          <ulink url="&blfs-ticket-root;20581">#20581</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>October 27th, 2024</para>
       <itemizedlist>
         <listitem>
diff --git a/packages.ent b/packages.ent
index 117da9dd3f..d2520b4eee 100644
--- a/packages.ent
+++ b/packages.ent
@@ -216,7 +216,7 @@
 
 <!-- Chapter 10 -->
 <!ENTITY aalib-version                "1.4rc5">
-<!ENTITY babl-version                 "0.1.108">
+<!ENTITY babl-version                 "0.1.110">
 <!ENTITY cargo-c-version              "0.10.5">
 <!ENTITY exiv2-version                "0.28.3">
 <!ENTITY freetype2-version            "2.13.3">
@@ -367,8 +367,8 @@
 -->
 
 <!ENTITY python3-major                "3">
-<!ENTITY python3-minor                "12">
-<!ENTITY python3-patch                "7">
+<!ENTITY python3-minor                "13">
+<!ENTITY python3-patch                "0">
 <!ENTITY python3-majorver             "&python3-major;.&python3-minor;">
 <!ENTITY python3-version              "&python3-majorver;.&python3-patch;">
 <!ENTITY python3-lib-suffix           "cpython-&python3-major;&python3-minor;-&lt;arch&gt;-linux-gnu">