From d486f260f00beab69341971d20609e2425465354 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 3 May 2013 09:51:45 +0200 Subject: update to latest upstream --- package/links/Makefile | 4 ++-- package/links/patches/patch-png_c | 38 -------------------------------------- 2 files changed, 2 insertions(+), 40 deletions(-) delete mode 100644 package/links/patches/patch-png_c (limited to 'package') diff --git a/package/links/Makefile b/package/links/Makefile index 616c2f211..3182d643c 100644 --- a/package/links/Makefile +++ b/package/links/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= links -PKG_VERSION:= 2.2 +PKG_VERSION:= 2.7 PKG_RELEASE:= 1 -PKG_MD5SUM:= c9937f9ed0061f264973182f871fb667 +PKG_MD5SUM:= 6b5ca02e180aed2f78ca2712f85e3ba5 PKG_DESCR:= web browser with graphic support PKG_SECTION:= browser PKG_DEPENDS:= libpng libjpeg libtiff gpm libopenssl diff --git a/package/links/patches/patch-png_c b/package/links/patches/patch-png_c deleted file mode 100644 index ff067ba86..000000000 --- a/package/links/patches/patch-png_c +++ /dev/null @@ -1,38 +0,0 @@ ---- links-2.2.orig/png.c 2005-01-02 20:03:34.000000000 +0100 -+++ links-2.2/png.c 2011-04-01 15:01:25.801818815 +0200 -@@ -48,7 +48,7 @@ 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) - { -- longjmp(png_ptr->jmpbuf,1); -+ longjmp(png_jmpbuf(png_ptr),1); - } - - void png_info_callback(png_structp png_ptr, png_infop info_ptr) -@@ -203,7 +203,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); -@@ -213,7 +213,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; -@@ -232,7 +232,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; - } -- cgit v1.2.3