[pkgsrc/trunk]: pkgsrc/graphics/cairo Fix png backend with libpng 1.2.30. Old...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/4d2b15f3c00d
branches:  trunk
changeset: 546257:4d2b15f3c00d
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Aug 25 15:36:18 2008 +0000

description:
Fix png backend with libpng 1.2.30. Older libpng versions flushed the
output at the end of the write and this was restored with 1.2.30, but
cairo didn't override the flush function, resulting in fflush on a
non-stream. This in turn resulted in crashes of graphviz when compiling
doxygen. Bump revision.

diffstat:

 graphics/cairo/Makefile         |   4 ++--
 graphics/cairo/distinfo         |   3 ++-
 graphics/cairo/patches/patch-ad |  27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 3 deletions(-)

diffs (58 lines):

diff -r 2ff4b5bda271 -r 4d2b15f3c00d graphics/cairo/Makefile
--- a/graphics/cairo/Makefile   Mon Aug 25 15:11:47 2008 +0000
+++ b/graphics/cairo/Makefile   Mon Aug 25 15:36:18 2008 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.65 2008/06/23 16:15:43 joerg Exp $
+# $NetBSD: Makefile,v 1.66 2008/08/25 15:36:18 joerg Exp $
 
 DISTNAME=      cairo-1.6.4
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    graphics
 MASTER_SITES=  http://cairographics.org/releases/
 
diff -r 2ff4b5bda271 -r 4d2b15f3c00d graphics/cairo/distinfo
--- a/graphics/cairo/distinfo   Mon Aug 25 15:11:47 2008 +0000
+++ b/graphics/cairo/distinfo   Mon Aug 25 15:36:18 2008 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.42 2008/05/14 15:26:14 obache Exp $
+$NetBSD: distinfo,v 1.43 2008/08/25 15:36:18 joerg Exp $
 
 SHA1 (cairo-1.6.4.tar.gz) = 9d990fe39a125ceb07221623c237cd7015855d5c
 RMD160 (cairo-1.6.4.tar.gz) = ccae736a40d985b72bda7c2f0a98a0838020658e
@@ -6,3 +6,4 @@
 SHA1 (patch-aa) = 92b1a9746f4f22ceb2f548eca2cfcf14481fae2a
 SHA1 (patch-ab) = 2a0a99846fab962b552efa79c9261927de792dfd
 SHA1 (patch-ac) = 8baca078827ebc7c03eecc14c575a440239c3f03
+SHA1 (patch-ad) = 41ebd6097c2e523ae4618bb248a3d66a1b0f9b4a
diff -r 2ff4b5bda271 -r 4d2b15f3c00d graphics/cairo/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/cairo/patches/patch-ad   Mon Aug 25 15:36:18 2008 +0000
@@ -0,0 +1,27 @@
+$NetBSD: patch-ad,v 1.5 2008/08/25 15:36:18 joerg Exp $
+
+--- src/cairo-png.c.orig       2008-04-11 23:07:25.000000000 +0200
++++ src/cairo-png.c
+@@ -119,6 +119,13 @@ png_simple_warning_callback (png_structp
+ }
+ 
+ 
++/* Starting with libpng-1.2.30, we must explicitly specify an output_flush_fn.
++ * Otherwise, we will segfault if we are writing to a stream. */
++static void
++png_simple_output_flush_fn (png_structp png_ptr)
++{
++}
++
+ static cairo_status_t
+ write_png (cairo_surface_t    *surface,
+          png_rw_ptr           write_func,
+@@ -179,7 +186,7 @@ write_png (cairo_surface_t *surface,
+       goto BAIL3;
+ #endif
+ 
+-    png_set_write_fn (png, closure, write_func, NULL);
++    png_set_write_fn (png, closure, write_func, png_simple_output_flush_fn);
+ 
+     switch (image->format) {
+     case CAIRO_FORMAT_ARGB32: