Hello community, here is the log from the commit of package libkgapi for openSUSE:Factory checked in at 2019-03-11 11:12:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libkgapi (Old) and /work/SRC/openSUSE:Factory/.libkgapi.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libkgapi" Mon Mar 11 11:12:42 2019 rev:44 rq:683275 version:18.12.3 Changes: -------- --- /work/SRC/openSUSE:Factory/libkgapi/libkgapi.changes 2019-02-28 21:33:51.481725964 +0100 +++ /work/SRC/openSUSE:Factory/.libkgapi.new.28833/libkgapi.changes 2019-03-11 11:12:44.513389732 +0100 @@ -1,0 +2,13 @@ +Sat Mar 09 08:03:23 UTC 2019 - [email protected] + +- Update to 18.12.3 + * New bugfix release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-18.12.3.php +- Changes since 18.12.2: + * Fix googletalk protocol. + * Contacts: fix email type deserialization (kde#398847) +- Dropped patches, now upstream: + * Contacts-fix-email-type-deserialization.patch + +------------------------------------------------------------------- Old: ---- Contacts-fix-email-type-deserialization.patch libkgapi-18.12.2.tar.xz New: ---- libkgapi-18.12.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libkgapi.spec ++++++ --- /var/tmp/diff_new_pack.dqYMxS/_old 2019-03-11 11:12:45.217389521 +0100 +++ /var/tmp/diff_new_pack.dqYMxS/_new 2019-03-11 11:12:45.221389520 +0100 @@ -20,15 +20,13 @@ %{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print $1"."$2}')} %bcond_without lang Name: libkgapi -Version: 18.12.2 +Version: 18.12.3 Release: 0 Summary: Extension for accessing Google data License: GPL-2.0-or-later AND LGPL-2.1-or-later Group: System/GUI/KDE URL: http://www.kde.org Source0: %{name}-%{version}.tar.xz -# PATCH-FIX-UPSTREAM -Patch0: Contacts-fix-email-type-deserialization.patch BuildRequires: cyrus-sasl-devel BuildRequires: extra-cmake-modules >= 1.0.0 BuildRequires: kcalcore-devel @@ -148,7 +146,6 @@ %prep %setup -q -n libkgapi-%{version} -%autopatch -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON ++++++ libkgapi-18.12.2.tar.xz -> libkgapi-18.12.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-18.12.2/CMakeLists.txt new/libkgapi-18.12.3/CMakeLists.txt --- old/libkgapi-18.12.2/CMakeLists.txt 2019-02-05 01:50:26.000000000 +0100 +++ new/libkgapi-18.12.3/CMakeLists.txt 2019-03-05 01:26:28.000000000 +0100 @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.10.2") +set(PIM_VERSION "5.10.3") set(KGAPI_LIB_VERSION ${PIM_VERSION}) @@ -24,8 +24,8 @@ -set(KCALENDARCORE_LIB_VERSION "5.10.2") -set(KCONTACTS_LIB_VERSION "5.10.2") +set(KCALENDARCORE_LIB_VERSION "5.10.3") +set(KCONTACTS_LIB_VERSION "5.10.3") ecm_setup_version(PROJECT VARIABLE_PREFIX KGAPI diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-18.12.2/poqm/zh_CN/libkgapi_qt.po new/libkgapi-18.12.3/poqm/zh_CN/libkgapi_qt.po --- old/libkgapi-18.12.2/poqm/zh_CN/libkgapi_qt.po 2019-02-05 01:50:26.000000000 +0100 +++ new/libkgapi-18.12.3/poqm/zh_CN/libkgapi_qt.po 2019-03-05 01:26:28.000000000 +0100 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: kdeorg\n" -"PO-Revision-Date: 2019-01-27 23:05\n" +"PO-Revision-Date: 2019-02-20 23:28\n" "Last-Translator: guoyunhe <[email protected]>\n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-18.12.2/src/contacts/contact.cpp new/libkgapi-18.12.3/src/contacts/contact.cpp --- old/libkgapi-18.12.2/src/contacts/contact.cpp 2019-01-28 08:39:56.000000000 +0100 +++ new/libkgapi-18.12.3/src/contacts/contact.cpp 2019-02-26 09:09:21.000000000 +0100 @@ -326,7 +326,11 @@ QString Contact::IMSchemeToProtocolName(const QString& scheme) { - return scheme.mid(scheme.lastIndexOf(QLatin1Char('#')) + 1).toLower(); + QString newScheme = scheme.mid(scheme.lastIndexOf(QLatin1Char('#')) + 1).toLower(); + if (newScheme == QLatin1String("google_talk")) { + newScheme = QStringLiteral("googletalk"); + } + return newScheme; } QString Contact::IMProtocolNameToScheme(const QString& protocolName) @@ -343,6 +347,8 @@ (protocolName.toUpper() == QLatin1String("AIM"))) { return SCHEME_URL + protocolName.toUpper(); + } else if (protocolName.toUpper() == QLatin1String("GOOGLETALK")) { + return SCHEME_URL + QStringLiteral("GOOGLE_TALK"); } /* If the protocolName is not officially supported by Google, then instead @@ -358,7 +364,7 @@ return Jabber; if (protoName == QLatin1String("ICQ")) return ICQ; - if (protoName == QLatin1String("GOOGLE_TALK")) + if (protoName == QLatin1String("GOOGLE_TALK") || protoName == QLatin1String("GOOGLETALK")) return GoogleTalk; if (protoName == QLatin1String("QQ")) return QQ; @@ -482,3 +488,17 @@ return type; } + +QString Contact::emailSchemeToProtocolName(const QString &scheme) +{ + QString type = scheme.mid(scheme.lastIndexOf(QLatin1Char('#')) + 1); + if (type == QLatin1String("work")) { + return QStringLiteral("WORK"); + } else if (type == QLatin1String("home")) { + return QStringLiteral("HOME"); + } else if (type == QLatin1String("other")) { + return QStringLiteral("OTHER"); + } + return type; +} + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-18.12.2/src/contacts/contact.h new/libkgapi-18.12.3/src/contacts/contact.h --- old/libkgapi-18.12.2/src/contacts/contact.h 2019-01-28 08:39:56.000000000 +0100 +++ new/libkgapi-18.12.3/src/contacts/contact.h 2019-02-26 09:09:21.000000000 +0100 @@ -320,6 +320,11 @@ */ static KContacts::Address::Type addressSchemeToType(const QString &scheme, bool primary = false); + /** + * @brief Contacts Google scheme URL to email type. + */ + static QString emailSchemeToProtocolName(const QString &scheme); + private: class Private; Private * const d; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libkgapi-18.12.2/src/contacts/contactsservice.cpp new/libkgapi-18.12.3/src/contacts/contactsservice.cpp --- old/libkgapi-18.12.2/src/contacts/contactsservice.cpp 2019-01-28 08:39:56.000000000 +0100 +++ new/libkgapi-18.12.3/src/contacts/contactsservice.cpp 2019-02-26 09:09:21.000000000 +0100 @@ -453,7 +453,8 @@ const QVariantList emails = data.value(QStringLiteral("gd$email")).toList(); for (const QVariant & em : emails) { const QVariantMap email = em.toMap(); - const QMap<QString, QStringList> params({ { QStringLiteral("TYPE"), { email.value(QStringLiteral("rel")).toString() } } }); + const auto emailType = Contact::emailSchemeToProtocolName(email.value(QStringLiteral("rel")).toString()); + const QMap<QString, QStringList> params({ { QStringLiteral("TYPE"), { emailType } } }); contact->insertEmail(email.value(QStringLiteral("address")).toString(), email.value(QStringLiteral("primary")).toBool(), params); } @@ -1026,7 +1027,8 @@ /* Emails */ if (e.tagName() == QLatin1String("gd:email")) { - const QMap<QString, QStringList> params({ { QStringLiteral("TYPE"), { e.attribute(QStringLiteral("rel"), {}) } } }); + const auto emailType = Contact::emailSchemeToProtocolName(e.attribute(QStringLiteral("rel"), {})); + const QMap<QString, QStringList> params({ { QStringLiteral("TYPE"), { emailType } } }); contact->insertEmail(e.attribute(QStringLiteral("address")), (e.attribute(QStringLiteral("primary")).toLower() == QLatin1String("true")), params); continue;
