freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 209e984 24/68: Require HarfBuzz 2.0.0.


From: Werner Lemberg
Subject: [freetype2] master 209e984 24/68: Require HarfBuzz 2.0.0.
Date: Fri, 5 Mar 2021 09:29:37 -0500 (EST)

branch: master
commit 209e9841f28ef3b38b9784a39e85edf69a9a853d
Author: Werner Lemberg <wl@gnu.org>
Commit: 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.
---
 CMakeLists.txt            | 2 +-
 ChangeLog                 | 9 +++++++++
 builds/unix/configure.raw | 2 +-
 meson.build               | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

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']



reply via email to

[Prev in Thread] Current Thread [Next in Thread]