Changeset ec42249

Timestamp:

12/03/2019 12:20:30 PM (4 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 9.1, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

baf041fa

Parents:

c2af02b

Message:

Fix qtwebengine for ICU-65.

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

Files:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (1 diff)

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Fix build breakage from ICU-65.1 in qtwebengine-5.13.2,
+          again caused by a U16NEXT() without a terminating semicolon.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Do not use system ICU for libreoffice, 65.1 broke
           one of the packages which it ships with (libfreehand). Fixes

x/lib/qtwebengine.xml

@@ -185 +185 @@
 <screen><userinput>sed -e '/link_pulseaudio/s/false/true/' \
     -i src/3rdparty/chromium/media/media_options.gni</userinput></screen>
+
+    <para>
+      Now add a terminating semicolon to a macro to let it compile with
+      <xref linkend="icu"/>:
+    </para>
+
+<!-- editors: this line number is specific to 5.13.2, later versions might
+have already been fixed, or more likely the relevant line is no longer 5713.
+There are two lines which invoke U16_NOTE(), the first already has a ';'
+followed by a comment, the second lacks the ';' -->
+
+<screen><userinput>sed -i '5713s/.*/&amp;;/' \
+  src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc</userinput></screen>
 
     <para>