[glib/glib-2-58: 6/6] Merge branch 'glib-2-58-backports' into 'glib-2-58'

[Emmanuele Bassi <ebassi src gnome org>]

commit 5e9c2a58b9a1aa3137ecc2ae97d4e0d400763fdc
Merge: 7086baebe d62f7cb67
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Wed Sep 5 10:10:55 2018 +0000

    Merge branch 'glib-2-58-backports' into 'glib-2-58'
    
    GLib 2.58 backports of various small patches
    
    See merge request GNOME/glib!298

 gio/gnetworkmonitorportal.c     |  7 +------
 gio/kqueue/gkqueuefilemonitor.c |  4 ++--
 glib/gspawn.c                   |  4 ++--
 meson.build                     | 16 ++++++++--------
 4 files changed, 13 insertions(+), 18 deletions(-)
---