diff options
| author | wiz <wiz> | 2011-01-29 11:24:43 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2011-01-29 11:24:43 +0000 |
| commit | 7242f2f2c012bc24ae3f5997fa3bdb0ca1eedfb6 (patch) | |
| tree | a5311772fed186d51d1dbe64a4993b1d8caa11ff /x11/fox | |
| parent | 8af16dc2d1c885f3cffee5890449cae17f990168 (diff) | |
| download | pkgsrc-7242f2f2c012bc24ae3f5997fa3bdb0ca1eedfb6.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'x11/fox')
| -rw-r--r-- | x11/fox/distinfo | 3 | ||||
| -rw-r--r-- | x11/fox/patches/patch-ab | 36 |
2 files changed, 38 insertions, 1 deletions
diff --git a/x11/fox/distinfo b/x11/fox/distinfo index 981279fc5fc..28f4c22eecb 100644 --- a/x11/fox/distinfo +++ b/x11/fox/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.18 2008/05/22 22:56:19 wiz Exp $ +$NetBSD: distinfo,v 1.19 2011/01/29 11:32:19 wiz Exp $ SHA1 (fox-1.6.33.tar.gz) = 3100a829bd121d7620b13aadda5b7087933e2057 RMD160 (fox-1.6.33.tar.gz) = ddd515868c83b758f5fb36e81e9175d2963de905 Size (fox-1.6.33.tar.gz) = 4339500 bytes SHA1 (patch-aa) = 3e0fa9f47b1e1464121b1c9b97b6391eb047a2d1 +SHA1 (patch-ab) = 7da560823b8dc062aedb76a3b59aa6afea05dfa6 diff --git a/x11/fox/patches/patch-ab b/x11/fox/patches/patch-ab new file mode 100644 index 00000000000..16f80c5305a --- /dev/null +++ b/x11/fox/patches/patch-ab @@ -0,0 +1,36 @@ +$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; + } |