From 2a0de9793b54fdd6dd067ee0dc95e3f65737079f Mon Sep 17 00:00:00 2001
From: Fernando de Oliveira <fernando@linuxfromscratch.org>
Date: Sun, 18 Aug 2013 02:33:50 +0000
Subject: [PATCH] Libreoffice: Fix build with system neon.

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@11648 af4574ff-66df-0310-9fd7-8a98e5e911e0
---
 introduction/welcome/changelog.xml | 7 +++++--
 xsoft/office/libreoffice.xml       | 7 +++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index 17f6d12280..b0680c07ed 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -46,6 +46,9 @@
     <listitem>
       <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>
@@ -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>
diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml
index b864eae1a3..dabb92f398 100644
--- a/xsoft/office/libreoffice.xml
+++ b/xsoft/office/libreoffice.xml
@@ -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 @@ sed -e "s/target\.mk/langlist\.mk/"                \
     -e "/tar -x/s/lo_src_dir/start_dir/"           \
     -i bin/unpack-sources &amp;&amp;
 
+patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_neon-1.patch    &amp;&amp;
 patch -Np1 -i ../libreoffice-&libreoffice-dlversion;-system_poppler-1.patch &amp;&amp;
 ./autogen.sh --prefix=/usr              \
              --sysconfdir=/etc          \