[PATCH] Fix compilation on 1.12 without FT_Get_X11_Font_Format Signed-off-by: Gilles Espinasse <[email protected]>

---
 configure.ac        |    2 +-
 src/cairo-ft-font.c |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index 878214d..7adbeb1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -526,7 +526,7 @@ if test "x$use_ft" = "xyes"; then
   AC_DEFINE_UNQUOTED(HAVE_FT_BITMAP_SIZE_Y_PPEM,$HAVE_FT_BITMAP_SIZE_Y_PPEM,
                      [FT_Bitmap_Size structure includes y_ppem field])
 
-  AC_CHECK_FUNCS(FT_GlyphSlot_Embolden FT_GlyphSlot_Oblique FT_Load_Sfnt_Table FT_Library_SetLcdFilter)
+  AC_CHECK_FUNCS(FT_Get_X11_Font_Format FT_GlyphSlot_Embolden FT_GlyphSlot_Oblique FT_Load_Sfnt_Table FT_Library_SetLcdFilter)
 
   LIBS="$_save_libs"
   CFLAGS="$_save_cflags"
diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c
index bd616b5..540383b 100644
--- a/src/cairo-ft-font.c
+++ b/src/cairo-ft-font.c
@@ -2551,10 +2551,12 @@ _cairo_ft_load_type1_data (void	            *abstract_font,
     }
 #endif
 
+#if HAVE_FT_GET_X11_FONT_FORMAT
     font_format = FT_Get_X11_Font_Format (face);
     if (!font_format ||
 	!(strcmp (font_format, "Type 1") == 0 ||
 	  strcmp (font_format, "CFF") == 0))
+#endif
     {
         status = CAIRO_INT_STATUS_UNSUPPORTED;
 	goto unlock;
-- 
1.7.2.5

-- 
cairo mailing list
[email protected]
http://lists.cairographics.org/mailman/listinfo/cairo