[bijiben/wip/inigomartinez/meson: 6/6] build: Raise glib version requirement

[Iñigo Martínez <inigomartinez src gnome org>]

commit db2b9a4ad4b69c744765963d46f9425c8c6c9acb
Author: Iñigo Martínez <inigomartinez gmail com>
Date:   Wed Sep 6 20:17:21 2017 +0200

    build: Raise glib version requirement
    
    bijiben uses glib-genmarshal to generate marshalers for libbiji.
    This patch raises glib version requirement to use a recent
    glib-genmarshal that supports the necessary options.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=787381

 meson.build             |    2 +-
 src/libbiji/meson.build |   39 +++------------------------------------
 2 files changed, 4 insertions(+), 37 deletions(-)
---
diff --git a/meson.build b/meson.build
index a98e246..c91c8df 100644
--- a/meson.build
+++ b/meson.build
@@ -113,7 +113,7 @@ bijiben_deps = [
   libgd_dep,
   tracker_sparql_dep,
   dependency('gio-unix-2.0'),
-  dependency('glib-2.0', version: '>= 2.28'),
+  dependency('glib-2.0', version: '>= 2.53.4'),
   dependency('goa-1.0'),
   dependency('gtk+-3.0', version: '>= 3.11.4'),
   dependency('libecal-1.2', version: '>= 3.13.90'),
diff --git a/src/libbiji/meson.build b/src/libbiji/meson.build
index b5c1931..8f6ebc5 100644
--- a/src/libbiji/meson.build
+++ b/src/libbiji/meson.build
@@ -26,46 +26,13 @@ sources = files(
   'biji-zeitgeist.c'
 )
 
-'''
+marshalers = 'biji-marshalers'
+
 sources += gnome.genmarshal(
   marshalers,
   sources: marshalers + '.list',
   prefix: '_biji_marshal'
 )
-'''
-
-# FIXME: workaround for meson's marshalers generation
-glib_genmarshal = find_program('glib-genmarshal')
-marshalers = 'biji-marshalers'
-
-marshalers_h = custom_target(
-  marshalers + '.h',
-  output: marshalers + '.h',
-  input: marshalers + '.list',
-  command: [
-    glib_genmarshal,
-    '--prefix=_biji_marshal',
-    '--output=@OUTPUT@',
-    '--quiet',
-    '--header',
-    '@INPUT@'
-  ]
-)
-
-marshalers_c = custom_target(
-  marshalers + '.c',
-  output: marshalers + '.c',
-  input: marshalers + '.list',
-  command: [
-    glib_genmarshal,
-    '--prefix=_biji_marshal',
-    '--include-header=' + marshalers_h.full_path(),
-    '--output=@OUTPUT@',
-    '--quiet',
-    '--body',
-    '@INPUT@'
-  ]
-)
 
 cflags = []
 if enable_zeitgeist
@@ -74,7 +41,7 @@ endif
 
 libbiji = static_library(
   'biji',
-  sources: sources + [marshalers_c, marshalers_h],
+  sources: sources,
   include_directories: top_inc,
   dependencies: bijiben_deps,
   c_args: cflags