Lerking/gtk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: Remove deprecated get_pkgconfig_variable()

Browse Source 
Replace it with `get_variable(pkgconfig:...)`.
This commit is contained in:
Emmanuele Bassi
2021-12-24 15:55:26 +00:00
parent 6f2ff620bd
commit a70988ecd5
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gtk/meson.build
View File

@@ -1101,7 +1101,7 @@ if harfbuzz_dep.found() and pangoft_dep.found()
endif
if x11_enabled
x11_data_prefix = dependency('x11').get_pkgconfig_variable('prefix')
x11_data_prefix = dependency('x11').get_variable(pkgconfig: 'prefix')
gtk_cargs += [ '-DX11_DATA_PREFIX="@0@"'.format(x11_data_prefix), ]
gtk_sources += gtk_x11_sources

8
meson.build
View File

@@ -456,7 +456,7 @@ colord_dep = dependency('colord', version: '>= 0.1.9', required: get_option('col
cdata.set('HAVE_COLORD', colord_dep.found())
if iso_codes_dep.found()
cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix'))
cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix'))
else
cdata.set_quoted('ISO_CODES_PREFIX', '/usr')
endif
@@ -515,7 +515,7 @@ if wayland_enabled
if not wlprotocolsdep.found()
wlproto_dir = subproject('wayland-protocols').get_variable('wayland_protocols_srcdir')
else
wlproto_dir = wlprotocolsdep.get_pkgconfig_variable('pkgdatadir')
wlproto_dir = wlprotocolsdep.get_variable(pkgconfig: 'pkgdatadir')
endif
wayland_pkgs = [
@@ -709,8 +709,8 @@ endif
graphene_dep_type = graphene_dep.type_name()
if graphene_dep_type == 'pkgconfig'
graphene_has_sse2 = graphene_dep.get_pkgconfig_variable('graphene_has_sse2') == '1'
graphene_has_gcc = graphene_dep.get_pkgconfig_variable('graphene_has_gcc') == '1'
graphene_has_sse2 = graphene_dep.get_variable(pkgconfig: 'graphene_has_sse2') == '1'
graphene_has_gcc = graphene_dep.get_variable(pkgconfig: 'graphene_has_gcc') == '1'
else
graphene_simd = subproject('graphene').get_variable('graphene_simd')
graphene_has_sse2 = graphene_simd.contains('sse2')

14
testsuite/introspection/meson.build
View File

@@ -2,11 +2,13 @@ py = import('python').find_installation('python3', modules: ['gi'])
env = environment()
env.prepend('GI_TYPELIB_PATH',
join_paths(project_build_root, 'gtk'),
gi_dep.get_pkgconfig_variable('typelibdir'))
env.prepend('LD_PRELOAD', join_paths(project_build_root, 'gtk', 'libgtk-4.so'))
project_build_root / 'gtk',
gi_dep.get_variable(pkgconfig: 'typelibdir'),
)
env.prepend('LD_PRELOAD', project_build_root / 'gtk' / 'libgtk-4.so')
test('api',
find_program('api.py', dirs: meson.current_source_dir()),
suite: ['introspection'],
env: env)
find_program('api.py', dirs: meson.current_source_dir()),
suite: ['introspection'],
env: env,
)