From b0d49f7e3ab317f7f7f6263ba446399f6c394664 Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 24 Sep 2025 10:18:05 +0800 Subject: [PATCH] 11.5.1 --- ...ort-On-gcc-12-dont-use-num-fast-path.patch | 36 +++++++++++++++++++ ...zz-11.5.0.tar.xz => harfbuzz-11.5.1.tar.xz | 4 +-- harfbuzz.spec | 10 ++++-- 3 files changed, 45 insertions(+), 5 deletions(-) create mode 100644 backport-On-gcc-12-dont-use-num-fast-path.patch rename harfbuzz-11.5.0.tar.xz => harfbuzz-11.5.1.tar.xz (32%) diff --git a/backport-On-gcc-12-dont-use-num-fast-path.patch b/backport-On-gcc-12-dont-use-num-fast-path.patch new file mode 100644 index 0000000..bd29d0b --- /dev/null +++ b/backport-On-gcc-12-dont-use-num-fast-path.patch @@ -0,0 +1,36 @@ +From ab0beceae7b589b2f6c270cc91cc38a86e8f28ea Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod +Date: Tue, 23 Sep 2025 10:22:22 -0400 +Subject: [PATCH] On gcc <= 12 don't use num fast path + +Fixes https://github.com/harfbuzz/harfbuzz/issues/5456 +--- + src/hb-algs.hh | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/src/hb-algs.hh b/src/hb-algs.hh +index 7dfa9769699..d87daa1d3d0 100644 +--- a/src/hb-algs.hh ++++ b/src/hb-algs.hh +@@ -92,6 +92,7 @@ template + struct __attribute__((packed)) hb_packed_t { Type v; }; + + #ifndef HB_FAST_NUM_ACCESS ++ + #if defined(__OPTIMIZE__) && \ + defined(__BYTE_ORDER) && \ + (__BYTE_ORDER == __BIG_ENDIAN || \ +@@ -102,6 +103,13 @@ struct __attribute__((packed)) hb_packed_t { Type v; }; + #else + #define HB_FAST_NUM_ACCESS 0 + #endif ++ ++// https://github.com/harfbuzz/harfbuzz/issues/5456 ++#if defined(__GNUC__) && !defined(__clang__) && (__GNUC__ <= 12) ++#undef HB_FAST_NUM_ACCESS ++#define HB_FAST_NUM_ACCESS 0 ++#endif ++ + #endif + + template diff --git a/harfbuzz-11.5.0.tar.xz b/harfbuzz-11.5.1.tar.xz similarity index 32% rename from harfbuzz-11.5.0.tar.xz rename to harfbuzz-11.5.1.tar.xz index 2547d4c..7bddb72 100644 --- a/harfbuzz-11.5.0.tar.xz +++ b/harfbuzz-11.5.1.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d30ba45c4c8ec4de661a1002b4f88d0841ff1a3087f34629275f5436d722109 -size 18154144 +oid sha256:972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1 +size 18212420 diff --git a/harfbuzz.spec b/harfbuzz.spec index c5a8bbc..bbf9e53 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -1,11 +1,12 @@ Name: harfbuzz -Version: 11.5.0 +Version: 11.5.1 Release: 1 Summary: A text shaping engine License: MIT-Modern-Variant URL: https://harfbuzz.github.io/ Source0: https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/harfbuzz-%{version}.tar.xz - +# https://github.com/harfbuzz/harfbuzz/pull/5578 +Patch6001: backport-On-gcc-12-dont-use-num-fast-path.patch BuildRequires: meson >= 0.60.0 BuildRequires: gobject-introspection-devel BuildRequires: gtk-doc @@ -48,7 +49,7 @@ Header files and libraries for building a extension library for %{name}. %meson_install %check -%meson_test || cat %{_vpath_builddir}/meson-logs/testlog.txt +%meson_test %files %doc AUTHORS NEWS @@ -75,6 +76,9 @@ Header files and libraries for building a extension library for %{name}. %{_datadir}/gtk-doc/html/harfbuzz %changelog +* Wed Sep 24 2025 Funda Wang - 11.5.1-1 +- update to 11.5.1 + * Sat Sep 13 2025 Funda Wang - 11.5.0-1 - update to 11.5.0 -- Gitee