Changeset eb056a19 for x

Timestamp:

02/09/2019 09:01:55 PM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

7ae2bfb

Parents:

637bb9ed

Message:

Merge to HEAD 21112.

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

Location:

x/lib

Files:

• qt5.xml (modified) (4 diffs)
• qtwebengine.xml (modified) (1 diff)
• webkitgtk.xml (modified) (1 diff)

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

x/lib/webkitgtk.xml

@@ -7 +7 @@
   <!ENTITY webkitgtk-download-http "https://webkitgtk.org/releases/webkitgtk-&webkitgtk-version;.tar.xz">
   <!ENTITY webkitgtk-download-ftp  " ">
-  <!ENTITY webkitgtk-md5sum        "96a731522b800f38e70f85c22f8de477">
+  <!ENTITY webkitgtk-md5sum        "7c21a30f7f078f0b712caf0c7ee966a4">
   <!ENTITY webkitgtk-size          "16 MB">
   <!ENTITY webkitgtk-buildsize     "789 MB (128 MB installed)">
-  <!ENTITY webkitgtk-time          "20 SBU (using parallelism=4, 65 SBUs using one core)">
+  <!ENTITY webkitgtk-time          "25 SBU (using parallelism=4, 65 SBUs using one core)">
 ]>