From 2b74a89bc8342f0b9b737c37d87737caf7b0ea1e Mon Sep 17 00:00:00 2001
From: Dirk Meyer <dinoex@FreeBSD.org>
Date: Fri, 1 Jun 2012 05:26:28 +0000
Subject: - update png to 1.5.10

---
 graphics/libafterimage/Makefile             |  3 ++-
 graphics/libafterimage/files/patch-export.c | 11 +++++++++++
 graphics/libafterimage/files/patch-import.c | 19 +++++++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 graphics/libafterimage/files/patch-export.c
 create mode 100644 graphics/libafterimage/files/patch-import.c

(limited to 'graphics/libafterimage')

diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index a13f188ae5c8..77e51cb09ab3 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	libafterimage
 PORTVERSION=	1.20
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	SF/afterstep/libAfterImage/${PORTVERSION}
 DISTNAME=	libAfterImage-${PORTVERSION}
@@ -17,7 +18,7 @@ COMMENT=	Generic imaging library originally designed for AfterStep
 
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		gif.5:${PORTSDIR}/graphics/giflib \
-		png.6:${PORTSDIR}/graphics/png \
+		png15:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.9:${PORTSDIR}/print/freetype2
 
diff --git a/graphics/libafterimage/files/patch-export.c b/graphics/libafterimage/files/patch-export.c
new file mode 100644
index 000000000000..950da3b1b275
--- /dev/null
+++ b/graphics/libafterimage/files/patch-export.c
@@ -0,0 +1,11 @@
+--- export.c.orig	2011-01-15 06:52:22.000000000 +0100
++++ export.c	2012-05-04 12:57:15.000000000 +0200
+@@ -496,7 +496,7 @@
+ 	png_ptr = png_create_write_struct( PNG_LIBPNG_VER_STRING, NULL, NULL, NULL );
+     if ( png_ptr != NULL )
+     	if( (info_ptr = png_create_info_struct(png_ptr)) != NULL )
+-			if( setjmp(png_ptr->jmpbuf) )
++			if( setjmp(png_jmpbuf(png_ptr)) )
+ 			{
+ 				png_destroy_info_struct(png_ptr, (png_infopp) &info_ptr);
+ 				info_ptr = NULL ;
diff --git a/graphics/libafterimage/files/patch-import.c b/graphics/libafterimage/files/patch-import.c
new file mode 100644
index 000000000000..3b2a5f7f8b47
--- /dev/null
+++ b/graphics/libafterimage/files/patch-import.c
@@ -0,0 +1,19 @@
+--- import.c.orig	2011-01-15 06:52:22.000000000 +0100
++++ import.c	2012-05-04 18:57:46.000000000 +0200
+@@ -40,6 +40,7 @@
+ # else
+ #  include <png.h>
+ # endif
++# include <pngpriv.h>
+ #else
+ # include <setjmp.h>
+ # ifdef HAVE_JPEG
+@@ -1251,7 +1252,7 @@
+ 			 * the normal method of doing things with libpng).  REQUIRED unless you
+ 			 * set up your own error handlers in the png_create_read_struct() earlier.
+ 			 */
+-			if ( !setjmp (png_ptr->jmpbuf))
++			if ( !setjmp (png_jmpbuf(png_ptr)))
+ 			{
+ 				ASFlagType rgb_flags = ASStorage_RLEDiffCompress|ASStorage_32Bit ;
+ 
-- 
cgit v1.2.3