Thu Jan 13 17:14:43 2011 UTC ()
Fix build with png-1.5.
(wiz)
diff -r1.4 -r1.5 pkgsrc/graphics/gdk-pixbuf2/distinfo
diff -r0 -r1.1 pkgsrc/graphics/gdk-pixbuf2/patches/patch-af
--- pkgsrc/graphics/gdk-pixbuf2/distinfo 2010/11/23 13:05:22 1.4
+++ pkgsrc/graphics/gdk-pixbuf2/distinfo 2011/01/13 17:14:43 1.5
| @@ -1,10 +1,11 @@ | | | @@ -1,10 +1,11 @@ |
| 1 | $NetBSD: distinfo,v 1.4 2010/11/23 13:05:22 he Exp $ | | 1 | $NetBSD: distinfo,v 1.5 2011/01/13 17:14:43 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (gdk-pixbuf-2.22.1.tar.bz2) = b452208963ddd84f7280865695b50255fcafaa2e | | 3 | SHA1 (gdk-pixbuf-2.22.1.tar.bz2) = b452208963ddd84f7280865695b50255fcafaa2e |
| 4 | RMD160 (gdk-pixbuf-2.22.1.tar.bz2) = d05d6642e147281b7dc1dd21657595333f13f6f1 | | 4 | RMD160 (gdk-pixbuf-2.22.1.tar.bz2) = d05d6642e147281b7dc1dd21657595333f13f6f1 |
| 5 | Size (gdk-pixbuf-2.22.1.tar.bz2) = 1543273 bytes | | 5 | Size (gdk-pixbuf-2.22.1.tar.bz2) = 1543273 bytes |
| 6 | SHA1 (patch-aa) = d5106a1436ad6899c30188c46246a066b13548df | | 6 | SHA1 (patch-aa) = d5106a1436ad6899c30188c46246a066b13548df |
| 7 | SHA1 (patch-ab) = d18a235ce973ef132e9dc777b1cf029b064c02ef | | 7 | SHA1 (patch-ab) = d18a235ce973ef132e9dc777b1cf029b064c02ef |
| 8 | SHA1 (patch-ac) = f8c8ff3175cee6a88938a0aaa081d3bd832a050d | | 8 | SHA1 (patch-ac) = f8c8ff3175cee6a88938a0aaa081d3bd832a050d |
| 9 | SHA1 (patch-ad) = 00b9186e0d3513a518c263b6d2f8350fc977580d | | 9 | SHA1 (patch-ad) = 00b9186e0d3513a518c263b6d2f8350fc977580d |
| 10 | SHA1 (patch-ae) = d4ad340e16589c579ec964bf95fd951b334adf04 | | 10 | SHA1 (patch-ae) = d4ad340e16589c579ec964bf95fd951b334adf04 |
| | | 11 | SHA1 (patch-af) = ee6fdf4c2ef334873b56487dafe4e2a0d055318b |
$NetBSD: patch-af,v 1.1 2011/01/13 17:14:43 wiz Exp $
Fix build with png-1.5.
--- gdk-pixbuf/io-png.c.orig 2010-07-10 00:54:35.000000000 +0000
+++ gdk-pixbuf/io-png.c
@@ -183,7 +183,11 @@ png_simple_error_callback(png_structp pn
error_msg);
}
+#if (PNG_LIBPNG_VER < 10500)
longjmp (png_save_ptr->jmpbuf, 1);
+#else
+ png_longjmp (png_save_ptr, 1);
+#endif
}
static void
@@ -287,7 +291,7 @@ gdk_pixbuf__png_image_load (FILE *f, GEr
return NULL;
}
- if (setjmp (png_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf(png_ptr))) {
g_free (rows);
if (pixbuf)
@@ -459,7 +463,7 @@ gdk_pixbuf__png_image_begin_load (GdkPix
return NULL;
}
- if (setjmp (lc->png_read_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
if (lc->png_info_ptr)
png_destroy_read_struct(&lc->png_read_ptr, NULL, NULL);
g_free(lc);
@@ -531,7 +535,7 @@ gdk_pixbuf__png_image_load_increment(gpo
lc->error = error;
/* Invokes our callbacks as needed */
- if (setjmp (lc->png_read_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf(lc->png_read_ptr))) {
lc->error = NULL;
return FALSE;
} else {
@@ -654,7 +658,7 @@ png_info_callback (png_structp png_rea
GDK_PIXBUF_ERROR,
GDK_PIXBUF_ERROR_INSUFFICIENT_MEMORY,
_("Insufficient memory to store a %ld by %ld image; try exiting some applications to reduce memory usage"),
- width, height);
+ (long)width, (long)height);
}
return;
}
@@ -769,7 +773,11 @@ png_error_callback(png_structp png_read_
error_msg);
}
+#if (PNG_LIBPNG_VER < 10500)
longjmp (png_read_ptr->jmpbuf, 1);
+#else
+ png_longjmp (png_read_ptr, 1);
+#endif
}
static void
@@ -978,7 +986,7 @@ static gboolean real_save_png (GdkPixbuf
success = FALSE;
goto cleanup;
}
- if (setjmp (png_ptr->jmpbuf)) {
+ if (setjmp (png_jmpbuf(png_ptr))) {
success = FALSE;
goto cleanup;
}