Author: renodr
Date: Wed May 27 10:08:18 2020
New Revision: 23206
Log:
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
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
trunk/BOOK/postlfs/security/openssh.xml
trunk/BOOK/x/lib/qt5.xml
trunk/BOOK/x/lib/qtwebengine.xml
trunk/BOOK/xsoft/graphweb/falkon.xml
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Wed May 27 09:55:01
2020 (r23205)
+++ trunk/BOOK/introduction/welcome/changelog.xml Wed May 27 10:08:18
2020 (r23206)
@@ -45,6 +45,13 @@
<para>May 27th, 2020</para>
<itemizedlist>
<listitem>
+ <para>[renodr] - Adapt Falkon to build with Qt-5.15.</para>
+ </listitem>
+ <listitem>
+ <para>[renodr] - Update to Qt and QtWebEngine-5.15.0. Fixes
+ <ulink url="&blfs-ticket-root;13575">#13575</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[pierre] - Update to vim-8.2.0814 to sync with lfs.</para>
</listitem>
</itemizedlist>
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Wed May 27 09:55:01 2020 (r23205)
+++ trunk/BOOK/packages.ent Wed May 27 10:08:18 2020 (r23206)
@@ -741,8 +741,8 @@
<!ENTITY libxklavier-version "5.4">
<!ENTITY pango-version "1.44.7">
<!ENTITY pangomm-version "2.42.1">
-<!ENTITY qt5-version "5.14.2">
-<!ENTITY qtwebengine-version "5.14.2">
+<!ENTITY qt5-version "5.15.0">
+<!ENTITY qtwebengine-version "5.15.0">
<!ENTITY qtwebkit-version "5.9.0">
<!ENTITY qscintilla-version "2.10.4">
<!ENTITY shared-mime-info-version "2.0">
Modified: trunk/BOOK/postlfs/security/openssh.xml
==============================================================================
--- trunk/BOOK/postlfs/security/openssh.xml Wed May 27 09:55:01 2020
(r23205)
+++ trunk/BOOK/postlfs/security/openssh.xml Wed May 27 10:08:18 2020
(r23206)
@@ -165,7 +165,7 @@
<para>
To test the results, issue: <command>make tests</command>.
- One test, <filename>key options</filename>, fails when run in chroot.
+ <!--One test, <filename>key options</filename>, fails when run in
chroot.-->
</para>
<!-- commenting this, I get "all tests passed" [ ken ]
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Wed May 27 09:55:01 2020 (r23205)
+++ trunk/BOOK/x/lib/qt5.xml Wed May 27 10:08:18 2020 (r23206)
@@ -4,15 +4,15 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY qt5-major "5.14">
+ <!ENTITY qt5-major "5.15">
<!ENTITY qt5-url
"https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single";>
<!ENTITY qt5-download-http
"&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
<!ENTITY qt5-download-ftp " ">
- <!ENTITY qt5-md5sum "b3d2b6d00e6ca8a8ede6d1c9bdc74daf">
- <!ENTITY qt5-size "524 MB">
- <!ENTITY qt5-buildsize "15 GB (264 MB installed)">
- <!ENTITY qt5-time "51 SBU (using parallelism=4)">
+ <!ENTITY qt5-md5sum "610a228dba6ef469d14d145b71ab3b88">
+ <!ENTITY qt5-size "565 MB">
+ <!ENTITY qt5-buildsize "14 GB (266 MB installed)">
+ <!ENTITY qt5-time "27 SBU (using parallelism=4)">
]>
<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@@ -78,6 +78,7 @@
</listitem>
</itemizedlist>
+<!-- Applied upstream in 5.15.0
<bridgehead renderas="sect3">Additional Downloads</bridgehead>
<itemizedlist spacing='compact'>
<listitem>
@@ -87,6 +88,7 @@
</para>
</listitem>
</itemizedlist>
+ -->
<bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
@@ -112,6 +114,7 @@
<xref linkend="libwebp"/>,
<xref linkend="libxkbcommon"/>,
<xref linkend="mesa"/>,
+ <xref linkend="mitkrb"/>,
<xref linkend="mtdev"/>,
<xref linkend="pcre2"/>,
<xref linkend="sqlite"/>,
@@ -138,10 +141,20 @@
<xref linkend="pulseaudio"/>,
<xref linkend="sdl2"/>,
<xref linkend="unixodbc"/>,
- <ulink url="http://www.firebirdsql.org/";>Firebird</ulink>, and
- <ulink url="https://libproxy.github.io/libproxy/";>libproxy</ulink>
+ <ulink url="https://www.assimp.org/";>assimp</ulink>,
+ <ulink url="http://www.festvox.org/flite/";>Flite</ulink>,
+ <ulink url="http://www.firebirdsql.org/";>Firebird</ulink>,
+ <ulink url="http://www.freetds.org/";>FreeTDS</ulink>,
+ <ulink url="https://libproxy.github.io/libproxy/";>libproxy</ulink>,
+ <ulink url="https://openal.org/";>OpenAL</ulink>,
+ <ulink url="https://freebsoft.org/speechd/";>speech-dispatcher</ulink>,
+ <ulink url="http:///www.tslib.org/";>tslib</ulink>, and
+ <ulink url="https://vulkan.lunarg.org/sdk/home/";>Vulkan</ulink>
</para>
+ <!-- Many of the dependencies in the qmake/configure output do not apply
+ to Linux-based platforms. I've selected the ones that do and put
+ them in as optional dependencies. -renodr -->
<para condition="html" role="usernotes">
User Notes: <ulink url="&blfs-wiki;/qt5"/>
</para>
@@ -244,12 +257,13 @@
-translationdir /usr/share/qt5/translations \
-examplesdir /usr/share/doc/qt5/examples</userinput></screen>
</note>
-
+<!-- Applied upstream in 5.15.0
<para>
First fix an issues using gcc-10:
</para>
<screen><userinput>patch -Np1 -i
../qt-everywhere-src-&qt5-version;-gcc10-1.patch</userinput></screen>
+-->
<para>
Install <application>Qt5</application> by running the following commands:
@@ -538,7 +552,7 @@
meshdebug, moc, pixeltool, qcollectiongenerator, qdbus, qdbuscpp2xml,
qdbusviewer, qdbusxml2cpp, qdistancefieldgenerator, qdoc, qgltf,
qhelpgenerator, qlalr, qmake, qml, qmlcachegen,
- qmleasing, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
+ qmleasing, qmlformat, qmlimportscanner, qmllint, qmlmin,
qmlplugindump,
qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qscxmlc,
qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
qtwaylandscanner, qvkgen, rcc, repc, sdpscanner, syncqt.pl, tracegen,
@@ -965,6 +979,18 @@
</indexterm>
</listitem>
</varlistentry>
+
+ <varlistentry id="qmlformat-qt5">
+ <term><command>qmlformat</command></term>
+ <listitem>
+ <para>
+ formats QML files according to the QML coding conventions.
+ </para>
+ <indexterm zone="qt5 qmlformat-qt5">
+ <primary sortas="b-qmlformat-qt5">qmlformat</primary>
+ </indexterm>
+ </listitem>
+ </varlistentry>
<varlistentry id="qmlimportscanner-qt5">
<term><command>qmlimportscanner</command></term>
Modified: trunk/BOOK/x/lib/qtwebengine.xml
==============================================================================
--- trunk/BOOK/x/lib/qtwebengine.xml Wed May 27 09:55:01 2020 (r23205)
+++ trunk/BOOK/x/lib/qtwebengine.xml Wed May 27 10:08:18 2020 (r23206)
@@ -4,13 +4,13 @@
<!ENTITY % general-entities SYSTEM "../../general.ent">
%general-entities;
- <!ENTITY qtwebengine-major "5.14">
+ <!ENTITY qtwebengine-major "5.15">
<!ENTITY qtwebengine-download-http
"https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz";>
<!ENTITY qtwebengine-download-ftp " ">
- <!ENTITY qtwebengine-md5sum "48f85fa5875bee56931b3be8b64a6712">
- <!ENTITY qtwebengine-size "232 MB">
- <!ENTITY qtwebengine-buildsize "3.6 GB (146 MB installed)">
- <!ENTITY qtwebengine-time "68 SBU (using 4 cores)">
+ <!ENTITY qtwebengine-md5sum "738478b9409f8615ca0f63738b73bbae">
+ <!ENTITY qtwebengine-size "265 MB">
+ <!ENTITY qtwebengine-buildsize "4.3 GB (146 MB installed)">
+ <!ENTITY qtwebengine-time "74 SBU (using 4 cores)">
]>
<sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
@@ -100,7 +100,7 @@
<listitem>
<para>
Required patch:
- <ulink
url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-consolidated-1.patch"/>
+ <ulink
url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-1.patch"/>
</para>
</listitem>
</itemizedlist>
@@ -161,11 +161,11 @@
xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include
|'</userinput></screen>
<para>
- Next, apply a patch that fixes issues when using gcc-10 and enable using
+ Next, apply a patch that fixes issues when using gcc-10 and enables using
system ICU version 67.1 or greater.
</para>
-<screen><userinput remap="pre">patch -Np1 -i
../qtwebengine-everywhere-src-&qtwebengine-version;-consolidated-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i
../qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-1.patch</userinput></screen>
<para>
Next, allow the pulseaudio library to be linked at build time, instead
@@ -342,11 +342,15 @@
QtWebEngineProcess (in $QT5DIR/libexec)
</seg>
<seg>
+ libQt5Pdf.so,
+ libQt5PdfWidgets.so,
libQt5WebEngineCore.so,
libQt5WebEngine.so, and
libQt5WebEngineWidgets.so
</seg>
<seg>
+ $QT5DIR/include/QtPdf,
+ $QT5DIR/include/QtPdfWidgets,
$QT5DIR/include/QtWebEngine,
$QT5DIR/include/QtWebEngineCore,
$QT5DIR/include/QtWebEngineWidgets,
Modified: trunk/BOOK/xsoft/graphweb/falkon.xml
==============================================================================
--- trunk/BOOK/xsoft/graphweb/falkon.xml Wed May 27 09:55:01 2020
(r23205)
+++ trunk/BOOK/xsoft/graphweb/falkon.xml Wed May 27 10:08:18 2020
(r23206)
@@ -129,7 +129,13 @@
</para>
<screen><userinput>sed -i '/#include <QSettings>/a#include
<QFile>' \
- src/plugins/VerticalTabs/verticaltabsplugin.cpp</userinput></screen>
+ src/plugins/VerticalTabs/verticaltabsplugin.cpp</userinput></screen>
+
+ <para>
+ Fix a build problem introduced in Qt-5.15:
+ </para>
+<screen><userinput remap="pre">sed -i '/#include <QPainter>/a #include
<QPainterPath>' \
+ src/lib/tools/qztools.cpp</userinput></screen>
<para>
Now build the program:
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
