[pkgsrc/trunk]: pkgsrc/graphics/py-cairo Fix build with Cairo 1.2 API and req...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d09196a504e1
branches:  trunk
changeset: 518855:d09196a504e1
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Sep 20 12:57:46 2006 +0000

description:
Fix build with Cairo 1.2 API and require it. Bump revision since DSO
changed.

diffstat:

 graphics/py-cairo/Makefile         |   6 ++++--
 graphics/py-cairo/patches/patch-aa |  22 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diffs (50 lines):

diff -r debc4be05220 -r d09196a504e1 graphics/py-cairo/Makefile
--- a/graphics/py-cairo/Makefile        Wed Sep 20 12:53:21 2006 +0000
+++ b/graphics/py-cairo/Makefile        Wed Sep 20 12:57:46 2006 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2006/04/23 17:13:03 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2006/09/20 12:57:46 joerg Exp $
 #
 
 DISTNAME=              pycairo-1.0.2
 PKGNAME=               ${PYPKGPREFIX}-cairo-1.0.2
-PKGREVISION=           1
+PKGREVISION=           2
 CATEGORIES=            graphics
 MASTER_SITES=          http://cairographics.org/releases/
 
@@ -27,6 +27,8 @@
 BUILDLINK_TRANSFORM+=  rm:-std=c99
 .endif
 
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.2.0
+
 .include "../../lang/python/extension.mk"
 .include "../../math/py-Numeric/buildlink3.mk"
 .include "../../graphics/cairo/buildlink3.mk"
diff -r debc4be05220 -r d09196a504e1 graphics/py-cairo/patches/patch-aa
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/py-cairo/patches/patch-aa        Wed Sep 20 12:57:46 2006 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-aa,v 1.1 2006/09/20 12:57:46 joerg Exp $
+
+--- cairo/pycairo-surface.c.orig       2005-09-28 14:35:09.000000000 +0000
++++ cairo/pycairo-surface.c
+@@ -595,7 +595,7 @@ pdf_surface_set_dpi (PycairoPDFSurface *
+ 
+     if (!PyArg_ParseTuple(args, "dd:PDFSurface.set_dpi", &x_dpi, &y_dpi))
+       return NULL;
+-    cairo_pdf_surface_set_dpi (o->surface, x_dpi, y_dpi);
++    cairo_surface_set_fallback_resolution (o->surface, x_dpi, y_dpi);
+     Py_RETURN_NONE;
+ }
+ 
+@@ -688,7 +688,7 @@ ps_surface_set_dpi (PycairoPSSurface *o,
+ 
+     if (!PyArg_ParseTuple(args, "dd:PSSurface.set_dpi", &x_dpi, &y_dpi))
+       return NULL;
+-    cairo_ps_surface_set_dpi (o->surface, x_dpi, y_dpi);
++    cairo_surface_set_fallback_resolution (o->surface, x_dpi, y_dpi);
+     Py_RETURN_NONE;
+ }
+