mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump minimum macOS run-time version to 10.10

Browse Source 
It is much over a year since we bumped to 10.9, so it is time.

Bumping to 10.10 will allow us to with good conscience get rid of some
code that (presumably) tries to emulate some aspects of OS X user
interface look that went away in 10.10. See tdf#114839.

Change-Id: Ic41f73d8e59a40c4696069af85bb3ff33146086c
Reviewed-on: https://gerrit.libreoffice.org/63880
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
This commit is contained in:
Tor Lillqvist
2018-11-23 12:07:40 +02:00
parent 1f5fa39b45
commit a7f57d86c7
2 changed files with 16 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@@ -36,7 +36,7 @@ run and compile LibreOffice, also used by the TDF builds:
* Runtime: Windows 7 * Runtime: Windows 7
* Build: Cygwin + Visual Studio 2017 * Build: Cygwin + Visual Studio 2017
* macOS: * macOS:
* Runtime: 10.9 * Runtime: 10.10
* Build: 10.12 + Xcode 9.3 * Build: 10.12 + Xcode 9.3
* Linux: * Linux:
* Runtime: RHEL 6 or CentOS 6 * Runtime: RHEL 6 or CentOS 6

36
configure.ac
View File

@@ -2297,7 +2297,7 @@ AC_ARG_WITH(macosx-sdk,
not terribly useful. It works fine to build with a new SDK and run the result not terribly useful. It works fine to build with a new SDK and run the result
on an older OS. on an older OS.
e. g.: --with-macosx-sdk=10.9 e. g.: --with-macosx-sdk=10.10
there are 3 options to control the MacOSX build: there are 3 options to control the MacOSX build:
--with-macosx-sdk (referred as 'sdk' below) --with-macosx-sdk (referred as 'sdk' below)
@@ -2311,15 +2311,15 @@ AC_ARG_WITH(macosx-sdk,
========================================== ==========================================
command line || config result command line || config result
========================================== ==========================================
min | max | sdk || min | max | sdk | min | max | sdk || min | max | sdk |
? | ? | ? || 10.9 | 10.s | 10.s | ? | ? | ? || 10.10 | 10.s | 10.s |
? | ? | 10.x || 10.9 | 10.x | 10.x | ? | ? | 10.x || 10.10 | 10.x | 10.x |
? | 10.x | ? || 10.9 | 10.s | 10.s | ? | 10.x | ? || 10.10 | 10.s | 10.s |
? | 10.x | 10.y || 10.9 | 10.x | 10.y | ? | 10.x | 10.y || 10.10 | 10.x | 10.y |
10.x | ? | ? || 10.x | 10.s | 10.s | 10.x | ? | ? || 10.x | 10.s | 10.s |
10.x | ? | 10.y || 10.x | 10.y | 10.y | 10.x | ? | 10.y || 10.x | 10.y | 10.y |
10.x | 10.y | ? || 10.x | 10.y | 10.y | 10.x | 10.y | ? || 10.x | 10.y | 10.y |
10.x | 10.y | 10.z || 10.x | 10.y | 10.z | 10.x | 10.y | 10.z || 10.x | 10.y | 10.z |
see: http://developer.apple.com/library/mac/#technotes/tn2064/_index.html see: http://developer.apple.com/library/mac/#technotes/tn2064/_index.html
@@ -2333,7 +2333,7 @@ AC_ARG_WITH(macosx-version-min-required,
AS_HELP_STRING([--with-macosx-version-min-required=<version>], AS_HELP_STRING([--with-macosx-version-min-required=<version>],
[set the minimum OS version needed to run the built LibreOffice]) [set the minimum OS version needed to run the built LibreOffice])
[ [
e. g.: --with-macos-version-min-required=10.9 e. g.: --with-macos-version-min-required=10.10
see --with-macosx-sdk for more info see --with-macosx-sdk for more info
], ],
,) ,)
@@ -2342,7 +2342,7 @@ AC_ARG_WITH(macosx-version-max-allowed,
AS_HELP_STRING([--with-macosx-version-max-allowed=<version>], AS_HELP_STRING([--with-macosx-version-max-allowed=<version>],
[set the maximum allowed OS version the LibreOffice compilation can use APIs from]) [set the maximum allowed OS version the LibreOffice compilation can use APIs from])
[ [
e. g.: --with-macos-version-max-allowed=10.9 e. g.: --with-macos-version-max-allowed=10.10
see --with-macosx-sdk for more info see --with-macosx-sdk for more info
], ],
,) ,)
@@ -2759,7 +2759,7 @@ if test $_os = Darwin -o $_os = iOS; then
esac esac
if test "$with_macosx_version_min_required" = "" ; then if test "$with_macosx_version_min_required" = "" ; then
with_macosx_version_min_required="10.9"; with_macosx_version_min_required="10.10";
fi fi
if test "$with_macosx_version_max_allowed" = "" ; then if test "$with_macosx_version_max_allowed" = "" ; then
@@ -2784,9 +2784,6 @@ if test $_os = Darwin -o $_os = iOS; then
fi fi
case "$with_macosx_version_min_required" in case "$with_macosx_version_min_required" in
10.9)
MAC_OS_X_VERSION_MIN_REQUIRED="1090"
;;
10.10) 10.10)
MAC_OS_X_VERSION_MIN_REQUIRED="101000" MAC_OS_X_VERSION_MIN_REQUIRED="101000"
;; ;;
@@ -2803,7 +2800,7 @@ if test $_os = Darwin -o $_os = iOS; then
MAC_OS_X_VERSION_MIN_REQUIRED="101400" MAC_OS_X_VERSION_MIN_REQUIRED="101400"
;; ;;
*) *)
AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.9--14]) AC_MSG_ERROR([with-macosx-version-min-required $with_macosx_version_min_required is not a supported value, supported values are 10.10--14])
;; ;;
esac esac
MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=$with_macosx_version_min_required MAC_OS_X_VERSION_MIN_REQUIRED_DOTS=$with_macosx_version_min_required
@@ -2828,9 +2825,6 @@ if test $_os = Darwin -o $_os = iOS; then
fi fi
case "$with_macosx_version_max_allowed" in case "$with_macosx_version_max_allowed" in
10.9)
MAC_OS_X_VERSION_MAX_ALLOWED="1090"
;;
10.10) 10.10)
MAC_OS_X_VERSION_MAX_ALLOWED="101000" MAC_OS_X_VERSION_MAX_ALLOWED="101000"
;; ;;
@@ -2847,7 +2841,7 @@ if test $_os = Darwin -o $_os = iOS; then
MAC_OS_X_VERSION_MAX_ALLOWED="101400" MAC_OS_X_VERSION_MAX_ALLOWED="101400"
;; ;;
*) *)
AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.9--14]) AC_MSG_ERROR([with-macosx-version-max-allowed $with_macosx_version_max_allowed is not a supported value, supported values are 10.10--14])
;; ;;
esac esac