[pango: 4/4] Merge branch 'fix-deadlocks' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 1fedc11aa03d95e4e365f01796ecceca8b0acd0e
Merge: 379f38e0 3aab7d85
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Mar 31 20:39:20 2021 +0000

    Merge branch 'fix-deadlocks' into 'master'
    
    Fix deadlocks
    
    See merge request GNOME/pango!310

 meson.build                  |   2 +-
 pango/pango-attributes.h     |  36 +++++++++++-
 pango/pango-layout.c         |  12 ++++
 pango/pango-renderer.c       | 128 +++++++++++++++++++++++++++++++++++++++++++
 pango/pango-renderer.h       |  34 +++++++++++-
 pango/pango-version-macros.h |  24 ++++++++
 pango/pangocairo-render.c    |  84 ++++++++++++++++++++++++++++
 pango/pangofc-fontmap.c      |   3 +-
 8 files changed, 317 insertions(+), 6 deletions(-)
---