From 40b70d8fa5dcd1d3fa808d76d860356f777310a8 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Mon, 9 Sep 2019 23:22:16 +0000
Subject: [PATCH] Update to qtwebengine-everywhere-src-5.13.1. Update to
 qt-everywhere-src-5.13.1. Update to glib-networking-2.62.0. Update to
 mercurial-5.1.1. Update to enchant-2.2.6.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@22122 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/genlib/enchant.xml             |  4 ++--
 general/prog/mercurial.xml             |  4 ++--
 introduction/welcome/changelog.xml     | 19 +++++++++++++++++++
 networking/netlibs/glib-networking.xml | 12 ++++++------
 packages.ent                           | 10 +++++-----
 x/lib/qt5.xml                          | 25 ++++++++-----------------
 x/lib/qtwebengine.xml                  | 10 +++++-----
 7 files changed, 47 insertions(+), 37 deletions(-)

diff --git a/general/genlib/enchant.xml b/general/genlib/enchant.xml
index 46b28a7431..77d81477f5 100644
--- a/general/genlib/enchant.xml
+++ b/general/genlib/enchant.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY enchant-download-http "https://github.com/AbiWord/enchant/releases/download/v&enchant-version;/enchant-&enchant-version;.tar.gz">
   <!ENTITY enchant-download-ftp  " ">
-  <!ENTITY enchant-md5sum        "0344871b4770c4f9f549b05734881f4e">
+  <!ENTITY enchant-md5sum        "4d12e13e69b8c00c15153992de4fe989">
   <!ENTITY enchant-size          "932 KB">
-  <!ENTITY enchant-buildsize     "7.4 MB">
+  <!ENTITY enchant-buildsize     "6.8 MB">
   <!ENTITY enchant-time          "0.2 SBU">
 ]>
 
diff --git a/general/prog/mercurial.xml b/general/prog/mercurial.xml
index 5b63e810d9..799c355eed 100644
--- a/general/prog/mercurial.xml
+++ b/general/prog/mercurial.xml
@@ -6,9 +6,9 @@
 
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "7b1902492cee88acfc3b62caae70f636">
+  <!ENTITY mercurial-md5sum        "3ba8caa5198fec0df036fb7d591e2ca2">
   <!ENTITY mercurial-size          "6.9 MB">
-  <!ENTITY mercurial-buildsize     "74 MB (with docs, add 571 MB for tests)">
+  <!ENTITY mercurial-buildsize     "74 MB (with docs, add 765 MB for tests)">
   <!ENTITY mercurial-time          "0.5 SBU (with docs, add 10 SBU for tests using -j4)">
 ]>
 
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index a6674165ca..0496db242f 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,25 @@
     <listitem>
       <para>September 9th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to qtwebengine-everywhere-src-5.13.1.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to qt-everywhere-src-5.13.1. Fixes
+          <ulink url="&blfs-ticket-root;12492">#12492</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to glib-networking-2.62.0. Fixes
+          <ulink url="&blfs-ticket-root;12506">#12506</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to mercurial-5.1.1. Fixes
+          <ulink url="&blfs-ticket-root;12496">#12496</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[bdubbs] - Update to enchant-2.2.6. Fixes
+          <ulink url="&blfs-ticket-root;12494">#12494</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[dj] - Replace PyCrypto with PyCryptodome. Fixes
           <ulink url="&blfs-ticket-root;12210">#12210</ulink>.</para>
diff --git a/networking/netlibs/glib-networking.xml b/networking/netlibs/glib-networking.xml
index ddd45d7def..2cbbc73ffb 100644
--- a/networking/netlibs/glib-networking.xml
+++ b/networking/netlibs/glib-networking.xml
@@ -5,13 +5,13 @@
   %general-entities;
 
   <!ENTITY glib-networking-download-http
-    "&gnome-download-http;/glib-networking/2.60/glib-networking-&glib-networking-version;.tar.xz">
+    "&gnome-download-http;/glib-networking/2.62/glib-networking-&glib-networking-version;.tar.xz">
   <!ENTITY glib-networking-download-ftp
-    "&gnome-download-ftp;/glib-networking/2.60/glib-networking-&glib-networking-version;.tar.xz">
-  <!ENTITY glib-networking-md5sum        "e8fd0462a82269fb4bbd6c07a1e7d0f4">
-  <!ENTITY glib-networking-size          "184 KB">
-  <!ENTITY glib-networking-buildsize     "5.7 MB (with tests)">
-  <!ENTITY glib-networking-time          "0.1 SBU (with tests)">
+    "&gnome-download-ftp;/glib-networking/2.62/glib-networking-&glib-networking-version;.tar.xz">
+  <!ENTITY glib-networking-md5sum        "33487436a16f9e79beac1c1a3b55f276">
+  <!ENTITY glib-networking-size          "180 KB">
+  <!ENTITY glib-networking-buildsize     "4.4 MB (with tests)">
+  <!ENTITY glib-networking-time          "less than 0.1 SBU (with tests)">
 ]>
 
 <sect1 id="glib-networking" xreflabel="glib-networking-&glib-networking-version;">
diff --git a/packages.ent b/packages.ent
index 3e99ff888a..606aa993db 100644
--- a/packages.ent
+++ b/packages.ent
@@ -90,7 +90,7 @@
 
 <!ENTITY clucene-version              "2.3.3.4">
 <!ENTITY dbus-glib-version            "0.110">
-<!ENTITY enchant-version              "2.2.5">
+<!ENTITY enchant-version              "2.2.6">
 <!ENTITY exempi-version               "2.5.1">
 <!ENTITY expat-version                "2.1.0">
 <!ENTITY fftw-version                 "3.3.8">
@@ -324,7 +324,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY llvm-version                 "8.0.1">
 <!ENTITY lua-version                  "5.3.5">
 <!ENTITY lua52-version                "5.2.4">
-<!ENTITY mercurial-version            "5.1">
+<!ENTITY mercurial-version            "5.1.1">
 <!ENTITY nasm-version                 "2.14.02">
 <!ENTITY ninja-version                "1.9.0">
 <!ENTITY npapi-sdk-version            "0.27.2">
@@ -575,7 +575,7 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY c-ares-version               "1.15.0">
 <!ENTITY curl-version                 "7.65.3">
 <!ENTITY geoclue2-version             "2.5.3">
-<!ENTITY glib-networking-version      "2.60.3">
+<!ENTITY glib-networking-version      "2.62.0">
 <!ENTITY ldns-version                 "1.7.1">
 <!ENTITY libevent-version             "2.1.11">
 <!ENTITY libnl-version                "3.5.0">
@@ -704,8 +704,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY libxklavier-version          "5.4">
 <!ENTITY pango-version                "1.42.4">
 <!ENTITY pangomm-version              "2.42.0">
-<!ENTITY qt5-version                  "5.13.0">
-<!ENTITY qtwebengine-version          "5.13.0">
+<!ENTITY qt5-version                  "5.13.1">
+<!ENTITY qtwebengine-version          "5.13.1">
 <!ENTITY qtwebkit-version             "5.9.0">
 <!ENTITY qscintilla-version           "2.10.4">
 <!ENTITY shared-mime-info-version     "1.12">
diff --git a/x/lib/qt5.xml b/x/lib/qt5.xml
index 18788b3c10..2cabb309c7 100644
--- a/x/lib/qt5.xml
+++ b/x/lib/qt5.xml
@@ -9,10 +9,10 @@
 
   <!ENTITY qt5-download-http "&qt5-url;/qt-everywhere-src-&qt5-version;.tar.xz">
   <!ENTITY qt5-download-ftp  " ">
-  <!ENTITY qt5-md5sum        "3c168d9a3a08248ff36f4f54c82e437f">
-  <!ENTITY qt5-size          "481 MB">
-  <!ENTITY qt5-buildsize     "12.5 GB (245 MB installed)">
-  <!ENTITY qt5-time          "46 SBU (using parallelism=4)">
+  <!ENTITY qt5-md5sum        "d66b1da335d0c25325fdf493e9044c38">
+  <!ENTITY qt5-size          "479 MB">
+  <!ENTITY qt5-buildsize     "12.5 GB (246 MB installed)">
+  <!ENTITY qt5-time          "35 SBU (using parallelism=4)">
 ]>
 
 <sect1 id="qt5" xreflabel="Qt-&qt5-version;">
@@ -77,7 +77,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
+<!--
    <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing='compact'>
       <listitem>
@@ -85,7 +85,7 @@
         url="&patch-root;/qt-&qt5-version;-upstream_fixes-1.patch"/></para>
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">Qt5 Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -238,25 +238,16 @@ ln -sfnv qt-&qt5-version; /opt/qt5</userinput></screen>
             -translationdir /usr/share/qt5/translations \
             -examplesdir    /usr/share/doc/qt5/examples</userinput></screen>
     </note>
-
+<!--
     <para>
       First fix some issues found upstream:
     </para>
 
 <screen><userinput>patch -Np1 -i ../qt-&qt5-version;-upstream_fixes-1.patch &amp;&amp;</userinput></screen> 
-
-<!--<para>
-      Next, fix an issue caused by changes in the Kernel API Headers:
-    </para>
-
-<screen><userinput remap="pre">sed -i 's/SIOCGSTAMP/0x8906/' \
-qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp</userinput></screen>-->
+-->
     <para>
       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;
diff --git a/x/lib/qtwebengine.xml b/x/lib/qtwebengine.xml
index c334d42c84..5f117d21dc 100644
--- a/x/lib/qtwebengine.xml
+++ b/x/lib/qtwebengine.xml
@@ -10,7 +10,7 @@
   <!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)">
+  <!ENTITY qtwebengine-time          "61 SBU (using 4 cores)">
 ]>
 
 <sect1 id="qtwebengine" xreflabel="qtwebengine-&qtwebengine-version;">
@@ -94,7 +94,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
+<!--
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
@@ -104,7 +104,7 @@
         </para>
       </listitem>
     </itemizedlist>
-
+-->
     <bridgehead renderas="sect3">qtwebengine Dependencies</bridgehead>
 
     <bridgehead renderas="sect4">Required</bridgehead>
@@ -158,14 +158,14 @@
 
 <screen><userinput>find -type f -name "*.pr[io]" |
   xargs sed -i -e 's|INCLUDEPATH += |&amp;$$QTWEBENGINE_ROOT/include |'</userinput></screen>
-
+<!--
     <para>
       Next, apply a patch that fixes background rendering issues in Falkon,
       and crashes on multimedia-heavy sites.
     </para>
 
 <screen><userinput remap="pre">patch -Np1 -i ../qtwebengine-&qtwebengine-version;-background_rendering_fix-1.patch</userinput></screen>
-    
+-->    
     <para>
       If an older version of the package's main library has been installed,
       when the package is built separately it will link to that in preference