Skip to content

Commit bb657b1

Browse files
authored
Meson: fix deprecation warnings (#362)
1 parent 5e447ca commit bb657b1

5 files changed

Lines changed: 9 additions & 8 deletions

File tree

data/meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
i18n.merge_file(
22
input: 'network.metainfo.xml.in',
33
output: 'io.elementary.wingpanel.network.metainfo.xml',
4-
po_dir: join_paths(meson.source_root(), 'po', 'extra'),
4+
po_dir: meson.project_source_root() / 'po' / 'extra',
55
type: 'xml',
66
install: true,
7-
install_dir: join_paths(get_option('datadir'), 'metainfo'),
7+
install_dir: get_option('datadir') / 'metainfo',
88
)
99

1010
configure_file(
1111
input: 'network.policy.in',
1212
output: 'io.elementary.wingpanel.network.policy',
1313
configuration: config_data,
14-
install_dir: polkit_dep.get_pkgconfig_variable('policydir', define_variable: ['prefix', prefix])
14+
install_dir: polkit_dep.get_variable('policydir', pkgconfig_define: ['prefix', prefix])
1515
)

meson.build

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
project(
22
'network',
33
'vala', 'c',
4-
version: '8.0.1'
4+
version: '8.0.1',
5+
meson_version: '>=0.58.0'
56
)
67

78
gettext_name = meson.project_name() + '-indicator'
@@ -21,7 +22,7 @@ add_project_arguments(
2122
add_project_arguments('-DG_LOG_DOMAIN="io.elementary.wingpanel.network"', language:'c')
2223

2324
wingpanel_dep = dependency('wingpanel')
24-
wingpanel_indicatorsdir = wingpanel_dep.get_pkgconfig_variable('indicatorsdir', define_variable: ['libdir', libdir])
25+
wingpanel_indicatorsdir = wingpanel_dep.get_variable('indicatorsdir', pkgconfig_define: ['libdir', libdir])
2526

2627
config_data = configuration_data()
2728
config_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))

po/extra/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
i18n.gettext('extra',
2-
args: '--directory=' + meson.source_root(),
2+
args: '--directory=' + meson.project_source_root(),
33
preset: 'glib',
44
install: false,
55
)

po/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
i18n.gettext(gettext_name,
2-
args: '--directory=' + meson.source_root(),
2+
args: '--directory=' + meson.project_source_root(),
33
preset: 'glib'
44
)
55

vapi/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
gir_dir = g_ir_dep.get_pkgconfig_variable('girdir')
1+
gir_dir = g_ir_dep.get_variable('girdir', pkgconfig_define: ['prefix', prefix])
22

33
libnm_target = custom_target('libnm',
44
command: [

0 commit comments

Comments
 (0)