summaryrefslogtreecommitdiff
path: root/mail/spamprobe
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2010-06-15 14:31:09 +0000
committerwiz <wiz@pkgsrc.org>2010-06-15 14:31:09 +0000
commit2b1ec62847d83a93596d855c1dc37ce545821433 (patch)
tree2b8b9ffdb3d667e211178b8d5dd66ae465809766 /mail/spamprobe
parent4674ee332790fe1f41ddba0953305f53d73c426a (diff)
downloadpkgsrc-2b1ec62847d83a93596d855c1dc37ce545821433.tar.gz
Fix build with png-1.4.x. Addresses PR 43477.
Diffstat (limited to 'mail/spamprobe')
-rw-r--r--mail/spamprobe/distinfo3
-rw-r--r--mail/spamprobe/patches/patch-ab25
2 files changed, 27 insertions, 1 deletions
diff --git a/mail/spamprobe/distinfo b/mail/spamprobe/distinfo
index 0d2af4626fc..a7160f37731 100644
--- a/mail/spamprobe/distinfo
+++ b/mail/spamprobe/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.13 2010/06/02 13:17:22 adam Exp $
+$NetBSD: distinfo,v 1.14 2010/06/15 14:31:09 wiz Exp $
SHA1 (spamprobe-1.4d.tar.gz) = fbcd65eb21097cd860d5e5ee2c4c2524c717a237
RMD160 (spamprobe-1.4d.tar.gz) = 4a9e098b92e6900d8b03d7ed5e8d052f2b2e8c56
Size (spamprobe-1.4d.tar.gz) = 262761 bytes
SHA1 (patch-aa) = 1a139882a9913537663a0d03b645e014b488ecbe
+SHA1 (patch-ab) = da2cd2cbc3b37e529e45b67eb7eea127afcaa07c
diff --git a/mail/spamprobe/patches/patch-ab b/mail/spamprobe/patches/patch-ab
new file mode 100644
index 00000000000..6da42f44710
--- /dev/null
+++ b/mail/spamprobe/patches/patch-ab
@@ -0,0 +1,25 @@
+$NetBSD: patch-ab,v 1.1 2010/06/15 14:31:10 wiz Exp $
+
+--- src/parser/PngParser.cc.orig 2006-11-17 07:11:10.000000000 +0000
++++ src/parser/PngParser.cc
+@@ -53,9 +53,9 @@ PngParser::~PngParser()
+ {
+ if (m_initialized) {
+ if (m_infoPtr) {
+- png_destroy_read_struct(&m_pngPtr, &m_infoPtr, png_infopp_NULL);
++ png_destroy_read_struct(&m_pngPtr, &m_infoPtr, NULL);
+ } else {
+- png_destroy_read_struct(&m_pngPtr, png_infopp_NULL, png_infopp_NULL);
++ png_destroy_read_struct(&m_pngPtr, NULL, NULL);
+ }
+ }
+ }
+@@ -104,7 +104,7 @@ void PngParser::tokenizeImage()
+ int bit_depth, color_type, interlace_type;
+
+ png_get_IHDR(m_pngPtr, m_infoPtr, &width, &height, &bit_depth, &color_type,
+- &interlace_type, int_p_NULL, int_p_NULL);
++ &interlace_type, NULL, NULL);
+
+ string base_token("image_0");
+ sendToken(base_token + "_height_" + num_to_string((int)width));