external/liborcus/UnpackedTarball_liborcus.mk | 1 +
external/liborcus/unusedheader.patch.0 | 11 +++++++++++
2 files changed, 12 insertions(+)
New commits:
commit a18fed7db4f4a5cd85b08dce516a38e874758be6
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Dec 2 14:41:11 2015 +0000
unnecessary include brings in boost headers that are broken under rhel-7
(cherry picked from commit 12fc5b85ddc3b90b385ad0fc2ab0144a32bf9a4b)
(cherry picked from commit 7587f8bab881303f77864dae03999048e43c642f)
Change-Id: I1ad477b9db9ba960ae2c417799e5d91b63538d57
Reviewed-on: https://gerrit.libreoffice.org/20354
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/external/liborcus/UnpackedTarball_liborcus.mk
b/external/liborcus/UnpackedTarball_liborcus.mk
index 126f250..63e5421 100644
--- a/external/liborcus/UnpackedTarball_liborcus.mk
+++ b/external/liborcus/UnpackedTarball_liborcus.mk
@@ -30,6 +30,7 @@ liborcus_patches += visibility.patch
# f60d6eecee72349993a392a9a63ddf3383d3b8c8@2>:
liborcus_patches += liborcus_0.7.0-configure.gcc5.patch.0
+liborcus_patches += unusedheader.patch.0
$(eval $(call gb_UnpackedTarball_add_patches,liborcus,\
$(foreach patch,$(liborcus_patches),external/liborcus/$(patch)) \
diff --git a/external/liborcus/unusedheader.patch.0
b/external/liborcus/unusedheader.patch.0
new file mode 100644
index 0000000..4f7a77b
--- /dev/null
+++ b/external/liborcus/unusedheader.patch.0
@@ -0,0 +1,11 @@
+--- ./src/parser/pstring.cpp.orig 2015-12-02 14:38:44.658744408 +0000
++++ ./src/parser/pstring.cpp 2015-12-02 14:38:50.449658497 +0000
+@@ -13,8 +13,6 @@
+ #include <iostream>
+ #include <vector>
+
+-#include <boost/thread/mutex.hpp>
+-
+ using namespace std;
+
+ namespace orcus {
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
