diff options
| author | David Tardon <dtardon@redhat.com> | 2017-07-17 09:06:58 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2017-07-20 10:48:05 +0200 |
| commit | 44401915b89582ebc50c644c4db38466a841d457 (patch) | |
| tree | 466dedaa1df4f4d5f18ec5e07c537dd8a82a5831 /external/libstaroffice | |
| parent | 77c70465200d5ab740bcb89c02a83c14dd5c008b (diff) | |
upload libstaroffice 0.0.4
Change-Id: Id350c51cff29d27c02cfe5e4fdb1c66be58001ad
Reviewed-on: https://gerrit.libreoffice.org/40037
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Diffstat (limited to 'external/libstaroffice')
4 files changed, 34 insertions, 29 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 new file mode 100644 index 000000000000..a0e1a362bb31 --- /dev/null +++ b/external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 @@ -0,0 +1,32 @@ +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/0001-ofz-1029-use-correct-loop-index.patch.1 b/external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 deleted file mode 100644 index f004e5674da6..000000000000 --- a/external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 +++ /dev/null @@ -1,27 +0,0 @@ -From 2d6253c7a692a3d92785dd990fce7256ea05e794 Mon Sep 17 00:00:00 2001 -From: David Tardon <dtardon@redhat.com> -Date: Fri, 7 Apr 2017 19:28:55 +0200 -Subject: [PATCH] ofz#1029 use correct loop index - -To be honest, I think this would be clearer as two separate reads to two -separate vars... ---- - src/lib/StarWriterStruct.cxx | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/lib/StarWriterStruct.cxx b/src/lib/StarWriterStruct.cxx -index 5893302..d1ad366 100644 ---- a/src/lib/StarWriterStruct.cxx -+++ b/src/lib/StarWriterStruct.cxx -@@ -327,7 +327,7 @@ bool DatabaseName::read(StarZone &zone) - } - data.m_name=libstoff::getString(text); - int positions[2]; -- for (int j=0; j<2; ++j) positions[i]=int(input->readULong(4)); -+ for (int j=0; j<2; ++j) positions[j]=int(input->readULong(4)); - data.m_selection=STOFFVec2i(positions[0],positions[1]); - m_dataList.push_back(data); - } --- -2.13.0 - diff --git a/external/libstaroffice/Library_staroffice.mk b/external/libstaroffice/Library_staroffice.mk index 50f77dc543d3..23d805d3a8e0 100644 --- a/external/libstaroffice/Library_staroffice.mk +++ b/external/libstaroffice/Library_staroffice.mk @@ -24,7 +24,7 @@ $(eval $(call gb_Library_set_include,staroffice,\ $(eval $(call gb_Library_add_defs,staroffice,\ -DBUILD_STOFF \ - -DDLL_EXPORT \ + -D_WINDLL \ -DNDEBUG \ -DSHAREDPTR_STD \ )) diff --git a/external/libstaroffice/UnpackedTarball_libstaroffice.mk b/external/libstaroffice/UnpackedTarball_libstaroffice.mk index 92a78fe9e5a4..0fb024f195ae 100644 --- a/external/libstaroffice/UnpackedTarball_libstaroffice.mk +++ b/external/libstaroffice/UnpackedTarball_libstaroffice.mk @@ -36,8 +36,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ endif $(eval $(call gb_UnpackedTarball_add_patches,libstaroffice, \ - external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1 \ external/libstaroffice/iOS.patch.0 \ + external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 \ )) # vim: set noet sw=4 ts=4: |