diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-26 19:32:34 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2015-11-26 19:32:34 +0100 |
| commit | 665bbcae09168c39c73117e04c5f14d09e25b50c (patch) | |
| tree | 7f49401e0ee6b9fed693e764fb1e96a7801f2115 /debian/patches/0145-fix_png15.patch | |
| parent | a67d929a8725f0a0ee722bd49f698602d33b6a77 (diff) | |
Rename and refresh the patches
Diffstat (limited to 'debian/patches/0145-fix_png15.patch')
| -rw-r--r-- | debian/patches/0145-fix_png15.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/debian/patches/0145-fix_png15.patch b/debian/patches/0145-fix_png15.patch new file mode 100644 index 0000000..bffc9ee --- /dev/null +++ b/debian/patches/0145-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); |