Author: ken
Date: Tue Nov  3 11:40:40 2020
New Revision: 23862

Log:
Patch qtwebengine to build with system ICU68.

Modified:
   trunk/BOOK/general.ent
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/x/lib/qtwebengine.xml

Modified: trunk/BOOK/general.ent
==============================================================================
--- trunk/BOOK/general.ent      Tue Nov  3 06:06:50 2020        (r23861)
+++ trunk/BOOK/general.ent      Tue Nov  3 11:40:40 2020        (r23862)
@@ -1,12 +1,12 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "01">                   <!-- Always 2 digits -->
+<!ENTITY day          "03">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
 <!ENTITY copyrightdate "2001-&year;">
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 1st, &year;">
+<!ENTITY releasedate  "November 3rd, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
 <!ENTITY lfs-version  "development">          <!-- x.y|development -->

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Tue Nov  3 06:06:50 
2020        (r23861)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Tue Nov  3 11:40:40 
2020        (r23862)
@@ -42,6 +42,16 @@
     </listitem>
     -->
     <listitem>
+      <para>November 3rd, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[ken] - Patch qtwebengine to build with
+          ICU68.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 1st, 2020</para>
       <itemizedlist>
         <listitem>

Modified: trunk/BOOK/x/lib/qtwebengine.xml
==============================================================================
--- trunk/BOOK/x/lib/qtwebengine.xml    Tue Nov  3 06:06:50 2020        (r23861)
+++ trunk/BOOK/x/lib/qtwebengine.xml    Tue Nov  3 11:40:40 2020        (r23862)
@@ -94,17 +94,17 @@
         </para>
       </listitem>
     </itemizedlist>
-<!--
+
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
         <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>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -158,14 +158,13 @@
 
 <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.
+      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;-consolidated_fixes-3.patch</userinput></screen>
--->
+<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
       of run time. This also prevents an issue with newer pulseaudio:
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page

Reply via email to