diff options
| author | wiz <wiz@pkgsrc.org> | 2011-04-05 12:01:59 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-04-05 12:01:59 +0000 |
| commit | e93357d79b16da962f11d8911d8c458c5124f9c6 (patch) | |
| tree | 9121356af412ca4f2bd761fd14363e013d0cfdce /wm | |
| parent | 7e7afe0757ca0dc47a6fc1ad719b3d455385d2e1 (diff) | |
| download | pkgsrc-e93357d79b16da962f11d8911d8c458c5124f9c6.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/afterstep/distinfo | 4 | ||||
| -rw-r--r-- | wm/afterstep/patches/patch-libAfterImage_export.c | 15 | ||||
| -rw-r--r-- | wm/afterstep/patches/patch-libAfterImage_import.c | 15 |
3 files changed, 33 insertions, 1 deletions
diff --git a/wm/afterstep/distinfo b/wm/afterstep/distinfo index ac8970598d4..97a91304338 100644 --- a/wm/afterstep/distinfo +++ b/wm/afterstep/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.12 2007/03/07 04:41:57 rillig Exp $ +$NetBSD: distinfo,v 1.13 2011/04/05 12:01:59 wiz Exp $ SHA1 (AfterStep-2.1.2.tar.bz2) = c367e7c73561ddf03b3725f80d2f39f50d2b45bd RMD160 (AfterStep-2.1.2.tar.bz2) = f891ded642b9190bd261f3e3f92cb595da2d785b @@ -6,3 +6,5 @@ Size (AfterStep-2.1.2.tar.bz2) = 5079333 bytes SHA1 (patch-aa) = c903ca64b609e4270ead1f1e03cb6ea962b294f8 SHA1 (patch-ab) = b513b41f5be32170c3e7027d53e44625cbb4958a SHA1 (patch-ac) = bbf8b111e335941f5cf8f3fab28c1e1dcc884713 +SHA1 (patch-libAfterImage_export.c) = 0b450561673cb3351c2f8685ba7357cc6a1de366 +SHA1 (patch-libAfterImage_import.c) = b8651c189e49c41eeff91bbd3498b79cdb0a7496 diff --git a/wm/afterstep/patches/patch-libAfterImage_export.c b/wm/afterstep/patches/patch-libAfterImage_export.c new file mode 100644 index 00000000000..fcd9f77163f --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterImage_export.c @@ -0,0 +1,15 @@ +$NetBSD: patch-libAfterImage_export.c,v 1.1 2011/04/05 12:02:00 wiz Exp $ + +Fix build with png-1.5. + +--- libAfterImage/export.c.orig 2005-03-09 23:59:06.000000000 +0000 ++++ libAfterImage/export.c +@@ -371,7 +371,7 @@ ASImage2png_int ( ASImage *im, void *dat + 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/wm/afterstep/patches/patch-libAfterImage_import.c b/wm/afterstep/patches/patch-libAfterImage_import.c new file mode 100644 index 00000000000..5909a49bb29 --- /dev/null +++ b/wm/afterstep/patches/patch-libAfterImage_import.c @@ -0,0 +1,15 @@ +$NetBSD: patch-libAfterImage_import.c,v 1.1 2011/04/05 12:02:00 wiz Exp $ + +Fix build with png-1.5. + +--- libAfterImage/import.c.orig 2005-06-21 22:58:24.000000000 +0000 ++++ libAfterImage/import.c +@@ -876,7 +876,7 @@ png2ASImage( const char * path, ASImageI + * 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 ; + |