Merge branch 'main' into fribidi

python-pillow · Jun 7, 2024 · d612201 · d612201
2 parents 44805bc + d25aaed
commit d612201
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -34,7 +34,7 @@ install:
 - xcopy /S /Y c:\test-images-main\* c:\pillow\tests\images
 - curl -fsSL -o nasm-win64.zip https://raw.githubusercontent.com/python-pillow/pillow-depends/main/nasm-2.16.01-win64.zip
 - 7z x nasm-win64.zip -oc:\
-- choco install ghostscript --version=10.3.0
+- choco install ghostscript --version=10.3.1
 - path c:\nasm-2.16.01;C:\Program Files\gs\gs10.00.0\bin;%PATH%
 - cd c:\pillow\winbuild\
 - ps: |

diff --git a/.github/workflows/test-windows.yml b/.github/workflows/test-windows.yml
@@ -86,7 +86,7 @@ jobs:
         choco install nasm --no-progress
         echo "C:\Program Files\NASM" >> $env:GITHUB_PATH
 
-        choco install ghostscript --version=10.3.0 --no-progress
+        choco install ghostscript --version=10.3.1 --no-progress
         echo "C:\Program Files\gs\gs10.00.0\bin" >> $env:GITHUB_PATH
 
         # Install extra test images

diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh
@@ -16,7 +16,7 @@ ARCHIVE_SDIR=pillow-depends-main
 
 # Package versions for fresh source builds
 FREETYPE_VERSION=2.13.2
-HARFBUZZ_VERSION=8.4.0
+HARFBUZZ_VERSION=8.5.0
 LIBPNG_VERSION=1.6.43
 JPEGTURBO_VERSION=3.0.2
 OPENJPEG_VERSION=2.5.2
@@ -33,9 +33,9 @@ if [[ -n "$IS_MACOS" ]] || [[ "$MB_ML_VER" != 2014 ]]; then
 else
     ZLIB_VERSION=1.2.8
 fi
-LIBWEBP_VERSION=1.3.2
+LIBWEBP_VERSION=1.4.0
 BZIP2_VERSION=1.0.8
-LIBXCB_VERSION=1.16.1
+LIBXCB_VERSION=1.17.0
 BROTLI_VERSION=1.1.0
 
 if [[ -n "$IS_MACOS" ]] && [[ "$CIBW_ARCHS" == "x86_64" ]]; then
@@ -70,7 +70,7 @@ function build {
     fi
     build_new_zlib
 
-    build_simple xcb-proto 1.16.0 https://xorg.freedesktop.org/archive/individual/proto
+    build_simple xcb-proto 1.17.0 https://xorg.freedesktop.org/archive/individual/proto
     if [ -n "$IS_MACOS" ]; then
         build_simple xorgproto 2024.1 https://www.x.org/pub/individual/proto
         build_simple libXau 1.0.11 https://www.x.org/pub/individual/lib

diff --git a/depends/install_imagequant.sh b/depends/install_imagequant.sh
@@ -2,7 +2,7 @@
 # install libimagequant
 
 archive_name=libimagequant
-archive_version=4.3.0
+archive_version=4.3.1
 
 archive=$archive_name-$archive_version
 

diff --git a/depends/install_webp.sh b/depends/install_webp.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # install webp
 
-archive=libwebp-1.3.2
+archive=libwebp-1.4.0
 
 ./download-and-extract.sh $archive https://raw.githubusercontent.com/python-pillow/pillow-depends/main/$archive.tar.gz
 

diff --git a/docs/installation/building-from-source.rst b/docs/installation/building-from-source.rst
@@ -68,7 +68,7 @@ Many of Pillow's features require external libraries:
 
 * **libimagequant** provides improved color quantization
 
-  * Pillow has been tested with libimagequant **2.6-4.3**
+  * Pillow has been tested with libimagequant **2.6-4.3.1**
   * Libimagequant is licensed GPLv3, which is more restrictive than
     the Pillow license, therefore we will not be distributing binaries
     with libimagequant support enabled.

diff --git a/winbuild/build_prepare.py b/winbuild/build_prepare.py
@@ -113,11 +113,11 @@ def cmd_msbuild(
     "BROTLI": "1.1.0",
     "FREETYPE": "2.13.2",
     "FRIBIDI": "1.0.15",
-    "HARFBUZZ": "8.4.0",
+    "HARFBUZZ": "8.5.0",
     "JPEGTURBO": "3.0.2",
     "LCMS2": "2.16",
     "LIBPNG": "1.6.43",
-    "LIBWEBP": "1.3.2",
+    "LIBWEBP": "1.4.0",
     "OPENJPEG": "2.5.2",
     "TIFF": "4.6.0",
     "XZ": "5.4.5",