Commit 2b289449 authored by Matthias Clasen's avatar Matthias Clasen
Browse files

Merge branch 'hb-dependency' into 'main'

Add an explicit harfbuzz dependency

See merge request !4732
parents b34beb93 c0747f2c
Pipeline #398059 failed with stages
in 39 minutes and 29 seconds
......@@ -1111,6 +1111,7 @@ gtk_deps = [
gobject_dep,
platform_gio_dep,
pangocairo_dep,
harfbuzz_dep,
fribidi_dep,
cairogobj_dep,
fontconfig_dep,
......
......@@ -12,6 +12,7 @@ project('gtk', 'c',
glib_req = '>= 2.66.0'
pango_req = '>= 1.50.0' # keep this in sync with .gitlab-ci/test-msys.sh
harfbuzz_req = '>= 2.6.0'
fribidi_req = '>= 0.19.7'
cairo_req = '>= 1.14.0'
gdk_pixbuf_req = '>= 2.30.0'
......@@ -393,6 +394,9 @@ pango_dep = dependency('pango', version: pango_req,
fallback : ['pango', 'libpango_dep'])
fribidi_dep = dependency('fribidi', version: fribidi_req,
fallback : ['fribidi', 'libfribidi_dep'])
harfbuzz_dep = dependency('harfbuzz', version: harfbuzz_req,
fallback: ['harfbuzz', 'libharfbuzz_dep'],
default_options: ['coretext=enabled'])
# Require PangoFT2 if on X11 or wayland
require_pangoft2 = wayland_enabled or x11_enabled
......
[wrap-git]
directory=harfbuzz
url=https://github.com/harfbuzz/harfbuzz.git
push-url=git@github.com:harfbuzz/harfbuzz.git
revision=main
depth=1
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment