[Libreoffice-commits] core.git: external/libetonyek

[David Tardon]

 external/libetonyek/0001-missing-include.patch.1  |   25 ++++++++++++++++++++++
 external/libetonyek/ExternalProject_libetonyek.mk |    2 -
 external/libetonyek/UnpackedTarball_libetonyek.mk |    1 
 3 files changed, 27 insertions(+), 1 deletion(-)

New commits:
commit eb5850d63acfd3077a4c5c62d45dff48bc6a6137
Author: David Tardon <dtardon at redhat.com>
Date:   Tue May 19 18:46:34 2015 +0200

    hopefully better fix for windows
    
    Change-Id: I196853f0efbaab48e5e09b2728df0a8e5152dc9e

diff --git a/external/libetonyek/0001-missing-include.patch.1 b/external/libetonyek/0001-missing-include.patch.1
new file mode 100644
index 0000000..f3e4e24
--- /dev/null
+++ b/external/libetonyek/0001-missing-include.patch.1
@@ -0,0 +1,25 @@
+From 3663b7b44646e1ed1218598aeb0bdf7326934029 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Tue, 19 May 2015 18:44:53 +0200
+Subject: [PATCH] missing include
+
+Change-Id: Ie7a733b49a5b9a056671f4274b5194c3891569ae
+---
+ src/lib/IWORKText.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/IWORKText.cpp b/src/lib/IWORKText.cpp
+index 3413ef3..c37b1bc 100644
+--- a/src/lib/IWORKText.cpp
++++ b/src/lib/IWORKText.cpp
+@@ -11,6 +11,7 @@
+ 
+ #include <cassert>
+ #include <string>
++#include <vector>
+ 
+ #include <boost/algorithm/string/classification.hpp>
+ #include <boost/algorithm/string/predicate.hpp>
+-- 
+2.4.0
+
diff --git a/external/libetonyek/ExternalProject_libetonyek.mk b/external/libetonyek/ExternalProject_libetonyek.mk
index a83c654..3de8605 100644
--- a/external/libetonyek/ExternalProject_libetonyek.mk
+++ b/external/libetonyek/ExternalProject_libetonyek.mk
@@ -36,7 +36,7 @@ $(call gb_ExternalProject_get_state_target,libetonyek,build) :
 			--disable-weffc \
 			--without-tools \
 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
-			BOOST_CFLAGS="-DBOOST_DETAIL_NO_CONTAINER_FWD $(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
+			BOOST_CFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \
 			XML_CFLAGS="$(LIBXML_CFLAGS)" \
 			XML_LIBS="$(LIBXML_LIBS)" \
 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
diff --git a/external/libetonyek/UnpackedTarball_libetonyek.mk b/external/libetonyek/UnpackedTarball_libetonyek.mk
index 4853907..01f35c3 100644
--- a/external/libetonyek/UnpackedTarball_libetonyek.mk
+++ b/external/libetonyek/UnpackedTarball_libetonyek.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libetonyek,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libetonyek,\
 	external/libetonyek/assert.patch \
+	external/libetonyek/0001-missing-include.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: