diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2021-01-04 02:11:25 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2021-01-04 02:11:25 +0000 |
| commit | 749d7af9a9757fda86eb90480efbea110904ab04 (patch) | |
| tree | 51f023944a9bf0748ba592e56ae5f464374a9593 | |
| parent | 98dc18209b9c523e267c6c11c2c8b93b88ee3506 (diff) | |
| parent | 9071cff538290db9dc80ac1da63e37d01a44c5d2 (diff) | |
| download | pango-749d7af9a9757fda86eb90480efbea110904ab04.tar.gz | |
Merge branch 'hb-coretext' into 'master'
Enable coretext for the harfbuzz subproject
See merge request GNOME/pango!267
| -rw-r--r-- | .gitlab-ci.yml | 1 | ||||
| -rw-r--r-- | 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 |