diff options
| author | ryoon <ryoon@pkgsrc.org> | 2011-01-19 12:45:22 +0000 |
|---|---|---|
| committer | ryoon <ryoon@pkgsrc.org> | 2011-01-19 12:45:22 +0000 |
| commit | 2316398f001ed68f4b344681cdfe5f49b3e6a99f (patch) | |
| tree | 50693ff28fe65293a9172890dec3cea43d41abda | |
| parent | b9c8180cc232dca52bb13a2a90d197d001080a31 (diff) | |
| download | pkgsrc-2316398f001ed68f4b344681cdfe5f49b3e6a99f.tar.gz | |
Fix build with png-1.5.
| -rw-r--r-- | graphics/gdk-pixbuf/distinfo | 3 | ||||
| -rw-r--r-- | graphics/gdk-pixbuf/patches/patch-an | 31 |
2 files changed, 33 insertions, 1 deletions
diff --git a/graphics/gdk-pixbuf/distinfo b/graphics/gdk-pixbuf/distinfo index c926f222152..3bc6c57f96a 100644 --- a/graphics/gdk-pixbuf/distinfo +++ b/graphics/gdk-pixbuf/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.20 2009/01/20 21:27:51 sketch Exp $ +$NetBSD: distinfo,v 1.21 2011/01/19 12:45:22 ryoon Exp $ SHA1 (gdk-pixbuf-0.22.0.tar.bz2) = 495324afb5abebc14567ffd5a6cd72333bcc7f5b RMD160 (gdk-pixbuf-0.22.0.tar.bz2) = 0e56a0f883fd8e3fb4d49b9a38f984b95cd96ece @@ -16,3 +16,4 @@ SHA1 (patch-aj) = 107cbe0e9756818ae2529cc4791d7cd06d476a7c SHA1 (patch-ak) = 123b32f70b0feb91bb3e0c2ca8e705ff2ae381bf SHA1 (patch-al) = cf05f283c7676c9fa51b822f5ced66524dfa487e SHA1 (patch-am) = 44180cb58cba4b5cc5663acc0215978001f82fa0 +SHA1 (patch-an) = ec341ab166c5ce98d1d0ba13b676646af50f7038 diff --git a/graphics/gdk-pixbuf/patches/patch-an b/graphics/gdk-pixbuf/patches/patch-an new file mode 100644 index 00000000000..2242e9c8595 --- /dev/null +++ b/graphics/gdk-pixbuf/patches/patch-an @@ -0,0 +1,31 @@ +$NetBSD: patch-an,v 1.1 2011/01/19 12:45:23 ryoon Exp $ + +--- gdk-pixbuf/io-png.c.orig 2001-01-24 20:59:23.000000000 +0000 ++++ gdk-pixbuf/io-png.c +@@ -175,7 +175,7 @@ gdk_pixbuf__png_image_load (FILE *f) + return NULL; + } + +- if (setjmp (png_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(png_ptr))) { + png_destroy_read_struct (&png_ptr, &info_ptr, &end_info); + return NULL; + } +@@ -311,7 +311,7 @@ gdk_pixbuf__png_image_begin_load (Module + 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); +@@ -366,7 +366,7 @@ gdk_pixbuf__png_image_load_increment(gpo + lc->max_row_seen_in_chunk = -1; + + /* Invokes our callbacks as needed */ +- if (setjmp (lc->png_read_ptr->jmpbuf)) { ++ if (setjmp (png_jmpbuf(lc->png_read_ptr))) { + return FALSE; + } else { + png_process_data(lc->png_read_ptr, lc->png_info_ptr, buf, size); |