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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 20 13:52:12 UTC 2019


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

New commits:
commit f56f8b5dbd488a486bdbbe20305ee5ef662299a0
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Aug 30 13:18:49 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Sep 20 15:51:15 2019 +0200

    tdf#126966: The share/palette folder was missing from the iOS app
    
    Maybe it would be good to simply include all of share as such, without
    trying to pick only what is actually needed? Must investigate.
    
    Change-Id: Ide991334fe4bbe2b1e9807b8dba2b1e635e4f469
    Reviewed-on: https://gerrit.libreoffice.org/78288
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/79252

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index b7bd29d20859..5ee7b2054c51 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -70,6 +70,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	mkdir -p $(IOSRES)/share/fonts/truetype
 	cp -R $(INSTDIR)/share/fonts/truetype $(IOSRES)/share/fonts
 	cp -R $(INSTDIR)/share/gallery $(IOSRES)/share
+	cp -R $(INSTDIR)/share/palette $(IOSRES)/share
 	cp $(SRCDIR)/ios/welcome.odt $(IOSRES)
 
 	# Set up rc (the "inifile", fundamentalrc, unorc, bootstraprc and versionrc.


More information about the Libreoffice-commits mailing list