diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-11-21 16:16:29 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2022-11-21 22:35:33 +0100 |
| commit | a7a766aa4119bf9616223d0de6587a3f30549eac (patch) | |
| tree | 000ca6e4c7a0ffe9cbbe8c1d7bb50f81286c6e6f | |
| parent | 97d6185ef18b97ce30206720567fab2994ef2b3d (diff) | |
macOS (janitor): remove workarounds for no longer supported SDKs
since we won't accept anything lower than 10.14 on master (and 10.13 on
libreoffice-7-4 branch), we don't need those quirks anymore.
Change-Id: Ibc71a2ce7a0dc60769d03d477991b48fc99d534d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143040
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | external/firebird/ExternalProject_firebird.mk | 5 | ||||
| -rw-r--r-- | external/libpng/UnpackedTarball_libpng.mk | 4 | ||||
| -rw-r--r-- | external/libpng/libpng-osx.patch.1 | 16 | ||||
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 1 |
5 files changed, 0 insertions, 31 deletions
diff --git a/configure.ac b/configure.ac index 5e2fe435a222..26641bbc23ce 100644 --- a/configure.ac +++ b/configure.ac @@ -12172,11 +12172,6 @@ if test "$enable_skia" != "no" -a "$build_skia" = "yes" -a -z "$DISABLE_GUI"; th SKIA_GPU=VULKAN AC_SUBST(SKIA_GPU) fi - - if test -n "$MAC_OS_X_VERSION_MIN_REQUIRED" && test "$MAC_OS_X_VERSION_MIN_REQUIRED" -lt "101200"; then - SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX=1 - AC_SUBST(SKIA_DISABLE_VMA_USE_STL_SHARED_MUTEX) - fi else AC_MSG_RESULT([no (freetype too old)]) add_warning "freetype version is too old for Skia library, at least 2.8.1 required, Skia support disabled" diff --git a/external/firebird/ExternalProject_firebird.mk b/external/firebird/ExternalProject_firebird.mk index 0419109e7156..29a71763600f 100644 --- a/external/firebird/ExternalProject_firebird.mk +++ b/external/firebird/ExternalProject_firebird.mk @@ -84,11 +84,6 @@ $(call gb_ExternalProject_get_state_target,firebird,build): , \ --enable-shared --disable-static \ ) \ - $(if $(filter MACOSX,$(OS)), \ - $(if $(filter 1, \ - $(shell expr '$(MAC_OS_X_VERSION_MIN_REQUIRED)' \ - '<' 101200)), \ - ac_cv_func_clock_gettime=no)) \ $(if $(HAVE_LIBCPP),CXX='$(CXX) -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR') \ && LC_ALL=C $(MAKE) \ $(if $(ENABLE_DEBUG),Debug) SHELL='$(SHELL)' $(if $(filter LINUX,$(OS)),CXXFLAGS="$$CXXFLAGS -std=gnu++11") \ diff --git a/external/libpng/UnpackedTarball_libpng.mk b/external/libpng/UnpackedTarball_libpng.mk index 2a8ad3f84406..dca4e4b5cfe9 100644 --- a/external/libpng/UnpackedTarball_libpng.mk +++ b/external/libpng/UnpackedTarball_libpng.mk @@ -15,8 +15,4 @@ $(eval $(call gb_UnpackedTarball_add_files,libpng,.,\ external/libpng/configs/pnglibconf.h \ )) -$(eval $(call gb_UnpackedTarball_add_patches,libpng,\ - external/libpng/libpng-osx.patch.1 \ -)) - # vim: set noet sw=4 ts=4: diff --git a/external/libpng/libpng-osx.patch.1 b/external/libpng/libpng-osx.patch.1 deleted file mode 100644 index 387b3a8cc613..000000000000 --- a/external/libpng/libpng-osx.patch.1 +++ /dev/null @@ -1,16 +0,0 @@ --*- Mode: Diff -*- - -Avoid warning: 'inflateValidate' is only available on macOS 10.13 or newer [-Wunguarded-availability-new] - ---- a/pngrutil.c -+++ b/pngrutil.c -@@ -422,7 +422,8 @@ - } - - #if ZLIB_VERNUM >= 0x1290 && \ -- defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) -+ defined(PNG_SET_OPTION_SUPPORTED) && defined(PNG_IGNORE_ADLER32) && \ -+ !(defined(MAC_OS_X_VERSION_MIN_REQUIRED) && MAC_OS_X_VERSION_MIN_REQUIRED < 101300) - if (((png_ptr->options >> PNG_IGNORE_ADLER32) & 3) == PNG_OPTION_ON) - /* Turn off validation of the ADLER32 checksum in IDAT chunks */ - ret = inflateValidate(&png_ptr->zstream, 0); diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index f1b71a037b4a..faa8e97387d4 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -100,7 +100,6 @@ $(call gb_ExternalProject_get_state_target,python3,build) : ) \ --enable-framework=/@__________________________________________________OOO --with-framework-name=LibreOfficePython, \ --enable-shared \ - $(if $(filter 1090 101000 101100 101200,$(MAC_OS_X_VERSION_MIN_REQUIRED)),ac_cv_func_utimensat=no) \ ) \ $(if $(ENABLE_OPENSSL),$(if $(SYSTEM_OPENSSL),,\ --with-openssl=$(call gb_UnpackedTarball_get_dir,openssl) \ |