summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkim <kim@pkgsrc.org>2004-08-29 16:44:48 +0000
committerkim <kim@pkgsrc.org>2004-08-29 16:44:48 +0000
commit123370c345d3bb783eeba89e78d349fa0ab9d35d (patch)
treec9092af601ca5540e0b76bd5ffb592bf1808a517
parent57061cf7aef12764a656c201fb01d792dde8d31c (diff)
downloadpkgsrc-123370c345d3bb783eeba89e78d349fa0ab9d35d.tar.gz
Make this compile with png-1.2.6
-rw-r--r--graphics/pngcrush/distinfo4
-rw-r--r--graphics/pngcrush/patches/patch-aa21
2 files changed, 19 insertions, 6 deletions
diff --git a/graphics/pngcrush/distinfo b/graphics/pngcrush/distinfo
index 7f9779f5653..85b34f75eaf 100644
--- a/graphics/pngcrush/distinfo
+++ b/graphics/pngcrush/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.6 2004/01/12 21:23:05 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/08/29 16:44:48 kim Exp $
SHA1 (pngcrush-1.5.10.tar.gz) = 469e41c2fdf5fefd307119643616d8d2c86e35b4
Size (pngcrush-1.5.10.tar.gz) = 313220 bytes
-SHA1 (patch-aa) = f3451b97ae974df79e786faba5dc588901e21d15
+SHA1 (patch-aa) = e0c26f3cb2eb01c7f11f7cfb1b575d3c5ab71361
diff --git a/graphics/pngcrush/patches/patch-aa b/graphics/pngcrush/patches/patch-aa
index a1d1277726d..44f2966e201 100644
--- a/graphics/pngcrush/patches/patch-aa
+++ b/graphics/pngcrush/patches/patch-aa
@@ -1,13 +1,26 @@
-$NetBSD: patch-aa,v 1.1 2004/01/12 21:23:05 adam Exp $
+$NetBSD: patch-aa,v 1.2 2004/08/29 16:44:48 kim Exp $
---- pngcrush.c.orig 2004-01-12 21:40:44.000000000 +0000
-+++ pngcrush.c
-@@ -416,7 +416,7 @@
+--- pngcrush.c.orig 2002-07-20 23:51:20.000000000 -0400
++++ pngcrush.c 2004-08-29 12:43:38.000000000 -0400
+@@ -416,7 +416,20 @@
*/
#define PNG_INTERNAL
-#include "png.h"
+#include <png.h>
++
++#ifndef HANDLE_CHUNK_AS_DEFAULT
++#define HANDLE_CHUNK_AS_DEFAULT PNG_HANDLE_CHUNK_AS_DEFAULT
++#endif
++#ifndef HANDLE_CHUNK_NEVER
++#define HANDLE_CHUNK_NEVER PNG_HANDLE_CHUNK_NEVER
++#endif
++#ifndef HANDLE_CHUNK_IF_SAFE
++#define HANDLE_CHUNK_IF_SAFE PNG_HANDLE_CHUNK_IF_SAFE
++#endif
++#ifndef HANDLE_CHUNK_ALWAYS
++#define HANDLE_CHUNK_ALWAYS PNG_HANDLE_CHUNK_ALWAYS
++#endif
/* we don't need the some of the extra libpng transformations
* so they are ifdef'ed out in a special version of pngconf.h, which