external/libabw/ExternalProject_libabw.mk | 3 ++- external/libcdr/ExternalProject_libcdr.mk | 3 ++- external/libmwaw/ExternalProject_libmwaw.mk | 6 ++---- external/libmwaw/Library_mwaw.mk | 3 +-- external/libodfgen/ExternalProject_libodfgen.mk | 4 ++-- external/libodfgen/Library_odfgen.mk | 3 +-- external/libvisio/ExternalProject_libvisio.mk | 3 ++- external/libwps/0001-add-missing-include.patch | 24 ++++++++++++++++++++++++ external/libwps/ExternalProject_libwps.mk | 4 ++-- external/libwps/Library_wps.mk | 3 +-- external/libwps/UnpackedTarball_libwps.mk | 1 + 11 files changed, 40 insertions(+), 17 deletions(-)
New commits: commit d4cac4de650ee9339b7e513c8762bfce6574af76 Author: David Tardon <dtar...@redhat.com> Date: Sun Aug 30 17:59:53 2015 +0200 libcdr: fix build with boost 1.59 Change-Id: Ie12338eae161f0a13fa4ff036e41d389bc0d616a diff --git a/external/libcdr/ExternalProject_libcdr.mk b/external/libcdr/ExternalProject_libcdr.mk index e4d7c9b..96930fe 100644 --- a/external/libcdr/ExternalProject_libcdr.mk +++ b/external/libcdr/ExternalProject_libcdr.mk @@ -36,7 +36,8 @@ $(call gb_ExternalProject_get_state_target,libcdr,build) : --disable-werror \ --disable-weffc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost))" \ + CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) commit 70b8f2e254860027ce575f3bd27ce92c04761a08 Author: David Tardon <dtar...@redhat.com> Date: Sun Aug 30 17:57:47 2015 +0200 libvisio: fix build with boost 1.59 Change-Id: Ib90425d6908bc0bfe2efb633d0215f77546e4c38 diff --git a/external/libvisio/ExternalProject_libvisio.mk b/external/libvisio/ExternalProject_libvisio.mk index b714788..6ecfa43 100644 --- a/external/libvisio/ExternalProject_libvisio.mk +++ b/external/libvisio/ExternalProject_libvisio.mk @@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libvisio,build) : $(if $(ENABLE_DEBUG),--enable-debug,--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))" \ + CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) \ + -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) commit 51c292b8bbbb5204f1c4d9ef78fd49bfb50f3afe Author: David Tardon <dtar...@redhat.com> Date: Sun Aug 30 17:39:09 2015 +0200 libabw: fix build with boost 1.59 Change-Id: I2213101623ba7e2cc329b659e17abe3d82e6b634 diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index 9a07409..980aada 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -35,7 +35,8 @@ $(call gb_ExternalProject_get_state_target,libabw,build) : --disable-werror \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\ - -I$(call gb_UnpackedTarball_get_dir,boost))" \ + -I$(call gb_UnpackedTarball_get_dir,boost)) \ + -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) commit 6ac4772ecc038c3e041a8b9bb594c53d977ac0f2 Author: David Tardon <dtar...@redhat.com> Date: Sun Aug 30 13:24:55 2015 +0200 libodfgen: drop dep. on boost Change-Id: If13cdf90de752626bbd37877fea045faae0616cb diff --git a/external/libodfgen/ExternalProject_libodfgen.mk b/external/libodfgen/ExternalProject_libodfgen.mk index b60d406..4f5ca4e 100644 --- a/external/libodfgen/ExternalProject_libodfgen.mk +++ b/external/libodfgen/ExternalProject_libodfgen.mk @@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libodfgen,\ )) $(eval $(call gb_ExternalProject_use_externals,libodfgen,\ - boost_headers \ revenge \ )) @@ -34,8 +33,9 @@ $(call gb_ExternalProject_get_state_target,libodfgen,build) : --disable-werror \ --disable-weffc \ --without-docs \ + --with-sharedptr=c++11 \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost)) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \ + CXXFLAGS="$(CXXFLAGS_CXX11) $(if $(SYSTEM_REVENGE),,$(if $(filter-out MSC,$(COM)),-DLIBREVENGE_VISIBILITY))" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ diff --git a/external/libodfgen/Library_odfgen.mk b/external/libodfgen/Library_odfgen.mk index 4cae5b0..669d551 100644 --- a/external/libodfgen/Library_odfgen.mk +++ b/external/libodfgen/Library_odfgen.mk @@ -12,7 +12,6 @@ $(eval $(call gb_Library_Library,odfgen)) $(eval $(call gb_Library_use_unpacked,odfgen,libodfgen)) $(eval $(call gb_Library_use_externals,odfgen,\ - boost_headers \ revenge \ )) @@ -24,10 +23,10 @@ $(eval $(call gb_Library_set_include,odfgen,\ )) $(eval $(call gb_Library_add_defs,odfgen,\ - -DBOOST_ALL_NO_LIB \ -DDLL_EXPORT \ -DLIBODFGEN_BUILD \ -DNDEBUG \ + -DSHAREDPTR_STD \ -DPACKAGE=\"libodfgen\" \ -DVERSION=\"0.1.$(ODFGEN_VERSION_MICRO)\" \ )) commit ee0f5944fb2da2b81217c9d67f617265e9cafb9c Author: David Tardon <dtar...@redhat.com> Date: Sun Aug 30 13:23:02 2015 +0200 libmwaw: drop dep. on boost Change-Id: If3bce409a98b9593920c41f8e18b82e8daa36fb1 diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index 5dbb772..5fa97ca 100644 --- a/external/libmwaw/ExternalProject_libmwaw.mk +++ b/external/libmwaw/ExternalProject_libmwaw.mk @@ -16,7 +16,6 @@ $(eval $(call gb_ExternalProject_register_targets,libmwaw,\ )) $(eval $(call gb_ExternalProject_use_externals,libmwaw,\ - boost_headers \ revenge \ )) @@ -30,15 +29,14 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : , \ --enable-shared --disable-static \ ) \ + --with-sharedptr=c++11 \ --without-docs \ --disable-tools \ --disable-zip \ $(if $(ENABLE_DEBUG),--enable-debug,--disable-debug) \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ --disable-werror \ - CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),\ - $(if $(COM_GCC_IS_CLANG),-Qunused-arguments) \ - -I$(call gb_UnpackedTarball_get_dir,boost))" \ + CXXFLAGS="$(CXXFLAGS_CXX11)" \ $(if $(filter LINUX,$(OS)),$(if $(SYSTEM_REVENGE),, \ 'LDFLAGS=-Wl$(COMMA)-z$(COMMA)origin \ -Wl$(COMMA)-rpath$(COMMA)\$$$$ORIGIN')) \ diff --git a/external/libmwaw/Library_mwaw.mk b/external/libmwaw/Library_mwaw.mk index f5aeee0..90b7665 100644 --- a/external/libmwaw/Library_mwaw.mk +++ b/external/libmwaw/Library_mwaw.mk @@ -13,7 +13,6 @@ $(eval $(call gb_Library_use_unpacked,mwaw,libmwaw)) $(eval $(call gb_Library_use_externals,mwaw,\ revenge \ - boost_headers \ )) $(eval $(call gb_Library_set_warnings_not_errors,mwaw)) @@ -24,10 +23,10 @@ $(eval $(call gb_Library_set_include,mwaw,\ )) $(eval $(call gb_Library_add_defs,mwaw,\ - -DBOOST_ALL_NO_LIB \ -DBUILD_MWAW \ -DNDEBUG \ -D_WINDLL \ + -DSHAREDPTR_STD \ )) $(eval $(call gb_Library_add_generated_exception_objects,mwaw,\ commit 41680ccd058696eb1679c91f11c8d53f12728241 Author: David Tardon <dtar...@redhat.com> Date: Sun Aug 30 12:33:57 2015 +0200 libwps: drop dep. on boost Change-Id: Id8ac510ad96d2a845b5c14024973274fb797c000 diff --git a/external/libwps/0001-add-missing-include.patch b/external/libwps/0001-add-missing-include.patch new file mode 100644 index 0000000..842bcf5 --- /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 <dtar...@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 475f56a..0bb5dde 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 ef323ce..2af5340 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 c990efc..5fad6b6 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) \ )) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits