Changeset 1e6ae10c

Timestamp:

05/27/2021 05:06:28 PM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

11.0, 11.1, 11.2, 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, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

c1b3614

Parents:

96aff83f (diff), e010adb (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/nautilus.xml (modified) (1 diff)
• networking/netlibs/curl.xml (modified) (3 diffs)

gnome/platform/nautilus.xml

@@ -115 +115 @@
   <sect2 role="installation">
     <title>Installation of Nautilus</title>
+
+    <!-- This is a known bug in meson-0.58.0, but seems (in LFS/BLFS) only
+         affects nautilus.  Remove the workaround after meson-0.58.1. -->
+    <para>
+      Work around an issue in meson-0.58.0:
+    </para>
+
+<screen><userinput>sed -e 's/test_env/#&amp;/' \
+    -e 's/env: \[/env: test_env + [/' \
+    -i test/automated/displayless/meson.build</userinput></screen>
 
     <para>

networking/netlibs/curl.xml

@@ -7 +7 @@
   <!ENTITY curl-download-http "https://curl.se/download/curl-&curl-version;.tar.xz">
   <!ENTITY curl-download-ftp  " ">
-  <!ENTITY curl-md5sum        "d7df02d3b78b625fee4dd765808a6eb6">
+  <!ENTITY curl-md5sum        "3cf78c539cae019cf96ba38571706e06">
   <!ENTITY curl-size          "2.4 MB">
   <!ENTITY curl-buildsize     "103 MB (add 17 MB for tests)">
@@ -73 +73 @@
       </listitem>
     </itemizedlist>
-
-    <!--
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -84 +83 @@
       </listitem>
     </itemizedlist>
-    -->
+-->
 
     <bridgehead renderas="sect3">cURL Dependencies</bridgehead>