From 26fd44f8328cf7e271be45277ed49527d7fd5455 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 9 Jul 2017 18:18:51 +0000
Subject: [PATCH] Update to gnumeric-1.12.35. Update to goffice-0.10.35. Update
 to xscreensaver 5.37. Update to mercurial 4.2.2.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@18932 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 general/prog/mercurial.xml         |  4 ++--
 introduction/welcome/changelog.xml | 16 ++++++++++++++++
 packages.ent                       |  8 ++++----
 x/lib/goffice010.xml               |  3 ++-
 xsoft/office/gnumeric.xml          | 14 +++++++-------
 xsoft/other/xscreensaver.xml       |  7 ++++---
 6 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/general/prog/mercurial.xml b/general/prog/mercurial.xml
index 0155b927d0..941eb64e8a 100644
--- a/general/prog/mercurial.xml
+++ b/general/prog/mercurial.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY mercurial-download-http "https://www.mercurial-scm.org/release/mercurial-&mercurial-version;.tar.gz">
   <!ENTITY mercurial-download-ftp  " ">
-  <!ENTITY mercurial-md5sum        "6bafef85db3b4fb78a73d52d5f003c93">
+  <!ENTITY mercurial-md5sum        "357718336be62c23597115040c0d2ded">
   <!ENTITY mercurial-size          "5.1 MB">
   <!ENTITY mercurial-buildsize     "46 MB (add 371 MB for tests)">
-  <!ENTITY mercurial-time          "0.1 SBU (add 4.4 SBU for tests usinf -j4)">
+  <!ENTITY mercurial-time          "0.1 SBU (add 4.4 SBU for tests using -j4)">
 ]>
 
 <sect1 id="mercurial" xreflabel="Mercurial-&mercurial-version;">
diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 4177e5e754..75ae9680cf 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,22 @@
     <listitem>
       <para>July 9th, 2017</para>
       <itemizedlist>
+       <listitem>
+         <para>[bdubbs] - Update to gnumeric-1.12.35. Fixes
+         <ulink url="&blfs-ticket-root;9459">#9459</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to goffice-0.10.35. Fixes
+         <ulink url="&blfs-ticket-root;9458">#9458</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to xscreensaver 5.37. Fixes
+         <ulink url="&blfs-ticket-root;9455">#9455</ulink>.</para>
+       </listitem>
+       <listitem>
+         <para>[bdubbs] - Update to mercurial 4.2.2. Fixes
+         <ulink url="&blfs-ticket-root;9452">#9452</ulink>.</para>
+       </listitem>
         <listitem>
           <para>[dj] - Introduce missing patches for balsa and transmission when
           using OpenSSL-1.1.0.</para>
diff --git a/packages.ent b/packages.ent
index 8b79ca200a..d090265d6b 100644
--- a/packages.ent
+++ b/packages.ent
@@ -313,7 +313,7 @@
 <!ENTITY llvm-version                 "4.0.1">
 <!ENTITY llvm-old-version             "3.9.1">
 <!ENTITY lua-version                  "5.3.4">
-<!ENTITY mercurial-version            "4.2.1">
+<!ENTITY mercurial-version            "4.2.2">
 <!ENTITY nasm-version                 "2.13.01">
 <!ENTITY ninja-version                "1.7.2">
 <!ENTITY npapi-sdk-version            "0.27.2">
@@ -546,7 +546,7 @@
 <!ENTITY freeglut-version             "3.0.0">
 <!ENTITY gdk-pixbuf-version           "2.36.6">
 <!ENTITY glu-version                  "9.0.0">
-<!ENTITY goffice010-version           "0.10.34">
+<!ENTITY goffice010-version           "0.10.35">
 <!ENTITY gtk2-version                 "2.24.31">
 <!ENTITY gtk3-version                 "3.22.16">
 <!ENTITY gtk-engines-version          "2.20.2">
@@ -702,7 +702,7 @@
 <!-- Part X -->
 <!-- Chapter 42 -->
 <!ENTITY AbiWord-version              "3.0.2">
-<!ENTITY gnumeric-version             "1.12.34">
+<!ENTITY gnumeric-version             "1.12.35">
 <!ENTITY gnucash-version              "2.4.11">
 
 <!ENTITY libreoffice-version          "5.3.4">
@@ -737,7 +737,7 @@
 <!ENTITY xarchiver-version            "0.5.4">
 <!ENTITY xchat-version                "2.8.8">
 <!ENTITY xdg-utils-version            "1.1.2">
-<!ENTITY xscreensaver-version         "5.36">
+<!ENTITY xscreensaver-version         "5.37">
 
 <!-- Part XI -->
 <!-- Chapter 45 -->
diff --git a/x/lib/goffice010.xml b/x/lib/goffice010.xml
index 5d2706871a..7d835d9e91 100644
--- a/x/lib/goffice010.xml
+++ b/x/lib/goffice010.xml
@@ -8,7 +8,7 @@
            "&gnome-download-http;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
   <!ENTITY goffice010-download-ftp
             "&gnome-download-ftp;/goffice/0.10/goffice-&goffice010-version;.tar.xz">
-  <!ENTITY goffice010-md5sum        "d6520936468a96179a03b27b54c9215e">
+  <!ENTITY goffice010-md5sum        "3a47150f19f0968d02b77374d1a5008f">
   <!ENTITY goffice010-size          "2.3 MB">
   <!ENTITY goffice010-buildsize     "79 MB (with tests)">
   <!ENTITY goffice010-time          "1.0 SBU (with tests)">
@@ -42,6 +42,7 @@
     </para>
 
     &lfs80_checked;
+    &gcc7_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
diff --git a/xsoft/office/gnumeric.xml b/xsoft/office/gnumeric.xml
index 331363dc38..73065c6f56 100644
--- a/xsoft/office/gnumeric.xml
+++ b/xsoft/office/gnumeric.xml
@@ -6,10 +6,10 @@
 
   <!ENTITY gnumeric-download-http "&gnome-download-http;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
   <!ENTITY gnumeric-download-ftp  "&gnome-download-ftp;/gnumeric/1.12/gnumeric-&gnumeric-version;.tar.xz">
-  <!ENTITY gnumeric-md5sum        "c7ef71e3f05de387814a532309f9ecd9">
+  <!ENTITY gnumeric-md5sum        "2b253329de4121231c6dfb402116c2c2">
   <!ENTITY gnumeric-size          "19 MB">
-  <!ENTITY gnumeric-buildsize     "278 MB (add 4 MB for tests)">
-  <!ENTITY gnumeric-time          "2.5 SBU (add 1.3 SBU for tests)">
+  <!ENTITY gnumeric-buildsize     "269 MB (add 4 MB for tests)">
+  <!ENTITY gnumeric-time          "2.5 SBU (add 3.5 SBU for tests)">
 ]>
 
 <sect1 id="gnumeric" xreflabel="Gnumeric-&gnumeric-version;">
@@ -35,6 +35,7 @@
     </para>
 
     &lfs80_checked;
+    &gcc7_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -137,10 +138,9 @@ make</userinput></screen>
 
 
     <para>
-      To run the tests, issue <command>make check</command>. 
-      Tests should be run from an active
-      X session, and <xref linkend="dconf"/> should be installed to prevent some
-      failures.  The valgrind tests are known to fail.
+      To run the tests, issue <command>make check</command>.  Tests should be
+      run from an active X session, and <xref linkend="dconf"/> should be
+      installed to prevent some failures. 
     </para>
 
   </sect2>
diff --git a/xsoft/other/xscreensaver.xml b/xsoft/other/xscreensaver.xml
index f3a08e4e40..84d7faa506 100644
--- a/xsoft/other/xscreensaver.xml
+++ b/xsoft/other/xscreensaver.xml
@@ -5,10 +5,10 @@
   %general-entities;
 
   <!ENTITY xscreensaver-download-http "http://www.jwz.org/xscreensaver/xscreensaver-&xscreensaver-version;.tar.gz">
-  <!ENTITY xscreensaver-download-ftp  " ">
-  <!ENTITY xscreensaver-md5sum        "79dc3349df1fe978825991ce71a4a220">
+  <!ENTITY xscreensaver-download-ftp  "34ae54cf740c4f2627d2097ac06eef68">
+  <!ENTITY xscreensaver-md5sum        "">
   <!ENTITY xscreensaver-size          "10 MB">
-  <!ENTITY xscreensaver-buildsize     "167 MB">
+  <!ENTITY xscreensaver-buildsize     "170 MB">
   <!ENTITY xscreensaver-time          "0.9 SBU">
 ]>
 
@@ -42,6 +42,7 @@
     </para>
 
     &lfs80_checked;
+    &gcc7_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">