download.lst | 4 ++-- external/libmspub/ExternalProject_libmspub.mk | 3 +-- external/libmspub/UnpackedTarball_libmspub.mk | 2 -- 3 files changed, 3 insertions(+), 6 deletions(-)
New commits: commit 4b4846716ddb6321c9f9f21d983d1820bf50ea1c Author: David Tardon <[email protected]> Date: Tue Jan 2 13:40:57 2018 +0100 upload libmspub 0.1.3 Reviewed-on: https://gerrit.libreoffice.org/47256 Tested-by: Jenkins <[email protected]> Reviewed-by: David Tardon <[email protected]> (cherry picked from commit a3488acbeb3b618cf5b6b1a93608c58d0eb9d646) Change-Id: I1f759bf914e4a61fc943098f04661789d374ffdb Reviewed-on: https://gerrit.libreoffice.org/47360 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> diff --git a/download.lst b/download.lst index 491b56a0569e..1ee0c025237c 100644 --- a/download.lst +++ b/download.lst @@ -158,8 +158,8 @@ export MDDS_SHA256SUM := dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1 export MDDS_TARBALL := mdds-1.3.1.tar.bz2 export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz -export MSPUB_SHA256SUM := 26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a -export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 +export MSPUB_SHA256SUM := f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97 +export MSPUB_TARBALL := libmspub-0.1.3.tar.xz export MWAW_SHA256SUM := db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea export MWAW_VERSION_MICRO := 13 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz diff --git a/external/libmspub/ExternalProject_libmspub.mk b/external/libmspub/ExternalProject_libmspub.mk index 40ba3dc6e56e..271aaf78e4d3 100644 --- a/external/libmspub/ExternalProject_libmspub.mk +++ b/external/libmspub/ExternalProject_libmspub.mk @@ -36,8 +36,7 @@ $(call gb_ExternalProject_get_state_target,libmspub,build) : --disable-weffc \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ - CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS) \ - -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ + CPPFLAGS="$(CPPFLAGS) $(ICU_UCHAR_TYPE) $(BOOST_CPPFLAGS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff --git a/external/libmspub/UnpackedTarball_libmspub.mk b/external/libmspub/UnpackedTarball_libmspub.mk index 23e81eed785d..57845333cb4e 100644 --- a/external/libmspub/UnpackedTarball_libmspub.mk +++ b/external/libmspub/UnpackedTarball_libmspub.mk @@ -13,8 +13,6 @@ $(eval $(call gb_UnpackedTarball_set_tarball,libmspub,$(MSPUB_TARBALL))) $(eval $(call gb_UnpackedTarball_set_patchlevel,libmspub,0)) -$(eval $(call gb_UnpackedTarball_update_autoconf_configs,libmspub)) - $(eval $(call gb_UnpackedTarball_add_patches,libmspub,\ external/libmspub/ubsan.patch \ )) _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
