pango r2586 - in trunk: . pango

[behdad svn gnome org]

Author: behdad
Date: Tue Apr  8 22:06:20 2008
New Revision: 2586
URL: http://svn.gnome.org/viewvc/pango?rev=2586&view=rev

Log:
2008-04-08  Behdad Esfahbod  <behdad gnome org>

        * configure.in:
        * pango/pangocairo-atsui.h:
        * pango/pangocairo-atsuifont.c:
        Try making our OS X stuff compile with latest cairo 1.5.x snapshots 
        that renamed cairo-atsui to cairo-quartz-font.



Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/pango/pangocairo-atsui.h
   trunk/pango/pangocairo-atsuifont.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Tue Apr  8 22:06:20 2008
@@ -351,7 +351,9 @@
   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])

Modified: trunk/pango/pangocairo-atsui.h
==============================================================================
--- trunk/pango/pangocairo-atsui.h	(original)
+++ trunk/pango/pangocairo-atsui.h	Tue Apr  8 22:06:20 2008
@@ -24,7 +24,11 @@
 
 #include "pangoatsui-private.h"
 #include <pango/pangocairo.h>
+#ifdef CAIRO_HAS_QUARTZ_FONT
+#include <cairo-quartz-font.h>
+#else
 #include <cairo-atsui.h>
+#endif
 
 G_BEGIN_DECLS
 

Modified: trunk/pango/pangocairo-atsuifont.c
==============================================================================
--- trunk/pango/pangocairo-atsuifont.c	(original)
+++ trunk/pango/pangocairo-atsuifont.c	Tue Apr  8 22:06:20 2008
@@ -78,6 +78,10 @@
 					       logical_rect);
 }
 
+/* XXX remove when we require cairo 1.6 */
+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)
 {