dilfridge 14/10/17 18:50:30 Added: print-manager-4.14.1-cups20.patch Log: Fix build with cups-2.0, bug 525598 (Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!)
Revision Changes Path 1.1 kde-base/print-manager/files/print-manager-4.14.1-cups20.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch?rev=1.1&content-type=text/plain Index: print-manager-4.14.1-cups20.patch =================================================================== diff --git a/libkcups/KCupsConnection.cpp b/libkcups/KCupsConnection.cpp index 713be2f..335fc46 100644 --- a/libkcups/KCupsConnection.cpp +++ b/libkcups/KCupsConnection.cpp @@ -377,11 +377,11 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration 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 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration 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 @@ int KCupsConnection::renewDBusSubscription(int subscriptionId, int leaseDuration 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 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t 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 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t 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 @@ ReturnArguments KCupsConnection::parseIPPVars(ipp_t *response, ipp_tag_t group_t 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 @@ QVariant KCupsConnection::ippAttrToVariant(ipp_attribute_t *attr) ret = values; } } -#endif // CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR >= 6 +#endif // !(CUPS_VERSION_MAJOR == 1 && CUPS_VERSION_MINOR < 6) return ret; }
