Changeset ee5db05

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

Files:

• general/prog/cbindgen.xml (modified) (1 diff)
• gnome.ent (modified) (2 diffs)
• gnome/applications/file-roller.xml (modified) (1 diff)
• gnome/applications/seahorse.xml (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (3 diffs)
• server/mail/postfix.xml (modified) (2 diffs)
• x/installing/tuning-fontconfig.xml (modified) (1 diff)
• x/lib/gdk-pixbuf.xml (modified) (4 diffs)

general/prog/cbindgen.xml

@@ -7 +7 @@
   <!ENTITY cbindgen-download-http "https://github.com/eqrion/cbindgen/archive/v&cbindgen-version;/cbindgen-&cbindgen-version;.tar.gz">
   <!ENTITY cbindgen-download-ftp  " ">
-  <!ENTITY cbindgen-md5sum        "9eb3e5c1c3adda2a8f1e3eee8d9700e3">
-  <!ENTITY cbindgen-size          "188 KB">
+  <!ENTITY cbindgen-md5sum        "b707b093702d4f1995f9a97f44ed081d">
+  <!ENTITY cbindgen-size          "192 KB">
   <!ENTITY cbindgen-buildsize     "123 MB (add 533 MB for tests)">
   <!ENTITY cbindgen-time          "0.6 SBU (add 0.4 SBU for tests), both on a 4-core machine">

gnome.ent

@@ -81 +81 @@
 <!ENTITY evince-version                    "40.1">
 <!ENTITY evolution-version                 "3.40.0">
-<!ENTITY file-roller-version               "3.38.0">
+<!ENTITY file-roller-version               "3.40.0">
 <!-- gedit moved to Editors, so it's now in packages.ent -->
 <!ENTITY gnome-calculator-version          "40.0">
@@ -97 +97 @@
 <!ENTITY gucharmap-version                 "12.0.1">
 <!-- nm-applet moved to Networking Utilities, so it's now in packages.ent -->
-<!ENTITY seahorse-version                  "3.38.1">
+<!ENTITY seahorse-version                  "40.0">
 <!ENTITY vinagre-version                   "3.22.0">
 <!--<!ENTITY vino-version                      "3.22.0">-->

gnome/applications/file-roller.xml

@@ -6 +6 @@
 
   <!ENTITY file-roller-download-http
-           "&gnome-download-http;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
+           "&gnome-download-http;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
   <!ENTITY file-roller-download-ftp
-           "&gnome-download-ftp;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
-  <!ENTITY file-roller-md5sum        "41ee373818d577659980dcdaf57b772a">
-  <!ENTITY file-roller-size          "860 KB">
+           "&gnome-download-ftp;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
+  <!ENTITY file-roller-md5sum        "b38c3eaea9aba5f44d2701fa23a7a0ff">
+  <!ENTITY file-roller-size          "856 KB">
   <!ENTITY file-roller-buildsize     "25 MB">
   <!ENTITY file-roller-time          "0.1 SBU (Using parallelism=4)">

gnome/applications/seahorse.xml

@@ -6 +6 @@
 
   <!ENTITY seahorse-download-http
-           "&gnome-download-http;/seahorse/&gnome-minor-38;/seahorse-&seahorse-version;.tar.xz">
+           "&gnome-download-http;/seahorse/&gnome-40;/seahorse-&seahorse-version;.tar.xz">
   <!ENTITY seahorse-download-ftp
-           "&gnome-download-ftp;/seahorse/&gnome-minor-38;/seahorse-&seahorse-version;.tar.xz">
-  <!ENTITY seahorse-md5sum        "e9d710e7c0282e6680869f48bf0a71d2">
-  <!ENTITY seahorse-size          "1.6 MB">
+           "&gnome-download-ftp;/seahorse/&gnome-40;/seahorse-&seahorse-version;.tar.xz">
+  <!ENTITY seahorse-md5sum        "c6c11d77e64c4efc31f02c7127327be8">
+  <!ENTITY seahorse-size          "1.3 MB">
   <!ENTITY seahorse-buildsize     "58 MB">
   <!ENTITY seahorse-time          "0.4 SBU">
@@ -148 +148 @@
       <para>
         <option>-Dldap-support=false</option>: Add this switch if you have not
-        installed openldap.
+        installed openldap. Note that you will have to use the following 'sed'
+        command to fix the build:
+        sed -i "448 s/g_list/if (ssrc) &amp;/" pgp/seahorse-pgp-backend.c
       </para>
 

introduction/welcome/changelog.xml

@@ -67 +67 @@
          <para>[bdubbs] - Update to jasper-2.0.32. Fixes
          <ulink url="&blfs-ticket-root;14921">#14921</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to cbindgen-0.19.0. Fixes
+         <ulink url="&blfs-ticket-root;14885">#14885</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to postfix-3.6.0. Fixes
+         <ulink url="&blfs-ticket-root;14892">#14892</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to gdk-pixbuf-2.42.6. Fixes
+         <ulink url="&blfs-ticket-root;14893">#14893</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to file-roller-3.40.0. Fixes
+         <ulink url="&blfs-ticket-root;14894">#14894</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[renodr] - Update to seahorse-40.0. Fixes
+         <ulink url="&blfs-ticket-root;14895">#14895</ulink>.</para>
        </listitem>
        <listitem>

packages.ent

@@ -331 +331 @@
 <!ENTITY autoconf213-version          "2.13">
 <!ENTITY bazaar-version               "2.5.1">
-<!ENTITY cbindgen-version             "0.18.0">
+<!ENTITY cbindgen-version             "0.19.0">
 <!ENTITY check-version                "0.12.0">
 <!ENTITY clisp-version                "2.49">
@@ -668 +668 @@
 
 <!ENTITY exim-version                 "4.94.2">
-<!ENTITY postfix-version              "3.5.9">
+<!ENTITY postfix-version              "3.6.0">
 <!ENTITY sendmail-version             "8.16.1">
 
@@ -735 +735 @@
 <!ENTITY fltk-version                 "1.3.5">
 <!ENTITY freeglut-version             "3.2.1">
-<!ENTITY gdk-pixbuf-version           "2.42.4">
+<!ENTITY gdk-pixbuf-version           "2.42.6">
 <!ENTITY gdk-pixbuf-xlib-version      "2.40.2">
 <!ENTITY gdl-version                  "3.34.0">

server/mail/postfix.xml

@@ -7 +7 @@
   <!ENTITY postfix-download-http " ">
   <!ENTITY postfix-download-ftp  "ftp://ftp.porcupine.org/mirrors/postfix-release/official/postfix-&postfix-version;.tar.gz">
-  <!ENTITY postfix-md5sum        "a4d1b2df03a500cf8f9759d5fca1c1f6">
-  <!ENTITY postfix-size          "4.4 MB">
-  <!ENTITY postfix-buildsize     "220 MB">
+  <!ENTITY postfix-md5sum        "75cfd03f0cf4c35876d630d2a04bd6f4">
+  <!ENTITY postfix-size          "4.5 MB">
+  <!ENTITY postfix-buildsize     "224 MB">
   <!ENTITY postfix-time          "0.2 SBU (Using parallelism=4)">
 ]>
@@ -364 +364 @@
         Create (or append to an existing) <filename>/etc/aliases</filename>
         with the following command. Change
-        <replaceable>&lt;LOGIN&gt;</replaceable> for your non-root login
+        <replaceable>&lt;LOGIN&gt;</replaceable> to your non-root login
         identity so mail addressed to
         <systemitem class="username">root</systemitem> can be forwarded to you.

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