diff --git a/package/harfbuzz/0002-fix-gcc-4-9-4-compilation-errors.patch b/package/harfbuzz/0002-fix-gcc-4-9-4-compilation-errors.patch deleted file mode 100644 index e3de881e9c..0000000000 --- a/package/harfbuzz/0002-fix-gcc-4-9-4-compilation-errors.patch +++ /dev/null @@ -1,63 +0,0 @@ -From 0d0b62575f2a52710d1fc3d59ed375cb3a50701a Mon Sep 17 00:00:00 2001 -From: Kevin Hellemun <17928966+OGKevin@users.noreply.github.com> -Date: Mon, 21 Sep 2026 12:58:03 +0200 -Subject: [PATCH] fix(gcc 4.9.4): compilation errors - -The current build for v14.5.0 fails to compile on gcc 4.9.4 which is -used on embedded Kobo systems. - -Ref: https://github.com/OGKevin/cadmus/pull/1005 - -Change-Id: 7a4bec5b5418bd0921b273d8d4a1e79b -Change-Id-Short: spvolnuouvyr -Upstream: https://github.com/harfbuzz/harfbuzz/commit/0d0b62575f2a52710d1fc3d59ed375cb3a50701a -Signed-off-by: Raphaël Mélotte ---- - src/graph/graph.hh | 2 +- - src/test-result.cc | 6 +++--- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/graph/graph.hh b/src/graph/graph.hh -index 0399f7f3e1f..e0e733e7e61 100644 ---- a/src/graph/graph.hh -+++ b/src/graph/graph.hh -@@ -635,7 +635,7 @@ struct graph_t - } - TRY(r); - -- return g; -+ return Ok (std::move (g)); - } - - graph_t (const graph_t&) = delete; -diff --git a/src/test-result.cc b/src/test-result.cc -index 9d487d4083e..b7b93a4cbe7 100644 ---- a/src/test-result.cc -+++ b/src/test-result.cc -@@ -433,7 +433,7 @@ int copy_move_counter_t::move_count = 0; - static result return_tracked_from_local () - { - copy_move_counter_t out (42); -- return out; -+ return Ok (std::move (out)); - } - - static result return_tracked_from_local_with_tag () -@@ -445,7 +445,7 @@ static result return_tracked_from_local_with_tag () - static hb_result_t return_tracked_error_from_local () - { - copy_move_counter_t out (42); -- return out; -+ return Err (std::move (out)); - } - - static hb_result_t return_tracked_error_from_local_with_tag () -@@ -457,7 +457,7 @@ static hb_result_t return_tracked_error_from_local_wit - static result return_move_only_from_local () - { - move_only_val_t out (42); -- return out; -+ return Ok (std::move (out)); - } - - static void test_return_moves_from_local () diff --git a/package/harfbuzz/harfbuzz.hash b/package/harfbuzz/harfbuzz.hash index bd025fb515..0d465e7c6b 100644 --- a/package/harfbuzz/harfbuzz.hash +++ b/package/harfbuzz/harfbuzz.hash @@ -1,4 +1,4 @@ -# From https://github.com/harfbuzz/harfbuzz/releases/tag/14.5.0 -sha256 b7132e148358a45185c9feafd049dbaf243649d3c44414b3534d9c95d18592b9 harfbuzz-14.5.0.tar.xz +# From https://github.com/harfbuzz/harfbuzz/releases/tag/14.5.1 +sha256 7e2fa4e8c7c98e8d8140671f5772542afaaa6acccfbd746506886b6d85f7f8d6 harfbuzz-14.5.1.tar.xz # Locally computed sha256 ba8f810f2455c2f08e2d56bb49b72f37fcf68f1f4fade38977cfd7372050ad64 COPYING diff --git a/package/harfbuzz/harfbuzz.mk b/package/harfbuzz/harfbuzz.mk index 71eee8f93f..f8f512d5a6 100644 --- a/package/harfbuzz/harfbuzz.mk +++ b/package/harfbuzz/harfbuzz.mk @@ -4,7 +4,7 @@ # ################################################################################ -HARFBUZZ_VERSION = 14.5.0 +HARFBUZZ_VERSION = 14.5.1 HARFBUZZ_SITE = https://github.com/harfbuzz/harfbuzz/releases/download/$(HARFBUZZ_VERSION) HARFBUZZ_SOURCE = harfbuzz-$(HARFBUZZ_VERSION).tar.xz HARFBUZZ_LICENSE = MIT, ISC (ucdn library)