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

[Xavier Claessens <xclaesse src gnome org>]

commit 8c6ec7615ce728d82cb6ff838f5785ac5123becc
Merge: fc7b8e84a 34a3ba72c
Author: Xavier Claessens <xclaesse gmail com>
Date:   Fri Oct 19 13:37:17 2018 +0000

    Merge branch '1543-glib-2-58-backports' into 'glib-2-58'
    
    Resolve "Backport recent Meson/pkg-config/test fixes to glib-2-58"
    
    See merge request GNOME/glib!392

 README.win32                                       |   3 +-
 configure.ac                                       |  19 +--
 docs/reference/gio/gdbus-codegen.xml               |   4 +-
 docs/reference/gio/gio.xml                         |   4 +-
 docs/reference/gio/meson.build                     |   4 +-
 docs/reference/glib/cross.xml                      |   4 +-
 docs/reference/glib/meson.build                    |   1 -
 docs/reference/gobject/glib-mkenums.xml            |   4 +-
 docs/reference/gobject/meson.build                 |   2 +-
 gio-2.0.pc.in                                      |   4 +-
 gio/Makefile.am                                    |   1 +
 gio/completion/gio                                 |   0
 gio/gdbus-2.0/codegen/codegen_main.py              |   0
 gio/gdbusconnection.c                              |   2 +-
 gio/gfileinfo-priv.h                               |   2 +
 gio/gfileinfo.c                                    |   2 +
 gio/gfileinfo.h                                    |  27 ++++
 gio/gio-tool.c                                     |   2 +-
 gio/glocalfileinfo.c                               |   6 +
 gio/gunionvolumemonitor.c                          |   2 +-
 gio/meson.build                                    |  17 ++-
 .../usr/applications/org.gnome.clocks.desktop      |   0
 gio/tests/g-file-info.c                            | 125 ++++++++++++++-----
 gio/tests/gdbus-object-manager-example/meson.build |   5 +-
 gio/tests/gdbus-serialization.c                    |   2 +
 gio/tests/gdbus-tests.c                            |   2 +
 gio/tests/meson.build                              |  98 ++++++++++-----
 gio/tests/modules/meson.build                      |  14 ++-
 gio/tests/modules/test-module-a.c                  |   2 +
 gio/tests/modules/test-module-b.c                  |   2 +
 gio/tests/readwrite.c                              |   3 +
 glib.mk                                            |   1 -
 glib/Makefile.am                                   |  27 ++--
 glib/gbookmarkfile.c                               |   4 +-
 glib/gnulib/vasnprintf.c                           |   2 +
 glib/gscanner.c                                    |   5 -
 glib/gspawn.c                                      |   3 +
 glib/gstdio-private.c                              |  77 ++++++++++++
 glib/gstdio.c                                      |  68 ++++++-----
 glib/{gtester-report => gtester-report.in}         |   8 +-
 glib/gtester.c                                     |   2 +-
 glib/meson.build                                   |  31 ++++-
 glib/tests/fileutils.c                             | 136 +++++++++++++++++++++
 glib/tests/meson.build                             |  20 ++-
 gobject/gobject-query.c                            |   2 +-
 gobject/tests/meson.build                          |   5 +-
 gthread/meson.build                                |   2 +
 m4macros/glib-2.0.m4                               |  33 ++---
 m4macros/gsettings.m4                              |  14 ++-
 meson.build                                        |  74 +++++++----
 template-tap.test.in                               |   4 +
 tests/Makefile.am                                  |   2 +-
 tests/{cxx-test.C => cxx-test.cpp}                 |   0
 tests/gio-test.c                                   |  25 ++--
 tests/gobject/Makefile.am                          |   8 +-
 tests/gobject/meson.build                          | 108 +++++++++-------
 tests/mapping-test.c                               |   5 +
 tests/meson.build                                  | 135 ++++++++++++++++++++
 tests/refcount/meson.build                         |  77 ++++++++----
 tests/type-test.c                                  |  14 ++-
 tests/unicode-encoding.c                           |   2 +
 61 files changed, 957 insertions(+), 300 deletions(-)
---