[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 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 f916474ed0ee205b4f34b74ab6b248230e9f0673
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:44:51 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 56824add0e56..106ae3cec1f1 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -63,7 +63,8 @@ core_factory_list = [
     ("libvcllo.a", "vcl_component_getFactory"),
     ("libspelllo.a", "spell_component_getFactory"),
     ("libpdffilterlo.a", "pdffilter_component_getFactory"),
-    ("libsvtlo.a", "svt_component_getFactory")
+    ("libsvtlo.a", "svt_component_getFactory"),
+    ("libctllo.a", "ctl_component_getFactory")
     ]
 
 core_constructor_list = [
commit 4a76f0e8b2509e3e137b380a54eacbce434f89c1
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:44:51 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 aaeaa5c1cc41..a05bc8d04487 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -49,6 +49,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 	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