cups: update to 1.4.2

This commit is contained in:
Juergen Daubert 2009-11-16 11:39:45 +01:00
parent 20db31915e
commit 7abadc2f2e
4 changed files with 4 additions and 32 deletions

View File

@ -103,7 +103,6 @@ drwxr-xr-x root/root usr/lib/cups/monitor/
-rwxr-xr-x root/root usr/lib/cups/monitor/bcp
-rwxr-xr-x root/root usr/lib/cups/monitor/tbcp
drwxr-xr-x root/root usr/lib/cups/notifier/
-rwxr-xr-x root/root usr/lib/cups/notifier/dbus
-rwxr-xr-x root/root usr/lib/cups/notifier/mailto
-rwxr-xr-x root/root usr/lib/cups/notifier/rss
lrwxrwxrwx root/root usr/lib/libcups.so -> libcups.so.2

View File

@ -1,4 +1,3 @@
01b6a755c5b0fb7df2d2c94571f67e1d cups
587a58039c112ecb3c932e048c8a7b01 cups-1.4.1-source.tar.bz2
d95e2d588e3d36e563027a963b117b1b cups-1.4.2-source.tar.bz2
2220f411940c4f7504ed4457c6304d4a cups-config.patch
53da7d8c4cb35986ac0ebacb92d072f8 cups-st3332.patch

View File

@ -4,15 +4,14 @@
# Depends on: libpng, libtiff, openssl
name=cups
version=1.4.1
release=2
version=1.4.2
release=1
source=(http://ftp.easysw.com/pub/cups/$version/$name-$version-source.tar.bz2 \
cups-config.patch cups cups-st3332.patch)
cups-config.patch cups)
build () {
cd $name-$version
patch -p1 -i $SRC/cups-st3332.patch
patch -p1 -i $SRC/cups-config.patch
./configure --prefix=/usr \

View File

@ -1,25 +0,0 @@
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