[pkgsrc/trunk]: pkgsrc/graphics/cairo Fix ABI regression compared to pkgsrc's...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/557e675b25db
branches:  trunk
changeset: 518856:557e675b25db
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Wed Sep 20 12:58:32 2006 +0000

description:
Fix ABI regression compared to pkgsrc's cairo-1.0. Bump revision.

diffstat:

 graphics/cairo/Makefile         |   4 ++--
 graphics/cairo/distinfo         |   3 ++-
 graphics/cairo/patches/patch-af |  30 ++++++++++++++++++++++++++++++
 3 files changed, 34 insertions(+), 3 deletions(-)

diffs (61 lines):

diff -r d09196a504e1 -r 557e675b25db graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Wed Sep 20 12:57:46 2006 +0000
+++ b/graphics/cairo/Makefile   Wed Sep 20 12:58:32 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.46 2006/08/31 11:12:58 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.47 2006/09/20 12:58:32 joerg Exp $
 
 DISTNAME=      cairo-1.2.4
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/releases/
 
diff -r d09196a504e1 -r 557e675b25db graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Wed Sep 20 12:57:46 2006 +0000
+++ b/graphics/cairo/distinfo   Wed Sep 20 12:58:32 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.24 2006/08/31 11:17:19 dmcmahill Exp $
+$NetBSD: distinfo,v 1.25 2006/09/20 12:58:32 joerg Exp $
 
 SHA1 (cairo-1.2.4.tar.gz) = 5520b771c8b85acea78fa56fc4c39b4dca6bcc7c
 RMD160 (cairo-1.2.4.tar.gz) = dee558b7489aa089de6963d909a8352725e10bdd
@@ -8,3 +8,4 @@
 SHA1 (patch-ac) = 71c66c051673a40b816c80cd8a67bfb4d0b6000b
 SHA1 (patch-ad) = 60ebdcbbcd0a7bd97ba4d25e79500547008ede34
 SHA1 (patch-ae) = 31141662ea34bc190443f82ed1ceab826bb98c37
+SHA1 (patch-af) = 257e2c4e73842e4a2f236765b9dae1c6f355c8b4
diff -r d09196a504e1 -r 557e675b25db graphics/cairo/patches/patch-af
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-af   Wed Sep 20 12:58:32 2006 +0000
@@ -0,0 +1,30 @@
+$NetBSD: patch-af,v 1.1 2006/09/20 12:58:32 joerg Exp $
+
+As cairo-1.0 from pkgsrc was shipped with PS and PDF backend enabled,
+ensure that the ABI is not broken.
+
+--- src/cairo-surface.c.orig   2006-09-20 00:06:40.000000000 +0200
++++ src/cairo-surface.c
+@@ -2116,3 +2116,22 @@ _cairo_surface_copy_pattern_for_destinat
+ 
+ /*  LocalWords:  rasterized
+  */
++
++#undef cairo_ps_surface_set_dpi
++#undef cairo_pdf_surface_set_dpi
++
++void
++cairo_ps_surface_set_dpi(cairo_surface_t      *surface,
++                       double          x_pixels_per_inch,
++                       double          y_pixels_per_inch)
++{
++      cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
++}
++
++void
++cairo_pdf_surface_set_dpi(cairo_surface_t     *surface,
++                       double          x_pixels_per_inch,
++                       double          y_pixels_per_inch)
++{
++      cairo_surface_set_fallback_resolution(surface, x_pixels_per_inch, y_pixels_per_inch);
++}