From daea92ea0010232efc1d95f378e8afe9e87a041d Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 12 Apr 2019 18:40:08 +0100 Subject: [PATCH 1/2] Ignore deprecated HarfBuzz API HarfBuzz 2.0 deprecated some API used by the GtkFontChooser, but since we're still supporting older versions of HarfBuzz, we should disable the deprecation warnings to avoid too much noise during builds. --- gtk/gtkfontchooserwidget.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/gtk/gtkfontchooserwidget.c b/gtk/gtkfontchooserwidget.c index c6eb764082..4f9954fd64 100644 --- a/gtk/gtkfontchooserwidget.c +++ b/gtk/gtkfontchooserwidget.c @@ -1798,7 +1798,11 @@ find_affected_text (hb_tag_t feature_tag, chars = g_string_new (""); hb_ot_layout_table_find_script (hb_face, HB_OT_TAG_GSUB, script_tag, &script_index); + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS hb_ot_layout_script_find_language (hb_face, HB_OT_TAG_GSUB, script_index, lang_tag, &lang_index); + G_GNUC_END_IGNORE_DEPRECATIONS + if (hb_ot_layout_language_find_feature (hb_face, HB_OT_TAG_GSUB, script_index, lang_index, feature_tag, &feature_index)) { unsigned int lookup_indexes[32]; @@ -2166,7 +2170,11 @@ gtk_font_chooser_widget_update_font_features (GtkFontChooserWidget *fontchooser) for (i = 0; i < 2; i++) { hb_ot_layout_table_find_script (hb_face, table[i], script_tag, &script_index); + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS hb_ot_layout_script_find_language (hb_face, table[i], script_index, lang_tag, &lang_index); + G_GNUC_END_IGNORE_DEPRECATIONS + count = G_N_ELEMENTS (features); hb_ot_layout_language_get_feature_tags (hb_face, table[i], From f39ae35e4bfa64b609b5bcce3f4bd92a237d78c4 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 12 Apr 2019 18:42:38 +0100 Subject: [PATCH 2/2] demo: Ignore deprecated HarfBuzz API We should avoid warnings just because we're building against bleeding edge HarfBuzz. --- demos/gtk-demo/font_features.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/demos/gtk-demo/font_features.c b/demos/gtk-demo/font_features.c index 8d647fc946..8299b6461c 100644 --- a/demos/gtk-demo/font_features.c +++ b/demos/gtk-demo/font_features.c @@ -495,7 +495,11 @@ update_script_combo (void) gboolean have_active = FALSE; lang = gtk_font_chooser_get_language (GTK_FONT_CHOOSER (font)); + + G_GNUC_BEGIN_IGNORE_DEPRECATIONS active = hb_ot_tag_from_language (hb_language_from_string (lang, -1)); + G_GNUC_END_IGNORE_DEPRECATIONS + g_free (lang); store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_UINT);