rpms/xsane
7
0
Fork 0
Code Issues Pull Requests Releases Activity

patch and rebuild for libpng-1.5

Browse Source
This commit is contained in:
Nils Philippsen 2011-11-21 14:14:58 +01:00
parent 4dd3dfd138
commit 6acff1321b
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
xsane-0.998-libpng.patch Normal file
View File

@ -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);

8
xsane.spec
View File

@ -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@redhat.com> - 0.998-5
- rebuild (libpng)
* Mon Nov 21 2011 Nils Philippsen <nils@redhat.com> - 0.998-5
- patch and rebuild for libpng-1.5
* Wed Jun 01 2011 Nils Philippsen <nils@redhat.com> - 0.998-4
- fix a problem in mouse event processing that interferes with selecting the