diff options
| author | Behdad Esfahbod <behdad@gnome.org> | 2008-04-08 21:06:20 +0000 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@src.gnome.org> | 2008-04-08 21:06:20 +0000 |
| commit | 886dab68d9abaa9d33af1c740d5a992023315724 (patch) | |
| tree | a6813c28331592f6ae801994e7c0cba37238d5b0 | |
| parent | fb4cb1b32ae77a27160e6719309dc2e39af8d60b (diff) | |
| download | pango-886dab68d9abaa9d33af1c740d5a992023315724.tar.gz | |
Try making our OS X stuff compile with latest cairo 1.5.x snapshots that
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.
svn path=/trunk/; revision=2586
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | configure.in | 2 | ||||
| -rw-r--r-- | pango/pangocairo-atsui.h | 4 | ||||
| -rw-r--r-- | pango/pangocairo-atsuifont.c | 4 |
4 files changed, 18 insertions, 0 deletions
@@ -1,5 +1,13 @@ 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. + +2008-04-08 Behdad Esfahbod <behdad@gnome.org> + * configure.in: Fix check for Carbon/Carbon.h availability. Oops! 2008-03-21 Behdad Esfahbod <behdad@gnome.org> 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 <pango/pangocairo.h> +#ifdef CAIRO_HAS_QUARTZ_FONT +#include <cairo-quartz-font.h> +#else #include <cairo-atsui.h> +#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) { |