Require cairo >= 1.6.4. Remove compat cruft that were added to support

2008-04-21  Behdad Esfahbod  <behdad@gnome.org>

        * configure.in:
        * pango/pangocairo-atsui.h:
        * pango/pangocairo-atsuifont.c
        (pango_cairo_atsui_font_create_font_face):
        * pango/pangocairo-fontmap.c
        (pango_cairo_font_map_new_for_font_type):
        Require cairo >= 1.6.4.  Remove compat cruft that were added to
        support older cairo that had cairo-atsui instead of cairo-quartz-font.

svn path=/trunk/; revision=2601

diff --git a/ChangeLog b/ChangeLog
index 78adaa8..4615d47 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2008-04-21  Behdad Esfahbod  <behdad@gnome.org>
 
+       * configure.in:
+       * pango/pangocairo-atsui.h:
+       * pango/pangocairo-atsuifont.c
+       (pango_cairo_atsui_font_create_font_face):
+       * pango/pangocairo-fontmap.c
+       (pango_cairo_font_map_new_for_font_type):
+       Require cairo >= 1.6.4.  Remove compat cruft that were added to
+       support older cairo that had cairo-atsui instead of cairo-quartz-font.
+
+2008-04-21  Behdad Esfahbod  <behdad@gnome.org>
+
        Bug 514617 – Add pango_cairo_font_map_set_default()
 
        * docs/pango-sections.txt:

diff --git a/configure.in b/configure.in
index 7a1ec76..d045884 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -320,7 +320,7 @@ have_cairo_xlib=false
 have_cairo_freetype=false
 have_cairo_win32=false
 have_cairo_atsui=false
-cairo_required=1.2.6
+cairo_required=1.6.4
 
 PKG_CHECK_MODULES(CAIRO, cairo >= $cairo_required, have_cairo=true, AC_MSG_RESULT([no]))
    
@@ -338,7 +338,7 @@ if $have_cairo ; then
     PKG_CHECK_EXISTS(cairo-win32 >= $cairo_required, have_cairo_win32=true, :)
   fi
   if $have_cairo_win32; then
-    AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo uses the Win32 GDI for fonts])
+    AC_DEFINE(HAVE_CAIRO_WIN32, 1, [Whether Cairo can use the Win32 GDI for fonts])
     have_cairo=true
   fi
 
@@ -346,17 +346,15 @@ if $have_cairo ; then
     PKG_CHECK_EXISTS(cairo-ft >= $cairo_required, have_cairo_freetype=true, :)
   fi
   if $have_cairo_freetype; then
-    AC_DEFINE(HAVE_CAIRO_FREETYPE, 1, [Whether Cairo uses FreeType for fonts])
+    AC_DEFINE(HAVE_CAIRO_FREETYPE, 1, [Whether Cairo can use FreeType for fonts])
     have_cairo=true
   fi
 
   if $have_atsui; then
-    # for transition from old cairo-atsui to new cairo-quartz-font
-    PKG_CHECK_EXISTS(cairo-atsui >= $cairo_required, have_cairo_atsui=true, :)
     PKG_CHECK_EXISTS(cairo-quartz-font >= $cairo_required, have_cairo_atsui=true, :)
   fi
   if $have_cairo_atsui; then
-    AC_DEFINE(HAVE_CAIRO_ATSUI, 1, [Whether Cairo uses ATSUI for fonts])
+    AC_DEFINE(HAVE_CAIRO_ATSUI, 1, [Whether Cairo can use ATSUI for fonts])
     have_cairo=true
   fi
 

diff --git a/pango/pangocairo-atsui.h b/pango/pangocairo-atsui.h
index 4d38806..423cffc 100644 (file)
--- a/pango/pangocairo-atsui.h
+++ b/pango/pangocairo-atsui.h
@@ -24,11 +24,7 @@
 
 #include "pangoatsui-private.h"
 #include <pango/pangocairo.h>
-#ifdef CAIRO_HAS_QUARTZ_FONT
 #include <cairo-quartz.h>
-#else
-#include <cairo-atsui.h>
-#endif
 
 G_BEGIN_DECLS
 

diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c
index e631b18..8e14618 100644 (file)
--- a/pango/pangocairo-atsuifont.c
+++ b/pango/pangocairo-atsuifont.c
@@ -78,11 +78,6 @@ pango_cairo_atsui_font_get_glyph_extents (PangoFont      *font,
                                               logical_rect);
 }
 
-/* XXX remove when we require cairo 1.6 */
-#undef cairo_atsui_font_face_create_for_atsu_font_id
-cairo_public cairo_font_face_t *
-cairo_atsui_face_create_for_atsu_font_id (ATSUFontID font_id);
-
 static cairo_font_face_t *
 pango_cairo_atsui_font_create_font_face (PangoCairoFont *font)
 {
@@ -90,7 +85,7 @@ pango_cairo_atsui_font_create_font_face (PangoCairoFont *font)
   ATSUFontID font_id;
 
   font_id = pango_atsui_font_get_atsu_font_id (afont);
-  return cairo_atsui_font_face_create_for_atsu_font_id (font_id);
+  return cairo_quartz_font_face_create_for_atsu_font_id (font_id);
 }
 
 static int

diff --git a/pango/pangocairo-fontmap.c b/pango/pangocairo-fontmap.c
index 2dbb588..70a1c82 100644 (file)
--- a/pango/pangocairo-fontmap.c
+++ b/pango/pangocairo-fontmap.c
@@ -130,7 +130,7 @@ pango_cairo_font_map_new_for_font_type (cairo_font_type_t fonttype)
   switch (fonttype)
   {
 #if defined(HAVE_CAIRO_ATSUI)
-    case CAIRO_FONT_TYPE_ATSUI:
+    case CAIRO_FONT_TYPE_QUARTZ:
       return g_object_new (PANGO_TYPE_CAIRO_ATSUI_FONT_MAP, NULL);
 #endif
 #if defined(HAVE_CAIRO_WIN32)