From 1d4b8d2a6d68abcd842190c4c257ec5c0eef6b3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 30 Apr 2026 10:51:36 -0700
Subject: [PATCH 1/2] Update for Meson 0.58.0

---
 meson.build          | 9 +++++----
 po/extra/meson.build | 2 +-
 po/meson.build       | 2 +-
 src/meson.build      | 4 ++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/meson.build b/meson.build
index 5711df2d..108fe1e8 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,8 @@
 project(
     'display',
     'vala', 'c',
-    version: '8.0.2'
+    version: '8.0.2',
+    meson_version: '>=0.58.0'
 )
 
 gettext_name = 'io.elementary.settings.' + meson.project_name()
@@ -9,8 +10,8 @@ gnome = import('gnome')
 i18n = import('i18n')
 
 prefix = get_option('prefix')
-datadir = join_paths(prefix, get_option('datadir'))
-libdir = join_paths(prefix, get_option('libdir'))
+datadir = prefix / get_option('datadir')
+libdir = prefix / get_option('libdir')
 
 add_project_arguments(
     '-DGETTEXT_PACKAGE="@0@"'.format(gettext_name),
@@ -19,7 +20,7 @@ add_project_arguments(
 )
 
 config_data = configuration_data()
-config_data.set_quoted('LOCALEDIR', join_paths(get_option('prefix'), get_option('localedir')))
+config_data.set_quoted('LOCALEDIR', get_option('prefix') / get_option('localedir'))
 config_data.set_quoted('GETTEXT_PACKAGE', gettext_name)
 config_file = configure_file(
     input: 'src/Config.vala.in',
diff --git a/po/extra/meson.build b/po/extra/meson.build
index eabcdec7..bc3f4c42 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 807481fc..4008fb5b 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 94aa9310..57b16624 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -18,7 +18,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])
 
 shared_module(
     meson.project_name(),
@@ -36,5 +36,5 @@ shared_module(
         switchboard_dep
     ],
     install: true,
-    install_dir : join_paths(switchboard_plugsdir, 'hardware')
+    install_dir : switchboard_plugsdir / 'hardware'
 )

From 1924d9f086fc97817e641e26edf634f2b6eee5ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Danielle=20For=C3=A9?= <danielle@elementary.io>
Date: Thu, 30 Apr 2026 10:52:17 -0700
Subject: [PATCH 2/2] Update README

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index dd7529ce..4fcfeeb3 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ You'll need the following dependencies:
 * libgranite-7-dev
 * libgtk-4-dev
 * libswitchboard-3-dev
-* meson
+* meson >= 0.58.0
 * valac
 
 Run `meson` to configure the build environment and then `ninja` to build