From ac55472b08b6ea4798f7c9f862e99d5b953de392 Mon Sep 17 00:00:00 2001 From: Andrew Murray Date: Tue, 1 Sep 2026 19:48:07 +1000 Subject: [PATCH] Use FT_CONFIG_OPTION_USE_HARFBUZZ --- .github/workflows/wheels-dependencies.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/.github/workflows/wheels-dependencies.sh b/.github/workflows/wheels-dependencies.sh index 9be2867dfb8..4b324ad3840 100755 --- a/.github/workflows/wheels-dependencies.sh +++ b/.github/workflows/wheels-dependencies.sh @@ -159,12 +159,6 @@ function build_brotli { touch brotli-stamp } -function build_freetype { # overrides multibuild's function so we can add "$@" args - build_libpng - build_bzip2 - build_simple freetype $FREETYPE_VERSION https://download.savannah.gnu.org/releases/freetype tar.gz "$@" -} - function build_harfbuzz { if [ -e harfbuzz-stamp ]; then return; fi python3 -m pip install meson ninja @@ -313,7 +307,7 @@ function build { # FreeType and HarfBuzz each want the other: # HarfBuzz reads font data through FreeType, and FreeType's autofitter asks HarfBuzz which glyphs a script covers. # Break the cycle by building FreeType twice, so that the FreeType we ship is linked against the HarfBuzz we ship. - build_freetype --with-harfbuzz=no + build_freetype if [[ -z "$IOS_SDK" ]]; then # On iOS, there's no vendor-provided raqm, and we can't ship it due to @@ -322,7 +316,7 @@ function build { # Now that HarfBuzz exists, build FreeType again against it. rm -rf freetype-$FREETYPE_VERSION freetype-stamp - build_freetype --with-harfbuzz=yes + CFLAGS="$CFLAGS -DFT_CONFIG_OPTION_USE_HARFBUZZ" build_freetype fi }