diff --git a/CMakeLists.txt b/CMakeLists.txt index 6c0e45ebc..a99282cab 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -251,7 +251,7 @@ include(CMakePushCheckState) include(CheckSymbolExists) if (NOT FT_DISABLE_HARFBUZZ) - set(HARFBUZZ_MIN_VERSION "2.6.8") + set(HARFBUZZ_MIN_VERSION "2.0.0") if (FT_DYNAMIC_HARFBUZZ) if (WIN32) # Windows uses its own LoadLibrary() diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw index 898e617c4..9a8d604f3 100644 --- a/builds/unix/configure.raw +++ b/builds/unix/configure.raw @@ -447,7 +447,7 @@ AC_ARG_WITH([harfbuzz], have_harfbuzz=no if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then - harfbuzz_pkg="harfbuzz >= 2.6.8" + harfbuzz_pkg="harfbuzz >= 2.0.0" have_harfbuzz_pkg=no if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then diff --git a/docs/CHANGES b/docs/CHANGES index 41e3ec6c2..e5fe3306c 100644 --- a/docs/CHANGES +++ b/docs/CHANGES @@ -10,9 +10,7 @@ CHANGES BETWEEN 2.13.3 and 2.14.0 (2025-Mmm-DD) between HarfBuzz and FreeType. A side effect of this change is that FreeType no longer uses - HarfBuzz header files (if HarfBuzz support is activated). To make - this work, we now require at least HarfBuzz version 2.6.8, - released in June 2020. + HarfBuzz header files (if HarfBuzz support is activated). This code was contributed by Behdad Esfahbod. @@ -35,8 +33,6 @@ CHANGES BETWEEN 2.13.3 and 2.14.0 (2025-Mmm-DD) (or must be able to construct such a cmap) of a given font to make this work. - You need HarfBuzz 7.2.0 or newer for the new diacritic support. - The central algorithm and the foundation of this feature was Craig White's GSoC 2023 project. diff --git a/meson.build b/meson.build index a9bf932c8..1d2480c31 100644 --- a/meson.build +++ b/meson.build @@ -354,7 +354,7 @@ harfbuzz_dep = disabler() if harfbuzz_opt == 'enabled' or harfbuzz_opt == 'auto' harfbuzz_dep = dependency('harfbuzz', - version: '>= 2.6.8', + version: '>= 2.0.0', required: harfbuzz_opt == 'enabled', default_options: ['freetype=disabled']) if harfbuzz_dep.found() diff --git a/src/autofit/ft-hb-decls.h b/src/autofit/ft-hb-decls.h index d3fbff6a9..032d4d37a 100644 --- a/src/autofit/ft-hb-decls.h +++ b/src/autofit/ft-hb-decls.h @@ -135,14 +135,6 @@ hb_ot_layout_lookup_collect_glyphs,(hb_face_t *face, hb_set_t *glyphs_after, /* OUT. May be NULL */ hb_set_t *glyphs_output /* OUT. May be NULL */)) -HB_EXTERN(unsigned, -hb_ot_layout_lookup_get_glyph_alternates,(hb_face_t *face, - unsigned lookup_index, - hb_codepoint_t glyph, - unsigned start_offset, - unsigned *alternate_count /* IN/OUT */, - hb_codepoint_t *alternate_glyphs /* OUT */)) - HB_EXTERN(hb_bool_t, hb_ot_layout_lookup_would_substitute,(hb_face_t *face, unsigned int lookup_index,