summaryrefslogtreecommitdiffstats
path: root/abs/extra-testing/cups/fix-infinite-usb-loop.patch
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-10-23 18:17:40 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-10-23 18:19:39 (GMT)
commitadbcf19958300e9b6598990184c8815b945ba0ee (patch)
treef4283c850ac0ac202c17e78a637ee7ca8147621b /abs/extra-testing/cups/fix-infinite-usb-loop.patch
parent61a68250df10d29b624650948484898334ff22d0 (diff)
downloadlinhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip
linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz
linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/extra-testing/cups/fix-infinite-usb-loop.patch')
-rw-r--r--abs/extra-testing/cups/fix-infinite-usb-loop.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/abs/extra-testing/cups/fix-infinite-usb-loop.patch b/abs/extra-testing/cups/fix-infinite-usb-loop.patch
deleted file mode 100644
index bad179e..0000000
--- a/abs/extra-testing/cups/fix-infinite-usb-loop.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -urNad cups-1.4.0~/backend/usb-libusb.c cups-1.4.0/backend/usb-libusb.c
---- cups-1.4.0~/backend/usb-libusb.c 2009-08-08 00:24:14.000000000 +0200
-+++ cups-1.4.0/backend/usb-libusb.c 2009-09-02 16:37:31.000000000 +0200
-@@ -158,7 +158,7 @@
-
- while (poll(pfds, 2, -1) > 0)
- {
-- if (pfds[0].revents & POLLIN)
-+ if (pfds[0].revents & (POLLIN + POLLHUP))
- {
- if ((bytes = read(print_fd, buffer, sizeof(buffer))) > 0)
- {
-@@ -179,7 +179,12 @@
- }
-
- if (pfds[1].revents & POLLIN)
-- tbytes += side_cb(printer, print_fd);
-+ {
-+ if ((bytes = side_cb(printer, print_fd)) < 0)
-+ pfds[1].events = 0; /* Filter has gone away... */
-+ else
-+ tbytes += bytes;
-+ }
- }
- }
-
-@@ -747,7 +752,7 @@
- if (cupsSideChannelRead(&command, &status, data, &datalen, 1.0))
- {
- _cupsLangPuts(stderr, _("WARNING: Failed to read side-channel request!\n"));
-- return (0);
-+ return (-1);
- }
-
- switch (command)