[pango/matthiasc/for-master: 29/30] Adapt deprecations

[Matthias Clasen <matthiasc src gnome org>]

commit f36934d527a320f95643fae6caf3e4fb0b90f692
Author: Matthias Clasen <mclasen redhat com>
Date:   Fri Sep 18 15:26:30 2020 -0400

    Adapt deprecations
    
    Move things around to reflect the fact that we are now
    in 1.47, and use our deprecation macros.

 pango/pangofc-fontmap.h | 8 ++++----
 pango/pangoft2.h        | 4 ++--
 pango/pangoxft.h        | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/pango/pangofc-fontmap.h b/pango/pangofc-fontmap.h
index c20bde60..6fdf32d2 100644
--- a/pango/pangofc-fontmap.h
+++ b/pango/pangofc-fontmap.h
@@ -128,9 +128,9 @@ typedef void (*PangoFcSubstituteFunc) (FcPattern *pattern,
  * the font. This function can be used to do things like set
  * hinting and antialiasing options.
  *
- * Since: 1.46
+ * Since: 1.48
  */
-PANGO_AVAILABLE_IN_1_46
+PANGO_AVAILABLE_IN_1_48
 void pango_fc_font_map_set_default_substitute (PangoFcFontMap        *fontmap,
                                               PangoFcSubstituteFunc func,
                                               gpointer              data,
@@ -146,9 +146,9 @@ void pango_fc_font_map_set_default_substitute (PangoFcFontMap        *fontmap,
  * That is, if your substitution function will return different
  * results for the same input pattern, you must call this function.
  *
- * Since: 1.46
+ * Since: 1.48
  */
-PANGO_AVAILABLE_IN_1_46
+PANGO_AVAILABLE_IN_1_48
 void pango_fc_font_map_substitute_changed (PangoFcFontMap *fontmap);
 
 /**
diff --git a/pango/pangoft2.h b/pango/pangoft2.h
index cda3b51e..892aa039 100644
--- a/pango/pangoft2.h
+++ b/pango/pangoft2.h
@@ -116,12 +116,12 @@ void          pango_ft2_font_map_set_resolution         (PangoFT2FontMap
                                                         double                  dpi_x,
                                                         double                  dpi_y);
 #ifndef PANGO_DISABLE_DEPRECATED
-PANGO_AVAILABLE_IN_1_2
+PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_set_default_substitute)
 void          pango_ft2_font_map_set_default_substitute (PangoFT2FontMap        *fontmap,
                                                         PangoFT2SubstituteFunc  func,
                                                         gpointer                data,
                                                         GDestroyNotify          notify);
-PANGO_AVAILABLE_IN_1_2
+PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_substitute_changed)
 void          pango_ft2_font_map_substitute_changed     (PangoFT2FontMap         *fontmap);
 PANGO_DEPRECATED_IN_1_22_FOR(pango_font_map_create_context)
 PangoContext *pango_ft2_font_map_create_context         (PangoFT2FontMap         *fontmap);
diff --git a/pango/pangoxft.h b/pango/pangoxft.h
index 708629cc..eb17f97c 100644
--- a/pango/pangoxft.h
+++ b/pango/pangoxft.h
@@ -102,13 +102,13 @@ void          pango_xft_shutdown_display (Display *display,
                                          int      screen);
 
 #ifndef PANGO_DISABLE_DEPRECATED
-PANGO_AVAILABLE_IN_1_2
+PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_set_default_substitute)
 void pango_xft_set_default_substitute (Display                *display,
                                       int                     screen,
                                       PangoXftSubstituteFunc  func,
                                       gpointer                data,
                                       GDestroyNotify          notify);
-PANGO_AVAILABLE_IN_1_2
+PANGO_DEPRECATED_IN_1_48_FOR(pango_fc_font_map_substitute_changed)
 void pango_xft_substitute_changed     (Display                *display,
                                       int                     screen);
 #endif