Changeset 0fccf51d

Timestamp:

02/08/2019 08:52:54 AM (5 years ago)

Author:

Pierre Labastie <pieere@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.4, 9.0, 9.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:

f8594669

Parents:

cee65a2

Message:

Make Qt5 P3 only

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qt5.xml (modified) (4 diffs)
• x/lib/qtwebengine.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "07">                   <!-- Always 2 digits -->
+<!ENTITY day          "08">                   <!-- Always 2 digits -->
 <!ENTITY month        "02">                   <!-- Always 2 digits -->
 <!ENTITY year         "2019">
@@ -7 +7 @@
 <!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 #] -->

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
     -->
+
+    <listitem>
+      <para>February 8th, 2019</para>
+      <itemizedlist>
+        <listitem>
+          <para>[pierre] - Allow using Python 3 to build Qt5.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
 
     <listitem>

x/lib/qt5.xml

@@ -131 +131 @@
       <xref linkend="pciutils"/> (required for QtWebEngine),
       <xref linkend="postgresql"/>,
+      <xref linkend="python2"/> (required for QtWebEngine),
       <xref linkend="pulseaudio"/>,
       <xref linkend="unixodbc"/>, and
@@ -200 +201 @@
       </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>
@@ -239 +232 @@
     </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&gt;/a#include &lt;mysql/mysql_version.h&gt;' \
-    -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                           &amp;&amp;
+<screen><userinput>find . -name "*.pr[io]" | xargs sed -i 's/python/&amp;3/' &amp;&amp;
+./configure -prefix $QT5PREFIX                        \
+            -sysconfdir /etc/xdg                      \
+            -confirm-license                          \
+            -opensource                               \
+            -dbus-linked                              \
+            -openssl-linked                           \
+            -system-harfbuzz                          \
+            -system-sqlite                            \
+            -nomake examples                          \
+            -no-rpath                                 \
+            -skip qtwebengine                         &amp;&amp;
 make</userinput></screen>
 
@@ -382 +364 @@
   <sect2 role="commands">
     <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>

x/lib/qtwebengine.xml

@@ -232 +232 @@
     <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