meson: require version 0.59.0 or later

Author: borisfaure

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@']

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@']
 

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@']
 

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
 

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']
   )