diff options
author | Emmanuele Bassi <ebassi@gnome.org> | 2021-12-10 17:59:53 +0000 |
---|---|---|
committer | Emmanuele Bassi <ebassi@gnome.org> | 2021-12-10 18:02:46 +0000 |
commit | f08e1139fc9a1108170de0060ebbecb665af16dc (patch) | |
tree | 2ec366593e1a487cd0c4588dcff4d16369009de1 | |
parent | cc31a16bc9928093c28eb9901b65195f4f820b54 (diff) | |
download | gtk+-f08e1139fc9a1108170de0060ebbecb665af16dc.tar.gz |
meson: Require a more recent version
We require Meson 0.48, which is borderline prehistoric, but in our CI
pipeline we use 0.49.
Let's use a version of Meson that has been released in more recent
times, without necessarily going to bleeding edge territory.
-rwxr-xr-x | .gitlab-ci/test-docker-meson.sh | 2 | ||||
-rw-r--r-- | docs/reference/meson.build | 6 | ||||
-rw-r--r-- | gdk/wayland/meson.build | 2 | ||||
-rw-r--r-- | gtk/meson.build | 2 | ||||
-rw-r--r-- | meson.build | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/.gitlab-ci/test-docker-meson.sh b/.gitlab-ci/test-docker-meson.sh index a116839a9d..bb9dbfb311 100755 --- a/.gitlab-ci/test-docker-meson.sh +++ b/.gitlab-ci/test-docker-meson.sh @@ -7,7 +7,7 @@ export CCACHE_BASEDIR="$(pwd)" export CCACHE_DIR="${CCACHE_BASEDIR}/_ccache" export PATH="${HOME}/.local/bin:${PATH}" -python3 -m pip install --user meson==0.49.2 +python3 -m pip install --user meson==0.56.2 meson \ -Dinstalled_tests=true \ diff --git a/docs/reference/meson.build b/docs/reference/meson.build index 2e28fba4a8..d8c6fa9b5d 100644 --- a/docs/reference/meson.build +++ b/docs/reference/meson.build @@ -1,11 +1,11 @@ if get_option('gtk_doc') - glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix') + glib_prefix = dependency('glib-2.0').get_variable(pkgconfig: 'prefix') glib_docpath = join_paths(glib_prefix, 'share', 'gtk-doc', 'html') - cairo_prefix = dependency('cairo-gobject').get_pkgconfig_variable('prefix') + cairo_prefix = dependency('cairo-gobject').get_variable(pkgconfig: 'prefix') cairo_docpath = join_paths(cairo_prefix, 'share', 'gtk-doc', 'html', 'cairo') - gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_pkgconfig_variable('prefix') + gdkpixbuf_prefix = dependency('gdk-pixbuf-2.0').get_variable(pkgconfig: 'prefix') gdkpixbuf_docpath = join_paths(gdkpixbuf_prefix, 'share', 'gtk-doc', 'html', 'gdk-pixbuf') docpath = join_paths(gtk_datadir, 'gtk-doc', 'html') diff --git a/gdk/wayland/meson.build b/gdk/wayland/meson.build index e66afd7f95..25adcd0b76 100644 --- a/gdk/wayland/meson.build +++ b/gdk/wayland/meson.build @@ -36,7 +36,7 @@ gdk_wayland_deps = [ ] # wayland protocols -proto_dir = dependency('wayland-protocols').get_pkgconfig_variable('pkgdatadir') +proto_dir = dependency('wayland-protocols').get_variable(pkgconfig: 'pkgdatadir') assert(proto_dir != '', 'Could not get pkgdatadir from wayland-protocols.pc') wayland_scanner = find_program('wayland-scanner') diff --git a/gtk/meson.build b/gtk/meson.build index 9754686cca..7a5f5e5b87 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -847,7 +847,7 @@ gtk_deps = [ ] if x11_enabled - x11_data_prefix = dependency('x11').get_pkgconfig_variable('prefix') + x11_data_prefix = dependency('x11').get_variable(pkgconfig: 'prefix') gtk_cargs += [ '-DX11_DATA_PREFIX="@0@"'.format(x11_data_prefix), ] gtk_sources += gtk_use_x11_sources diff --git a/meson.build b/meson.build index 82123e7a61..8c8b722d0e 100644 --- a/meson.build +++ b/meson.build @@ -4,7 +4,7 @@ project('gtk+-3.0', 'c', 'buildtype=debugoptimized', 'warning_level=1' ], - meson_version : '>= 0.48.0', + meson_version : '>= 0.56.2', license: 'LGPLv2.1+') glib_major_req = 2 @@ -494,7 +494,7 @@ if tracker3_enabled endif if iso_codes_dep.found() - cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_pkgconfig_variable('prefix')) + cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) else cdata.set_quoted('ISO_CODES_PREFIX', get_option('prefix')) endif |