download.lst | 4
external/harfbuzz/0001-const-up-modifier_combining_marks.patch | 70
----------
external/harfbuzz/UnpackedTarball_harfbuzz.mk | 4
3 files changed, 2 insertions(+), 76 deletions(-)
New commits:
commit 77a799f556b2fdeac06c9652c0085995f81cd910
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Thu Jul 31 17:22:19 2025 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Aug 1 09:06:00 2025 +0200
harfbuzz: upgrade to 11.3.3
* 0001-const-up-modifier_combining_marks.patch has been fixed
upstream
Downloaded from
https://github.com/harfbuzz/harfbuzz/releases/download/11.3.3/harfbuzz-11.3.3.tar.xz
Change-Id: Iaeba7ca2988cfc3b150003a0bc4169ab8bde5627
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/188691
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/download.lst b/download.lst
index 823d71000e33..bb0608d651e8 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 :=
093714c8548a285094685f0bdc999e202d666b59eeb3df2ff921ab68b8336a49
-HARFBUZZ_TARBALL := harfbuzz-11.2.1.tar.xz
+HARFBUZZ_SHA256SUM :=
e1fbca6b32a91ae91ecd9eb2ca8d47a5bfe2b1cb2e54855ab7a0b464919ef358
+HARFBUZZ_TARBALL := harfbuzz-11.3.3.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git a/external/harfbuzz/0001-const-up-modifier_combining_marks.patch
b/external/harfbuzz/0001-const-up-modifier_combining_marks.patch
deleted file mode 100644
index 223acb68a5a9..000000000000
--- a/external/harfbuzz/0001-const-up-modifier_combining_marks.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 59a84b4ec5b45381dc2b60bb88ce5604ffceef6f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolan.mcnam...@collabora.com>
-Date: Sun, 13 Jul 2025 20:40:53 +0100
-Subject: [PATCH] const up modifier_combining_marks
-
-and supported_face_loaders, etc.
-
-move these symbols out of the .data section
----
- src/hb-face.cc | 2 +-
- src/hb-font.cc | 2 +-
- src/hb-ot-shaper-arabic.cc | 2 +-
- src/hb-ot-shaper-thai.cc | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/hb-face.cc b/src/hb-face.cc
-index 431cbaccb..3a5045109 100644
---- a/src/hb-face.cc
-+++ b/src/hb-face.cc
-@@ -329,7 +329,7 @@ hb_face_create_from_file_or_fail (const char *file_name,
- return face;
- }
-
--static struct supported_face_loaders_t {
-+static const struct supported_face_loaders_t {
- char name[16];
- hb_face_t * (*from_file) (const char *font_file, unsigned face_index);
- hb_face_t * (*from_blob) (hb_blob_t *blob, unsigned face_index);
-diff --git a/src/hb-font.cc b/src/hb-font.cc
-index 417420404..06e6f1c42 100644
---- a/src/hb-font.cc
-+++ b/src/hb-font.cc
-@@ -2401,7 +2401,7 @@ hb_font_set_funcs_data (hb_font_t *font,
- font->changed ();
- }
-
--static struct supported_font_funcs_t {
-+static const struct supported_font_funcs_t {
- char name[16];
- void (*func) (hb_font_t *);
- } supported_font_funcs[] =
-diff --git a/src/hb-ot-shaper-arabic.cc b/src/hb-ot-shaper-arabic.cc
-index d25a3f6f4..c5104c948 100644
---- a/src/hb-ot-shaper-arabic.cc
-+++ b/src/hb-ot-shaper-arabic.cc
-@@ -654,7 +654,7 @@ postprocess_glyphs_arabic (const hb_ot_shape_plan_t *plan,
-
- /* https://www.unicode.org/reports/tr53/ */
-
--static hb_codepoint_t
-+static const hb_codepoint_t
- modifier_combining_marks[] =
- {
- 0x0654u, /* ARABIC HAMZA ABOVE */
-diff --git a/src/hb-ot-shaper-thai.cc b/src/hb-ot-shaper-thai.cc
-index 6124a2114..6d293b5c4 100644
---- a/src/hb-ot-shaper-thai.cc
-+++ b/src/hb-ot-shaper-thai.cc
-@@ -163,7 +163,7 @@ thai_pua_shape (hb_codepoint_t u, thai_action_t action,
hb_font_t *font)
- }
-
-
--static enum thai_above_state_t
-+static const enum thai_above_state_t
- { /* Cluster above looks like: */
- T0, /* ⣤ */
- T1, /* ⣼ */
---
-2.49.0
-
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index 3b561cb32785..dba3442cfb88 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -15,12 +15,8 @@ $(eval $(call
gb_UnpackedTarball_update_autoconf_configs,harfbuzz))
$(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,1))
-# 0001-const-up-modifier_combining_marks.patch upstreamed as:
-# https://github.com/harfbuzz/harfbuzz/pull/5389
-
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/harfbuzz_visibility.patch.1 \
- external/harfbuzz/0001-const-up-modifier_combining_marks.patch \
))
# meson will replace python3 from shebang in build commands with the
