basic/source/sbx/sbxvalue.cxx | 2 ++
external/libcdr/UnpackedTarball_libcdr.mk | 3 +++
external/libcdr/iOS.patch | 20 ++++++++++++++++++++
3 files changed, 25 insertions(+)
New commits:
commit bb826321b590ea793d0a225489b45e0c2c6ac237
Author: jan Iversen <j...@libreoffice.org>
Date: Tue Sep 19 15:36:12 2017 +0200
iOS, solved code never reached (sbxvalue.cxx)
used #ifndef to avoid "code never reached"
Change-Id: I3f3d6f9aa31a263b783528e2921133ed526146c9
diff --git a/basic/source/sbx/sbxvalue.cxx b/basic/source/sbx/sbxvalue.cxx
index 0d5a1c432156..a754e1f13610 100644
--- a/basic/source/sbx/sbxvalue.cxx
+++ b/basic/source/sbx/sbxvalue.cxx
@@ -1358,8 +1358,10 @@ bool SbxValue::Compare( SbxOperator eOp, const SbxValue&
rOp ) const
{
if ( bVBAInterop && eOp == SbxEQ && GetError() ==
ERRCODE_BASIC_CONVERSION )
{
+#ifndef IOS
ResetError();
bRes = false;
+#endif
}
}
}
commit bc6aa1c4c3304baaaec4c9e14d47b983d186550b
Author: jan Iversen <j...@libreoffice.org>
Date: Tue Sep 19 15:30:10 2017 +0200
iOS, patch libcdr to accept 64bit compile
Change-Id: Ifa52ee6caedbf79450b098a3a0debe75836debb8
diff --git a/external/libcdr/UnpackedTarball_libcdr.mk
b/external/libcdr/UnpackedTarball_libcdr.mk
index e3c218386f50..cc3851ebdccb 100644
--- a/external/libcdr/UnpackedTarball_libcdr.mk
+++ b/external/libcdr/UnpackedTarball_libcdr.mk
@@ -13,6 +13,9 @@ $(eval $(call
gb_UnpackedTarball_set_tarball,libcdr,$(CDR_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,libcdr,0))
+$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
+ external/libcdr/iOS.patch \
+))
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
$(eval $(call gb_UnpackedTarball_add_patches,libcdr, \
diff --git a/external/libcdr/iOS.patch b/external/libcdr/iOS.patch
new file mode 100644
index 000000000000..44e3d87918f6
--- /dev/null
+++ b/external/libcdr/iOS.patch
@@ -0,0 +1,20 @@
+--- config.sub
++++ config.sub
+@@ -250,7 +250,7 @@
+ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] |
alpha64pca5[67] \
+ | am33_2.0 \
+- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr |
avr32 \
++ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | arm64
| avr | avr32 \
+ | be32 | be64 \
+ | bfin \
+ | c4x | clipper \
+@@ -358,7 +358,7 @@
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+ | avr-* | avr32-* \
+ | be32-* | be64-* \
+ | bfin-* | bs2000-* \
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
