[Libreoffice-commits] core.git: 2 commits - ios/CustomTarget_iOS_setup.mk solenv/bin

[Libreoffice Gerrit user]

 ios/CustomTarget_iOS_setup.mk |    1 +
 solenv/bin/native-code.py     |    3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e0d686af6de6443d2845aa15cac5b2830b5e1dbf
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Mar 20 23:43:21 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Mar 20 23:47:56 2019 +0200

    tdf#124168: The libctllo.a is needed in the iOS app for ToC
    
    After I added the share/template folder, the app then turns out to
    need this UNO component.
    
    Change-Id: I877dd8c730f49477e20c58515ee80bafdafaa6b7

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index ac7a1fc3c34e..a52d8e138a19 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -61,7 +61,8 @@ core_factory_list = [
     ("libspelllo.a", "spell_component_getFactory"),
     ("libpdffilterlo.a", "pdffilter_component_getFactory"),
     ("libsvgiolo.a", "svgio_component_getFactory"),
-    ("libsvtlo.a", "svt_component_getFactory")
+    ("libsvtlo.a", "svt_component_getFactory"),
+    ("libctllo.a", "ctl_component_getFactory")
     ]
 
 core_constructor_list = [
commit 6edbf6015e13a6932fb39db5ad62f34daf96f917
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Mar 20 23:42:16 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Mar 20 23:46:41 2019 +0200

    tdf#124168: The share/template folder is needed in the iOS app
    
    Otherwise we get a warning dialog about a missing
    internal/idxexample.odt when inserting a table of contents.
    
    Change-Id: Id30be100906ea3292b9acd9e983ef7ae39ef63a2

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index faf8d25bf629..89f8e340f44d 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -68,6 +68,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
 	cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
 	cp -R $(INSTDIR)/share/theme_definitions $(IOSRES)/share
+	cp -R $(INSTDIR)/share/template $(IOSRES)/share
 	mkdir -p $(IOSRES)/share/fonts/truetype
 	cp $(INSTDIR)/share/fonts/truetype/Liberation* $(IOSRES)/share/fonts/truetype
 	cp $(SRCDIR)/ios/welcome.odt $(IOSRES)