summaryrefslogtreecommitdiff
path: root/graphics/enblend-enfuse
diff options
context:
space:
mode:
authoradam <adam@pkgsrc.org>2011-01-29 16:38:33 +0000
committeradam <adam@pkgsrc.org>2011-01-29 16:38:33 +0000
commitb51f957ad3f61c2221ca043b7ce4a1ae0ca8e0e8 (patch)
treedb1ae6f362d81c2d80dc51e4defe1eff9ab002eb /graphics/enblend-enfuse
parent67c4013108f4337d8dde0711d7c39e7234ca6f64 (diff)
downloadpkgsrc-b51f957ad3f61c2221ca043b7ce4a1ae0ca8e0e8.tar.gz
Fix building with libpng-1.5
Diffstat (limited to 'graphics/enblend-enfuse')
-rw-r--r--graphics/enblend-enfuse/distinfo4
-rw-r--r--graphics/enblend-enfuse/patches/patch-ae12
2 files changed, 11 insertions, 5 deletions
diff --git a/graphics/enblend-enfuse/distinfo b/graphics/enblend-enfuse/distinfo
index c37fb955d01..53b206f37aa 100644
--- a/graphics/enblend-enfuse/distinfo
+++ b/graphics/enblend-enfuse/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2011/01/29 16:30:41 adam Exp $
+$NetBSD: distinfo,v 1.8 2011/01/29 16:38:33 adam Exp $
SHA1 (enblend-enfuse-4.0/enblend-enfuse-4.0.tar.gz) = 34c3a5ce11c6ef0ef520d8a15a3cb6a94a567033
RMD160 (enblend-enfuse-4.0/enblend-enfuse-4.0.tar.gz) = 9e531b5bf6f7258ef8778c01b456979e0bc04338
@@ -7,6 +7,6 @@ SHA1 (patch-aa) = b1809fe6ef6609658b697635c6cbf0c112a03fd1
SHA1 (patch-ab) = afc074bb94e2a2b96c654c37540072514ba0bce0
SHA1 (patch-ac) = 916f4655ff30013583014eb8deecc72bd19ae55d
SHA1 (patch-ad) = 735b9bb01a8a76ec3dc4a13cece4d79681c2d951
-SHA1 (patch-ae) = 7dc598bd9a2eda75e762c46b2aebc4004de6a817
+SHA1 (patch-ae) = fbb68114f877cf01960b353b527fa45cdac6b59d
SHA1 (patch-af) = a32710958e30000fe75ecd436071306ea4b1844c
SHA1 (patch-ag) = 6ef31f8b5ce54883e636adf23b4ea615ae9c752d
diff --git a/graphics/enblend-enfuse/patches/patch-ae b/graphics/enblend-enfuse/patches/patch-ae
index 53e9d07a99c..ad2e971aa58 100644
--- a/graphics/enblend-enfuse/patches/patch-ae
+++ b/graphics/enblend-enfuse/patches/patch-ae
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.2 2011/01/29 16:30:41 adam Exp $
+$NetBSD: patch-ae,v 1.3 2011/01/29 16:38:33 adam Exp $
---- src/vigra_impex/png.cxx.orig 2011-01-29 14:59:12.000000000 +0000
+--- src/vigra_impex/png.cxx.orig 2009-12-20 15:32:28.000000000 +0000
+++ src/vigra_impex/png.cxx
@@ -81,7 +81,11 @@ extern "C" {
static void PngError( png_structp png_ptr, png_const_charp error_msg )
@@ -194,7 +194,7 @@ $NetBSD: patch-ae,v 1.2 2011/01/29 16:30:41 adam Exp $
vigra_postcondition( false, png_error_message.insert(0, "error in png_set_oFFs(): ").c_str() );
png_set_oFFs(png, info, position.x, position.y, PNG_OFFSET_PIXEL);
}
-@@ -597,7 +601,7 @@ namespace vigra {
+@@ -597,12 +601,12 @@ namespace vigra {
// set icc profile
if (iccProfile.size() > 0) {
png_set_iCCP(png, info, "icc", 0,
@@ -203,6 +203,12 @@ $NetBSD: patch-ae,v 1.2 2011/01/29 16:30:41 adam Exp $
}
#endif
+ // write the info struct
+- if (setjmp(png->jmpbuf))
++ if (setjmp(png_jmpbuf(png)))
+ vigra_postcondition( false, png_error_message.insert(0, "error in png_write_info(): ").c_str() );
+ png_write_info( png, info );
+
@@ -634,10 +638,10 @@ namespace vigra {
}