Try to add pango.

5 files changed, 33 insertions, 7 deletions

diff --git a/lib/meson-projects/meson.build b/lib/meson-projects/meson.build
index 5b2b6a4d..c373f0ce 100644
--- a/lib/meson-projects/meson.build
+++ b/lib/meson-projects/meson.build
@@ -1,7 +1,12 @@
 project('cru-deps', 'c', 'cpp')
 
-alias_target('all', 
-  dependency('cairo', fallback: ['cairo', 'cairo_dep'], required: get_option('cairo')),
-  dependency('pango', fallback: ['pango', 'pango_deps'], required: get_option('pango'))
-)
+if get_option('cairo').enabled()
+  subproject('glib')
+  subproject('cairo')
+endif
+
+if get_option('pango').enabled()
+  subproject('glib')
+  subproject('pango')
+endif
 
diff --git a/lib/meson-projects/subprojects/.gitignore b/lib/meson-projects/subprojects/.gitignore
index a268818f..69b705eb 100644
--- a/lib/meson-projects/subprojects/.gitignore
+++ b/lib/meson-projects/subprojects/.gitignore
@@ -1,5 +1,6 @@
 *
 !.gitignore
 !cairo.wrap
+!glib.wrap
 !pango.wrap
 
diff --git a/lib/meson-projects/subprojects/cairo.wrap b/lib/meson-projects/subprojects/cairo.wrap
index 8f12b5cc..fb8aa712 100644
--- a/lib/meson-projects/subprojects/cairo.wrap
+++ b/lib/meson-projects/subprojects/cairo.wrap
@@ -5,3 +5,6 @@ push-url = ssh://git@gitlab.freedesktop.org:cairo/cairo.git
 revision = master
 depth = 1
 
+[provide]
+cairo = libcairo_dep
+cairo-gobject = libcairogobject_dep
diff --git a/lib/meson-projects/subprojects/glib.wrap b/lib/meson-projects/subprojects/glib.wrap
new file mode 100644
index 00000000..bf287a7d
--- /dev/null
+++ b/lib/meson-projects/subprojects/glib.wrap
@@ -0,0 +1,11 @@
+[wrap-git]
+directory = glib
+url = https://gitlab.gnome.org/GNOME/glib.git
+push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/glib.git
+revision = main
+depth = 1
+
+[provide]
+dependency_names = gthread-2.0, gobject-2.0, gmodule-no-export-2.0, gmodule-export-2.0, gmodule-2.0, glib-2.0, gio-2.0, gio-windows-2.0, gio-unix-2.0
+program_names = glib-genmarshal, glib-mkenums, glib-compile-schemas, glib-compile-resources, gio-querymodules, gdbus-codegen
+
diff --git a/lib/meson-projects/subprojects/pango.wrap b/lib/meson-projects/subprojects/pango.wrap
index b29457c2..b75c158b 100644
--- a/lib/meson-projects/subprojects/pango.wrap
+++ b/lib/meson-projects/subprojects/pango.wrap
@@ -1,7 +1,13 @@
 [wrap-git]
 directory = pango
-url = https://gitlab.freedesktop.org/GNOME/pango.git
-push-url = ssh://git@gitlab.freedesktop.org:GNOME/pango.git
-revision = master
+url = https://gitlab.gnome.org/GNOME/pango.git
+push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/pango.git
+revision = main
 depth = 1
 
+[provide]
+pango = libpango_dep
+pangoft2 = libpangoft2_dep
+pangoxft = libpangoxft_dep
+pangowin32 = libpangowin32_dep
+pangocairo = libpangocairo_dep