diff options
author | Tom Hacohen <tom@stosb.com> | 2014-02-21 09:47:30 +0000 |
---|---|---|
committer | Tom Hacohen <tom@stosb.com> | 2014-02-21 09:47:30 +0000 |
commit | dae9eacb142340968d78e8dd1a45d98ebca3b7f6 (patch) | |
tree | 8e78bd3a0581d5a83d93d05476349bbf7870506e | |
parent | 12a0cc8342328e3246021aaad4ca938b93f6a259 (diff) |
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 T1006.
-rw-r--r-- | src/lib/evas/canvas/evas_font_dir.c | 2 |
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, | |||
788 | } | 788 | } |
789 | else /* Add a fallback list from fontconfig according to the found font. */ | 789 | else /* Add a fallback list from fontconfig according to the found font. */ |
790 | { | 790 | { |
791 | #if FC_MAJOR >= 2 && FC_MINOR >= 11 | ||
791 | FcResult res; | 792 | FcResult res; |
792 | 793 | ||
793 | FT_Face face = evas_common_font_freetype_face_get((RGBA_Font *) font); | 794 | 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, | |||
810 | font = _evas_load_fontconfig(font, evas->evas, set, size, wanted_rend); | 811 | font = _evas_load_fontconfig(font, evas->evas, set, size, wanted_rend); |
811 | } | 812 | } |
812 | } | 813 | } |
814 | #endif | ||
813 | } | 815 | } |
814 | #endif | 816 | #endif |
815 | 817 | ||