Changeset 72119155 for x/lib/qtwebengine.xml

Timestamp:

11/03/2020 07:40:40 PM (2 years ago)

Author:

Ken Moffat <ken@…>

Branches:

10.1, 11.0, 11.1, 11.2, 11.3, ken/inkscape-core-mods, lazarus, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226

Children:

3ec1600

Parents:

6b94a5d

Message:

Patch qtwebengine to build with system ICU68.

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

File:

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

x/lib/qtwebengine.xml

@@ -95 +95 @@
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
@@ -101 +101 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-3.patch"/>
+          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-1.patch"/>
         </para>
       </listitem>
     </itemizedlist>
--->
+
     <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
 
@@ -159 +159 @@
 <screen><userinput>find -type f -name "*.pr[io]" |
   xargs sed -i -e 's|INCLUDEPATH += |&amp;$$QTWEBENGINE_ROOT/include |'</userinput></screen>
-<!--
-    <para>
-      Next, apply a patch that fixes issues when using gcc-10 and current bison
-      and also enables using system ICU version 67.1 or greater.
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-3.patch</userinput></screen>
--->
+
+    <para>
+      Next, apply a patch that fixes the build with system ICU version 68.1.
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-1.patch</userinput></screen>
+
     <para>
       Next, allow the pulseaudio library to be linked at build time, instead