From 3195a1e6df0d55f3ba4fe10ff5911662a56763f2 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Wed, 28 Jun 2023 22:33:13 -0400
Subject: [PATCH] build: Add a dependency on glyphy

We have a subproject, and we link statically
if we can, to avoid depending on a project
that is not generally packaged in distros.
---
 gsk/meson.build         | 1 +
 gtk/meson.build         | 1 +
 meson.build             | 4 ++++
 subprojects/glyphy.wrap | 6 ++++++
 4 files changed, 12 insertions(+)
 create mode 100644 subprojects/glyphy.wrap

diff --git a/gsk/meson.build b/gsk/meson.build
index da657fdf44..4d4610f18b 100644
--- a/gsk/meson.build
+++ b/gsk/meson.build
@@ -196,6 +196,7 @@ gsk_deps = [
   cairo_dep,
   cairo_csi_dep,
   libgdk_dep,
+  libglyphy_dep
 ]
 
 libgsk_f16c = static_library('gsk_f16c',
diff --git a/gtk/meson.build b/gtk/meson.build
index 1bc3ab14e6..36cf1677d8 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1017,6 +1017,7 @@ gtk_deps = [
   epoxy_dep,
   libm,
   graphene_dep,
+  libglyphy_dep,
 ]
 
 if x11_enabled
diff --git a/meson.build b/meson.build
index 0d848495fb..48155170a9 100644
--- a/meson.build
+++ b/meson.build
@@ -26,6 +26,7 @@ cloudproviders_req = '>= 0.3.1'
 xkbcommon_req      = '>= 0.2.0'
 sysprof_req        = '>= 3.38.0'
 vulkan_req         = '>= 1.2'
+libglyphy_req      = '>= 0.2.0'
 
 fs = import('fs')
 gnome = import('gnome')
@@ -382,6 +383,9 @@ fribidi_dep    = dependency('fribidi', version: fribidi_req,
                             default_options: ['docs=false'])
 harfbuzz_dep   = dependency('harfbuzz', version: harfbuzz_req,
                             default_options: ['coretext=enabled'])
+libglyphy_dep  = dependency('glyphy', version: libglyphy_req,
+                             default_options: ['default_library=static', 'demo=disabled'],
+                            fallback : ['glyphy', 'libglyphy_dep'])
 
 # Require PangoFT2 if on X11 or wayland
 pangoft_dep    = dependency('pangoft2', version: pango_req,
diff --git a/subprojects/glyphy.wrap b/subprojects/glyphy.wrap
new file mode 100644
index 0000000000..6b79cdba19
--- /dev/null
+++ b/subprojects/glyphy.wrap
@@ -0,0 +1,6 @@
+[wrap-git]
+directory=glyphy
+url=https://github.com/behdad/glyphy.git
+revision=master
+depth=1
+