diff --git a/harfbuzz-5.3.1-Fix_check-symbols_failure.patch b/harfbuzz-5.3.1-Fix_check-symbols_failure.patch deleted file mode 100644 index 54803cc..0000000 --- a/harfbuzz-5.3.1-Fix_check-symbols_failure.patch +++ /dev/null @@ -1,60 +0,0 @@ -From b0b7a65388da25ae3fa01e969ad6abc67eed4f49 Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod -Date: Thu, 20 Oct 2022 17:13:26 -0600 -Subject: [PATCH] [subset] Fix check-symbols failure - -Fixes https://github.com/harfbuzz/harfbuzz/issues/3850 ---- - src/check-symbols.py | 2 +- - src/hb-subset-accelerator.hh | 5 +++-- - src/hb-subset.cc | 4 ++++ - 3 files changed, 8 insertions(+), 3 deletions(-) - -diff --git a/src/check-symbols.py b/src/check-symbols.py -index 11ca28dc7f..d0b8bd3c82 100755 ---- a/src/check-symbols.py -+++ b/src/check-symbols.py -@@ -31,7 +31,7 @@ - symprefix = '_' if suffix == 'dylib' else '' - - EXPORTED_SYMBOLS = [s.split ()[2] -- for s in re.findall (r'^.+ [BCDGIRST] .+$', subprocess.check_output (nm.split() + [so]).decode ('utf-8'), re.MULTILINE) -+ for s in re.findall (r'^.+ [BCDGIRSTu] .+$', subprocess.check_output (nm.split() + [so]).decode ('utf-8'), re.MULTILINE) - if not re.match (r'.* %s(%s)\b' % (symprefix, IGNORED_SYMBOLS), s)] - - # run again c++filt also if is available -diff --git a/src/hb-subset-accelerator.hh b/src/hb-subset-accelerator.hh -index 34bd0534fb..5652db147f 100644 ---- a/src/hb-subset-accelerator.hh -+++ b/src/hb-subset-accelerator.hh -@@ -33,12 +33,13 @@ - #include "hb-map.hh" - #include "hb-set.hh" - -+extern HB_INTERNAL hb_user_data_key_t _hb_subset_accelerator_user_data_key; -+ - struct hb_subset_accelerator_t - { - static hb_user_data_key_t* user_data_key() - { -- static hb_user_data_key_t key; -- return &key; -+ return &_hb_subset_accelerator_user_data_key; - } - - static hb_subset_accelerator_t* create(const hb_map_t& unicode_to_gid_, -diff --git a/src/hb-subset.cc b/src/hb-subset.cc -index 6026aa6eff..de9322de3f 100644 ---- a/src/hb-subset.cc -+++ b/src/hb-subset.cc -@@ -82,6 +82,10 @@ using OT::Layout::GPOS; - * retain glyph ids option and configure the subset to pass through the layout tables untouched. - */ - -+ -+hb_user_data_key_t _hb_subset_accelerator_user_data_key = {}; -+ -+ - /* - * The list of tables in the open type spec. Used to check for tables that may need handling - * if we are unable to list the tables in a face. diff --git a/harfbuzz-5.3.1.tar.xz b/harfbuzz-5.3.1.tar.xz deleted file mode 100644 index 55e9540..0000000 --- a/harfbuzz-5.3.1.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d -size 17874260 diff --git a/harfbuzz-6.0.0.tar.xz b/harfbuzz-6.0.0.tar.xz new file mode 100644 index 0000000..4dd82b6 --- /dev/null +++ b/harfbuzz-6.0.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1d1010a1751d076d5291e433c138502a794d679a7498d1268ee21e2d4a140eb4 +size 18952524 diff --git a/harfbuzz.changes b/harfbuzz.changes index b6ea97e..b1f9237 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -1,3 +1,18 @@ +------------------------------------------------------------------- +Sat Dec 17 09:26:17 UTC 2022 - Andreas Stieger + +- Update to version 6.0.0: + + Add API to pre-process the face and speed up future subsetting + operations on that face. Provides up to a 95% reduction in + subsetting times when the same face is subset more than once. + + Shaping have been speedup by skipping entire lookups when the + buffer contents don't intersect with the lookup. Shows up to a + 10% speedup in shaping some fonts + + The HarfBuzz subsetter can now drop axes by pinning them to + specific values (also referred to as instancing) +- Drop harfbuzz-5.3.1-Fix_check-symbols_failure.patch: Fixed + upstream. + ------------------------------------------------------------------- Fri Oct 21 06:52:00 UTC 2022 - Andreas Stieger diff --git a/harfbuzz.spec b/harfbuzz.spec index 985be67..f4101a5 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -17,16 +17,13 @@ Name: harfbuzz -Version: 5.3.1 +Version: 6.0.0 Release: 0 Summary: An OpenType text shaping engine License: MIT URL: https://www.freedesktop.org/wiki/Software/HarfBuzz Source0: https://github.com/harfbuzz/harfbuzz/releases/download/%{version}/%{name}-%{version}.tar.xz Source99: baselibs.conf -# PATCH-FIX-UPSTREAM harfbuzz-5.3.1-Fix_check-symbols_failure.patch -- Fix failing tests -Patch0: harfbuzz-5.3.1-Fix_check-symbols_failure.patch - BuildRequires: c++_compiler BuildRequires: c_compiler BuildRequires: meson