From fbb2d762896556b1b14103aeff865be0a6fab851 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Tue, 5 Apr 2011 11:04:39 +0000
Subject: Fix build with png-1.5.

---
 graphics/tuxpaint/distinfo         |  4 ++--
 graphics/tuxpaint/patches/patch-ab | 20 ++++++++++++++++++--
 2 files changed, 20 insertions(+), 4 deletions(-)

(limited to 'graphics/tuxpaint')

diff --git a/graphics/tuxpaint/distinfo b/graphics/tuxpaint/distinfo
index 54262867744..653a5a4717e 100644
--- a/graphics/tuxpaint/distinfo
+++ b/graphics/tuxpaint/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2010/02/03 22:13:09 joerg Exp $
+$NetBSD: distinfo,v 1.21 2011/04/05 11:04:39 wiz Exp $
 
 SHA1 (tuxpaint-0.9.17.tar.gz) = 88e42d19339bb1faa03bce45a28d3fe11fbe05b4
 RMD160 (tuxpaint-0.9.17.tar.gz) = c7cf3636875cad87646cda4df978f9adbbf18630
 Size (tuxpaint-0.9.17.tar.gz) = 7570223 bytes
 SHA1 (patch-aa) = 85365ebbe02084a3f11dcd365e5e5ecdee8c86c9
-SHA1 (patch-ab) = 78cba52d776088c5ad8ba3ea77a8584d0f708159
+SHA1 (patch-ab) = 48277925cd9caf53f4f1a4ed391fc9acc21ea80b
 SHA1 (patch-ad) = ac33e71f3cd7e581d67206a86875492af2836f47
diff --git a/graphics/tuxpaint/patches/patch-ab b/graphics/tuxpaint/patches/patch-ab
index 5f078556c96..765d900f38c 100644
--- a/graphics/tuxpaint/patches/patch-ab
+++ b/graphics/tuxpaint/patches/patch-ab
@@ -1,6 +1,8 @@
-$NetBSD: patch-ab,v 1.4 2007/09/04 21:11:58 drochner Exp $
+$NetBSD: patch-ab,v 1.5 2011/04/05 11:04:40 wiz Exp $
 
---- src/tuxpaint.c.orig	2007-07-01 03:38:03.000000000 +0200
+Third chunk: fix build with png-1.5.
+
+--- src/tuxpaint.c.orig	2007-07-01 01:38:03.000000000 +0000
 +++ src/tuxpaint.c
 @@ -170,7 +170,7 @@ static scaleparams scaletable[] = {
     likely available; if not using GNU, you can set HAVE_STRCASESTR to
@@ -22,3 +24,17 @@ $NetBSD: patch-ab,v 1.4 2007/09/04 21:11:58 drochner Exp $
  #if !defined(RSVG_H) || !defined(RSVG_CAIRO_H)
  #error "---------------------------------------------------"
  #error "If you installed libRSVG from packages, be sure"
+@@ -12528,12 +12528,7 @@ static int do_png_save(FILE * fi, const 
+       {
+ 	png_init_io(png_ptr, fi);
+ 
+-	info_ptr->width = surf->w;
+-	info_ptr->height = surf->h;
+-	info_ptr->bit_depth = 8;
+-	info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+-	info_ptr->interlace_type = 1;
+-	info_ptr->valid = 0;	// will be updated by various png_set_FOO() functions
++	png_set_IHDR(png_ptr, info_ptr, surf->w, surf->h, 8, PNG_COLOR_TYPE_RGB, 1, PNG_COMPRESSION_TYPE_BASE, PNG_FILTER_TYPE_BASE);
+ 
+ 	png_set_sRGB_gAMA_and_cHRM(png_ptr, info_ptr,
+ 				   PNG_sRGB_INTENT_PERCEPTUAL);
-- 
cgit v1.2.3