Changeset ee5db05 for x

Timestamp:

05/06/2021 06:45:36 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:

0dbcba9, f3e509d

Parents:

55dd726 (diff), 6679bb0 (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

Location:

x

Files:

• installing/tuning-fontconfig.xml (modified) (1 diff)
• lib/gdk-pixbuf.xml (modified) (4 diffs)

x/installing/tuning-fontconfig.xml

@@ -329 +329 @@
     <para>
       For more examples see the blfs-support thread which started at <ulink
-      url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-September/078422.html">/2016-September/078422</ulink>,
+      url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00128.html">2016-09/00128</ulink>,
       particularly <ulink
-      url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-September/078425.html">2016-September/078425</ulink>,
+      url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00137.html">2016-09/00137</ulink>,
       and the original poster's preferred solution at <ulink
-      url="http://lists.linuxfromscratch.org/pipermail/blfs-support/2016-November/078658.html">2016-November/078658</ulink>.
+      url="https://lists.linuxfromscratch.org/sympa/arc/blfs-support/2016-09/msg00147.html">2016-09/00147</ulink>.
       There are other examples in <xref linkend="arch-fontconfig"/> and <xref
       linkend="gentoo-fontconfig"/>.

x/lib/gdk-pixbuf.xml

@@ -9 +9 @@
   <!ENTITY gdk-pixbuf-download-ftp
            "&gnome-download-ftp;/gdk-pixbuf/2.42/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
-  <!ENTITY gdk-pixbuf-md5sum        "628e4767d1636a06dea5b0fa4838f723">
-  <!ENTITY gdk-pixbuf-size          "7.2 MB">
-  <!ENTITY gdk-pixbuf-buildsize     "70 MB (with tests)">
+  <!ENTITY gdk-pixbuf-md5sum        "7cd2fdaa3c55e2302316fe36968f7425">
+  <!ENTITY gdk-pixbuf-size          "7.4 MB">
+  <!ENTITY gdk-pixbuf-buildsize     "71 MB (with tests)">
   <!ENTITY gdk-pixbuf-time          "0.2 SBU (Using parallelism=4; with tests)">
 ]>
@@ -101 +101 @@
     <para role="optional">
        <!--<xref linkend="jasper"/> and-->
-      <xref linkend="gtk-doc"/>
+      <xref linkend="gtk-doc"/> and
+      <ulink url="https://gitlab.gnome.org/ebassi/gi-docgen">gi-docgen</ulink>
     </para>
 
@@ -120 +121 @@
 cd build &amp;&amp;
 
-meson --prefix=/usr .. &amp;&amp;
+meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
 ninja</userinput></screen>
 
@@ -153 +154 @@
       <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>
 <!-- Removed in 2.42.0