[pango/wip/smcv/use-g-test-skip-again: 44/44] Merge branch 'master' into 'wip/smcv/use-g-test-skip-again'

[Matthias Clasen <matthiasc src gnome org>]

commit f9a796053cdc2070c99084be6c74da06d3a3b50d
Merge: 89f75b0b ce3ff350
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jan 4 01:08:41 2021 +0000

    Merge branch 'master' into 'wip/smcv/use-g-test-skip-again'
    
    # Conflicts:
    #   meson.build

 .gitlab-ci.yml               | 39 +++++++++++++++++++++++-----
 .gitlab-ci/fedora.Dockerfile |  2 +-
 NEWS                         | 14 ++++++++++
 make-release.sh              |  6 ++---
 meson.build                  | 62 +++++++++++++++++++++++++++++---------------
 meson_options.txt            |  5 ++--
 pango/meson.build            |  8 +++++-
 pango/pangofc-font.c         |  2 +-
 pango/pangofc-fontmap.c      | 27 ++++++++++++++++---
 pango/pangoft2.h             |  3 ++-
 pango/pangoxft.h             |  3 ++-
 pango/shape.c                | 23 +++++++++++++---
 subprojects/cairo.wrap       |  6 +++++
 subprojects/freetype2.wrap   | 16 ++++--------
 tests/gen-all-unicode.py     |  2 ++
 tests/gen-installed-test.py  |  2 ++
 tests/meson.build            |  6 ++---
 tests/test-shape.c           |  6 ++---
 18 files changed, 168 insertions(+), 64 deletions(-)
---