summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPatrick Luby <patrick.luby@collabora.com>2023-03-21 08:38:21 -0400
committerAndras Timar <andras.timar@collabora.com>2023-05-25 09:09:37 +0200
commit11ba45cad501c76eda85fa5834350c230fe88b0b (patch)
treec101c5cdc963ab805bd70cfa204c84f47f6d6b6c
parent71bed39a48f8b979c522b158a2e44724dda5b503 (diff)
Partial fix: iOS missing text direction listbox in Format > Page Style > Page
Add the static libraries that are required by the LibreOffice's CTL and CJK text layout features to the iOS app add link list. libnumbertext.a is one of the missing static libraries that are required by the LibreOffice's CTL and CJK text layout features. The other missing static library (which was in the ios-all-static-libs list but was getting stripped by Xcode) is added back by listing the "lingucomponent_NumberText_get_implementation" C function. Without these static library changes, enabling CTL or CJK will cause a crash as the "lingucomponent_NumberText_get_implementation" symbol won't be in the binary and that function needs libnumbertext.a. Reference-to: https://github.com/CollaboraOnline/online/issues/6050 Change-Id: I21fddbfd29a1d326b509840127bd136c327cd3d2 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149240 Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com> Reviewed-by: Patrick Luby <plubius@neooffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
-rwxr-xr-xbin/lo-all-static-libs1
-rwxr-xr-xsolenv/bin/native-code.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/bin/lo-all-static-libs b/bin/lo-all-static-libs
index 3db8d803d07a..009ddce23730 100755
--- a/bin/lo-all-static-libs
+++ b/bin/lo-all-static-libs
@@ -119,6 +119,7 @@ echo $INSTDIR/$LIBO_LIB_FOLDER/lib*.a \
$WORKDIR/UnpackedTarball/libexttextcat/src/.libs/*.a \
$WORKDIR/UnpackedTarball/libmspub/src/lib/.libs/*.a \
$WORKDIR/UnpackedTarball/libmwaw/src/lib/.libs/*.a \
+ $WORKDIR/UnpackedTarball/libnumbertext/src/.libs/*.a \
$WORKDIR/UnpackedTarball/libodfgen/src/.libs/*.a \
$WORKDIR/UnpackedTarball/liborcus/src/*/.libs/*.a \
$WORKDIR/UnpackedTarball/librevenge/src/*/.libs/*.a \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 0309ae09a7ee..40a8981c0c1c 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -308,6 +308,7 @@ core_constructor_list = [
("lingucomponent_MacSpellChecker_get_implementation", "#ifdef IOS"),
# lingucomponent/source/spellcheck/languagetool/LanguageTool.component
("lingucomponent_LanguageToolGrammarChecker_get_implementation", "#if !ENABLE_FUZZERS"),
+ "lingucomponent_NumberText_get_implementation",
# lingucomponent/source/thesaurus/libnth/lnth.component
"lingucomponent_Thesaurus_get_implementation",
"lingucomponent_SpellChecker_get_implementation",