[pango: 3/3] Merge branch 'ebassi/gir-fixes' into 'master'

[Matthias Clasen <matthiasc src gnome org>]

commit b2b39ba72148d65409db71ab96e2b095e065c48f
Merge: 4b5e25a2 bf767265
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jun 10 21:06:06 2020 +0000

    Merge branch 'ebassi/gir-fixes' into 'master'
    
    Ebassi/gir fixes
    
    See merge request GNOME/pango!199

 pango/meson.build       | 10 +++++-----
 pango/pango-ot.h        | 23 ++++++++++++++++++++++-
 pango/pangocairo-fc.h   |  6 ++++++
 pango/pangocairo.h      | 24 +++++++++++++++++++++---
 pango/pangofc-decoder.h | 22 +++++++++++++++-------
 pango/pangofc-font.h    |  6 ++++++
 pango/pangofc-fontmap.h |  6 ++++++
 pango/pangoft2.h        | 12 +++++++++++-
 pango/pangoxft-font.c   | 12 ++++++------
 pango/pangoxft-render.h |  9 +++++++++
 pango/pangoxft.h        | 31 ++++++++++++++++++++++++++-----
 11 files changed, 133 insertions(+), 28 deletions(-)
---