Tue Feb 1 10:32:00 2011 UTC ()
Fix build with png-1.5.
(wiz)
diff -r1.17 -r1.18 pkgsrc/graphics/xsane/distinfo
diff -r0 -r1.1 pkgsrc/graphics/xsane/patches/patch-src_xsane-save.c
--- pkgsrc/graphics/xsane/distinfo 2007/03/08 18:24:46 1.17
+++ pkgsrc/graphics/xsane/distinfo 2011/02/01 10:32:00 1.18
| @@ -1,5 +1,6 @@ | | | @@ -1,5 +1,6 @@ |
| 1 | $NetBSD: distinfo,v 1.17 2007/03/08 18:24:46 wiz Exp $ | | 1 | $NetBSD: distinfo,v 1.18 2011/02/01 10:32:00 wiz Exp $ |
| 2 | | | 2 | |
| 3 | SHA1 (xsane-0.994.tar.gz) = 64a936f0e95b5c5d296e34407d72813dd802b309 | | 3 | SHA1 (xsane-0.994.tar.gz) = 64a936f0e95b5c5d296e34407d72813dd802b309 |
| 4 | RMD160 (xsane-0.994.tar.gz) = 5ce83791e16a0c805b2850bb17092092264a3ce1 | | 4 | RMD160 (xsane-0.994.tar.gz) = 5ce83791e16a0c805b2850bb17092092264a3ce1 |
| 5 | Size (xsane-0.994.tar.gz) = 3303013 bytes | | 5 | Size (xsane-0.994.tar.gz) = 3303013 bytes |
| | | 6 | SHA1 (patch-src_xsane-save.c) = 785faf5c267975534e86aad6bdbc8c279c92a202 |
$NetBSD: patch-src_xsane-save.c,v 1.1 2011/02/01 10:32:00 wiz Exp $
Fix build with png-1.5.
--- src/xsane-save.c.orig 2007-03-03 08:59:45.000000000 +0000
+++ src/xsane-save.c
@@ -4833,7 +4833,7 @@ int xsane_save_png(FILE *outfile, int co
return -1; /* error */
}
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
xsane_back_gtk_error(buf, TRUE);
@@ -5026,7 +5026,7 @@ int xsane_save_png_16(FILE *outfile, int
return -1; /* error */
}
- if (setjmp(png_ptr->jmpbuf))
+ if (setjmp(png_jmpbuf(png_ptr)))
{
snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG);
xsane_back_gtk_error(buf, TRUE);