[dia: 77/105] #19: Fix build issue where glib-genmarshal did not support "--output".

[Zander <zbrown src gnome org>]

commit 79da373029bf4bd7c99a6cb422dc8b6a792421f1
Author: Eduard Nicodei <eddnicodei gmail com>
Date:   Sun Jan 13 18:08:58 2019 -0500

    #19: Fix build issue where glib-genmarshal did not support "--output".
    
      - Also bump main library version numbers to be the same as those on
        Debian 9.  This is hopefully conservative enough be available on
        most platforms but new enough so that we do not have to support
        legacy versions.
      - Also add minor comments and formatting.

 lib/meson.build | 16 +++++++++-------
 meson.build     | 12 +++++++-----
 2 files changed, 16 insertions(+), 12 deletions(-)
---
diff --git a/lib/meson.build b/lib/meson.build
index 73a36adc..4ed156ae 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -96,27 +96,29 @@ libdia_sources = stdprop_sources + [
     'diacellrendererproperty.c',
 ]
 
+# Note glib-genmarshal supports --output argument, but only after version 2.53.2
 glib_genmarshal = find_program('glib-genmarshal')
 diamarshal_c = custom_target(
     'diamarshal.c',
     input : 'diamarshal.list',
     output : 'diamarshal.c',
+    capture : true,
     command : [ glib_genmarshal,
-                '--prefix=dia_marshal',
-                '--include-header', 'diamarshal.h',
-                '--output', '@OUTPUT@',
                 '--body',
-                '@INPUT@'])
+                '--prefix=dia_marshal',
+                '@INPUT@' ]
+)
 
 diamarshal_h = custom_target(
     'diamarshal.h',
     input : 'diamarshal.list',
     output : 'diamarshal.h',
+    capture : true,
     command : [ glib_genmarshal,
-                '--prefix=dia_marshal',
-                '--output', '@OUTPUT@',
                 '--header',
-                '@INPUT@'])
+                '--prefix=dia_marshal',
+                '@INPUT@' ]
+)
 
 subdir('pixmaps')
 
diff --git a/meson.build b/meson.build
index d16f7291..535b657a 100644
--- a/meson.build
+++ b/meson.build
@@ -9,11 +9,9 @@ project('dia',
 cc = meson.get_compiler('c')
 conf = configuration_data()
 
-#GTK_MODULES="gtk+-2.0 >= 2.16.0 glib-2.0 >= 2.20.0 libxml-2.0 gdk-pixbuf-2.0 gthread-2.0 gmodule-2.0"
-libgtk_dep  = dependency('gtk+-2.0', version : '>= 2.16.0')
-libglib_dep = dependency('glib-2.0', version : '>= 2.20.0')
-libxml_dep  = dependency('libxml-2.0', version : '>= 2.6.27')
-
+libglib_dep = dependency('glib-2.0', version : '>= 2.50.3')
+libgtk_dep  = dependency('gtk+-2.0', version : '>= 2.24.31')
+libxml_dep  = dependency('libxml-2.0', version : '>= 2.9.4')
 #TODO: what are the minimum versions?
 gmodule_dep = dependency('gmodule-2.0')
 libzlib_dep = dependency('zlib')
@@ -21,12 +19,16 @@ libcairo_dep = dependency('cairo')
 #TODO: this will become a hard dependency as part of GTK3 port.
 # Therefore, remove all references to HAVE_CAIRO
 conf.set('HAVE_CAIRO', 1)
+
 libm_dep = cc.find_library('m')
+
+# This is needed for some platforms (eg. BSD).
 libc_dep = cc.find_library('c', required : false)
 
 # Optional deps
 freetype_dep = dependency('freetype2', version: ['>= 11.0.5', '< 22.0.0'], required: false)
 conf.set('HAVE_FREETYPE', freetype_dep.found())
+# TODO: Until issue #23 is fixed, we need to keep version below 0.62.
 libpoppler_dep = dependency('poppler', version: '<= 0.62.0', required: false)
 conf.set('HAVE_POPPLER', libpoppler_dep.found())
 libemf_dep = cc.find_library('emf', required: false)