[gtk: 4/4] Merge branch 'nirbheek/misc-meson-fixes' into 'master'

[Nirbheek Chauhan <nirbheekc src gnome org>]

commit 185354555c5775d2c2f8c901a12d17b37e373edb
Merge: 29905d1ce6 cfb0df14cc
Author: Nirbheek Chauhan <nirbheek chauhan gmail com>
Date:   Tue Jul 24 08:29:34 2018 +0000

    Merge branch 'nirbheek/misc-meson-fixes' into 'master'
    
    Fix broadway backend build and graphene as a subproject
    
    Closes #1197 and #1218
    
    See merge request GNOME/gtk!265

 gdk/broadway/meson.build    | 24 ++++++++++++------------
 gdk/x11/meson.build         |  2 +-
 meson.build                 | 11 +++++++++--
 subprojects/gdk-pixbuf.wrap |  4 ++--
 subprojects/pango.wrap      |  4 ++--
 5 files changed, 26 insertions(+), 19 deletions(-)
---