diff --git a/harfbuzz-5.3.0.tar.xz b/harfbuzz-5.3.0.tar.xz deleted file mode 100644 index 2be1ba5..0000000 --- a/harfbuzz-5.3.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a05e19e3f52da24ed071522f0fddf872157d7d25e869cfd156cd6f1e81c42152 -size 17921224 diff --git a/harfbuzz-5.3.1-Fix_check-symbols_failure.patch b/harfbuzz-5.3.1-Fix_check-symbols_failure.patch new file mode 100644 index 0000000..54803cc --- /dev/null +++ b/harfbuzz-5.3.1-Fix_check-symbols_failure.patch @@ -0,0 +1,60 @@ +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 new file mode 100644 index 0000000..55e9540 --- /dev/null +++ b/harfbuzz-5.3.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a6ce097b75a8121facc4ba83b5b083bfec657f45b003cd5a3424f2ae6b4434d +size 17874260 diff --git a/harfbuzz.changes b/harfbuzz.changes index 728da2f..b6ea97e 100644 --- a/harfbuzz.changes +++ b/harfbuzz.changes @@ -1,15 +1,25 @@ +------------------------------------------------------------------- +Fri Oct 21 06:52:00 UTC 2022 - Andreas Stieger + +- Update to version 5.3.1: + + Subsetter repacker fixes + + Adjust Grapheme clusters for Katakana voiced sound marks + + New hb-subset option --preprocess-face +- Add harfbuzz-5.3.1-Fix_check-symbols_failure.patch: Fix failing + tests. + ------------------------------------------------------------------- Sun Oct 9 06:33:58 UTC 2022 - Andreas Stieger - Update to version 5.3.0: - * Don’t add glyphs from dropped MATH or COLR tables to the subset + + Don’t add glyphs from dropped MATH or COLR tables to the subset glyphs - * Map rlig to appropriate AAT feature selectors - * Update USE data files to latest version - * Check CBDT extents first before outline tables, to help with + + Map rlig to appropriate AAT feature selectors + + Update USE data files to latest version + + Check CBDT extents first before outline tables, to help with fonts that also include an empty glyf table - * More work towards variable font instancing in the subsetter - * Subsetter repacker improvements + + More work towards variable font instancing in the subsetter + + Subsetter repacker improvements ------------------------------------------------------------------- Tue Sep 20 17:21:33 UTC 2022 - Bjørn Lie diff --git a/harfbuzz.spec b/harfbuzz.spec index d9085c9..985be67 100644 --- a/harfbuzz.spec +++ b/harfbuzz.spec @@ -17,13 +17,15 @@ Name: harfbuzz -Version: 5.3.0 +Version: 5.3.1 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