Changeset e7cae3c

Timestamp:

06/21/2021 06:25:55 PM (2 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.0, 11.1, 11.2, 11.3, 12.0, kea, ken/inkscape-core-mods, lazarus, lxqt, plabs/python-mods, qt5new, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

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:

• introduction/welcome/changelog.xml (modified) (1 diff)
• x/lib/qtwebengine.xml (modified) (4 diffs)

introduction/welcome/changelog.xml

@@ -47 +47 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Update QtWebengine with newer patch to match the
+          5.15.5 commercial release (Security Fixes). Fixes
+          <ulink url="&blfs-ticket-root;15195">#15195</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[ken] - Patch Qt-5.15.2 (security fix re qtsvg). Fixes
           <ulink url="&blfs-ticket-root;15197">#15197</ulink>.</para>

x/lib/qtwebengine.xml

@@ -14 +14 @@
   <!ENTITY qtwebengine-size          "306 MB">
   <!ENTITY qtwebengine-buildsize     "5.1 GB (154 MB installed)">
-  <!ENTITY qtwebengine-time          "100 SBU (Using parallelism=4)">
+  <!ENTITY qtwebengine-time          "95 SBU (Using 6 jobs on a 4-core processor)">
 ]>
 
@@ -213 +213 @@
                that the tarball names names differ
           <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> -->
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-2.patch"/>
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-upstream_fixes-2.patch"/>
         </para>
       </listitem>
@@ -219 +219 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-upstream_fixes-1.patch"/>
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-3.patch"/>
         </para>
       </listitem>
@@ -292 +292 @@
 
     <para>
-      Now apply a patch to fix several issues that can prevent the build working:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-2.patch</userinput></screen>
-
-    <para>
-      Next apply a patch for security and other fixes:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-upstream_fixes-1.patch</userinput></screen>
+      Now apply a patch for security and other fixes:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-upstream_fixes-2.patch</userinput></screen>
+
+    <para>
+      Next apply a patch to fix several issues that can prevent the build working:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-3.patch</userinput></screen>
 
 <!-- start of commands for git versions only -->