diff options
| author |   Jim Ramsay <lack@gentoo.org> | 2009-09-17 15:36:38 +0000 |
|---|---|---|
| committer | Jim Ramsay <lack@gentoo.org> | 2009-09-17 15:36:38 +0000 |
| commit | bd9d60c7cf7ae619f4bd9ef51c7b981c9d040880 (patch) | |
| tree | a91f2cf2b9282560d6018175fb8e87af240d93d5 /net-print | |
| parent | Opera 10 can download, install and select dictionaries entirely without the u... (diff) | |
| download | gentoo-2-bd9d60c7cf7ae619f4bd9ef51c7b981c9d040880.tar.gz gentoo-2-bd9d60c7cf7ae619f4bd9ef51c7b981c9d040880.tar.bz2 gentoo-2-bd9d60c7cf7ae619f4bd9ef51c7b981c9d040880.zip | |
Add patch which fixes bug #285003
(Portage version: 2.1.6.13/cvs/Linux x86_64)
Diffstat (limited to 'net-print')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.4.1.ebuild | 3 | ||||
| -rw-r--r-- | net-print/cups/files/cups-1.4.1-usb-function-decl.patch | 25 |
3 files changed, 32 insertions, 2 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index 341a4374cbc6..c4bf9e15e52f 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.365 2009/09/13 10:57:01 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.366 2009/09/17 15:36:38 lack Exp $ + + 17 Sep 2009; Jim Ramsay <lack@gentoo.org> cups-1.4.1.ebuild, + +files/cups-1.4.1-usb-function-decl.patch: + Add patch which fixes bug #285003 *cups-1.4.1 (13 Sep 2009) diff --git a/net-print/cups/cups-1.4.1.ebuild b/net-print/cups/cups-1.4.1.ebuild index 1a0643cac600..7496ff8715a5 100644 --- a/net-print/cups/cups-1.4.1.ebuild +++ b/net-print/cups/cups-1.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.1.ebuild,v 1.1 2009/09/13 10:57:01 tgurr Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.1.ebuild,v 1.2 2009/09/17 15:36:38 lack Exp $ EAPI="2" @@ -66,6 +66,7 @@ pkg_setup() { src_prepare() { # create a missing symlink to allow https printing via IPP, bug #217293 epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch" + epatch "${FILESDIR}/${PN}-1.4.1-usb-function-decl.patch" } src_configure() { diff --git a/net-print/cups/files/cups-1.4.1-usb-function-decl.patch b/net-print/cups/files/cups-1.4.1-usb-function-decl.patch new file mode 100644 index 000000000000..3953d92f86da --- /dev/null +++ b/net-print/cups/files/cups-1.4.1-usb-function-decl.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 + |