[gtk: 6/6] Merge branch 'wip/lantw/improve-freebsd-build-and-fix-warnings' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 9178f7406768ae11280eaf1f8ff523711de572b1
Merge: e6deaa3a85 43a7f36993
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Apr 23 02:40:00 2018 +0000

    Merge branch 'wip/lantw/improve-freebsd-build-and-fix-warnings' into 'master'
    
    Improve meson.build for FreeBSD and reduce the number of warnings during compilation
    
    See merge request GNOME/gtk!123

 demos/gtk-demo/spinbutton.c            |  6 ++---
 gtk/gtkcssfontfeaturesvalueprivate.h   |  2 +-
 gtk/gtkcssfontvariationsvalueprivate.h |  2 +-
 gtk/gtkimcontextxim.c                  |  1 -
 meson.build                            | 45 +++++++++++++++++++++-------------
 meson_options.txt                      |  4 +--
 tests/meson.build                      |  2 +-
 tests/testgtk.c                        |  6 ++---
 8 files changed, 39 insertions(+), 29 deletions(-)
---