From 1d3de59ac2d12e42e12c9642bd252236a80b096b Mon Sep 17 00:00:00 2001 Message-Id: <1d3de59ac2d12e42e12c9642bd252236a80b096b.1531842210.git.erack@redhat.com> From: Eike Rathke Date: Tue, 17 Jul 2018 17:37:55 +0200 Subject: [PATCH] Use $(ICU_MAJOR) instead of hard coded (Upgrade to ICU 62.1) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------erAck-patch-parts" This is a multi-part message in MIME format. --------------erAck-patch-parts Content-Type: text/plain; charset=UTF-8; format=fixed Content-Transfer-Encoding: 8bit Change-Id: Ifea7072922388b2c0b7631fb809b23e2a5524a3c --- ios/CustomTarget_iOS_setup.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --------------erAck-patch-parts Content-Type: text/x-patch; name="0001-Use-ICU_MAJOR-instead-of-hard-coded-Upgrade-to-ICU-6.patch" Content-Transfer-Encoding: 8bit Content-Disposition: attachment; filename="0001-Use-ICU_MAJOR-instead-of-hard-coded-Upgrade-to-ICU-6.patch" # Slightly adapted to rawhide/F29 libreoffice-6-0-6 diff --git a/ios/CustomTarget_iOS_setup.mk b/ios/CustomTarget_iOS_setup.mk index a0d1a18823ab..718bb8b90d46 100644 --- a/ios/CustomTarget_iOS_setup.mk +++ b/ios/CustomTarget_iOS_setup.mk @@ -32,7 +32,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk $(SRCDIR)/ios/CustomTarget_iOS_setup.mk > $(IOSGEN)/native-code.h # generate resource files used to start/run LibreOffice - cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt61l.dat $(IOSRES)/icudt61l.dat + cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt$(ICU_MAJOR)l.dat $(IOSRES)/icudt$(ICU_MAJOR)l.dat cp $(INSTDIR)/program/types.rdb $(IOSRES)/udkapi.rdb cp $(INSTDIR)/program/types/offapi.rdb $(IOSRES) cp $(INSTDIR)/program/types/oovbaapi.rdb $(IOSRES) --------------erAck-patch-parts--