From: jpc <jpc@pld-linux.org>
Date: Tue, 22 Sep 2009 10:30:38 +0000 (+0000)
Subject: - fix compilation
X-Git-Tag: auto/aidath/cups-1_4_1-5
X-Git-Url: https://git.pld-linux.org/?p=packages%2Fcups.git;a=commitdiff_plain;h=92b9e1b21308cec85d82165cde768607ad7cc33f

- fix compilation

Changed files:
    cups-side_cb.patch -> 1.1
    cups.spec -> 1.271
---

diff --git a/cups-side_cb.patch b/cups-side_cb.patch
new file mode 100644
index 0000000..3953d92
--- /dev/null
+++ b/cups-side_cb.patch
@@ -0,0 +1,25 @@
+From 484851e02cc5a9b702e0f226f20a0d33325d9dee Mon Sep 17 00:00:00 2001
+From: Tim Waugh <twaugh@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
+
diff --git a/cups.spec b/cups.spec
index e37c4a7..580cc7b 100644
--- a/cups.spec
+++ b/cups.spec
@@ -38,6 +38,7 @@ Patch6:		%{name}-direct_usb.patch
 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
@@ -339,6 +340,7 @@ Wsparcie dla LPD w serwerze wydruków CUPS.
 %patch7 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 %build
 %{__aclocal} -I config-scripts