ref: cc90307d7140867479428bc21861240cfe66cfec
parent: 3dbdb78a25850b8a7fe86ccc17987c9eacac1470
author: Xavier Claessens <xavier.claessens@collabora.com>
date: Wed Feb 10 04:30:40 EST 2021
* meson.build: s/freetype2_dep/freetype_dep/. Many projects (e.g., fontconfig, cairo) hardcode the `freetype_dep` variable name to use FreeType as subproject because that was the variable name in Centricular's Meson port of FreeType. While they should stop hardcoding that variable name, it does not cost us anything to keep using that name to ease transition.
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,15 @@
2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
+ * meson.build: s/freetype2_dep/freetype_dep/.
+
+ Many projects (e.g., fontconfig, cairo) hardcode the `freetype_dep`
+ variable name to use FreeType as subproject because that was the
+ variable name in Centricular's Meson port of FreeType. While they
+ should stop hardcoding that variable name, it does not cost us
+ anything to keep using that name to ease transition.
+
+2021-02-09 Xavier Claessens <xavier.claessens@collabora.com>
+
[meson] Fix handling of HarfBuzz library.
* meson.build (harfbuzz_dep): Do not fall back to HarfBuzz by
--- a/meson.build
+++ b/meson.build
@@ -327,11 +327,11 @@
# To be used by other projects including this one through subproject().
-freetype2_dep = declare_dependency(
+freetype_dep = declare_dependency(
include_directories: ft2_includes,
link_with: ft2_lib,
version: ft2_pkgconfig_version)
-meson.override_dependency('freetype2', freetype2_dep)
+meson.override_dependency('freetype2', freetype_dep)
# NOTE: Using both `install_dir` and `subdir` doesn't seem to work below,