Skip to content

Commit

Permalink
Fix meson.build deprecations up to 0.56.0 (#11870)
Browse files Browse the repository at this point in the history
  • Loading branch information
rcalixte authored Oct 2, 2023
1 parent 56718fd commit 331e0fc
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion docs/reference/cinnamon-js/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/cinnamon-tutorials/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/cinnamon/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
4 changes: 2 additions & 2 deletions docs/reference/st/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
@@ -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')
Expand All @@ -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')
Expand All @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion src/st/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down

0 comments on commit 331e0fc

Please sign in to comment.