From 060b34c5b612d65cb9a601469f8569e48c632645 Mon Sep 17 00:00:00 2001 From: peelz Date: Thu, 9 May 2024 13:41:48 -0400 Subject: [PATCH] Fix meson deprecation warnings --- meson.build | 10 +++++----- src/polkit/meson.build | 1 - 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/meson.build b/meson.build index adc3067c..39f7f329 100644 --- a/meson.build +++ b/meson.build @@ -164,7 +164,7 @@ endif dbus_dep = dependency('dbus-1', required: false) dbus_policydir = pk_prefix / pk_datadir / 'dbus-1/system.d' if dbus_dep.found() - dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir]) + dbus_system_bus_services_dir = dbus_dep.get_variable(pkgconfig: 'system_bus_services_dir', pkgconfig_define: ['datadir', pk_prefix / pk_datadir]) else # libdbus development files not installed, assume a standard layout dbus_system_bus_services_dir = pk_prefix / pk_datadir / 'dbus-1' / 'system-services' @@ -205,10 +205,10 @@ if enable_logind if systemd_systemdsystemunitdir == '' systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it') # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used - systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir') + systemd_systemdsystemunitdir = systemd_dep.get_variable(pkgconfig: 'systemdsystemunitdir') endif - systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d') + systemd_sysusers_dir = systemd_dep.get_variable(pkgconfig: 'sysusers_dir', default_value: '/usr/lib/sysusers.d') else logind_dep = dependency('libelogind', not_found_message: 'elogind support requested but libelogind library not found') endif @@ -298,7 +298,7 @@ if os_type == '' ] foreach os_path: os_paths - if run_command('test', '-e', os_path[1]).returncode() == 0 + if run_command('test', '-e', os_path[1], check: false).returncode() == 0 os_type = os_path[0] break endif @@ -395,7 +395,7 @@ output += ' source code location: ' + source_root + '\n' output += ' compiler: ' + cc.get_id() + '\n' output += ' c_flags: ' + ' '.join(compiler_c_flags) + '\n\n' if enable_man - output += ' xsltproc: ' + xsltproc.path() + '\n' + output += ' xsltproc: ' + xsltproc.full_path() + '\n' endif output += ' introspection: ' + enable_introspection.to_string() + '\n' output += ' Distribution/OS: ' + os_type + '\n' diff --git a/src/polkit/meson.build b/src/polkit/meson.build index 9699fea6..a7ce02b1 100644 --- a/src/polkit/meson.build +++ b/src/polkit/meson.build @@ -114,7 +114,6 @@ pkg.generate( requires: common_deps, variables: [ 'exec_prefix=${prefix}', - 'datadir=' + ('${prefix}' / pk_datadir), 'policydir=' + ('${datadir}' / pk_actiondir), 'actiondir=' + ('${datadir}' / pk_actiondir), 'pkcheck_supports_uid=true',