Update to 2.3pre2: === RELEASE 2.3pre2 === So dub 16 20:19:07 CEST 2011 mikulas: Utf-8 text terminal support Sat Mar 12 23:55:56 MET 2011 mikulas: Fixed a bug with gpm, if gpm closed a handle on its own, links would occasionaly close it again Mon Aug 9 01:35:29 UTC 2010 mikulas: Don't report terminal size in User-Agent Thu Aug 5 23:31:59 MET 2010 mikulas: Scan for header tags even in document body Sat Jul 31 22:35:04 MET 2010 mikulas: link rel=prefetch Sat Jul 31 22:24:06 MET 2010 mikulas: Interpret style="display:none" Fri Jun 18 20:39:46 MET 2010 mikulas: Fixed crash when unknown Content-Enconding is returned by the server Sat Apr 24 04:11:58 CEST 2010 mikulas: Fix an occasional lockup with Ctrl-Z, fg and framebufferdiff -r1.51 -r1.52 pkgsrc/www/links/Makefile.common
(wiz)
@@ -1,18 +1,18 @@ | @@ -1,18 +1,18 @@ | |||
1 | # $NetBSD: Makefile.common,v 1.51 2011/01/14 10:37:21 wiz Exp $ | 1 | # $NetBSD: Makefile.common,v 1.52 2011/05/02 13:17:47 wiz Exp $ | |
2 | # used by www/links/Makefile | 2 | # used by www/links/Makefile | |
3 | # used by www/links-gui/Makefile | 3 | # used by www/links-gui/Makefile | |
4 | 4 | |||
5 | DISTNAME= links-2.3pre1 | 5 | DISTNAME= links-2.3pre2 | |
6 | CATEGORIES= www | 6 | CATEGORIES= www | |
7 | MASTER_SITES= http://links.twibright.com/download/ | 7 | MASTER_SITES= http://links.twibright.com/download/ | |
8 | EXTRACT_SUFX= .tar.bz2 | 8 | EXTRACT_SUFX= .tar.bz2 | |
9 | 9 | |||
10 | MAINTAINER= wiz@NetBSD.org | 10 | MAINTAINER= wiz@NetBSD.org | |
11 | HOMEPAGE= http://links.twibright.com/ | 11 | HOMEPAGE= http://links.twibright.com/ | |
12 | LICENSE= gnu-gpl-v2 # including special OpenSSL paragraph | 12 | LICENSE= gnu-gpl-v2 # including special OpenSSL paragraph | |
13 | 13 | |||
14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | 14 | PKG_INSTALLATION_TYPES= overwrite pkgviews | |
15 | PKG_DESTDIR_SUPPORT= user-destdir | 15 | PKG_DESTDIR_SUPPORT= user-destdir | |
16 | 16 | |||
17 | GNU_CONFIGURE= YES | 17 | GNU_CONFIGURE= YES | |
18 | 18 |
@@ -1,7 +1,7 @@ | @@ -1,7 +1,7 @@ | |||
1 | $NetBSD: distinfo,v 1.53 2011/01/14 10:37:21 wiz Exp $ | 1 | $NetBSD: distinfo,v 1.54 2011/05/02 13:17:47 wiz Exp $ | |
2 | 2 | |||
3 | SHA1 (links-2.3pre1.tar.bz2) = 6d420a5c4514b45ee245fd3933d2a8cfa6eae76d | 3 | SHA1 (links-2.3pre2.tar.bz2) = 5bc210f746559725565bec1d4748b5c56b263ee5 | |
4 | RMD160 (links-2.3pre1.tar.bz2) = f0cfc8c48c7d5fb759ac58b7f7a00275480ac3de | 4 | RMD160 (links-2.3pre2.tar.bz2) = 800032cf852382b70aa29e6f9a0c2b86bde5b74f | |
5 | Size (links-2.3pre1.tar.bz2) = 3832651 bytes | 5 | Size (links-2.3pre2.tar.bz2) = 3832710 bytes | |
6 | SHA1 (patch-aa) = b2a6d47767e7d132c6903a044e9aeeb4b35f0eb6 | 6 | SHA1 (patch-aa) = 45b6a12bcef9a229cf1b7f2b777c14786b3c5b81 | |
7 | SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837 | 7 | SHA1 (patch-ab) = a2d461c9d8b6300469ab6195886830fdd63be837 |
@@ -1,18 +1,17 @@ | @@ -1,18 +1,17 @@ | |||
1 | # $NetBSD: Makefile,v 1.62 2011/01/13 13:39:39 wiz Exp $ | 1 | # $NetBSD: Makefile,v 1.63 2011/05/02 13:17:47 wiz Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | PKGNAME= ${DISTNAME:S/links/&-gui/} | 4 | PKGNAME= ${DISTNAME:S/links/&-gui/} | |
5 | PKGREVISION= 1 | |||
6 | COMMENT= Lynx-like text and graphics WWW browser | 5 | COMMENT= Lynx-like text and graphics WWW browser | |
7 | 6 | |||
8 | CONFLICTS+= links-[0-9]* elinks-0.3* | 7 | CONFLICTS+= links-[0-9]* elinks-0.3* | |
9 | 8 | |||
10 | USE_TOOLS+= pkg-config | 9 | USE_TOOLS+= pkg-config | |
11 | CONFIGURE_ARGS+= --enable-graphics | 10 | CONFIGURE_ARGS+= --enable-graphics | |
12 | CONFIGURE_ARGS+= --without-sdl | 11 | CONFIGURE_ARGS+= --without-sdl | |
13 | 12 | |||
14 | BUILDLINK_DEPMETHOD.libXt?= build | 13 | BUILDLINK_DEPMETHOD.libXt?= build | |
15 | 14 | |||
16 | .include "../../www/links/Makefile.common" | 15 | .include "../../www/links/Makefile.common" | |
17 | .include "../../graphics/png/buildlink3.mk" | 16 | .include "../../graphics/png/buildlink3.mk" | |
18 | .include "../../graphics/tiff/buildlink3.mk" | 17 | .include "../../graphics/tiff/buildlink3.mk" |
@@ -1,45 +1,45 @@ | @@ -1,45 +1,45 @@ | |||
1 | $NetBSD: patch-aa,v 1.6 2011/01/14 10:37:22 wiz Exp $ | 1 | $NetBSD: patch-aa,v 1.7 2011/05/02 13:17:47 wiz Exp $ | |
2 | 2 | |||
3 | Fix build with png-1.5. | 3 | Fix build with png-1.5. | |
4 | 4 | |||
5 | --- png.c.orig 2008-08-18 01:14:38.000000000 +0000 | 5 | --- png.c.orig 2011-04-19 15:17:49.000000000 +0000 | |
6 | +++ png.c | 6 | +++ png.c | |
7 | @@ -48,7 +48,11 @@ void img_my_png_warning(png_structp a, p | 7 | @@ -38,7 +38,11 @@ static void img_my_png_warning(png_struc | |
8 | /* Error for from-web PNG images. */ | 8 | /* Error for from-web PNG images. */ | |
9 | void img_my_png_error(png_structp png_ptr, png_const_charp error_string) | 9 | static void img_my_png_error(png_structp png_ptr, png_const_charp error_string) | |
10 | { | 10 | { | |
11 | +#if (PNG_LIBPNG_VER < 10500) | 11 | +#if (PNG_LIBPNG_VER < 10500) | |
12 | longjmp(png_ptr->jmpbuf,1); | 12 | longjmp(png_ptr->jmpbuf,1); | |
13 | +#else | 13 | +#else | |
14 | + png_longjmp(png_ptr,1); | 14 | + png_longjmp(png_ptr,1); | |
15 | +#endif | 15 | +#endif | |
16 | } | 16 | } | |
17 | 17 | |||
18 | void png_info_callback(png_structp png_ptr, png_infop info_ptr) | 18 | static void png_info_callback(png_structp png_ptr, png_infop info_ptr) | |
19 | @@ -204,7 +208,7 @@ void png_start(struct cached_image *cimg | 19 | @@ -196,7 +200,7 @@ void png_start(struct cached_image *cimg | |
20 | #ifdef DEBUG | 20 | #ifdef DEBUG | |
21 | if (!info_ptr) internal ("png_create_info_struct failed\n"); | 21 | if (!info_ptr) internal ("png_create_info_struct failed\n"); | |
22 | #endif /* #ifdef DEBUG */ | 22 | #endif /* #ifdef DEBUG */ | |
23 | - if (setjmp(png_ptr->jmpbuf)){ | 23 | - if (setjmp(png_ptr->jmpbuf)){ | |
24 | + if (setjmp(png_jmpbuf(png_ptr))){ | 24 | + if (setjmp(png_jmpbuf(png_ptr))){ | |
25 | error: | 25 | error: | |
26 | png_destroy_read_struct(&png_ptr, &info_ptr, | 26 | png_destroy_read_struct(&png_ptr, &info_ptr, | |
27 | (png_infopp)NULL); | 27 | (png_infopp)NULL); | |
28 | @@ -214,7 +218,7 @@ error: | 28 | @@ -206,7 +210,7 @@ error: | |
29 | png_set_progressive_read_fn(png_ptr, NULL, | 29 | png_set_progressive_read_fn(png_ptr, NULL, | |
30 | png_info_callback, png_row_callback, | 30 | png_info_callback, png_row_callback, | |
31 | png_end_callback); | 31 | png_end_callback); | |
32 | - if (setjmp(png_ptr->jmpbuf)) goto error; | 32 | - if (setjmp(png_ptr->jmpbuf)) goto error; | |
33 | + if (setjmp(png_jmpbuf(png_ptr))) goto error; | 33 | + if (setjmp(png_jmpbuf(png_ptr))) goto error; | |
34 | decoder=mem_alloc(sizeof(*decoder)); | 34 | decoder=mem_alloc(sizeof(*decoder)); | |
35 | decoder->png_ptr=png_ptr; | 35 | decoder->png_ptr=png_ptr; | |
36 | decoder->info_ptr=info_ptr; | 36 | decoder->info_ptr=info_ptr; | |
37 | @@ -233,7 +237,7 @@ void png_restart(struct cached_image *ci | 37 | @@ -225,7 +229,7 @@ void png_restart(struct cached_image *ci | |
38 | png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr; | 38 | png_ptr=((struct png_decoder *)(cimg->decoder))->png_ptr; | |
39 | info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr; | 39 | info_ptr=((struct png_decoder *)(cimg->decoder))->info_ptr; | |
40 | end_callback_hit=0; | 40 | end_callback_hit=0; | |
41 | - if (setjmp(png_ptr->jmpbuf)){ | 41 | - if (setjmp(png_ptr->jmpbuf)){ | |
42 | + if (setjmp(png_jmpbuf(png_ptr))){ | 42 | + if (setjmp(png_jmpbuf(png_ptr))){ | |
43 | img_end(cimg); | 43 | img_end(cimg); | |
44 | return; | 44 | return; | |
45 | } | 45 | } |