From 3d3bceea00d67d0a4a09968c7ce4b6ee8d8a9597 Mon Sep 17 00:00:00 2001
From: Ken Moffat <ken@linuxfromscratch.org>
Date: Sat, 17 May 2014 22:04:23 +0000
Subject: [PATCH] Re-enable system-icu and system-boost in libreoffice.

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

diff --git a/introduction/welcome/changelog.xml b/introduction/welcome/changelog.xml
index d7b190b2bb..d2141fd6f0 100644
--- a/introduction/welcome/changelog.xml
+++ b/introduction/welcome/changelog.xml
@@ -47,6 +47,10 @@
     <listitem>
       <para>May 17th, 2014</para>
       <itemizedlist>
+        <listitem>
+          <para>[ken] - Reinstate system boost and icu switches in libreoffice,
+          thanks to Christopher Gregory for noticing.</para>
+        </listitem>
         <listitem>
           <para>[fernando] - Revert unnecessary revision 13047 "Help Lua-5.2.3
           to find Ncurses-5.9 for Readline-6.3".</para>
diff --git a/xsoft/office/libreoffice.xml b/xsoft/office/libreoffice.xml
index bdedc67c76..e5fd9b0da3 100644
--- a/xsoft/office/libreoffice.xml
+++ b/xsoft/office/libreoffice.xml
@@ -350,12 +350,14 @@ sed -e "s/target\.mk/langlist\.mk/"                \
              --disable-postgresql-sdbc   \
              --enable-release-build=yes  \
              --enable-python=system      \
+             --with-system-boost         \
              --with-system-clucene       \
              --with-system-cairo         \
              --with-system-curl          \
              --with-system-expat         \
              --with-system-graphite      \
              --with-system-harfbuzz      \
+             --with-system-icu           \
              --with-system-jpeg          \
              --with-system-lcms2         \
              --with-system-libpng        \
@@ -371,10 +373,6 @@ sed -e "s/target\.mk/langlist\.mk/"                \
              --with-system-redland       \
              --with-system-zlib          \
              --with-parallelism=$(getconf _NPROCESSORS_ONLN)</userinput></screen>
-<!-- below, switches not working with icu-53.1; move back, when upstream
-or patch solves the problem-->
-<!--             -with-system-icu           \-->
-<!--             -with-system-boost         \-->
 
     <para>
       The instructions below will only build the package without running