download.lst | 4 ++--
external/harfbuzz/tdf159529.patch.0 | 10 ++++++----
2 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 477689c58d842c718940c568616890179f5aac06
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Tue Apr 29 13:21:44 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Tue Apr 29 15:05:45 2025 +0200
harfbuzz: upgrade to 11.2.0
Downloaded from
https://github.com/harfbuzz/harfbuzz/releases/download/11.2.0/harfbuzz-11.2.0.tar.xz
Change-Id: Ib9910d1a9e1a657b1d26f05354a7213d48b85e83
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184761
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 64e794ea9402..b1c058e0ab98 100644
--- a/download.lst
+++ b/download.lst
@@ -327,8 +327,8 @@ GRAPHITE_TARBALL := graphite2-minimal-1.3.14.tgz
# three static lines
# so that git cherry-pick
# will not run into conflicts
-HARFBUZZ_SHA256SUM :=
477f0d48c34dc32093b45304178eb9733361ca1832b5159879c99e6d40227969
-HARFBUZZ_TARBALL := harfbuzz-11.1.0.tar.xz
+HARFBUZZ_SHA256SUM :=
50f7d0a208367e606dbf6eecc5cfbecc01a47be6ee837ae7aff2787e24b09b45
+HARFBUZZ_TARBALL := harfbuzz-11.2.0.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/harfbuzz/tdf159529.patch.0
b/external/harfbuzz/tdf159529.patch.0
index 547f21b566b0..e65a579466eb 100644
--- a/external/harfbuzz/tdf159529.patch.0
+++ b/external/harfbuzz/tdf159529.patch.0
@@ -1,8 +1,8 @@
--- ./src/hb-ot-font.cc 2023-11-11 09:08:45
+++ ./src/hb-ot-font.cc 2024-02-20 18:53:55
-@@ -475,13 +475,23 @@
- if (ot_face->VARC->get_extents (font, glyph, extents)) return true;
- #endif
+@@ -413,7 +413,12 @@
+ const hb_ot_face_t *ot_face = ot_font->ot_face;
+
#if !defined(HB_NO_OT_FONT_BITMAP) && !defined(HB_NO_COLOR)
- if (ot_face->sbix->get_extents (font, glyph, extents)) return true;
+ /* tdf#159529 clear the hb_ot_face_t's data after fetching 'sbix' table
@@ -14,7 +14,9 @@
if (ot_face->CBDT->get_extents (font, glyph, extents)) return true;
#endif
#if !defined(HB_NO_COLOR) && !defined(HB_NO_PAINT)
- if (ot_face->COLR->get_extents (font, glyph, extents)) return true;
+@@ -422,7 +427,12 @@
+ #ifndef HB_NO_VAR_COMPOSITES
+ if (ot_face->VARC->get_extents (font, glyph, extents)) return true;
#endif
- if (ot_face->glyf->get_extents (font, glyph, extents)) return true;
+ /* tdf#159529 clear the hb_ot_face_t's data after fetching 'glyf' table
