[clutter: 7/7] Merge branch 'build-fix' into 'master'

[Emmanuele Bassi <ebassi src gnome org>]

commit 6dd50fcdf722c6be12c060d3696635b0cdd16221
Merge: a7186d256 c4f593b03
Author: Emmanuele Bassi <ebassi gmail com>
Date:   Sun Mar 15 15:14:22 2020 +0000

    Merge branch 'build-fix' into 'master'
    
    Build fixes
    
    See merge request GNOME/clutter!13

 .gitlab-ci.yml            |  2 +-
 .gitlab-ci/Dockerfile     |  4 +--
 clutter/meson.build       | 63 ++++++++++++++++++++++++++---------------------
 doc/cookbook/meson.build  |  1 -
 meson.build               |  2 +-
 tests/conform/meson.build |  1 -
 6 files changed, 39 insertions(+), 34 deletions(-)
---