From 889aa40e0807c0efcff0d885ef946ed8e761511b Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pieere@linuxfromscratch.org>
Date: Sat, 7 Feb 2015 22:24:44 +0000
Subject: [PATCH] Update to goffice-0.10.20 and gnumeric-1.12.20

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@15466 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  8 ++++++++
 packages.ent                       |  4 ++--
 x/lib/goffice010.xml               |  4 ++--
 xsoft/office/gnumeric.xml          | 10 +++++++---
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 7fd38aab70..a3d3a68823 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,14 @@
     <listitem>
       <para>February 7th, 2015</para>
       <itemizedlist>
+        <listitem>
+          <para>[pierre] - Update to gnumeric-1.12.20. Fixes
+          <ulink url="&blfs-ticket-root;6114">#6114</ulink>.</para>
+        </listitem>
+        <listitem>
+          <para>[pierre] - Update to goffice-0.10.20. Fixes
+          <ulink url="&blfs-ticket-root;6113">#6113</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Update to cmake-3.1.2. Fixes
           <ulink url="&blfs-ticket-root;6119">#6119</ulink>.</para>
diff --git a/packages.ent b/packages.ent
index 4e2fe661a2..dac99edbbc 100644
--- a/packages.ent
+++ b/packages.ent
@@ -461,7 +461,7 @@
 <!ENTITY freeglut-version             "2.8.1">
 <!ENTITY gdk-pixbuf-version           "2.31.1">
 <!ENTITY glu-version                  "9.0.0">
-<!ENTITY goffice010-version           "0.10.19">
+<!ENTITY goffice010-version           "0.10.20">
 <!ENTITY gtk2-version                 "2.24.25">
 <!ENTITY gtk3-version                 "3.14.8">
 <!ENTITY gtk-engines-version          "2.20.2">
@@ -577,7 +577,7 @@
 <!-- Part X -->
 <!-- Chapter 34 -->
 <!ENTITY AbiWord-version              "3.0.1">
-<!ENTITY gnumeric-version             "1.12.19">
+<!ENTITY gnumeric-version             "1.12.20">
 <!ENTITY gnucash-version              "2.4.11">
 
 <!ENTITY libreoffice-version          "4.4.0">
diff --git a/x/lib/goffice010.xml b/x/lib/goffice010.xml
index 32d973c1b6..c1e3b81cec 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        "5f9806f808be361230c2efe0503767e4">
+  <!ENTITY goffice010-md5sum        "1785853fa42a13a3067e42773abdc905">
   <!ENTITY goffice010-size          "2.2 MB">
   <!ENTITY goffice010-buildsize     "95 MB (additional 2 MB for the tests)">
   <!ENTITY goffice010-time          "0.9 SBU (additional less than 0.1 SBU for the tests)">
@@ -145,7 +145,7 @@ make</userinput></screen>
           None
         </seg>
         <seg>
-          libgoffice-0.10.so and
+          libgoffice-0.10.so
         </seg>
         <seg>
           /usr/include/libgoffice-0.10,
diff --git a/xsoft/office/gnumeric.xml b/xsoft/office/gnumeric.xml
index 347f7f114e..23869ae897 100644
--- a/xsoft/office/gnumeric.xml
+++ b/xsoft/office/gnumeric.xml
@@ -6,7 +6,7 @@
 
   <!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        "74abf39132d672d5fc0d16a19e62e3aa">
+  <!ENTITY gnumeric-md5sum        "d60bad3065348fefe2096a16a9bc11dd">
   <!ENTITY gnumeric-size          "17.6 MB">
   <!ENTITY gnumeric-buildsize     "276 MB (additional 2 MB for the tests)">
   <!ENTITY gnumeric-time          "1.8 SBU (additional 1.5 SBU for the tests)">
@@ -82,12 +82,14 @@
     <para role="recommended runtime">
        an icon theme such as <xref linkend="adwaita-icon-theme"/>,
        <xref linkend="oxygen-icons"/> or
-       <xref linkend="gnome-icon-theme"/>, and
+       <xref linkend="gnome-icon-theme"/>,
+       <xref linkend="x-window-system"/>, and
        <xref linkend="yelp"/> for the buit-in help functionality
     </para>
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <xref linkend="dconf"/> (to prevent some test failures),
       <xref linkend="gobject-introspection"/>,
       <xref linkend="pygobject3"/>,
       <xref linkend="valgrind"/> (for some tests),
@@ -136,7 +138,9 @@ make</userinput></screen>
 
     <para>
       If you wish to test the results, issue <command>make -k check</command>.
-      A few tests fail, some for known reasons.
+      Tests must be run from an active X session, and <xref linkend="dconf"/>
+      should be installed to prevent some failures. Even so, a few tests fail,
+      some for known reasons.
     </para>
 
   </sect2>