Require HarfBuzz 2.0.0.
This is needed to make commit f1f9705f9
work.
* CMakeLists.txt (HARFBUZZ_MIN_VERSION), builds/unix/configure.raw
(harfbuzz_pkg), meson.build (harfbuzz_dep): Updated.
This commit is contained in:
parent
8dc311320c
commit
209e9841f2
|
@ -205,7 +205,7 @@ endif ()
|
||||||
|
|
||||||
|
|
||||||
# Find dependencies
|
# Find dependencies
|
||||||
set(HARFBUZZ_MIN_VERSION "1.8.0")
|
set(HARFBUZZ_MIN_VERSION "2.0.0")
|
||||||
if (FT_WITH_HARFBUZZ)
|
if (FT_WITH_HARFBUZZ)
|
||||||
find_package(HarfBuzz ${HARFBUZZ_MIN_VERSION} REQUIRED)
|
find_package(HarfBuzz ${HARFBUZZ_MIN_VERSION} REQUIRED)
|
||||||
else ()
|
else ()
|
||||||
|
|
|
@ -1,3 +1,12 @@
|
||||||
|
2021-01-23 Werner Lemberg <wl@gnu.org>
|
||||||
|
|
||||||
|
Require HarfBuzz 2.0.0.
|
||||||
|
|
||||||
|
This is needed to make commit f1f9705f9 work.
|
||||||
|
|
||||||
|
* CMakeLists.txt (HARFBUZZ_MIN_VERSION), builds/unix/configure.raw
|
||||||
|
(harfbuzz_pkg), meson.build (harfbuzz_dep): Updated.
|
||||||
|
|
||||||
2021-01-22 Alexei Podtelezhnikov <apodtele@gmail.com>
|
2021-01-22 Alexei Podtelezhnikov <apodtele@gmail.com>
|
||||||
|
|
||||||
* autogen.sh: Absorb `version.sed'.
|
* autogen.sh: Absorb `version.sed'.
|
||||||
|
|
|
@ -488,7 +488,7 @@ AC_ARG_WITH([harfbuzz],
|
||||||
|
|
||||||
have_harfbuzz=no
|
have_harfbuzz=no
|
||||||
if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
|
if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
|
||||||
harfbuzz_pkg="harfbuzz >= 1.8.0"
|
harfbuzz_pkg="harfbuzz >= 2.0.0"
|
||||||
have_harfbuzz_pkg=no
|
have_harfbuzz_pkg=no
|
||||||
|
|
||||||
if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
|
if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
|
||||||
|
|
|
@ -274,7 +274,7 @@ endif
|
||||||
|
|
||||||
# Harfbuzz support
|
# Harfbuzz support
|
||||||
harfbuzz_dep = dependency('harfbuzz',
|
harfbuzz_dep = dependency('harfbuzz',
|
||||||
version: '>= 1.8.0',
|
version: '>= 2.0.0',
|
||||||
required: get_option('harfbuzz'))
|
required: get_option('harfbuzz'))
|
||||||
if harfbuzz_dep.found()
|
if harfbuzz_dep.found()
|
||||||
ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']
|
ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']
|
||||||
|
|
Loading…
Reference in New Issue