From ceadeab443ca849477237ad1c3ebdd736bcb87b4 Mon Sep 17 00:00:00 2001
From: Andrew Benton <andy@linuxfromscratch.org>
Date: Tue, 10 Apr 2012 12:43:21 +0000
Subject: [PATCH] Libre Office dependency improvements

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@9891 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 xsoft/office/libreoffice.xml | 35 ++++++++++++++++++++++-------------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml
index c5166c1d74..627449491a 100644
--- a/xsoft/office/libreoffice.xml
+++ b/xsoft/office/libreoffice.xml
@@ -159,29 +159,33 @@
 
     <bridgehead renderas="sect4">Required</bridgehead>
     <para role="required">
+      <xref linkend="cups"/>,
+      <xref linkend="curl"/> or <xref linkend="wget"/>,
+      <xref linkend="gperf"/>,
       <xref linkend="gtk2"/> or <xref linkend="gtk3"/>,
       <application>Perl Modules</application>
-      <xref linkend="perl-xml-parser"/> and
-      <xref linkend="perl-archive-zip"/>,
+      <xref linkend="perl-archive-zip"/> and
+      <xref linkend="perl-xml-parser"/>,
       <xref linkend="unzip"/>,
-      <xref linkend="zip"/> and
-      <xref linkend="which"/>.
+      <xref linkend="which"/> and
+      <xref linkend="zip"/>.
     </para>
 
     <bridgehead renderas="sect4">Recommended</bridgehead>
     <note>
       <para>
-        These packages are recommend because if they're not installed the build
-        process will compile and install its own (often older) version.
+        Most of these packages are recommend because if they're not installed
+        the build process will compile and install its own (often older)
+        version. If you're using <application>GCC 4.7</application> some of
+        those older packages will fail to compile.
       </para>
     </note>
 
     <para role="recommended">
       <xref linkend="boost"/>,
-      <xref linkend="curl"/>,
       <xref linkend="db"/>,
       <xref linkend="expat"/>,
-      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
+      <xref linkend="gst-plugins-base"/>,
       <xref linkend="libjpeg"/>,
       <xref linkend="libgsf"/>,
       <xref linkend="libpng"/>,
@@ -197,11 +201,11 @@
 
     <bridgehead renderas="sect4">Optional</bridgehead>
     <para role="optional">
+      <ulink url="http://hunspell.sourceforge.net/">Hunspell</ulink>,
       <ulink url="http://sourceforge.net/projects/hunspell/files/MyThes/">MyThes</ulink>,
       <ulink url="http://sampleicc.sourceforge.net/">SampleICC</ulink>,
       <ulink url="http://hci.iwr.uni-heidelberg.de/vigra">Vigra</ulink> and
-      <xref linkend="zenity"/>
-      .
+      <xref linkend="zenity"/>.
     </para>
 
     <para condition="html" role="usernotes">
@@ -220,10 +224,10 @@
         to a user with numerical id 11012 and with the permissions set to allow
         read, write and execute for that user only! If you untared as
         <systemitem class="username">root</systemitem> in your home folder you
-        could end up unable to log in again. If you untared it in
+        could end up unable to log in again :/ If you untared it in
         <filename class="directory">/usr</filename> you would find your user
         account unable to access any file in
-        <filename class="directory">/usr</filename> :/
+        <filename class="directory">/usr</filename>.
       </para>
 
       <para>
@@ -343,6 +347,11 @@ gtk-update-icon-cache /usr/share/icons/hicolor</userinput></screen>
       want to use <application>Gtk+-3</application>.
     </para>
 
+    <para>
+      <option>--disable-gstreamer</option>: add this option if you've not
+      installed <xref linkend="gst-plugins-base"/>.
+    </para>
+
     <para>
       <option>--disable-binfilter</option>: These "binfilters" enable
       <application>Libre Office</application> to open legacy
@@ -370,7 +379,7 @@ gtk-update-icon-cache /usr/share/icons/hicolor</userinput></screen>
     </para>
 
     <para>
-      <option>--with-system- ...</option>: These options stops it trying to
+      <option>--with-system- ...</option>: These options stop it trying to
       compile its own versions of these dependencies. If you've not installed
       some of these dependencies remove the corresponding option.
     </para>