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

Tor Lillqvist (via logerrit) logerrit at kemper.freedesktop.org
Fri Aug 30 11:11:37 UTC 2019


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

New commits:
commit 73b07f12376ae2a36c0d0e6ef859a8400619cc0c
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 Aug 30 13:10:47 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>

diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk
index 75af10fe3598..11793938ebb4 100644
--- a/ios/CustomTarget_iOS_setup.mk
+++ b/ios/CustomTarget_iOS_setup.mk
@@ -53,6 +53,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_i
 	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
 
 	# Set up rc, the "inifile". See getIniFileName_Impl().
 	echo '[Bootstrap]' > $(IOSRES)/rc


More information about the Libreoffice-commits mailing list