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

[Tor Lillqvist (via logerrit)]

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

New commits:
commit 8420415d3122b238ff3c8d1d088f67c1c8c4fc5c
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Thu Oct 10 15:58:15 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 20 14:20:18 2019 +0100

    Set RTL_OS to "iOS" for iOS
    
    We accidentally had left it as "MacOSX". Affects at least the
    "generator" metadata stored in documents.
    
    Change-Id: I72eeefdbe192409084f7ab7a24adbc39dcafb624
    (cherry picked from commit 1fb87997031d6318ddf8ddf9714d2585a92f7667)
    Reviewed-on: https://gerrit.libreoffice.org/83280
    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 e8b876c39158..9df71ad7c85e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4220,6 +4220,7 @@ darwin*)
         ;;
     arm64)
         OS=iOS
+        RTL_OS=iOS
         if test "$enable_ios_simulator" = "yes"; then
             AC_MSG_ERROR([iOS simulator is only available in OSX not iOS])
         else
commit 041e7e5725e9c679cf1976cfb9044b4366d78426
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Wed Oct 9 09:03:29 2019 +0300
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Wed Nov 20 14:19:59 2019 +0100

    Bump the minimum iOS run-time version to 12.2
    
    Change-Id: I082a7d62e222e625d1d921bea39b45578118d225
    (cherry picked from commit 92d860f3fdd7c5390fa6c100d6f4dbbfa8f14fe7)
    Reviewed-on: https://gerrit.libreoffice.org/83279
    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 d3fe3cb21fe5..e8b876c39158 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2985,10 +2985,10 @@ if test $_os = iOS; then
     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
+        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`