Hello community, here is the log from the commit of package kde4-print-manager for openSUSE:Factory checked in at 2014-11-19 20:23:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kde4-print-manager (Old) and /work/SRC/openSUSE:Factory/.kde4-print-manager.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kde4-print-manager" Changes: -------- --- /work/SRC/openSUSE:Factory/kde4-print-manager/kde4-print-manager.changes 2014-11-01 08:14:01.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kde4-print-manager.new/kde4-print-manager.changes 2014-11-19 20:24:29.000000000 +0100 @@ -1,0 +2,7 @@ +Sun Nov 9 21:10:52 UTC 2014 - tittiatcoke@gmail.com + +- Update to 4.14.3 + * KDE 4.14.3 SC Bugfix Release + * See http://www.kde.org/announcements/announce-4.14.3.php + +------------------------------------------------------------------- Old: ---- print-manager-4.14.2.tar.xz New: ---- print-manager-4.14.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kde4-print-manager.spec ++++++ --- /var/tmp/diff_new_pack.07P9Yj/_old 2014-11-19 20:24:30.000000000 +0100 +++ /var/tmp/diff_new_pack.07P9Yj/_new 2014-11-19 20:24:30.000000000 +0100 @@ -30,7 +30,7 @@ Summary: A new print manager for KDE 4 License: GPL-2.0+ Group: System/GUI/KDE -Version: 4.14.2 +Version: 4.14.3 Release: 0 Source: print-manager-%{version}.tar.xz # PATCH-FIX-OPENSUSE dont-make-configure-dialog-modal.patch kde#328014, boo#889187 ++++++ print-manager-4.14.2.tar.xz -> print-manager-4.14.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/print-manager-4.14.2/libkcups/KCupsConnection.cpp new/print-manager-4.14.3/libkcups/KCupsConnection.cpp --- old/print-manager-4.14.2/libkcups/KCupsConnection.cpp 2014-07-16 10:26:50.000000000 +0200 +++ new/print-manager-4.14.3/libkcups/KCupsConnection.cpp 2014-10-16 21:09:36.000000000 +0200 @@ -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; } -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org