Changeset e7cae3c


Ignore:
Timestamp:
06/21/2021 06:25:55 PM (6 weeks ago)
Author:
Ken Moffat <ken@…>
Branches:
trunk
Children:
baba025c
Parents:
4d0615f1
Message:

qtwebengine: Update patches:

Update the security fixes to match paid-for 5.15.5.
Remove one item from the build fixes patch which is now upstream,
and apply that after the security fixes.
Remeasure for gcc-11.1.0 which takes a few less SBU.

Files:
2 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    r4d0615f1 re7cae3c  
    4747      <itemizedlist>
    4848        <listitem>
     49          <para>[ken] - Update QtWebengine with newer patch to match the
     50          5.15.5 commercial release (Security Fixes). Fixes
     51          <ulink url="&blfs-ticket-root;15195">#15195</ulink>.</para>
     52        </listitem>
     53        <listitem>
    4954          <para>[ken] - Patch Qt-5.15.2 (security fix re qtsvg). Fixes
    5055          <ulink url="&blfs-ticket-root;15197">#15197</ulink>.</para>
  • x/lib/qtwebengine.xml

    r4d0615f1 re7cae3c  
    1414  <!ENTITY qtwebengine-size          "306 MB">
    1515  <!ENTITY qtwebengine-buildsize     "5.1 GB (154 MB installed)">
    16   <!ENTITY qtwebengine-time          "100 SBU (Using parallelism=4)">
     16  <!ENTITY qtwebengine-time          "95 SBU (Using 6 jobs on a 4-core processor)">
    1717]>
    1818
     
    213213               that the tarball names names differ
    214214          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> -->
    215           <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-2.patch"/>
     215          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-upstream_fixes-2.patch"/>
    216216        </para>
    217217      </listitem>
     
    219219        <para>
    220220          Required patch:
    221           <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-upstream_fixes-1.patch"/>
     221          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-3.patch"/>
    222222        </para>
    223223      </listitem>
     
    292292
    293293    <para>
    294       Now apply a patch to fix several issues that can prevent the build working:
    295     </para>
    296 
    297 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-2.patch</userinput></screen>
    298 
    299     <para>
    300       Next apply a patch for security and other fixes:
    301     </para>
    302 
    303 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-upstream_fixes-1.patch</userinput></screen>
     294      Now apply a patch for security and other fixes:
     295    </para>
     296
     297<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-upstream_fixes-2.patch</userinput></screen>
     298
     299    <para>
     300      Next apply a patch to fix several issues that can prevent the build working:
     301    </para>
     302
     303<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-3.patch</userinput></screen>
    304304
    305305<!-- start of commands for git versions only -->
Note: See TracChangeset for help on using the changeset viewer.