From d845b1ed1e5932c38f954e70a1ca7ae5ac6bd7ee Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 19 Apr 2006 17:01:34 +0000
Subject: Fix build with png-1.2.9nb2. Bump PKGREVISION since different
 functions are used. The patch is already integrated in the 1.2rc2 release.

---
 print/cups/Makefile         |  4 ++--
 print/cups/distinfo         |  3 ++-
 print/cups/patches/patch-ai | 22 ++++++++++++++++++++++
 3 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 print/cups/patches/patch-ai

(limited to 'print/cups')

diff --git a/print/cups/Makefile b/print/cups/Makefile
index 61adac84006..a65a0a21997 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2006/04/17 13:45:59 wiz Exp $
+# $NetBSD: Makefile,v 1.110 2006/04/19 17:01:34 wiz Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -6,7 +6,7 @@
 
 DISTNAME=	cups-${DIST_VERS}-source
 PKGNAME=	cups-${VERS}
-PKGREVISION=	9
+PKGREVISION=	10
 BASE_VERS=	1.1.23
 DIST_VERS=	${BASE_VERS}
 VERS=		${DIST_VERS:S/-/./g}
diff --git a/print/cups/distinfo b/print/cups/distinfo
index dfa4f0c0c58..81130153f33 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.39 2006/03/29 17:22:46 joerg Exp $
+$NetBSD: distinfo,v 1.40 2006/04/19 17:01:34 wiz Exp $
 
 SHA1 (cups-1.1.23-source.tar.bz2) = 32d5bfb44c4edc1b54ccb014b5a44499295c6c5c
 RMD160 (cups-1.1.23-source.tar.bz2) = 255ec4c22422b14f2367d69f3ec7e590dc46bea5
@@ -11,6 +11,7 @@ SHA1 (patch-ae) = 773b723b3cbd669cd1695577c578fea0fc7fa7f8
 SHA1 (patch-af) = 04e5bf3b73083eb2457a20b0f5238f017fe4aaab
 SHA1 (patch-ag) = 47a5c7a9ad7c604fa3253aebbaa62f576fb477d0
 SHA1 (patch-ah) = 1ef58b7e1dfcbd8aabb9e822d30f995b3d653ea4
+SHA1 (patch-ai) = 4b335e3b33ff1d3421ae03729fbe57ef7aa0e22f
 SHA1 (patch-an) = 8eb0f80067839d3d112d93e08cb8ad6854fa2b4c
 SHA1 (patch-ao) = c4c8f833cf4a09a686a338df6c209cebec36c6ef
 SHA1 (patch-ap) = 2351844f81a561d69cd02a1e83e30f3c9ee33f5f
diff --git a/print/cups/patches/patch-ai b/print/cups/patches/patch-ai
new file mode 100644
index 00000000000..0a788e096a7
--- /dev/null
+++ b/print/cups/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.14 2006/04/19 17:01:34 wiz Exp $
+
+--- filter/image-png.c.orig	2005-01-03 20:29:57.000000000 +0100
++++ filter/image-png.c
+@@ -82,7 +82,7 @@ ImageReadPNG(image_t    *img,		/* IO - I
+ 
+   png_read_info(pp, info);
+ 
+   fprintf(stderr, "DEBUG: PNG image: %dx%dx%d, color_type=%x (%s%s%s)\n",
+-          info->width, info->height, info->bit_depth, info->color_type,
++          (int)info->width, (int)info->height, info->bit_depth, info->color_type,
+ 	  (info->color_type & PNG_COLOR_MASK_COLOR) ? "RGB" : "GRAYSCALE",
+ 	  (info->color_type & PNG_COLOR_MASK_ALPHA) ? "+ALPHA" : "",
+@@ -252,7 +252,7 @@ ImageReadPNG(image_t    *img,		/* IO - I
+     }
+ 
+   png_read_end(pp, info);
+-  png_read_destroy(pp, info, NULL);
++  png_destroy_read_struct(&pp, &info, NULL);
+ 
+   fclose(fp);
+   free(in);
-- 
cgit v1.2.3