[blfs-book] r11648 - in trunk/BOOK: introduction/welcome xsoft/office

fernando at higgs.linuxfromscratch.org fernando at higgs.linuxfromscratch.org
Sat Aug 17 19:33:50 PDT 2013


Author: fernando
Date: Sat Aug 17 19:33:50 2013
New Revision: 11648

Log:
Libreoffice: Fix build with system neon.

Modified:
   trunk/BOOK/introduction/welcome/changelog.xml
   trunk/BOOK/xsoft/office/libreoffice.xml

Modified: trunk/BOOK/introduction/welcome/changelog.xml
==============================================================================
--- trunk/BOOK/introduction/welcome/changelog.xml	Sat Aug 17 16:12:58 2013	(r11647)
+++ trunk/BOOK/introduction/welcome/changelog.xml	Sat Aug 17 19:33:50 2013	(r11648)
@@ -47,6 +47,9 @@
       <para>August 18th, 2013</para>
       <itemizedlist>
         <listitem>
+          <para>[fernando] - Libreoffice: Fix build with system neon.</para>
+        </listitem>
+        <listitem>
           <para>[rthomsen] - Amarok 2.8.0. Fixes
            <ulink url="&blfs-ticket-root;3981">#3981</ulink>.</para>
         </listitem>
@@ -58,7 +61,7 @@
       <para>August 17th, 2013</para>
       <itemizedlist>
         <listitem>
-          <para>[bdubbs] Update to gpgme-1.4.3. Fixes
+          <para>[bdubbs] - Update to gpgme-1.4.3. Fixes
            <ulink url="&blfs-ticket-root;3974">#3974</ulink>.</para>
         </listitem>
         <listitem>
@@ -72,7 +75,7 @@
       <para>August 16th, 2013</para>
       <itemizedlist>
         <listitem>
-          <para>[fernando] LibreOffice: fixes to build dictionaries, 
+          <para>[fernando] - LibreOffice: fixes to build dictionaries, 
           help and languages support. Thanks to David B.</para>
         </listitem>
       </itemizedlist>

Modified: trunk/BOOK/xsoft/office/libreoffice.xml
==============================================================================
--- trunk/BOOK/xsoft/office/libreoffice.xml	Sat Aug 17 16:12:58 2013	(r11647)
+++ trunk/BOOK/xsoft/office/libreoffice.xml	Sat Aug 17 19:33:50 2013	(r11648)
@@ -137,6 +137,12 @@
           <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-system_poppler-1.patch"/>
         </para>
       </listitem>
+      <listitem>
+        <para>
+          Required patch:
+          <ulink url="&patch-root;/libreoffice-&libreoffice-dlversion;-system_neon-1.patch"/>
+        </para>
+      </listitem>
     </itemizedlist>
 
     <bridgehead renderas="sect3">LibreOffice Dependencies</bridgehead>
@@ -299,6 +305,7 @@
     -e "/tar -x/s/lo_src_dir/start_dir/"           \
     -i bin/unpack-sources &&
 
+patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_neon-1.patch    &&
 patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_poppler-1.patch &&
 ./autogen.sh --prefix=/usr              \
              --sysconfdir=/etc          \



More information about the blfs-book mailing list