Changeset f3cd2c8

Timestamp:

07/19/2024 03:48:49 PM (7 weeks ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

12.2, lazarus, trunk, xry111/for-12.3, xry111/spidermonkey128

Children:

1189bdd2

Parents:

cbccbc3b (diff), 7b86a32 (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/genlib/appstream-glib.xml (modified) (1 diff)
• general/prog/python-modules/sphinx.xml (modified) (1 diff)
• xsoft/other/gimp.xml (modified) (3 diffs)

general/genlib/appstream-glib.xml

@@ -153 +153 @@
       <?dbhtml list-presentation="table"?>
 
-      <varlistentry id="appdata-builder">
-        <term><command>appdata-builder</command></term>
+      <varlistentry id="appstream-builder">
+        <term><command>appstream-builder</command></term>
         <listitem>
           <para>
             builds AppStream metadata
           </para>
-          <indexterm zone="appstream-glib appdata-builder">
-            <primary sortas="b-appdata-builder">appdata-builder</primary>
+          <indexterm zone="appstream-glib appstream-builder">
+            <primary sortas="b-appstream-builder">appstream-builder</primary>
           </indexterm>
         </listitem>

general/prog/python-modules/sphinx.xml

@@ -119 +119 @@
 <screen remap="test"><userinput>python3 -m venv --system-site-packages testenv &amp;&amp;
 source testenv/bin/activate                    &amp;&amp;
-pip3 install filelock defusedxml               &amp;&amp;
+pip3 install sphinx[test]                      &amp;&amp;
 python3 -m pytest<!-- no && because of a possible error -->
 deactivate</userinput></screen>

xsoft/other/gimp.xml

@@ -165 +165 @@
       <xref linkend="gs"/> (with libgs installed),
       <xref linkend="iso-codes"/>,
-      <xref linkend="libgudev"/>, and
+      <xref linkend="libgudev"/>,
+      <xref linkend="pygobject3"/>, and
       <xref linkend="xdg-utils"/>
     </para>
@@ -173 +174 @@
       <xref linkend="aalib"/>,
       <xref linkend="alsa-lib"/>,
+      <xref linkend="gjs"/>,
       <xref linkend="gvfs"/> (to access the online help),
+      <xref linkend="libjxl"/>,
       <xref linkend="libmng"/>,
       <xref linkend="libunwind"/>,
       <xref linkend="libwebp"/>,
+      <xref linkend="lua"/>,
       <xref linkend="openjpeg2"/>,
       <xref linkend="gtk-doc"/>,
-      <ulink url="https://people.freedesktop.org/~hughsient/appstream-glib">appstream-glib</ulink>,
+      <ulink url="https://github.com/HEASARC/cfitsio">cfitsio</ulink>,
       <ulink url="https://github.com/ianlancetaylor/libbacktrace">libbacktrace</ulink>,
+      <ulink url="https://github.com/svanderburg/libiff">libiff</ulink>,
+      <ulink url="https://github.com/svanderburg/libilbm">libilbm</ulink>,
       <ulink url="https://github.com/strukturag/libheif/">libheif</ulink> with
       <ulink url="https://github.com/strukturag/libde265/">libde265</ulink>
       (both needed to read macOS heic images),
-      <ulink url="https://wvware.sourceforge.net/libwmf.html">libwmf</ulink>, and
-      <ulink url="https://www.openexr.com/">OpenEXR</ulink>
+      <ulink url="https://wvware.sourceforge.net/libwmf.html">libwmf</ulink>,
+      <ulink url="https://www.openexr.com/">OpenEXR</ulink>, and
+      <ulink url="https://github.com/phoboslab/qoi">qoi</ulink>
     </para>
 
@@ -392 +399 @@
             is a tool that can build plug-ins or scripts and install them
             if they are distributed in one source file.
-            <command>gimptool-2.0</command> can also be used by programs that
+            <command>gimptool-2.99</command> can also be used by programs that
             need to know what libraries and include-paths The
             <application>Gimp</application> was compiled with