From 0bbdb242a0c0328cd14cb10e76ebb810cee2cf65 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 13 Jul 2022 15:18:38 +0100 Subject: [PATCH] build: Bump Meson dependency to 0.57.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This means we can depend on fix 42ba8efaf2 in Meson, which fixes use of `volatile` in the default templates used by `gnome.mkenums_simple()`. This fixes compiler warnings with recent compilers, which are promoted to errors due to `-Werror`. Meson 0.57.0 is available in bullseye-backports in Debian, which means it’s available basically everywhere now. Bumping the dependency required fixing a few deprecations in the `meson.build` files. Signed-off-by: Philip Withnall --- .gitlab-ci/debian-unstable.Dockerfile | 2 +- libmalcontent-ui/meson.build | 2 +- malcontent-control/meson.build | 2 +- meson.build | 10 +++++----- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.gitlab-ci/debian-unstable.Dockerfile b/.gitlab-ci/debian-unstable.Dockerfile index a981b67..717001f 100644 --- a/.gitlab-ci/debian-unstable.Dockerfile +++ b/.gitlab-ci/debian-unstable.Dockerfile @@ -27,7 +27,7 @@ RUN locale-gen C.UTF-8 && /usr/sbin/update-locale LANG=C.UTF-8 ENV LANG=C.UTF-8 LANGUAGE=C.UTF-8 LC_ALL=C.UTF-8 -RUN pip3 install meson==0.54.3 +RUN pip3 install meson==0.57.0 ARG HOST_USER_ID=5555 ENV HOST_USER_ID ${HOST_USER_ID} diff --git a/libmalcontent-ui/meson.build b/libmalcontent-ui/meson.build index 1cfa354..d96ca18 100644 --- a/libmalcontent-ui/meson.build +++ b/libmalcontent-ui/meson.build @@ -85,7 +85,7 @@ libmalcontent_ui_gir = gnome.generate_gir(libmalcontent_ui, xmllint = find_program('xmllint', required: false) if xmllint.found() - gtk_prefix = dependency('gtk+-3.0').get_pkgconfig_variable('prefix') + gtk_prefix = dependency('gtk+-3.0').get_variable(pkgconfig: 'prefix') test( 'validate-ui', xmllint, args: [ diff --git a/malcontent-control/meson.build b/malcontent-control/meson.build index d4ef3c1..9b9bb68 100644 --- a/malcontent-control/meson.build +++ b/malcontent-control/meson.build @@ -78,7 +78,7 @@ endif xmllint = find_program('xmllint', required: false) if xmllint.found() - gtk_prefix = dependency('gtk+-3.0').get_pkgconfig_variable('prefix') + gtk_prefix = dependency('gtk+-3.0').get_variable(pkgconfig: 'prefix') test( 'validate-ui', xmllint, args: [ diff --git a/meson.build b/meson.build index 6bdc156..29a5850 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,6 @@ project('malcontent', 'c', version : '0.10.5', - meson_version : '>= 0.50.0', + meson_version : '>= 0.57.0', license: ['LGPL-2.1-or-later', 'GPL-2.0-or-later'], default_options : [ 'buildtype=debugoptimized', @@ -34,12 +34,12 @@ if pamlibdir == '' endif dbus = dependency('dbus-1') -dbusinterfacesdir = dbus.get_pkgconfig_variable('interfaces_dir', - define_variable: ['datadir', datadir]) +dbusinterfacesdir = dbus.get_variable(pkgconfig: 'interfaces_dir', + pkgconfig_define: ['datadir', datadir]) polkit_gobject = dependency('polkit-gobject-1') -polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', - define_variable: ['prefix', prefix]) +polkitpolicydir = polkit_gobject.get_variable(pkgconfig: 'policydir', + pkgconfig_define: ['prefix', prefix]) config_h = configuration_data() config_h.set_quoted('GETTEXT_PACKAGE', 'malcontent')