openkylin
/
cups
mirror of https://gitee.com/openkylin/cups.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Patch to support Apple AirPrint (printing from iPhone, iPad, iPod Touch to a CUPS server) 

Bug-Ubuntu: https://bugs.launchpad.net/bugs/711779
Bug-Ubuntu: https://bugs.launchpad.net/bugs/1054495
Bug-Debian: https://bugs.debian.org/700961
Bug: https://github.com/apple/cups/issues/4341
Patch-Name: airprint-support.patch

Gbp-Pq: Name 0018-Patch-to-support-Apple-AirPrint-printing-from-iPhone.patch
This commit is contained in:
Till Kamppeter 2016-08-09 18:11:29 +02:00 committed by openKylinBot
parent 843db89d68
commit b697d4aac6
5 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
conf/mime.convs.in
View File

@ -44,6 +44,9 @@ application/postscript application/vnd.cups-postscript 66 pstops
application/vnd.cups-raster image/pwg-raster 100 rastertopwg application/vnd.cups-raster image/pwg-raster 100 rastertopwg
application/vnd.cups-raster image/urf 100 rastertopwg application/vnd.cups-raster image/urf 100 rastertopwg
# Needed for printing from iOS (AirPrint) clients
image/urf application/pdf 100 -
######################################################################## ########################################################################
# #
# Raw filter... # Raw filter...

3
conf/mime.types
View File

@ -108,6 +108,9 @@ image/x-alias pix short(8,8) short(8,24)
image/x-bitmap bmp string(0,BM) + !printable(2,14) image/x-bitmap bmp string(0,BM) + !printable(2,14)
image/x-icon ico image/x-icon ico
# Needed for printing from iOS (AirPrint) clients
image/urf urf string(0,UNIRAST<00>)
######################################################################## ########################################################################
# #
# Text files... # Text files...

2
scheduler/conf.c
View File

@ -745,7 +745,7 @@ cupsdReadConfiguration(void)
DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED; DefaultShared = CUPS_DEFAULT_DEFAULT_SHARED;
#if defined(HAVE_DNSSD) || defined(HAVE_AVAHI) #if defined(HAVE_DNSSD) || defined(HAVE_AVAHI)
cupsdSetString(&DNSSDSubTypes, "_cups,_print"); cupsdSetString(&DNSSDSubTypes, "_cups,_print,_universal");
cupsdClearString(&DNSSDHostName); cupsdClearString(&DNSSDHostName);
#endif /* HAVE_DNSSD || HAVE_AVAHI */ #endif /* HAVE_DNSSD || HAVE_AVAHI */

6
scheduler/dirsvc.c
View File

@ -440,6 +440,12 @@ dnssdBuildTxtRecord(
keyvalue[count ][0] = "pdl"; keyvalue[count ][0] = "pdl";
keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript"; keyvalue[count++][1] = p->pdl ? p->pdl : "application/postscript";
/* iOS 6 does not accept this printer as AirPrint printer if there is
no URF txt record or "URF=none", "DM3" is the minimum needed found
by try and error */
keyvalue[count ][0] = "URF";
keyvalue[count++][1] = "DM3";
if (get_auth_info_required(p, air_str, sizeof(air_str))) if (get_auth_info_required(p, air_str, sizeof(air_str)))
{ {
keyvalue[count ][0] = "air"; keyvalue[count ][0] = "air";

4
scheduler/printers.c
View File

@ -3731,7 +3731,9 @@ add_printer_formats(cupsd_printer_t *p) /* I - Printer */
} }
else if (!_cups_strcasecmp(type->super, "image")) else if (!_cups_strcasecmp(type->super, "image"))
{ {
if (!_cups_strcasecmp(type->type, "jpeg")) if (!_cups_strcasecmp(type->type, "urf"))
strlcat(pdl, "image/urf,", sizeof(pdl));
else if (!_cups_strcasecmp(type->type, "jpeg"))
strlcat(pdl, "image/jpeg,", sizeof(pdl)); strlcat(pdl, "image/jpeg,", sizeof(pdl));
else if (!_cups_strcasecmp(type->type, "png")) else if (!_cups_strcasecmp(type->type, "png"))
strlcat(pdl, "image/png,", sizeof(pdl)); strlcat(pdl, "image/png,", sizeof(pdl));