[Libreoffice-commits] core.git: 2 commits - configure.ac ios/CustomTarget_iOS_setup.mk README.md

[Tor Lillqvist]

 README.md                     |    4 ++--
 configure.ac                  |    2 +-
 ios/CustomTarget_iOS_setup.mk |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b9dde4a74cba5a771cbc85880d518f6717d19216
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 7 21:51:14 2018 +0300

    We use ICU 61 now
    
    Change-Id: I7faf23de08db680599658206faaf3028888563f6

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
@@ -54,7 +54,7 @@ $(IOSGEN)/native-code.h: $(BUILDDIR)/config_host.mk \
 	    > $(IOSGEN)/native-code.h
 
 	# copy 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)
commit 6961b7509122b6e829ec2b72e1bde68c615a0a2f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Jun 7 17:15:07 2018 +0300

    Bump iOS SDK version to the current one, 11.4
    
    Not sure why we at some stage lost the possibiliy to build against any
    of several recent versions, but require one specific. But yeah, no big
    deal, anybody working on iOS code is expected to keep ther Xcode (and
    thus SDKs) updated.

diff --git a/README.md b/README.md
index c59f68122473..3bcd70716e00 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ run and compile LibreOffice, also used by the TDF builds:
     * Runtime: RHEL 6 or CentOS 6
     * Build: GCC 4.8.1 or Clang
 * iOS (only for LibreOfficeKit):
-    * Runtime: 11.3 (only support for newer i devices == 64 bit)
-    * Build: Xcode 9.3 and iPhone SDK 11.3
+    * Runtime: 11.4 (only support for newer i devices == 64 bit)
+    * Build: Xcode 9.3 and iPhone SDK 11.4
 
 At least Clang 3.4.2 is known to be too old to pass the configure.ac check "whether $CXX supports
 C++17, C++14, or C++11" in its current form (due to the #pragma GCC diagnostic ignored "-Wpragmas"
diff --git a/configure.ac b/configure.ac
index c045e6fb7340..0f236c885723 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2932,7 +2932,7 @@ dnl ===================================================================
 
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
-    current_sdk_ver=11.3
+    current_sdk_ver=11.4
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
         versionmin=-mios-simulator-version-min=$current_sdk_ver