fdo-mirrors/fprintd
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/libfprint/fprintd.git synced 2025-12-20 14:00:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: Do not use deprecated meson object functions

Browse source
This commit is contained in:
Marco Trevisan (Treviño) 2025-02-20 20:49:54 +01:00 • committed by Marco Trevisan
parent 5f73ca1e3f
commit f7b26a518f
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/meson.build
View file

@ -27,7 +27,7 @@ polkit_policy = 'net.reactivated.fprint.device.policy'
polkit_policy_target = i18n.merge_file( polkit_policy_target = i18n.merge_file(
input: '@0@.in'.format(polkit_policy), input: '@0@.in'.format(polkit_policy),
output: polkit_policy, output: polkit_policy,
po_dir: meson.source_root() / 'po', po_dir: meson.project_source_root() / 'po',
install: true, install: true,
install_dir: polkit_policy_directory, install_dir: polkit_policy_directory,
) )

2
meson.build
View file

@ -6,7 +6,7 @@ project('fprintd', 'c',
'warning_level=3', 'warning_level=3',
'c_std=gnu99', 'c_std=gnu99',
], ],
meson_version: '>= 0.50.0') meson_version: '>= 0.56.0')
gnome = import('gnome') gnome = import('gnome')
i18n = import('i18n') i18n = import('i18n')

6
tests/meson.build
View file

@ -31,8 +31,8 @@ foreach t: tests
'env': [ 'env': [
'G_DEBUG=fatal-criticals', 'G_DEBUG=fatal-criticals',
'G_MESSAGES_DEBUG=all', 'G_MESSAGES_DEBUG=all',
'FPRINT_BUILD_DIR=' + meson.build_root() / 'src', 'FPRINT_BUILD_DIR=' + meson.project_build_root() / 'src',
'TOPSRCDIR=' + meson.source_root(), 'TOPSRCDIR=' + meson.project_source_root(),
], ],
'depends': [ 'depends': [
fprintd, fprintd,
@ -75,7 +75,7 @@ foreach pt: python_tests
args: ut_args, args: ut_args,
suite: ut_suite, suite: ut_suite,
depends: pt.get('depends', []), depends: pt.get('depends', []),
workdir: pt.get('workdir', meson.build_root()), workdir: pt.get('workdir', meson.project_build_root()),
env: pt.get('env', []), env: pt.get('env', []),
timeout: pt.get('timeout', 30), timeout: pt.get('timeout', 30),
is_parallel: pt.get('is_parallel', true), is_parallel: pt.get('is_parallel', true),

4
tests/pam/meson.build
View file

@ -49,8 +49,8 @@ foreach t: tests
'file': files(meson.current_source_dir() / t + '.py')[0], 'file': files(meson.current_source_dir() / t + '.py')[0],
'is_parallel': false, 'is_parallel': false,
'env': [ 'env': [
'TOPBUILDDIR=' + meson.build_root(), 'TOPBUILDDIR=' + meson.project_build_root(),
'TOPSRCDIR=' + meson.source_root(), 'TOPSRCDIR=' + meson.project_source_root(),
'LD_PRELOAD=' + ' '.join(pam_tests_ld_preload), 'LD_PRELOAD=' + ' '.join(pam_tests_ld_preload),
'PAM_WRAPPER=1', 'PAM_WRAPPER=1',
'PAM_WRAPPER_DEBUGLEVEL=2', 'PAM_WRAPPER_DEBUGLEVEL=2',