Skip to content

Commit 1b33f07

Browse files
authored
Merge branch 'main' into harfbuzz
2 parents 390a58a + ffe0010 commit 1b33f07

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
lines changed

.github/workflows/wheels-dependencies.sh

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,11 @@ ARCHIVE_SDIR=pillow-depends-main
9393
# Package versions for fresh source builds. Version numbers with "Patched"
9494
# annotations have a source code patch that is required for some platforms. If
9595
# you change those versions, ensure the patch is also updated.
96-
FREETYPE_VERSION=2.13.3
96+
if [[ -n "$IOS_SDK" ]]; then
97+
FREETYPE_VERSION=2.13.3
98+
else
99+
FREETYPE_VERSION=2.14.1
100+
fi
97101
HARFBUZZ_VERSION=12.1.0
98102
LIBPNG_VERSION=1.6.50
99103
JPEGTURBO_VERSION=3.1.2
@@ -314,6 +318,10 @@ function build {
314318

315319
if [[ -n "$IS_MACOS" ]]; then
316320
# Custom freetype build
321+
if [[ -z "$IOS_SDK" ]]; then
322+
build_simple sed 4.9 https://mirrors.middlendian.com/gnu/sed
323+
fi
324+
317325
build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz --with-harfbuzz=no
318326
else
319327
build_freetype

.github/workflows/wheels.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ jobs:
5454
platform: macos
5555
os: macos-13
5656
cibw_arch: x86_64
57-
build: "cp3{9,10,11}*"
57+
build: "cp3{10,11}*"
5858
macosx_deployment_target: "10.10"
5959
- name: "macOS 10.13 x86_64"
6060
platform: macos

winbuild/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ For more extensive info, see the [Windows build instructions](build.rst).
1616
Here's an example script to build on Windows:
1717

1818
```
19-
set PYTHON=C:\Python39\bin
19+
set PYTHON=C:\Python310\bin
2020
cd /D C:\Pillow\winbuild
2121
%PYTHON%\python.exe build_prepare.py -v --depends=C:\pillow-depends
2222
build\build_dep_all.cmd

winbuild/build.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ Example
115115

116116
Here's an example script to build on Windows::
117117

118-
set PYTHON=C:\Python39\bin
118+
set PYTHON=C:\Python310\bin
119119
cd /D C:\Pillow\winbuild
120120
%PYTHON%\python.exe build_prepare.py -v --depends C:\pillow-depends
121121
build\build_dep_all.cmd

0 commit comments

Comments
 (0)