Revert "Evas font: Change font fallback to not depend on fontconfig >= 2.11."

It seems that before 2.10, this was not stable, and was causing issues
to some people. I guess we'll have to bring the dependency back, at
least until we can find a better solution.

This reverts commit ec41f67be4.

This fixes T1006.
This commit is contained in:
Tom Hacohen 2014-02-21 09:47:30 +00:00
parent 12a0cc8342
commit dae9eacb14
1 changed files with 2 additions and 0 deletions

View File

@ -788,6 +788,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
}
else /* Add a fallback list from fontconfig according to the found font. */
{
#if FC_MAJOR >= 2 && FC_MINOR >= 11
FcResult res;
FT_Face face = evas_common_font_freetype_face_get((RGBA_Font *) font);
@ -810,6 +811,7 @@ evas_font_load(Evas *eo_evas, Evas_Font_Description *fdesc, const char *source,
font = _evas_load_fontconfig(font, evas->evas, set, size, wanted_rend);
}
}
#endif
}
#endif