Changeset f7e4cc69

Timestamp:

08/26/2021 08:22:23 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

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:

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:

• introduction/welcome/changelog.xml (modified) (2 diffs)
• postlfs/security/ssh-askpass.xml (modified) (1 diff)
• x/lib/gdk-pixbuf.xml (modified) (3 diffs)
• x/lib/pango.xml (modified) (4 diffs)
• xincludes/meson-wrap-nofallback.xml (added)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Add --wrap-mode=nofallback to gdk-pixbuf and pango. Fixes
+          <ulink url="&blfs-ticket-root;15466">#15466</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Update to Unicode-Collate-1.31 (perl module). Fixes
           <ulink url="&blfs-ticket-root;15446">#15446</ulink>.</para>
@@ -62 +66 @@
         </listitem>
         <listitem>
-          <para>[pierre] - Update to openssh-8.7p1.
+          <para>[pierre] - Update to openssh-8.7p1, with ssh-askpass.
           Fixes <ulink url="&blfs-ticket-root;15439">#15439</ulink>.</para>
         </listitem>

postlfs/security/ssh-askpass.xml

@@ -9 +9 @@
   <!ENTITY ssh-askpass-download-ftp
     "ftp://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/openssh-&ssh-askpass-version;.tar.gz">
-  <!ENTITY ssh-askpass-md5sum        "805f7048aec6dd752584e570383a6f00">
+  <!ENTITY ssh-askpass-md5sum        "f545230799f131aecca04da56e61990a">
   <!ENTITY ssh-askpass-size          "1.7 MB">
-  <!ENTITY ssh-askpass-buildsize     "9.6 MB">
+  <!ENTITY ssh-askpass-buildsize     "9.8 MB">
   <!ENTITY ssh-askpass-time          "less than 0.1 SBU">
 ]>

x/lib/gdk-pixbuf.xml

@@ -101 +101 @@
     <para role="optional">
        <!--<xref linkend="jasper"/> and-->
-      <xref linkend="gtk-doc"/> and
+  <!--<xref linkend="gtk-doc"/> and-->
       <ulink url="https://gitlab.gnome.org/ebassi/gi-docgen">gi-docgen</ulink>
+      (to generate documentation)
     </para>
 
@@ -121 +122 @@
 cd build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release -Dgtk_doc=false .. &amp;&amp;
+meson --prefix=/usr --buildtype=release --wrap-mode=nofallback .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -153 +154 @@
       href="../../xincludes/meson-buildtype-release.xml"/>
 
+    <!-- gi-docgen can get installed without this, if deps exist -->
+    <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
+      href="../../xincludes/meson-wrap-nofallback.xml"/>
+
+    <!-- gtk_doc replaced by gi-docgen
     <para>
       <option>-Dgtk_doc=true</option>: Use this parameter if
       <application>GTK-Doc</application> is installed and you wish to rebuild
       and install the API documentation.
-      <!-- -Dgtk_doc is set to "yield=true" in meson_options.txt -->
-    </para>
+      <!\-\- -Dgtk_doc is set to "yield=true" in meson_options.txt \-\->
+    </para>-->
 <!-- Removed in 2.42.0
     <para>

x/lib/pango.xml

@@ -94 +94 @@
     <para role="optional">
       <xref linkend="cantarell-fonts"/> (for tests),
-      <xref linkend="gtk-doc"/>,
+  <!--<xref linkend="gtk-doc"/>,-->
       <xref linkend="sysprof"/>,
-      <ulink url="https://gitlab.gnome.org/GNOME/gi-docgen">gi-docgen</ulink>,
+      <ulink url="https://gitlab.gnome.org/GNOME/gi-docgen">gi-docgen</ulink>
+      (to generate documentation),
       <ulink url="https://ftpmirror.gnu.org/gnu/help2man">help2man</ulink>, and
       <ulink url="https://linux.thai.net/projects/libthai">libthai</ulink>
@@ -117 +118 @@
 cd    build &amp;&amp;
 
-meson --prefix=/usr --buildtype=release .. &amp;&amp;
+meson --prefix=/usr --buildtype=release --wrap-mode=nofallback .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -152 +153 @@
       href="../../xincludes/meson-buildtype-release.xml"/>
 
+    <!-- gtk-doc replaced by gi-docgen
     <para>
       <option>-Dgtk_doc</option>: Use this switch if gtk-doc is 
       installed and you wish to rebuild and install the API documentation.
-    </para>
+    </para>-->
 
     <para>
@@ -162 +164 @@
     </para>
 
-    <!-- gi-docgen is now included in the tarball with 1.48.4
+    <!-- gi-docgen can get installed without this, if deps exist -->
     <xi:include xmlns:xi="http://www.w3.org/2001/XInclude"
-      href="../../xincludes/meson-wrap-nodownload.xml"/>
-    -->
+      href="../../xincludes/meson-wrap-nofallback.xml"/>
+
   </sect2>