[pango: 2/2] Merge branch 'revert-1fedc11a' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit 80dbd6ea6f37793109b0ab5bfd43bac811810481
Merge: 1fedc11a cc8ac2a1
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Mar 31 21:07:40 2021 +0000

    Merge branch 'revert-1fedc11a' into 'master'
    
    Revert "Merge branch 'fix-deadlocks' into 'master'"
    
    See merge request GNOME/pango!311

 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, 6 insertions(+), 317 deletions(-)
---