Author: pierre
Date: Fri Feb 8 00:52:54 2019
New Revision: 21106
Log:
Make Qt5 P3 only
Modified:
trunk/BOOK/general.ent
trunk/BOOK/introduction/welcome/changelog.xml
trunk/BOOK/x/lib/qt5.xml
trunk/BOOK/x/lib/qtwebengine.xml
Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent Thu Feb 7 20:20:46 2019 (r21105)
+++ trunk/BOOK/general.ent Fri Feb 8 00:52:54 2019 (r21106)
@@ -1,12 +1,12 @@
<!-- $LastChangedBy$ $Date$ -->
-<!ENTITY day "07"> <!-- Always 2 digits -->
+<!ENTITY day "08"> <!-- Always 2 digits -->
<!ENTITY month "02"> <!-- Always 2 digits -->
<!ENTITY year "2019">
<!ENTITY copyrightdate "2001-&year;">
<!ENTITY copyholder "The BLFS Development Team">
<!ENTITY version "&year;-&month;-&day;">
-<!ENTITY releasedate "February 7th, &year;">
+<!ENTITY releasedate "February 8th, &year;">
<!ENTITY pubdate "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
<!ENTITY blfs-version "svn"> <!-- svn|[release #] -->
<!ENTITY lfs-version "development"> <!-- x.y|development -->
Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml Thu Feb 7 20:20:46
2019 (r21105)
+++ trunk/BOOK/introduction/welcome/changelog.xml Fri Feb 8 00:52:54
2019 (r21106)
@@ -43,6 +43,15 @@
-->
<listitem>
+ <para>February 8th, 2019</para>
+ <itemizedlist>
+ <listitem>
+ <para>[pierre] - Allow using Python 3 to build Qt5.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>February 7th, 2019</para>
<itemizedlist>
<listitem revision="systemd">
Modified: trunk/BOOK/x/lib/qt5.xml
==============================================================================
--- trunk/BOOK/x/lib/qt5.xml Thu Feb 7 20:20:46 2019 (r21105)
+++ trunk/BOOK/x/lib/qt5.xml Fri Feb 8 00:52:54 2019 (r21106)
@@ -130,6 +130,7 @@
<xref linkend="mariadb"/> or <ulink
url="http://www.mysql.com/";>MySQL</ulink>,
<xref linkend="pciutils"/> (required for QtWebEngine),
<xref linkend="postgresql"/>,
+ <xref linkend="python2"/> (required for QtWebEngine),
<xref linkend="pulseaudio"/>,
<xref linkend="unixodbc"/>, and
<ulink url="http://www.firebirdsql.org/";>Firebird</ulink>
@@ -199,15 +200,7 @@
them or use internal versions bundled in the source tarball.
</para>
</caution>
-<!--
- <para>
- If your system is using glibc-2.28, apply the patch to exclude certain
- system headers and to avoid redefining two functions which are now in
- glibc :
- </para>
-<screen><userinput>patch -Np1 -i
../qt-&qt5-version;-glibc228-1.patch</userinput></screen>
--->
<note>
<para>
The build time and space required for the full
@@ -238,33 +231,22 @@
-examplesdir /usr/share/doc/qt5/examples</userinput></screen>
</note>
-<!-- Not needed with mariadb-10.2.8, but a symlink for mysql_version.h
- on the mariadb page, is needed.
-
- <para>
- If you have <xref linkend="mariadb"/> installed, fix a build issue with
- with <application>MySQL</application> compatibility:
- </para>
-
-<screen><userinput>sed '/qsqlresult_p.h>/a#include
<mysql/mysql_version.h>' \
- -i qtbase/src/plugins/sqldrivers/mysql/qsql_mysql.cpp</userinput></screen>
--->
-
<para>
Install <application>Qt5</application> by running the following commands:
</para>
-<screen><userinput>./configure -prefix $QT5PREFIX \
- -sysconfdir /etc/xdg \
- -confirm-license \
- -opensource \
- -dbus-linked \
- -openssl-linked \
- -system-harfbuzz \
- -system-sqlite \
- -nomake examples \
- -no-rpath \
- -skip qtwebengine &&
+<screen><userinput>find . -name "*.pr[io]" | xargs sed -i 's/python/&3/'
&&
+./configure -prefix $QT5PREFIX \
+ -sysconfdir /etc/xdg \
+ -confirm-license \
+ -opensource \
+ -dbus-linked \
+ -openssl-linked \
+ -system-harfbuzz \
+ -system-sqlite \
+ -nomake examples \
+ -no-rpath \
+ -skip qtwebengine &&
make</userinput></screen>
<para>
@@ -383,6 +365,14 @@
<title>Command Explanations</title>
<para>
+ <command>find ... | xargs sed ...</command>: Allows using
+ <application>Python 3</application> instead of <application>Python
+ 2</application>. This command destroys the build for QtWebEngine, so do
+ not use it if you remove the <parameter>-skip qtwebengine</parameter>
+ switch.
+ </para>
+
+ <para>
<parameter>-confirm-license</parameter>: Accept license
without prompting user during configuration.
</para>
Modified: trunk/BOOK/x/lib/qtwebengine.xml
==============================================================================
--- trunk/BOOK/x/lib/qtwebengine.xml Thu Feb 7 20:20:46 2019 (r21105)
+++ trunk/BOOK/x/lib/qtwebengine.xml Fri Feb 8 00:52:54 2019 (r21106)
@@ -231,7 +231,7 @@
<para>
<command>-- -system-ffmpeg -webengine-icu</command>: If any options are
- passed to qmake ithey must come after '--' which must follow '..' that
points
+ passed to qmake they must come after '--' which must follow '..' that
points
to the main directory. The options here cause it to use system ffmpeg and
system icu. If built as part of full Qt5, the system icu is
automatically
used (only) by Qt5Core if it is available, but unless this option is used
--
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page
