Update Meson functions v1 APPLIED

Sebastian Crane: 1
 Update Meson functions

 2 files changed, 2 insertions(+), 2 deletions(-)

Thank you for merging!

[PATCH] Update Meson functions Export this patch

Change source_root() (deprecated in Meson 0.56.0) and path() (deprecated
in Meson 0.55.0) to project_source_root() and full_path() respectively.
---
 data/meson.build | 2 +-
 src/meson.build  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/meson.build b/data/meson.build
index 4be6ee7..e59e533 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -35,7 +35,7 @@ metainfo_file = i18n.merge_file(
     input:  'net.kirgroup.confy.metainfo.xml.in',
     output: 'net.kirgroup.confy.metainfo.xml',
     type: 'xml',
-    po_dir: join_paths (meson.source_root(), 'po'),
+    po_dir: join_paths (meson.project_source_root(), 'po'),
     install: true,
     install_dir: join_paths (get_option ('datadir'), 'metainfo')
 )
diff --git a/src/meson.build b/src/meson.build
index 5770910..dacc746 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -43,7 +43,7 @@ gnome.compile_resources('confy',


 conf = configuration_data()
-conf.set('PYTHON', python3.path())
+conf.set('PYTHON', python3.full_path())
 conf.set('VERSION', meson.project_version())
 conf.set('localedir', join_paths(get_option('prefix'), get_option('localedir')))
 conf.set('pkgdatadir', pkgdatadir)
--
2.30.2

Fabio <fabrixxm@kirgroup.net>

1 year, 5 months ago

Merged. Thank you!