44 lines
1.7 KiB
Diff
44 lines
1.7 KiB
Diff
From b9dde4a74cba5a771cbc85880d518f6717d19216 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <b9dde4a74cba5a771cbc85880d518f6717d19216.1531842189.git.erack@redhat.com>
|
|
From: Tor Lillqvist <tml@collabora.com>
|
|
Date: Thu, 7 Jun 2018 21:51:14 +0300
|
|
Subject: [PATCH] We use ICU 61 now
|
|
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: I7faf23de08db680599658206faaf3028888563f6
|
|
---
|
|
ios/CustomTarget_iOS_setup.mk | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
|
|
--------------erAck-patch-parts
|
|
Content-Type: text/x-patch; name="0001-We-use-ICU-61-now.patch"
|
|
Content-Transfer-Encoding: 8bit
|
|
Content-Disposition: attachment; filename="0001-We-use-ICU-61-now.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 a9f98850c6d8..a0d1a18823ab 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/icudt60l.dat $(IOSRES)/icudt60l.dat
|
|
+ cp $(WORKDIR)/UnpackedTarball/icu/source/data/in/icudt61l.dat $(IOSRES)/icudt61l.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--
|
|
|
|
|