Author: bdubbs
Date: Sat Jul 1 20:51:17 2017
New Revision: 18908
Log:
Update to Qt and QtWebEngine-5.9.1
Modified:
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/packages.ent
trunk/BOOK/x/lib/qt5.xml
trunk/BOOK/x/lib/qtwebengine.xml
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Sat Jul 1 08:26:17
2017 (r18907)
+++ trunk/BOOK/introduction/welcome/changelog.xml Sat Jul 1 20:51:17
2017 (r18908)
@@ -46,6 +46,10 @@
<para>July 1st, 2017</para>
<itemizedlist>
<listitem>
+ <para>[bdubbs] - Update to Qt and QtWebEngine-5.9.1. Fixes
+ <ulink url="&blfs-ticket-root;9432">#9432</ulink>.</para>
+ </listitem>
+ <listitem>
<para>[pierre] - Update <quote>innodb_xxx</quote> variables to
their current default values in MariaDB configuration file,
and remove an obsolete variable. Report by J. Burrell and
Modified: trunk/BOOK/packages.ent
==============================================================================
--- trunk/BOOK/packages.ent Sat Jul 1 08:26:17 2017 (r18907)
+++ trunk/BOOK/packages.ent Sat Jul 1 20:51:17 2017 (r18908)
@@ -559,8 +559,8 @@
<!ENTITY libxklavier-version "5.4">
<!ENTITY pango-version "1.40.6">
<!ENTITY pangomm-version "2.40.1">
-<!ENTITY qt5-version "5.9.0">
-<!ENTITY qtwebengine-version "5.9.0">
+<!ENTITY qt5-version "5.9.1">
+<!ENTITY qtwebengine-version "5.9.1">
<!ENTITY qtwebkit-version "5.9.0">
<!ENTITY shared-mime-info-version "1.8">
<!ENTITY startup-notification-version "0.12">
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Sat Jul 1 08:26:17 2017 (r18907)
+++ trunk/BOOK/x/lib/qt5.xml Sat Jul 1 20:51:17 2017 (r18908)
@@ -9,10 +9,10 @@
<!ENTITY qt5-download-http
"&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
<!ENTITY qt5-download-ftp " ">
- <!ENTITY qt5-md5sum "9c8bc8b828c2b56721980368266df9d9">
- <!ENTITY qt5-size "439 MB">
- <!ENTITY qt5-buildsize "8.9 GB (214 MB installed)">
- <!ENTITY qt5-time "29 SBU (using parallelism=4)">
+ <!ENTITY qt5-md5sum "77b4af61c49a09833d4df824c806acaf">
+ <!ENTITY qt5-size "440 MB">
+ <!ENTITY qt5-buildsize "8.8 GB (214 MB installed)">
+ <!ENTITY qt5-time "26 SBU (using parallelism=4)">
]>
<sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@@ -240,6 +240,10 @@
qtbase/src/network/network.pro &&
export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' &&
+sed -e "/qsql_mysql_p.h/ a #include <mysql/mysql_version.h>" \
+ -i qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp &&
+
+
./configure -prefix $QT5PREFIX \
-sysconfdir /etc/xdg \
-confirm-license \
@@ -263,27 +267,12 @@
<screen role="root"><userinput>make install</userinput></screen>
-<!-- Not needed any more
- <para>
- Remove references to the build directory from the installed
- <filename class="extension">.pc</filename> files by running
- the following command as the
- <systemitem class="username">root</systemitem> user:
- </para>
-
-<screen role="root"><userinput>find $QT5PREFIX/lib/pkgconfig -name "*.pc"
-exec perl -pi -e "s, -L$PWD/?\S+,,g" {} \;</userinput></screen>
--->
<para>
Remove references to the build directory from installed library
dependency (prl) <!--and profile include (pri)--> files by running the
following
command as the <systemitem class="username">root</systemitem> user:
</para>
-<!-- Not needed any more
-find $QT5PREFIX/ -name qt_lib_bootstrap_private.pri \
- -exec sed -i -e "s:$PWD/qtbase:/$QT5PREFIX/lib/:g" {} \; &&
--->
-
<screen role="root"><userinput>find $QT5PREFIX/ -name \*.prl \
-exec sed -i -e '/^QMAKE_PRL_BUILD_DIR/d' {} \;</userinput></screen>
@@ -384,6 +373,13 @@
<title>Command Explanations</title>
<para>
+ <command>sed ... qsql_mysql.cpp </command>: The
+ <command>configure</command> now searches for mysql/mariadb and sets up
+ Qt to use it if found. This command compensates for a change in the
+ mariadb-10.2 include files.
+ </para>
+
+ <para>
<parameter>-confirm-license</parameter>: Accept license
without prompting user during configuration.
</para>
@@ -392,11 +388,6 @@
<parameter>-opensource</parameter>: Install the opensource
version of <application>Qt</application>.
</para>
-<!-- default as of QT-5.7:
- <para>
- <parameter>-release</parameter>: This switch disables
- building with debugging symbols.
- </para>-->
<para>
<parameter>-nomake examples</parameter>: This switch
@@ -409,12 +400,6 @@
<parameter>-system-sqlite</parameter>: This switch enables use
of the system version of <application>SQLite</application>.
</para>
-<!-- Tested during configure, and not built if not found:
- <para>
- <parameter>-no-nis</parameter>: This switch disables support
- for Network Information Service (NIS) which has been
- removed from recent versions of <application>Glibc</application>.
- </para>-->
<para>
<parameter>-dbus-linked -openssl-linked</parameter>: These
Modified: trunk/BOOK/x/lib/qtwebengine.xml
==============================================================================
--- trunk/BOOK/x/lib/qtwebengine.xml Sat Jul 1 08:26:17 2017 (r18907)
+++ trunk/BOOK/x/lib/qtwebengine.xml Sat Jul 1 20:51:17 2017 (r18908)
@@ -7,10 +7,10 @@
<!ENTITY qtwebengine-major "5.9">
<!ENTITY qtwebengine-download-http
"https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-opensource-src-&qtwebengine-version;.tar.xz";>
<!ENTITY qtwebengine-download-ftp " ">
- <!ENTITY qtwebengine-md5sum "d7ca5049baf5ff69d69ee58d5da392d4">
+ <!ENTITY qtwebengine-md5sum "d4ad2f5df86c8483c06b3fe14c30136a">
<!ENTITY qtwebengine-size "208 MB">
- <!ENTITY qtwebengine-buildsize "3.2 GB (153 MB installed)">
- <!ENTITY qtwebengine-time "43 SBU (on a 4 core processor)">
+ <!ENTITY qtwebengine-buildsize "3.2 GB (141 MB installed)">
+ <!ENTITY qtwebengine-time "35 SBU (on a 12 core processor,
estimated 45 SBU with 4 cores)">
<!-- Both qmake and ninja will use all available cores, in fact ninja runs n+2
jobs at a time. Most of our readers do not have more than 4 cores.
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
