- up to 2.1.4

[packages/cups.git] / cups-direct_usb.patch

diff --git a/cups-direct_usb.patch b/cups-direct_usb.patch
index 3e7bef37b63b468ab1b5f6c16fcb9f7aed2209fc..4e25ce7db4556f8c5322e9b28d50f15f25c76913 100644 (file)
--- a/cups-direct_usb.patch
+++ b/cups-direct_usb.patch
@@ -1,15 +1,17 @@
---- cups-1.2.8/backend/usb-unix.c.direct-usb   2007-02-05 20:25:50.000000000 +0000
-+++ cups-1.2.8/backend/usb-unix.c      2007-02-14 17:44:40.000000000 +0000
-@@ -87,6 +87,8 @@
-              strcasecmp(hostname, "Canon") &&
-              strncasecmp(hostname, "Konica", 6) &&
-              strncasecmp(hostname, "Minolta", 7);
+diff -up cups-1.5b1/backend/usb-unix.c.direct-usb cups-1.5b1/backend/usb-unix.c
+--- cups-1.5b1/backend/usb-unix.c.direct-usb   2011-05-20 05:49:49.000000000 +0200
++++ cups-1.5b1/backend/usb-unix.c      2011-05-23 17:52:14.000000000 +0200
+@@ -102,6 +102,9 @@ print_device(const char *uri,              /* I - De
+              _cups_strncasecmp(hostname, "Minolta", 7);
+ #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
+ 
 +    if (use_bc && !strncmp(uri, "usb:/dev/", 9))
 +      use_bc = 0;
- #endif /* __FreeBSD__ || __NetBSD__ || __OpenBSD__ || __DragonFly__ */
-  
++
      if ((device_fd = open_device(uri, &use_bc)) == -1)
-@@ -304,12 +306,7 @@
+     {
+       if (getenv("CLASS") != NULL)
+@@ -331,12 +334,7 @@ open_device(const char *uri,              /* I - Dev
    if (!strncmp(uri, "usb:/dev/", 9))
  #ifdef __linux
    {