diff options
| -rw-r--r-- | download.lst | 4 | ||||
| -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 |
3 files changed, 2 insertions, 38 deletions
diff --git a/download.lst b/download.lst index 45d20903a754..2431931de40d 100644 --- a/download.lst +++ b/download.lst @@ -209,8 +209,8 @@ export RHINO_SHA256SUM := 1fb458d6aab06932693cc8a9b6e4e70944ee1ff052fa63606e3131 export RHINO_TARBALL := 798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip export SERF_SHA256SUM := 6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700 export SERF_TARBALL := serf-1.2.1.tar.bz2 -export STAROFFICE_SHA256SUM := 6e728784d002144716b10fe122973b3e4edda9004538386b0b58bb303404903a -export STAROFFICE_VERSION_MICRO := 4 +export STAROFFICE_SHA256SUM := 315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982 +export STAROFFICE_VERSION_MICRO := 5 export STAROFFICE_TARBALL := libstaroffice-0.0.$(STAROFFICE_VERSION_MICRO).tar.xz export SWING_SHA256SUM := 64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1 export SWING_TARBALL := 35c94d2df8893241173de1d16b6034c0-swingExSrc.zip 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: |