diff options
| author | drochner <drochner@pkgsrc.org> | 2008-10-16 12:22:10 +0000 |
|---|---|---|
| committer | drochner <drochner@pkgsrc.org> | 2008-10-16 12:22:10 +0000 |
| commit | e23f517170e8fcc12e7f1034d1f28d88b9d369d4 (patch) | |
| tree | 7a118d48a501c3f9d867d2071d6fc3379af94465 /graphics/cairo | |
| parent | 063a9f588a0b0f9a4e2d5ce34256e5dfb4349e54 (diff) | |
| download | pkgsrc-e23f517170e8fcc12e7f1034d1f28d88b9d369d4.tar.gz | |
add two patches from wiz: fix build with "ssp", "make test" fix
Diffstat (limited to 'graphics/cairo')
| -rw-r--r-- | graphics/cairo/distinfo | 4 | ||||
| -rw-r--r-- | graphics/cairo/patches/patch-ac | 17 | ||||
| -rw-r--r-- | graphics/cairo/patches/patch-ad | 31 |
3 files changed, 51 insertions, 1 deletions
diff --git a/graphics/cairo/distinfo b/graphics/cairo/distinfo index f7a2549ab59..48eb8620f1e 100644 --- a/graphics/cairo/distinfo +++ b/graphics/cairo/distinfo @@ -1,7 +1,9 @@ -$NetBSD: distinfo,v 1.44 2008/10/16 10:55:08 drochner Exp $ +$NetBSD: distinfo,v 1.45 2008/10/16 12:22:10 drochner Exp $ SHA1 (cairo-1.8.0.tar.gz) = 8a689ca47c24216f37bb8cabae21ff08a7f47899 RMD160 (cairo-1.8.0.tar.gz) = 1b1079ab73813ca6782c0d4cb3623575e08ee94e Size (cairo-1.8.0.tar.gz) = 5662670 bytes SHA1 (patch-aa) = 870d57c20afbca75ab5c3ec399409de19726fd66 SHA1 (patch-ab) = 54f0dd3e7afdf88b0ab8cf8f32ed16eed04f0797 +SHA1 (patch-ac) = 9412e50f13d7d8f15c212aff2114d45a261a8b6f +SHA1 (patch-ad) = 2ead8b50dc71aa8b7bbb699f14f72a354f88a314 diff --git a/graphics/cairo/patches/patch-ac b/graphics/cairo/patches/patch-ac new file mode 100644 index 00000000000..42ac0a9a696 --- /dev/null +++ b/graphics/cairo/patches/patch-ac @@ -0,0 +1,17 @@ +$NetBSD: patch-ac,v 1.10 2008/10/16 12:22:10 drochner Exp $ + +Fixes +cairo-type1-subset.c:1220:24: error: macro "read" passed 4 arguments, but takes just 3 +>From ickle_ on freenode #cairo. + +--- src/cairo-type1-subset.c.orig 2008-09-25 11:36:35.000000000 +0000 ++++ src/cairo-type1-subset.c +@@ -1215,7 +1215,7 @@ cairo_type1_font_subset_generate (void + } + + if (font->face->stream->read) { +- ret = font->face->stream->read (font->face->stream, 0, ++ ret = (* font->face->stream->read) (font->face->stream, 0, + (unsigned char *) font->type1_data, + font->type1_length); + if (ret != font->type1_length) { diff --git a/graphics/cairo/patches/patch-ad b/graphics/cairo/patches/patch-ad new file mode 100644 index 00000000000..bd33f005006 --- /dev/null +++ b/graphics/cairo/patches/patch-ad @@ -0,0 +1,31 @@ +$NetBSD: patch-ad,v 1.7 2008/10/16 12:22:10 drochner Exp $ + +--- boilerplate/cairo-boilerplate-glitz.c.orig 2008-09-25 11:36:35.000000000 +0000 ++++ boilerplate/cairo-boilerplate-glitz.c +@@ -217,7 +217,7 @@ _cairo_boilerplate_glitz_glx_create_surf + gxtc->base.width = width; + gxtc->base.height = height; + gxtc->base.content = content; +- status = cairo_boilerplate_surface_set_user_data (surface, ++ status = cairo_surface_set_user_data (surface, + &glitz_closure_key, gxtc, NULL); + if (status == CAIRO_STATUS_SUCCESS) + return surface; +@@ -361,7 +361,7 @@ _cairo_boilerplate_glitz_agl_create_surf + aglc->base.width = width; + aglc->base.height = height; + aglc->base.content = content; +- status = cairo_boilerplate_surface_set_user_data (surface, ++ status = cairo_surface_set_user_data (surface, + &glitz_closure_key, aglc, NULL); + if (status == CAIRO_STATUS_SUCCESS) + return surface; +@@ -493,7 +493,7 @@ _cairo_boilerplate_glitz_wgl_create_surf + wglc->base.width = width; + wglc->base.height = height; + wglc->base.content = content; +- status = cairo_boilerplate_surface_set_user_data (surface, ++ status = cairo_surface_set_user_data (surface, + &glitz_closure_key, wglc, NULL); + if (status == CAIRO_STATUS_SUCCESS) + return surface; |