Changes in / [f0acf55:c9f0cc0]

Files:

• packages.ent (modified) (1 diff)
• x/lib/lib.xml (modified) (1 diff)
• x/lib/qt5.xml (modified) (2 diffs)
• x/lib/qtbase.xml (added)
• x/lib/qtwebengine.xml (deleted)
• xsoft/graphweb/falkon.xml (modified) (1 diff)

packages.ent

@@ -753 +753 @@
 <!ENTITY pango-version                "1.48.0">
 <!ENTITY pangomm-version              "2.42.1">
-<!ENTITY qt5-version                  "5.15.2">
-<!ENTITY qtwebengine-version          "5.15.2">
+<!ENTITY qt5-major                    "5.15">
+<!ENTITY qt5-version                  "&qt5-major;.2">
+<!ENTITY qt5-url "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/submodules">
+<!ENTITY qtwebengine-version          "&qt5-major;.2">
 <!ENTITY qtwebkit-version             "5.9.0">
 <!ENTITY qscintilla-version           "2.10.4">

x/lib/lib.xml

@@ -71 +71 @@
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="pangomm.xml"/>
 <!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qscintilla.xml"/> -->
+  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtbase.xml"/>
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qt5.xml"/>
-  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebengine.xml"/>
   <!--
   <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="qtwebkit5.xml"/> -->

x/lib/qt5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!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-http "&qt5-url;/">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "e1447db4f06c841d8947f0a6ce83a7b5">
-  <!ENTITY qt5-size          "560 MB">
+  <!ENTITY qt5-md5sum        "See below">
+  <!ENTITY qt5-size          "59 MB">
   <!ENTITY qt5-buildsize     "14 GB (255 MB installed)">
   <!ENTITY qt5-time          "22 SBU (using parallelism=4)">
@@ -430 +428 @@
     <para>
       <parameter>-skip qtwebengine</parameter>: This switch disables building
-      the QtWebEngine. The BLFS editors have chosen to build <xref
-      linkend="qtwebengine"/> separately.
+      the QtWebEngine. <!--The BLFS editors have chosen to build <xref
+      linkend="qtwebengine"/> separately.-->
     </para>
 

xsoft/graphweb/falkon.xml

@@ -82 +82 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="extra-cmake-modules"/> and
-      <xref linkend="qtwebengine"/>
+      <xref linkend="extra-cmake-modules"/> <!-- and
+      <xref linkend="qtwebengine"/>-->
     </para>