walkero
/
harfbuzz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert fallback kwargs to [provide] entries.

This commit is contained in:
Jussi Pakkanen 2022-01-13 18:30:52 +02:00 committed by Behdad Esfahbod
parent bc0a5fdf43
commit 726b1a8b2d
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -90,15 +90,12 @@ if not get_option('freetype').disabled()
if not freetype_dep.found() if not freetype_dep.found()
# https://github.com/harfbuzz/harfbuzz/pull/2498 # https://github.com/harfbuzz/harfbuzz/pull/2498
freetype_dep = dependency('freetype2', required: get_option('freetype'), freetype_dep = dependency('freetype2', required: get_option('freetype'),
fallback: ['freetype2', 'freetype_dep'],
default_options: ['harfbuzz=disabled']) default_options: ['harfbuzz=disabled'])
endif endif
endif endif
glib_dep = dependency('glib-2.0', required: get_option('glib'), glib_dep = dependency('glib-2.0', required: get_option('glib'))
fallback: ['glib', 'libglib_dep']) gobject_dep = dependency('gobject-2.0', required: get_option('gobject'))
gobject_dep = dependency('gobject-2.0', required: get_option('gobject'),
fallback: ['glib', 'libgobject_dep'])
graphite2_dep = dependency('graphite2', required: get_option('graphite2')) graphite2_dep = dependency('graphite2', required: get_option('graphite2'))
graphite_dep = dependency('graphite2', required: get_option('graphite')) graphite_dep = dependency('graphite2', required: get_option('graphite'))
@ -148,8 +145,8 @@ if not get_option('cairo').disabled()
# dependency cycle here because we have configured freetype2 above with # dependency cycle here because we have configured freetype2 above with
# harfbuzz support disabled, so when cairo will lookup freetype2 dependency # harfbuzz support disabled, so when cairo will lookup freetype2 dependency
# it will be forced to use that one. # it will be forced to use that one.
cairo_dep = dependency('cairo', fallback: 'cairo', required: get_option('cairo')) cairo_dep = dependency('cairo', required: get_option('cairo'))
cairo_ft_dep = dependency('cairo-ft', fallback: 'cairo', required: get_option('cairo')) cairo_ft_dep = dependency('cairo-ft', required: get_option('cairo'))
endif endif
endif endif

3
subprojects/cairo.wrap
View File

@ -3,3 +3,6 @@ directory=cairo
url=https://gitlab.freedesktop.org/cairo/cairo.git url=https://gitlab.freedesktop.org/cairo/cairo.git
depth=1 depth=1
revision=1.17.4 revision=1.17.4
[provide]
dependency_names = cairo, cairo-ft

3
subprojects/freetype2.wrap
View File

@ -2,3 +2,6 @@
directory=freetype directory=freetype
url=https://gitlab.freedesktop.org/freetype/freetype.git url=https://gitlab.freedesktop.org/freetype/freetype.git
revision=VER-2-11-0 revision=VER-2-11-0
[provide]
freetype2 = freetype_dep

4
subprojects/glib.wrap
View File

@ -4,3 +4,7 @@ url=https://gitlab.gnome.org/GNOME/glib.git
depth=1 depth=1
push-url=git@gitlab.gnome.org:GNOME/glib.git push-url=git@gitlab.gnome.org:GNOME/glib.git
revision=2.58.1 revision=2.58.1
[provide]
glib-2.0 = libglib_dep
gobject-2.0 = libgobject_dep