Skip to content

Commit 331e0fc

Browse files
authored
Fix meson.build deprecations up to 0.56.0 (#11870)
1 parent 56718fd commit 331e0fc

File tree

6 files changed

+11
-11
lines changed

6 files changed

+11
-11
lines changed

docs/reference/cinnamon-js/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ gen_doc = files('gen_doc.py')
22

33
parts_files = custom_target(
44
'js-doc-gen',
5-
command: [python, gen_doc, meson.source_root(), join_paths(meson.build_root(), '@OUTDIR@')],
5+
command: [python, gen_doc, meson.project_source_root(), join_paths(meson.project_build_root(), '@OUTDIR@')],
66
# input: ['cinnamon-js-docs.sgml'],
77
output: ['ui.xml', 'misc.xml'],
88
build_by_default: true,

docs/reference/cinnamon-tutorials/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ gnome.gtkdoc(
33
mode: 'xml',
44
main_xml: 'cinnamon-tutorials-docs.sgml',
55
src_dir: [
6-
join_paths(meson.source_root(), 'src'),
7-
join_paths(meson.build_root(), 'src'),
6+
join_paths(meson.project_source_root(), 'src'),
7+
join_paths(meson.project_build_root(), 'src'),
88
],
99
mkdb_args: ['--xml-mode', '--output-format=xml'],
1010
html_assets: 'settings.png',

docs/reference/cinnamon/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ gnome.gtkdoc(
3131
gobject_typesfile: 'cinnamon.types',
3232
dependencies: [libcinnamon_deps, st_dep, cinnamon_dep],
3333
src_dir: [
34-
join_paths(meson.source_root(), 'src'),
35-
join_paths(meson.build_root(), 'src'),
34+
join_paths(meson.project_source_root(), 'src'),
35+
join_paths(meson.project_build_root(), 'src'),
3636
],
3737
scan_args: '--rebuild-types',
3838
mkdb_args: ['--xml-mode', '--output-format=xml'],

docs/reference/st/meson.build

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ gnome.gtkdoc(
55
gobject_typesfile: 'cinnamon-st.types',
66
dependencies: [st_dep],
77
src_dir: [
8-
join_paths(meson.source_root(), 'src', 'st'),
9-
join_paths(meson.build_root(), 'src', 'st'),
8+
join_paths(meson.project_source_root(), 'src', 'st'),
9+
join_paths(meson.project_build_root(), 'src', 'st'),
1010
],
1111
scan_args: '--rebuild-types',
1212
mkdb_args: ['--xml-mode', '--output-format=xml'],

meson.build

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
project('Cinnamon', 'c', version : '5.8.4', meson_version : '>=0.47.0')
1+
project('Cinnamon', 'c', version : '5.8.4', meson_version : '>=0.56.0')
22

33
gnome = import('gnome')
44
i18n = import('i18n')
@@ -19,7 +19,7 @@ pkglibdir = join_paths(libdir, meson.project_name().to_lower())
1919
girdir = join_paths(datadir, 'gir-1.0')
2020
servicedir = join_paths(datadir, 'dbus-1', 'services')
2121
pkgdatadir = join_paths(datadir, meson.project_name().to_lower())
22-
po_dir = join_paths(meson.source_root(), 'po')
22+
po_dir = join_paths(meson.project_source_root(), 'po')
2323

2424
# dependencies
2525
cjs = dependency('cjs-1.0', version: '>= 4.8.0')
@@ -40,7 +40,7 @@ glib_version = '2.52.0'
4040
glib = dependency('glib-2.0', version: '>= ' + glib_version)
4141
gtk = dependency('gtk+-3.0', version: '>= 3.12.0')
4242
muffin = dependency('libmuffin-0', version: '>= 5.2.0')
43-
muffin_typelibdir = muffin.get_pkgconfig_variable('typelibdir')
43+
muffin_typelibdir = muffin.get_variable(pkgconfig: 'typelibdir')
4444
pango = dependency('muffin-cogl-pango-0')
4545
xapp = dependency('xapp', version: '>= 2.6.0')
4646
X11 = dependency('x11')

src/st/meson.build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ st_gir_sources = [
135135
st_headers,
136136
]
137137

138-
data_to_c = find_program(meson.source_root() + '/src/data-to-c.pl')
138+
data_to_c = find_program(meson.project_source_root() + '/src/data-to-c.pl')
139139

140140
glsl_sources = custom_target('scroll-view-fade-glsl',
141141
input: ['st-scroll-view-fade.glsl'],

0 commit comments

Comments
 (0)