[Libreoffice-commits] core.git: download.lst external/libstaroffice

[David Tardon]

 download.lst                                                                             |    4 -
 external/libstaroffice/0001-clang-do-not-use-defined-__has_cpp_attribute-and-__h.patch.1 |   32 ++++++++++
 external/libstaroffice/0001-ofz-1029-use-correct-loop-index.patch.1                      |   27 --------
 external/libstaroffice/Library_staroffice.mk                                             |    2 
 external/libstaroffice/UnpackedTarball_libstaroffice.mk                                  |    2 
 5 files changed, 36 insertions(+), 31 deletions(-)

New commits:
commit 44401915b89582ebc50c644c4db38466a841d457
Author: David Tardon <dtardon at redhat.com>
Date:   Mon Jul 17 09:06:58 2017 +0200

    upload libstaroffice 0.0.4
    
    Change-Id: Id350c51cff29d27c02cfe5e4fdb1c66be58001ad
    Reviewed-on: https://gerrit.libreoffice.org/40037
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/download.lst b/download.lst
index eb626cbf5d02..0419d0148ea5 100644
--- a/download.lst
+++ b/download.lst
@@ -210,8 +210,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 := bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6
-export STAROFFICE_VERSION_MICRO := 3
+export STAROFFICE_SHA256SUM := 6e728784d002144716b10fe122973b3e4edda9004538386b0b58bb303404903a
+export STAROFFICE_VERSION_MICRO := 4
 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
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 at 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 at 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: