[Libreoffice-commits] core.git: external/libmwaw

[David Tardon]

 external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 |   45 ++++++++++
 external/libmwaw/UnpackedTarball_libmwaw.mk                                  |    1 
 2 files changed, 46 insertions(+)

New commits:
commit df1d2d9d732e54a9596722b75e5117ed36cdc664
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jul 17 10:53:17 2017 +0200

    try to fix osx build
    
    Change-Id: I4b9f29f6221b6c4206a961e9951fff2d3ab93e21

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
new file mode 100644
index 000000000000..c983002f086f
--- /dev/null
+++ b/external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1
@@ -0,0 +1,45 @@
+From a7648cda4017551c1c97c61362eb52d95fbe68e7 Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at 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(__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/UnpackedTarball_libmwaw.mk b/external/libmwaw/UnpackedTarball_libmwaw.mk
index c51473a3fe82..bf44de96c3f3 100644
--- a/external/libmwaw/UnpackedTarball_libmwaw.mk
+++ b/external/libmwaw/UnpackedTarball_libmwaw.mk
@@ -37,6 +37,7 @@ endif
 
 $(eval $(call gb_UnpackedTarball_add_patches,libmwaw, \
     external/libmwaw/iOS.patch.0 \
+    external/libmwaw/0001-make-MWAW_FALLTHROUGH-decl.-more-verbose-again.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4: