From 886dab68d9abaa9d33af1c740d5a992023315724 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Tue, 8 Apr 2008 21:06:20 +0000 Subject: Try making our OS X stuff compile with latest cairo 1.5.x snapshots that 2008-04-08 Behdad Esfahbod * 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. svn path=/trunk/; revision=2586 --- ChangeLog | 8 ++++++++ configure.in | 2 ++ pango/pangocairo-atsui.h | 4 ++++ pango/pangocairo-atsuifont.c | 4 ++++ 4 files changed, 18 insertions(+) diff --git a/ChangeLog b/ChangeLog index 6a620b27..a16aef9c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-04-08 Behdad Esfahbod + + * 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. + 2008-04-08 Behdad Esfahbod * configure.in: Fix check for Carbon/Carbon.h availability. Oops! diff --git a/configure.in b/configure.in index dc9b7fe1..56c2516b 100644 --- a/configure.in +++ b/configure.in @@ -351,7 +351,9 @@ if $have_cairo ; then 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]) diff --git a/pango/pangocairo-atsui.h b/pango/pangocairo-atsui.h index 6b97ce88..5b95425c 100644 --- a/pango/pangocairo-atsui.h +++ b/pango/pangocairo-atsui.h @@ -24,7 +24,11 @@ #include "pangoatsui-private.h" #include +#ifdef CAIRO_HAS_QUARTZ_FONT +#include +#else #include +#endif G_BEGIN_DECLS diff --git a/pango/pangocairo-atsuifont.c b/pango/pangocairo-atsuifont.c index 23282023..ebc2446f 100644 --- a/pango/pangocairo-atsuifont.c +++ b/pango/pangocairo-atsuifont.c @@ -78,6 +78,10 @@ pango_cairo_atsui_font_get_glyph_extents (PangoFont *font, 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) { -- cgit v1.2.1