[gtk: 7/7] Merge branch 'wip/otte/build' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 94eb3d7ac07ea0fc1858b685cb2ec6b0bfabe1f6
Merge: 3883a98771 0ae2acfb1a
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Jul 20 18:25:59 2021 +0000

    Merge branch 'wip/otte/build' into 'master'
    
    Streamline build configuration
    
    See merge request GNOME/gtk!3391

 .gitlab-ci.yml            |  1 +
 .gitlab-ci/test-docker.sh |  2 +-
 .gitlab-ci/test-msvc.bat  |  2 +-
 config.h.meson            |  3 ---
 gdk/x11/gdkdisplay-x11.c  | 22 ----------------
 gdk/x11/gdkdisplay-x11.h  |  2 --
 gdk/x11/gdkdrag-x11.c     | 27 --------------------
 gdk/x11/gdkdrop-x11.c     |  3 ---
 gdk/x11/gdksurface-x11.c  |  8 ------
 gdk/x11/meson.build       |  1 -
 gtk/meson.build           | 30 +++++++++++-----------
 meson.build               | 64 ++++++++++++++++++++---------------------------
 meson_options.txt         | 22 ++++++----------
 13 files changed, 53 insertions(+), 134 deletions(-)
---