--- deliantra/Deliantra-Client/pango-font.c 2006/07/04 23:23:31 1.1 +++ deliantra/Deliantra-Client/pango-font.c 2009/04/26 20:59:41 1.4 @@ -72,6 +72,17 @@ if (FcPatternGetDouble (pattern, FC_PIXEL_SIZE, 0, &d) == FcResultMatch) font->size = d * PANGO_SCALE; +#if PANGO_VERSION_CHECK (1, 16, 0) + /* pango 1.24 is ABI-incompatible with 1.22, but distros */ + /* usually package it under the same name, so a runtime check */ + /* is required */ + /* unfortunately, pango fdoesn't sipport runtime checks in < 1.16 */ + /* so there is no real way to ensure binary compatibility portably */ + /* greta move, pango */ + if (pango_version () > PANGO_VERSION_ENCODE (1, 23, 0)) + PANGO_FC_FONT (font)->fontmap = fontmap; +#endif + return font; } @@ -103,7 +114,6 @@ error = FT_New_Face (_pango_opengl_font_map_get_library (fcfont->fontmap), (char *) filename2, id, &font->face); - if (error) { bail1: