[gtk/hb-dependency] Add an explicit harfbuzz dependency
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk/hb-dependency] Add an explicit harfbuzz dependency
- Date: Sun, 15 May 2022 14:38:18 +0000 (UTC)
commit c0747f2c2eb4fb1fda9ed3763c27c9ffecd3f3b9
Author: Matthias Clasen <mclasen redhat com>
Date: Sun May 15 10:37:24 2022 -0400
Add an explicit harfbuzz dependency
We are using Harfbuzz api in the file chooser,
so lets make this official.
gtk/meson.build | 1 +
meson.build | 4 ++++
subprojects/harfbuzz.wrap | 6 ++++++
3 files changed, 11 insertions(+)
---
diff --git a/gtk/meson.build b/gtk/meson.build
index 987835ff9d..322badc1ad 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1111,6 +1111,7 @@ gtk_deps = [
gobject_dep,
platform_gio_dep,
pangocairo_dep,
+ harfbuzz_dep,
fribidi_dep,
cairogobj_dep,
fontconfig_dep,
diff --git a/meson.build b/meson.build
index 6c28a62683..0bad104e24 100644
--- a/meson.build
+++ b/meson.build
@@ -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
diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap
new file mode 100644
index 0000000000..10b770d424
--- /dev/null
+++ b/subprojects/harfbuzz.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+directory=harfbuzz
+url=https://github.com/harfbuzz/harfbuzz.git
+push-url=git github com:harfbuzz/harfbuzz.git
+revision=main
+depth=1
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]