README.md | 4 ++-- configure.ac | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 6afd20db5d83e97c6d007544c4087e4c55c18139 Author: Xisco Fauli <[email protected]> AuthorDate: Tue Jan 14 10:41:41 2025 +0100 Commit: Christian Lohmaier <[email protected]> CommitDate: Wed Jan 22 13:13:27 2025 +0100 Revert "bump minimum Xcode version to 14.3 (and that in turn requries macOS 13)" This reverts commit 520c55c59e101d0727534f1e250547d349e7f436. No longer needed after commit 670e3fe7358dc69d80ed25b178cc7a2d3c76f0ee Author: Michael Stahl <[email protected]> Date: Thu Jan 9 17:50:53 2025 +0100 poppler: try to patch out all uses of std::ranges Change-Id: I024a361a1cbf4e279b7bfcfed6f5671f665e9681 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180225 Tested-by: Jenkins Reviewed-by: Xisco Fauli <[email protected]> Signed-off-by: Xisco Fauli <[email protected]> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/180237 Reviewed-by: Michael Stahl <[email protected]> Tested-by: Christian Lohmaier <[email protected]> Reviewed-by: Christian Lohmaier <[email protected]> diff --git a/README.md b/README.md index 3b8248bf9926..8e39324cbd95 100644 --- a/README.md +++ b/README.md @@ -38,8 +38,8 @@ run and compile LibreOffice, also used by the TDF builds: * Runtime: Windows 7 * Build: Cygwin + Visual Studio 2019 version 16.10 * macOS: - * Runtime: 10.15 (11 for aarch64) - * Build: 13 or later + Xcode 14.3 or later (using latest version available for a given versino of macOS) + * Runtime: 10.15 + * Build: 12 (13 for aarch64) + Xcode 14 * Linux: * Runtime: RHEL 8 or CentOS 8 and comparable * Build: either GCC 12; or Clang 12 with libstdc++ 10 diff --git a/configure.ac b/configure.ac index 61a2dfb94426..e3c055a32e4f 100644 --- a/configure.ac +++ b/configure.ac @@ -3745,7 +3745,7 @@ if test $_os = Darwin; then my_xcode_ver1=$(xcrun xcodebuild -version | head -n 1) my_xcode_ver2=${my_xcode_ver1#Xcode } my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print $1*100+($2<100?$2:99) }') - if test "$my_xcode_ver3" -ge 1403; then + if test "$my_xcode_ver3" -ge 1205; then AC_MSG_RESULT([yes ($my_xcode_ver2)]) if test $MAC_OS_X_VERSION_MIN_REQUIRED -lt 120000; then if test "$my_xcode_ver3" -eq 1500; then @@ -3757,7 +3757,7 @@ if test $_os = Darwin; then fi fi else - AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at least Xcode 14.3]) + AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at least Xcode 12.5]) fi my_xcode_ver1=$(xcrun xcodebuild -version | tail -n 1)
