matteo
/
malcontent
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

build: Bump Meson dependency to 0.57.0 

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 <pwithnall@endlessos.org>
This commit is contained in:
Philip Withnall 2022-07-13 15:18:38 +01:00
parent a732fd418d
commit 0bbdb242a0
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci/debian-unstable.Dockerfile
View File

@ -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 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 ARG HOST_USER_ID=5555
ENV HOST_USER_ID ${HOST_USER_ID} ENV HOST_USER_ID ${HOST_USER_ID}

2
libmalcontent-ui/meson.build
View File

@ -85,7 +85,7 @@ libmalcontent_ui_gir = gnome.generate_gir(libmalcontent_ui,
xmllint = find_program('xmllint', required: false) xmllint = find_program('xmllint', required: false)
if xmllint.found() if xmllint.found()
gtk_prefix = dependency('gtk+-3.0').get_pkgconfig_variable('prefix') gtk_prefix = dependency('gtk+-3.0').get_variable(pkgconfig: 'prefix')
test( test(
'validate-ui', xmllint, 'validate-ui', xmllint,
args: [ args: [

2
malcontent-control/meson.build
View File

@ -78,7 +78,7 @@ endif
xmllint = find_program('xmllint', required: false) xmllint = find_program('xmllint', required: false)
if xmllint.found() if xmllint.found()
gtk_prefix = dependency('gtk+-3.0').get_pkgconfig_variable('prefix') gtk_prefix = dependency('gtk+-3.0').get_variable(pkgconfig: 'prefix')
test( test(
'validate-ui', xmllint, 'validate-ui', xmllint,
args: [ args: [

10
meson.build
View File

@ -1,6 +1,6 @@
project('malcontent', 'c', project('malcontent', 'c',
version : '0.10.5', 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'], license: ['LGPL-2.1-or-later', 'GPL-2.0-or-later'],
default_options : [ default_options : [
'buildtype=debugoptimized', 'buildtype=debugoptimized',
@ -34,12 +34,12 @@ if pamlibdir == ''
endif endif
dbus = dependency('dbus-1') dbus = dependency('dbus-1')
dbusinterfacesdir = dbus.get_pkgconfig_variable('interfaces_dir', dbusinterfacesdir = dbus.get_variable(pkgconfig: 'interfaces_dir',
define_variable: ['datadir', datadir]) pkgconfig_define: ['datadir', datadir])
polkit_gobject = dependency('polkit-gobject-1') polkit_gobject = dependency('polkit-gobject-1')
polkitpolicydir = polkit_gobject.get_pkgconfig_variable('policydir', polkitpolicydir = polkit_gobject.get_variable(pkgconfig: 'policydir',
define_variable: ['prefix', prefix]) pkgconfig_define: ['prefix', prefix])
config_h = configuration_data() config_h = configuration_data()
config_h.set_quoted('GETTEXT_PACKAGE', 'malcontent') config_h.set_quoted('GETTEXT_PACKAGE', 'malcontent')