[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - configure.ac lingucomponent/Library_MacOSXSpell.mk lingucomponent/Module_lingucomponent.mk postprocess/Rdb_services.mk Repository.mk solenv/bin

[Tor Lillqvist (via logerrit)]

 Repository.mk                           |    4 ++--
 configure.ac                            |    8 ++++++--
 lingucomponent/Library_MacOSXSpell.mk   |    1 -
 lingucomponent/Module_lingucomponent.mk |    4 ++--
 postprocess/Rdb_services.mk             |    6 ++++--
 solenv/bin/native-code.py               |    4 ++--
 6 files changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 1e01adf9d46524569c0c4461b78e5c06143db761
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Jan 3 13:55:24 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Jan 3 14:23:29 2020 +0100

    Use only the 'MacOSXSpell' component on iOS, not the 'spell' one
    
    Using only the system spell checker (through MacOSXSpell) is what we
    have been doing anyway.
    
    Do not build the hunspell or mythes externals for iOS. Do not build
    the lnth or spell components for iOS.
    
    Change-Id: I2e2abc268d7719e540072e5daff3f7960e04ed27
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86172
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/Repository.mk b/Repository.mk
index cd7f47ffbb24..6d1458238231 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -394,7 +394,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	localebe1 \
 	log \
 	lng \
-	lnth \
+	$(if $(filter-out iOS,$(OS)),lnth) \
 	$(if $(filter $(OS),MACOSX),macbe1) \
 	$(if $(MERGELIBS),merged) \
 	migrationoo2 \
@@ -428,7 +428,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \
 	simplecanvas \
 	slideshow \
 	sot \
-	spell \
+	$(if $(filter-out iOS,$(OS)),spell) \
 	$(if $(DISABLE_GUI),,spl) \
 	storagefd \
 	$(call gb_Helper_optional,SCRIPTING,stringresource) \
diff --git a/configure.ac b/configure.ac
index 568a99baf59f..c24547c7e283 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9648,7 +9648,9 @@ dnl ===================================================================
 dnl Check for system hunspell
 dnl ===================================================================
 AC_MSG_CHECKING([which libhunspell to use])
-if test "$with_system_hunspell" = "yes"; then
+if test "$_os" = iOS; then
+   AC_MSG_RESULT([none])
+elif test "$with_system_hunspell" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_HUNSPELL=TRUE
     AC_LANG_PUSH([C++])
@@ -9721,7 +9723,9 @@ dnl ===================================================================
 dnl Checking for mythes
 dnl ===================================================================
 AC_MSG_CHECKING([which mythes to use])
-if test "$with_system_mythes" = "yes"; then
+if test "$_os" = iOS; then
+   AC_MSG_RESULT([none])
+elif test "$with_system_mythes" = "yes"; then
     AC_MSG_RESULT([external])
     SYSTEM_MYTHES=TRUE
     AC_LANG_PUSH([C++])
diff --git a/lingucomponent/Library_MacOSXSpell.mk b/lingucomponent/Library_MacOSXSpell.mk
index f244673a1c4c..d49ee47a73bd 100644
--- a/lingucomponent/Library_MacOSXSpell.mk
+++ b/lingucomponent/Library_MacOSXSpell.mk
@@ -38,7 +38,6 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,MacOSXSpell,\
 
 $(eval $(call gb_Library_use_externals,MacOSXSpell,\
 	boost_headers \
-	hunspell \
 ))
 
 $(eval $(call gb_Library_add_objcxxobjects,MacOSXSpell,\
diff --git a/lingucomponent/Module_lingucomponent.mk b/lingucomponent/Module_lingucomponent.mk
index 2bde5d5391e5..9dabeb155673 100644
--- a/lingucomponent/Module_lingucomponent.mk
+++ b/lingucomponent/Module_lingucomponent.mk
@@ -13,9 +13,9 @@ $(eval $(call gb_Module_Module,lingucomponent))
 $(eval $(call gb_Module_add_targets,lingucomponent,\
 	Library_guesslang \
 	Library_hyphen \
-	Library_lnth \
+	$(if $(filter-out iOS,$(OS)),Library_lnth) \
 	$(if $(filter iOS MACOSX,$(OS)),Library_MacOSXSpell) \
-	Library_spell \
+	$(if $(filter-out iOS,$(OS)),Library_spell) \
 	StaticLibrary_ulingu \
 	Library_numbertext \
 ))
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index 406382b9fd16..bcfd9fd8a18d 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -50,8 +50,10 @@ $(eval $(call gb_Rdb_add_components,services,\
 	i18npool/util/i18npool \
 	lingucomponent/source/hyphenator/hyphen/hyphen \
 	lingucomponent/source/languageguessing/guesslang \
-	lingucomponent/source/spellcheck/spell/spell \
-	lingucomponent/source/thesaurus/libnth/lnth \
+	$(if $(filter-out iOS,$(OS)), \
+		lingucomponent/source/spellcheck/spell/spell \
+		lingucomponent/source/thesaurus/libnth/lnth \
+	) \
 	lingucomponent/source/numbertext/numbertext \
 	linguistic/source/lng \
 	$(if $(ENABLE_LWP), \
diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index d000d106c337..9a688a3b470d 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -34,7 +34,7 @@ core_factory_list = [
     ("libi18nsearchlo.a", "i18nsearch_component_getFactory"),
     ("libinvocadaptlo.a", "invocadapt_component_getFactory"),
     ("liblnglo.a", "lng_component_getFactory"),
-    ("liblnthlo.a", "lnth_component_getFactory"),
+    ("liblnthlo.a", "lnth_component_getFactory", "#ifndef IOS"),
     ("liblocalebe1lo.a", "localebe1_component_getFactory"),
     ("libpackage2.a", "package2_component_getFactory"),
     ("libsmlo.a", "sm_component_getFactory"),
@@ -58,7 +58,7 @@ core_factory_list = [
     ("libxmlscriptlo.a", "xmlscript_component_getFactory"),
     ("libmcnttype.a", "mcnttype_component_getFactory"),
     ("libvcllo.a", "vcl_component_getFactory"),
-    ("libspelllo.a", "spell_component_getFactory"),
+    ("libspelllo.a", "spell_component_getFactory", "#ifndef IOS"),
     ("libsvtlo.a", "svt_component_getFactory"),
     ("libpdffilterlo.a", "pdffilter_component_getFactory"),
     ("libctllo.a", "ctl_component_getFactory"),