[pango] Don't use deprecated hb_font_funcs_set_glyph_func()

[Behdad Esfahbod <behdad src gnome org>]

commit 906509e22bf617d97a71f41d335d7a0dec344187
Author: Behdad Esfahbod <behdad behdad org>
Date:   Mon Apr 17 13:26:52 2017 -0700

    Don't use deprecated hb_font_funcs_set_glyph_func()

 configure.ac          |    2 +-
 pango/pangofc-shape.c |   11 ++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index d78ef0e..0b37a0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -208,7 +208,7 @@ AM_CONDITIONAL(CROSS_COMPILING, [test $cross_compiling = yes])
 # Checks for HarfBuzz
 #
 have_harfbuzz=false
-PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= 0.9.30, have_harfbuzz=true, :)
+PKG_CHECK_MODULES(HARFBUZZ, harfbuzz >= 1.2.3, have_harfbuzz=true, :)
 AM_CONDITIONAL(HAVE_HARFBUZZ, $have_harfbuzz)
 
 #
diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
index 6cd9818..a18fa73 100644
--- a/pango/pangofc-shape.c
+++ b/pango/pangofc-shape.c
@@ -76,10 +76,10 @@ typedef struct _PangoFcHbContext {
 } PangoFcHbContext;
 
 static hb_bool_t
-pango_fc_hb_font_get_glyph (hb_font_t *font, void *font_data,
-                           hb_codepoint_t unicode, hb_codepoint_t variation_selector,
-                           hb_codepoint_t *glyph,
-                           void *user_data G_GNUC_UNUSED)
+pango_fc_hb_font_get_nominal_glyph (hb_font_t *font, void *font_data,
+                                   hb_codepoint_t unicode,
+                                   hb_codepoint_t *glyph,
+                                   void *user_data G_GNUC_UNUSED)
 {
   PangoFcHbContext *context = (PangoFcHbContext *) font_data;
   PangoFcFont *fc_font = context->fc_font;
@@ -245,7 +245,8 @@ pango_fc_get_hb_font_funcs (void)
 
   if (G_UNLIKELY (!funcs)) {
     funcs = hb_font_funcs_create ();
-    hb_font_funcs_set_glyph_func (funcs, pango_fc_hb_font_get_glyph, NULL, NULL);
+    hb_font_funcs_set_nominal_glyph_func (funcs, pango_fc_hb_font_get_nominal_glyph, NULL, NULL);
+    /* XXX we don't support variation selectors yet :(. */
     hb_font_funcs_set_glyph_h_advance_func (funcs, pango_fc_hb_font_get_glyph_advance, NULL, NULL);
     hb_font_funcs_set_glyph_v_advance_func (funcs, pango_fc_hb_font_get_glyph_advance, NULL, NULL);
     hb_font_funcs_set_glyph_h_origin_func (funcs, pango_fc_hb_font_get_glyph_h_origin, NULL, NULL);