[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - ios/CustomTarget_iOS_setup.mk

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 27 17:45:06 UTC 2018


 ios/CustomTarget_iOS_setup.mk |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 6463efbc3271788e6e21dc97a2b25bd08f8784f9
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Tue Nov 27 16:10:25 2018 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Tue Nov 27 16:10:25 2018 +0200

    Prepare to bundle the Liberation fonts with the iOS app
    
    The way the iOS app is built (over in the online repo), any
    "resources" to be included need to be copied into the
    workdir/CustomTarget/ios folder.
    
    Change-Id: I0104df73326a8ccfa86235ea23b5900f9d2554b5

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 7c09103a6de4..2501ebecee53 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -48,6 +48,8 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 	cp -R $(INSTDIR)/share/registry $(IOSRES)
 	cp $(INSTDIR)/share/config/*zip $(IOSRES)/share/config
 	cp -R $(INSTDIR)/share/liblangtag $(IOSRES)/share
+	mkdir -p $(IOSRES)/share/fonts/truetype
+	cp $(INSTDIR)/share/fonts/truetype/Liberation* $(IOSRES)/share/fonts/truetype
 
 	# Set up rc, the "inifile". See getIniFileName_Impl().
 	echo '[Bootstrap]' > $(IOSRES)/rc


More information about the Libreoffice-commits mailing list