aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Hacohen <tom@stosb.com>2014-02-21 09:47:30 +0000
committerTom Hacohen <tom@stosb.com>2014-02-21 09:47:30 +0000
commitdae9eacb142340968d78e8dd1a45d98ebca3b7f6 (patch)
tree8e78bd3a0581d5a83d93d05476349bbf7870506e
parentautotools: make specifying binary look the same as Elementary. (diff)
downloadefl-dae9eacb142340968d78e8dd1a45d98ebca3b7f6.tar.gz
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 ec41f67be466ca2dea83ce787f74bd4b4d6c71cb. This fixes https://phab.enlightenment.org/T1006.
-rw-r--r--src/lib/evas/canvas/evas_font_dir.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/evas/canvas/evas_font_dir.c b/src/lib/evas/canvas/evas_font_dir.c
index a75cd945eb..0e67bf80a9 100644
--- a/src/lib/evas/canvas/evas_font_dir.c
+++ b/src/lib/evas/canvas/evas_font_dir.c
@@ -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