Changeset a4eccad

Timestamp:

12/30/2022 05:25:49 PM (16 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/llvm18, xry111/xf86-video-removal

Children:

0516cd2

Parents:

959291f (diff), 5c41392 (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:

• gnome/platform/gexiv2.xml (modified) (4 diffs)
• networking/netlibs/libslirp.xml (added)
• networking/netlibs/netlibs.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• postlfs/virtualization/qemu.xml (modified) (1 diff)

gnome/platform/gexiv2.xml

@@ -81 +81 @@
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
-      <xref linkend="gtk-doc"/> (for documentation) and
-      <xref linkend="python2"/> (for the Python2 module)
+      <xref linkend="gtk-doc"/> (for documentation)
+<!--  <xref linkend="python2"/> (for the Python2 module) -->
     </para>
 
@@ -144 +144 @@
       </seglistitem>
     </segmentedlist>
-<!--
+
     <variablelist>
       <bridgehead renderas="sect3">Short Descriptions</bridgehead>
@@ -154 +154 @@
         <listitem>
           <para>
-            contains the ??? client API functions.
+            provides a wrapper around the Exiv2 library
           </para>
           <indexterm zone="gexiv2 libgexiv2">
@@ -163 +163 @@
 
     </variablelist>
--->
+
   </sect2>
 

networking/netlibs/netlibs.xml

@@ -33 +33 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libpsl.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libndp.xml"/>
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libslirp.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libsoup3.xml"/>

packages.ent

@@ -583 +583 @@
 <!ENTITY libpsl-version               "0.21.2">
 <!ENTITY libndp-version               "1.8">
+<!ENTITY libslirp-version             "4.7.0">
 <!ENTITY libsoup-minor                "2.74">
 <!ENTITY libsoup-version              "&libsoup-minor;.3">

postlfs/virtualization/qemu.xml

@@ -78 +78 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="alsa-lib"/> and
+      <xref linkend="alsa-lib"/>,
+      <xref linkend="libslirp"/>, and
       <xref linkend="sdl2"/>
     </para>