[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - configure.ac

[Tor Lillqvist (via logerrit)]

 configure.ac |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 3047d3e7e2467da1e3a3f05bc32239a17b9a29b2
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 9 09:01:27 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 20 14:19:37 2019 +0100

    Accept iOS SDK 13.1
    
    Change-Id: I02870b35f67dd9ca47061311186d74dfec823aa7
    (cherry picked from commit 2738622e6faf62da2753d97cd770e2b887f765b8)
    Reviewed-on: https://gerrit.libreoffice.org/83278
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index 19ebb04f118d..d3fe3cb21fe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2981,8 +2981,8 @@ dnl ===================================================================
 
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
-    current_sdk_ver=13.0
-    older_sdk_vers="12.4 12.2"
+    current_sdk_ver=13.1
+    older_sdk_vers="13.0 12.4 12.2"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
         versionmin=-mios-simulator-version-min=11.0
commit 8788e4e4d0a71b5d7ada9ee5775d0675167ae120
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Sep 23 14:16:19 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 20 14:19:11 2019 +0100

    Let's not bother looking for quite old iOS SDKs
    
    Change-Id: I449d5fe425d741ca3b4a3be84e7e2bc015e90e32
    (cherry picked from commit 48df1a3f665ba843be6fa99bec8fd5796ec096fb)
    Reviewed-on: https://gerrit.libreoffice.org/83277
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/configure.ac b/configure.ac
index d29af8c8d5c5..19ebb04f118d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2982,7 +2982,7 @@ dnl ===================================================================
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
     current_sdk_ver=13.0
-    older_sdk_vers="12.4 12.2 12.1 12.0 11.4"
+    older_sdk_vers="12.4 12.2"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
         versionmin=-mios-simulator-version-min=11.0