Fix the crossfire-client* packages for png-1.5.

3 files changed, 54 insertions, 0 deletions

diff --git a/games/crossfire-client/patches/patch-gtk-v2_src_png.c b/games/crossfire-client/patches/patch-gtk-v2_src_png.c
new file mode 100644
index 00000000000..87c1598727e
--- /dev/null
+++ b/games/crossfire-client/patches/patch-gtk-v2_src_png.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtk-v2_src_png.c,v 1.1 2011/04/01 15:31:33 wiz Exp $
+
+Fix build with png-1.5.
+
+--- gtk-v2/src/png.c.orig	2008-01-29 07:29:07.000000000 +0000
++++ gtk-v2/src/png.c
+@@ -532,7 +532,7 @@ int png_to_gdkpixmap(GdkWindow *window, 
+ 	png_destroy_read_struct (&png_ptr, NULL, NULL);
+ 	return PNGX_OUTOFMEM;
+     }
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct (&png_ptr, &info_ptr,NULL);
+ 	return PNGX_DATA;
+     }
diff --git a/games/crossfire-client/patches/patch-gtk_png.c b/games/crossfire-client/patches/patch-gtk_png.c
new file mode 100644
index 00000000000..cd6cfb57a30
--- /dev/null
+++ b/games/crossfire-client/patches/patch-gtk_png.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-gtk_png.c,v 1.1 2011/04/01 15:31:33 wiz Exp $
+
+Fix build with png-1.5.
+
+--- gtk/png.c.orig	2008-01-29 07:29:04.000000000 +0000
++++ gtk/png.c
+@@ -86,7 +86,7 @@ uint8 *png_to_data(uint8 *data, int len,
+ 	png_destroy_read_struct (&png_ptr, NULL, NULL);
+ 	return NULL;
+     }
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+ 	return NULL;
+     }
diff --git a/games/crossfire-client/patches/patch-x11_png.c b/games/crossfire-client/patches/patch-x11_png.c
new file mode 100644
index 00000000000..92e3784b41b
--- /dev/null
+++ b/games/crossfire-client/patches/patch-x11_png.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-x11_png.c,v 1.1 2011/04/01 15:31:33 wiz Exp $
+
+Fix build with png-1.5.
+
+--- x11/png.c.orig	2008-01-29 07:29:06.000000000 +0000
++++ x11/png.c
+@@ -88,7 +88,7 @@ uint8 *png_to_data(unsigned char *data, 
+ 	png_destroy_read_struct (&png_ptr, NULL, NULL);
+ 	return NULL;
+     }
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+ 	return NULL;
+     }
+@@ -600,7 +600,7 @@ int png_to_xpixmap(Display *display, Dra
+ 	png_destroy_read_struct (&png_ptr, NULL, NULL);
+ 	return PNGX_OUTOFMEM;
+     }
+-    if (setjmp (png_ptr->jmpbuf)) {
++    if (setjmp (png_jmpbuf(png_ptr))) {
+ 	png_destroy_read_struct (&png_ptr, &info_ptr, NULL);
+ 	return PNGX_DATA;
+     }