[planner: 37/61] build: Pass GLIB_VERSION_{MIN, MAX}_REQUIRED for compilation




commit 6c1af2add69f2924ef92906a67d06edce374f6a7
Author: Mart Raudsepp <leio gentoo org>
Date:   Sun Dec 27 17:09:53 2020 +0200

    build: Pass GLIB_VERSION_{MIN,MAX}_REQUIRED for compilation
    
    This removes deprecation warnings added in newer glib than we currently
    require. There is plenty to modernize without caring for the newest
    glib deprecations for now.

 meson.build | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
---
diff --git a/meson.build b/meson.build
index dfe6883a..03fcd1d8 100644
--- a/meson.build
+++ b/meson.build
@@ -41,9 +41,11 @@ configure_file(
 toplevel_inc = include_directories('.')
 libplanner_inc = include_directories('libplanner')
 
+glib_req_version = '2.50'
+glib_req = '>= @0@'.format(glib_req_version)
 eds_req = '>= 3.6'
 
-glib_dep = dependency('glib-2.0', version: '>= 2.50.0')
+glib_dep = dependency('glib-2.0', version: glib_req)
 gmodule_dep = dependency('gmodule-2.0')
 gobject_dep = dependency('gobject-2.0')
 gio_dep = dependency('gobject-2.0')
@@ -68,6 +70,15 @@ libeds_dep = dependency('libebook-1.2', version: eds_req, required: get_option('
 libplanner_deps = [glib_dep, gmodule_dep, gobject_dep, libxml_dep, m_dep]
 planner_deps = [glib_dep, gobject_dep, gmodule_dep, gio_dep, gtk_dep, gnomecanvas_dep]
 
+glib_version_arr = glib_req_version.split('.')
+glib_major_version = glib_version_arr[0]
+glib_minor_version = glib_version_arr[1]
+
+add_project_arguments([
+  '-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_@0@_@1@'.format(glib_major_version, glib_minor_version),
+  '-DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_@0@_@1@'.format(glib_major_version, glib_minor_version),
+], language: 'c')
+
 subdir('po')
 subdir('libplanner')
 subdir('data')


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]