[pkgsrc/trunk]: pkgsrc/graphics/cairo add two patches from wiz: fix build wit...

[drochner <drochner%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f11e2836691a
branches:  trunk
changeset: 548457:f11e2836691a
user:      drochner <drochner%pkgsrc.org@localhost>
date:      Thu Oct 16 12:22:10 2008 +0000

description:
add two patches from wiz: fix build with "ssp", "make test" fix

diffstat:

 graphics/cairo/distinfo         |   4 +++-
 graphics/cairo/patches/patch-ac |  17 +++++++++++++++++
 graphics/cairo/patches/patch-ad |  31 +++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletions(-)

diffs (70 lines):

diff -r b080dcbf3613 -r f11e2836691a graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Thu Oct 16 11:11:22 2008 +0000
+++ b/graphics/cairo/distinfo   Thu Oct 16 12:22:10 2008 +0000
@@ -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 -r b080dcbf3613 -r f11e2836691a graphics/cairo/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-ac   Thu Oct 16 12:22:10 2008 +0000
@@ -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 -r b080dcbf3613 -r f11e2836691a graphics/cairo/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-ad   Thu Oct 16 12:22:10 2008 +0000
@@ -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;