From 5cc300f315fe7fc33c5469c9bfab7abba99fbee2 Mon Sep 17 00:00:00 2001
From: Bruce Dubbs <bdubbs@linuxfromscratch.org>
Date: Sun, 13 Jan 2019 21:17:09 +0000
Subject: [PATCH] Update to libreoffice-6.1.4.2

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@20971 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml |  4 +++
 packages.ent                       |  4 +--
 xsoft/office/libreoffice.xml       | 47 ++++++++++++------------------
 3 files changed, 24 insertions(+), 31 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index dc4c6de46f..81dc5534e5 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -45,6 +45,10 @@
     <listitem>
       <para>January 13th, 2019</para>
       <itemizedlist>
+        <listitem>
+          <para>[bdubbs] - Update to libreoffice-6.1.4.2. Fixes
+          <ulink url="&blfs-ticket-root;11180">#11180</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[pierre] - Fix the W3M patch so that it builds with GC
           8.0.x.</para>
diff --git a/packages.ent b/packages.ent
index 14cd9f5328..900790b75e 100644
--- a/packages.ent
+++ b/packages.ent
@@ -844,8 +844,8 @@ to avoid building libxml2 twice, which is slow with all deps -->
 <!ENTITY gnumeric-version             "1.12.44">
 <!ENTITY gnucash-version              "2.4.11">
 
-<!ENTITY libreoffice-version          "6.1.2">
-<!ENTITY libreoffice-patch            ".1">
+<!ENTITY libreoffice-version          "6.1.4">
+<!ENTITY libreoffice-patch            ".2">
 <!ENTITY libreoffice-dlversion        "&libreoffice-version;&libreoffice-patch;">
 
 <!-- Chapter 43 -->
diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml
index d4b736ff5d..d02c4e7433 100644
--- a/xsoft/office/libreoffice.xml
+++ b/xsoft/office/libreoffice.xml
@@ -7,31 +7,32 @@
   <!ENTITY libreoffice-dl "http://download.documentfoundation.org/libreoffice/src/&libreoffice-version;">
 
   <!ENTITY libreoffice-core-download-http "&libreoffice-dl;/libreoffice-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-core-md5sum        "b8d746b56e39b1926e61a4ede7c71891">
+  <!ENTITY libreoffice-core-md5sum        "f6e69df90d8d6de6dd223d5309f71caa">
   <!ENTITY libreoffice-core-size          "198 MB">
 
   <!ENTITY libreoffice-dict-download-http "&libreoffice-dl;/libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-dict-md5sum        "d0b075239e5c628cc53eff999ea78868">
-  <!ENTITY libreoffice-dict-size          "41 MB">
+  <!ENTITY libreoffice-dict-md5sum        "e5bb56a92b72c3102f4917aafebba3b4">
+  <!ENTITY libreoffice-dict-size          "42 MB">
 
   <!ENTITY libreoffice-help-download-http "&libreoffice-dl;/libreoffice-help-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-help-md5sum        "383c63275294891f33da9b7d326671ee">
+  <!ENTITY libreoffice-help-md5sum        "e02680a25ab4f5eee112170f20bf47d0">
   <!ENTITY libreoffice-help-size          "16 MB">
 
   <!ENTITY libreoffice-translations-download-http "&libreoffice-dl;/libreoffice-translations-&libreoffice-dlversion;.tar.xz">
-  <!ENTITY libreoffice-translations-md5sum        "2937eac11d5ac8f1a5d4c3f5920904ab">
+  <!ENTITY libreoffice-translations-md5sum        "8c99e7da7bfc9515f5d074ca7449471b">
   <!ENTITY libreoffice-translations-size          "135 MB">
 
 
   <!-- full size still accurate for 6.0.2, reconfiguring and rebuilding
    the built source after initial DESTDIR install doesn't take a vast time -->
 
-  <!ENTITY libreoffice-buildsize          "6.2 GB (746 MB installed). Installing the whole set of languages was previously reported to require up to 26 GB (2.9 GB installed)">
+  <!ENTITY libreoffice-buildsize  "6.4 GB (756 MB installed). Installing the whole set of languages was previously reported to require up to 26 GB (2.9 GB installed)">
 
   <!-- for 6.1.2.1 I allowed 2 SBU for downloads, my total was 
        64.76 SBU with fast downloads 
+       for 6.1.4.2 I just used the total time - bdubbs
   -->
-  <!ENTITY libreoffice-time               "64 SBU with parallelism=4 + download time">
+  <!ENTITY libreoffice-time "63 SBU with parallelism=4 including typical download time">
 
 ]>
 
@@ -150,16 +151,8 @@
       <listitem>
         <para>
           Required patch to fix building with system <xref linkend="poppler"/> (all
-          recent versions):
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler70-1.patch"/>
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Required patch to fix building with system <xref linkend="poppler"/>
-          (only if using that version or a later version):
-          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-poppler71-1.patch"/>
+          recent versions) and <xref linkend="boost"/>:
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch"/>
         </para>
       </listitem>
 
@@ -303,6 +296,14 @@
 <screen><userinput>tar -xf libreoffice-&libreoffice-dlversion;.tar.xz --no-overwrite-dir &amp;&amp;
 cd libreoffice-&libreoffice-dlversion;</userinput></screen>
 
+<!-- keep a commented instruction if no patches are currently required -->
+    <para> <!-- for all recent versions -->
+     Fix build failures introduced by recent versions of <xref linkend="poppler"/>
+     and <xref linkend="boost"/>:
+    </para>
+
+<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-consolidated_fixes-1.patch</userinput></screen>
+
     <para>
       Create symlinks to tarballs from the source directory so they won't
       get downloaded again:
@@ -337,18 +338,6 @@ ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz         external
     </para>
 
 <screen><userinput>export LO_PREFIX=<replaceable>&lt;PREFIX&gt;</replaceable></userinput></screen>
-<!-- keep a commented instruction if no patches are currently required -->
-    <para> <!-- for all recent versions -->
-     Fix build failures introduced by recent versions of <xref linkend="poppler"/>:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler70-1.patch</userinput></screen>
-
-    <para> <!-- for 0.71.0, not tested on earlier versions -->
-     Similarly, fix build failures introduced with <xref linkend="poppler"/>:
-    </para>
-
-<screen><userinput>patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-poppler71-1.patch</userinput></screen>
 
     <para>
       Locales "fr" and "en-GB", you will find below, are just examples; you