Skip to content

Commit 281551c

Browse files
authored
Fix meson.build deprecations up to 0.56.0 (#675)
1 parent b28c5f4 commit 281551c

File tree

4 files changed

+9
-9
lines changed

4 files changed

+9
-9
lines changed

data/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ custom_target('muffin.desktop',
77
msgfmt,
88
'--desktop', '--template',
99
'@INPUT@',
10-
'-d', join_paths(meson.source_root(), 'po'),
10+
'-d', join_paths(meson.project_source_root(), 'po'),
1111
'-o', '@OUTPUT@'
1212
],
1313
install: true,

meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
project('muffin', 'c',
22
version: '5.8.1',
3-
meson_version: '>= 0.50.0',
3+
meson_version: '>=0.56.0',
44
license: 'GPLv2+'
55
)
66

@@ -376,7 +376,7 @@ cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification)
376376
cdata.set('HAVE_INTROSPECTION', have_introspection)
377377
cdata.set('HAVE_PROFILER', have_profiler)
378378

379-
xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
379+
xkb_base = xkeyboard_config_dep.get_variable(pkgconfig: 'xkb_base')
380380
cdata.set_quoted('XKB_BASE', xkb_base)
381381

382382
if cc.has_header_symbol('sys/prctl.h', 'prctl')
@@ -483,7 +483,7 @@ output = [
483483
' Clutter tests............ ' + have_clutter_tests.to_string(),
484484
' Installed tests.......... ' + have_installed_tests.to_string(),
485485
'',
486-
' Now type \'ninja -C ' + meson.build_root() + '\' to build ' + meson.project_name(),
486+
' Now type \'ninja -C ' + meson.project_build_root() + '\' to build ' + meson.project_name(),
487487
'',
488488
'',
489489
]

src/meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -734,7 +734,7 @@ if have_profiler
734734
'backends/meta-profiler.h',
735735
]
736736

737-
sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces')
737+
sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_variable(pkgconfig: 'datadir'), 'dbus-1', 'interfaces')
738738
sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
739739

740740
dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
@@ -820,14 +820,14 @@ if have_wayland
820820
['xwayland-keyboard-grab', 'unstable', 'v1', ],
821821
]
822822
if have_wayland_eglstream
823-
wayland_eglstream_protocols_dir = wayland_eglstream_protocols_dep.get_pkgconfig_variable('pkgdatadir')
823+
wayland_eglstream_protocols_dir = wayland_eglstream_protocols_dep.get_variable(pkgconfig: 'pkgdatadir')
824824
wayland_protocols += [
825825
['wayland-eglstream-controller', 'third-party', wayland_eglstream_protocols_dir],
826826
]
827827
endif
828828

829829
wayland_scanner = find_program('wayland-scanner')
830-
protocols_dir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir')
830+
protocols_dir = wayland_protocols_dep.get_variable(pkgconfig: 'pkgdatadir')
831831
assert(protocols_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc')
832832

833833
foreach p: wayland_protocols

src/tests/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ if have_installed_tests
3838
endif
3939

4040
test_env = environment()
41-
test_env.set('G_TEST_SRCDIR', join_paths(meson.source_root(), 'src'))
42-
test_env.set('G_TEST_BUILDDIR', meson.build_root())
41+
test_env.set('G_TEST_SRCDIR', join_paths(meson.project_source_root(), 'src'))
42+
test_env.set('G_TEST_BUILDDIR', meson.project_build_root())
4343
test_env.set('MUTTER_TEST_PLUGIN_PATH', '@0@'.format(default_plugin.full_path()))
4444

4545
test_client = executable('mutter-test-client',

0 commit comments

Comments
 (0)