Changeset 0dbcba9


Ignore:
Timestamp:
05/06/2021 08:19:12 PM (2 years ago)
Author:
Ken Moffat <ken@…>
Branches:
11.0, 11.1, 11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal
Children:
43d94d8
Parents:
685b8672 (diff), ee5db05 (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

Pick up changes which happened while I was preparing qtwebengine.

Files:
16 edited

Legend:

Unmodified
Added
Removed

  • general/graphlib/jasper.xml

    r685b8672 r0dbcba9  
    77  <!ENTITY jasper-download-http "https://github.com/jasper-software/jasper/archive/version-&jasper-version;/jasper-&jasper-version;.tar.gz">
    88  <!ENTITY jasper-download-ftp  " ">
    9   <!ENTITY jasper-md5sum        "0cce8fe864cba16be38542a2030a0ae0">
     9  <!ENTITY jasper-md5sum        "2c6017d275146f8792fa448227a7c373">
    1010  <!ENTITY jasper-size          "1.3 MB">
    11   <!ENTITY jasper-buildsize     "10 MB (with tests)">
     11  <!ENTITY jasper-buildsize     "6.6 MB (with tests)">
    1212  <!ENTITY jasper-time          "0.2 SBU (with tests)">
    1313]>

  • general/graphlib/libtiff.xml

    r685b8672 r0dbcba9  
    1010           "ftp://ftp.remotesensing.org/libtiff/tiff-&libtiff-version;.tar.gz">-->
    1111  <!ENTITY libtiff-download-ftp  " ">
    12   <!ENTITY libtiff-md5sum        "2bbf6db1ddc4a59c89d6986b368fc063">
     12  <!ENTITY libtiff-md5sum        "0a2e4744d1426a8fc8211c0cdbc3a1b3">
    1313  <!ENTITY libtiff-size          "2.7 MB">
    1414  <!ENTITY libtiff-buildsize     "16 MB (with tests)">
    … …  
    1616]>
    1717
    18 <sect1 id="libtiff" xreflabel="LibTIFF-&libtiff-version;">
     18<sect1 id="libtiff" xreflabel="libtiff-&libtiff-version;">
    1919  <?dbhtml filename="libtiff.html"?>
    2020
    … …  
    2323  </sect1info>
    2424
    25   <title>LibTIFF-&libtiff-version;</title>
     25  <title>libtiff-&libtiff-version;</title>
    2626
    2727  <indexterm zone="libtiff">
    28     <primary sortas="a-LibTIFF">LibTIFF</primary>
     28    <primary sortas="a-libtiff">libtiff</primary>
    2929  </indexterm>
    3030
    3131  <sect2 role="package">
    32     <title>Introduction to LibTIFF</title>
     32    <title>Introduction to libtiff</title>
    3333
    3434    <para>
    35       The <application>LibTIFF</application> package contains the TIFF
     35      The <application>libtiff</application> package contains the TIFF
    3636      libraries and associated utilities. The libraries are used by many
    3737      programs for reading and writing TIFF files and the utilities are
    … …  
    7575    </itemizedlist>
    7676
    77     <bridgehead renderas="sect3">LibTIFF Dependencies</bridgehead>
     77    <bridgehead renderas="sect3">libtiff Dependencies</bridgehead>
    7878
    7979    <bridgehead renderas="sect4">Recommended</bridgehead>
    … …  
    9696
    9797  <sect2 role="installation">
    98     <title>Installation of LibTIFF</title>
     98    <title>Installation of libtiff</title>
    9999
    100100    <para>
    101       Install <application>LibTIFF</application> by running the following
     101      Install <application>libtiff</application> by running the following
    102102      commands:
    103103    </para>

  • general/prog/cbindgen.xml

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

  • general/prog/docutils.xml

    r685b8672 r0dbcba9  
    77  <!ENTITY docutils-download-http "https://downloads.sourceforge.net/docutils/docutils-&docutils-version;.tar.gz">
    88  <!ENTITY docutils-download-ftp  " ">
    9   <!ENTITY docutils-md5sum        "abebc3d26886aec6faaa13f66384a6fc">
    10   <!ENTITY docutils-size          "2.0 MB">
    11   <!ENTITY docutils-buildsize     "16 MB">
     9  <!ENTITY docutils-md5sum        "ed810564c25063e9dac10dd0893ead47">
     10  <!ENTITY docutils-size          "1.9 MB">
     11  <!ENTITY docutils-buildsize     "12 MB">
    1212  <!ENTITY docutils-time          "less than 0.1 SBU">
    1313]>

  • general/prog/perl-modules/perl-list-allutils.xml

    r685b8672 r0dbcba9  
    66
    77  <!ENTITY my-download-http "&perl_authors;/id/D/DR/DROLSKY/List-AllUtils-&List-AllUtils-version;.tar.gz">
    8   <!ENTITY my-md5sum "9b1513c67e887cbf7e724dd5de427048">
     8  <!ENTITY my-md5sum "86469b1f6819ba181a8471eb932965f2">
    99
    1010]>

  • gnome.ent

    r685b8672 r0dbcba9  
    8181<!ENTITY evince-version                    "40.1">
    8282<!ENTITY evolution-version                 "3.40.0">
    83 <!ENTITY file-roller-version               "3.38.0">
     83<!ENTITY file-roller-version               "3.40.0">
    8484<!-- gedit moved to Editors, so it's now in packages.ent -->
    8585<!ENTITY gnome-calculator-version          "40.0">
    … …  
    9797<!ENTITY gucharmap-version                 "12.0.1">
    9898<!-- nm-applet moved to Networking Utilities, so it's now in packages.ent -->
    99 <!ENTITY seahorse-version                  "3.38.1">
     99<!ENTITY seahorse-version                  "40.0">
    100100<!ENTITY vinagre-version                   "3.22.0">
    101101<!--<!ENTITY vino-version                      "3.22.0">-->

  • gnome/applications/file-roller.xml

    r685b8672 r0dbcba9  
    66
    77  <!ENTITY file-roller-download-http
    8            "&gnome-download-http;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
     8           "&gnome-download-http;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
    99  <!ENTITY file-roller-download-ftp
    10            "&gnome-download-ftp;/file-roller/&gnome-minor-38;/file-roller-&file-roller-version;.tar.xz">
    11   <!ENTITY file-roller-md5sum        "41ee373818d577659980dcdaf57b772a">
    12   <!ENTITY file-roller-size          "860 KB">
     10           "&gnome-download-ftp;/file-roller/&gnome-minor-40;/file-roller-&file-roller-version;.tar.xz">
     11  <!ENTITY file-roller-md5sum        "b38c3eaea9aba5f44d2701fa23a7a0ff">
     12  <!ENTITY file-roller-size          "856 KB">
    1313  <!ENTITY file-roller-buildsize     "25 MB">
    1414  <!ENTITY file-roller-time          "0.1 SBU (Using parallelism=4)">

  • gnome/applications/seahorse.xml

    r685b8672 r0dbcba9  
    66
    77  <!ENTITY seahorse-download-http
    8            "&gnome-download-http;/seahorse/&gnome-minor-38;/seahorse-&seahorse-version;.tar.xz">
     8           "&gnome-download-http;/seahorse/&gnome-40;/seahorse-&seahorse-version;.tar.xz">
    99  <!ENTITY seahorse-download-ftp
    10            "&gnome-download-ftp;/seahorse/&gnome-minor-38;/seahorse-&seahorse-version;.tar.xz">
    11   <!ENTITY seahorse-md5sum        "e9d710e7c0282e6680869f48bf0a71d2">
    12   <!ENTITY seahorse-size          "1.6 MB">
     10           "&gnome-download-ftp;/seahorse/&gnome-40;/seahorse-&seahorse-version;.tar.xz">
     11  <!ENTITY seahorse-md5sum        "c6c11d77e64c4efc31f02c7127327be8">
     12  <!ENTITY seahorse-size          "1.3 MB">
    1313  <!ENTITY seahorse-buildsize     "58 MB">
    1414  <!ENTITY seahorse-time          "0.4 SBU">
    … …  
    148148      <para>
    149149        <option>-Dldap-support=false</option>: Add this switch if you have not
    150         installed openldap.
     150        installed openldap. Note that you will have to use the following 'sed'
     151        command to fix the build:
     152        sed -i "448 s/g_list/if (ssrc) &amp;/" pgp/seahorse-pgp-backend.c
    151153      </para>
    152154

  • introduction/welcome/changelog.xml

    r685b8672 r0dbcba9  
    4747         <para>[ken] - Patch qtwebengine-20210401 for latest fixes. Fixes
    4848         <ulink url="&blfs-ticket-root;14999">#14999</ulink>.</para>
     49         <para>[bdubbs] - adwaita-icon-theme-40.1. Fixes
     50         <ulink url="&blfs-ticket-root;14935">#14935</ulink>.</para>
     51       </listitem>
     52       <listitem>
     53         <para>[bdubbs] - Update to xf86-input-libinput-1.0.1 (Xorg Driver). Fixes
     54         <ulink url="&blfs-ticket-root;14933">#14933</ulink>.</para>
     55       </listitem>
     56       <listitem>
     57         <para>[bdubbs] - Update to docutils-0.17.1 (Python module). Fixes
     58         <ulink url="&blfs-ticket-root;14926">#14926</ulink>.</para>
     59       </listitem>
     60       <listitem>
     61         <para>[bdubbs] - Update to List-AllUtils-0.19 (Perl module). Fixes
     62         <ulink url="&blfs-ticket-root;14924">#14924</ulink>.</para>
     63       </listitem>
     64       <listitem>
     65         <para>[bdubbs] - Update to libtiff-4.3.0. Fixes
     66         <ulink url="&blfs-ticket-root;14922">#14922</ulink>.</para>
     67       </listitem>
     68       <listitem>
     69         <para>[bdubbs] - Update to jasper-2.0.32. Fixes
     70         <ulink url="&blfs-ticket-root;14921">#14921</ulink>.</para>
     71       </listitem>
     72       <listitem>
     73         <para>[renodr] - Update to cbindgen-0.19.0. Fixes
     74         <ulink url="&blfs-ticket-root;14885">#14885</ulink>.</para>
     75       </listitem>
     76       <listitem>
     77         <para>[renodr] - Update to postfix-3.6.0. Fixes
     78         <ulink url="&blfs-ticket-root;14892">#14892</ulink>.</para>
     79       </listitem>
     80       <listitem>
     81         <para>[renodr] - Update to gdk-pixbuf-2.42.6. Fixes
     82         <ulink url="&blfs-ticket-root;14893">#14893</ulink>.</para>
     83       </listitem>
     84       <listitem>
     85         <para>[renodr] - Update to file-roller-3.40.0. Fixes
     86         <ulink url="&blfs-ticket-root;14894">#14894</ulink>.</para>
     87       </listitem>
     88       <listitem>
     89         <para>[renodr] - Update to seahorse-40.0. Fixes
     90         <ulink url="&blfs-ticket-root;14895">#14895</ulink>.</para>
    4991       </listitem>
    5092       <listitem>

  • packages.ent

    r685b8672 r0dbcba9  
    214214<!ENTITY harfbuzz-version             "2.8.1">
    215215<!--<!ENTITY ijs-version                  "0.35">-->
    216 <!ENTITY jasper-version               "2.0.28">
     216<!ENTITY jasper-version               "2.0.32">
    217217<!ENTITY lcms-version                 "1.19">
    218218<!ENTITY lcms2-version                "2.12">
    … …  
    226226<!ENTITY libraw-version               "0.20.2">
    227227<!ENTITY libspiro-version             "20200505">
    228 <!ENTITY libtiff-version              "4.2.0">
     228<!ENTITY libtiff-version              "4.3.0">
    229229<!ENTITY libwebp-version              "1.2.0">
    230230<!ENTITY mypaint-brushes-version      "1.3.0"> <!-- version 1 only -->
    … …  
    331331<!ENTITY autoconf213-version          "2.13">
    332332<!ENTITY bazaar-version               "2.5.1">
    333 <!ENTITY cbindgen-version             "0.18.0">
     333<!ENTITY cbindgen-version             "0.19.0">
    334334<!ENTITY check-version                "0.12.0">
    335335<!ENTITY clisp-version                "2.49">
    … …  
    422422<!ENTITY IPC-Run3-version             "0.048">
    423423<!ENTITY Lingua-Translit-version      "0.28">
    424 <!ENTITY List-AllUtils-version        "0.18">
     424<!ENTITY List-AllUtils-version        "0.19">
    425425<!ENTITY List-MoreUtils-version       "0.430">
    426426<!ENTITY Log-Log4perl-version         "1.54">
    … …  
    551551<!-- Python module versions used in the Python Modules instructions -->
    552552<!-- <!ENTITY Beaker-version               "1.10.0"> -->
    553 <!ENTITY docutils-version             "0.17">
     553<!ENTITY docutils-version             "0.17.1">
    554554<!ENTITY dbus-python-version          "1.2.16">
    555555<!ENTITY dbusmock-version             "0.23.0">
    … …  
    668668
    669669<!ENTITY exim-version                 "4.94.2">
    670 <!ENTITY postfix-version              "3.5.9">
     670<!ENTITY postfix-version              "3.6.0">
    671671<!ENTITY sendmail-version             "8.16.1">
    672672
    … …  
    735735<!ENTITY fltk-version                 "1.3.5">
    736736<!ENTITY freeglut-version             "3.2.1">
    737 <!ENTITY gdk-pixbuf-version           "2.42.4">
     737<!ENTITY gdk-pixbuf-version           "2.42.6">
    738738<!ENTITY gdk-pixbuf-xlib-version      "2.40.2">
    739739<!ENTITY gdl-version                  "3.34.0">
    … …  
    789789<!ENTITY icon-naming-utils-version    "0.8.90">
    790790<!ENTITY hicolor-icon-theme-version   "0.17">
    791 <!ENTITY adwaita-icon-theme-version   "3.38.0">
     791<!ENTITY adwaita-icon-theme-version   "40.1">
    792792<!ENTITY gnome-icon-theme-version     "3.12.0">
    793793<!ENTITY gnome-icon-theme-extras-version "3.12.0">

  • server/mail/postfix.xml

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

  • stylesheets/patcheslist.xsl

    r685b8672 r0dbcba9  
    8383          <xsl:text>/x265</xsl:text>
    8484        </xsl:when>
     85          <!-- node -->
     86        <xsl:when test="contains($patch.name, 'node')">
     87          <xsl:text>/node</xsl:text>
     88        </xsl:when>
    8589          <!-- General rule -->
    8690        <xsl:otherwise>

  • x/icons/adwaita-icon-theme.xml

    r685b8672 r0dbcba9  
    99  <!ENTITY adwaita-icon-theme-download-ftp
    1010   "&gnome-download-ftp;/adwaita-icon-theme/&gnome-minor-38;/adwaita-icon-theme-&adwaita-icon-theme-version;.tar.xz">
    11   <!ENTITY adwaita-icon-theme-md5sum        "b3c1d078ba20f179e0cddfc3453db6ee">
     11  <!ENTITY adwaita-icon-theme-md5sum        "cff9e78291161e3f59d12803adcfc34f">
    1212  <!ENTITY adwaita-icon-theme-size          "16 MB">
    13   <!ENTITY adwaita-icon-theme-buildsize     "133 MB">
    14   <!ENTITY adwaita-icon-theme-time          "0.6 SBU">
     13  <!ENTITY adwaita-icon-theme-buildsize     "91 MB">
     14  <!ENTITY adwaita-icon-theme-time          "0.5 SBU (Using parallelism=4)">
    1515]>
    1616

  • x/installing/tuning-fontconfig.xml

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

  • x/installing/x7driver-libinput.xml

    r685b8672 r0dbcba9  
    55  %general-entities;
    66
    7   <!ENTITY xorg-libinput-driver-version "1.0.0">
     7  <!ENTITY xorg-libinput-driver-version "1.0.1">
    88
    99  <!ENTITY xorg-libinput-driver-download-http "&xorg-download-http;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.bz2">
    1010  <!ENTITY xorg-libinput-driver-download-ftp  "&xorg-download-ftp;/driver/xf86-input-libinput-&xorg-libinput-driver-version;.tar.bz2">
    11   <!ENTITY xorg-libinput-driver-md5sum        "d548bf7dbf10854a417e369445b1d82a">
    12   <!ENTITY xorg-libinput-driver-size          "370 KB">
     11  <!ENTITY xorg-libinput-driver-md5sum        "cc30d31f0ffd2653dd727aedd4372984">
     12  <!ENTITY xorg-libinput-driver-size          "372 KB">
    1313  <!ENTITY xorg-libinput-driver-buildsize     "3.6 MB (with tests)">
    1414  <!ENTITY xorg-libinput-driver-time          "less than 0.1 SBU (with tests)">

  • x/lib/gdk-pixbuf.xml

    r685b8672 r0dbcba9  
    99  <!ENTITY gdk-pixbuf-download-ftp
    1010           "&gnome-download-ftp;/gdk-pixbuf/2.42/gdk-pixbuf-&gdk-pixbuf-version;.tar.xz">
    11   <!ENTITY gdk-pixbuf-md5sum        "628e4767d1636a06dea5b0fa4838f723">
    12   <!ENTITY gdk-pixbuf-size          "7.2 MB">
    13   <!ENTITY gdk-pixbuf-buildsize     "70 MB (with tests)">
     11  <!ENTITY gdk-pixbuf-md5sum        "7cd2fdaa3c55e2302316fe36968f7425">
     12  <!ENTITY gdk-pixbuf-size          "7.4 MB">
     13  <!ENTITY gdk-pixbuf-buildsize     "71 MB (with tests)">
    1414  <!ENTITY gdk-pixbuf-time          "0.2 SBU (Using parallelism=4; with tests)">
    1515]>
    … …  
    101101    <para role="optional">
    102102       <!--<xref linkend="jasper"/> and-->
    103       <xref linkend="gtk-doc"/>
     103      <xref linkend="gtk-doc"/> and
     104      <ulink url="https://gitlab.gnome.org/ebassi/gi-docgen">gi-docgen</ulink>
    104105    </para>
    105106
    … …  
    120121cd build &amp;&amp;
    121122
    122 meson --prefix=/usr .. &amp;&amp;
     123meson --prefix=/usr -Dgtk_doc=false .. &amp;&amp;
    123124ninja</userinput></screen>
    124125
    … …  
    153154      <application>GTK-Doc</application> is installed and you wish to rebuild
    154155      and install the API documentation.
     156      <!-- -Dgtk_doc is set to "yield=true" in meson_options.txt -->
    155157    </para>
    156158<!-- Removed in 2.42.0
Note: See TracChangeset for help on using the changeset viewer.