From 319ddc49bdff5fd8708ae48b0bde98753187dd0c Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Tue, 30 Jul 2013 07:02:50 +0200
Subject: [PATCH] sanitize clucene includes

---
 0001-sanitize-system-clucene-includes.patch | 34 +++++++++++++++++++++
 libreoffice.spec                            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 0001-sanitize-system-clucene-includes.patch

diff --git a/0001-sanitize-system-clucene-includes.patch b/0001-sanitize-system-clucene-includes.patch
new file mode 100644
index 0000000..d967708
--- /dev/null
+++ b/0001-sanitize-system-clucene-includes.patch
@@ -0,0 +1,34 @@
+From 24c1cea3bb964d6d2255c2bd9f1433413aa3e694 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Tue, 30 Jul 2013 06:45:48 +0200
+Subject: [PATCH] sanitize system clucene includes
+
+Apparently clucene bundles pieces of a very old version of boost (1.42)
+in CLucene/ext/boost, which breaks build with boost 1.54.
+
+(cherry picked from commit 24add548ac163651de5e3372798f0d4db347de77)
+Signed-off-by: David Tardon <dtardon@redhat.com>
+
+Conflicts:
+	configure.ac
+
+Change-Id: Ib244222f8f048aefe0484060f9ad5f41bfd24def
+---
+ configure.ac | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/configure.ac b/configure.ac
+index 03d2ef8..ce04c65 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -7144,6 +7144,7 @@ if test "$with_system_clucene" = "yes"; then
+     AC_MSG_RESULT([external])
+     SYSTEM_CLUCENE=YES
+     PKG_CHECK_MODULES(CLUCENE, libclucene-core)
++    CLUCENE_CFLAGS=[$(printf '%s' "$CLUCENE_CFLAGS" | sed -e 's@-I[^ ]*/CLucene/ext@@')]
+     AC_LANG_PUSH([C++])
+     save_CXXFLAGS=$CXXFLAGS
+     save_CPPFLAGS=$CPPFLAGS
+-- 
+1.8.3.1
+
diff --git a/libreoffice.spec b/libreoffice.spec
index 6e269a1..95e7361 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -258,6 +258,7 @@ Patch20: 0001-Resolves-fdo-48835-application-menu-for-LibreOffice.patch
 Patch21: 0001-move-static-bitmap-into-a-svapp-member.patch
 Patch22: 0001-resolved-fdo-67094-handle-text-s-in-text-p-and-text-.patch
 Patch23: 0001-Use-inconditionally-the-libwpd-0.9.5-path.patch
+Patch24: 0001-sanitize-system-clucene-includes.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/libreoffice
@@ -1013,6 +1014,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch21 -p1 -b .move-static-bitmap-into-a-svapp-member.patch
 %patch22 -p1 -b .resolved-fdo-67094-handle-text-s-in-text-p-and-text-.patch
 %patch23 -p1 -b .Use-inconditionally-the-libwpd-0.9.5-path.patch
+%patch24 -p1 -b .sanitize-system-clucene-includes.patch
 
 # TODO: check this
 # these are horribly incomplete--empty translations and copied english