Changeset 604d16a

Timestamp:

07/06/2019 02:52:28 AM (4 years ago)

Author:

Bruce Dubbs <bdubbs@…>

Branches:

10.0, 10.1, 11.0, 11.1, 11.2, 11.3, 12.0, 9.0, 9.1, kea, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/python-mods, qt5new, renodr/vulkan-addition, trunk, upgradedb, xry111/intltool, xry111/soup3, xry111/test-20220226, xry111/xf86-video-removal

Children:

0c38e23

Parents:

05e57e19

Message:

Update to qtwebengine-everywhere-src-5.13.0.
Clarify python3 instructions in qt-everywhere-src-5.13.0.

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

Files:

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

introduction/welcome/changelog.xml

@@ -46 +46 @@
       <para>July 5th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to qtwebengine-everywhere-src-5.13.0. 
+          Clarify python3 instructions in qt-everywhere-src-5.13.0. Fixes
+          <ulink url="&blfs-ticket-root;12173">#12173</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[renodr] - Update to libbytesize-2.1. Fixes

packages.ent

@@ -708 +708 @@
 <!ENTITY pangomm-version              "2.42.0">
 <!ENTITY qt5-version                  "5.13.0">
-<!ENTITY qtwebengine-version          "5.12.4">
+<!ENTITY qtwebengine-version          "5.13.0">
 <!ENTITY qtwebkit-version             "5.9.0">
 <!ENTITY qscintilla-version           "2.10.4">

x/lib/qt5.xml

@@ -249 +249 @@
       Install <application>Qt5</application> by running the following commands:
     </para>
-
+<!--
 <screen><userinput>find . -name "*.pr[io]" | xargs sed -i 's/python/&amp;3/' &amp;&amp;
+-->
+
+<screen><userinput>sed -i 's/python /python3 /' qtdeclarative/qtdeclarative.pro \
+                             qtdeclarative/src/3rdparty/masm/masm.pri &amp;&amp;
 
 ./configure -prefix $QT5PREFIX                        \
@@ -384 +388 @@
 
     <para>
-      <command>find ... | xargs sed ...</command>: Allows using
+      <command>sed ...</command>: Allows using
       <application>Python 3</application> instead of <application>Python
       2</application>. This command destroys the build for QtWebEngine, so do

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        "9f1f20537eba9b166cd0e59191e49f29">
-  <!ENTITY qtwebengine-size          "238 MB">
-  <!ENTITY qtwebengine-buildsize     "3.3 GB (135 MB installed)">
-  <!ENTITY qtwebengine-time          "40 SBU (using 4 cores)">
+  <!ENTITY qtwebengine-md5sum        "235ecc14211ba03ae7331c175c1b7c78">
+  <!ENTITY qtwebengine-size          "245 MB">
+  <!ENTITY qtwebengine-buildsize     "3.5 GB (135 MB installed)">
+  <!ENTITY qtwebengine-time          "62 SBU (using 4 cores)">
 ]>