diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | download.lst | 4 | ||||
| -rw-r--r-- | external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 | 25 | ||||
| -rw-r--r-- | external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 | 46 | ||||
| -rw-r--r-- | external/libmwaw/ExternalProject_libmwaw.mk | 1 | ||||
| -rw-r--r-- | external/libmwaw/UnpackedTarball_libmwaw.mk | 2 |
6 files changed, 29 insertions, 51 deletions
diff --git a/configure.ac b/configure.ac index 63ae44336fec..ffb1fdf0c850 100644 --- a/configure.ac +++ b/configure.ac @@ -7698,7 +7698,7 @@ libo_CHECK_SYSTEM_MODULE([libcdr],[CDR],[libcdr-0.1]) libo_CHECK_SYSTEM_MODULE([libmspub],[MSPUB],[libmspub-0.1]) libo_CHECK_SYSTEM_MODULE([libmwaw],[MWAW],[libmwaw-0.3 >= 0.3.1]) -libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.11]) +libo_PKG_VERSION([MWAW], [libmwaw-0.3], [0.3.13]) libo_CHECK_SYSTEM_MODULE([libetonyek],[ETONYEK],[libetonyek-0.1]) libo_PKG_VERSION([ETONYEK], [libetonyek-0.1], [0.1.7]) diff --git a/download.lst b/download.lst index 78bac45c9514..dca14ac081be 100644 --- a/download.lst +++ b/download.lst @@ -158,8 +158,8 @@ export MDNSRESPONDER_SHA256SUM := 4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09 export MDNSRESPONDER_TARBALL := mDNSResponder-576.30.4.tar.gz export MSPUB_SHA256SUM := 26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a export MSPUB_TARBALL := libmspub-0.1.2.tar.bz2 -export MWAW_SHA256SUM := 7691a6e6e7221d61c40e3f630a8907e3e516b99a587e47d09ec53f8ac60ed1e7 -export MWAW_VERSION_MICRO := 12 +export MWAW_SHA256SUM := db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea +export MWAW_VERSION_MICRO := 13 export MWAW_TARBALL := libmwaw-0.3.$(MWAW_VERSION_MICRO).tar.xz export MYSQL_CONNECTOR_CPP_SHA256SUM := a25f14dad39e93a2f9cdf09166ee53981f7212dce829e4208e07a522963a8585 export MYSQL_CONNECTOR_CPP_TARBALL := 7239a4430efd4d0189c4f24df67f08e5-mysql-connector-c++-1.1.4.tar.gz diff --git a/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 b/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 new file mode 100644 index 000000000000..2036fa869f86 --- /dev/null +++ b/external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 @@ -0,0 +1,25 @@ +From 4bc8ec0481f89b989b0c34236c9d5d9b8038d4a9 Mon Sep 17 00:00:00 2001 +From: David Tardon <dtardon@redhat.com> +Date: Wed, 15 Nov 2017 13:15:44 +0100 +Subject: [PATCH] fix call of explicit ctor + +--- + src/lib/libmwaw_internal.hxx | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx +index 2875a0fb..b844a9d5 100644 +--- a/src/lib/libmwaw_internal.hxx ++++ b/src/lib/libmwaw_internal.hxx +@@ -1027,7 +1027,7 @@ public: + } + //! generic constructor + template <class U> explicit MWAWBox2(MWAWBox2<U> const &p) +- : m_data(p.min(), p.max()) ++ : m_data(MWAWVec2<T>(p.min()), MWAWVec2<T>(p.max())) + { + } + +-- +2.14.3 + diff --git a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 deleted file mode 100644 index dbbe6bfd204c..000000000000 --- a/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 +++ /dev/null @@ -1,46 +0,0 @@ -From a7648cda4017551c1c97c61362eb52d95fbe68e7 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Mon, 17 Jul 2017 10:43:01 +0200 -Subject: [PATCH] make MWAW_FALLTHROUGH decl. more verbose again - -... because older clang doesn't like the former one: -./libmwaw_internal.hxx:122:58: error: token is not a valid binary operator in a preprocessor subexpression - ~~~~~~~~~~~~~~~~~~~^ ---- - src/lib/libmwaw_internal.hxx | 13 ++++++++----- - 1 file changed, 8 insertions(+), 5 deletions(-) - -diff --git a/src/lib/libmwaw_internal.hxx b/src/lib/libmwaw_internal.hxx -index 4c9580d..cbf0fc0 100644 ---- a/src/lib/libmwaw_internal.hxx -+++ b/src/lib/libmwaw_internal.hxx -@@ -117,17 +117,20 @@ struct MWAW_shared_ptr_noop_deleter { - #endif - - /** fall through attributes */ --#define MWAW_FALLTHROUGH --#if defined(__clang__) -+#if defined(__clang__) && defined(__has_cpp_attribute) --# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough) --# undef MWAW_FALLTHROUGH -+# if __has_cpp_attribute(clang::fallthrough) - # define MWAW_FALLTHROUGH [[clang::fallthrough]] -+# else -+# define MWAW_FALLTHROUGH - # endif - #elif defined(__GNUC__) - # if __GNUC__>=7 --# undef MWAW_FALLTHROUGH --# define MWAW_FALLTHROUGH __attribute__ ((fallthrough)) -+# define MWAW_FALLTHROUGH [[fallthrough]] -+# else -+# define MWAW_FALLTHROUGH - # endif -+#else -+# define MWAW_FALLTHROUGH - #endif - - /* ---------- debug --------------- */ --- -2.13.0 - diff --git a/external/libmwaw/ExternalProject_libmwaw.mk b/external/libmwaw/ExternalProject_libmwaw.mk index 50483717eebd..a30af23e9bed 100644 --- a/external/libmwaw/ExternalProject_libmwaw.mk +++ b/external/libmwaw/ExternalProject_libmwaw.mk @@ -29,7 +29,6 @@ $(call gb_ExternalProject_get_state_target,libmwaw,build) : , \ --enable-shared --disable-static \ ) \ - --with-sharedptr=c++11 \ --without-docs \ --disable-tools \ --disable-zip \ diff --git a/external/libmwaw/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk index ff87be9a2028..851b39bc66d0 100644 --- a/external/libmwaw/UnpackedTarball_libmwaw.mk +++ b/external/libmwaw/UnpackedTarball_libmwaw.mk @@ -38,7 +38,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ endif $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \ - external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 \ + external/libmwaw/0001-fix-call-of-explicit-ctor.patch.1 \ )) # vim: set noet sw=4 ts=4: |