Changeset d60cd837 for x/lib/qtwebengine.xml

Timestamp:

02/03/2019 06:37:53 PM (5 years ago)

Author:

DJ Lucas <dj@…>

Branches:

elogind

Children:

4d176c4f

Parents:

8f6f10e

Message:

Merge to HEAD 21080.

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

File:

• x/lib/qtwebengine.xml (modified) (5 diffs)

x/lib/qtwebengine.xml

@@ -8 +8 @@
   <!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        "53d74f6ed0c188ee106381d9cba99e94">
-  <!ENTITY qtwebengine-size          "241 MB">
+  <!ENTITY qtwebengine-md5sum        "516c70f4f5ef8f4d0462425735f4ff47">
+  <!ENTITY qtwebengine-size          "238 MB">
   <!ENTITY qtwebengine-buildsize     "3.3 GB (134 MB installed)">
-  <!ENTITY qtwebengine-time          "36 SBU (using 4 cores)">
+  <!ENTITY qtwebengine-time          "60 SBU (using 4 cores)">
 ]>
 
@@ -55 +55 @@
         although the installed libraries correctly use the shared version. If
         that static library is not present, the build will fail quite quickly.
-        Please note that if you try to build webengine as part of <xref
-        linkend="qt5"/> and the static library is not available, that build will
-        either complete without installing webengine, or else fail during the
-        install (both variants have been observed).
+        Please note that if you try to build webengine as part of
+        <application>Qt</application> and the static library is not available,
+        that build will either complete without installing webengine, or else fail
+        during the install (both variants have been observed in 5.12.0).
       </para>
     </note>
@@ -92 +92 @@
         <para>
           Estimated build time: &qtwebengine-time;
+        </para>
+      </listitem>
+    </itemizedlist>
+
+    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+    <itemizedlist spacing="compact">
+      <listitem>
+        <para>
+          Required patch (if building on i686):
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-i686_alignof_fix-1.patch"/>
         </para>
       </listitem>
@@ -164 +174 @@
 <screen role="root"><userinput>mv -v ${QT5DIR}/lib/libQtWebEngineCore.so{,.old}</userinput></screen>
 
+    <para>
+      If you are building on a 32-bit i686 system, GCC changed the alignof
+      operator to optimize the ABI. Unfortunately, this makes the alignof()
+      operator return an incorrect number (4 instead of 8). Apply a patch to
+      fix this:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../qtwebengine-&qtwebengine-version;-i686_alignof_fix-1.patch</userinput></screen>
+
 <screen><userinput>mkdir build &amp;&amp;
 cd    build &amp;&amp;
 
-qmake -- -system-ffmpeg -webengine-icu .. &amp;&amp;
+qmake .. -- -system-ffmpeg -webengine-icu &amp;&amp;
 make</userinput></screen>
 <!--
@@ -212 +231 @@
 
     <para>
-      <command>-- -system-ffmpeg -webengine-icu ..</command>: If any options are
-      passed to qmake ithey must come after '--' and before the '..' which points
+      <command>-- -system-ffmpeg -webengine-icu</command>: If any options are
+      passed to qmake ithey 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