Changeset 08f2ed34

Timestamp:

12/17/2017 07:01:39 AM (6 years ago)

Author:

Thomas Trepl <thomas@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 12.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, perl-modules, 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:

57e07f4

Parents:

b13548d

Message:

Version upgrade Qt-5.10.0 and QtWebEngine-5.10.0

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

Files:

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

general.ent

@@ -1 +1 @@
 <!-- $LastChangedBy$ $Date$ -->
 
-<!ENTITY day          "16">                   <!-- Always 2 digits -->
+<!ENTITY day          "17">                   <!-- Always 2 digits -->
 <!ENTITY month        "12">                   <!-- Always 2 digits -->
 <!ENTITY year         "2017">

introduction/welcome/changelog.xml

@@ -42 +42 @@
     </listitem>
 -->
+    <listitem>
+      <para>December 17th, 2017</para>
+      <itemizedlist>
+        <listitem>
+          <para>[thomas] - Update to Qt-5.10.0 and QtWebEngine-5.10.0. Fixes
+          <ulink url="&blfs-ticket-root;10139">#10139</ulink>.</para>
+        </listitem>
+      </itemizedlist>
+    </listitem>
+
     <listitem>
       <para>December 16th, 2017</para>

packages.ent

@@ -577 +577 @@
 <!ENTITY pango-version                "1.40.14">
 <!ENTITY pangomm-version              "2.40.1">
-<!ENTITY qt5-version                  "5.9.3">
-<!ENTITY qtwebengine-version          "5.9.3">
+<!ENTITY qt5-version                  "5.10.0">
+<!ENTITY qtwebengine-version          "5.10.0">
 <!ENTITY qtwebkit-version             "5.9.0">
 <!ENTITY qscintilla-version           "2.10.2">

x/lib/qt5.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qt5-major "5.9">
+  <!ENTITY qt5-major "5.10">
   <!ENTITY qt5-url   "https://download.qt.io/archive/qt/&qt5-major;/&qt5-version;/single">
 
-  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-opensource-src-&qt5-version;.tar.xz">
+  <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "eae2435509493a2084405714e0a9bdf9">
-  <!ENTITY qt5-size          "288 MB">
-  <!ENTITY qt5-buildsize     "8.7 GB (215 MB installed)">
-  <!ENTITY qt5-time          "25 SBU (using parallelism=4)">
+  <!ENTITY qt5-md5sum        "c5e275ab0ed7ee61d0f4b82cd471770d">
+  <!ENTITY qt5-size          "289 MB">
+  <!ENTITY qt5-buildsize     "9.6 GB (225 MB installed)">
+  <!ENTITY qt5-time          "29.8 SBU (using parallelism=4)">
 ]>
 
@@ -83 +83 @@
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
-      <xref linkend="python2"/> and
       <xref linkend="xorg7-lib"/>
     </para>
@@ -104 +103 @@
       <xref linkend="mesa"/>,
       <xref linkend="mtdev"/>,
-      <xref linkend="openssl10"/>,
       <xref linkend="pcre2"/>,
       <xref linkend="sqlite"/>,
@@ -241 +239 @@
     </para>
 
-<screen><userinput>echo "INCLUDEPATH += /usr/include/openssl-1.0" >>           \
-                     qtbase/src/network/network.pro         &amp;&amp;
-export OPENSSL_LIBS='-L/usr/lib/openssl-1.0 -lssl -lcrypto' &amp;&amp;
-
-./configure -prefix $QT5PREFIX                          \
+<screen><userinput>./configure -prefix $QT5PREFIX                          \
             -sysconfdir /etc/xdg                        \
             -confirm-license                            \

x/lib/qtwebengine.xml

@@ -5 +5 @@
   %general-entities;
 
-  <!ENTITY qtwebengine-major "5.9">
+  <!ENTITY qtwebengine-major "5.10">
   <!ENTITY qtwebengine-download-http "https://download.qt.io/archive/qt/&qtwebengine-major;/&qtwebengine-version;/submodules/qtwebengine-opensource-src-&qtwebengine-version;.tar.xz">
   <!ENTITY qtwebengine-download-ftp  " ">
-  <!ENTITY qtwebengine-md5sum        "3d9a205f94117d1fcd61544b02d32d99">
+  <!ENTITY qtwebengine-md5sum        "0ea0b32e97911cf80d32b31cf10a6d8b">
   <!ENTITY qtwebengine-size          "208 MB">
-  <!ENTITY qtwebengine-buildsize     "3.2 GB (141 MB installed)">
-  <!ENTITY qtwebengine-time          "60 SBU (using 4 cores)">
+  <!ENTITY qtwebengine-buildsize     "3.3 GB (144 MB installed)">
+  <!ENTITY qtwebengine-time          "95 SBU (using 4 cores)">
 
   <!--   Both qmake and ninja will use all available cores, in fact ninja runs n+2