rpms/cups
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Return from cupsEnumDests() once all records have been returned.

Browse Source
This commit is contained in:
Tim Waugh 2013-06-04 11:00:27 +01:00
parent dfc01588c9
commit 5f1314986b
2 changed files with 24 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
cups-enum-all.patch Normal file
View File

@ -0,0 +1,17 @@
diff -up cups-1.6.2/cups/dest.c.enum-all cups-1.6.2/cups/dest.c
--- cups-1.6.2/cups/dest.c.enum-all 2013-06-04 10:58:36.169786250 +0100
+++ cups-1.6.2/cups/dest.c 2013-06-04 10:59:02.147900811 +0100
@@ -2724,9 +2724,12 @@ cups_dnssd_browse_cb(
break;
case AVAHI_BROWSER_REMOVE:
- case AVAHI_BROWSER_ALL_FOR_NOW:
case AVAHI_BROWSER_CACHE_EXHAUSTED:
break;
+
+ case AVAHI_BROWSER_ALL_FOR_NOW:
+ avahi_simple_poll_quit(data->simple_poll);
+ break;
}
}

8
cups.spec
View File

@ -11,7 +11,7 @@ Summary: CUPS printing system
Name: cups Name: cups
Epoch: 1 Epoch: 1
Version: 1.6.2 Version: 1.6.2
Release: 7%{?dist} Release: 8%{?dist}
License: GPLv2 License: GPLv2
Group: System Environment/Daemons Group: System Environment/Daemons
Url: http://www.cups.org/ Url: http://www.cups.org/
@ -56,6 +56,7 @@ Patch25: cups-systemd-socket.patch
Patch26: cups-lpd-manpage.patch Patch26: cups-lpd-manpage.patch
Patch27: cups-avahi-address.patch Patch27: cups-avahi-address.patch
Patch28: cups-usblp-quirks.patch Patch28: cups-usblp-quirks.patch
Patch29: cups-enum-all.patch
Patch100: cups-lspp.patch Patch100: cups-lspp.patch
@ -228,6 +229,8 @@ Sends IPP requests to the specified URI and tests and/or displays the results.
# More USB quirks for the libusb-based backend (STR #4311). # More USB quirks for the libusb-based backend (STR #4311).
# Fixed in 1.6.3 # Fixed in 1.6.3
%patch28 -p1 -b .quirks %patch28 -p1 -b .quirks
# Return from cupsEnumDests() once all records have been returned.
%patch29 -p1 -b .enum-all
%if %lspp %if %lspp
# LSPP support. # LSPP support.
@ -629,6 +632,9 @@ rm -f %{cups_serverbin}/backend/smb
%{_mandir}/man5/ipptoolfile.5.gz %{_mandir}/man5/ipptoolfile.5.gz
%changelog %changelog
* Tue Jun 4 2013 Tim Waugh <twaugh@redhat.com> - 1:1.6.2-8
- Return from cupsEnumDests() once all records have been returned.
* Thu May 23 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.6.2-7 * Thu May 23 2013 Jiri Popelka <jpopelka@redhat.com> - 1:1.6.2-7
- Added more USB quirks for the libusb-based backend (STR #4311) - Added more USB quirks for the libusb-based backend (STR #4311)