packages: xsane/xsane.spec, xsane/xsane-libpng.patch (NEW)=?UTF-8?Q?=20?=- rel 5; png fix

[arekm]

Author: arekm                        Date: Fri Feb 10 11:33:04 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- rel 5; png fix

---- Files affected:
packages/xsane:
   xsane.spec (1.71 -> 1.72) , xsane-libpng.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/xsane/xsane.spec
diff -u packages/xsane/xsane.spec:1.71 packages/xsane/xsane.spec:1.72
--- packages/xsane/xsane.spec:1.71	Tue Feb  7 23:09:10 2012
+++ packages/xsane/xsane.spec	Fri Feb 10 12:32:59 2012
@@ -4,7 +4,7 @@
 Summary(zh_CN.UTF-8):	xsane - 一个图形扫描程序
 Name:		xsane
 Version:	0.998
-Release:	4
+Release:	5
 License:	GPL v2+
 Group:		X11/Applications/Graphics
 #Source0Download:	http://www.xsane.org/cgi-bin/sitexplorer.cgi?/download/
@@ -15,6 +15,7 @@
 Patch0:		%{name}-datadir.patch
 Patch1:		%{name}-pl.po-update.patch
 Patch2:		%{name}-poMakefile.patch
+Patch3:		%{name}-libpng.patch
 URL:		http://www.xsane.org/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -45,6 +46,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 mv -f po/{zh,zh_TW}.po
 
@@ -91,6 +93,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.72  2012/02/10 11:32:59  arekm
+- rel 5; png fix
+
 Revision 1.71  2012/02/07 22:09:10  arekm
 - release 4
 

================================================================
Index: packages/xsane/xsane-libpng.patch
diff -u /dev/null packages/xsane/xsane-libpng.patch:1.1
--- /dev/null	Fri Feb 10 12:33:04 2012
+++ packages/xsane/xsane-libpng.patch	Fri Feb 10 12:32:59 2012
@@ -0,0 +1,20 @@
+--- xsane-0.998/src/xsane-save.c.org	2012-02-10 12:31:29.768614682 +0100
++++ xsane-0.998/src/xsane-save.c	2012-02-10 12:31:31.511986798 +0100
+@@ -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);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xsane/xsane.spec?r1=1.71&r2=1.72&f=u