[pkgsrc/trunk]: pkgsrc/graphics/gimp24 Fix build with png-1.2.9nb2. Bump PKGR...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bd035a8ab99e
branches:  trunk
changeset: 511848:bd035a8ab99e
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sun Apr 23 18:29:39 2006 +0000

description:
Fix build with png-1.2.9nb2. Bump PKGREVISION.

diffstat:

 graphics/gimp24/Makefile         |   4 ++--
 graphics/gimp24/distinfo         |   3 ++-
 graphics/gimp24/patches/patch-ae |  37 +++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 3 deletions(-)

diffs (68 lines):

diff -r a00ceeca7dd0 -r bd035a8ab99e graphics/gimp24/Makefile
--- a/graphics/gimp24/Makefile  Sun Apr 23 18:26:51 2006 +0000
+++ b/graphics/gimp24/Makefile  Sun Apr 23 18:29:39 2006 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2006/04/23 18:29:39 wiz Exp $
 
 DISTNAME=      gimp-2.3.8
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 MASTER_SITES=  ftp://ftp.gimp.org/pub/gimp/v2.3/ \
                ftp://ftp.cs.umn.edu/pub/gimp/v2.3/ \
diff -r a00ceeca7dd0 -r bd035a8ab99e graphics/gimp24/distinfo
--- a/graphics/gimp24/distinfo  Sun Apr 23 18:26:51 2006 +0000
+++ b/graphics/gimp24/distinfo  Sun Apr 23 18:29:39 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2006/04/14 10:49:41 adam Exp $
+$NetBSD: distinfo,v 1.5 2006/04/23 18:29:39 wiz Exp $
 
 SHA1 (gimp-2.3.8.tar.bz2) = 32721b460582a3d3e267703c0f8829e24379306d
 RMD160 (gimp-2.3.8.tar.bz2) = db4bb4cd580efd8c06e8362935e9d98e74b057aa
@@ -7,3 +7,4 @@
 SHA1 (patch-ab) = 57fde7f50489fe16383ef85677670b38fd3cc089
 SHA1 (patch-ac) = 22e1d7c34486cf17ab2af3b01426b67a761078fa
 SHA1 (patch-ad) = 24c141e55321d36b45e0e17712882185fc5f04ac
+SHA1 (patch-ae) = 14ef2ed4ee4b3049b052ab4bf33bc60346c22b53
diff -r a00ceeca7dd0 -r bd035a8ab99e graphics/gimp24/patches/patch-ae
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/graphics/gimp24/patches/patch-ae  Sun Apr 23 18:29:39 2006 +0000
@@ -0,0 +1,37 @@
+$NetBSD: patch-ae,v 1.1 2006/04/23 18:29:39 wiz Exp $
+
+--- plug-ins/common/png.c.orig 2005-11-04 21:19:00.000000000 +0100
++++ plug-ins/common/png.c
+@@ -1095,12 +1095,10 @@ load_image (const gchar *filename,
+    * Done with the file...
+    */
+ 
+-  png_read_destroy (pp, info, NULL);
++  png_destroy_read_struct (&pp, &info, NULL);
+ 
+   g_free (pixel);
+   g_free (pixels);
+-  free (pp);
+-  free (info);
+ 
+   fclose (fp);
+ 
+@@ -1553,7 +1551,7 @@ save_image (const gchar *filename,
+     }
+ 
+   png_write_end (pp, info);
+-  png_write_destroy (pp);
++  png_destroy_read_struct (&pp, &info, NULL);
+ 
+   g_free (pixel);
+   g_free (pixels);
+@@ -1568,9 +1566,6 @@ save_image (const gchar *filename,
+       g_free (text);
+     }
+ 
+-  free (pp);
+-  free (info);
+-
+   fclose (fp);
+ 
+   return TRUE;