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