Merge f905202267 into d42e537efe

.github/workflows/macos-install.sh

@@ -2,21 +2,10 @@
 
 set -e
 
-if [[ "$ImageOS" == "macos13" ]]; then
-    brew uninstall gradle maven
-
-    wget https://raw.githubusercontent.com/python-pillow/pillow-depends/main/freetype-2.14.1.tar.gz
-    tar -xvzf freetype-2.14.1.tar.gz
-    (cd freetype-2.14.1 \
-        && ./configure \
-        && make -j4 \
-        && make install)
-else
-    brew install freetype
-fi
 brew install \
     aom \
     dav1d \
+    freetype \
     ghostscript \
     jpeg-turbo \
     libimagequant \

.github/workflows/test.yml

@@ -57,7 +57,7 @@ jobs:
         - { python-version: "3.14t", disable-gil: true }
         - { python-version: "3.13t", disable-gil: true }
         # Intel
-        - { os: "macos-13", python-version: "3.10" }
+        - { os: "macos-15-intel", python-version: "3.10" }
         exclude:
         - { os: "macos-latest", python-version: "3.10" }
 

.github/workflows/wheels-dependencies.sh

@@ -109,6 +109,11 @@ LIBXCB_VERSION=1.17.0
 BROTLI_VERSION=1.1.0  # Patched; next release won't need patching. See patch file.
 LIBAVIF_VERSION=1.3.0
 
+function macos_intel_cross_build_setup {
+    # Prevent multibuild from disabling cross compiling on arm64
+    :
+}
+
 function build_pkg_config {
     if [ -e pkg-config-stamp ]; then return; fi
     # This essentially duplicates the Homebrew recipe.
@@ -267,7 +272,11 @@ function build {
     if [ -z "$IS_ALPINE" ] && [ -z "$SANITIZER" ] && [ -z "$IS_MACOS" ]; then
         yum remove -y zlib-devel
     fi
-    build_zlib_ng
+    if [[ -n "$IS_MACOS" ]]; then
+        CFLAGS="$CFLAGS -headerpad_max_install_names" build_zlib_ng
+    else
+        build_zlib_ng
+    fi
 
     build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
     if [[ -n "$IS_MACOS" ]]; then

.github/workflows/wheels.yml

@@ -52,19 +52,19 @@ jobs:
         include:
           - name: "macOS 10.10 x86_64"
             platform: macos
-            os: macos-13
+            os: macos-15-intel
             cibw_arch: x86_64
             build: "cp3{9,10,11}*"
             macosx_deployment_target: "10.10"
           - name: "macOS 10.13 x86_64"
             platform: macos
-            os: macos-13
+            os: macos-15-intel
             cibw_arch: x86_64
             build: "cp3{12,13,14}*"
             macosx_deployment_target: "10.13"
           - name: "macOS 10.15 x86_64"
             platform: macos
-            os: macos-13
+            os: macos-15-intel
             cibw_arch: x86_64
             build: "pp3*"
             macosx_deployment_target: "10.15"
@@ -103,7 +103,7 @@ jobs:
             cibw_arch: arm64_iphonesimulator
           - name: "iOS x86_64 simulator"
             platform: ios
-            os: macos-13
+            os: macos-14
             cibw_arch: x86_64_iphonesimulator
     steps:
       - uses: actions/checkout@v5

docs/installation/platform-support.rst

@@ -39,9 +39,9 @@ These platforms are built and tested for every change.
 +----------------------------------+----------------------------+---------------------+
 | Gentoo                           | 3.12                       | x86-64              |
 +----------------------------------+----------------------------+---------------------+
-| macOS 13 Ventura                 | 3.10                       | x86-64              |
+| macOS 15 Sequoia                 | 3.10                       | x86-64              |
-+----------------------------------+----------------------------+---------------------+
+|                                  +----------------------------+---------------------+
-| macOS 15 Sequoia                 | 3.11, 3.12, 3.13, 3.14     | arm64               |
+|                                  | 3.11, 3.12, 3.13, 3.14,    | arm64               |
 |                                  | PyPy3                      |                     |
 +----------------------------------+----------------------------+---------------------+
 | Ubuntu Linux 22.04 LTS (Jammy)   | 3.10                       | x86-64              |