Changeset 21552cf


Ignore:
Timestamp:
05/27/2020 05:08:18 PM (4 years ago)
Author:
Douglas R. Reno <renodr@…>
Branches:
10.0, 10.1, 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:
f4327ad9
Parents:
ae44cab
Message:

Update to Qt and QtWebEngine 5.15.0
Adapt Falkon to build with Qt5-5.15.0
OpenSSH tests: Remove some text that was invalid, which I entered in my last build

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23206 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • introduction/welcome/changelog.xml

    rae44cab r21552cf  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[renodr] - Adapt Falkon to build with Qt-5.15.</para>
     49        </listitem>
     50        <listitem>
     51          <para>[renodr] - Update to Qt and QtWebEngine-5.15.0. Fixes
     52          <ulink url="&blfs-ticket-root;13575">#13575</ulink>.</para>
     53        </listitem>
     54        <listitem>
    4855          <para>[pierre] - Update to vim-8.2.0814 to sync with lfs.</para>
    4956        </listitem>

  • packages.ent

    rae44cab r21552cf  
    742742<!ENTITY pango-version                "1.44.7">
    743743<!ENTITY pangomm-version              "2.42.1">
    744 <!ENTITY qt5-version                  "5.14.2">
    745 <!ENTITY qtwebengine-version          "5.14.2">
     744<!ENTITY qt5-version                  "5.15.0">
     745<!ENTITY qtwebengine-version          "5.15.0">
    746746<!ENTITY qtwebkit-version             "5.9.0">
    747747<!ENTITY qscintilla-version           "2.10.4">

  • postlfs/security/openssh.xml

    rae44cab r21552cf  
    166166    <para>
    167167      To test the results, issue: <command>make tests</command>.
    168       One test, <filename>key options</filename>, fails when run in chroot.
     168      <!--One test, <filename>key options</filename>, fails when run in chroot.-->
    169169    </para>
    170170

  • x/lib/qt5.xml

    rae44cab r21552cf  
    55  %general-entities;
    66
    7   <!ENTITY qt5-major "5.14">
     7  <!ENTITY qt5-major "5.15">
    88  <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
    99
    1010  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
    1111  <!ENTITY qt5-download-ftp  " ">
    12   <!ENTITY qt5-md5sum        "b3d2b6d00e6ca8a8ede6d1c9bdc74daf">
    13   <!ENTITY qt5-size          "524 MB">
    14   <!ENTITY qt5-buildsize     "15 GB (264 MB installed)">
    15   <!ENTITY qt5-time          "51 SBU (using parallelism=4)">
     12  <!ENTITY qt5-md5sum        "610a228dba6ef469d14d145b71ab3b88">
     13  <!ENTITY qt5-size          "565 MB">
     14  <!ENTITY qt5-buildsize     "14 GB (266 MB installed)">
     15  <!ENTITY qt5-time          "27 SBU (using parallelism=4)">
    1616]>
    1717
    … …  
    7979    </itemizedlist>
    8080
     81<!-- Applied upstream in 5.15.0
    8182   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    8283    <itemizedlist spacing='compact'>
    … …  
    8889      </listitem>
    8990    </itemizedlist>
     91 -->
    9092
    9193    <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
    … …  
    113115      <xref linkend="libxkbcommon"/>,
    114116      <xref linkend="mesa"/>,
     117      <xref linkend="mitkrb"/>,
    115118      <xref linkend="mtdev"/>,
    116119      <xref linkend="pcre2"/>,
    … …  
    139142      <xref linkend="sdl2"/>,
    140143      <xref linkend="unixodbc"/>,
    141       <ulink url="http://www.firebirdsql.org/">Firebird</ulink>, and
    142       <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>
    143     </para>
    144 
     144      <ulink url="https://www.assimp.org/">assimp</ulink>,
     145      <ulink url="http://www.festvox.org/flite/">Flite</ulink>,
     146      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
     147      <ulink url="http://www.freetds.org/">FreeTDS</ulink>,
     148      <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>,
     149      <ulink url="https://openal.org/">OpenAL</ulink>,
     150      <ulink url="https://freebsoft.org/speechd/">speech-dispatcher</ulink>,
     151      <ulink url="http:///www.tslib.org/">tslib</ulink>, and
     152      <ulink url="https://vulkan.lunarg.org/sdk/home/">Vulkan</ulink>
     153    </para>
     154
     155    <!-- Many of the dependencies in the qmake/configure output do not apply
     156         to Linux-based platforms. I've selected the ones that do and put
     157         them in as optional dependencies. -renodr -->
    145158    <para condition="html" role="usernotes">
    146159       User Notes: <ulink url="&blfs-wiki;/qt5"/>
    … …  
    245258            -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
    246259    </note>
    247 
     260<!-- Applied upstream in 5.15.0
    248261    <para>
    249262      First fix an issues using gcc-10:
    … …  
    251264
    252265<screen><userinput>patch -Np1 -i ../qt-everywhere-src-&qt5-version;-gcc10-1.patch</userinput></screen>
     266-->
    253267
    254268    <para>
    … …  
    539553          qdbusviewer, qdbusxml2cpp, qdistancefieldgenerator, qdoc, qgltf,
    540554          qhelpgenerator, qlalr, qmake, qml, qmlcachegen,
    541           qmleasing, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
     555          qmleasing, qmlformat, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
    542556          qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qscxmlc,
    543557          qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
    … …  
    967981      </varlistentry>
    968982
     983      <varlistentry id="qmlformat-qt5">
     984        <term><command>qmlformat</command></term>
     985        <listitem>
     986          <para>
     987            formats QML files according to the QML coding conventions.
     988          </para>
     989          <indexterm zone="qt5 qmlformat-qt5">
     990            <primary sortas="b-qmlformat-qt5">qmlformat</primary>
     991          </indexterm>
     992        </listitem>
     993      </varlistentry>
     994
    969995      <varlistentry id="qmlimportscanner-qt5">
    970996        <term><command>qmlimportscanner</command></term>

  • x/lib/qtwebengine.xml

    rae44cab r21552cf  
    55  %general-entities;
    66
    7   <!ENTITY qtwebengine-major "5.14">
     7  <!ENTITY qtwebengine-major "5.15">
    88  <!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
    99  <!ENTITY qtwebengine-download-ftp  " ">
    10   <!ENTITY qtwebengine-md5sum        "48f85fa5875bee56931b3be8b64a6712">
    11   <!ENTITY qtwebengine-size          "232 MB">
    12   <!ENTITY qtwebengine-buildsize     "3.6 GB (146 MB installed)">
    13   <!ENTITY qtwebengine-time          "68 SBU (using 4 cores)">
     10  <!ENTITY qtwebengine-md5sum        "738478b9409f8615ca0f63738b73bbae">
     11  <!ENTITY qtwebengine-size          "265 MB">
     12  <!ENTITY qtwebengine-buildsize     "4.3 GB (146 MB installed)">
     13  <!ENTITY qtwebengine-time          "74 SBU (using 4 cores)">
    1414]>
    1515
    … …  
    101101        <para>
    102102          Required patch:
    103           <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-consolidated-1.patch"/>
     103          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-1.patch"/>
    104104        </para>
    105105      </listitem>
    … …  
    162162
    163163    <para>
    164       Next, apply a patch that fixes issues when using gcc-10 and enable using
     164      Next, apply a patch that fixes issues when using gcc-10 and enables using
    165165      system ICU version 67.1 or greater.
    166166    </para>
    167167
    168 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-everywhere-src-&qtwebengine-version;-consolidated-1.patch</userinput></screen>
     168<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-1.patch</userinput></screen>
    169169
    170170    <para>
    … …  
    343343        </seg>
    344344        <seg>
     345          libQt5Pdf.so,
     346          libQt5PdfWidgets.so,
    345347          libQt5WebEngineCore.so,
    346348          libQt5WebEngine.so, and
    … …  
    348350        </seg>
    349351        <seg>
     352          $QT5DIR/include/QtPdf,
     353          $QT5DIR/include/QtPdfWidgets,
    350354          $QT5DIR/include/QtWebEngine,
    351355          $QT5DIR/include/QtWebEngineCore,

  • xsoft/graphweb/falkon.xml

    rae44cab r21552cf  
    130130
    131131<screen><userinput>sed -i '/#include &lt;QSettings&gt;/a#include &lt;QFile&gt;' \
    132   src/plugins/VerticalTabs/verticaltabsplugin.cpp</userinput></screen>
     132   src/plugins/VerticalTabs/verticaltabsplugin.cpp</userinput></screen>
     133   
     134    <para>
     135      Fix a build problem introduced in Qt-5.15:
     136    </para>
     137<screen><userinput remap="pre">sed -i '/#include &lt;QPainter&gt;/a #include &lt;QPainterPath&gt;' \
     138   src/lib/tools/qztools.cpp</userinput></screen>
    133139
    134140    <para>
Note: See TracChangeset for help on using the changeset viewer.