10 files changed, 72 insertions, 46 deletions
diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap
index d09964e4..fb8aa712 100644
--- a/subprojects/cairo.wrap
+++ b/subprojects/cairo.wrap
@@ -1,6 +1,10 @@
 [wrap-git]
-directory=cairo
-url=https://gitlab.freedesktop.org/cairo/cairo.git
-push-url=ssh://git@gitlab.freedesktop.org:cairo/cairo.git
-revision=master
-depth=1
+directory = cairo
+url = https://gitlab.freedesktop.org/cairo/cairo.git
+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/subprojects/fontconfig.wrap b/subprojects/fontconfig.wrap
new file mode 100644
index 00000000..a8985bca
--- /dev/null
+++ b/subprojects/fontconfig.wrap
@@ -0,0 +1,9 @@
+[wrap-git]
+directory = fontconfig
+url = https://gitlab.freedesktop.org/fontconfig/fontconfig
+push-url = git@gitlab.freedesktop.org:fontconfig/fontconfig.git
+depth = 1
+revision = 2.14.0
+
+[provide]
+fontconfig = fontconfig_dep
diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
index 7c88f89c..fe00fc49 100644
--- a/subprojects/freetype2.wrap
+++ b/subprojects/freetype2.wrap
@@ -1,6 +1,7 @@
 [wrap-git]
-directory=freetype2
-url=https://github.com/centricular/freetype2.git
-depth=1
-push-url=git@github.com:centricular/freetype2.git
-revision=meson
+directory = freetype
+url = https://gitlab.freedesktop.org/freetype/freetype.git
+revision = VER-2-11-0
+
+[provide]
+dependency_names = freetype2
diff --git a/subprojects/fribidi.wrap b/subprojects/fribidi.wrap
index 0132d4ec..20ba8edf 100644
--- a/subprojects/fribidi.wrap
+++ b/subprojects/fribidi.wrap
@@ -1,6 +1,9 @@
 [wrap-git]
-directory=fribidi
-url=https://github.com/fribidi/fribidi.git
-push-url=git@github.com:fribidi/fribidi.git
-revision=master
-depth=1
+directory = fribidi
+url = https://github.com/fribidi/fribidi.git
+push-url = git@github.com:fribidi/fribidi.git
+revision = master
+depth = 1
+
+[provide]
+dependency_names = fribidi
diff --git a/subprojects/gi-docgen.wrap b/subprojects/gi-docgen.wrap
index 98cd9211..85c85da1 100644
--- a/subprojects/gi-docgen.wrap
+++ b/subprojects/gi-docgen.wrap
@@ -1,6 +1,9 @@
 [wrap-git]
-directory=gi-docgen
-url=https://gitlab.gnome.org/GNOME/gi-docgen.git
-push-url=ssh://git@gitlab.gnome.org:GNOME/gi-docgen.git
-revision=main
-depth=1
+directory = gi-docgen
+url = https://gitlab.gnome.org/GNOME/gi-docgen.git
+push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/gi-docgen.git
+revision = main
+depth = 1
+
+[provide]
+program_names = gi-docgen
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
index c785910d..525a37bb 100644
--- a/subprojects/glib.wrap
+++ b/subprojects/glib.wrap
@@ -1,6 +1,10 @@
 [wrap-git]
-directory=glib
-url=https://gitlab.gnome.org/GNOME/glib.git
-push-url=ssh://git@gitlab.gnome.org:GNOME/glib.git
-revision=main
-depth=1
+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/subprojects/gobject-introspection.wrap b/subprojects/gobject-introspection.wrap
index aa96c352..314211b1 100644
--- a/subprojects/gobject-introspection.wrap
+++ b/subprojects/gobject-introspection.wrap
@@ -1,10 +1,10 @@
 [wrap-git]
-directory=gobject-introspection
-url=https://gitlab.gnome.org/GNOME/gobject-introspection.git
-push-url=ssh://git@gitlab.gnome.org:GNOME/gobject-introspection.git
-revision=main
-depth=1
+directory = gobject-introspection
+url = https://gitlab.gnome.org/GNOME/gobject-introspection.git
+push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/gobject-introspection.git
+revision = main
+depth = 1
 
 [provide]
-dependency_names = gobject-introspection-1.0
-program_names = g-ir-scanner
+dependency_names = gobject-introspection-1.0, gobject-introspection-no-export-1.0
+program_names = g-ir-annotation-tool, g-ir-compiler, g-ir-doc-tool, g-ir-generate, g-ir-inspect, g-ir-scanner
diff --git a/subprojects/harfbuzz.wrap b/subprojects/harfbuzz.wrap
index a57870b2..9245bfb5 100644
--- a/subprojects/harfbuzz.wrap
+++ b/subprojects/harfbuzz.wrap
@@ -1,6 +1,9 @@
 [wrap-git]
-directory=harfbuzz
-url=https://github.com/harfbuzz/harfbuzz.git
-push-url=git@github.com:harfbuzz/harfbuzz.git
-revision=4.0.0
-depth=1
+directory = harfbuzz
+url = https://github.com/harfbuzz/harfbuzz.git
+push-url = git@github.com:harfbuzz/harfbuzz.git
+revision = 4.0.0
+depth = 1
+
+[provide]
+harfbuzz = libharfbuzz_dep
diff --git a/subprojects/json-glib.wrap b/subprojects/json-glib.wrap
deleted file mode 100644
index b88acd72..00000000
--- a/subprojects/json-glib.wrap
+++ /dev/null
@@ -1,5 +0,0 @@
-[wrap-git]
-directory=json-glib
-url=https://gitlab.gnome.org/GNOME/json-glib.git
-revision=master
-depth=1
diff --git a/subprojects/sysprof.wrap b/subprojects/sysprof.wrap
index fb669463..fbb124d5 100644
--- a/subprojects/sysprof.wrap
+++ b/subprojects/sysprof.wrap
@@ -1,5 +1,9 @@
 [wrap-git]
-directory=sysprof
-url=https://gitlab.gnome.org/GNOME/sysprof.git
-revision=6b1cd7a722fcebae1ac392562c47957477ade8bf
-depth=1
+directory = sysprof
+url = https://gitlab.gnome.org/GNOME/sysprof.git
+push-url = ssh://git@ssh.gitlab.gnome.org:GNOME/sysprof.git
+revision = master
+depth = 1
+
+[provide]
+dependency_names = sysprof-4, sysprof-capture-4, sysprof-ui-4