From ca42b09c3dea390cf6e4091a969a3245d164fc32 Mon Sep 17 00:00:00 2001 From: "Martin Koch, ESE GmbH" <martin.koch@ese.de> Date: Mon, 15 Jun 2020 09:20:38 +0200 Subject: [PATCH] Add version requirement >= 2.60 for the GLib family of libraries - due to usage of Reference-counted-data in lib/wptoml/array.cpp (requires >= 2.58, see https://developer.gnome.org/glib/stable/glib-Reference-counted-data.html) - and usage of G_GNUC_FALLTHROUGH in lib/wp/object-interest.c (requires 2.60, see https://developer.gnome.org/glib/stable/glib-Miscellaneous-Macros.html#G-GNUC-FALLTHROUGH:CAPS) Signed-off-by: Martin Koch, ESE GmbH <martin.koch@ese.de> --- meson.build | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meson.build b/meson.build index 52a6922f..668ca520 100644 --- a/meson.build +++ b/meson.build @@ -30,10 +30,10 @@ cmake = import('cmake') cpptoml = cmake.subproject('cpptoml') cpptoml_dep = cpptoml.dependency('cpptoml') -gobject_dep = dependency('gobject-2.0') -gmodule_dep = dependency('gmodule-2.0') -gio_dep = dependency('gio-2.0') -giounix_dep = dependency('gio-unix-2.0') +gobject_dep = dependency('gobject-2.0', version : '>= 2.60') +gmodule_dep = dependency('gmodule-2.0', version : '== ' + gobject_dep.version()) +gio_dep = dependency('gio-2.0', version : '== ' + gobject_dep.version()) +giounix_dep = dependency('gio-unix-2.0', version : '== ' + gobject_dep.version()) pipewire_dep = dependency('libpipewire-0.3') gnome = import('gnome') -- GitLab