[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - configure.ac

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 5904742993f77a4ca4e7fb5c5a9d983da5b5ff73
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 1 10:58:08 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 1 12:20:06 2019 +0200

    Don't bother with iOS earlier than 12.2
    
    Change-Id: I63d5dfcbda4c33c58757693d628de1bef84ac245

diff --git a/configure.ac b/configure.ac
index ca0b3e31f738..c817647540b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2968,13 +2968,13 @@ dnl ===================================================================
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
     current_sdk_ver=13.2
-    older_sdk_vers="13.1 13.0 12.4 12.2 12.1 12.0 11.4"
+    older_sdk_vers="13.1 13.0 12.4 12.2"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
-        versionmin=-mios-simulator-version-min=11.0
+        versionmin=-mios-simulator-version-min=12.2
     else
         platform=iPhoneOS
-        versionmin=-miphoneos-version-min=11.0
+        versionmin=-miphoneos-version-min=12.2
     fi
     xcode_developer=`xcode-select -print-path`
 
commit 904aa5d058b92da759a7ca5d42b10531f01c2054
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Fri Nov 1 09:57:08 2019 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Fri Nov 1 12:20:06 2019 +0200

    Accept iOS SDK 13.2
    
    Change-Id: I5d42a60a257661f39d1c9af6299ca3278f783d2b
    Reviewed-on: https://gerrit.libreoffice.org/81870
    Tested-by: Jenkins
    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 a013d4593cfb..ca0b3e31f738 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2967,8 +2967,8 @@ dnl ===================================================================
 
 if test $_os = iOS; then
     AC_MSG_CHECKING([what iOS SDK to use])
-    current_sdk_ver=13.1
-    older_sdk_vers="13.0 12.4 12.2 12.1 12.0 11.4"
+    current_sdk_ver=13.2
+    older_sdk_vers="13.1 13.0 12.4 12.2 12.1 12.0 11.4"
     if test "$enable_ios_simulator" = "yes"; then
         platform=iPhoneSimulator
         versionmin=-mios-simulator-version-min=11.0