Changeset 45b31bb


Ignore:
Timestamp:
01/04/2021 12:29:20 PM (3 years ago)
Author:
Pierre Labastie <pieere@…>
Branches:
qt5new
Children:
c9426454
Parents:
3fa3e246 (diff), d67acd4f (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:

Merging trunk r24052 through r24067

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/branches/qt5new@24068 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
20 edited

Legend:

Unmodified
Added
Removed

  • general.ent

    r3fa3e246 r45b31bb  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "01">                   <!-- Always 2 digits -->
     3<!ENTITY day          "03">                   <!-- Always 2 digits -->
    44<!ENTITY month        "01">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2021">
    … …  
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "January 1st, &year;">
     9<!ENTITY releasedate  "January 3rd, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

  • general/graphlib/harfbuzz.xml

    r3fa3e246 r45b31bb  
    1010  <!ENTITY harfbuzz-md5sum        "6d8393e6fb84edfb15997d1c5ba35b1b">
    1111  <!ENTITY harfbuzz-size          "9.1 MB">
    12   <!ENTITY harfbuzz-buildsize     "240 MB (add 6 MB for tests)">
    13   <!ENTITY harfbuzz-time          "0.4 SBU (Using parallelism=4; add 0.2 SBU for tests)">
     12  <!ENTITY harfbuzz-buildsize     "229 MB (add 6 MB for tests)">
     13  <!ENTITY harfbuzz-time          "0.3 SBU (Using parallelism=4; add 0.2 SBU for tests)">
    1414]>
    1515
    … …  
    7676    <bridgehead renderas="sect4">Recommended</bridgehead>
    7777    <para role="recommended">
     78      <xref linkend="git"/>,
    7879      <xref linkend="glib2"/> (required for Pango),
    7980      <xref role="first" linkend="graphite2"/> (required for building
    … …  
    123124cd    build &amp;&amp;
    124125
    125 meson --prefix=/usr -Dgraphite=enabled &amp;&amp;
     126meson --prefix=/usr -Dgraphite=enabled -Dbenchmark=disabled &amp;&amp;
    126127ninja</userinput></screen>
    127128
    … …  
    152153      building <xref linkend="texlive"/> or <xref linkend="libreoffice"/>
    153154      with system harfbuzz.
     155    </para>
     156
     157    <para>
     158      <parameter>-Dbenchmark=disabled</parameter>: This switch disables
     159      downloading and building the <application>google-benchmark</application>
     160      subproject, which requires <xref linkend="git"/>, and is of no
     161      use for non developpers.
    154162    </para>
    155163

  • general/graphlib/opencv.xml

    r3fa3e246 r45b31bb  
    140140      <ulink url="http://structure.io/openni">OpenNI</ulink>,
    141141      <ulink url="http://plantuml.sourceforge.net/">PlanetUML</ulink>,
    142       <ulink url="http://www.1stvision.com/AVT-gige-camera-software-downloads.html">PvAPI</ulink>,
    143       <ulink url="https://www.threadingbuildingblocks.org/">Threading Building Blocks (TBB)</ulink>,
     142      <ulink url="https://www.alliedvision.com/en/support/software-downloads.html">PvAPI</ulink>,
     143      <ulink url="https://github.com/oneapi-src/oneTBB">Threading Building Blocks (TBB)</ulink>,
    144144      <ulink url="http://unicap-imaging.org/">UniCap</ulink>,
    145145      <ulink url="http://www.vtk.org/">VTK - The Visualization Toolkit</ulink>, and

  • general/graphlib/qrencode.xml

    r3fa3e246 r45b31bb  
    1313]>
    1414
    15 <sect1 id="qrencode" xreflabel="libqrencode-&qrencode-version;">
     15<sect1 id="qrencode" xreflabel="qrencode-&qrencode-version;">
    1616  <?dbhtml filename="qrencode.html"?>
    1717
    … …  
    2121  </sect1info>
    2222
    23   <title>Libqrencode-&qrencode-version;</title>
     23  <title>qrencode-&qrencode-version;</title>
    2424
    2525  <indexterm zone="qrencode">
    … …  
    2828
    2929  <sect2 role="package">
    30     <title>Introduction to Libqrencode</title>
    31 
    32     <para>
    33       <application>Libqrencode</application> is a fast and compact library
     30    <title>Introduction to qrencode</title>
     31
     32    <para>
     33      <application>Qrencode</application> is a fast and compact library
    3434      for encoding data in a QR Code symbol, a 2D symbology that can be
    3535      scanned by handheld terminals such as a mobile phone with a CCD sensor.
    … …  
    7272    </itemizedlist>
    7373
    74     <bridgehead renderas="sect3">Libqrencode Dependencies</bridgehead>
     74    <bridgehead renderas="sect3">Qrencode Dependencies</bridgehead>
    7575
    7676    <bridgehead renderas="sect4">Recommended</bridgehead>
    … …  
    9191
    9292  <sect2 role="installation">
    93     <title>Installation of Libqrencode</title>
     93    <title>Installation of qrencode</title>
    9494
    9595    <para>

  • general/prog/python-dbusmock.xml

    r3fa3e246 r45b31bb  
    77  <!ENTITY dbusmock-download-http "https://github.com/martinpitt/python-dbusmock/releases/download/&dbusmock-version;/python-dbusmock-&dbusmock-version;.tar.gz">
    88  <!ENTITY dbusmock-download-ftp  " ">
    9   <!ENTITY dbusmock-md5sum        "136e255d2241ea40a271a60389f55fdd">
    10   <!ENTITY dbusmock-size          "72 KB">
    11   <!ENTITY dbusmock-buildsize     "880 KB">
     9  <!ENTITY dbusmock-md5sum        "f9203f4b78ac90f7e804361fc39042f3">
     10  <!ENTITY dbusmock-size          "68 KB">
     11  <!ENTITY dbusmock-buildsize     "820 KB">
    1212  <!ENTITY dbusmock-time          "less than 0.1 SBU">
    1313]>

  • general/prog/ruby.xml

    r3fa3e246 r45b31bb  
    77  <!ENTITY ruby-download-http "http://cache.ruby-lang.org/pub/ruby/&ruby-minor-version;/ruby-&ruby-version;.tar.xz">
    88  <!ENTITY ruby-download-ftp  " ">
    9   <!ENTITY ruby-md5sum        "60adb09227ff188a53fd13b6e854edd2">
    10   <!ENTITY ruby-size          "11 MB">
    11   <!ENTITY ruby-buildsize     "567 MB (add 230 MB for C API docs)">
    12   <!ENTITY ruby-time          "1.3 SBU (using parallelism=4; add 4.4 SBU for tests; add 0.5 SBU for C API docs)">
     9  <!ENTITY ruby-md5sum        "fefb57db58b5c3f11534710bab2bba47">
     10  <!ENTITY ruby-size          "14 MB">
     11  <!ENTITY ruby-buildsize     "629 MB (add 533 MB for C API docs)">
     12  <!ENTITY ruby-time          "1.3 SBU (using parallelism=4; add 5.5 SBU for tests; add 0.8 SBU for C API docs)">
    1313]>
    1414
    … …  
    111111
    112112    <para>
    113       To test the results, issue: <command>make check</command>. There are over
     113      To test the results, issue: <command>make check</command>. There are almost
    114114      21,000 tests. Some tests related to ipv6 may indicate errors.  If the
    115115      tests are run in a directory that has a world writable component (e.g.
    116       /tmp) then several additional tests may fail. One test related to
    117       the time function may fail due to a change in expectations as a result of
    118       glibc-2.31.
     116      /tmp) then several additional tests may fail. A few tests my fail due
     117      to system configuration expectations.
    119118    </para>
    120119
    … …  
    162161      <seglistitem>
    163162        <seg>
    164           bundle, bundler, erb, gem, irb, rake, rdoc, ri, and ruby
     163          bundle,
     164          bundler,
     165          erb,
     166          gem,
     167          irb,
     168          racc,
     169          rake,
     170          rbs,
     171          rdoc,
     172          ri,
     173          ruby, and
     174          typeprof
    165175        </seg>
    166176        <seg>

  • introduction/welcome/changelog.xml

    r3fa3e246 r45b31bb  
    4343    -->
    4444    <listitem>
     45      <para>January 2nd, 2021</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[renodr] - Fix the build of python bindings in
     49          libmusicbrainz.</para>
     50        </listitem>
     51        <listitem>
     52          <para>[bdubbs] - Update to ruby-3.0.0. Fixes
     53          <ulink url="&blfs-ticket-root;14415">#14415</ulink>.</para>
     54        </listitem>
     55        <listitem>
     56          <para>[bdubbs] - Update to mesa-20.3.2. Fixes
     57          <ulink url="&blfs-ticket-root;14448">#14448</ulink>.</para>
     58        </listitem>
     59        <listitem>
     60          <para>[bdubbs] - Update to python-dbusmock-0.21.0. Fixes
     61          <ulink url="&blfs-ticket-root;14452">#14452</ulink>.</para>
     62        </listitem>
     63        <listitem>
     64          <para>[bdubbs] - Update to wget-1.21. Fixes
     65          <ulink url="&blfs-ticket-root;14449">#14449</ulink>.</para>
     66        </listitem>
     67        <listitem>
     68          <para>[bdubbs] - Update to vim-8.2.2253. Addreses
     69          <ulink url="&blfs-ticket-root;12241">#12241</ulink>.</para>
     70        </listitem>
     71      </itemizedlist>
     72    </listitem>
     73
     74    <listitem>
    4575      <para>January 1st, 2021</para>
    4676      <itemizedlist>

  • kde/extra-cmake-modules.xml

    r3fa3e246 r45b31bb  
    8181    <bridgehead renderas="sect4">Optional</bridgehead>
    8282    <para role="optional">
     83      <ulink url="https://pypi.org/project/PyQt5/">PyQt</ulink> (experimental
     84      support for building KDE Python bindings), and
    8385      <ulink url="https://pypi.python.org/pypi/Sphinx">Sphinx</ulink> (for
    8486         building documentation)

  • kde/kf5/kf5-frameworks.xml

    r3fa3e246 r45b31bb  
    8686    <xref linkend="libepoxy"/>,
    8787    <xref linkend="libgcrypt"/>,
     88    <xref linkend="libical"/>,
    8889    <xref linkend="libjpeg"/>,
    8990    <xref linkend="libpng"/>,
    … …  
    115116  <para role="optional">
    116117    <xref linkend="bluez"/> (needed to build Bluez-Qt),
    117     <xref linkend="ModemManager"/> (needed to build ModemManager-Qt)
     118    <xref linkend="ModemManager"/> (needed to build ModemManager-Qt),
     119    <ulink url="http://libdmtx.sourceforge.net/">Datamatrix</ulink> (deemed
     120      recommended for Prison by upstream)
    118121  </para>
    119122
    … …  
    158161    <ulink url="http://hspell.ivrix.org.il/">Hspell</ulink> and
    159162    <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>
    160   </para>
    161 
    162   <bridgehead renderas="sect4">Recommended dependency for Prison</bridgehead>
    163   <para role="optional">
    164     <!-- Leaving as optional since this is external -->
    165     <ulink url="http://libdmtx.sourceforge.net/">Datamatrix</ulink> and
    166163  </para>
    167164

  • multimedia/libdriv/libmusicbrainz.xml

    r3fa3e246 r45b31bb  
    150150    </para>
    151151
    152 <screen role="root"><userinput>(cd python &amp;&amp; python setup.py install)</userinput></screen>
     152<screen role="root"><userinput>(cd python &amp;&amp; python2 setup.py install)</userinput></screen>
    153153
    154154  </sect2>

  • multimedia/libdriv/mlt.xml

    r3fa3e246 r45b31bb  
    9090      <xref linkend="sdl2"/>,
    9191      <ulink url="http://jackaudio.org">JACK</ulink>,
    92       <ulink url="http://www.ipswitchft.com/moveit/">MOVEit</ulink>,
     92      <ulink url="http://www.ipswitch.com/moveit/">MOVEit</ulink>,
    9393      <ulink url="http://sox.sourceforge.net/">SoX</ulink>,
    9494      <ulink url="https://github.com/mltframework/swfdec">Swfdec</ulink>, and

  • networking/netprogs/wget.xml

    r3fa3e246 r45b31bb  
    99  <!ENTITY wget-download-ftp
    1010           "&gnu-ftp;/wget/wget-&wget-version;.tar.gz">
    11   <!ENTITY wget-md5sum        "db4e6dc7977cbddcd543b240079a4899">
    12   <!ENTITY wget-size          "4.2 MB">
    13   <!ENTITY wget-buildsize     "60 MB (with tests)">
    14   <!ENTITY wget-time          "0.4 SBU (with tests)">
     11  <!ENTITY wget-md5sum        "3852118b7a771a7c9c0388883c8f5dbf">
     12  <!ENTITY wget-size          "4.6 MB">
     13  <!ENTITY wget-buildsize     "70 MB (with tests)">
     14  <!ENTITY wget-time          "0.5 SBU (with tests)">
    1515]>
    1616

  • packages.ent

    r3fa3e246 r45b31bb  
    6868<!ENTITY juffed-version               "0.10.r71.gc3c1a3f">
    6969<!ENTITY nano-version                 "5.4">
    70 <!ENTITY vim-version                  "8.2.2070">
     70<!ENTITY vim-version                  "8.2.2253">
    7171<!ENTITY vim-majmin                   "82">
    7272
    … …  
    363363<!ENTITY python3-lib-suffix           "cpython-&python3-major;&python3-minor;-&lt;arch&gt;-linux-gnu">
    364364
    365 <!ENTITY ruby-minor-version           "2.7">
    366 <!ENTITY ruby-patch-version           "2">
     365<!ENTITY ruby-minor-version           "3.0">
     366<!ENTITY ruby-patch-version           "0">
    367367<!ENTITY ruby-version                 "&ruby-minor-version;.&ruby-patch-version;">
    368368<!ENTITY rust-version                 "1.47.0">
    … …  
    547547<!ENTITY docutils-version             "0.16">
    548548<!ENTITY dbus-python-version          "1.2.16">
    549 <!ENTITY dbusmock-version             "0.20.0">
     549<!ENTITY dbusmock-version             "0.21.0">
    550550<!-- <!ENTITY funcsigs-version             "1.0.2"> -->
    551551<!ENTITY decorator-version            "4.4.2">
    … …  
    590590<!ENTITY rsync-version                "3.2.3">
    591591<!ENTITY samba-version                "4.13.3">
    592 <!ENTITY wget-version                 "1.20.3">
     592<!ENTITY wget-version                 "1.21">
    593593<!ENTITY wireless-tools-version       "29">
    594594<!ENTITY wpa_supplicant-version       "2.9">
    … …  
    693693<!ENTITY xkeyboard-config-version     "2.31">
    694694<!ENTITY mesa-major-minor             "20.3">
    695 <!ENTITY mesa-version                 "&mesa-major-minor;.1">
     695<!ENTITY mesa-version                 "&mesa-major-minor;.2">
    696696<!ENTITY xcb-util-version             "0.4.0">
    697697<!ENTITY xcb-util-image-version       "0.4.0">

  • postlfs/editors/vim.xml

    r3fa3e246 r45b31bb  
    99  <!ENTITY vim-download-http "&sources-anduin-http;/vim/vim-&vim-version;.tar.gz">
    1010  <!ENTITY vim-download-ftp  " ">
    11   <!ENTITY vim-md5sum        "52ecae95a255a4e9221d81e6ad64e6a2">
     11  <!ENTITY vim-md5sum        "497890e1f563a65c6f7594c0b0f5c0b9">
    1212  <!ENTITY vim-size          "15 MB">
    13   <!ENTITY vim-buildsize     "109 MB (add 71 MB for tests)">
     13  <!ENTITY vim-buildsize     "110 MB (add 71 MB for tests)">
    1414  <!ENTITY vim-time          "0.3 SBU (with parallelism=4; add 1.3 SBU for tests)">
    1515]>

  • template/template.xml

    r3fa3e246 r45b31bb  
    384384      <seglistitem>
    385385        <seg>
    386           PROGRAM1, PROGRAM2 and PROGRAM3.
     386          PROGRAM1, PROGRAM2 and PROGRAM3<!-- no period here since it is not
     387          a sentence -->
    387388        </seg>
    388389        <seg>
    389           libLIBRARY1.so, libLIBRARY2.so and libLIBRARY3.so.
     390          libLIBRARY1.so, libLIBRARY2.so and libLIBRARY3.so<!-- no period here
     391          since it is not a sentence -->
    390392        </seg>
    391393        <seg>
    … …  
    393395          /usr/share/TEMPLATE-&TEMPLATE-version;,
    394396          /usr/share/doc/TEMPLATE-&TEMPLATE-version; and
    395           /var/lib/TEMPLATE.
     397          /var/lib/TEMPLATE<!-- no period here
     398          since it is not a sentence -->
    396399        </seg>
    397400      </seglistitem>

  • x/icons/breeze-icons.xml

    r3fa3e246 r45b31bb  
    8282    <bridgehead renderas="sect4">Optional</bridgehead>
    8383    <para role="optional">
    84       <xref linkend="kf5-frameworks"/>
     84      <xref linkend="kf5-frameworks"/>,
     85      <xref linkend="libxml2"/>, and
     86      <xref linkend="lxml"/>
    8587    </para>
    8688

  • x/installing/mesa.xml

    r3fa3e246 r45b31bb  
    77  <!ENTITY mesa-download-http "https://mesa.freedesktop.org/archive/mesa-&mesa-version;.tar.xz">
    88  <!ENTITY mesa-download-ftp  "ftp://ftp.freedesktop.org/pub/mesa/mesa-&mesa-version;.tar.xz">
    9   <!ENTITY mesa-md5sum        "e9242ee9a07a1d932bcf7b28284e2dcf">
     9  <!ENTITY mesa-md5sum        "b378394df26fc6b4d58888f9f1ef1bdb">
    1010  <!ENTITY mesa-size          "14 MB">
    11   <!ENTITY mesa-buildsize     "631 MB (with docs), add 317 MB for tests">
    12   <!ENTITY mesa-time          "2.7 SBU (with parallelism=4 and docs). Add 0.5 SBU for tests">
     11  <!ENTITY mesa-buildsize     "481 MB (with docs), add 317 MB for tests">
     12  <!ENTITY mesa-time          "2.5 SBU (with parallelism=4 and docs). Add 0.5 SBU for tests">
    1313]>
    1414

  • x/lib/gtk+3.xml

    r3fa3e246 r45b31bb  
    7676    <bridgehead renderas="sect4">Required</bridgehead>
    7777    <para role="required">
    78       <xref linkend="at-spi2-atk"/>,
    79       <xref linkend="fribidi"/>,
     78      <xref linkend="at-spi2-atk"/>,
    8079      <xref linkend="gdk-pixbuf"/>,
    8180      <xref linkend="libepoxy"/>, and

  • x/lib/pango.xml

    r3fa3e246 r45b31bb  
    146146
    147147    <para>
    148       <option>-Denable-docs</option>: Use this switch if gtk-doc is
     148      <option>-Dgtk_doc</option>: Use this switch if gtk-doc is
    149149      installed and you wish to rebuild and install the API documentation.
    150150    </para>
    151151
    152152    <para>
    153       <option>-Dgir=false</option>: Use this switch if you do not want to
    154       use <xref linkend="gobject-introspection"/>.
     153      <option>-Dintrospection=false</option>: Use this switch if you do not
     154      want to use <xref linkend="gobject-introspection"/>.
    155155    </para>
    156156

  • xfce/apps/parole.xml

    r3fa3e246 r45b31bb  
    66
    77  <!ENTITY parole-download-http
    8            "http://archive.xfce.org/src/apps/parole/1.0/parole-&parole-version;.tar.bz2">
     8           "http://archive.xfce.org/src/apps/parole/4.15/parole-&parole-version;.tar.bz2">
    99  <!ENTITY parole-download-ftp  " ">
    1010  <!ENTITY parole-md5sum        "baf86d34ff5f88d83343bf7118f06702">
Note: See TracChangeset for help on using the changeset viewer.