Changeset 678ce3b0

Timestamp:

11/20/2020 10:35:18 PM (3 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

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:

277c9f4e

Parents:

91e6a8f

Message:

Update to qtwebengine-5.15.2.
Update to qt-everywhere-src-5.15.2.

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

Files:

• general.ent (modified) (2 diffs)
• introduction/welcome/changelog.xml (modified) (1 diff)
• packages.ent (modified) (1 diff)
• x/lib/qt5.xml (modified) (3 diffs)
• x/lib/qtwebengine.xml (modified) (1 diff)

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "19">                   <!-- Always 2 digits -->
+<!ENTITY day          "20">                   <!-- Always 2 digits -->
 <!ENTITY month        "11">                   <!-- Always 2 digits -->
 <!ENTITY year         "2020">
@@ -7 +7 @@
 <!ENTITY copyholder   "The BLFS Development Team">
 <!ENTITY version      "&year;-&month;-&day;">
-<!ENTITY releasedate  "November 19th, &year;">
+<!ENTITY releasedate  "November 20th, &year;">
 <!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->

introduction/welcome/changelog.xml

@@ -43 +43 @@
     -->
     <listitem>
+      <para>November 20th, 2020</para>
+      <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to qtwebengine-5.15.2. Fixes
+          <ulink url="&blfs-ticket-root;14266">#14266</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to qt-everywhere-src-5.15.2. Addresses
+          <ulink url="&blfs-ticket-root;14266">#14266</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
+    <listitem>
       <para>November 19th, 2020</para>
       <itemizedlist>

packages.ent

@@ -752 +752 @@
 <!ENTITY pango-version                "1.48.0">
 <!ENTITY pangomm-version              "2.42.1">
-<!ENTITY qt5-version                  "5.15.1">
-<!ENTITY qtwebengine-version          "5.15.1">
+<!ENTITY qt5-version                  "5.15.2">
+<!ENTITY qtwebengine-version          "5.15.2">
 <!ENTITY qtwebkit-version             "5.9.0">
 <!ENTITY qscintilla-version           "2.10.4">

x/lib/qt5.xml

@@ -10 +10 @@
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "ab16c28f4f9e6db8299096312decdbc4">
-  <!ENTITY qt5-size          "554 MB">
-  <!ENTITY qt5-buildsize     "14 GB (266 MB installed)">
+  <!ENTITY qt5-md5sum        "e1447db4f06c841d8947f0a6ce83a7b5">
+  <!ENTITY qt5-size          "560 MB">
+  <!ENTITY qt5-buildsize     "14 GB (255 MB installed)">
   <!ENTITY qt5-time          "22 SBU (using parallelism=4)">
 ]>
@@ -79 +79 @@
     </itemizedlist>
 
-<!-- Applied upstream in 5.15.0
-   <bridgehead renderas="sect3">Additional Downloads</bridgehead>
-    <itemizedlist spacing='compact'>
-      <listitem>
-        <para>
-          Required Patch: <ulink url=
-          "&patch-root;/qt-everywhere-src-&qt5-version;-gcc10-1.patch"/>
-        </para>
-      </listitem>
-    </itemizedlist>
- -->
-
     <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
 
@@ -270 +258 @@
     </para>
 
-<screen><userinput>sed -i 's/python /python3 /' qtdeclarative/qtdeclarative.pro \
-                             qtdeclarative/src/3rdparty/masm/masm.pri &amp;&amp;
-
-./configure -prefix $QT5PREFIX                        \
+<screen><userinput>./configure -prefix $QT5PREFIX                        \
             -sysconfdir /etc/xdg                      \
             -confirm-license                          \

x/lib/qtwebengine.xml

@@ -8 +8 @@
   <!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-everywhere-src-&qtwebengine-version;.tar.xz">
   <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "e37c44664e8a55471b92b07695f7f7db">
-  <!ENTITY qtwebengine-size          "266 MB">
-  <!ENTITY qtwebengine-buildsize     "4.1 GB (142 MB installed)">
-  <!ENTITY qtwebengine-time          "56 SBU (using 4 cores)">
+  <!ENTITY qtwebengine-md5sum        "c88cbe3158feb20c4feb3d54262feb23">
+  <!ENTITY qtwebengine-size          "267 MB">
+  <!ENTITY qtwebengine-buildsize     "4.4 GB (145 MB installed)">
+  <!ENTITY qtwebengine-time          "64 SBU (Using parallelism=4)">
 ]>