diff options
| author | wiz <wiz@pkgsrc.org> | 2011-02-01 10:32:00 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-02-01 10:32:00 +0000 |
| commit | d21feee9e38967a6c80a67fede0e610083179e42 (patch) | |
| tree | a3397db98b23a8332fa3ad4e7817dac928545f44 /graphics/xsane | |
| parent | 9d4a686eb9a22faa24a8527ab185e2a51ccbc9ba (diff) | |
| download | pkgsrc-d21feee9e38967a6c80a67fede0e610083179e42.tar.gz | |
Fix build with png-1.5.
Diffstat (limited to 'graphics/xsane')
| -rw-r--r-- | graphics/xsane/distinfo | 3 | ||||
| -rw-r--r-- | graphics/xsane/patches/patch-src_xsane-save.c | 24 |
2 files changed, 26 insertions, 1 deletions
diff --git a/graphics/xsane/distinfo b/graphics/xsane/distinfo index cfa8736a261..a781ce2cbd9 100644 --- a/graphics/xsane/distinfo +++ b/graphics/xsane/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.17 2007/03/08 18:24:46 wiz Exp $ +$NetBSD: distinfo,v 1.18 2011/02/01 10:32:00 wiz Exp $ SHA1 (xsane-0.994.tar.gz) = 64a936f0e95b5c5d296e34407d72813dd802b309 RMD160 (xsane-0.994.tar.gz) = 5ce83791e16a0c805b2850bb17092092264a3ce1 Size (xsane-0.994.tar.gz) = 3303013 bytes +SHA1 (patch-src_xsane-save.c) = 785faf5c267975534e86aad6bdbc8c279c92a202 diff --git a/graphics/xsane/patches/patch-src_xsane-save.c b/graphics/xsane/patches/patch-src_xsane-save.c new file mode 100644 index 00000000000..c51fff2fc82 --- /dev/null +++ b/graphics/xsane/patches/patch-src_xsane-save.c @@ -0,0 +1,24 @@ +$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); |