diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-12-19 03:15:06 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2022-12-19 17:25:17 +0530 |
| commit | cc9072ad21c20d6ce7b0313e8d301fb5d5faab18 (patch) | |
| tree | 7f0cb52ee4b74c15b7783d426759056dbeba8c9f /subprojects | |
| parent | 7954eed96054ad012ab5b331eddd1ecde703a52a (diff) | |
| download | pango-cc9072ad21c20d6ce7b0313e8d301fb5d5faab18.tar.gz | |
meson: Stop using fallback: kwarg for deps that don't need it
Subprojects that use meson.override_dependency() do not require the
caller to provide the subproject name and dependency variable name
inside the subproject.
All the dependencies we use can be switched in this way; including
gi-docgen which is now automatically executed by the find_program()
invocation thanks to `program_names` in the wrap file.
Diffstat (limited to 'subprojects')
| -rw-r--r-- | subprojects/cairo.wrap | 14 | ||||
| -rw-r--r-- | subprojects/fontconfig.wrap | 9 | ||||
| -rw-r--r-- | subprojects/freetype2.wrap | 11 | ||||
| -rw-r--r-- | subprojects/fribidi.wrap | 13 | ||||
| -rw-r--r-- | subprojects/gi-docgen.wrap | 3 | ||||
| -rw-r--r-- | subprojects/glib.wrap | 4 | ||||
| -rw-r--r-- | subprojects/harfbuzz.wrap | 13 |
7 files changed, 47 insertions, 20 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 01606cee..85c85da1 100644 --- a/subprojects/gi-docgen.wrap +++ b/subprojects/gi-docgen.wrap @@ -4,3 +4,6 @@ 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 08f7d4e5..525a37bb 100644 --- a/subprojects/glib.wrap +++ b/subprojects/glib.wrap @@ -4,3 +4,7 @@ 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/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 |