diff options
| author | Frank Lichtenheld <djpig@debian.org> | 2013-01-29 01:20:42 +0100 |
|---|---|---|
| committer | Mattia Rizzolo <mattia@mapreri.org> | 2014-10-03 14:06:00 +0000 |
| commit | 2853a604aefed21a483727bfc681134c2c646597 (patch) | |
| tree | 91a029ae670124e167eb9b7ef3f1f967785af02a /debian/patches/fix_png15.patch | |
| parent | 4a26a00da27f6a3d822083aaed7849a2cbc8fa3e (diff) | |
Imported Debian patch 0.998-4debian/0.998-4
Diffstat (limited to 'debian/patches/fix_png15.patch')
| -rw-r--r-- | debian/patches/fix_png15.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/fix_png15.patch b/debian/patches/fix_png15.patch new file mode 100644 index 0000000..bffc9ee --- /dev/null +++ b/debian/patches/fix_png15.patch @@ -0,0 +1,34 @@ +Description: Build with libpng15. +Author: Nobuhiro Iwamatsu <iwamatsu@debian.org> +Bug-Debian: http://bugs.debian.org/649800 +Forwarded: no + +Index: xsane-0.998/src/xsane-save.c +=================================================================== +--- xsane-0.998.orig/src/xsane-save.c 2013-01-27 01:44:39.000000000 +0100 ++++ xsane-0.998/src/xsane-save.c 2013-01-29 00:17:56.934234295 +0100 +@@ -4928,8 +4928,11 @@ + xsane_back_gtk_error(buf, TRUE); + return -1; /* error */ + } +- ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if ( setjmp( png_jmpbuf ( png_ptr ) ) ) ++#else + if (setjmp(png_ptr->jmpbuf)) ++#endif + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); +@@ -5119,7 +5122,11 @@ + return -1; /* error */ + } + ++#if PNG_LIBPNG_VER_MAJOR == 1 && PNG_LIBPNG_VER_MINOR >= 4 ++ if ( setjmp( png_jmpbuf ( png_ptr ) ) ) ++#else + if (setjmp(png_ptr->jmpbuf)) ++#endif + { + snprintf(buf, sizeof(buf), "%s %s", ERR_DURING_SAVE, ERR_LIBPNG); + xsane_back_gtk_error(buf, TRUE); |