diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2014-10-17 20:52:34 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2014-10-17 20:52:34 +0200 |
| commit | 386a341614bd6f89919a122eabe31cbb13f27822 (patch) | |
| tree | ad07576cfc3f64cb23eca4bd3922da78529e29c0 /kde-base | |
| parent | 8a746c29be524c6737596953367c9b5588668fe0 (diff) | |
| download | kde-386a341614bd6f89919a122eabe31cbb13f27822.tar.gz kde-386a341614bd6f89919a122eabe31cbb13f27822.tar.bz2 kde-386a341614bd6f89919a122eabe31cbb13f27822.zip | |
[kde-base/print-manager] Fix build with cups-2.0, bug525598
Package-Manager: portage-2.2.14_rc1
Diffstat (limited to 'kde-base')
| -rw-r--r-- | kde-base/print-manager/files/print-manager-4.14.1-cups20.patch | 72 | ||||
| -rw-r--r-- | kde-base/print-manager/print-manager-4.14.2.ebuild | 2 |
2 files changed, 74 insertions, 0 deletions
diff --git a/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch b/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch new file mode 100644 index 00000000000..58c59dd6107 --- /dev/null +++ b/kde-base/print-manager/files/print-manager-4.14.1-cups20.patch @@ -0,0 +1,72 @@ +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; + } + diff --git a/kde-base/print-manager/print-manager-4.14.2.ebuild b/kde-base/print-manager/print-manager-4.14.2.ebuild index abba251a6bc..680616e65c9 100644 --- a/kde-base/print-manager/print-manager-4.14.2.ebuild +++ b/kde-base/print-manager/print-manager-4.14.2.ebuild @@ -19,3 +19,5 @@ RDEPEND="${DEPEND} !kde-misc/print-manager app-admin/system-config-printer-gnome " + +PATCHES=( "${FILESDIR}/${PN}-4.14.1-cups20.patch" ) |