isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: Replace deprecated meson functions

Browse Source 
Replace deprecated functions with their direct replacements:

 - dep.get_pkgconfig_variable() → dep.get_variable()
 - prg.path() → prg.full_path()
 - source/build_root() → project_source/build_root()

In one case we need meson.global_source_root() that was only
added in meson 0.58, so bump the requirement to that.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2077>
This commit is contained in:
Florian Müllner
2021-12-23 02:40:22 +01:00
committed by Marge Bot
parent 0d3894c471
commit daf729de11
11 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/reference/shell/meson.build
View File

@ -41,8 +41,8 @@ configure_file(
gnome.gtkdoc('shell',
main_sgml: 'shell-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')
],
scan_args: [
'--ignore-headers=' + ' '.join(private_headers + exclude_directories)

4
docs/reference/st/meson.build
View File

@ -12,8 +12,8 @@ configure_file(
gnome.gtkdoc('st',
main_sgml: 'st-docs.sgml',
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: [
'--ignore-headers=' + ' '.join(private_headers),