[patch] print-manager-4.12.5-build-with-cups-2.patch

print-manager-4.12.5-build-with-cups-2.patch (text/plain), 3.17 KB, created by Andreas Sturmlechner on 2015-02-14 11:04:12 UTC

commit 864153745c2593fd7e6c31fe425f347bd83846fe
Author: Daniel Nicoletti <[e-mail]>
Date:   Mon Aug 25 10:31:05 2014 -0300

    Adjust CUPS_VERSION_MAJOR to build for CUPS version greater than 1 (needed now that CUPS 2.0b1 is out)
    BUG:338543

commit 731085d7720e7128ab102ef80383d1bfaea27661
Author: Daniel Nicoletti <[e-mail]>
Date:   Mon Aug 25 17:04:18 2014 -0300

    Fix ifdef's logic to still match 1.6 onwards and 1.6 backwards
    BUG:338543

diff -u b/libkcups/KCupsConnection.cpp b/libkcups/KCupsConnection.cpp
--- b/libkcups/KCupsConnection.cpp
+++ b/libkcups/KCupsConnection.cpp
@@ -377,11 +377,11 @@
         response = request.sendIppRequest();
     } while (retry("/", operation));
 
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
     if (response && ippGetStatusCode(response) == IPP_OK) {
 #else
     if (response && response->request.status.status_code == IPP_OK) {
-#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
         ipp_attribute_t *attr;
         if (subscriptionId >= 0) {
             // Request was ok, just return the current subscription
@@ -392,7 +392,7 @@
             kWarning() << "No notify-subscription-id in response!";
             ret = -1;
         } else {
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
             ret = ippGetInteger(attr, 0);
         }
     } else if (subscriptionId >= 0 && response && ippGetStatusCode(response) == IPP_NOT_FOUND) {
@@ -406,7 +406,7 @@
         kDebug() << "Subscription not found";
         // When the subscription is not found try to get a new one
         return renewDBusSubscription(-1, leaseDuration, events);
-#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
     } else {
         kDebug() << "Request failed" << cupsLastError() << httpGetStatus(CUPS_HTTP_DEFAULT);
         // When the server stops/restarts we will have some error so ignore it
@@ -582,7 +582,7 @@
     ipp_attribute_t *attr;
     ReturnArguments ret;
 
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
     QVariantHash destAttributes;
     for (attr = ippFirstAttribute(response); attr != NULL; attr = ippNextAttribute(response)) {
         // We hit an attribute sepparator
@@ -659,7 +659,7 @@
             break;
         }
     }
-#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
 
     return ret;
 }
@@ -667,7 +667,7 @@
 QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr)
 {
     QVariant ret;
-#if CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
+#if !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
     switch (ippGetValueTag(attr)) {
     case IPP_TAG_INTEGER:
     case IPP_TAG_ENUM:
@@ -760,7 +760,7 @@
             ret = values;
         }
     }
-#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6
+#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6)
     return ret;
 }