Changeset d10b870

Timestamp:

01/28/2022 03:15:33 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, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

c0cf007f

Parents:

207b52d

git-author:

Ken Moffat <ken@…> (01/28/2022 02:59:27 AM)

git-committer:

Ken Moffat <ken@…> (01/28/2022 03:15:33 AM)

Message:

Qt5 - apply kf5.15 patches from kde.

I have only used the patches for modules used by packages in BLFS
or required by the extra KDE packages mentioned in BLFS. For the
full details of what has been applied (or omitted) see
​https://www.linuxfromscratch.org/~ken/qt5/

I have also revised the SBU - the extra patches make a minimal
difference on my -j4 builds, but I need to use -j8 to get to 22
SBU. That figure seems to have been carried over from when we were
using gcc-10.2.

In the optional dependencies, pciutils was shown as optional but
required for qtwebengine: show it as optional, other parts of qt
can use it, and add it to qtwebengine as required. Remove python2
from the qt5 optional dependencies, only qtwebengine needs it and
it is already shown as required there.

Files:

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

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <itemizedlist>
         <listitem>
+          <para>[ken] - In Qt5 apply consolidated kde (kf5.15) patches
+          for all the qt5 modules required by packages mentioned in BLFS.
+          This includes the existing qtsvg fix and gcc-11 changes, as
+          well as other fixes including a new qtsvg vulnerability fix
+          (Security Update). Fixes
+          <ulink url="&blfs-ticket-root;16002">#16002</ulink>.</para>
+        </listitem>
+        <listitem>
           <para>[bdubbs] - Update to bind-9.18.0. Fixes
           <ulink url="&blfs-ticket-root;16016">#16016</ulink>.</para>

x/lib/qt5.xml

@@ -13 +13 @@
   <!ENTITY qt5-size          "560 MB">
   <!ENTITY qt5-buildsize     "15 GB (257 MB installed)">
-  <!ENTITY qt5-time          "22 SBU (using parallelism=4)">
+  <!ENTITY qt5-time          "29 SBU (using parallelism=4)">
 ]>
 
@@ -40 +40 @@
       major users of <application>Qt</application> is <application>KDE
       Frameworks 5 (KF5)</application>.
+    </para>
+
+    <para>
+      Now that <application>Qt5</application> updates are restricted to
+      commercial customers, upstream patches for the various modules are being
+      curated at kde, see
+      <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
+      and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
     </para>
 
@@ -83 +91 @@
         <para>
           Required patch:
-          <ulink url="&patch-root;/qt-everywhere-src-&qt5-version;-CVE-2021-3481-1.patch"/>
+          <ulink url="&patch-root;/qt-everywhere-src-&qt5-version;-kf5.15-2.patch"/>
         </para>
       </listitem>
@@ -132 +140 @@
       <xref linkend="mariadb"/>
         or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="pciutils"/> (required for QtWebEngine),
+      <xref linkend="pciutils"/>,
       <xref linkend="postgresql"/>,
-      <xref linkend="python2"/> (required for QtWebEngine),
+      <!-- we handle QtWebEngine separately
+      <xref linkend="python2"/> (required for QtWebEngine), -->
       <xref linkend="pulseaudio"/>,
       <xref linkend="sdl2"/>,
@@ -256 +265 @@
 
     <para>
-      First apply a patch to fix an Out Of Bounds read in QtSVG:
-    </para>
-
-<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-src-&qt5-version;-CVE-2021-3481-1.patch</userinput></screen>
-
-    <para>
-      Next fix some issues using gcc-11:
-    </para>
-
-<screen><userinput>sed -i '/utility/a #include &lt;limits&gt;'     qtbase/src/corelib/global/qglobal.h         &amp;&amp;
-sed -i '/string/a #include &lt;limits&gt;'      qtbase/src/corelib/global/qfloat16.h        &amp;&amp;
-sed -i '/qbytearray/a #include &lt;limits&gt;'  qtbase/src/corelib/text/qbytearraymatcher.h &amp;&amp;
-sed -i '/type_traits/a #include &lt;limits&gt;' qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h</userinput></screen>
+      First apply a patch to pull in the fixes curated by kde for those
+      modules which are required by packages mentioned in this book:
+    </para>
+
+<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-src-&qt5-version;-kf5.15-2.patch</userinput></screen>
 
     <para>

x/lib/qtwebengine.xml

@@ -253 +253 @@
       <xref linkend="nodejs"/>,
       <xref linkend="nss"/>,
+      <xref linkend="pciutils"/>,
       <xref linkend="python2"/>, and
       <xref linkend='qt5'/>