From 3be11c24e8b7ddb2656387b965c3f93304d35fca Mon Sep 17 00:00:00 2001
From: Dave Andreoli <dave@gurumeditation.it>
Date: Sun, 10 Dec 2023 07:38:39 +0100
Subject: [PATCH] Use a more recent meson to silence deprecations

---
 INSTALL     |  4 ++--
 meson.build | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/INSTALL b/INSTALL
index fc64386..c7cfa68 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,6 +1,6 @@
 To build using meson
 ====================
-meson build
+meson setup build
 cd build
 ninja
 ninja install
@@ -8,7 +8,7 @@ ninja install
 
 Or without chdir
 ================
-meson build
+meson setup build
 ninja -C build
 ninja -C build install
 
diff --git a/meson.build b/meson.build
index 1e85b62..4475a5f 100644
--- a/meson.build
+++ b/meson.build
@@ -3,7 +3,7 @@
 project('edgar', 'c',
         version: '0.4.0',
         license: 'GPL v3',
-        meson_version: '>= 0.53.0')
+        meson_version: '>= 0.58.0')
 
 # NOTE: meson 51 needed for the 'modules' param of pymod.find_installation()
 # NOTE: meson 53 needed for the 'embed' param of py3.dependency()
@@ -15,10 +15,10 @@ dep_efl = dependency('efl', version: '>= 1.24')
 
 #### Enlightenemnt ####
 dep_e = dependency('enlightenment', version: '>= 0.23.99')
-e_modules_dir = dep_e.get_pkgconfig_variable('modules')
-e_lib_dir = dep_e.get_pkgconfig_variable('libdir')
-e_release = dep_e.get_pkgconfig_variable('release')
-e_module_arch = dep_e.get_pkgconfig_variable('module_arch')
+e_modules_dir = dep_e.get_variable('modules')
+e_lib_dir = dep_e.get_variable('libdir')
+e_release = dep_e.get_variable('release')
+e_module_arch = dep_e.get_variable('module_arch')
 
 
 #### Dlopen ####
@@ -31,7 +31,7 @@ py3 = import('python').find_installation('python3', modules: ['efl', 'dbus'])
 dep_py3 = py3.dependency(embed: true)
 
 ## bytecompile command to be used by gadgets
-py3_bytecompile = [py3, meson.source_root() / 'meson_bytecompile.py',
+py3_bytecompile = [py3, meson.project_source_root() / 'meson_bytecompile.py',
                    '@INPUT@', '@OUTPUT@']
 
 ## find the installed libpython soname, will be dlopened at runtime
@@ -78,7 +78,7 @@ install_data('python/e.py', install_dir: gadgets_install_dir)
 install_data('module.desktop', install_dir: mod_install_dir)
 
 cmd = [edje_cc,
-       '-id', meson.source_root(),
+       '-id', meson.project_source_root(),
        '@INPUT@', '@OUTPUT@']
 custom_target('e-module-edgar.edj',
               input      : 'e-module-edgar.edc',