Commit 209e9841f28ef3b38b9784a39e85edf69a9a853d
2021-01-23T14:15:29
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.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 54d91ba..ba158e3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -205,7 +205,7 @@ endif ()
# Find dependencies
-set(HARFBUZZ_MIN_VERSION "1.8.0")
+set(HARFBUZZ_MIN_VERSION "2.0.0")
if (FT_WITH_HARFBUZZ)
find_package(HarfBuzz ${HARFBUZZ_MIN_VERSION} REQUIRED)
else ()
diff --git a/ChangeLog b/ChangeLog
index 1e4c9a5..a1b27b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
* autogen.sh: Absorb `version.sed'.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index 0f9173c..e8ccdee 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -488,7 +488,7 @@ AC_ARG_WITH([harfbuzz],
have_harfbuzz=no
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
if test x"$HARFBUZZ_CFLAGS" = x -a x"$HARFBUZZ_LIBS" = x; then
diff --git a/meson.build b/meson.build
index cd63cf0..b773d4b 100644
--- a/meson.build
+++ b/meson.build
@@ -274,7 +274,7 @@ endif
# Harfbuzz support
harfbuzz_dep = dependency('harfbuzz',
- version: '>= 1.8.0',
+ version: '>= 2.0.0',
required: get_option('harfbuzz'))
if harfbuzz_dep.found()
ftoption_command += ['--enable=FT_CONFIG_OPTION_USE_HARFBUZZ']