diff options
Diffstat (limited to 'graphics/xsane')
| -rw-r--r-- | graphics/xsane/Makefile | 3 | ||||
| -rw-r--r-- | graphics/xsane/files/patch-xsane-save.c | 20 |
2 files changed, 22 insertions, 1 deletions
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile index 7c40ba61b299..25d5256ef00b 100644 --- a/graphics/xsane/Makefile +++ b/graphics/xsane/Makefile @@ -7,6 +7,7 @@ PORTNAME= xsane PORTVERSION= 0.998 +PORTREVISION= 1 CATEGORIES= graphics MASTER_SITES= http://www.xsane.org/download/ \ http://gd.tuwien.ac.at/hci/sane/xsane/ \ @@ -16,7 +17,7 @@ MAINTAINER= domi@nonsensss.de COMMENT= Gtk-based X11 frontend for SANE (Scanner Access Now Easy) LIB_DEPENDS= jpeg.11:${PORTSDIR}/graphics/jpeg \ - png.6:${PORTSDIR}/graphics/png \ + png15:${PORTSDIR}/graphics/png \ tiff.4:${PORTSDIR}/graphics/tiff \ sane.1:${PORTSDIR}/graphics/sane-backends diff --git a/graphics/xsane/files/patch-xsane-save.c b/graphics/xsane/files/patch-xsane-save.c new file mode 100644 index 000000000000..3113c7308ea3 --- /dev/null +++ b/graphics/xsane/files/patch-xsane-save.c @@ -0,0 +1,20 @@ +--- src/xsane-save.c.orig 2010-11-16 22:06:00.000000000 +0100 ++++ src/xsane-save.c 2012-05-04 07:37:59.000000000 +0200 +@@ -4910,7 +4910,7 @@ + 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); +@@ -5100,7 +5100,7 @@ + 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); |