Pick up and apply some patches based on

http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063

which makes libreoffice43 build with boost 1.59.  This time it is
verified to build with the rest of pkgsrc updated (as of today) on
NetBSD/i386 6.1.5.

7 files changed, 131 insertions, 1 deletions

diff --git a/misc/libreoffice43/distinfo b/misc/libreoffice43/distinfo
index fc1ec5c10d8..f60bfb9806f 100644
--- a/misc/libreoffice43/distinfo
+++ b/misc/libreoffice43/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2015/09/04 07:21:20 he Exp $
+$NetBSD: distinfo,v 1.3 2015/09/16 21:12:39 he Exp $
 
 SHA1 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 452eba922e4f41603539c9dc39947d2271e47093
 RMD160 (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = dbeb7a7f8c89961ca2e544b810345d025561866b
@@ -154,7 +154,13 @@ SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = 87fad181a9d
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_uno2cpp.cxx) = 5022ad96533aa1681e6fab323cadf803281a6c17
 SHA1 (patch-configure.ac) = fd5dac877dbbc45f07780b9bedfbdced26a5e357
 SHA1 (patch-external_coinmp_ExternalProject__coinmp.mk) = 3e77cd0a770beb47c025b0e65769acded9d81ca1
+SHA1 (patch-external_libebook_ExternalProject__libebook.mk) = c280e08880788eb41681af1cb88e4350deea692b
+SHA1 (patch-external_libmspub_ExternalProject__libmspub.mk) = 392b2f722f9f7eb23f30aa1749face241e0e9a40
+SHA1 (patch-external_liborcus_ExternalProject__liborcus.mk) = 637058d2c5e930db086238773ccb926997a1de46
+SHA1 (patch-external_librevenge_ExternalProject__librevenge.mk) = 25f5ce0b3a78eda07bbb0ded01c753dd876edcef
 SHA1 (patch-odk_CustomTarget__classes.mk) = 991896c402d1d2505e5aacec5df78439c8e9a767
 SHA1 (patch-solenv_gbuild_AllLangResTarget.mk) = c6fa51c74e3be0e9d4f18e1481039d44d6c3db98
 SHA1 (patch-solenv_gbuild_Deliver.mk) = 07ffb548a24edfe64fcf370423a2124c7a32cafb
 SHA1 (patch-solenv_gbuild_Module.mk) = 78d57071ac2c884bb6406356f45db3c55b61c678
+SHA1 (patch-solenv_gbuild_platform_com__GCC__defs.mk) = 72e53e2f554714878853b4998fcac4ac20560e18
+SHA1 (patch-solenv_gbuild_platform_com__MSC__defs.mk) = 4d91f1ba84cee9cf1503736c41548e96507d6a1a
diff --git a/misc/libreoffice43/patches/patch-external_libebook_ExternalProject__libebook.mk b/misc/libreoffice43/patches/patch-external_libebook_ExternalProject__libebook.mk
new file mode 100644
index 00000000000..22846c759d1
--- /dev/null
+++ b/misc/libreoffice43/patches/patch-external_libebook_ExternalProject__libebook.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-external_libebook_ExternalProject__libebook.mk,v 1.1 2015/09/16 21:12:39 he Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- external/libebook/ExternalProject_libebook.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ external/libebook/ExternalProject_libebook.mk
+@@ -38,7 +38,10 @@ $(call gb_ExternalProject_get_state_targ
+ 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+ 			--disable-werror \
+ 			--disable-weffc \
+-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
++			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) \
++			-DBOOST_ERROR_CODE_HEADER_ONLY \
++			-DBOOST_SYSTEM_NO_DEPRECATED \
++			-I$(BUILDDIR)/config_$(gb_Side))" \
+ 			XML_CFLAGS="$(LIBXML_CFLAGS)" \
+ 			XML_LIBS="$(LIBXML_LIBS)" \
+ 			REVENGE_GENERATORS_CFLAGS=' ' REVENGE_GENERATORS_LIBS=' ' REVENGE_STREAM_CFLAGS=' ' REVENGE_STREAM_LIBS=' ' \
diff --git a/misc/libreoffice43/patches/patch-external_libmspub_ExternalProject__libmspub.mk b/misc/libreoffice43/patches/patch-external_libmspub_ExternalProject__libmspub.mk
new file mode 100644
index 00000000000..1de3caf079e
--- /dev/null
+++ b/misc/libreoffice43/patches/patch-external_libmspub_ExternalProject__libmspub.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-external_libmspub_ExternalProject__libmspub.mk,v 1.1 2015/09/16 21:12:39 he Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- external/libmspub/ExternalProject_libmspub.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ external/libmspub/ExternalProject_libmspub.mk
+@@ -35,7 +35,10 @@ $(call gb_ExternalProject_get_state_targ
+ 			--disable-werror \
+ 			--disable-weffc \
+ 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
++			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) \
++			-DBOOST_ERROR_CODE_HEADER_ONLY \
++			-DBOOST_SYSTEM_NO_DEPRECATED \
++			-I$(BUILDDIR)/config_$(gb_Side))" \
+ 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ 		&& $(MAKE) \
+ 	)
diff --git a/misc/libreoffice43/patches/patch-external_liborcus_ExternalProject__liborcus.mk b/misc/libreoffice43/patches/patch-external_liborcus_ExternalProject__liborcus.mk
new file mode 100644
index 00000000000..6b163bc2125
--- /dev/null
+++ b/misc/libreoffice43/patches/patch-external_liborcus_ExternalProject__liborcus.mk
@@ -0,0 +1,19 @@
+$NetBSD: patch-external_liborcus_ExternalProject__liborcus.mk,v 1.1 2015/09/16 21:12:39 he Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- external/liborcus/ExternalProject_liborcus.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ external/liborcus/ExternalProject_liborcus.mk
+@@ -70,7 +70,7 @@ liborcus_CPPFLAGS+=-D_GLIBCXX_DEBUG
+ endif
+ endif
+ 
+-liborcus_CXXFLAGS=$(CXXFLAGS)
++liborcus_CXXFLAGS=$(CXXFLAGS) -DBOOST_SYSTEM_NO_DEPRECATED
+ liborcus_LDFLAGS=$(LDFLAGS) $(gb_LTOFLAGS)
+ ifeq ($(COM),MSC)
+ liborcus_CXXFLAGS+=$(BOOST_CXXFLAGS)
diff --git a/misc/libreoffice43/patches/patch-external_librevenge_ExternalProject__librevenge.mk b/misc/libreoffice43/patches/patch-external_librevenge_ExternalProject__librevenge.mk
new file mode 100644
index 00000000000..33c74c4b361
--- /dev/null
+++ b/misc/libreoffice43/patches/patch-external_librevenge_ExternalProject__librevenge.mk
@@ -0,0 +1,22 @@
+$NetBSD: patch-external_librevenge_ExternalProject__librevenge.mk,v 1.1 2015/09/16 21:12:39 he Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- external/librevenge/ExternalProject_librevenge.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ external/librevenge/ExternalProject_librevenge.mk
+@@ -35,7 +35,10 @@ $(call gb_ExternalProject_get_state_targ
+ 			--disable-generators \
+ 			--without-docs \
+ 			$(if $(VERBOSE)$(verbose),--disable-silent-rules,--enable-silent-rules) \
+-			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) -I$(BUILDDIR)/config_$(gb_Side))" \
++			CXXFLAGS="$(if $(SYSTEM_BOOST),$(BOOST_CPPFLAGS),-I$(call gb_UnpackedTarball_get_dir,boost) \
++			-DBOOST_ERROR_CODE_HEADER_ONLY \
++			-DBOOST_SYSTEM_NO_DEPRECATED \
++			-I$(BUILDDIR)/config_$(gb_Side))" \
+ 			$(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \
+ 			$(if $(filter MACOSX,$(OS)),--prefix=/@.__________________________________________________OOO) \
+ 		&& $(MAKE) \
diff --git a/misc/libreoffice43/patches/patch-solenv_gbuild_platform_com__GCC__defs.mk b/misc/libreoffice43/patches/patch-solenv_gbuild_platform_com__GCC__defs.mk
new file mode 100644
index 00000000000..3b5b185635a
--- /dev/null
+++ b/misc/libreoffice43/patches/patch-solenv_gbuild_platform_com__GCC__defs.mk
@@ -0,0 +1,19 @@
+$NetBSD: patch-solenv_gbuild_platform_com__GCC__defs.mk,v 1.1 2015/09/16 21:12:39 he Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- solenv/gbuild/platform/com_GCC_defs.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ solenv/gbuild/platform/com_GCC_defs.mk
+@@ -47,6 +47,8 @@ gb_CPPU_ENV := gcc3
+ gb_AFLAGS := $(AFLAGS)
+ 
+ gb_COMPILERDEFS := \
++	-DBOOST_ERROR_CODE_HEADER_ONLY \
++	-DBOOST_SYSTEM_NO_DEPRECATED \
+ 	-DCPPU_ENV=$(gb_CPPU_ENV) \
+ 
+ gb_CFLAGS_COMMON := \
diff --git a/misc/libreoffice43/patches/patch-solenv_gbuild_platform_com__MSC__defs.mk b/misc/libreoffice43/patches/patch-solenv_gbuild_platform_com__MSC__defs.mk
new file mode 100644
index 00000000000..9cb436e8a79
--- /dev/null
+++ b/misc/libreoffice43/patches/patch-solenv_gbuild_platform_com__MSC__defs.mk
@@ -0,0 +1,20 @@
+$NetBSD: patch-solenv_gbuild_platform_com__MSC__defs.mk,v 1.1 2015/09/16 21:12:39 he Exp $
+
+Pick up and apply some diffs based on
+
+http://pkgs.fedoraproject.org/cgit/libreoffice.git/commit/?id=57cfb98d1c45259f946ff3444eeb6891a030e063
+
+which makes libreoffice43 build with boost 1.59.
+
+--- solenv/gbuild/platform/com_MSC_defs.mk.orig	2015-04-20 19:36:29.000000000 +0000
++++ solenv/gbuild/platform/com_MSC_defs.mk
+@@ -41,6 +41,9 @@ gb_CXX := $(CXX)
+ endif
+ 
+ gb_COMPILERDEFS := \
++	-DBOOST_ERROR_CODE_HEADER_ONLY \
++	-DBOOST_OPTIONAL_USE_OLD_DEFINITION_OF_NONE \
++	-DBOOST_SYSTEM_NO_DEPRECATED \
+ 	-D_CRT_NON_CONFORMING_SWPRINTFS \
+ 	-D_CRT_NONSTDC_NO_DEPRECATE \
+ 	-D_CRT_SECURE_NO_DEPRECATE \