[pango/fontsetsimple] Make PangoFontsetSimple available again

[Matthias Clasen <matthiasc src gnome org>]

commit 8a408d4f25ddb0e3d6020cdde0cd8f8a19ee8db2
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Sep 3 07:15:09 2019 -0400

    Make PangoFontsetSimple available again
    
    Turns out some bindings depend on this, even
    though it is not used in pango and not practically
    useful. Bring it back as deprecated API.
    
    Closes: https://gitlab.gnome.org/GNOME/pango/issues/417

 pango/pango-fontset-private.h | 37 -------------------------------------
 pango/pango-fontset.h         | 33 +++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+), 37 deletions(-)
---
diff --git a/pango/pango-fontset-private.h b/pango/pango-fontset-private.h
index a7d71564..717af7d2 100644
--- a/pango/pango-fontset-private.h
+++ b/pango/pango-fontset-private.h
@@ -30,43 +30,6 @@
 
 G_BEGIN_DECLS
 
-
-/*
- * PangoFontsetSimple
- */
-
-/**
- * PANGO_TYPE_FONTSET_SIMPLE:
- *
- * The #GObject type for #PangoFontsetSimple.
- */
-/**
- * PangoFontsetSimple:
- *
- * #PangoFontsetSimple is a implementation of the abstract
- * #PangoFontset base class in terms of an array of fonts,
- * which the creator provides when constructing the
- * #PangoFontsetSimple.
- */
-#define PANGO_TYPE_FONTSET_SIMPLE       (pango_fontset_simple_get_type ())
-#define PANGO_FONTSET_SIMPLE(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONTSET_SIMPLE, 
PangoFontsetSimple))
-#define PANGO_IS_FONTSET_SIMPLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONTSET_SIMPLE))
-
-typedef struct _PangoFontsetSimple  PangoFontsetSimple;
-typedef struct _PangoFontsetSimpleClass  PangoFontsetSimpleClass;
-
-PANGO_AVAILABLE_IN_ALL
-GType pango_fontset_simple_get_type (void) G_GNUC_CONST;
-
-PANGO_AVAILABLE_IN_ALL
-PangoFontsetSimple * pango_fontset_simple_new    (PangoLanguage      *language);
-PANGO_AVAILABLE_IN_ALL
-void                 pango_fontset_simple_append (PangoFontsetSimple *fontset,
-                                                 PangoFont          *font);
-PANGO_AVAILABLE_IN_ALL
-int                  pango_fontset_simple_size   (PangoFontsetSimple *fontset);
-
-
 G_END_DECLS
 
 #endif /* __PANGO_FONTSET_PRIVATE_H__ */
diff --git a/pango/pango-fontset.h b/pango/pango-fontset.h
index fed3e744..4f2590b5 100644
--- a/pango/pango-fontset.h
+++ b/pango/pango-fontset.h
@@ -124,6 +124,38 @@ struct _PangoFontsetClass
   void (*_pango_reserved4) (void);
 };
 
+/**
+ * PANGO_TYPE_FONTSET_SIMPLE:
+ *
+ * The #GObject type for #PangoFontsetSimple.
+ */
+/**
+ * PangoFontsetSimple:
+ *
+ * #PangoFontsetSimple is a implementation of the abstract
+ * #PangoFontset base class in terms of an array of fonts,
+ * which the creator provides when constructing the
+ * #PangoFontsetSimple.
+ */
+#define PANGO_TYPE_FONTSET_SIMPLE       (pango_fontset_simple_get_type ())
+#define PANGO_FONTSET_SIMPLE(object)    (G_TYPE_CHECK_INSTANCE_CAST ((object), PANGO_TYPE_FONTSET_SIMPLE, 
PangoFontsetSimple))
+#define PANGO_IS_FONTSET_SIMPLE(object) (G_TYPE_CHECK_INSTANCE_TYPE ((object), PANGO_TYPE_FONTSET_SIMPLE))
+
+typedef struct _PangoFontsetSimple  PangoFontsetSimple;
+typedef struct _PangoFontsetSimpleClass  PangoFontsetSimpleClass;
+
+
+PANGO_DEPRECATED_IN_1_44
+GType pango_fontset_simple_get_type (void) G_GNUC_CONST;
+
+PANGO_DEPRECATED_IN_1_44
+PangoFontsetSimple * pango_fontset_simple_new    (PangoLanguage      *language);
+PANGO_DEPRECATED_IN_1_44
+void                 pango_fontset_simple_append (PangoFontsetSimple *fontset,
+                                                  PangoFont          *font);
+PANGO_DEPRECATED_IN_1_44
+int                  pango_fontset_simple_size   (PangoFontsetSimple *fontset);
+
 #endif  /* PANGO_DISABLE_DEPRECATED */
 
 
@@ -138,6 +170,7 @@ void              pango_fontset_foreach     (PangoFontset           *fontset,
                                             gpointer                data);
 
 
+
 G_END_DECLS
 
 #endif /* __PANGO_FONTSET_H__ */