Merge branch 'meson.build-fixes' into 'main'

*/meson.build: Fix warnings about features deprecated since Meson 0.56

See merge request World/Phosh/squeekboard!681

meson.build

@@ -93,7 +93,7 @@ copy_cargo_toml = run_command('cp', 'Cargo.toml', 'meson_Cargo.toml.in', check:
 prepare_cargo_toml = run_command('sed', '-i', 's/path = "/path = "@path@\//', 'meson_Cargo.toml.in', check: true)
 
 path_data = configuration_data()
-path_data.set('path', meson.source_root())
+path_data.set('path', meson.project_source_root())
 cargo_toml = configure_file(
     input: 'meson_Cargo.toml.in',
     output: 'Cargo.toml',

protocols/meson.build

@@ -1,5 +1,5 @@
 wayland_protos = dependency('wayland-protocols', version: '>=1.12')
-wl_protocol_dir = wayland_protos.get_pkgconfig_variable('pkgdatadir')
+wl_protocol_dir = wayland_protos.get_variable(pkgconfig : 'pkgdatadir')
 
 wl_scanner = find_program('wayland-scanner')
 gen_scanner_client_header = generator(wl_scanner,

src/meson.build

@@ -1,7 +1,7 @@
 gnome = import('gnome')
 dbus_src = gnome.gdbus_codegen(
     'sm.puri.OSK0',
-    join_paths(meson.source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
+    join_paths(meson.project_source_root() / 'data' / 'dbus', 'sm.puri.OSK0.xml')
 )
 
 config_h = configure_file(
@@ -83,7 +83,7 @@ test(
     'rstest',
     cargo_script,
     args: ['test'] + cargo_build_flags,
-    env: ['SOURCE_DIR=' + meson.source_root()],
+    env: ['SOURCE_DIR=' + meson.project_source_root()],
     # This is a whole Cargo-based test suite, let it run for a while
     timeout: 900,
     depends: [build_rstests],

tests/meson.build

@@ -136,7 +136,7 @@ foreach layout : [
             + ['--example', 'test_layout', '--', layout]
             + extra,
         timeout: timeout,
-        workdir: meson.build_root(),
+        workdir: meson.project_build_root(),
     )
 endforeach
 
@@ -147,8 +147,8 @@ if get_option('find_orphans')
         cargo_script,
         args: ['run'] + cargo_build_flags
             + ['--example', 'find_orphan_layouts',
-                '--', meson.source_root() + '/data/keyboards/'],
+                '--', meson.project_source_root() + '/data/keyboards/'],
         timeout: timeout,
-        workdir: meson.build_root(),
+        workdir: meson.project_build_root(),
     )
 endif