From 9071cff538290db9dc80ac1da63e37d01a44c5d2 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 3 Jan 2021 20:52:58 -0500 Subject: Enable coretext for the harfbuzz subproject On OS X, we need hb_coretext_font_create, so pass coretext=enabled to harfbuzz. --- .gitlab-ci.yml | 1 - meson.build | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 428b3ff6..9b64061a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -94,7 +94,6 @@ macos: - meson -Dintrospection=disabled -Dcpp_std=c++11 -Dpixman:tests=disabled - -Dharfbuzz:coretext=enabled _build - ninja -C _build artifacts: diff --git a/meson.build b/meson.build index aa537940..5bd193c8 100644 --- a/meson.build +++ b/meson.build @@ -239,7 +239,9 @@ fontconfig_pc='' harfbuzz_lib='' fontconfig_lib='' -harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req_version, required: false) +harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req_version, required: false, + fallback: ['harfbuzz', 'libharfbuzz_dep'], + default_options: ['coretext=enabled']) if harfbuzz_dep.found() harfbuzz_pc = 'harfbuzz' else -- cgit v1.2.1