Changeset 21552cf for x/lib/qt5.xml

Timestamp:

05/27/2020 05:08:18 PM (4 years ago)

Author:

Douglas R. Reno <renodr@…>

Branches:

10.0, 10.1, 11.0, 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:

f4327ad9

Parents:

ae44cab

Message:

Update to Qt and QtWebEngine 5.15.0
Adapt Falkon to build with Qt5-5.15.0
OpenSSH tests: Remove some text that was invalid, which I entered in my last build

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@23206 af4574ff-66df-0310-9fd7-8a98e5e911e0

File:

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

x/lib/qt5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qt5-major "5.14">
+  <!ENTITY qt5-major "5.15">
   <!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-ftp  " ">
-  <!ENTITY qt5-md5sum        "b3d2b6d00e6ca8a8ede6d1c9bdc74daf">
-  <!ENTITY qt5-size          "524 MB">
-  <!ENTITY qt5-buildsize     "15 GB (264 MB installed)">
-  <!ENTITY qt5-time          "51 SBU (using parallelism=4)">
+  <!ENTITY qt5-md5sum        "610a228dba6ef469d14d145b71ab3b88">
+  <!ENTITY qt5-size          "565 MB">
+  <!ENTITY qt5-buildsize     "14 GB (266 MB installed)">
+  <!ENTITY qt5-time          "27 SBU (using parallelism=4)">
 ]>
 
@@ -79 +79 @@
     </itemizedlist>
 
+<!-- Applied upstream in 5.15.0
    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
@@ -88 +89 @@
       </listitem>
     </itemizedlist>
+ -->
 
     <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
@@ -113 +115 @@
       <xref linkend="libxkbcommon"/>,
       <xref linkend="mesa"/>,
+      <xref linkend="mitkrb"/>,
       <xref linkend="mtdev"/>,
       <xref linkend="pcre2"/>,
@@ -139 +142 @@
       <xref linkend="sdl2"/>,
       <xref linkend="unixodbc"/>,
-      <ulink url="http://www.firebirdsql.org/">Firebird</ulink>, and
-      <ulink url="https://libproxy.github.io/libproxy/">libproxy</ulink>
-    </para>
-
+      <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://libproxy.github.io/libproxy/">libproxy</ulink>,
+      <ulink url="https://openal.org/">OpenAL</ulink>,
+      <ulink url="https://freebsoft.org/speechd/">speech-dispatcher</ulink>,
+      <ulink url="http:///www.tslib.org/">tslib</ulink>, and
+      <ulink url="https://vulkan.lunarg.org/sdk/home/">Vulkan</ulink>
+    </para>
+
+    <!-- Many of the dependencies in the qmake/configure output do not apply
+         to Linux-based platforms. I've selected the ones that do and put
+         them in as optional dependencies. -renodr -->
     <para condition="html" role="usernotes">
        User Notes: <ulink url="&blfs-wiki;/qt5"/>
@@ -245 +258 @@
             -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
-
+<!-- Applied upstream in 5.15.0
     <para>
       First fix an issues using gcc-10:
@@ -251 +264 @@
 
 <screen><userinput>patch -Np1 -i ../qt-everywhere-src-&qt5-version;-gcc10-1.patch</userinput></screen>
+-->
 
     <para>
@@ -539 +553 @@
           qdbusviewer, qdbusxml2cpp, qdistancefieldgenerator, qdoc, qgltf,
           qhelpgenerator, qlalr, qmake, qml, qmlcachegen,
-          qmleasing, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
+          qmleasing, qmlformat, qmlimportscanner, qmllint, qmlmin, qmlplugindump,
           qmlpreview, qmlprofiler, qmlscene, qmltestrunner, qscxmlc,
           qtattributionscanner, qtdiag, qtpaths, qtplugininfo,
@@ -967 +981 @@
       </varlistentry>
 
+      <varlistentry id="qmlformat-qt5">
+        <term><command>qmlformat</command></term>
+        <listitem>
+          <para>
+            formats QML files according to the QML coding conventions.
+          </para>
+          <indexterm zone="qt5 qmlformat-qt5">
+            <primary sortas="b-qmlformat-qt5">qmlformat</primary>
+          </indexterm>
+        </listitem>
+      </varlistentry>
+
       <varlistentry id="qmlimportscanner-qt5">
         <term><command>qmlimportscanner</command></term>