libwps: drop dep. on boost

Change-Id: Id8ac510ad96d2a845b5c14024973274fb797c000

4 files changed, 28 insertions, 4 deletions

diff --git a/external/libwps/0001-add-missing-include.patch b/external/libwps/0001-add-missing-include.patch
new file mode 100644
index 000000000000..842bcf5c300c
--- /dev/null
+++ b/external/libwps/0001-add-missing-include.patch
@@ -0,0 +1,24 @@
+From bc6f0f3a006123a89d1321038edeb75f2fd67c6f Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon@redhat.com>
+Date: Sun, 30 Aug 2015 11:21:29 +0200
+Subject: [PATCH] add missing include
+
+---
+ src/lib/WPS8.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/lib/WPS8.cpp b/src/lib/WPS8.cpp
+index 04c1e57..8d39fa8 100644
+--- a/src/lib/WPS8.cpp
++++ b/src/lib/WPS8.cpp
+@@ -19,6 +19,7 @@
+  * applicable instead of those above.
+  */
+ 
++#include <algorithm>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
+-- 
+2.4.3
+
diff --git a/external/libwps/ExternalProject_libwps.mk b/external/libwps/ExternalProject_libwps.mk
index 475f56a42d64..0bb5ddee78a0 100644
--- a/external/libwps/ExternalProject_libwps.mk
+++ b/external/libwps/ExternalProject_libwps.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libwps,\
 ))
 
 $(eval $(call gb_ExternalProject_use_externals,libwps,\
-	boost_headers \
 	revenge \
 ))
 
@@ -30,12 +29,13 @@ $(call gb_ExternalProject_get_state_target,libwps,build) :
 			, \
 				--enable-shared --disable-static \
 			) \
+			--with-sharedptr=c++11 \
 			--without-docs \
 			--disable-tools \
 			--disable-debug \
 			--disable-werror \
 			$(if $(verbose),--disable-silent-rules,--enable-silent-rules) \
-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
+			CXXFLAGS="$(CXXFLAGS_CXX11) $(gb_VISIBILITY_FLAGS) $(gb_VISIBILITY_FLAGS_CXX)" \
 			$(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \
 				'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \
 					-Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index ef323cebb7bf..2af534045b65 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,wps))
 $(eval $(call gb_Library_use_unpacked,wps,libwps))
 
 $(eval $(call gb_Library_use_externals,wps,\
-    boost_headers \
 	revenge \
 ))
 
@@ -24,10 +23,10 @@ $(eval $(call gb_Library_set_include,wps,\
 ))
 
 $(eval $(call gb_Library_add_defs,wps,\
-	-DBOOST_ALL_NO_LIB \
 	-DBUILD_WPS\
 	-DDLL_EXPORT \
 	-DNDEBUG \
+	-DSHAREDPTR_STD \
 ))
 
 $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index c990efc83e25..5fad6b6ba620 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -14,6 +14,7 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libwps,$(WPS_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,libwps,1))
 
 $(eval $(call gb_UnpackedTarball_add_patches,libwps,\
+	external/libwps/0001-add-missing-include.patch \
 	$(if $(SYSTEM_REVENGE),,external/libwps/rpath.patch.0) \
 ))