Skip to content

Commit 188be7d

Browse files
committed
Deps: Revert Harfbuzz to 11.2.1
Match Qt bundled version. Might help with crashes I can't reproduce in text shaping.
1 parent 042930d commit 188be7d

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

scripts/deps/build-dependencies-linux-cross.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ fi
102102
# TODO: Pull all of this from the main file.
103103

104104
FREETYPE=2.13.3
105-
HARFBUZZ=11.3.2
105+
HARFBUZZ=11.2.1
106106
LIBBACKTRACE=793921876c981ce49759114d7bb89bb89b2d3a2d
107107
LIBJPEGTURBO=3.1.1
108108
LIBPNG=1.6.50
@@ -159,7 +159,7 @@ if [ "$SKIP_HARFBUZZ" != true ]; then
159159
curl -C - -L -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz"
160160
fi
161161
cat >> SHASUMS <<EOF
162-
b6120ebc56238474f4030b2fbcfd235912b6adaf1477c088f4a399a942dd0ab0 harfbuzz-$HARFBUZZ.tar.gz
162+
057d5754c3ac0c499bbf4d729d52acf134c7bb4ba8868ba22e84ae96bc272816 harfbuzz-$HARFBUZZ.tar.gz
163163
EOF
164164
fi
165165
if [ "$SKIP_LIBJPEG" != true ]; then

scripts/deps/build-dependencies-linux.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
7070
fi
7171

7272
FREETYPE=2.13.3
73-
HARFBUZZ=11.3.2
73+
HARFBUZZ=11.2.1
7474
LIBBACKTRACE=793921876c981ce49759114d7bb89bb89b2d3a2d
7575
LIBJPEGTURBO=3.1.1
7676
LIBPNG=1.6.50
@@ -126,7 +126,7 @@ if [ "$SKIP_HARFBUZZ" != true ]; then
126126
curl -C - -L -o "harfbuzz-$HARFBUZZ.tar.gz" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/$HARFBUZZ.tar.gz"
127127
fi
128128
cat >> SHASUMS <<EOF
129-
b6120ebc56238474f4030b2fbcfd235912b6adaf1477c088f4a399a942dd0ab0 harfbuzz-$HARFBUZZ.tar.gz
129+
057d5754c3ac0c499bbf4d729d52acf134c7bb4ba8868ba22e84ae96bc272816 harfbuzz-$HARFBUZZ.tar.gz
130130
EOF
131131
fi
132132
if [ "$SKIP_LIBJPEG" != true ]; then

scripts/deps/build-dependencies-mac.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ if [ "${INSTALLDIR:0:1}" != "/" ]; then
3737
fi
3838

3939
FREETYPE=2.13.3
40-
HARFBUZZ=11.3.2
40+
HARFBUZZ=11.2.1
4141
SDL3=3.2.18
4242
ZSTD=1.5.7
4343
LIBPNG=1.6.50
@@ -82,7 +82,7 @@ CMAKE_COMMON_QT=(
8282

8383
cat > SHASUMS <<EOF
8484
0550350666d427c74daeb85d5ac7bb353acba5f76956395995311a9c6f063289 freetype-$FREETYPE.tar.xz
85-
b6120ebc56238474f4030b2fbcfd235912b6adaf1477c088f4a399a942dd0ab0 harfbuzz-$HARFBUZZ.tar.gz
85+
057d5754c3ac0c499bbf4d729d52acf134c7bb4ba8868ba22e84ae96bc272816 harfbuzz-$HARFBUZZ.tar.gz
8686
4df396518620a7aa3651443e87d1b2862e4e88cad135a8b93423e01706232307 libpng-$LIBPNG.tar.xz
8787
aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c libjpeg-turbo-$LIBJPEGTURBO.tar.gz
8888
e4ab7009bf0629fd11982d4c2aa83964cf244cffba7347ecd39019a9e38c4564 libwebp-$LIBWEBP.tar.gz

scripts/deps/build-dependencies-windows-arm64.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ echo INSTALLDIR=%INSTALLDIR%
4646
cd "%BUILDDIR%"
4747

4848
set FREETYPE=2.13.3
49-
set HARFBUZZ=11.3.2
49+
set HARFBUZZ=11.2.1
5050
set LIBJPEGTURBO=3.1.1
5151
set LIBPNG=1650
5252
set QT=6.9.1
@@ -68,7 +68,7 @@ set DXCOMPILER=1.8.2407.12
6868
set DXAGILITY=1.614.1
6969

7070
call :downloadfile "freetype-%FREETYPE%.tar.gz" "https://download.savannah.gnu.org/releases/freetype/freetype-%FREETYPE%.tar.gz" 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 || goto error
71-
call :downloadfile "harfbuzz-%HARFBUZZ%.zip" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip" 0b8f2a5c749529d7ae09b5c85ffb3f6392421ddafb0cc4bbeaf7c503258ed4f0 || goto error
71+
call :downloadfile "harfbuzz-%HARFBUZZ%.zip" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip" b1efe6f6114a02d7eb4a0e8e4fa1bc540daf6299c66d4cbef344bf59849c5aa4 || goto error
7272
call :downloadfile "lpng%LIBPNG%.zip" "https://download.sourceforge.net/libpng/lpng%LIBPNG%.zip" 4be6938313b08d5921f9dede13f2789b653c96f4f8595d92ff3f09c9320e51c7 || goto error
7373
call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c || goto error
7474
call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" 208028b3b6225b3c9eae3942e50ed243d8798b4b3a56b98a59b3f7e37baa55fd || goto error

scripts/deps/build-dependencies-windows-x64.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ set "PATH=%PATH%;%INSTALLDIR%\bin"
4444
cd "%BUILDDIR%"
4545

4646
set FREETYPE=2.13.3
47-
set HARFBUZZ=11.3.2
47+
set HARFBUZZ=11.2.1
4848
set LIBJPEGTURBO=3.1.1
4949
set LIBPNG=1650
5050
set QT=6.9.1
@@ -66,7 +66,7 @@ set DXCOMPILER=1.8.2407.12
6666
set DXAGILITY=1.614.1
6767

6868
call :downloadfile "freetype-%FREETYPE%.tar.gz" "https://download.savannah.gnu.org/releases/freetype/freetype-%FREETYPE%.tar.gz" 5c3a8e78f7b24c20b25b54ee575d6daa40007a5f4eea2845861c3409b3021747 || goto error
69-
call :downloadfile "harfbuzz-%HARFBUZZ%.zip" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip" 0b8f2a5c749529d7ae09b5c85ffb3f6392421ddafb0cc4bbeaf7c503258ed4f0 || goto error
69+
call :downloadfile "harfbuzz-%HARFBUZZ%.zip" "https://github.com/harfbuzz/harfbuzz/archive/refs/tags/%HARFBUZZ%.zip" b1efe6f6114a02d7eb4a0e8e4fa1bc540daf6299c66d4cbef344bf59849c5aa4 || goto error
7070
call :downloadfile "lpng%LIBPNG%.zip" "https://download.sourceforge.net/libpng/lpng%LIBPNG%.zip" 4be6938313b08d5921f9dede13f2789b653c96f4f8595d92ff3f09c9320e51c7 || goto error
7171
call :downloadfile "libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" "https://github.com/libjpeg-turbo/libjpeg-turbo/releases/download/%LIBJPEGTURBO%/libjpeg-turbo-%LIBJPEGTURBO%.tar.gz" aadc97ea91f6ef078b0ae3a62bba69e008d9a7db19b34e4ac973b19b71b4217c || goto error
7272
call :downloadfile "SDL3-%SDL3%.zip" "https://github.com/libsdl-org/SDL/releases/download/release-%SDL3%/SDL3-%SDL3%.zip" 208028b3b6225b3c9eae3942e50ed243d8798b4b3a56b98a59b3f7e37baa55fd || goto error

0 commit comments

Comments
 (0)