Changeset 30d1d34

Timestamp:

12/07/2023 05:28:49 PM (6 months ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

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

Children:

babbe4db

Parents:

b4353b4c (diff), 26f615ac (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:

• multimedia/audioutils/audacious.xml (modified) (2 diffs)
• postlfs/editors/vim.xml (modified) (2 diffs)
• server/major/apache.xml (modified) (2 diffs)
• xsoft/graphweb/seamonkey.xml (modified) (2 diffs)

multimedia/audioutils/audacious.xml

@@ -213 +213 @@
 cd audacious-plugins-&audacious-plugins-version;                    &&
 
+sed -e '/libxml/a #include <libxml/parser.h>' \
+    -i src/scrobbler2/scrobbler.h             &&
+
 mkdir build &&
 cd    build &&
@@ -242 +245 @@
 
     <para>
-      <option>-Dgtk3=true</option>: This options sets the default graphical
-      user interface.
-    </para>
-
-    <para>
-      <option>-Dvalgrind=true</option>: The option enables Valgrind analysis support.
+      <parameter>-Dgtk3=true</parameter>: This option sets the default
+      graphical user interface.
+    </para>
+
+    <para>
+      <parameter>-Dlibarchive=true</parameter>: This adds libarchive support,
+      for reading compressed module sets or skins.
+    </para>
+
+    <para>
+      <command>sed -e '/libxml/a ...'</command>: This fixes building against
+      libxml-2.12.x.
+    </para>
+
+    <para>
+      <option>-Dvalgrind=true</option>: The option enables Valgrind analysis
+      support.
     </para>
 

postlfs/editors/vim.xml

@@ -92 +92 @@
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <para role="recommended">
-      <xref linkend="x-window-system"/> and
-      <xref linkend="gtk3"/>
+      <xref linkend="x-window-system"/>,
+      <xref linkend="gtk3"/>, and
+      <xref linkend="rsync"/>
     </para>
 
@@ -99 +100 @@
     <para role="optional">
       <xref linkend="gpm"/>,
-      <xref linkend="lua"/>,
-      <xref linkend="rsync"/>, and
+      <xref linkend="lua"/>, and
       <xref linkend="ruby"/>
     </para>

server/major/apache.xml

@@ -137 +137 @@
     -i configure  &&
 
+sed -e '/encoding.h/a # include <libxml/xmlstring.h>' \
+    -i modules/filters/mod_xml2enc.c  &&
+
 ./configure --enable-authnz-fcgi                              \
             --enable-layout=BLFS                              \
@@ -184 +187 @@
       <application>apxs</application> utility to use absolute pathnames for
       modules, when instructed to do so.
+    </para>
+
+    <para>
+      <command>sed -e '/HTTPD_ROOT/s ...</command>: Fixes some paths.
+    </para>
+
+    <para>
+      <command>sed -e '/encoding.h/a ...</command>; Fix building against
+      libxml-2.12.x.
     </para>
 

xsoft/graphweb/seamonkey.xml

@@ -153 +153 @@
       <xref linkend="wget"/>,
       <xref linkend="wireless_tools"/>,
-      <ulink url="https://hunspell.sourceforge.net/">Hunspell</ulink>, and
+      <ulink url="https://hunspell.sourceforge.net/">Hunspell</ulink>,
+      <ulink url="https://gitlab.gnome.org/Archive/gconf">Gconf</ulink>, and
       <ulink url="https://facebook.github.io/watchman/">Watchman</ulink>
     </para>
@@ -196 +197 @@
 # and uncomment this if you installed alsa-lib instead of PulseAudio
 #ac_add_options --enable-alsa
-<!--
-# Comment out following option if you have gconf installed
-ac_add_options - -disable-gconf
-
-following was for icu in the past seems OK with icu-60, seamonkey-2.49
-line below was with comment and explanation
-# Use the internal version of icu due to execution problems-->
+
+# Comment out the following option if you have gconf installed
+ac_add_options --disable-gconf
+
 # Comment out following options if you have not installed
 # recommended dependencies: