[pango: 5/5] Merge branch 'matthiasc/for-main' into 'main'

[Matthias Clasen <matthiasc src gnome org>]

commit a042d311c8e6f5fbb82c52a24a47831674dff9e7
Merge: 07c91f9b 8fa7b37a
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Dec 25 15:01:17 2021 +0000

    Merge branch 'matthiasc/for-main' into 'main'
    
    tracing: Fix the defines
    
    Closes #648
    
    See merge request GNOME/pango!565

 pango/itemize.c             |  8 +++++---
 pango/meson.build           |  1 +
 pango/pango-trace-private.h |  4 ++--
 pango/pangofc-fontmap.c     | 24 ++++++++++++++++++------
 tests/meson.build           | 14 ++++++++++++++
 5 files changed, 40 insertions(+), 11 deletions(-)
---