*** guile-cairo-1.3.90/guile-cairo/guile-cairo-enum-types.c.orig Thu May 31 22:18:14 2007 --- guile-cairo-1.3.90/guile-cairo/guile-cairo-enum-types.c Thu May 31 23:41:17 2007 *************** *** 96,103 **** --- 96,105 ---- {CAIRO_STATUS_FILE_NOT_FOUND, "file-not-found"}, {CAIRO_STATUS_INVALID_DASH, "invalid-dash"}, {CAIRO_STATUS_INVALID_DSC_COMMENT, "invalid-dsc-comment"}, + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) {CAIRO_STATUS_INVALID_INDEX, "invalid-index"}, {CAIRO_STATUS_CLIP_NOT_REPRESENTABLE, "clip-not-representable"}, + #endif {0, NULL} }; *************** *** 220,226 **** --- 222,230 ---- {CAIRO_SURFACE_TYPE_BEOS, "beos"}, {CAIRO_SURFACE_TYPE_DIRECTFB, "directfb"}, {CAIRO_SURFACE_TYPE_SVG, "svg"}, + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) {CAIRO_SURFACE_TYPE_OS2, "os2"}, + #endif {0, NULL} }; *** guile-cairo-1.3.90/guile-cairo/guile-cairo-vector-types.h.orig Thu May 31 22:05:56 2007 --- guile-cairo-1.3.90/guile-cairo/guile-cairo-vector-types.h Thu May 31 23:39:49 2007 *************** *** 31,38 **** --- 31,40 ---- SCM scm_from_cairo_matrix (cairo_matrix_t *matrix); void scm_fill_cairo_matrix (SCM scm, cairo_matrix_t *matrix); + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) SCM scm_from_cairo_rectangle (cairo_rectangle_t *rect); void scm_fill_cairo_rectangle (SCM scm, cairo_rectangle_t *rect); + #endif SCM scm_from_cairo_glyph (cairo_glyph_t *glyph); void scm_fill_cairo_glyph (SCM scm, cairo_glyph_t *glyph); *** guile-cairo-1.3.90/guile-cairo/guile-cairo.c.orig Thu May 31 22:07:16 2007 --- guile-cairo-1.3.90/guile-cairo/guile-cairo.c Thu May 31 23:41:06 2007 *************** *** 163,168 **** --- 163,169 ---- CCONSRET (cairo_create (scm_to_cairo_surface (surf))); } + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) #ifdef DEBUG_GUILE_CAIRO SCM_DEFINE_PUBLIC (scm_cairo_get_reference_count, "cairo-get-reference-count", 1, 0, 0, (SCM ctx), *************** *** 171,176 **** --- 172,178 ---- CCHKRET (ctx, scm_from_uint (cairo_get_reference_count (scm_to_cairo (ctx)))); } #endif + #endif /* not wrapping the user_data because I need to mail the guile list, * possibility of calling gc_unprotect during gc */ *************** *** 772,777 **** --- 774,780 ---- CCHKRET (ctx, SCM_UNSPECIFIED); } + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) SCM_DEFINE_PUBLIC (scm_cairo_clip_extents, "cairo-clip-extents", 1, 0, 0, (SCM ctx), "") *************** *** 805,810 **** --- 808,814 ---- return ret; } + #endif /* HAVE_CAIRO_140_API */ SCM_DEFINE_PUBLIC (scm_cairo_font_options_create, "cairo-font-options-create", 0, 0, 0, (void), *************** *** 1008,1013 **** --- 1012,1018 ---- CCHKRET (ctx, SCM_UNSPECIFIED); } + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) SCM_DEFINE_PUBLIC (scm_cairo_get_scaled_font, "cairo-get-scaled-font", 1, 0, 0, (SCM ctx), "") *************** *** 1015,1020 **** --- 1020,1026 ---- SCM ret = scm_from_cairo_scaled_font (cairo_get_scaled_font (scm_to_cairo (ctx))); SFCHKRET (ret, ret); } + #endif SCM_DEFINE_PUBLIC (scm_cairo_show_text, "cairo-show-text", 2, 0, 0, (SCM ctx, SCM val), *************** *** 1160,1165 **** --- 1166,1172 ---- CCHKRET (ctx, ret); } + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) #ifdef DEBUG_GUILE_CAIRO SCM_DEFINE_PUBLIC (scm_cairo_font_face_get_reference_count, "cairo-font-face-get-reference-count", 1, 0, 0, (SCM face), *************** *** 1168,1173 **** --- 1175,1181 ---- return scm_from_uint (cairo_font_face_get_reference_count (scm_to_cairo_font_face (face))); } #endif + #endif SCM_DEFINE_PUBLIC (scm_cairo_font_face_get_type, "cairo-font-face-get-type", 1, 0, 0, (SCM face), *************** *** 1390,1395 **** --- 1398,1404 ---- scm_from_double (cairo_get_miter_limit (scm_to_cairo (ctx)))); } + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) SCM_DEFINE_PUBLIC (scm_cairo_get_dash_count, "cairo-get-dash-count", 1, 0, 0, (SCM ctx), "") *************** *** 1417,1422 **** --- 1426,1432 ---- scm_values (scm_list_2 (data ? scm_take_f64vector(data, ndoubles) : SCM_BOOL_F, scm_from_double (offset)))); } + #endif /* HAVE_CAIRO_140_API */ SCM_DEFINE_PUBLIC (scm_cairo_get_matrix, "cairo-get-matrix", 1, 0, 0, (SCM ctx), *************** *** 1525,1530 **** --- 1535,1541 ---- return SCM_UNSPECIFIED; } + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) #ifdef DEBUG_GUILE_CAIRO SCM_DEFINE_PUBLIC (scm_cairo_surface_get_reference_count, "cairo-surface-get-reference-count", 1, 0, 0, (SCM surf), *************** *** 1533,1538 **** --- 1544,1550 ---- return scm_from_uint (cairo_surface_get_reference_count (scm_to_cairo_surface (surf))); } #endif + #endif SCM_DEFINE_PUBLIC (scm_cairo_surface_get_type, "cairo-surface-get-type", 1, 0, 0, (SCM surf), *************** *** 1779,1784 **** --- 1791,1797 ---- scm_to_double (r1))); } + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) #ifdef DEBUG_GUILE_CAIRO SCM_DEFINE_PUBLIC (scm_cairo_pattern_get_reference_count, "cairo-pattern-get-reference-count", 1, 0, 0, (SCM pat), *************** *** 1787,1792 **** --- 1800,1806 ---- return scm_from_uint (cairo_pattern_get_reference_count (scm_to_cairo_pattern (pat))); } #endif + #endif SCM_DEFINE_PUBLIC (scm_cairo_pattern_get_type, "cairo-pattern-get-type", 1, 0, 0, (SCM pat), *************** *** 1879,1884 **** --- 1893,1899 ---- scm_from_cairo_filter (cairo_pattern_get_filter (scm_to_cairo_pattern (pat)))); } + #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) SCM_DEFINE_PUBLIC (scm_cairo_pattern_get_rgba, "cairo-pattern-get-rgba", 1, 0, 0, (SCM pat), "") *************** *** 1952,1957 **** --- 1967,1973 ---- scm_from_double (r1), SCM_UNDEFINED))); } + #endif /* HAVE_CAIRO_140_API */ SCM_DEFINE_PUBLIC (scm_cairo_make_matrix, "cairo-make-matrix", 6, 0, 0, (SCM xx, SCM yx, SCM xy, SCM yy, SCM x0, SCM y0), *** guile-cairo-1.3.90/guile-cairo/guile-cairo-vector-types.c.orig Thu May 31 22:20:45 2007 --- guile-cairo-1.3.90/guile-cairo/guile-cairo-vector-types.c Thu May 31 23:39:40 2007 *************** *** 97,103 **** /********************************************************************** * cairo_rectangle_t **********************************************************************/ ! SCM scm_from_cairo_rectangle (cairo_rectangle_t *rect) { --- 97,103 ---- /********************************************************************** * cairo_rectangle_t **********************************************************************/ ! #if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,4,0) SCM scm_from_cairo_rectangle (cairo_rectangle_t *rect) { *************** *** 120,125 **** --- 120,126 ---- rect->height = GET (scm, 3); #undef GET } + #endif /********************************************************************** * cairo_glyph_t *** guile-cairo-1.3.90/README.orig Thu May 31 22:28:11 2007 --- guile-cairo-1.3.90/README Thu May 31 22:29:39 2007 *************** *** 120,126 **** * Guile 1.8.0 or newer http://www.gnu.org/software/guile/ ! * Cairo 1.4.0 or newer http://cairographics.org/ --- 120,126 ---- * Guile 1.8.0 or newer http://www.gnu.org/software/guile/ ! * Cairo 1.2.0 or newer http://cairographics.org/ *** guile-cairo-1.3.90/configure.ac.orig Thu May 31 22:27:12 2007 --- guile-cairo-1.3.90/configure.ac Thu May 31 23:41:34 2007 *************** *** 1,9 **** AC_PREREQ(2.52) AC_INIT(HACKING) AM_CONFIG_HEADER(config.h) ! AM_INIT_AUTOMAKE(guile-cairo, 1.3.90) ! AC_SUBST(VERSION,1.3.90) AM_MAINTAINER_MODE AC_DISABLE_STATIC --- 1,9 ---- AC_PREREQ(2.52) AC_INIT(HACKING) AM_CONFIG_HEADER(config.h) ! AM_INIT_AUTOMAKE(guile-cairo, 1.3.91sgt) ! AC_SUBST(VERSION,1.3.91sgt) AM_MAINTAINER_MODE AC_DISABLE_STATIC *************** *** 59,65 **** AC_SUBST(GUILE_LIBS) AC_MSG_RESULT(yes) ! PKG_CHECK_MODULES(CAIRO, cairo >= 1.4.0) AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS) --- 59,65 ---- AC_SUBST(GUILE_LIBS) AC_MSG_RESULT(yes) ! PKG_CHECK_MODULES(CAIRO, cairo >= 1.2.0) AC_SUBST(CAIRO_LIBS) AC_SUBST(CAIRO_CFLAGS)