[glib: 4/4] Merge branch 'macosx-objc' into 'master'

[Xavier Claessens <xclaesse src gnome org>]

commit 8f2d68da658831a443f08cb8bc181d615a5095fe
Merge: 534e93950 c627fb492
Author: Xavier Claessens <xclaesse gmail com>
Date:   Fri May 25 03:13:38 2018 +0000

    Merge branch 'macosx-objc' into 'master'
    
    Macosx fixes
    
    Closes #528 and #1381
    
    See merge request GNOME/glib!3

 gio/Makefile.am                                    | 25 +++++++--
 ...cationbackend.c => gcocoanotificationbackend.m} |  0
 ...ettingsbackend.c => gnextstepsettingsbackend.m} |  0
 gio/{gosxappinfo.c => gosxappinfo.m}               |  0
 gio/{gosxcontenttype.c => gosxcontenttype.m}       |  0
 gio/meson.build                                    | 20 ++++----
 meson.build                                        | 60 +++++++++++++---------
 7 files changed, 66 insertions(+), 39 deletions(-)
---