[blfs-book] r23510 - in trunk/BOOK: introduction/welcome x/lib

[ken--- via blfs-book]

Author: ken
Date: Thu Aug 13 08:00:39 2020
New Revision: 23510

Log:
Fix qtwebengine build with current bison, thanks to Marty Jack.

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

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml       Thu Aug 13 06:51:55 
2020        (r23509)
+++ trunk/BOOK/introduction/welcome/changelog.xml       Thu Aug 13 08:00:39 
2020        (r23510)
@@ -45,6 +45,10 @@
       <para>August 13th, 2020</para>
       <itemizedlist>
         <listitem>
+          <para>[ken] - Use updated patch in qtwebengine to fix build
+          with current bison.</para>
+        </listitem>
+        <listitem>
           <para>[xry111] - Revert r23505, and fix the instruction to build
           texlive with poppler-20.08.</para>
         </listitem>

Modified: trunk/BOOK/x/lib/qtwebengine.xml
==============================================================================
--- trunk/BOOK/x/lib/qtwebengine.xml    Thu Aug 13 06:51:55 2020        (r23509)
+++ trunk/BOOK/x/lib/qtwebengine.xml    Thu Aug 13 08:00:39 2020        (r23510)
@@ -100,7 +100,7 @@
       <listitem>
         <para>
           Required patch:
-          <ulink 
url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-1.patch"/>
+          <ulink 
url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-2.patch"/>
         </para>
       </listitem>
     </itemizedlist>
@@ -161,11 +161,11 @@
   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 enables using
-      system ICU version 67.1 or greater.
+      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-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i 
../qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-2.patch</userinput></screen>
 
     <para>
       Next, allow the pulseaudio library to be linked at build time, instead
-- 
http://lists.linuxfromscratch.org/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page