[balsa/wip/gtk4: 49/351] Bump glib dependency to 2.54

[Peter Bloomfield <peterb src gnome org>]

commit a4419f122cda511700e96c07cb5ceedb2de78e15
Author: Peter Bloomfield <PeterBloomfield bellsouth net>
Date:   Mon Nov 6 14:57:26 2017 -0500

    Bump glib dependency to 2.54
    
    That guarantees that we have the new glib-gnmarshal, so we can drop the
    conditional code for working with the old version.
    
    Also, we drop the 'languages' argument of gnome.yelp(), as it is
    deprecated; we use a LINGUAS file instead, as recommended.

 doc/meson.build           |    3 +--
 libbalsa/imap/meson.build |   42 +++++-------------------------------------
 libbalsa/meson.build      |   38 +++-----------------------------------
 meson.build               |   14 +-------------
 4 files changed, 10 insertions(+), 87 deletions(-)
---
diff --git a/doc/meson.build b/doc/meson.build
index 1feb9ba..f0e1646 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -61,8 +61,7 @@ HELP_MEDIA   = [
 
 gnome.yelp(HELP_ID,
            sources   : HELP_FILES,
-           media     : HELP_MEDIA,
-           languages : HELP_LINGUAS)
+           media     : HELP_MEDIA)
 
 # Ugly!
 # gnome.yelp needs '--extra : HELP_EXTRA' for included files
diff --git a/libbalsa/imap/meson.build b/libbalsa/imap/meson.build
index fcff957..f5b6712 100644
--- a/libbalsa/imap/meson.build
+++ b/libbalsa/imap/meson.build
@@ -22,46 +22,14 @@ libimap_a_sources = [
   'util.h'
   ]
 
-# genmarshal
-#
-
-if use_gnome_genmarshal
-  libimap_marshal_files = gnome.genmarshal('libimap-marshal',
-                                           prefix  : 'libimap',
-                                           sources : 'libimap-marshal.list')
-else # use_gnome_genmarshal
-  libimap_marshal_h = custom_target('libimap_marshal_h',
-    input   : 'libimap-marshal.list',
-    output  : 'libimap-marshal.h',
-    command : [
-      glib_genmarshal,
-      '--header',
-      '--prefix=libimap',
-      '--output=@OUTPUT@',
-      '@INPUT@'
-    ]
-  )
-
-  libimap_marshal_c = custom_target('libimap_marshal_c',
-    input   : 'libimap-marshal.list',
-    output  : 'libimap-marshal.c',
-    command : [
-      glib_genmarshal,
-      '--header',
-      '--body',
-      '--prefix=libimap',
-      '--output=@OUTPUT@',
-      '@INPUT@'
-    ]
-  )
-
-  libimap_marshal_files = [libimap_marshal_c, libimap_marshal_h]
-endif # use_gnome_genmarshal
+libimap_marshal_files = gnome.genmarshal('libimap-marshal',
+                                         prefix  : 'libimap',
+                                         sources : 'libimap-marshal.list')
 
 libimap_compile_arg = '-ansi'
 libimap_link_arg    = '-lz'
-libimap_compile_dep  = declare_dependency(compile_args : libimap_compile_arg,
-                                          link_args    : libimap_link_arg)
+libimap_compile_dep = declare_dependency(compile_args : libimap_compile_arg,
+                                         link_args    : libimap_link_arg)
 
 libimap_a = static_library('imap', libimap_a_sources, libimap_marshal_files,
                            dependencies        : balsa_deps + [libimap_compile_dep],
diff --git a/libbalsa/meson.build b/libbalsa/meson.build
index e752796..256f774 100644
--- a/libbalsa/meson.build
+++ b/libbalsa/meson.build
@@ -135,41 +135,9 @@ libbalsa_a_sources = [
 
 libbalsa_a_sources += libbalsa_gpgme_extra
 
-# genmarshal
-#
-
-if use_gnome_genmarshal
-  libbalsa_marshal_files = gnome.genmarshal('libbalsa-marshal',
-                                            prefix  : 'libbalsa',
-                                            sources : 'libbalsa-marshal.list')
-else # use_gnome_genmarshal
-  libbalsa_marshal_h = custom_target('libbalsa_marshal_h',
-    input   : 'libbalsa-marshal.list',
-    output  : 'libbalsa-marshal.h',
-    command : [
-      glib_genmarshal,
-      '--header',
-      '--prefix=libbalsa',
-      '--output=@OUTPUT@',
-      '@INPUT@'
-    ]
-  )
-
-  libbalsa_marshal_c = custom_target('libbalsa_marshal_c',
-    input   : 'libbalsa-marshal.list',
-    output  : 'libbalsa-marshal.c',
-    command : [
-      glib_genmarshal,
-      '--header',
-      '--body',
-      '--prefix=libbalsa',
-      '--output=@OUTPUT@',
-      '@INPUT@'
-    ]
-  )
-
-  libbalsa_marshal_files = [libbalsa_marshal_c, libbalsa_marshal_h]
-endif # use_gnome_genmarshal
+libbalsa_marshal_files = gnome.genmarshal('libbalsa-marshal',
+                                          prefix  : 'libbalsa',
+                                          sources : 'libbalsa-marshal.list')
 
 libimap_include = include_directories('imap')
 
diff --git a/meson.build b/meson.build
index d781a92..fe6563f 100644
--- a/meson.build
+++ b/meson.build
@@ -128,7 +128,7 @@ conf.set('TOOLKIT_CATEGORIES', TOOLKIT_CATEGORIES)
 # #####################################################################
 
 # Dependencies for balsa and balsa_ab:
-glib_dep    = dependency('glib-2.0', version : '>= 2.40.0')
+glib_dep    = dependency('glib-2.0', version : '>= 2.54.0')
 gtk_dep     = dependency('gtk+-4.0')
 gmime_dep   = dependency('gmime-2.6')
 gio_dep     = dependency('gio-2.0')
@@ -153,18 +153,6 @@ libnetclient_deps = [glib_dep,
                      gio_dep,
                      gnutls_dep]
 
-# glib-genmarshal
-#
-# If glib is too old, we cannot use gnome.genmarshal
-# because it generates a source file that does not include the header file,
-# which causes an error when compiling with -Wmissing-prototypes and -Werror.
-
-use_gnome_genmarshal = glib_dep.version().version_compare('>= 2.53.4')
-if not use_gnome_genmarshal
-  glib_genmarshal = run_command('pkg-config',
-                                ['--variable=glib_genmarshal', 'glib-2.0']).stdout().strip()
-endif
-
 # Check whether res_init is available
 result = compiler.has_function('res_init', prefix : '#include <resolv.h>')
 if not result