diff options
| author | David Tardon <dtardon@redhat.com> | 2017-11-14 20:07:09 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-11-15 16:26:40 +0100 |
| commit | a3df638a0c8ec1a5a318df96760119d99d2d66dc (patch) | |
| tree | 66eeee98a2b7359e2ac43173e35e67905782a9e7 /external | |
| parent | e6aec5ad0a0db4f41f90b39971c296732372cadf (diff) | |
upload libmwaw 0.3.13
Change-Id: I9af801efd81bbe64117de52359491c05069c1947
Reviewed-on: https://gerrit.libreoffice.org/44736
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
4 files changed, 26 insertions, 48 deletions
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: |