diff options
| author | David Tardon <dtardon@redhat.com> | 2017-11-07 15:56:42 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-11-08 09:12:52 +0100 |
| commit | 42cbbdcbd46f3c44f16a853fcd193b2001a998e5 (patch) | |
| tree | ae4f6c28db2465d8783e5016792feaa6fc4626b0 /external | |
| parent | d6214b8e9b3f9956c91d7b88e1985cb56112ea37 (diff) | |
upload libstaroffice 0.0.5
Change-Id: I43fcd4b7daf6fb2a035bcd34ac7a46624155e8ba
Reviewed-on: https://gerrit.libreoffice.org/44420
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external')
| -rw-r--r-- | external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 | 32 | ||||
| -rw-r--r-- | external/libstaroffice/UnpackedTarball_libstaroffice.mk | 4 |
2 files changed, 0 insertions, 36 deletions
diff --git a/external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 b/external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 deleted file mode 100644 index a0e1a362bb31..000000000000 --- a/external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 +++ /dev/null @@ -1,32 +0,0 @@ -From a90326d10f1f63e78b996fd3db1cb4c43960e406 Mon Sep 17 00:00:00 2001 -From: osnola <alonso@loria.fr> -Date: Wed, 19 Jul 2017 12:04:41 +0200 -Subject: [PATCH] clang: do not use defined(__has_cpp_attribute) and - __has_cpp_attribute(clang::fallthrough) on the same line... - ---- - src/lib/libstaroffice_internal.hxx | 8 +++++--- - 1 file changed, 5 insertions(+), 3 deletions(-) - -diff --git a/src/lib/libstaroffice_internal.hxx b/src/lib/libstaroffice_internal.hxx -index edf806c..e362116 100644 ---- a/src/lib/libstaroffice_internal.hxx -+++ b/src/lib/libstaroffice_internal.hxx -@@ -113,9 +113,11 @@ struct STOFF_shared_ptr_noop_deleter { - /** fall through attributes */ - #define STOFF_FALLTHROUGH - #if defined(__clang__) --# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough) --# undef STOFF_FALLTHROUGH --# define STOFF_FALLTHROUGH [[clang::fallthrough]] -+# if defined(__has_cpp_attribute) -+# if __has_cpp_attribute(clang::fallthrough) -+# undef STOFF_FALLTHROUGH -+# define STOFF_FALLTHROUGH [[clang::fallthrough]] -+# endif - # endif - #elif defined(__GNUC__) - # if __GNUC__>=7 --- -2.13.0 - diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk index 5012b8c84591..17bf429eb8d0 100644 --- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -37,8 +37,4 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ )) endif -$(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ - external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 \ -)) - # vim: set noet sw=4 ts=4: |