Changeset 86e62cc

Timestamp:

11/26/2021 03:14:47 AM (2 years ago)

Author:

Ken Moffat <ken@…>

Branches:

11.1, 11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

72ecea9

Parents:

8995282

Message:

Patch qtwebengine up to 5.15.7.

Files:

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

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Patch qtwebengine to bring it to 5.15.7 (security fixes). Fixes
+          <ulink url="&blfs-ticket-root;15765">#15765</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[timtas] - Update to openldap-2.6.0. Fixes
           <ulink url="&blfs-ticket-root;15701">#15701</ulink>.</para>

x/lib/qtwebengine.xml

@@ -13 +13 @@
   <!ENTITY qtwebengine-md5sum        "af799617842cca0b765102c312fbdd46">
   <!ENTITY qtwebengine-size          "306 MB">
-  <!ENTITY qtwebengine-buildsize     "5.1 GB (154 MB installed)">
-  <!ENTITY qtwebengine-time          "97 SBU (typical, Using parallelism=4)">
+  <!ENTITY qtwebengine-buildsize     "5.0 GB (154 MB installed)">
+  <!ENTITY qtwebengine-time          "107 SBU (typical, Using parallelism=4)">
 ]>
 
@@ -224 +224 @@
                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;-upstream_fixes-2.patch"/>
+           
+          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-5.15.7-1.patch"/>
         </para>
       </listitem>
@@ -231 +231 @@
         <para>
           Required patch:-->
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/>
-        </para>
-      </listitem>
-      <listitem>
-        <para>
-          Required patch:
-          <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-harfbuzz3-1.patch"/>
+     <!--     <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/> -->
+          <ulink url="&patch-root;/qtwebengine-5.15.7-build_fixes-1.patch"/>
         </para>
       </listitem>
@@ -312 +307 @@
 <screen role="root"><userinput>ln -svf /usr/bin/python{2,}</userinput></screen>
 
-<!-- retain, there might later be a patch rather than a full 306MB tarball
-    <para>
-      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>
+      Now apply a patch to update from 5.15.6 to the security and other fixes
+      contained in the 5.15.7 source:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-5.15.7-1.patch</userinput></screen>
 
     <para>
@@ -323 +319 @@
     </para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-build_fixes-1.patch</userinput></screen>
-
-    <para>
-      If you are using harfbuzz-3.0 or later, apply a patch to let the build
-      complete:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-harfbuzz3-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-5.15.7-build_fixes-1.patch</userinput></screen>
 
 <!-- start of commands for git versions only -->
     <para>
-      Although the first patch has ensured that git is not invoked during the build,
+      Although the build_fixes patch has ensured that git is not invoked during the build,
       the build system has labyrinthine rules of byzantine complexity, and in
       particular trying to build without two <filename>.git</filename> directories