diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libabw/ExternalProject_libabw.mk | 3 | ||||
| -rw-r--r-- | external/libabw/UnpackedTarball_libabw.mk | 4 | ||||
| -rw-r--r-- | external/libabw/libabw-msvc.patch.1 | 46 | ||||
| -rw-r--r-- | solenv/flatpak-manifest.in | 6 |
5 files changed, 56 insertions, 7 deletions
diff --git a/download.lst b/download.lst index 6e2be6621236..d2b8140c4e0e 100644 --- a/download.lst +++ b/download.lst @@ -1,5 +1,5 @@ -export ABW_SHA256SUM := 7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199 -export ABW_TARBALL := libabw-0.1.1.tar.bz2 +export ABW_SHA256SUM := 0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485 +export ABW_TARBALL := libabw-0.1.2.tar.xz export APACHE_COMMONS_LOGGING_SHA256SUM := 49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81 export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz export APR_SHA256SUM := 1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb diff --git a/external/libabw/ExternalProject_libabw.mk b/external/libabw/ExternalProject_libabw.mk index d8e4d112ea35..c8c2bd2e9882 100644 --- a/external/libabw/ExternalProject_libabw.mk +++ b/external/libabw/ExternalProject_libabw.mk @@ -35,8 +35,7 @@ $(call gb_ExternalProject_get_state_target,libabw,build) : --disable-werror \ $(if $(verbose),--disable-silent-rules,--enable-silent-rules) \ CXXFLAGS="$(gb_CXXFLAGS) $(if $(ENABLE_OPTIMIZED),$(gb_COMPILEROPTFLAGS),$(gb_COMPILERNOOPTFLAGS))" \ - CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS) \ - -DBOOST_ERROR_CODE_HEADER_ONLY -DBOOST_SYSTEM_NO_DEPRECATED" \ + CPPFLAGS="$(CPPFLAGS) $(BOOST_CPPFLAGS)" \ $(if $(CROSS_COMPILING),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM)) \ && $(MAKE) \ ) diff --git a/external/libabw/UnpackedTarball_libabw.mk b/external/libabw/UnpackedTarball_libabw.mk index 7b9ba49e7e69..27195d3a0ab3 100644 --- a/external/libabw/UnpackedTarball_libabw.mk +++ b/external/libabw/UnpackedTarball_libabw.mk @@ -15,6 +15,10 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0)) $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw)) +$(eval $(call gb_UnpackedTarball_add_patches,libabw, \ + external/libabw/libabw-msvc.patch.1 \ +)) + ifeq ($(COM_IS_CLANG),TRUE) ifneq ($(filter -fsanitize=%,$(CC)),) $(eval $(call gb_UnpackedTarball_add_patches,libabw, \ diff --git a/external/libabw/libabw-msvc.patch.1 b/external/libabw/libabw-msvc.patch.1 new file mode 100644 index 000000000000..d14b122f9575 --- /dev/null +++ b/external/libabw/libabw-msvc.patch.1 @@ -0,0 +1,46 @@ +From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001 +From: Miklos Vajna <vmiklos@collabora.co.uk> +Date: Wed, 2 Aug 2017 14:53:36 +0200 +Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still + +See e.g. +<https://stackoverflow.com/questions/37503029/cplusplus-is-equal-to-199711-in-msvc-does-it-support-c11>, +on MSVC we can't depend on the value of __cplusplus, since that one is a +too low value, even if everything else works fine. +--- + m4/ax_cxx_compile_stdcxx.m4 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff -Naur a/configure b/configure +--- a/configure 2017-08-02 14:50:09.000000000 +0200 ++++ b/configure 2017-08-02 14:50:57.000000000 +0200 +@@ -16001,7 +16001,7 @@ + + #error "This is not a C++ compiler" + +-#elif __cplusplus < 201103L ++#elif __cplusplus < 201103L && !(defined _MSC_VER) + + #error "This is not a C++11 compiler" + +@@ -16314,7 +16314,7 @@ + + #error "This is not a C++ compiler" + +-#elif __cplusplus < 201103L ++#elif __cplusplus < 201103L && !(defined _MSC_VER) + + #error "This is not a C++11 compiler" + +@@ -16636,7 +16636,7 @@ + + #error "This is not a C++ compiler" + +-#elif __cplusplus < 201103L ++#elif __cplusplus < 201103L && !(defined _MSC_VER) + + #error "This is not a C++11 compiler" + +-- +2.12.3 + diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in index b5af365cde4e..b9eaa71beb67 100644 --- a/solenv/flatpak-manifest.in +++ b/solenv/flatpak-manifest.in @@ -182,10 +182,10 @@ "dest-filename": "external/tarballs/libgpg-error-1.27.tar.bz2" }, { - "url": "https://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2", - "sha256": "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199", + "url": "https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz", + "sha256": "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485", "type": "file", - "dest-filename": "external/tarballs/libabw-0.1.1.tar.bz2" + "dest-filename": "external/tarballs/libabw-0.1.2.tar.xz" }, { "url": "https://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz", |