Changes in x/lib/qt5.xml [0318335:3f2db3a6]

File:

• x/lib/qt5.xml (modified) (12 diffs)

x/lib/qt5.xml

@@ -8 +8 @@
   <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
 
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
+  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "e1447db4f06c841d8947f0a6ce83a7b5">
-  <!ENTITY qt5-size          "560 MB">
-  <!ENTITY qt5-buildsize     "15 GB (257 MB installed)">
-  <!ENTITY qt5-time          "22 SBU (using parallelism=4)">
+  <!ENTITY qt5-md5sum        "b30147f4fd91c8dc1b7e61cbc7e6b8a6">
+  <!ENTITY qt5-size          "595 MB">
+  <!ENTITY qt5-buildsize     "15 GB (268 MB installed)">
+  <!ENTITY qt5-time          "29 SBU (using parallelism=4)">
 ]>
 
@@ -19 +19 @@
   <?dbhtml filename="qt5.html" ?>
 
-  <sect1info>
-    <date>$Date$</date>
-  </sect1info>
 
   <title>Qt-&qt5-version;</title>
@@ -42 +39 @@
     </para>
 
-    &lfs110a_checked;
+    &lfs112_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
@@ -82 +79 @@
       <listitem>
         <para>
+          Now that <application>Qt5</application> updates are restricted to
+          commercial customers, upstream patches for the various modules are
+          being curated at kde.
+          Patches for the modules required by packages in BLFS have been
+          aggregated for the non-modular Qt5 build we use.
+        </para>
+        <para>
           Required patch:
-          <ulink url="&patch-root;/qt-everywhere-src-&qt5-version;-CVE-2021-3481-1.patch"/>
+          <ulink url="&patch-root;/qt-everywhere-opensource-src-&qt5-version;-kf5-1.patch"/>
+        </para>
+        <para>
+          Details of the kde curation can be found at
+          <ulink url="https://dot.kde.org/2021/04/06/announcing-kdes-qt-5-patch-collection"/>
+          and <ulink url="https://community.kde.org/Qt5PatchCollection"/>.
         </para>
       </listitem>
@@ -100 +109 @@
       <xref linkend="make-ca"/>,
       <xref linkend="cups"/>,
+      <xref linkend="double-conversion"/>,
       <xref linkend="glib2"/>,
       <xref linkend="gst10-plugins-base"/> (QtMultimedia backend),
@@ -112 +122 @@
       <xref linkend="libxkbcommon"/>,
       <xref linkend="mesa"/>,
-      <xref linkend="mitkrb"/>,
       <xref linkend="mtdev"/>,
       <xref linkend="pcre2"/>,
@@ -132 +141 @@
       <xref linkend="libinput"/>, <!-- needs -libinput switch -->
       <xref linkend="mariadb"/>
-        or <ulink url="http://www.mysql.com/">MySQL</ulink>,
-      <xref linkend="pciutils"/> (required for QtWebEngine),
+        or <ulink url="https://www.mysql.com/">MySQL</ulink>,
+      <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"/>,
@@ -141 +151 @@
       <ulink url="https://www.assimp.org/">assimp</ulink>,
       <ulink url="http://www.festvox.org/flite/">Flite</ulink>,
-      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>,
-      <ulink url="http://www.freetds.org/">FreeTDS</ulink>,
+      <ulink url="https://www.firebirdsql.org/">Firebird</ulink>,
+      <ulink url="https://www.freetds.org/">FreeTDS</ulink>,
       <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>,
       <ulink url="https://openal.org/">OpenAL</ulink>,
@@ -257 +267 @@
 
     <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-opensource-src-&qt5-version;-kf5-1.patch</userinput></screen>
 
     <para>
@@ -487 +489 @@
 
     <sect3 id="qt5-config">
-     <!-- <title>Configuration Information</title>-->
-
-    <title>If you installed Qt5 in /usr</title>
+      <title>Configuration Information</title>
+
+      <para>
+        If <xref linkend="sudo"/> is installed, QT5DIR should be available to
+        the super user as well. Execute the following commands as the
+        <systemitem class="username">root</systemitem> user:
+      </para>
+
+<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
+<literal>Defaults env_keep += QT5DIR</literal>
+EOF</userinput></screen>
+
+      <bridgehead renderas="sect4">If you installed Qt5 in /usr</bridgehead>
 
       <para>
@@ -508 +520 @@
 EOF</userinput></screen>
 
-      <para>
-        If <xref linkend="sudo"/> is installed, QT5DIR should be available to
-        the super user as well. Execute the following commands as the
-        <systemitem class="username">root</systemitem> user:
-      </para>
-
-<screen role="root"><userinput>cat &gt; /etc/sudoers.d/qt &lt;&lt; "EOF"
-<literal>Defaults env_keep += QT5DIR</literal>
-EOF</userinput></screen>
-      
-    <bridgehead renderas="sect4">If you did not install Qt5 in /usr</bridgehead>
+      <bridgehead renderas="sect4">If you did not install Qt5 in /usr</bridgehead>
 
       <para>
@@ -585 +587 @@
           qhelpgenerator, qlalr, qmake, qml, qmlcachegen,
           qmleasing, qmlformat, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
-          qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qscxmlc,
+          qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qmltime,
+          qmltyperegistrar, qscxmlc,
           qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
           qtwaylandscanner, qvkgen, rcc, repc, sdpscanner, syncqt.pl, tracegen,