download.lst | 4 ++-- external/harfbuzz/ExternalProject_harfbuzz.mk | 3 +++ external/harfbuzz/UnpackedTarball_harfbuzz.mk | 1 - external/harfbuzz/thread.patch | 11 ----------- 4 files changed, 5 insertions(+), 14 deletions(-)
New commits: commit d82deb2d7ba0e926ee6325ba7689d828557a26f2 Author: Khaled Hosny <[email protected]> AuthorDate: Wed Mar 4 19:01:40 2026 +0200 Commit: Khaled Hosny <[email protected]> CommitDate: Wed Mar 4 23:46:41 2026 +0100 harfbuzz: upgrade to 13.0.0 Downloaded from https://github.com/harfbuzz/harfbuzz/releases/download/13.0.0/harfbuzz-13.0.0.tar.xz Drop thread.patch that is now included upstream. Change-Id: I2ae3d79f28dccc499b8c62a72d75e2f57c9b5013 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/200975 Tested-by: Jenkins Reviewed-by: Khaled Hosny <[email protected]> diff --git a/download.lst b/download.lst index 8bedafc91a26..1ef6a0c45e44 100644 --- a/download.lst +++ b/download.lst @@ -322,8 +322,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz # three static lines # so that git cherry-pick # will not run into conflicts -HARFBUZZ_SHA256SUM := 6f6db164359a2da5a84ef826615b448b33e6306067ad829d85d5b0bf936f1bb8 -HARFBUZZ_TARBALL := harfbuzz-12.3.2.tar.xz +HARFBUZZ_SHA256SUM := 1626ebc763d28f4bcca1531fef42e92ca995d45f8ad90ad2ae0b5d1a567fe67a +HARFBUZZ_TARBALL := harfbuzz-13.0.0.tar.xz # three static lines # so that git cherry-pick # will not run into conflicts diff --git a/external/harfbuzz/ExternalProject_harfbuzz.mk b/external/harfbuzz/ExternalProject_harfbuzz.mk index e1ae4777cff5..204ff93457a8 100644 --- a/external/harfbuzz/ExternalProject_harfbuzz.mk +++ b/external/harfbuzz/ExternalProject_harfbuzz.mk @@ -58,6 +58,9 @@ $(call gb_ExternalProject_get_state_target,harfbuzz,build) : | $(call gb_Externa -Dcpp_std=$(subst -std:,,$(subst -std=,,$(filter -std%,$(CXXFLAGS_CXX11)))) \ -Dtests=disabled \ -Dutilities=disabled \ + -Dsubset=enabled \ + -Draster=disabled \ + -Dvector=disabled \ -Dicu=enabled \ -Dicu_builtin=true \ -Dgraphite2=enabled \ diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk b/external/harfbuzz/UnpackedTarball_harfbuzz.mk index 61d8384e0bf0..b3b63944d0dc 100644 --- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk +++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk @@ -17,7 +17,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0)) $(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \ external/harfbuzz/harfbuzz_visibility.patch.1 \ - external/harfbuzz/thread.patch \ )) # meson will replace python3 from shebang in build commands with the diff --git a/external/harfbuzz/thread.patch b/external/harfbuzz/thread.patch deleted file mode 100644 index f5c7e0ab2dfa..000000000000 --- a/external/harfbuzz/thread.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- src/meson.build -+++ src/meson.build -@@ -674,7 +674,7 @@ - - libharfbuzz_subset = library('harfbuzz-subset', hb_subset_sources, - include_directories: incconfig, -- dependencies: [m_dep], -+ dependencies: [thread_dep, m_dep], - link_with: [libharfbuzz], - cpp_args: cpp_args + extra_hb_cpp_args, - soversion: hb_so_version,
