From fe1463674c4c97388409a8c91dd525e7b7afb69e Mon Sep 17 00:00:00 2001 From: James McCoy Date: Mon, 28 Aug 2023 21:29:13 +0200 Subject: [PATCH] patch 9.0.1815: pango_coverage_unref() deprecated in pango > 1.51 Problem: pango_coverage_unref() deprecated in pango > 1.51 Solution: use g_object_unref() instead closes: #12942 Free PangoCoverage with g_object_unref for Pango >= 1.52 pango_coverage_unref was declared deprecated in Pango 1.52.0 in favor of g_object_unref. Adjust the call when building against a new enough Pango to avoid the deprecation warning. Signed-off-by: James McCoy Co-authored-by: James McCoy Signed-off-by: Christian Brabandt --- src/gui_gtk_x11.c | 4 ++++ src/version.c | 2 ++ 2 files changed, 6 insertions(+) diff --git a/src/gui_gtk_x11.c b/src/gui_gtk_x11.c index 1f8b2ebcc..3f0cf8c5a 100644 --- a/src/gui_gtk_x11.c +++ b/src/gui_gtk_x11.c @@ -4845,7 +4845,11 @@ is_cjk_font(PangoFontDescription *font_desc) { uc = (cjk_langs[i][0] == 'k') ? 0xAC00 : 0x4E00; is_cjk = (pango_coverage_get(coverage, uc) == PANGO_COVERAGE_EXACT); +#if PANGO_VERSION_CHECK(1, 52, 0) + g_object_unref(coverage); +#else pango_coverage_unref(coverage); +#endif } } diff --git a/src/version.c b/src/version.c index ce2869486..6d818ada9 100644 --- a/src/version.c +++ b/src/version.c @@ -699,6 +699,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1815, /**/ 1814, /**/