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

fix medium-definitions patch to not barf on obsolete options in config file

Browse Source 
(#185269, by Aldy Hernandez)
This commit is contained in:
Nils Philippsen 2006-04-04 16:02:28 +00:00
parent 6b5be7ddb7
commit 4ed514f2b3
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xsane-0.99-medium-definitions.patch Normal file
View File

@ -0,0 +1,16 @@
--- xsane-0.99/src/xsane-preferences.c.medium-definitions 2005-12-29 12:18:09.000000000 +0100
+++ xsane-0.99/src/xsane-preferences.c 2006-04-04 17:53:11.000000000 +0200
@@ -446,6 +446,13 @@
{
break;
}
+ else if (!strcmp(name, "medium-definitions"))
+ {
+ /* Ignore medium_definitions */
+ SANE_Word discard;
+ xsane_rc_io_w_space(&w, 3);
+ xsane_rc_io_w_word(&w, &discard);
+ }
else if (i == NELEMS(desc))
{
DBG(DBG_info2, "preferences identifier %s unknown\n", name);

8
xsane.spec
View File

@ -1,11 +1,11 @@
Name: xsane Name: xsane
Summary: An X Window System front-end for the SANE scanner interface. Summary: An X Window System front-end for the SANE scanner interface.
Version: 0.99 Version: 0.99
Release: 2.2 Release: 3
Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz Source0: http://www.xsane.org/download/%{name}-%{version}.tar.gz
Source1: xsane-install-gimp-plugin Source1: xsane-install-gimp-plugin
Patch0: xsane-0.90-htmlview.patch Patch0: xsane-0.90-htmlview.patch
Patch1: xsane-medium-definitions.patch Patch1: xsane-0.99-medium-definitions.patch
Patch2: xsane-0.92_gimp2.0.patch Patch2: xsane-0.92_gimp2.0.patch
Patch3: xsane-0.99-buffer.patch Patch3: xsane-0.99-buffer.patch
License: GPL License: GPL
@ -97,6 +97,10 @@ fi
exit 0 exit 0
%changelog %changelog
* Tue Apr 04 2006 Nils Philippsen <nphilipp@redhat.com> - 0.99-3
- fix medium-definitions patch to not barf on obsolete options in config file
(#185269, by Aldy Hernandez)
* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.99-2.2 * Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 0.99-2.2
- bump again for double-long bug on ppc(64) - bump again for double-long bug on ppc(64)