Changeset d10b870


Ignore:
Timestamp:
01/28/2022 03:15:33 AM (4 months ago)
Author:
Ken Moffat <ken@…>
Branches:
11.1, lazarus, trunk, xry111/intltool, xry111/test-20220226
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:
3 edited

Legend:

Unmodified
Added
Removed
  • introduction/welcome/changelog.xml

    r207b52d rd10b870  
    4646      <itemizedlist>
    4747        <listitem>
     48          <para>[ken] - In Qt5 apply consolidated kde (kf5.15) patches
     49          for all the qt5 modules required by packages mentioned in BLFS.
     50          This includes the existing qtsvg fix and gcc-11 changes, as
     51          well as other fixes including a new qtsvg vulnerability fix
     52          (Security Update). Fixes
     53          <ulink url="&blfs-ticket-root;16002">#16002</ulink>.</para>
     54        </listitem>
     55        <listitem>
    4856          <para>[bdubbs] - Update to bind-9.18.0. Fixes
    4957          <ulink url="&blfs-ticket-root;16016">#16016</ulink>.</para>
  • x/lib/qt5.xml

    r207b52d rd10b870  
    1313  <!ENTITY qt5-size          "560 MB">
    1414  <!ENTITY qt5-buildsize     "15 GB (257 MB installed)">
    15   <!ENTITY qt5-time          "22 SBU (using parallelism=4)">
     15  <!ENTITY qt5-time          "29 SBU (using parallelism=4)">
    1616]>
    1717
     
    4040      major users of <application>Qt</application> is <application>KDE
    4141      Frameworks 5 (KF5)</application>.
     42    </para>
     43
     44    <para>
     45      Now that <application>Qt5</application> updates are restricted to
     46      commercial customers, upstream patches for the various modules are being
     47      curated at kde, see
     48      <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
     49      and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
    4250    </para>
    4351
     
    8391        <para>
    8492          Required patch:
    85           <ulink url="&patch-root;/qt-everywhere-src-&qt5-version;-CVE-2021-3481-1.patch"/>
     93          <ulink url="&patch-root;/qt-everywhere-src-&qt5-version;-kf5.15-2.patch"/>
    8694        </para>
    8795      </listitem>
     
    132140      <xref linkend="mariadb"/>
    133141        or <ulink url="http://www.mysql.com/">MySQL</ulink>,
    134       <xref linkend="pciutils"/> (required for QtWebEngine),
     142      <xref linkend="pciutils"/>,
    135143      <xref linkend="postgresql"/>,
    136       <xref linkend="python2"/> (required for QtWebEngine),
     144      <!-- we handle QtWebEngine separately
     145      <xref linkend="python2"/> (required for QtWebEngine), -->
    137146      <xref linkend="pulseaudio"/>,
    138147      <xref linkend="sdl2"/>,
     
    256265
    257266    <para>
    258       First apply a patch to fix an Out Of Bounds read in QtSVG:
    259     </para>
    260 
    261 <screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-src-&qt5-version;-CVE-2021-3481-1.patch</userinput></screen>
    262 
    263     <para>
    264       Next fix some issues using gcc-11:
    265     </para>
    266 
    267 <screen><userinput>sed -i '/utility/a #include &lt;limits&gt;'     qtbase/src/corelib/global/qglobal.h         &amp;&amp;
    268 sed -i '/string/a #include &lt;limits&gt;'      qtbase/src/corelib/global/qfloat16.h        &amp;&amp;
    269 sed -i '/qbytearray/a #include &lt;limits&gt;'  qtbase/src/corelib/text/qbytearraymatcher.h &amp;&amp;
    270 sed -i '/type_traits/a #include &lt;limits&gt;' qtdeclarative/src/qmldebug/qqmlprofilerevent_p.h</userinput></screen>
     267      First apply a patch to pull in the fixes curated by kde for those
     268      modules which are required by packages mentioned in this book:
     269    </para>
     270
     271<screen><userinput remap="pre">patch -Np1 -i ../qt-everywhere-src-&qt5-version;-kf5.15-2.patch</userinput></screen>
    271272
    272273    <para>
  • x/lib/qtwebengine.xml

    r207b52d rd10b870  
    253253      <xref linkend="nodejs"/>,
    254254      <xref linkend="nss"/>,
     255      <xref linkend="pciutils"/>,
    255256      <xref linkend="python2"/>, and
    256257      <xref linkend='qt5'/>
Note: See TracChangeset for help on using the changeset viewer.