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

---
 INSTALL                     |  4 ++--
 meson.build                 | 12 ++++++------
 themes/default/meson.build  |  2 +-
 themes/lemmings/meson.build |  2 +-
 4 files changed, 10 insertions(+), 10 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 e3c53ae..ea467ec 100644
--- a/meson.build
+++ b/meson.build
@@ -3,16 +3,16 @@
 project('penguins', 'c',
         version: '1.0.0',
         license: 'GPL v3',
-        meson_version: '>= 0.47.0')
+        meson_version: '>= 0.58.0')
 
 gettext_domain = 'e-module-' + meson.project_name()
 
 
 #### Enlightenemnt ####
 dep_e = dependency('enlightenment', version: '>= 0.23.99')
-e_modules_dir = dep_e.get_pkgconfig_variable('modules')
-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_release = dep_e.get_variable('release')
+e_module_arch = dep_e.get_variable('module_arch')
 
 
 #### Install dirs ####
@@ -35,7 +35,7 @@ if get_option('nls')
    cc = meson.get_compiler('c')
    dep_intl = cc.find_library('intl', required : false)
    subdir('po')
-endif 
+endif
 
 
 #### Edje cc ####
@@ -58,7 +58,7 @@ configure_file(output: 'penguins_config.h', configuration: config_h)
 install_data('module.desktop', install_dir: mod_install_dir)
 
 cmd = [ edje_cc,
-        '-id', join_paths(meson.source_root(), 'images'),
+        '-id', join_paths(meson.project_source_root(), 'images'),
         '@INPUT@', '@OUTPUT@']
 custom_target('e-module-penguins.edj',
               input      : 'e-module-penguins.edc',
diff --git a/themes/default/meson.build b/themes/default/meson.build
index cfe8223..7c17776 100644
--- a/themes/default/meson.build
+++ b/themes/default/meson.build
@@ -2,7 +2,7 @@
 theme_name = 'default'
 
 command = [edje_cc,
-           '-id', join_paths(meson.source_root(), 'themes', theme_name),
+           '-id', join_paths(meson.project_source_root(), 'themes', theme_name),
            '@INPUT@', '@OUTPUT@']
 
 custom_target(theme_name + '.edj',
diff --git a/themes/lemmings/meson.build b/themes/lemmings/meson.build
index 3bcbcea..89f5039 100644
--- a/themes/lemmings/meson.build
+++ b/themes/lemmings/meson.build
@@ -2,7 +2,7 @@
 theme_name = 'lemmings'
 
 command = [edje_cc,
-           '-id', join_paths(meson.source_root(), 'themes', theme_name),
+           '-id', join_paths(meson.project_source_root(), 'themes', theme_name),
            '@INPUT@', '@OUTPUT@']
 
 custom_target(theme_name + '.edj',