[blfs-book] r10566 - trunk/BOOK/xsoft/office

[krejzi]

Author: krejzi
Date: 2012-08-24 11:47:26 -0600 (Fri, 24 Aug 2012)
New Revision: 10566

Modified:
   trunk/BOOK/xsoft/office/libreoffice.xml
Log:
Mark Libreoffice as LFS 7.2 checked. Add a patch that fixes compilation with 
system poppler.

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
===================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml     2012-08-24 14:42:47 UTC (rev 
10565)
+++ trunk/BOOK/xsoft/office/libreoffice.xml     2012-08-24 17:47:26 UTC (rev 
10566)
@@ -36,7 +36,7 @@
       and is descended from OpenOffice.org.
     </para>
 
-    &lfs71_checked;
+    &lfs72_checked;
 
     <bridgehead renderas="sect3">Package Information</bridgehead>
     <itemizedlist spacing="compact">
@@ -75,9 +75,13 @@
     <bridgehead renderas="sect3">Additional Downloads</bridgehead>
     <itemizedlist spacing="compact">
       <listitem>
-        <para>Optional patch (required if you have Boost 1.50): <ulink
+        <para>Optional patch (required if you have Boost 1.50+): <ulink
         
url="&patch-root;/libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch"/></para>
       </listitem>
+      <listitem>
+        <para>Optional patch (required if you are using system version of 
Poppler): <ulink
+        
url="&patch-root;/libreoffice-core-&libreoffice-version;.4-poppler_fix-1.patch"/></para>
+      </listitem>
     </itemizedlist>
     
     <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
@@ -118,8 +122,7 @@
       <xref linkend="libxml2"/> and <xref linkend="libxslt"/>,
       <xref linkend="neon"/>,
       <xref linkend="nss"/>,
-      <!-- LibreOffice 3.6.0.4 doesn't build with current poppler, using 
internal version
-      <xref linkend="poppler"/>, -->
+      <xref linkend="poppler"/>,
       <xref linkend="openssl"/> and
       <xref linkend="redland"/>.
     </para>
@@ -177,6 +180,7 @@
     </para>
 
 <screen><userinput>patch -Np1 -i 
../libreoffice-core-&libreoffice-version;.4-boost_fix-1.patch &amp;&amp;
+patch -Np1 -i ../libreoffice-core-&libreoffice-version;.4-poppler_fix-1.patch 
&amp;&amp;
 ./autogen.sh --prefix=/usr  \
   --disable-binfilter       \
   --disable-gconf           \
@@ -195,7 +199,8 @@
   --with-system-libxml      \
   --with-system-neon        \
   --with-system-nss         \
-  --with-system-openssl     \<!--  - -with-system-poppler     \ -->
+  --with-system-openssl     \
+  --with-system-poppler     \
   --with-system-redland     \
   --with-system-zlib        \
   --without-java            \

-- 
http://linuxfromscratch.org/mailman/listinfo/blfs-book
FAQ: http://www.linuxfromscratch.org/blfs/faq.html
Unsubscribe: See the above information page