diff --git a/README.md b/README.md index 8cef0031..3fb97dc2 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ You'll need the following dependencies: * libflatpak-dev * libgranite-7-dev >= 7.4.0 * libgtk-4-dev -* meson +* meson >= 0.58.0 * valac Run `meson` to configure the build environment and then `ninja` to build diff --git a/data/meson.build b/data/meson.build index d2c22809..b71aa154 100644 --- a/data/meson.build +++ b/data/meson.build @@ -7,7 +7,7 @@ gresource = gnome.compile_resources( i18n.merge_file( input: 'applications.metainfo.xml.in', output: 'io.elementary.settings.applications.metainfo.xml', - po_dir: join_paths(meson.source_root (), 'po', 'extra'), + po_dir: join_paths(meson.project_source_root (), 'po', 'extra'), install_dir: join_paths(datadir, 'metainfo'), install: true ) diff --git a/meson.build b/meson.build index 12c10fa8..1b24a541 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,8 @@ project( 'applications', 'vala', 'c', - version: '8.2.0' + version: '8.2.0', + meson_version: '>= 0.58.0' ) gettext_name = 'io.elementary.settings.' + meson.project_name() diff --git a/po/extra/meson.build b/po/extra/meson.build index e5572927..024dc312 100644 --- a/po/extra/meson.build +++ b/po/extra/meson.build @@ -1,5 +1,5 @@ i18n.gettext('extra', - args: '--directory=' + meson.source_root(), + args: '--directory=' + meson.project_source_root(), preset: 'glib', install: false, ) diff --git a/po/meson.build b/po/meson.build index c072575b..d7f18d4b 100644 --- a/po/meson.build +++ b/po/meson.build @@ -1,5 +1,5 @@ i18n.gettext(gettext_name, - args: '--directory=' + meson.source_root(), + args: '--directory=' + meson.project_source_root(), preset: 'glib' ) subdir('extra') diff --git a/src/meson.build b/src/meson.build index 1dca946b..4435884c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -24,7 +24,7 @@ plug_files = files( ) switchboard_dep = dependency('switchboard-3') -switchboard_plugsdir = switchboard_dep.get_pkgconfig_variable('plugsdir', define_variable: ['libdir', libdir]) +switchboard_plugsdir = switchboard_dep.get_variable('plugsdir', pkgconfig_define: ['libdir', libdir]) shared_module( meson.project_name(),