From 5501dc7b4753c01b4c03bdc9f82fad1b98b63e41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 20 Feb 2024 01:00:29 +0100 Subject: [PATCH] build: Stop using deprecated dep.get_pkgconfig_variable() method Use generic get_variable() instead --- doc/meson.build | 2 +- meson.build | 4 ++-- tests/meson.build | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/meson.build b/doc/meson.build index 77236a06..e48067fd 100644 --- a/doc/meson.build +++ b/doc/meson.build @@ -19,7 +19,7 @@ content_files = [ expand_content_files = content_files -glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') +glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix') glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') docpath = join_paths(get_option('datadir'), 'gtk-doc', 'html') diff --git a/meson.build b/meson.build index 07019d3c..984f26e6 100644 --- a/meson.build +++ b/meson.build @@ -269,7 +269,7 @@ if install_udev_rules udev_rules_dir = get_option('udev_rules_dir') if udev_rules_dir == 'auto' udev_dep = dependency('udev') - udev_rules_dir = udev_dep.get_pkgconfig_variable('udevdir') + '/rules.d' + udev_rules_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/rules.d' endif endif @@ -306,7 +306,7 @@ if not udev_hwdb.disabled() if udev_hwdb_dir == 'auto' udev_dep = dependency('udev') - udev_hwdb_dir = udev_dep.get_pkgconfig_variable('udevdir') + '/hwdb.d' + udev_hwdb_dir = udev_dep.get_variable(pkgconfig: 'udevdir') + '/hwdb.d' endif else udev_hwdb_dir = '' diff --git a/tests/meson.build b/tests/meson.build index efa573fb..f68ed406 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -339,7 +339,7 @@ endif valgrind = find_program('valgrind', required: false) if valgrind.found() - glib_share = glib_dep.get_pkgconfig_variable('prefix') / 'share' / glib_dep.name() + glib_share = glib_dep.get_variable(pkgconfig: 'prefix') / 'share' / glib_dep.name() glib_suppressions = glib_share + '/valgrind/glib.supp' libfprint_suppressions = '@0@/@1@'.format(meson.project_source_root(), files('libfprint.supp')[0])