From 884b4ce280d028c22e5f3e6aa90e2805a2e0b96d Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Sun, 28 Sep 2025 09:57:14 +0800 Subject: [PATCH] 12.0.0 --- ...ort-On-gcc-12-dont-use-num-fast-path.patch | 36 ------------------- ...zz-11.5.1.tar.xz => harfbuzz-12.0.0.tar.xz | 4 +-- harfbuzz.spec | 7 ++-- 3 files changed, 6 insertions(+), 41 deletions(-) delete mode 100644 backport-On-gcc-12-dont-use-num-fast-path.patch rename harfbuzz-11.5.1.tar.xz => harfbuzz-12.0.0.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 deleted file mode 100644 index bd29d0b..0000000 --- a/backport-On-gcc-12-dont-use-num-fast-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -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.1.tar.xz b/harfbuzz-12.0.0.tar.xz similarity index 32% rename from harfbuzz-11.5.1.tar.xz rename to harfbuzz-12.0.0.tar.xz index 7bddb72..a2b928e 100644 --- a/harfbuzz-11.5.1.tar.xz +++ b/harfbuzz-12.0.0.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:972a60a8d274d49e70361da6920c3a73dfb0fb4387f6c6811906a47ba634d8a1 -size 18212420 +oid sha256:9f63c4a0fcdcb90b5a2c54dd17ad23429dfb281de6c0986863b8a89a05e5bc27 +size 18212392 diff --git a/harfbuzz.spec b/harfbuzz.spec index bbf9e53..bb9ef9b 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -1,12 +1,10 @@ Name: harfbuzz -Version: 11.5.1 +Version: 12.0.0 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 @@ -76,6 +74,9 @@ Header files and libraries for building a extension library for %{name}. %{_datadir}/gtk-doc/html/harfbuzz %changelog +* Sun Sep 28 2025 Funda Wang - 12.0.0-1 +- update to 12.0.0 + * Wed Sep 24 2025 Funda Wang - 11.5.1-1 - update to 11.5.1 -- Gitee