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

2
src/meson.build
View File

@ -13,7 +13,7 @@ script_data.set('libdir', libdir)
script_data.set('libexecdir', libexecdir)
script_data.set('pkgdatadir', pkgdatadir)
script_data.set('pkglibdir', pkglibdir)
script_data.set('PYTHON', python.path())
script_data.set('PYTHON', python.full_path())
script_data.set('VERSION', meson.project_version())
script_tools = ['gnome-shell-perf-tool']

6
src/st/meson.build
View File

@ -153,7 +153,7 @@ st_enums = gnome.mkenums_simple('st-enum-types',
st_gir_sources = st_sources + st_headers + st_enums
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'],
@ -165,8 +165,8 @@ glsl_sources = custom_target('scroll-view-fade-glsl',
st_nogir_sources = [glsl_sources]
st_cflags = [
'-I@0@/src'.format(meson.source_root()),
'-I@0@'.format(meson.build_root()),
'-I@0@/src'.format(meson.project_source_root()),
'-I@0@'.format(meson.project_build_root()),
'-DPREFIX="@0@"'.format(prefix),
'-DLIBDIR="@0@"'.format(libdir),
'-DG_LOG_DOMAIN="St"',