packages: cups/cups.spec, cups/cups-side_cb.patch (NEW) - fix compilation

[jpc]

Author: jpc                          Date: Tue Sep 22 10:30:43 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix compilation

---- Files affected:
packages/cups:
   cups.spec (1.270 -> 1.271) , cups-side_cb.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cups/cups.spec
diff -u packages/cups/cups.spec:1.270 packages/cups/cups.spec:1.271
--- packages/cups/cups.spec:1.270	Wed Sep 16 21:03:39 2009
+++ packages/cups/cups.spec	Tue Sep 22 12:30:38 2009
@@ -39,6 +39,7 @@
 Patch7:		%{name}-no-polluted-krb5config.patch
 Patch9:		%{name}-verbose-compilation.patch
 Patch10:	%{name}-peercred.patch
+Patch11:	%{name}-side_cb.patch
 URL:		http://www.cups.org/
 BuildRequires:	acl-devel
 BuildRequires:	autoconf
@@ -340,6 +341,7 @@
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %{__aclocal} -I config-scripts
@@ -751,6 +753,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.271  2009/09/22 10:30:38  jpc
+- fix compilation
+
 Revision 1.270  2009/09/16 19:03:39  arekm
 - rel 5; fixed post script
 

================================================================
Index: packages/cups/cups-side_cb.patch
diff -u /dev/null packages/cups/cups-side_cb.patch:1.1
--- /dev/null	Tue Sep 22 12:30:43 2009
+++ packages/cups/cups-side_cb.patch	Tue Sep 22 12:30:38 2009
@@ -0,0 +1,25 @@
+From 484851e02cc5a9b702e0f226f20a0d33325d9dee Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh at redhat.com>
+Date: Mon, 14 Sep 2009 17:34:36 +0100
+Subject: [PATCH] Fixed side_cb function declaration in usb-unix.c.
+
+---
+ backend/usb-unix.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/backend/usb-unix.c b/backend/usb-unix.c
+index c47910d..a00f1ad 100644
+--- a/backend/usb-unix.c
++++ b/backend/usb-unix.c
+@@ -560,7 +560,7 @@ open_device(const char *uri,		/* I - Device URI */
+  * 'side_cb()' - Handle side-channel requests...
+  */
+ 
+-static void
++static int
+ side_cb(int         print_fd,		/* I - Print file */
+         int         device_fd,		/* I - Device file */
+         int         snmp_fd,		/* I - SNMP socket (unused) */
+-- 
+1.6.4.2
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cups/cups.spec?r1=1.270&r2=1.271&f=u