Index: introduction/welcome/changelog.xml
===================================================================
--- introduction/welcome/changelog.xml	(revision 29d1160177bbf5e9b3965f9283a277463228889d)
+++ introduction/welcome/changelog.xml	(revision bbd73d4893bf99ee374f55c6dc14d41f25c8e9f0)
@@ -45,4 +45,10 @@
       <para>February 9th, 2020</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Adjust the build of libreoffice: remove obsolete switches,
+          note that all of dictionaries, help and translations will be downloaded
+          if not present, reinstate system poppler. Fixes
+          <ulink url="&blfs-ticket-root;13106">#13106</ulink>.</para>
+        </listitem>
         <listitem>
           <para>[bdubbs] - Update to gdb-9.1. Fixes
Index: xsoft/office/libreoffice.xml
===================================================================
--- xsoft/office/libreoffice.xml	(revision 29d1160177bbf5e9b3965f9283a277463228889d)
+++ xsoft/office/libreoffice.xml	(revision bbd73d4893bf99ee374f55c6dc14d41f25c8e9f0)
@@ -23,14 +23,25 @@
   <!ENTITY libreoffice-translations-size          "164 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.5 GB (782 MB installed). Installing the whole set of languages was previously reported to require up to 26 GB (2.9 GB installed)">
+  <!-- full size remeasured for 6.4.0.3 -->
+
+  <!ENTITY libreoffice-buildsize  "9.0 GB including the additional files if downloaded during the build (820 MB installed). Installing the whole set of languages for 6.4.0.3 required up to 25 GB (3.2 GB installed)">
+
+ <!-- Editors: many updates to poppler will break LO using system poppler until
+      somebody is able to provide a patch or sed.  In these cases, please mark
+      the dependency as currently broken and move the \-\-with-system-poppler
+      line to a comment. Also please switch poppler between recommended and
+      optional according to whether or not we use the system version.  The
+      installed size will be increased by 2 MB if using the shipped poppler, but
+      the variation in build times will be lost in the noise. - ken -->
 
   <!-- 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
+
+       For 6.4.0.3 downloading everything including dictionaries,
+       help, translations took less than 2 minutes (1.1 SBU) with
+       a good domestic internet connection.  Total time was 60 SBU - ken
   -->
-  <!ENTITY libreoffice-time "59 SBU with parallelism=4 including typical download time">
+  <!ENTITY libreoffice-time "54 SBU with parallelism=4 including typical download time">
 
 ]>
@@ -91,4 +102,13 @@
 
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
+
+    <note>
+      <para>
+        Around 80 smallish tarballs and zip files will be downloaded during the
+        build. If you have not downloaded one or more of the following, they too
+        will also be downloaded during the build.
+      </para>
+    </note>
+
     <itemizedlist spacing="compact">
       <listitem>
@@ -194,8 +214,8 @@
       <xref linkend="graphite2"/>,
       <xref linkend="gst10-plugins-base"/>,
-      <xref linkend="gtk3"/> and
-      <xref linkend="gtk2"/> (see <quote>Command Explanations</quote>),
+      <xref linkend="gtk3"/>,
+ <!-- <xref linkend="gtk2"/>  -->
       <xref linkend="harfbuzz"/>,
- <!-- <xref linkend="icu"/>,-->
+      <xref linkend="icu"/>
       <xref linkend="libatomic_ops"/>,
       <xref linkend="lcms2"/>,
@@ -208,4 +228,5 @@
       <xref linkend="nss"/>,
       <xref linkend="openldap"/> (if connecting to an LDAP server),
+      <xref linkend="poppler"/>,
       <xref linkend="postgresql"/>,
       <xref linkend="redland"/>,
@@ -232,5 +253,4 @@
       <xref linkend="mitkrb"/>,
       <xref linkend="nasm"/>,
-      <xref linkend="poppler"/> (currently broken), 
       <xref linkend="sane"/>,
       <xref linkend="telepathy-glib"/>,
@@ -311,17 +331,13 @@
 
     <para>
-      Create symlinks to tarballs from the source directory so they won't
-      get downloaded again:
+      If you have downloaded the dictionaries, help and translations tarballs,
+      create symlinks to them from the source directory so they won't get
+      downloaded again:
     </para>
 
 <screen><userinput>install -dm755 external/tarballs &amp;&amp;
 ln -sv ../../../libreoffice-dictionaries-&libreoffice-dlversion;.tar.xz external/tarballs/ &amp;&amp;
-ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz         external/tarballs/</userinput></screen>
-
-    <para>
-      If you have downloaded the translations tarball, create a symlink:
-    </para>
-
-<screen><userinput>ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
+ln -sv ../../../libreoffice-help-&libreoffice-dlversion;.tar.xz         external/tarballs/ &amp;&amp;
+ln -sv ../../../libreoffice-translations-&libreoffice-dlversion;.tar.xz external/tarballs/</userinput></screen>
 
     <note>
@@ -364,17 +380,13 @@
 sed -e '/JAVA_SOURCE_VER/s/6/7/' \
     -e '/JAVA_TARGET_VER/s/6/7/' \
-    -i configure.ac
-
-<!-- Removed in 6.2             - -with-alloc=system
-     In 6.3  -disable-gtk -enable-gtk3 added (sic, I accidentally built like
-     that) which allows removal of  - -with-system-cairo but did NOT cause
-     system epoxy to be automatically used, as configure claimed -->
-<!--
-     libfreehand-0.1.2 is downloaded (from freedesktop.org) but moving to
-     ICU-65.1 has highlighted a missing semicolon in one of the files,
-     causing libreoffice to fail to build : command moved to an option with
-     explanation until a newer version of libfreehand is pulled in.
-             \-\-with-system-icu           \
--->
+    -i configure.ac &amp;&amp;
+
+sed -e 's/globalParams = new GlobalParams()/globalParams.reset(new GlobalParams())/' \
+    -i sdext/source/pdfimport/xpdfwrapper/wrapper_gpl.cxx
+
+sed -e 's/printPath( GfxPath/printPath(const GfxPath/' \
+    -e 's/  GfxSubpath/ const GfxSubpath/' \
+    -i sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.*
+
 ./autogen.sh --prefix=$LO_PREFIX         \
              --sysconfdir=/etc           \
@@ -401,4 +413,5 @@
              --with-system-graphite      \
              --with-system-harfbuzz      \
+             --with-system-icu           \
              --with-system-jpeg          \
              --with-system-lcms2         \
@@ -411,4 +424,5 @@
              --with-system-openldap      \
              --with-system-openssl       \
+             --with-system-poppler       \
              --with-system-postgresql    \
              --with-system-redland       \
@@ -416,5 +430,4 @@
              --with-system-zlib</userinput></screen>
 
-<!--             - -with-system-poppler       \ -->
     <para>
       The instructions below will only build the package without running
@@ -501,6 +514,8 @@
     <para>
       <command>sed -e ...</command>: The first sed prevents compression of the
-      manual pages, the second one prevents the install from failing, and the
-      the third allows to build with OpenJDK-12.
+      manual pages, the second one prevents the install from failing, the third
+      allows to build with OpenJDK-12, and the third and fourth allow
+      poppler-0.85.0 to be used.
+      <!-- FIXME update hardcoded poppler version in text when necessary -->
     </para>
 
@@ -563,10 +578,4 @@
 
     <para>
-      <parameter>-disable-gtk -enable-gtk3</parameter>: This pair of switches
-      tell the configure script to use <application>GTK+-3</application> instead
-      of <application>GTK+-2</application>.
-    </para>
-
-    <para>
       <parameter>--without-junit</parameter>: This switch disables the tests
       for the deprecated HSQLDB driver which is written in Java. If you wish
@@ -598,5 +607,5 @@
       <parameter>--enable-python=system</parameter>: This switch tells
       <application>LibreOffice</application> to use installed
-      <application>Python 3</application> to build the translations instead of
+      <application>Python 3</application> instead of
       the bundled one.
     </para>
@@ -654,11 +663,12 @@
     </para>
 
-    <para>
-      <option>--disable-gtk3</option>: Use this switch if you have not installed
+<!-- only gtk3 is referenced in the configure script for 6.4.0.3
+    <para>
+      <option>\-\-disable-gtk3</option>: Use this switch if you have not installed
       <application>GTK+-3</application>, or if you have installed it but wish
       to use <application>GTK+-2</application> (the menu icons differ).
- <!-- Note that a <application>GTK+-3</application> build still
-      requires <application>GTK+-2</application> to build the gtk-plugin.-->
-    </para>
+ <!\-\- Note that a <application>GTK+-3</application> build still
+      requires <application>GTK+-2</application> to build the gtk-plugin.\-\->
+    </para>-->
 
     <para>
@@ -668,4 +678,10 @@
       installed <application>PostgreSQL</application> and you do not want
       <application>LibreOffice</application> to compile its bundled copy.
+    </para>
+
+    <para>
+      <option>--enable-gtk3-kde5</option>: This switch allows the Visual Class
+      Library, which is responsible for widgets, to be built with KF5 file
+      dialogs if GTK+-3, Qt5 and Plasma are all available.
     </para>
 
