Updated color management extension patch again as with the previous the build tests failed (LP: #1362321).

1 files changed, 48 insertions, 17 deletions

diff --git a/debian/patches/color-management-extension.patch b/debian/patches/color-management-extension.patch
index 29c8f62a..2f115b8d 100644
--- a/debian/patches/color-management-extension.patch
+++ b/debian/patches/color-management-extension.patch
@@ -1,6 +1,3 @@
-Description: Color management per queue using colord.
-Author: Joe Simon <jsimon383@gmail.com>
-Last-Update: 2014-08-28
 --- a/cgi-bin/admin.c
 +++ b/cgi-bin/admin.c
 @@ -1132,6 +1132,11 @@
@@ -43,6 +40,16 @@ Last-Update: 2014-08-28
      ippAddInteger(request, IPP_TAG_PRINTER, IPP_TAG_ENUM, "printer-state",
                    IPP_PRINTER_IDLE);
  
+--- a/cups/cups.h
++++ b/cups/cups.h
+@@ -241,6 +241,7 @@
+ 					 * @since CUPS 1.4/OS X 10.6@ */
+   CUPS_PRINTER_MFP = 0x4000000,		/* Printer with scanning capabilities
+ 					 * @since CUPS 1.4/OS X 10.6@ */
++  CUPS_PRINTER_CM_OFF = 0x8000000,	/* Printer is not color-managed */
+   CUPS_PRINTER_OPTIONS = 0x6fffc	/* ~(CLASS | REMOTE | IMPLICIT |
+ 					 * DEFAULT | FAX | REJECTING | DELETE |
+ 					 * NOT_SHARED | AUTHENTICATED |
 --- a/cups/dest.c
 +++ b/cups/dest.c
 @@ -1437,6 +1437,7 @@
@@ -53,15 +60,22 @@ Last-Update: 2014-08-28
  		  "printer-is-shared",
  		  "printer-location",
  		  "printer-make-and-model",
-@@ -1582,6 +1583,11 @@
+@@ -1544,7 +1545,8 @@
+ 	    !strcmp(attr->name, "marker-types") ||
+ 	    !strcmp(attr->name, "printer-commands") ||
+ 	    !strcmp(attr->name, "printer-info") ||
+-	    !strcmp(attr->name, "printer-is-shared") ||
++	    !strcmp(attr->name, "printer-info") ||
++	    !strcmp(attr->name, "printer-is-cm-calibrating") ||
+ 	    !strcmp(attr->name, "printer-make-and-model") ||
+ 	    !strcmp(attr->name, "printer-mandatory-job-attributes") ||
+ 	    !strcmp(attr->name, "printer-state") ||
+@@ -1581,7 +1583,7 @@
+               break;
  	    }
  	}
- #endif /* __APPLE__ */
-+        else if (!strcmp(attr->name, "printer-is-cm-calibrating")) 
-+          if (value == 1) 
-+            num_options = cupsAddOption("cm-calibration",
-+                                        cups_make_string(attr, value, sizeof(value)), 
-+                                        num_options, &options);
+-#endif /* __APPLE__ */
++#endif /* __APPLE__ */        
          else if (!strcmp(attr->name, "printer-name") &&
  	         attr->value_tag == IPP_TAG_NAME)
  	  printer_name = attr->values[0].string.text;
@@ -81,7 +95,7 @@ Last-Update: 2014-08-28
      "printer-icons",
      "printer-info",
      "printer-is-accepting-jobs",
-+    "printer-is-cm-calibration",	/* CUPS extension */
++    "printer-is-cm-calibrating",	/* CUPS extension */
      "printer-is-shared",		/* CUPS extension */
      "printer-kind",			/* IPP Paid Printing */
      "printer-location",
@@ -276,34 +290,41 @@ Last-Update: 2014-08-28
             cupsLastErrorString());
 --- a/scheduler/ipp.c
 +++ b/scheduler/ipp.c
-@@ -988,6 +988,13 @@
+@@ -988,6 +988,16 @@
  		  pclass->accepting ? "Now" : "No longer");
    }
  
 +  if ((attr = ippFindAttribute(con->request, "printer-is-cm-calibrating",
 +                               IPP_TAG_BOOLEAN)) != NULL)
 +  {
-+    if (pclass->calibrating && !attr->values[0].boolean)
-+      pclass->calibrating = attr->values[0].boolean;
++    cupsdLogMessage(CUPSD_LOG_INFO,
++                    "Setting %s printer-is-cm-calibrating to %d (was %d.)",
++                    pclass->name, attr->values[0].boolean, pclass->calibrating);
++
++    pclass->calibrating = attr->values[0].boolean;
 +  }
 +
    if ((attr = ippFindAttribute(con->request, "printer-is-shared",
                                 IPP_TAG_BOOLEAN)) != NULL)
    {
-@@ -2491,6 +2498,12 @@
+@@ -2491,6 +2501,16 @@
  		  printer->accepting ? "Now" : "No longer");
    }
  
 +  if ((attr = ippFindAttribute(con->request, "printer-is-cm-calibrating",
 +                                 IPP_TAG_BOOLEAN)) != NULL)
-+  {
++  {    
++    cupsdLogMessage(CUPSD_LOG_INFO,
++                    "Setting %s printer-is-cm-calibrating to %d (was %d.)",
++                    printer->name, attr->values[0].boolean, printer->calibrating);
++
 +    printer->calibrating = attr->values[0].boolean;
 +  }
 +
    if ((attr = ippFindAttribute(con->request, "printer-is-shared",
                                 IPP_TAG_BOOLEAN)) != NULL)
    {
-@@ -4901,6 +4914,10 @@
+@@ -4901,6 +4921,10 @@
      ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-accepting-jobs",
                    printer->accepting);
  
@@ -314,6 +335,16 @@ Last-Update: 2014-08-28
    if (!ra || cupsArrayFind(ra, "printer-is-shared"))
      ippAddBoolean(con->response, IPP_TAG_PRINTER, "printer-is-shared",
                    printer->shared);
+@@ -4950,6 +4974,9 @@
+     if (!printer->accepting)
+       type |= CUPS_PRINTER_REJECTING;
+ 
++    if (!printer->calibrating)
++      type |= CUPS_PRINTER_CM_OFF;
++
+     if (!printer->shared)
+       type |= CUPS_PRINTER_NOT_SHARED;
+ 
 --- a/scheduler/printers.c
 +++ b/scheduler/printers.c
 @@ -95,11 +95,12 @@