Convert fallback kwargs to [provide] entries.
diff --git a/meson.build b/meson.build
index c889240..131f155 100644
--- a/meson.build
+++ b/meson.build
@@ -90,15 +90,12 @@
if not freetype_dep.found()
# https://github.com/harfbuzz/harfbuzz/pull/2498
freetype_dep = dependency('freetype2', required: get_option('freetype'),
- fallback: ['freetype2', 'freetype_dep'],
default_options: ['harfbuzz=disabled'])
endif
endif
-glib_dep = dependency('glib-2.0', required: get_option('glib'),
- fallback: ['glib', 'libglib_dep'])
-gobject_dep = dependency('gobject-2.0', required: get_option('gobject'),
- fallback: ['glib', 'libgobject_dep'])
+glib_dep = dependency('glib-2.0', required: get_option('glib'))
+gobject_dep = dependency('gobject-2.0', required: get_option('gobject'))
graphite2_dep = dependency('graphite2', required: get_option('graphite2'))
graphite_dep = dependency('graphite2', required: get_option('graphite'))
@@ -148,8 +145,8 @@
# dependency cycle here because we have configured freetype2 above with
# harfbuzz support disabled, so when cairo will lookup freetype2 dependency
# it will be forced to use that one.
- cairo_dep = dependency('cairo', fallback: 'cairo', required: get_option('cairo'))
- cairo_ft_dep = dependency('cairo-ft', fallback: 'cairo', required: get_option('cairo'))
+ cairo_dep = dependency('cairo', required: get_option('cairo'))
+ cairo_ft_dep = dependency('cairo-ft', required: get_option('cairo'))
endif
endif
diff --git a/subprojects/cairo.wrap b/subprojects/cairo.wrap
index afb2695..7a7d18c 100644
--- a/subprojects/cairo.wrap
+++ b/subprojects/cairo.wrap
@@ -3,3 +3,6 @@
url=https://gitlab.freedesktop.org/cairo/cairo.git
depth=1
revision=1.17.4
+
+[provide]
+dependency_names = cairo, cairo-ft
diff --git a/subprojects/freetype2.wrap b/subprojects/freetype2.wrap
index c346deb..cf8f307 100644
--- a/subprojects/freetype2.wrap
+++ b/subprojects/freetype2.wrap
@@ -2,3 +2,6 @@
directory=freetype
url=https://gitlab.freedesktop.org/freetype/freetype.git
revision=VER-2-11-0
+
+[provide]
+freetype2 = freetype_dep
diff --git a/subprojects/glib.wrap b/subprojects/glib.wrap
index 7a4eae1..9143090 100644
--- a/subprojects/glib.wrap
+++ b/subprojects/glib.wrap
@@ -4,3 +4,7 @@
depth=1
push-url=git@gitlab.gnome.org:GNOME/glib.git
revision=2.58.1
+
+[provide]
+glib-2.0 = libglib_dep
+gobject-2.0 = libgobject_dep