diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-02-20 17:59:29 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-02-20 17:59:29 +0000 |
| commit | 4834be666a0b36a91c8408b43e7e5a56e5748dbd (patch) | |
| tree | e6895948bf924ce18f54f559a6539eccdd3e58fa /www-client/links/files | |
| parent | x86 stable wrt bug #355539 (diff) | |
| download | gentoo-2-4834be666a0b36a91c8408b43e7e5a56e5748dbd.tar.gz gentoo-2-4834be666a0b36a91c8408b43e7e5a56e5748dbd.tar.bz2 gentoo-2-4834be666a0b36a91c8408b43e7e5a56e5748dbd.zip | |
Fix building with libpng-1.5, convert to EAPI=2, disable unneeded configure workarounds, comment out SDL since upstream has it disabled, remove optional png flag since all graphics mode implicitly need it, and convert to DESTDIR install.
(Portage version: 2.2.0_alpha24/cvs/Linux x86_64)
Diffstat (limited to 'www-client/links/files')
| -rw-r--r-- | www-client/links/files/links-2.3_pre1-libpng-1.5.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/www-client/links/files/links-2.3_pre1-libpng-1.5.patch b/www-client/links/files/links-2.3_pre1-libpng-1.5.patch new file mode 100644 index 000000000000..81b3c69b2a03 --- /dev/null +++ b/www-client/links/files/links-2.3_pre1-libpng-1.5.patch @@ -0,0 +1,38 @@ +--- png.c.orig 2011-02-20 12:47:07.000000000 -0500 ++++ png.c 2011-02-20 12:47:58.000000000 -0500 +@@ -48,7 +48,7 @@ + /* Error for from-web PNG images. */ + void img_my_png_error(png_structp png_ptr, png_const_charp error_string) + { +- longjmp(png_ptr->jmpbuf,1); ++ longjmp(png_jmpbuf(png_ptr),1); + } + + void png_info_callback(png_structp png_ptr, png_infop info_ptr) +@@ -204,7 +204,7 @@ + #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 +214,7 @@ + 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 +233,7 @@ + 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; + } |