diff --git a/docs/reference/cinnamon-js/meson.build b/docs/reference/cinnamon-js/meson.build index 66a5e156eb..c1ad842002 100644 --- a/docs/reference/cinnamon-js/meson.build +++ b/docs/reference/cinnamon-js/meson.build @@ -2,7 +2,7 @@ gen_doc = files('gen_doc.py') parts_files = custom_target( 'js-doc-gen', - command: [python, gen_doc, meson.source_root(), join_paths(meson.build_root(), '@OUTDIR@')], + command: [python, gen_doc, meson.project_source_root(), join_paths(meson.project_build_root(), '@OUTDIR@')], # input: ['cinnamon-js-docs.sgml'], output: ['ui.xml', 'misc.xml'], build_by_default: true, diff --git a/docs/reference/cinnamon-tutorials/meson.build b/docs/reference/cinnamon-tutorials/meson.build index 360fe2cf84..c31019458d 100644 --- a/docs/reference/cinnamon-tutorials/meson.build +++ b/docs/reference/cinnamon-tutorials/meson.build @@ -3,8 +3,8 @@ gnome.gtkdoc( mode: 'xml', main_xml: 'cinnamon-tutorials-docs.sgml', src_dir: [ - join_paths(meson.source_root(), 'src'), - join_paths(meson.build_root(), 'src'), + join_paths(meson.project_source_root(), 'src'), + join_paths(meson.project_build_root(), 'src'), ], mkdb_args: ['--xml-mode', '--output-format=xml'], html_assets: 'settings.png', diff --git a/docs/reference/cinnamon/meson.build b/docs/reference/cinnamon/meson.build index 833016d9f8..fec3ed34de 100644 --- a/docs/reference/cinnamon/meson.build +++ b/docs/reference/cinnamon/meson.build @@ -31,8 +31,8 @@ gnome.gtkdoc( gobject_typesfile: 'cinnamon.types', dependencies: [libcinnamon_deps, st_dep, cinnamon_dep], src_dir: [ - join_paths(meson.source_root(), 'src'), - join_paths(meson.build_root(), 'src'), + join_paths(meson.project_source_root(), 'src'), + join_paths(meson.project_build_root(), 'src'), ], scan_args: '--rebuild-types', mkdb_args: ['--xml-mode', '--output-format=xml'], diff --git a/docs/reference/st/meson.build b/docs/reference/st/meson.build index ddedd071aa..50d47e93aa 100644 --- a/docs/reference/st/meson.build +++ b/docs/reference/st/meson.build @@ -5,8 +5,8 @@ gnome.gtkdoc( gobject_typesfile: 'cinnamon-st.types', dependencies: [st_dep], src_dir: [ - join_paths(meson.source_root(), 'src', 'st'), - join_paths(meson.build_root(), 'src', 'st'), + join_paths(meson.project_source_root(), 'src', 'st'), + join_paths(meson.project_build_root(), 'src', 'st'), ], scan_args: '--rebuild-types', mkdb_args: ['--xml-mode', '--output-format=xml'], diff --git a/meson.build b/meson.build index dcd52fee79..88f9a91a7e 100644 --- a/meson.build +++ b/meson.build @@ -1,4 +1,4 @@ -project('Cinnamon', 'c', version : '5.8.4', meson_version : '>=0.47.0') +project('Cinnamon', 'c', version : '5.8.4', meson_version : '>=0.56.0') gnome = import('gnome') i18n = import('i18n') @@ -19,7 +19,7 @@ pkglibdir = join_paths(libdir, meson.project_name().to_lower()) girdir = join_paths(datadir, 'gir-1.0') servicedir = join_paths(datadir, 'dbus-1', 'services') pkgdatadir = join_paths(datadir, meson.project_name().to_lower()) -po_dir = join_paths(meson.source_root(), 'po') +po_dir = join_paths(meson.project_source_root(), 'po') # dependencies cjs = dependency('cjs-1.0', version: '>= 4.8.0') @@ -40,7 +40,7 @@ glib_version = '2.52.0' glib = dependency('glib-2.0', version: '>= ' + glib_version) gtk = dependency('gtk+-3.0', version: '>= 3.12.0') muffin = dependency('libmuffin-0', version: '>= 5.2.0') -muffin_typelibdir = muffin.get_pkgconfig_variable('typelibdir') +muffin_typelibdir = muffin.get_variable(pkgconfig: 'typelibdir') pango = dependency('muffin-cogl-pango-0') xapp = dependency('xapp', version: '>= 2.6.0') X11 = dependency('x11') diff --git a/src/st/meson.build b/src/st/meson.build index 285a158a4e..4d062b7846 100644 --- a/src/st/meson.build +++ b/src/st/meson.build @@ -135,7 +135,7 @@ st_gir_sources = [ st_headers, ] -data_to_c = find_program(meson.source_root() + '/src/data-to-c.pl') +data_to_c = find_program(meson.project_source_root() + '/src/data-to-c.pl') glsl_sources = custom_target('scroll-view-fade-glsl', input: ['st-scroll-view-fade.glsl'],