Hello community, here is the log from the commit of package akonadi-contact for openSUSE:Factory checked in at 2016-09-14 23:00:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/akonadi-contact (Old) and /work/SRC/openSUSE:Factory/.akonadi-contact.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-contact" Changes: -------- --- /work/SRC/openSUSE:Factory/akonadi-contact/akonadi-contact.changes 2016-08-29 15:18:00.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.akonadi-contact.new/akonadi-contact.changes 2016-09-14 23:00:36.000000000 +0200 @@ -1,0 +2,8 @@ +Fri Sep 9 08:02:48 UTC 2016 - [email protected] + +- Update to KDE Applications 16.08.1 + * KDE Applications 16.08.1 + * https://www.kde.org/announcements/announce-applications-16.08.1.php + + +------------------------------------------------------------------- Old: ---- akonadi-contacts-16.08.0.tar.xz New: ---- akonadi-contacts-16.08.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-contact.spec ++++++ --- /var/tmp/diff_new_pack.qhREJi/_old 2016-09-14 23:00:37.000000000 +0200 +++ /var/tmp/diff_new_pack.qhREJi/_new 2016-09-14 23:00:37.000000000 +0200 @@ -16,7 +16,7 @@ # Name: akonadi-contact -Version: 16.08.0 +Version: 16.08.1 Release: 0 %define kf5_version 5.23.0 Summary: KDE PIM Libraries for Akonadi Contacts @@ -36,7 +36,7 @@ BuildRequires: kcompletion-devel >= %{kf5_version} BuildRequires: kf5-filesystem BuildRequires: kio-devel >= %{kf5_version} -BuildRequires: akonadi-server-devel >= 16.08.0 +BuildRequires: akonadi-server-devel >= 16.08.1 BuildRequires: libprison-devel BuildRequires: pkgconfig(Qt5Test) >= 5.6.0 BuildRequires: pkgconfig(Qt5WebEngine) >= 5.6.0 ++++++ akonadi-contacts-16.08.0.tar.xz -> akonadi-contacts-16.08.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/CMakeLists.txt new/akonadi-contacts-16.08.1/CMakeLists.txt --- old/akonadi-contacts-16.08.0/CMakeLists.txt 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/CMakeLists.txt 2016-08-25 08:22:39.000000000 +0200 @@ -20,13 +20,13 @@ include(ECMInstallIcons) include(ECMQtDeclareLoggingCategory) -set(PIM_VERSION "5.3.0") +set(PIM_VERSION "5.3.1") set(AKONADI_CONTACTS_VERSION ${PIM_VERSION}) -set(AKONADI_MIME_VERSION "5.3.0") -set(KCONTACTS_VERSION "5.3.0") -set(CALENDARCORE_VERSION "5.3.0") -set(KMIMELIB_VERSION "5.3.0") -set(AKONADI_VERSION "5.3.0") +set(AKONADI_MIME_VERSION "5.3.1") +set(KCONTACTS_VERSION "5.3.1") +set(CALENDARCORE_VERSION "5.3.1") +set(KMIMELIB_VERSION "5.3.1") +set(AKONADI_VERSION "5.3.1") ecm_setup_version(${AKONADI_CONTACTS_VERSION} VARIABLE_PREFIX AKONADICONTACT VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/akonadi-contact_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/contactgroupeditordialog.cpp new/akonadi-contacts-16.08.1/src/contactgroupeditordialog.cpp --- old/akonadi-contacts-16.08.0/src/contactgroupeditordialog.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/contactgroupeditordialog.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -28,7 +28,6 @@ #include <item.h> #include <kcontacts/contactgroup.h> #include <KLocalizedString> -#include <KLocalizedString> #include <KLineEdit> #include <KConfig> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/contactstreemodel.cpp new/akonadi-contacts-16.08.1/src/contactstreemodel.cpp --- old/akonadi-contacts-16.08.0/src/contactstreemodel.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/contactstreemodel.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -27,7 +27,6 @@ #include <kiconloader.h> #include <KLocalizedString> -#include <KLocalizedString> #include <QIcon> #include <QLocale> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/editor/addresseditor/addresstypedialog.cpp new/akonadi-contacts-16.08.1/src/editor/addresseditor/addresstypedialog.cpp --- old/akonadi-contacts-16.08.0/src/editor/addresseditor/addresstypedialog.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/editor/addresseditor/addresstypedialog.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -31,16 +31,14 @@ AddressTypeDialog::AddressTypeDialog(KContacts::Address::Type type, QWidget *parent) : QDialog(parent) { - QVBoxLayout *mainLayout = new QVBoxLayout; - setLayout(mainLayout); + QVBoxLayout *mainLayout = new QVBoxLayout(this); setWindowTitle(i18nc("street/postal", "Edit Address Type")); - QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); + QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel, this); QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok); okButton->setDefault(true); okButton->setShortcut(Qt::CTRL | Qt::Key_Return); connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); - okButton->setDefault(true); QWidget *page = new QWidget(this); mainLayout->addWidget(page); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/editor/generalinfoeditor/mail/mailwidget.cpp new/akonadi-contacts-16.08.1/src/editor/generalinfoeditor/mail/mailwidget.cpp --- old/akonadi-contacts-16.08.0/src/editor/generalinfoeditor/mail/mailwidget.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/editor/generalinfoeditor/mail/mailwidget.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -128,7 +128,9 @@ value.removeAll(QStringLiteral("PREF")); } } - parameters.insert(QStringLiteral("type"), value); + if (!value.isEmpty()) { + parameters.insert(QStringLiteral("type"), value); + } mEmail.setParameters(parameters); return mEmail; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp new/akonadi-contacts-16.08.1/src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp --- old/akonadi-contacts-16.08.0/src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/editor/generalinfoeditor/messaging/messagingwidgetlister.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -41,65 +41,6 @@ } -#if 0 -void IMEditWidget::loadContact(const KContacts::Addressee &contact) -{ - mIMEdit->setText(contact.custom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-IMAddress"))); - - const QStringList customs = contact.customs(); - - foreach (const QString &custom, customs) { - QString app, name, value; - Akonadi::CustomFieldsListWidget::splitCustomField(custom, app, name, value); - - if (app.startsWith(QStringLiteral("messaging/"))) { - if (name == QLatin1String("All")) { - const QString protocol = app; - const QStringList names = value.split(QChar(0xE000), QString::SkipEmptyParts); - - foreach (const QString &name, names) { - mIMAddresses << IMAddress(protocol, name, (name == mIMEdit->text())); - } - } - } - } -} - -void IMEditWidget::storeContact(KContacts::Addressee &contact) const -{ - if (!mIMEdit->text().isEmpty()) { - contact.insertCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-IMAddress"), mIMEdit->text()); - } else { - contact.removeCustom(QStringLiteral("KADDRESSBOOK"), QStringLiteral("X-IMAddress")); - } - - // create a map with protocol as key and list of names for that protocol as value - QMap<QString, QStringList> protocolMap; - - // fill map with all known protocols - foreach (const QString &protocol, IMProtocols::self()->protocols()) { - protocolMap.insert(protocol, QStringList()); - } - - // add the configured addresses - foreach (const IMAddress &address, mIMAddresses) { - protocolMap[address.protocol()].append(address.name()); - } - - // iterate over this list and modify the contact according - QMapIterator<QString, QStringList> it(protocolMap); - while (it.hasNext()) { - it.next(); - - if (!it.value().isEmpty()) { - contact.insertCustom(it.key(), QStringLiteral("All"), it.value().join(QString(0xE000))); - } else { - contact.removeCustom(it.key(), QStringLiteral("All")); - } - } -} - -#endif void MessagingWidgetLister::loadContact(const KContacts::Addressee &contact) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/editor/generalinfoeditor/web/webwidget.cpp new/akonadi-contacts-16.08.1/src/editor/generalinfoeditor/web/webwidget.cpp --- old/akonadi-contacts-16.08.0/src/editor/generalinfoeditor/web/webwidget.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/editor/generalinfoeditor/web/webwidget.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -132,7 +132,9 @@ value.removeAll(QStringLiteral("PREF")); } } - parameters.insert(QStringLiteral("type"), value); + if (!value.isEmpty()) { + parameters.insert(QStringLiteral("type"), value); + } mUrl.setParameters(parameters); return mUrl; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/editor/personaleditor/dateeditwidget.cpp new/akonadi-contacts-16.08.1/src/editor/personaleditor/dateeditwidget.cpp --- old/akonadi-contacts-16.08.0/src/editor/personaleditor/dateeditwidget.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/editor/personaleditor/dateeditwidget.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -25,7 +25,6 @@ #include <kdatepicker.h> -#include <KLocalizedString> #include <QContextMenuEvent> #include <QHBoxLayout> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/emailaddressselectionwidget.cpp new/akonadi-contacts-16.08.1/src/emailaddressselectionwidget.cpp --- old/akonadi-contacts-16.08.0/src/emailaddressselectionwidget.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/emailaddressselectionwidget.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -37,7 +37,6 @@ #include <kcontacts/contactgroup.h> #include <KLineEdit> #include <KLocalizedString> -#include <KLocalizedString> #include <QtCore/QTimer> #include <QHBoxLayout> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-contacts-16.08.0/src/standardcontactformatter.cpp new/akonadi-contacts-16.08.1/src/standardcontactformatter.cpp --- old/akonadi-contacts-16.08.0/src/standardcontactformatter.cpp 2016-08-10 22:34:24.000000000 +0200 +++ new/akonadi-contacts-16.08.1/src/standardcontactformatter.cpp 2016-08-25 08:22:39.000000000 +0200 @@ -27,7 +27,6 @@ #include <kconfiggroup.h> #include <KLocalizedString> -#include <KLocalizedString> #include <kstringhandler.h> #include <QtCore/QSet>
