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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Mon Sep 16 12:48:14 UTC 2019


 ios/CustomTarget_iOS_setup.mk |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a04a1e82172c6a38585d45b394be95de4a96e641
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Mar 25 18:25:52 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon Sep 16 14:47:37 2019 +0200

    Just include all fonts from instdir/share/fonts in the iOS app
    
    Change-Id: I7c98fb1cbf6523e39111c774a5ef3af20bba73b6
    Reviewed-on: https://gerrit.libreoffice.org/79002
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 3ae6bd9c20d1..e9db39d478bc 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -66,7 +66,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	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
+	cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts
 	cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
 	# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and versionrc.


More information about the Libreoffice-commits mailing list