diff options
| author | wiz <wiz@pkgsrc.org> | 2011-01-14 10:32:28 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-01-14 10:32:28 +0000 |
| commit | 9cecee25401e34c195275065e9fb6e2f25f48d6e (patch) | |
| tree | e92aebede95a9f88ac9cfacbb523ee2dda68d69e /www/links | |
| parent | 4726b2f50665c2b3a392d5bd747b9c74842c1cb5 (diff) | |
| download | pkgsrc-9cecee25401e34c195275065e9fb6e2f25f48d6e.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'www/links')
| -rw-r--r-- | www/links/Makefile.common | 3 | ||||
| -rw-r--r-- | www/links/distinfo | 3 | ||||
| -rw-r--r-- | www/links/patches/patch-aa | 45 |
3 files changed, 49 insertions, 2 deletions
diff --git a/www/links/Makefile.common b/www/links/Makefile.common index 04bcb749180..d5f4ffed8c3 100644 --- a/www/links/Makefile.common +++ b/www/links/Makefile.common @@ -1,5 +1,6 @@ -# $NetBSD: Makefile.common,v 1.50 2010/12/02 16:00:38 wiz Exp $ +# $NetBSD: Makefile.common,v 1.51 2011/01/14 10:37:21 wiz Exp $ # used by www/links/Makefile +# used by www/links-gui/Makefile DISTNAME= links-2.3pre1 CATEGORIES= www diff --git a/www/links/distinfo b/www/links/distinfo index d879aec0805..6089dd0a1aa 100644 --- a/www/links/distinfo +++ b/www/links/distinfo @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.52 2010/12/02 16:00:38 wiz Exp $ +$NetBSD: distinfo,v 1.53 2011/01/14 10:37:21 wiz Exp $ SHA1 (links-2.3pre1.tar.bz2) = 6d420a5c4514b45ee245fd3933d2a8cfa6eae76d RMD160 (links-2.3pre1.tar.bz2) = f0cfc8c48c7d5fb759ac58b7f7a00275480ac3de Size (links-2.3pre1.tar.bz2) = 3832651 bytes +SHA1 (patch-aa) = b2a6d47767e7d132c6903a044e9aeeb4b35f0eb6 SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837 diff --git a/www/links/patches/patch-aa b/www/links/patches/patch-aa new file mode 100644 index 00000000000..124a705b893 --- /dev/null +++ b/www/links/patches/patch-aa @@ -0,0 +1,45 @@ +$NetBSD: patch-aa,v 1.6 2011/01/14 10:37:22 wiz Exp $ + +Fix build with png-1.5. + +--- png.c.orig 2008-08-18 01:14:38.000000000 +0000 ++++ png.c +@@ -48,7 +48,11 @@ void img_my_png_warning(png_structp a, p + /* Error for from-web PNG images. */ + void img_my_png_error(png_structp png_ptr, png_const_charp error_string) + { ++#if (PNG_LIBPNG_VER < 10500) + longjmp(png_ptr->jmpbuf,1); ++#else ++ png_longjmp(png_ptr,1); ++#endif + } + + void png_info_callback(png_structp png_ptr, png_infop info_ptr) +@@ -204,7 +208,7 @@ void png_start(struct cached_image *cimg + #ifdef DEBUG + if (!info_ptr) internal ("png_create_info_struct failed\n"); + #endif /* #ifdef DEBUG */ +- if (setjmp(png_ptr->jmpbuf)){ ++ if (setjmp(png_jmpbuf(png_ptr))){ + error: + png_destroy_read_struct(&png_ptr, &info_ptr, + (png_infopp)NULL); +@@ -214,7 +218,7 @@ error: + png_set_progressive_read_fn(png_ptr, NULL, + png_info_callback, png_row_callback, + png_end_callback); +- if (setjmp(png_ptr->jmpbuf)) goto error; ++ if (setjmp(png_jmpbuf(png_ptr))) goto error; + decoder=mem_alloc(sizeof(*decoder)); + decoder->png_ptr=png_ptr; + decoder->info_ptr=info_ptr; +@@ -233,7 +237,7 @@ void png_restart(struct cached_image *ci + png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr; + info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr; + end_callback_hit=0; +- if (setjmp(png_ptr->jmpbuf)){ ++ if (setjmp(png_jmpbuf(png_ptr))){ + img_end(cimg); + return; + } |