From cce0f5b653abcdf99a7bbba6757f000b3fc4cd7e Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Sat, 4 Jan 2025 10:34:59 +1100
Subject: [PATCH 1/4] Removed giflib as webp dependency

---
 .github/workflows/wheels-dependencies.sh | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
index 1ebc49a88e0..05167d96962 100755
--- a/.github/workflows/wheels-dependencies.sh
+++ b/.github/workflows/wheels-dependencies.sh
@@ -45,7 +45,6 @@ OPENJPEG_VERSION=2.5.3
 XZ_VERSION=5.6.3
 TIFF_VERSION=4.6.0
 LCMS2_VERSION=2.16
-GIFLIB_VERSION=5.2.2
 ZLIB_NG_VERSION=2.2.3
 LIBWEBP_VERSION=1.5.0
 BZIP2_VERSION=1.0.8
@@ -135,16 +134,10 @@ function build {
     CFLAGS="$CFLAGS -O3 -DNDEBUG"
     if [[ -n "$IS_MACOS" ]]; then
         CFLAGS="$CFLAGS -Wl,-headerpad_max_install_names"
-    # For giflib 5.2.2
-    elif [ -n "$IS_ALPINE" ]; then
-        apk add imagemagick
-    else
-        if [[ "$MB_ML_VER" == "_2_28" ]]; then
-            yum install -y epel-release
-        fi
-        yum install -y ImageMagick
     fi
-    build_libwebp
+    build_simple libwebp $LIBWEBP_VERSION \
+        https://storage.googleapis.com/downloads.webmproject.org/releases/webp tar.gz \
+        --enable-libwebpmux --enable-libwebpdemux
     CFLAGS=$ORIGINAL_CFLAGS
 
     build_brotli

From 7708e4b524aca2e7d56fcc75eee59834622f75e8 Mon Sep 17 00:00:00 2001
From: Andrew Murray <radarhere@users.noreply.github.com>
Date: Mon, 6 Jan 2025 20:30:47 +1100
Subject: [PATCH 2/4] Improved Docker coverage reporting

---
 .ci/after_success.sh              | 6 +-----
 .github/workflows/test-docker.yml | 6 +++---
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.ci/after_success.sh b/.ci/after_success.sh
index c71546f007b..6da27b975cc 100755
--- a/.ci/after_success.sh
+++ b/.ci/after_success.sh
@@ -2,8 +2,4 @@
 
 # gather the coverage data
 python3 -m pip install coverage
-if [[ $MATRIX_DOCKER ]]; then
-  python3 -m coverage xml --ignore-errors
-else
-  python3 -m coverage xml
-fi
+python3 -m coverage xml
diff --git a/.github/workflows/test-docker.yml b/.github/workflows/test-docker.yml
index 4b01a10e4c2..bebb9cda277 100644
--- a/.github/workflows/test-docker.yml
+++ b/.github/workflows/test-docker.yml
@@ -90,15 +90,15 @@ jobs:
 
     - name: After success
       run: |
-        PATH="$PATH:~/.local/bin"
         docker start pillow_container
+        sudo docker cp pillow_container:/Pillow /Pillow
+        sudo chown -R runner /Pillow
         pil_path=`docker exec pillow_container /vpy3/bin/python -c 'import os, PIL;print(os.path.realpath(os.path.dirname(PIL.__file__)))'`
         docker stop pillow_container
         sudo mkdir -p $pil_path
         sudo cp src/PIL/*.py $pil_path
+        cd /Pillow
         .ci/after_success.sh
-      env:
-        MATRIX_DOCKER: ${{ matrix.docker }}
 
     - name: Upload coverage
       uses: codecov/codecov-action@v5

From b1749dff08ab96a05234e1492759011ef54cbd59 Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Mon, 6 Jan 2025 17:35:41 +0000
Subject: [PATCH 3/4] [pre-commit.ci] pre-commit autoupdate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/astral-sh/ruff-pre-commit: v0.8.4 → v0.8.6](https://github.com/astral-sh/ruff-pre-commit/compare/v0.8.4...v0.8.6)
- [github.com/pre-commit/mirrors-clang-format: v19.1.5 → v19.1.6](https://github.com/pre-commit/mirrors-clang-format/compare/v19.1.5...v19.1.6)
- [github.com/woodruffw/zizmor-pre-commit: v0.10.0 → v1.0.0](https://github.com/woodruffw/zizmor-pre-commit/compare/v0.10.0...v1.0.0)
---
 .pre-commit-config.yaml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b76f92ec00e..20fa7d04f00 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.8.4
+    rev: v0.8.6
     hooks:
       - id: ruff
         args: [--exit-non-zero-on-fix]
@@ -24,7 +24,7 @@ repos:
         exclude: (Makefile$|\.bat$|\.cmake$|\.eps$|\.fits$|\.gd$|\.opt$)
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v19.1.5
+    rev: v19.1.6
     hooks:
       - id: clang-format
         types: [c]
@@ -57,7 +57,7 @@ repos:
       - id: check-renovate
 
   - repo: https://github.com/woodruffw/zizmor-pre-commit
-    rev: v0.10.0
+    rev: v1.0.0
     hooks:
       - id: zizmor
 

From 84c8e38b2d88d0c4fb733d9c6e44e6af13e2e05e Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 8 Jan 2025 07:38:51 +0000
Subject: [PATCH 4/4] Update cygwin/cygwin-install-action action to v5

---
 .github/workflows/test-cygwin.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/test-cygwin.yml b/.github/workflows/test-cygwin.yml
index 5b0a0394688..abfeaa77f9c 100644
--- a/.github/workflows/test-cygwin.yml
+++ b/.github/workflows/test-cygwin.yml
@@ -52,7 +52,7 @@ jobs:
           persist-credentials: false
 
       - name: Install Cygwin
-        uses: cygwin/cygwin-install-action@v4
+        uses: cygwin/cygwin-install-action@v5
         with:
           packages: >
             gcc-g++