From d575679f5922efff70148571e2ec73c06672d28e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Sat, 13 Dec 2025 10:21:52 -0800
Subject: [PATCH] Meson: bump version to 0.58 and fix deprecation warnings

---
 data/meson.build     | 2 +-
 meson.build          | 3 ++-
 po/extra/meson.build | 2 +-
 po/meson.build       | 2 +-
 src/meson.build      | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 2eae58d4a..9346422e4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -1,7 +1,7 @@
 i18n.merge_file(
     input: 'system.metainfo.xml.in',
     output: 'io.elementary.settings.system.metainfo.xml',
-    po_dir: meson.source_root() / 'po' / 'extra',
+    po_dir: meson.project_source_root() / 'po' / 'extra',
     type: 'xml',
     install: true,
     install_dir: datadir / 'metainfo',
diff --git a/meson.build b/meson.build
index 0b161cd68..9a6c76beb 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,8 @@
 project(
     'system',
     'vala', 'c',
-    version: '8.2.2'
+    version: '8.2.2',
+    meson_version: '>=0.58.0'
 )
 
 gettext_name = 'io.elementary.settings.' + meson.project_name()
diff --git a/po/extra/meson.build b/po/extra/meson.build
index eabcdec7a..bc3f4c42b 100644
--- a/po/extra/meson.build
+++ b/po/extra/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext('extra',
-    args: '--directory='+meson.source_root(),
+    args: '--directory='+meson.project_source_root(),
     preset: 'glib',
     install: false,
 )
diff --git a/po/meson.build b/po/meson.build
index c1dea4501..e17b66ea9 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -1,5 +1,5 @@
 i18n.gettext(gettext_name,
-    args: ['--directory=' + meson.source_root()],
+    args: ['--directory=' + meson.project_source_root()],
     preset: 'glib'
 )
 
diff --git a/src/meson.build b/src/meson.build
index 57bd2a4a8..8570d5971 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -16,7 +16,7 @@ plug_files = files(
 )
 
 switchboard_dep = dependency('switchboard-3')
-switchboard_plugsdir = switchboard_dep.get_pkgconfig_variable('plugsdir', define_variable: ['libdir', libdir])
+switchboard_plugsdir = switchboard_dep.get_variable('plugsdir', pkgconfig_define: ['libdir', libdir])
 
 config_data = configuration_data()
 config_data.set('GETTEXT_PACKAGE', gettext_name)