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.

(he)

 @@ -1,14 +1,14 @@
-$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
 Size (libreoffice/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz) = 96939 bytes
 SHA1 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 66ed8eac9bac2a23ba9e3a3b3d560609fa3acc25
 RMD160 (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 45c0fd5f41e82691dcdebdda87da78b0af529066
 Size (libreoffice/0279a21fab6f245e85a6f85fea54f511-source-code-font-1.009.tar.gz) = 102916 bytes
 SHA1 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 885cc4b6c9472d95e2515e777f6018a90657e974
 RMD160 (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = f3c180e878c68bb44fd9fc44b40c0e1ea480f266
 Size (libreoffice/048751f3271906db5126ab76870444c4-commons-codec-1.9-src.zip) = 525299 bytes
 SHA1 (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 4e90cefad975ef2f1f92e43ba899629ed3b829f8
 RMD160 (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 8e6c7ac95a134218eea626aabf12d5db258347b2
 Size (libreoffice/05f84c95b610c21c5fd510d10debcabf-mariadb-native-client-1.0.0.tar.bz2) = 443589 bytes
 @@ -144,17 +144,23 @@ Size (libreoffice/libreoffice-4.3.7.2.ta
 SHA1 (libreoffice/libreoffice-dictionaries-4.3.7.2.tar.xz) = e2aec24a4ba9e73a636858a82884449c984e72d8
 RMD160 (libreoffice/libreoffice-dictionaries-4.3.7.2.tar.xz) = 3b4a200260b5371942ca5d1f98da5ac724e42190
 Size (libreoffice/libreoffice-dictionaries-4.3.7.2.tar.xz) = 37062776 bytes
 SHA1 (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = 9901a6a0cbfbf840a38c4d14b709364541aec2c8
 RMD160 (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = f00dbd342dd19b3f03d91099182ab538284ed808
 Size (libreoffice/libreoffice-help-4.3.7.2.tar.xz) = 1854916 bytes
 SHA1 (libreoffice/libreoffice-translations-4.3.7.2.tar.xz) = 10d9764a854247b05c96c95b6ead9c186022a1b6
 RMD160 (libreoffice/libreoffice-translations-4.3.7.2.tar.xz) = d8046c77a47629b554b673166a0c91e2a00dcb8a
 Size (libreoffice/libreoffice-translations-4.3.7.2.tar.xz) = 127356488 bytes
 SHA1 (patch-bridges_source_cpp__uno_gcc3__linux__x86-64_share.hxx) = 87fad181a9d188b34598bfc279fd3d1cae9a1149
 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

$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=' ' \

$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) \ )

$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)

$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) \

$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 := \

$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 \