tasn pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=dae9eacb142340968d78e8dd1a45d98ebca3b7f6

commit dae9eacb142340968d78e8dd1a45d98ebca3b7f6
Author: Tom Hacohen <[email protected]>
Date:   Fri Feb 21 09:47:30 2014 +0000

    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.
---
 src/lib/evas/canvas/evas_font_dir.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/lib/evas/canvas/evas_font_dir.c 
b/src/lib/evas/canvas/evas_font_dir.c
index a75cd94..0e67bf8 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
 

-- 


Reply via email to