Changeset 72119155


Ignore:
Timestamp:
11/03/2020 07:40:40 PM (2 years ago)
Author:
Ken Moffat <ken@…>
Branches:
10.1, 11.0, 11.1, 11.2, 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

Files:
3 edited

Legend:

Unmodified
Added
Removed
  • general.ent

    r6b94a5d r72119155  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "01">                   <!-- Always 2 digits -->
     3<!ENTITY day          "03">                   <!-- Always 2 digits -->
    44<!ENTITY month        "11">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2020">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "November 1st, &year;">
     9<!ENTITY releasedate  "November 3rd, &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
  • introduction/welcome/changelog.xml

    r6b94a5d r72119155  
    4343    -->
    4444    <listitem>
     45      <para>November 3rd, 2020</para>
     46      <itemizedlist>
     47        <listitem>
     48          <para>[ken] - Patch qtwebengine to build with
     49          ICU68.</para>
     50        </listitem>
     51      </itemizedlist>
     52    </listitem>
     53
     54    <listitem>
    4555      <para>November 1st, 2020</para>
    4656      <itemizedlist>
  • x/lib/qtwebengine.xml

    r6b94a5d r72119155  
    9595      </listitem>
    9696    </itemizedlist>
    97 <!--
     97
    9898    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
    9999    <itemizedlist spacing="compact">
     
    101101        <para>
    102102          Required patch:
    103           <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-3.patch"/>
     103          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-1.patch"/>
    104104        </para>
    105105      </listitem>
    106106    </itemizedlist>
    107 -->
     107
    108108    <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
    109109
     
    159159<screen><userinput>find -type f -name "*.pr[io]" |
    160160  xargs sed -i -e 's|INCLUDEPATH += |&amp;$$QTWEBENGINE_ROOT/include |'</userinput></screen>
    161 <!--
    162     <para>
    163       Next, apply a patch that fixes issues when using gcc-10 and current bison
    164       and also enables using system ICU version 67.1 or greater.
    165     </para>
    166 
    167 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-everywhere-src-&qtwebengine-version;-consolidated_fixes-3.patch</userinput></screen>
    168 -->
     161
     162    <para>
     163      Next, apply a patch that fixes the build with system ICU version 68.1.
     164    </para>
     165
     166<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-1.patch</userinput></screen>
     167
    169168    <para>
    170169      Next, allow the pulseaudio library to be linked at build time, instead
Note: See TracChangeset for help on using the changeset viewer.