From d9e7ec32d6e98d99286557a066e3dacaa3366467 Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Sun, 7 Nov 2021 10:55:08 -0500
Subject: Reshuffle private headers a bit

pango_itemize_with_font belongs into pango-item-private.h.
---
 pango/pango-context-private.h | 10 ----------
 pango/pango-context.c         |  1 +
 pango/pango-item-private.h    | 18 ++++++++++++++----
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/pango/pango-context-private.h b/pango/pango-context-private.h
index d65406e1..71f43b60 100644
--- a/pango/pango-context-private.h
+++ b/pango/pango-context-private.h
@@ -50,16 +50,6 @@ struct _PangoContext
   gboolean round_glyph_positions;
 };
 
-GList *         pango_itemize_with_font (PangoContext               *context,
-                                         PangoDirection              base_dir,
-                                         const char                 *text,
-                                         int                         start_index,
-                                         int                         length,
-                                         PangoAttrList              *attrs,
-                                         PangoAttrIterator          *cached_iter,
-                                         const PangoFontDescription *desc);
-
-
 G_END_DECLS
 
 #endif /* __PANGO_CONTEXT_PRIVATE_H__ */
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 2301138f..d0166d94 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -28,6 +28,7 @@
 #include "pango-impl-utils.h"
 
 #include "pango-font-private.h"
+#include "pango-item-private.h"
 #include "pango-fontset-private.h"
 #include "pango-fontmap-private.h"
 #include "pango-script-private.h"
diff --git a/pango/pango-item-private.h b/pango/pango-item-private.h
index dd3f89fc..e80a3c02 100644
--- a/pango/pango-item-private.h
+++ b/pango/pango-item-private.h
@@ -68,10 +68,20 @@ G_STATIC_ASSERT (offsetof (PangoItem, length) == offsetof (PangoItemPrivate, len
 G_STATIC_ASSERT (offsetof (PangoItem, num_chars) == offsetof (PangoItemPrivate, num_chars));
 G_STATIC_ASSERT (offsetof (PangoItem, analysis) == offsetof (PangoItemPrivate, analysis));
 
-void               pango_analysis_collect_features    (const PangoAnalysis *analysis,
-                                                       hb_feature_t        *features,
-                                                       guint                length,
-                                                       guint               *num_features);
+void               pango_analysis_collect_features    (const PangoAnalysis        *analysis,
+                                                       hb_feature_t               *features,
+                                                       guint                       length,
+                                                       guint                      *num_features);
+
+GList *            pango_itemize_with_font            (PangoContext               *context,
+                                                       PangoDirection              base_dir,
+                                                       const char                 *text,
+                                                       int                         start_index,
+                                                       int                         length,
+                                                       PangoAttrList              *attrs,
+                                                       PangoAttrIterator          *cached_iter,
+                                                       const PangoFontDescription *desc);
+
 
 G_END_DECLS
 
-- 
cgit v1.2.1