[xsane] patch and rebuild for libpng-1.5
Nils Philippsen
nphilipp at fedoraproject.org
Mon Nov 21 13:21:36 UTC 2011
commit 6acff1321bdf0461a0b949de087b942c1c90c270
Author: Nils Philippsen <nils at redhat.com>
Date: Mon Nov 21 14:14:58 2011 +0100
patch and rebuild for libpng-1.5
xsane-0.998-libpng.patch | 21 +++++++++++++++++++++
xsane.spec | 8 ++++++--
2 files changed, 27 insertions(+), 2 deletions(-)
---
diff --git a/xsane-0.998-libpng.patch b/xsane-0.998-libpng.patch
new file mode 100644
index 0000000..f79270f
--- /dev/null
+++ b/xsane-0.998-libpng.patch
@@ -0,0 +1,21 @@
+diff -up xsane-0.998/src/xsane-save.c.libpng xsane-0.998/src/xsane-save.c
+--- xsane-0.998/src/xsane-save.c.libpng 2011-11-21 13:29:05.468000002 +0100
++++ xsane-0.998/src/xsane-save.c 2011-11-21 13:50:38.522004958 +0100
+@@ -4912,7 +4912,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);
+@@ -5102,7 +5102,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);
diff --git a/xsane.spec b/xsane.spec
index 827b325..eefffdc 100644
--- a/xsane.spec
+++ b/xsane.spec
@@ -41,6 +41,9 @@ Patch7: xsane-0.998-xsane_update_param-crash.patch
# fix from: https://bugs.launchpad.net/ubuntu/+source/xsane/+bug/370818
# submitted to upstream (Oliver Rauch) via email, 2011-06-01
Patch8: xsane-0.998-preview-selection.patch
+# build with libpng-1.5
+# submitted to upstream (Oliver Rauch) via email, 2011-11-21
+Patch9: xsane-0.998-libpng.patch
# autoconf-generated files
Patch100: xsane-0.998-1-autoconf.patch.bz2
License: GPLv2+
@@ -100,6 +103,7 @@ done
%patch6 -p1 -b .desktop-file
%patch7 -p1 -b .xsane_update_param-crash
%patch8 -p1 -b .preview-selection.patch
+%patch9 -p1 -b .libpng
%patch100 -p1 -b .autoconf
@@ -170,8 +174,8 @@ fi
%{_datadir}/sane/xsane
%changelog
-* Mon Nov 07 2011 Nils Philippsen <nils at redhat.com> - 0.998-5
-- rebuild (libpng)
+* Mon Nov 21 2011 Nils Philippsen <nils at redhat.com> - 0.998-5
+- patch and rebuild for libpng-1.5
* Wed Jun 01 2011 Nils Philippsen <nils at redhat.com> - 0.998-4
- fix a problem in mouse event processing that interferes with selecting the
More information about the scm-commits
mailing list