Changeset 9e0ab833

Timestamp:

01/17/2022 01:40:18 PM (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, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

5a828aaa

Parents:

34623f0e

Message:

Update to qtwebengine-5.15.8.

Files:

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

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - Update to qtwebengine-5.15.8 (Security Fix). Fixes
+          <ulink url="&blfs-ticket-root;15922">#15922</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[pierre] - Apply upstream fix to accountservice to be
           able to build with newer versions of meson.</para>

packages.ent

@@ -779 +779 @@
 <!ENTITY pangomm-version              "2.46.2">
 <!ENTITY qt5-version                  "5.15.2">
-<!ENTITY qtwebengine-version          "5.15.6">
+<!ENTITY qtwebengine-version          "5.15.8">
 <!ENTITY qtwebkit-version             "5.9.0">
 <!ENTITY qscintilla-version           "2.10.4">

x/lib/qtwebengine.xml

@@ -11 +11 @@
   <!ENTITY qtwebengine-download-http "&sources-anduin-http;/qtwebengine/qtwebengine-&qtwebengine-version;.tar.xz">
   <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "af799617842cca0b765102c312fbdd46">
+  <!ENTITY qtwebengine-md5sum        "e9ff105f86c94bd302773a78db0d9738">
   <!ENTITY qtwebengine-size          "306 MB">
-  <!ENTITY qtwebengine-buildsize     "5.0 GB (154 MB installed)">
-  <!ENTITY qtwebengine-time          "107 SBU (typical, Using parallelism=4)">
+  <!ENTITY qtwebengine-buildsize     "5.1 GB (154 MB installed)">
+  <!ENTITY qtwebengine-time          "103 SBU (typical, Using parallelism=4)">
 ]>
 
@@ -78 +78 @@
 
       <para> <!-- for git versions -->
-        The tarball linked to below was created from the 5.15.6 git branch
+        The tarball linked to below was created from the 5.15 git branch
         and the 87-branch of the chromium submodule (which is forked from
         chromium). See the GIT-VERSIONS file in the tarball (after applying
@@ -171 +171 @@
     <note>
       <para>
+        If you  are upgrading and have installed a newer version of <xref
+        linkend='icu'/> since you last installed <xref linkend='qt5'/>, you
+        will need to reinstall Qt5 before upgrading, otherwise the final link
+        of this package will fail with a warning that the version of icu
+        libraries needed by libQt5Core.so may conflict with the version
+        used for this package.
+      </para>
+
+      <para>
         Unusually, the shipped GN build system (used to create the Ninja files)
         requires a static <filename class="libraryfile">libstdc++.a</filename>
@@ -218 +227 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
-      <listitem>
+  <!--<listitem>
         <para>
           Required patch:
-          <!-- keep links for releases and git versions as a reminder
+          <!\-\- keep links for releases and git versions as a reminder
                that the tarball names names differ
-          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> -->
+          <ulink url="&patch-root;/qtwebengine-everywhere-src-&qtwebengine-version;-ICU68-2.patch"/> \-\->
            
           <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-5.15.7-1.patch"/>
         </para>
-      </listitem>
+      </listitem>-->
       <listitem>
         <para>
           Required patch:-->
      <!--     <ulink url="&patch-root;/qtwebengine-&qtwebengine-version;-build_fixes-1.patch"/> -->
-          <ulink url="&patch-root;/qtwebengine-5.15.7-build_fixes-1.patch"/>
+          <ulink url="&patch-root;/qtwebengine-5.15.8-build_fixes-1.patch"/>
         </para>
       </listitem>
@@ -308 +317 @@
 
 
-    <para>
+<!--<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>
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-5.15.7-1.patch</userinput></screen>-->
 
     <para>
@@ -319 +328 @@
     </para>
 
-<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-5.15.7-build_fixes-1.patch</userinput></screen>
+<screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-5.15.8-build_fixes-1.patch</userinput></screen>
 
 <!-- start of commands for git versions only -->