From 281551c2fa181f15cfea8a53b60a197e90cd7866 Mon Sep 17 00:00:00 2001
From: Rick Calixte <10281587+rcalixte@users.noreply.github.com>
Date: Mon, 2 Oct 2023 13:14:28 -0400
Subject: [PATCH] Fix meson.build deprecations up to 0.56.0 (#675)

---
 data/meson.build      | 2 +-
 meson.build           | 6 +++---
 src/meson.build       | 6 +++---
 src/tests/meson.build | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 34960c1b2..aba5c8e9c 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -7,7 +7,7 @@ custom_target('muffin.desktop',
     msgfmt,
     '--desktop', '--template',
     '@INPUT@',
-    '-d', join_paths(meson.source_root(), 'po'),
+    '-d', join_paths(meson.project_source_root(), 'po'),
     '-o', '@OUTPUT@'
   ],
   install: true,
diff --git a/meson.build b/meson.build
index 8db34977b..26b028aae 100644
--- a/meson.build
+++ b/meson.build
@@ -1,6 +1,6 @@
 project('muffin', 'c',
   version: '5.8.1',
-  meson_version: '>= 0.50.0',
+  meson_version: '>=0.56.0',
   license: 'GPLv2+'
 )
 
@@ -376,7 +376,7 @@ cdata.set('HAVE_STARTUP_NOTIFICATION', have_startup_notification)
 cdata.set('HAVE_INTROSPECTION', have_introspection)
 cdata.set('HAVE_PROFILER', have_profiler)
 
-xkb_base = xkeyboard_config_dep.get_pkgconfig_variable('xkb_base')
+xkb_base = xkeyboard_config_dep.get_variable(pkgconfig: 'xkb_base')
 cdata.set_quoted('XKB_BASE', xkb_base)
 
 if cc.has_header_symbol('sys/prctl.h', 'prctl')
@@ -483,7 +483,7 @@ output = [
   '        Clutter tests............ ' + have_clutter_tests.to_string(),
   '        Installed tests.......... ' + have_installed_tests.to_string(),
   '',
-  '  Now type \'ninja -C ' + meson.build_root() + '\' to build ' + meson.project_name(),
+  '  Now type \'ninja -C ' + meson.project_build_root() + '\' to build ' + meson.project_name(),
   '',
   '',
 ]
diff --git a/src/meson.build b/src/meson.build
index cb15dd47b..2dd095e2a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -734,7 +734,7 @@ if have_profiler
     'backends/meta-profiler.h',
   ]
 
-  sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_pkgconfig_variable('datadir'), 'dbus-1', 'interfaces')
+  sysprof_dbus_interfaces_dir = join_paths(sysprof_dep.get_variable(pkgconfig: 'datadir'), 'dbus-1', 'interfaces')
   sysprof3_dbus_file = join_paths(sysprof_dbus_interfaces_dir, 'org.gnome.Sysprof3.Profiler.xml')
 
   dbus_sysprof3_profiler_built_sources = gnome.gdbus_codegen('meta-dbus-sysprof3-profiler',
@@ -820,14 +820,14 @@ if have_wayland
     ['xwayland-keyboard-grab', 'unstable', 'v1', ],
   ]
   if have_wayland_eglstream
-    wayland_eglstream_protocols_dir = wayland_eglstream_protocols_dep.get_pkgconfig_variable('pkgdatadir')
+    wayland_eglstream_protocols_dir = wayland_eglstream_protocols_dep.get_variable(pkgconfig: 'pkgdatadir')
     wayland_protocols += [
       ['wayland-eglstream-controller', 'third-party', wayland_eglstream_protocols_dir],
     ]
   endif
 
   wayland_scanner = find_program('wayland-scanner')
-  protocols_dir = wayland_protocols_dep.get_pkgconfig_variable('pkgdatadir')
+  protocols_dir = wayland_protocols_dep.get_variable(pkgconfig: 'pkgdatadir')
   assert(protocols_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc')
 
   foreach p: wayland_protocols
diff --git a/src/tests/meson.build b/src/tests/meson.build
index 89bd00f6f..596ca5e8b 100644
--- a/src/tests/meson.build
+++ b/src/tests/meson.build
@@ -38,8 +38,8 @@ if have_installed_tests
 endif
 
 test_env = environment()
-test_env.set('G_TEST_SRCDIR', join_paths(meson.source_root(), 'src'))
-test_env.set('G_TEST_BUILDDIR', meson.build_root())
+test_env.set('G_TEST_SRCDIR', join_paths(meson.project_source_root(), 'src'))
+test_env.set('G_TEST_BUILDDIR', meson.project_build_root())
 test_env.set('MUTTER_TEST_PLUGIN_PATH', '@0@'.format(default_plugin.full_path()))
 
 test_client = executable('mutter-test-client',