KDE and cups issues

[bdubbs@…]

Cups 1.2 forces a patch requirement for kdelibs. We will need to apply this patch to kdelibs when we add cups 1.2 to the book. cups-1.2 has not been released yet but is at the -rc3 stage.

This is the patch:

--- ipprequest.cpp      (revision 534402)
+++ ipprequest.cpp      (working copy)
@@ -511,7 +511,11 @@
       cupsFreeOptions(n, options);

       // find an remove that annoying "document-format" attribute
-       // (can't use IppDeleteAttribute as cups 1.0.9 doesn't have that)
+#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 2
+    ipp_attribute_t *attr = ippFindAttribute(request_, "document-format", IPP_TAG_NAME);
+    ippDeleteAttribute(request_, attr);
+#else
+       // (can't use IppDeleteAttribute as older cups doesn't have that)
       ipp_attribute_t *attr = request_->attrs;
       while (attr)
       {
@@ -524,4 +528,5 @@
               }
               attr = attr->next;
       }
+#endif
} 

Problem and patch reported by Matthew Carson.

[Randy McMurchy]

This bug is dependent on bug1979. I'm putting a patch into the repo for kdelibs. It will be named kdelibs-3.5.2-cups1.2-1.patch.

[Randy McMurchy]

Per Bruce's message, I added the patch to kdelibs. Though it was originally going to go in at the same time the book is updated with CUPS, it doesn't matter. The patch is an if/else looking for CUPS-1.2.x. If not 1.2.x, the old code is executed. There really was no reason to wait.