]> git.ipfire.org Git - thirdparty/vim.git/commitdiff
patch 9.0.1815: pango_coverage_unref() deprecated in pango > 1.51 v9.0.1815
authorJames McCoy <jamessan@jamessan.com>
Mon, 28 Aug 2023 19:29:13 +0000 (21:29 +0200)
committerChristian Brabandt <cb@256bit.org>
Mon, 28 Aug 2023 19:29:13 +0000 (21:29 +0200)
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 <jamessan@jamessan.com>
Co-authored-by: James McCoy <jamessan@jamessan.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
src/gui_gtk_x11.c
src/version.c

index 1f8b2ebcc76afd255a27a358dafc05776ca3469b..3f0cf8c5aaccbe16b5da4102f6074bb916b888a3 100644 (file)
@@ -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
        }
     }
 
index ce286948603ca12dda8f43cc209249a93e537b3a..6d818ada90457399b660ae9862d33874f0c76278 100644 (file)
@@ -699,6 +699,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1815,
 /**/
     1814,
 /**/