This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch my_config
in repository terminology.
View the commit online.
commit 40e4e8858e83dedb87d6c2f31eb5da8c69c702b8
Author: Boris Faure <bill...@gmail.com>
AuthorDate: Sun Mar 23 22:09:05 2025 +0100
meson: require version 0.59.0 or later
---
data/colorschemes/meson.build | 2 +-
data/themes/meson.build | 6 +++---
data/themes/nyanology/meson.build | 8 ++++----
meson.build | 7 ++++---
po/meson.build | 4 ++--
5 files changed, 14 insertions(+), 13 deletions(-)
diff --git a/data/colorschemes/meson.build b/data/colorschemes/meson.build
index 07f577dd..8325f0ab 100644
--- a/data/colorschemes/meson.build
+++ b/data/colorschemes/meson.build
@@ -32,7 +32,7 @@ add_color_scheme_sh = find_program(
'add_color_scheme.sh',
native: false,
required: true,
- dirs: [join_paths(meson.source_root(), 'data', 'colorschemes')])
+ dirs: [join_paths(meson.project_source_root(), 'data', 'colorschemes')])
cs_builder = [add_color_scheme_sh,
eet_bin, '@OUTPUT@', '@INPUT@']
diff --git a/data/themes/meson.build b/data/themes/meson.build
index 0d92ef5c..eaef201b 100644
--- a/data/themes/meson.build
+++ b/data/themes/meson.build
@@ -1,8 +1,8 @@
command = [edje_cc,
edje_offscale,
- '-id', join_paths(meson.source_root(), 'data', 'themes', 'images'),
- '-fd', join_paths(meson.source_root(), 'data', 'fonts'),
- '-sd', join_paths(meson.source_root(), 'data', 'themes', 'sounds'),
+ '-id', join_paths(meson.project_source_root(), 'data', 'themes', 'images'),
+ '-fd', join_paths(meson.project_source_root(), 'data', 'fonts'),
+ '-sd', join_paths(meson.project_source_root(), 'data', 'themes', 'sounds'),
'@INPUT@',
'@OUTPUT@']
diff --git a/data/themes/nyanology/meson.build b/data/themes/nyanology/meson.build
index 2c8420cd..9d45d5ec 100644
--- a/data/themes/nyanology/meson.build
+++ b/data/themes/nyanology/meson.build
@@ -1,9 +1,9 @@
command = [edje_cc,
- '-id', join_paths(meson.source_root(), 'data', 'themes',
+ '-id', join_paths(meson.project_source_root(), 'data', 'themes',
'nyanology', 'images'),
- '-id', join_paths(meson.source_root(), 'data', 'themes', 'images'),
- '-fd', join_paths(meson.source_root(), 'data', 'fonts'),
- '-sd', join_paths(meson.source_root(), 'data', 'themes', 'sounds'),
+ '-id', join_paths(meson.project_source_root(), 'data', 'themes', 'images'),
+ '-fd', join_paths(meson.project_source_root(), 'data', 'fonts'),
+ '-sd', join_paths(meson.project_source_root(), 'data', 'themes', 'sounds'),
'@INPUT@',
'@OUTPUT@']
diff --git a/meson.build b/meson.build
index 1915335b..e30a4d1d 100644
--- a/meson.build
+++ b/meson.build
@@ -1,7 +1,8 @@
project('terminology', 'c',
version: '1.13.0',
default_options: ['buildtype=plain', 'c_std=gnu99'],
- license: 'BSD')
+ license: 'BSD',
+ meson_version: '>=0.59.0')
cc = meson.get_compiler('c')
@@ -78,10 +79,10 @@ foreach efl_dep: efl_deps
dep = dependency(efl_dep, version: '>=' + efl_version)
terminology_dependencies += [dep]
if efl_dep == 'edje'
- edje_cc_path = dep.get_pkgconfig_variable('prefix') + '/bin/edje_cc'
+ edje_cc_path = dep.get_variable(pkgconfig: 'prefix') + '/bin/edje_cc'
endif
if efl_dep == 'eet'
- eet_path = dep.get_pkgconfig_variable('prefix') + '/bin/eet'
+ eet_path = dep.get_variable(pkgconfig: 'prefix') + '/bin/eet'
endif
endforeach
diff --git a/po/meson.build b/po/meson.build
index 6f7d1991..9b56f61b 100644
--- a/po/meson.build
+++ b/po/meson.build
@@ -4,7 +4,7 @@ if get_option('nls')
add_project_arguments('-DGETTEXT_PACKAGE="terminology"', language:'c')
i18n.gettext(meson.project_name(),
args: [
- '--directory=' + meson.source_root(),
+ '--directory=' + meson.project_source_root(),
'--keyword=_',
'--keyword=d_:1',
'--keyword=P_:1,2',
@@ -19,7 +19,7 @@ endif
# maintainer shortcut for updating po stuff
run_target ('po',
- command: ['ninja', '-C', meson.build_root(),
+ command: ['ninja', '-C', meson.project_build_root(),
meson.project_name() + '-pot',
meson.project_name() + '-update-po']
)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
