Sat Jan 29 11:32:19 2011 UTC ()
Fix build with png-1.5.
(wiz)
diff -r1.18 -r1.19 pkgsrc/x11/fox/distinfo
diff -r0 -r1.6 pkgsrc/x11/fox/patches/patch-ab
--- pkgsrc/x11/fox/distinfo 2008/05/22 22:56:19 1.18
+++ pkgsrc/x11/fox/distinfo 2011/01/29 11:32:19 1.19
| @@ -1,6 +1,7 @@ | | | @@ -1,6 +1,7 @@ |
| 1 | $NetBSD: distinfo,v 1.18 2008/05/22 22:56:19 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.19 2011/01/29 11:32:19 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (fox-1.6.33.tar.gz) = 3100a829bd121d7620b13aadda5b7087933e2057 | | 3 | SHA1 (fox-1.6.33.tar.gz) = 3100a829bd121d7620b13aadda5b7087933e2057 |
| 4 | RMD160 (fox-1.6.33.tar.gz) = ddd515868c83b758f5fb36e81e9175d2963de905 | | 4 | RMD160 (fox-1.6.33.tar.gz) = ddd515868c83b758f5fb36e81e9175d2963de905 |
| 5 | Size (fox-1.6.33.tar.gz) = 4339500 bytes | | 5 | Size (fox-1.6.33.tar.gz) = 4339500 bytes |
| 6 | SHA1 (patch-aa) = 3e0fa9f47b1e1464121b1c9b97b6391eb047a2d1 | | 6 | SHA1 (patch-aa) = 3e0fa9f47b1e1464121b1c9b97b6391eb047a2d1 |
| | | 7 | SHA1 (patch-ab) = 7da560823b8dc062aedb76a3b59aa6afea05dfa6 |
$NetBSD: patch-ab,v 1.6 2011/01/29 11:32:19 wiz Exp $
Fix build with png-1.5.
--- src/fxpngio.cpp.orig 2006-01-22 17:58:54.000000000 +0000
+++ src/fxpngio.cpp
@@ -75,7 +75,11 @@ static void user_flush_fn(png_structp ){
static void user_error_fn(png_structp png_ptr,png_const_charp){
FXStream* store=(FXStream*)png_get_error_ptr(png_ptr);
store->setError(FXStreamFormat); // Flag this as a format error in FXStream
+#if (PNG_LIBPNG_VER < 10500)
longjmp(png_ptr->jmpbuf,1); // Bail out
+#else
+ png_longjmp(png_ptr,1); // Bail out
+#endif
}
@@ -118,7 +122,7 @@ bool fxloadPNG(FXStream& store,FXColor*&
}
// Set error handling
- if(setjmp(png_ptr->jmpbuf)){
+ if(setjmp(png_jmpbuf(png_ptr))){
// Free all of the memory associated with the png_ptr and info_ptr
png_destroy_read_struct(&png_ptr,&info_ptr,(png_infopp)NULL);
@@ -231,7 +235,7 @@ bool fxsavePNG(FXStream& store,const FXC
}
// Set error handling.
- if(setjmp(png_ptr->jmpbuf)){
+ if(setjmp(png_jmpbuf(png_ptr))){
png_destroy_write_struct(&png_ptr,&info_ptr);
return false;
}