Changeset f7e4cc69


Ignore:
Timestamp:
08/26/2021 08:22:23 PM (13 months ago)
Author:
Bruce Dubbs <bdubbs@…>
Branches:
11.0, 11.1, 11.2, lazarus, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226
Children:
9d154616
Parents:
df5a815 (diff), 95d46832 (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:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    rdf5a815 rf7e4cc69  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[ken] - Add --wrap-mode=nofallback to gdk-pixbuf and pango. Fixes
     49          <ulink url="&blfs-ticket-root;15466">#15466</ulink>.</para>
     50        </listitem>
     51        <listitem>
    4852          <para>[ken] - Update to Unicode-Collate-1.31 (perl module). Fixes
    4953          <ulink url="&blfs-ticket-root;15446">#15446</ulink>.</para>
     
    6266        </listitem>
    6367        <listitem>
    64           <para>[pierre] - Update to openssh-8.7p1.
     68          <para>[pierre] - Update to openssh-8.7p1, with ssh-askpass.
    6569          Fixes <ulink url="&blfs-ticket-root;15439">#15439</ulink>.</para>
    6670        </listitem>
  • postlfs/security/ssh-askpass.xml

    rdf5a815 rf7e4cc69  
    99  <!ENTITY ssh-askpass-download-ftp
    1010    "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&ssh-askpass-version;.tar.gz">
    11   <!ENTITY ssh-askpass-md5sum        "805f7048aec6dd752584e570383a6f00">
     11  <!ENTITY ssh-askpass-md5sum        "f545230799f131aecca04da56e61990a">
    1212  <!ENTITY ssh-askpass-size          "1.7 MB">
    13   <!ENTITY ssh-askpass-buildsize     "9.6 MB">
     13  <!ENTITY ssh-askpass-buildsize     "9.8 MB">
    1414  <!ENTITY ssh-askpass-time          "less than 0.1 SBU">
    1515]>
  • x/lib/gdk-pixbuf.xml

    rdf5a815 rf7e4cc69  
    101101    <para role="optional">
    102102       <!--<xref linkend="jasper"/> and-->
    103       <xref linkend="gtk-doc"/> and
     103  <!--<xref linkend="gtk-doc"/> and-->
    104104      <ulink url="https://gitlab.gnome.org/ebassi/gi-docgen">gi-docgen</ulink>
     105      (to generate documentation)
    105106    </para>
    106107
     
    121122cd build &amp;&amp;
    122123
    123 meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
     124meson --prefix=/usr --buildtype=release --wrap-mode=nofallback .. &amp;&amp;
    124125ninja</userinput></screen>
    125126
     
    153154      href="../../xincludes/meson-buildtype-release.xml"/>
    154155
     156    <!-- gi-docgen can get installed without this, if deps exist -->
     157    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
     158      href="../../xincludes/meson-wrap-nofallback.xml"/>
     159
     160    <!-- gtk_doc replaced by gi-docgen
    155161    <para>
    156162      <option>-Dgtk_doc=true</option>: Use this parameter if
    157163      <application>GTK-Doc</application> is installed and you wish to rebuild
    158164      and install the API documentation.
    159       <!-- -Dgtk_doc is set to "yield=true" in meson_options.txt -->
    160     </para>
     165      <!\-\- -Dgtk_doc is set to "yield=true" in meson_options.txt \-\->
     166    </para>-->
    161167<!-- Removed in 2.42.0
    162168    <para>
  • x/lib/pango.xml

    rdf5a815 rf7e4cc69  
    9494    <para role="optional">
    9595      <xref linkend="cantarell-fonts"/> (for tests),
    96       <xref linkend="gtk-doc"/>,
     96  <!--<xref linkend="gtk-doc"/>,-->
    9797      <xref linkend="sysprof"/>,
    98       <ulink url="https://gitlab.gnome.org/GNOME/gi-docgen">gi-docgen</ulink>,
     98      <ulink url="https://gitlab.gnome.org/GNOME/gi-docgen">gi-docgen</ulink>
     99      (to generate documentation),
    99100      <ulink url="https://ftpmirror.gnu.org/gnu/help2man">help2man</ulink>, and
    100101      <ulink url="https://linux.thai.net/projects/libthai">libthai</ulink>
     
    117118cd    build &amp;&amp;
    118119
    119 meson --prefix=/usr --buildtype=release .. &amp;&amp;
     120meson --prefix=/usr --buildtype=release --wrap-mode=nofallback .. &amp;&amp;
    120121ninja</userinput></screen>
    121122
     
    152153      href="../../xincludes/meson-buildtype-release.xml"/>
    153154
     155    <!-- gtk-doc replaced by gi-docgen
    154156    <para>
    155157      <option>-Dgtk_doc</option>: Use this switch if gtk-doc is
    156158      installed and you wish to rebuild and install the API documentation.
    157     </para>
     159    </para>-->
    158160
    159161    <para>
     
    162164    </para>
    163165
    164     <!-- gi-docgen is now included in the tarball with 1.48.4
     166    <!-- gi-docgen can get installed without this, if deps exist -->
    165167    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
    166       href="../../xincludes/meson-wrap-nodownload.xml"/>
    167     -->
     168      href="../../xincludes/meson-wrap-nofallback.xml"/>
     169
    168170  </sect2>
    169171
Note: See TracChangeset for help on using the changeset viewer.