diff --git a/.github/workflows/build.sh b/.github/workflows/build.sh index 98bbbe472c7..f00311c1324 100755 --- a/.github/workflows/build.sh +++ b/.github/workflows/build.sh @@ -1,11 +1,12 @@ if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then # webp, zstd, xz, libtiff, libxcb cause a conflict with building webp, libtiff, libxcb + # libxdmcp causes an issue on macOS < 11 # curl from brew requires zstd, use system curl # if php is installed, brew tries to reinstall these after installing openblas # remove lcms2 to fix building openjpeg on arm64 # remove xmlto to skip building giflib docs - brew remove --ignore-dependencies webp zstd xz libtiff libxcb curl php lcms2 xmlto ghostscript + brew remove --ignore-dependencies webp zstd xz libtiff libxcb libxdmcp curl php lcms2 xmlto ghostscript if [[ "$PLAT" == "arm64" ]]; then export MACOSX_DEPLOYMENT_TARGET="11.0" diff --git a/config.sh b/config.sh index fd94823b88c..713ab72f5d6 100644 --- a/config.sh +++ b/config.sh @@ -4,11 +4,6 @@ ARCHIVE_SDIR=pillow-depends-main # Package versions for fresh source builds -if [[ -n "$IS_MACOS" ]] && [[ $MACOSX_DEPLOYMENT_TARGET == "10.10" ]]; then - LIBXAU_VERSION=1.0.10 -else - LIBXAU_VERSION=1.0.11 -fi FREETYPE_VERSION=2.12.1 HARFBUZZ_VERSION=6.0.0 LIBPNG_VERSION=1.6.39 @@ -75,7 +70,7 @@ function pre_build { build_simple xcb-proto 1.15.2 https://xcb.freedesktop.org/dist if [ -n "$IS_MACOS" ]; then build_simple xorgproto 2022.2 https://www.x.org/pub/individual/proto - build_simple libXau $LIBXAU_VERSION https://www.x.org/pub/individual/lib + build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib build_simple libpthread-stubs 0.4 https://xcb.freedesktop.org/dist cp venv/share/pkgconfig/xcb-proto.pc venv/lib/pkgconfig/xcb-proto.pc else