Changeset 1e6ae10c


Ignore:
Timestamp:
05/27/2021 05:06:28 PM (4 weeks ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
trunk
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:
2 edited

Legend:

Unmodified
Added
Removed
  • gnome/platform/nautilus.xml

    r96aff83f r1e6ae10c  
    115115  <sect2 role="installation">
    116116    <title>Installation of Nautilus</title>
     117
     118    <!-- This is a known bug in meson-0.58.0, but seems (in LFS/BLFS) only
     119         affects nautilus.  Remove the workaround after meson-0.58.1. -->
     120    <para>
     121      Work around an issue in meson-0.58.0:
     122    </para>
     123
     124<screen><userinput>sed -e 's/test_env/#&amp;/' \
     125    -e 's/env: \[/env: test_env + [/' \
     126    -i test/automated/displayless/meson.build</userinput></screen>
    117127
    118128    <para>
  • networking/netlibs/curl.xml

    r96aff83f r1e6ae10c  
    77  <!ENTITY curl-download-http "https://curl.se/download/curl-&curl-version;.tar.xz">
    88  <!ENTITY curl-download-ftp  " ">
    9   <!ENTITY curl-md5sum        "d7df02d3b78b625fee4dd765808a6eb6">
     9  <!ENTITY curl-md5sum        "3cf78c539cae019cf96ba38571706e06">
    1010  <!ENTITY curl-size          "2.4 MB">
    1111  <!ENTITY curl-buildsize     "103 MB (add 17 MB for tests)">
     
    7373      </listitem>
    7474    </itemizedlist>
    75 
    76     <!--
     75<!--
    7776    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    7877    <itemizedlist spacing="compact">
     
    8483      </listitem>
    8584    </itemizedlist>
    86     -->
     85-->
    8786
    8887    <bridgehead renderas="sect3">cURL Dependencies</bridgehead>
Note: See TracChangeset for help on using the changeset viewer.