[Libreoffice-commits] core.git: 5 commits - external/libepubgen external/libqxp i18npool/source ios/CustomTarget_Lo_Xcconfig.mk sfx2/source
jan Iversen
jani at libreoffice.org
Wed Sep 6 11:05:15 UTC 2017
external/libepubgen/UnpackedTarball_libepubgen.mk | 3 +++
external/libepubgen/libepubgen-ios.patch.1 | 21 +++++++++++++++++++++
external/libqxp/UnpackedTarball_libqxp.mk | 1 +
external/libqxp/iOS.patch.1 | 21 +++++++++++++++++++++
i18npool/source/breakiterator/gendict.cxx | 3 ++-
ios/CustomTarget_Lo_Xcconfig.mk | 6 ------
sfx2/source/bastyp/dummytypes.cxx | 1 -
7 files changed, 48 insertions(+), 8 deletions(-)
New commits:
commit 7030d03c8345dd98e9470c7c8de942391ad49e6d
Author: jan Iversen <jani at libreoffice.org>
Date: Wed Sep 6 12:40:36 2017 +0200
iOS, avoid copying res files.
the resource files are compiled into the code, so no
need to copy the resource files.
LibreOfficeKit compiles for arm64
A few link problems outstanding
Change-Id: I82ba6f2582b01b2cc5180fd1ee732c7c8458275d
diff --git a/ios/CustomTarget_Lo_Xcconfig.mk b/ios/CustomTarget_Lo_Xcconfig.mk
index 3e3be5eca4d1..a4bbbc577e82 100644
--- a/ios/CustomTarget_Lo_Xcconfig.mk
+++ b/ios/CustomTarget_Lo_Xcconfig.mk
@@ -59,12 +59,6 @@ $(LO_XCCONFIG) :
cp $(INSTDIR)/program/services/services.rdb $(IOSRESOURCE)/services
cp $(INSTDIR)/program/services.rdb $(IOSRESOURCE)
- # copy .res files
- # program/resource is hardcoded in unotools/source/i18n/resmgr.cxx. Sure,
- # we could set STAR_RESOURCE_PATH instead. sigh...
- mkdir -p $(IOSRESOURCE)/program/resource
- cp $(INSTDIR)/program/resource/*en-US.res $(IOSRESOURCE)/program/resource
-
# soffice.cfg
mkdir -p $(IOSRESOURCE)/share/config
cp -R $(INSTDIR)/share/config/soffice.cfg $(IOSRESOURCE)/share/config
commit 4829d41c89acbf29db6414d026275829cf69bdc1
Author: jan Iversen <jani at libreoffice.org>
Date: Wed Sep 6 08:42:52 2017 +0200
iOS, make gendict.cxx compile
it is not possible to take the address directly of OUString variables.
Change-Id: I8e31494523f4ec186de81aa065f03d7fb2ef475d
diff --git a/i18npool/source/breakiterator/gendict.cxx b/i18npool/source/breakiterator/gendict.cxx
index dd3376835dd1..677ea49812af 100644
--- a/i18npool/source/breakiterator/gendict.cxx
+++ b/i18npool/source/breakiterator/gendict.cxx
@@ -146,7 +146,8 @@ static inline void printDataArea(FILE *dictionary_fp, FILE *source_fp, vector<sa
if ((lenArrayCurr & 0x0f) == 0x0f)
fputs("\n\t", source_fp);
#else
- fwrite(&Ostr[i], sizeof(Ostr[i]), 1, source_fp);
+ sal_Unicode x = Ostr[i];
+ fwrite(&x, sizeof(Ostr[i]), 1, source_fp);
#endif
}
}
commit 0c1532c62bc489e5e811a641919492316bcbe8e3
Author: jan Iversen <jani at libreoffice.org>
Date: Mon Sep 4 22:45:44 2017 +0200
removed unused type for avmedia dummytypes
Removed StaticType, since opengrok can only find 1 place it is present.
Change-Id: I5a2aacb53c6a22d510e79c152b3725fa7821351d
diff --git a/sfx2/source/bastyp/dummytypes.cxx b/sfx2/source/bastyp/dummytypes.cxx
index 2955172ecaf1..183a0ab4d811 100644
--- a/sfx2/source/bastyp/dummytypes.cxx
+++ b/sfx2/source/bastyp/dummytypes.cxx
@@ -11,7 +11,6 @@
#include <avmedia/mediaitem.hxx>
#if !HAVE_FEATURE_AVMEDIA
-SAL_DLLPUBLIC_EXPORT TypeId avmedia::MediaItem::StaticType() { return 0; }
#endif
// vim:set shiftwidth=4 softtabstop=4 expandtab:
commit b63cbdaec5873a32bd936d24d3152c3ec4de3180
Author: jan Iversen <jani at libreoffice.org>
Date: Mon Sep 4 21:56:15 2017 +0200
iOS, update libqxp to allow arm64
Added iOS patch for arm64
Change-Id: I5a7c3b6d68df6fa8202c04d9a710e4a611b49b99
diff --git a/external/libqxp/UnpackedTarball_libqxp.mk b/external/libqxp/UnpackedTarball_libqxp.mk
index 028ae73a0e1b..e39ea71a976c 100644
--- a/external/libqxp/UnpackedTarball_libqxp.mk
+++ b/external/libqxp/UnpackedTarball_libqxp.mk
@@ -26,6 +26,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,libqxp, \
external/libqxp/0001-add-missing-includes.patch.1 \
external/libqxp/0001-WaE-narrowing-conversion.patch.1 \
external/libqxp/android-workaround.patch.1 \
+ external/libqxp/iOS.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libqxp/iOS.patch.1 b/external/libqxp/iOS.patch.1
new file mode 100644
index 000000000000..28082edbee2e
--- /dev/null
+++ b/external/libqxp/iOS.patch.1
@@ -0,0 +1,21 @@
+diff -Naur libqxp/config.sub libqxp.new/config.sub
+--- libqxp/config.sub 2017-08-26 08:39:26.000000000 +0200
++++ libqxp.new/config.sub 2017-09-04 21:50:24.000000000 +0200
+@@ -252,7 +252,7 @@
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc | arceb \
+- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
+ | avr | avr32 \
+ | ba \
+ | be32 | be64 \
+@@ -374,7 +374,7 @@
+ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
+- | arm-* | armbe-* | armle-* | armeb-* | armv*-* \
++ | arm-* | armbe-* | armle-* | armeb-* | armv*-* | arm64* \
+ | avr-* | avr32-* \
+ | ba-* \
+ | be32-* | be64-* \
commit 9cd591c1d954032f47eb4831a6c8d46886b45917
Author: jan Iversen <jani at libreoffice.org>
Date: Mon Sep 4 21:47:04 2017 +0200
iOS, add arm64 support in libepub
Added patch to support arm64
Change-Id: If230ddd45b9d1fecc91e1cb529ff3f3da7f2c03d
diff --git a/external/libepubgen/UnpackedTarball_libepubgen.mk b/external/libepubgen/UnpackedTarball_libepubgen.mk
index eb8f0bab9fae..28582a5cf0f3 100644
--- a/external/libepubgen/UnpackedTarball_libepubgen.mk
+++ b/external/libepubgen/UnpackedTarball_libepubgen.mk
@@ -18,6 +18,9 @@ epubgen_patches += libepubgen-validation3.patch.1
epubgen_patches += libepubgen-vc.patch.1
# Backport of <https://sourceforge.net/p/libepubgen/code/ci/2e9e9af9f49a78cca75d3c862c8dd4b5f7cc7eb2/> (and its deps).
epubgen_patches += libepubgen-epub3.patch.1
+# iOS patch to support arm64
+epubgen_patches += libepubgen-ios.patch.1
+
ifeq ($(COM_IS_CLANG),TRUE)
ifneq ($(filter -fsanitize=%,$(CC)),)
diff --git a/external/libepubgen/libepubgen-ios.patch.1 b/external/libepubgen/libepubgen-ios.patch.1
new file mode 100644
index 000000000000..74ca30c47794
--- /dev/null
+++ b/external/libepubgen/libepubgen-ios.patch.1
@@ -0,0 +1,21 @@
+diff -Naur libepubgen/config.sub libepubgen.new/config.sub
+--- libepubgen/config.sub 2014-06-08 18:24:47.000000000 +0200
++++ libepubgen.new/config.sub 2017-09-04 21:41:46.000000000 +0200
+@@ -257,7 +257,7 @@
+ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
+ | am33_2.0 \
+ | arc \
+- | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | arm64 \
+ | avr | avr32 \
+ | be32 | be64 \
+ | bfin \
+@@ -370,7 +370,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-* \
More information about the Libreoffice-commits
mailing list