From f7185ea70ee3949d0f7c59730596253f0ba857d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Tue, 19 May 2020 10:44:59 +0200 Subject: [PATCH] build: Specifify glib versions This avoids deprecation warnings due to GTimeVal used in libebook-contacts.h See https://tecnocode.co.uk/2019/08/24/gtimeval-deprecation-in-glib-2-61-2/ It's already fixed in newer eds so we can drop this once we move to a newer stack. --- meson.build | 5 +++++ src/meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/meson.build b/meson.build index faade21..383750a 100644 --- a/meson.build +++ b/meson.build @@ -58,6 +58,11 @@ config_data.set_quoted('PACKAGE_URL', calls_homepage) config_data.set_quoted('PACKAGE_VERSION', calls_version) config_data.set('PACKAGE_URL_RAW', calls_homepage) +add_project_arguments([ + '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_58', + '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_60', +], language: 'c') + subdir('po') subdir('src') subdir('plugins') diff --git a/src/meson.build b/src/meson.build index 82ab3ae..a7f708c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -28,7 +28,7 @@ gnome = import('gnome') src_include = include_directories('.') calls_includes = [ top_include, src_include ] -calls_deps = [ dependency('gobject-2.0'), +calls_deps = [ dependency('gobject-2.0', version: '>= 2.58'), dependency('gtk+-3.0'), dependency('libhandy-0.0', version: '>= 0.0.12'), dependency('gsound'),