download.lst
| 4 -
external/harfbuzz/0001-buffer-Allow-unsafe_to_break-whole-buffer-to-succeed.patch.1
| 32 ----------
external/harfbuzz/UnpackedTarball_harfbuzz.mk
| 1
3 files changed, 2 insertions(+), 35 deletions(-)
New commits:
commit 542dc75792718d57b3ff689b5d6fda2d49c1b641
Author: Xisco Fauli <[email protected]>
AuthorDate: Tue May 13 09:38:46 2025 +0200
Commit: Xisco Fauli <[email protected]>
CommitDate: Tue May 13 11:48:46 2025 +0200
harfbuzz: upgrade to 11.2.1
* 0001-buffer-Allow-unsafe_to_break-whole-buffer-to-succeed.patch.1
has been fixed upstream
Downloaded from
https://github.com/harfbuzz/harfbuzz/releases/download/11.2.1/harfbuzz-11.2.1.tar.xz
Change-Id: I8b215831e702529881c8b2529bde1afd2dd95b8b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/185246
Reviewed-by: Xisco Fauli <[email protected]>
Tested-by: Jenkins
diff --git a/download.lst b/download.lst
index 4a6dfdff48e3..7b217a039928 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 :=
50f7d0a208367e606dbf6eecc5cfbecc01a47be6ee837ae7aff2787e24b09b45
-HARFBUZZ_TARBALL := harfbuzz-11.2.0.tar.xz
+HARFBUZZ_SHA256SUM :=
093714c8548a285094685f0bdc999e202d666b59eeb3df2ff921ab68b8336a49
+HARFBUZZ_TARBALL := harfbuzz-11.2.1.tar.xz
# three static lines
# so that git cherry-pick
# will not run into conflicts
diff --git
a/external/harfbuzz/0001-buffer-Allow-unsafe_to_break-whole-buffer-to-succeed.patch.1
b/external/harfbuzz/0001-buffer-Allow-unsafe_to_break-whole-buffer-to-succeed.patch.1
deleted file mode 100644
index 497c9b02eb61..000000000000
---
a/external/harfbuzz/0001-buffer-Allow-unsafe_to_break-whole-buffer-to-succeed.patch.1
+++ /dev/null
@@ -1,32 +0,0 @@
-From 39896512cfd6f37e416cdc9c598e977d9548426a Mon Sep 17 00:00:00 2001
-From: Behdad Esfahbod <[email protected]>
-Date: Wed, 7 May 2025 16:11:37 -0600
-Subject: [PATCH] [buffer] Allow unsafe_to_break() whole buffer to succeed
-
-Fixes https://github.com/harfbuzz/harfbuzz/pull/5315
----
- src/hb-buffer.hh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/src/hb-buffer.hh b/src/hb-buffer.hh
-index 6c620db69..1a534aad2 100644
---- a/src/hb-buffer.hh
-+++ b/src/hb-buffer.hh
-@@ -410,11 +410,11 @@ struct hb_buffer_t
- bool interior = false,
- bool from_out_buffer = false)
- {
-- end = hb_min (end, len);
--
-- if (unlikely (end - start > 255))
-+ if (unlikely (end != (unsigned) -1 && end - start > 255))
- return;
-
-+ end = hb_min (end, len);
-+
- if (interior && !from_out_buffer && end - start < 2)
- return;
-
---
-2.49.0
-
diff --git a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
index dd365dd45e5f..49b5ee65f05c 100644
--- a/external/harfbuzz/UnpackedTarball_harfbuzz.mk
+++ b/external/harfbuzz/UnpackedTarball_harfbuzz.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,harfbuzz,0))
$(eval $(call gb_UnpackedTarball_add_patches,harfbuzz, \
external/harfbuzz/tdf159529.patch.0 \
external/harfbuzz/harfbuzz_visibility.patch.1 \
-
external/harfbuzz/0001-buffer-Allow-unsafe_to_break-whole-buffer-to-succeed.patch.1
\
))
# meson will replace python3 from shebang in build commands with the
