Hello community, here is the log from the commit of package kidentitymanagement for openSUSE:Factory checked in at 2016-05-31 12:20:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kidentitymanagement (Old) and /work/SRC/openSUSE:Factory/.kidentitymanagement.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kidentitymanagement" Changes: -------- --- /work/SRC/openSUSE:Factory/kidentitymanagement/kidentitymanagement.changes 2016-03-26 15:15:37.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kidentitymanagement.new/kidentitymanagement.changes 2016-05-31 12:20:53.000000000 +0200 @@ -1,0 +2,24 @@ +Sat May 7 10:28:36 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.04.1 + * KDE Applications 16.04.1 + * https://www.kde.org/announcements/announce-applications-16.04.1.php + + +------------------------------------------------------------------- +Sun Apr 17 06:04:57 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.04.0 + * KDE Applications 16.04.0 + * https://www.kde.org/announcements/announce-applications-16.04.0.php + + +------------------------------------------------------------------- +Mon Apr 11 06:41:27 UTC 2016 - tittiatc...@gmail.com + +- Update to KDE Applications 16.03.90 + * KDE Applications 16.04.0 RC + * https://www.kde.org/announcements/announce-applications-16.04-rc.php + + +------------------------------------------------------------------- Old: ---- kidentitymanagement-15.12.3.tar.xz New: ---- kidentitymanagement-16.04.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kidentitymanagement.spec ++++++ --- /var/tmp/diff_new_pack.DDsLsD/_old 2016-05-31 12:20:53.000000000 +0200 +++ /var/tmp/diff_new_pack.DDsLsD/_new 2016-05-31 12:20:53.000000000 +0200 @@ -17,7 +17,7 @@ Name: kidentitymanagement -Version: 15.12.3 +Version: 16.04.1 Release: 0 %define kf5_version 5.1.0 Summary: KDE PIM Libraries: Identity Management @@ -48,7 +48,7 @@ BuildRequires: kwallet-devel >= %{kf5_version} BuildRequires: kwidgetsaddons-devel >= %{kf5_version} BuildRequires: kxmlgui-devel >= %{kf5_version} -BuildRequires: libKF5AkonadiPrivate-devel >= 1.72.43 +BuildRequires: akonadi-server-devel BuildRequires: libassuan-devel BuildRequires: libical-devel >= 0.42 BuildRequires: libxslt-devel ++++++ kidentitymanagement-15.12.3.tar.xz -> kidentitymanagement-16.04.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/CMakeLists.txt new/kidentitymanagement-16.04.1/CMakeLists.txt --- old/kidentitymanagement-15.12.3/CMakeLists.txt 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/CMakeLists.txt 2016-04-29 19:30:55.000000000 +0200 @@ -3,7 +3,7 @@ project(KIdentityManagement) # ECM setup -find_package(ECM 5.16.0 CONFIG REQUIRED) +find_package(ECM 5.19.0 CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) include(GenerateExportHeader) @@ -14,12 +14,12 @@ include(FeatureSummary) include(KDEInstallDirs) include(KDECMakeSettings) -include(KDEFrameworkCompilerSettings) +include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(ECMQtDeclareLoggingCategory) -set(KF5_VERSION "5.16.0") -set(KIDENTITYMANAGEMENT_LIB_VERSION "4.82.0") -set(PIMTEXTEDIT_LIB_VERSION "4.86.0") +set(KF5_VERSION "5.19.0") +set(KIDENTITYMANAGEMENT_LIB_VERSION "5.2.1") +set(PIMTEXTEDIT_LIB_VERSION "5.2.0") ecm_setup_version(${KIDENTITYMANAGEMENT_LIB_VERSION} VARIABLE_PREFIX KIDENTITYMANAGEMENT VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kidentitymanagement_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/autotests/identitytest.cpp new/kidentitymanagement-16.04.1/autotests/identitytest.cpp --- old/kidentitymanagement-15.12.3/autotests/identitytest.cpp 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/autotests/identitytest.cpp 2016-04-29 19:30:55.000000000 +0200 @@ -36,7 +36,6 @@ QStandardPaths::setTestModeEnabled(true); } - void IdentityTester::test_NullIdentity() { IdentityManager manager; @@ -49,7 +48,7 @@ // It is picking up identities from older tests somethimes, so cleanup while (manager.identities().size() > 1) { - manager.removeIdentity(manager.identities().first()); + manager.removeIdentity(manager.identities().at(0)); manager.commit(); } @@ -74,7 +73,7 @@ manager.commit(); // Remove the first identity, which we couldn't remove above - manager.removeIdentity(manager.identities().first()); + manager.removeIdentity(manager.identities().at(0)); manager.commit(); QCOMPARE(manager.allEmails().size(), 4); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/autotests/identitytest.h new/kidentitymanagement-16.04.1/autotests/identitytest.h --- old/kidentitymanagement-15.12.3/autotests/identitytest.h 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/autotests/identitytest.h 2016-04-29 19:30:55.000000000 +0200 @@ -24,7 +24,7 @@ class IdentityTester : public QObject { - Q_OBJECT + Q_OBJECT private Q_SLOTS: void initTestCase(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/autotests/signaturetest.cpp new/kidentitymanagement-16.04.1/autotests/signaturetest.cpp --- old/kidentitymanagement-15.12.3/autotests/signaturetest.cpp 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/autotests/signaturetest.cpp 2016-04-29 19:30:55.000000000 +0200 @@ -25,7 +25,6 @@ #include "signature.h" - #include <KIconLoader> #include <KConfigGroup> #include <QStandardPaths> @@ -65,7 +64,7 @@ QString fileContent = QString::fromUtf8(thisFile.readAll()); Signature sig3; - sig3.setUrl(QStringLiteral("cat ") + QStringLiteral(__FILE__), true); + sig3.setPath(QStringLiteral("cat ") + QStringLiteral(__FILE__), true); QCOMPARE(sig3.rawText(), fileContent); QVERIFY(!sig3.isInlinedHtml()); QVERIFY(sig3.text().isEmpty()); @@ -73,7 +72,7 @@ QCOMPARE(sig3.withSeparator(), QString(QStringLiteral("-- \n") + fileContent)); Signature sig4; - sig4.setUrl(QStringLiteral(__FILE__), false); + sig4.setPath(QStringLiteral(__FILE__), false); QCOMPARE(sig4.rawText(), fileContent); QVERIFY(!sig4.isInlinedHtml()); QVERIFY(sig4.text().isEmpty()); @@ -188,9 +187,9 @@ QImage image1, image2; QVERIFY(image1.load(image1Path)); QVERIFY(image2.load(image1Path)); - QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + QStringLiteral("emailidentities/unittest/") ; + QString path = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QLatin1Char('/') + QStringLiteral("emailidentities/unittest/"); QDir().mkpath(path); - QString configPath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QLatin1Char('/') + QStringLiteral("signaturetest") ; + QString configPath = QStandardPaths::writableLocation(QStandardPaths::ConfigLocation) + QLatin1Char('/') + QStringLiteral("signaturetest"); QDir().mkpath(configPath); KConfig config(configPath); KConfigGroup group1 = config.group("Signature1"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/src/identity.cpp new/kidentitymanagement-16.04.1/src/identity.cpp --- old/kidentitymanagement-15.12.3/src/identity.cpp 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/src/identity.cpp 2016-04-29 19:30:55.000000000 +0200 @@ -479,7 +479,7 @@ QString Identity::signatureFile() const { - return mSignature.url(); + return mSignature.path(); } QString Identity::autocorrectionLanguage() const @@ -566,7 +566,7 @@ void Identity::setSignatureFile(const QString &str) { - mSignature.setUrl(str, signatureIsCommand()); + mSignature.setPath(str, signatureIsCommand()); } void Identity::setSignatureInlineText(const QString &str) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/src/identitymanager.cpp new/kidentitymanagement-16.04.1/src/identitymanager.cpp --- old/kidentitymanagement-15.12.3/src/identitymanager.cpp 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/src/identitymanager.cpp 2016-04-29 19:30:55.000000000 +0200 @@ -29,6 +29,7 @@ #include <klocalizedstring.h> #include "kidentitymanagement_debug.h" #include <kconfig.h> +#include <ksharedconfig.h> #include <kuser.h> #include <kconfiggroup.h> #include <kdelibs4configmigrator.h> @@ -66,6 +67,7 @@ { public: Private(KIdentityManagement::IdentityManager *); + ~Private(); void writeConfig() const; void readConfig(KConfig *config); void createDefaultIdentity(); @@ -312,11 +314,11 @@ commit(); } - KConfig kmailConf(QStringLiteral("kmail2rc")); + KSharedConfig::Ptr kmailConf(KSharedConfig::openConfig(QStringLiteral("kmail2rc"))); if (!d->mReadOnly) { bool needCommit = false; - if (kmailConf.hasGroup(QStringLiteral("Composer"))) { - KConfigGroup composerGroup = kmailConf.group(QStringLiteral("Composer")); + if (kmailConf->hasGroup(QStringLiteral("Composer"))) { + KConfigGroup composerGroup = kmailConf->group(QStringLiteral("Composer")); if (composerGroup.hasKey(QStringLiteral("pgp-auto-sign"))) { const bool pgpAutoSign = composerGroup.readEntry(QStringLiteral("pgp-auto-sign"), false); QList<Identity>::iterator end = d->mIdentities.end(); @@ -328,8 +330,8 @@ needCommit = true; } } - if (kmailConf.hasGroup(QStringLiteral("General"))) { - KConfigGroup generalGroup = kmailConf.group(QStringLiteral("General")); + if (kmailConf->hasGroup(QStringLiteral("General"))) { + KConfigGroup generalGroup = kmailConf->group(QStringLiteral("General")); if (generalGroup.hasKey(QStringLiteral("Default domain"))) { QString defaultDomain = generalGroup.readEntry(QStringLiteral("Default domain")); if (defaultDomain.isEmpty()) { @@ -696,5 +698,10 @@ rollback(); } +IdentityManager::Private::~Private() +{ + delete mConfig; +} + } #include "moc_identitymanager.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/src/signature.cpp new/kidentitymanagement-16.04.1/src/signature.cpp --- old/kidentitymanagement-15.12.3/src/signature.cpp 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/src/signature.cpp 2016-04-29 19:30:55.000000000 +0200 @@ -64,7 +64,7 @@ /// The directory where the images will be saved to. QString saveLocation; bool enabled; - QString url; + QString path; QString text; Signature::Type type; bool inlinedHtml; @@ -184,7 +184,7 @@ void SignaturePrivate::assignFrom(const KIdentityManagement::Signature &that) { - url = that.url(); + path = that.path(); inlinedHtml = that.isInlinedHtml(); text = that.text(); type = that.type(); @@ -239,13 +239,9 @@ { assert(type == Signature::FromFile); - // TODO: Use KIO::NetAccess to download non-local files! - const QUrl u(url); - if (!u.isLocalFile() && !u.scheme().isEmpty() && - !(QFileInfo(url).isRelative() && - QFileInfo(url).exists())) { - qCDebug(KIDENTITYMANAGEMENT_LOG) << "Signature::textFromFile:" - << "non-local URLs are unsupported"; + QFile f(path); + if (!f.open(QIODevice::ReadOnly)) { + qCWarning(KIDENTITYMANAGEMENT_LOG) << "Failed to open" << path << ":" << f.errorString(); if (ok) { *ok = false; } @@ -255,13 +251,6 @@ if (ok) { *ok = true; } - - // TODO: hmm, should we allow other encodings, too? - QFile f(url); - if (!f.open(QIODevice::ReadOnly)) { - qCWarning(KIDENTITYMANAGEMENT_LOG) << "Failed to open" << url << ":" << f.errorString(); - return QString(); - } const QByteArray ba = f.readAll(); return QString::fromLocal8Bit(ba.data(), ba.size()); } @@ -271,7 +260,7 @@ assert(type == Signature::FromCommand); // handle pathological cases: - if (url.isEmpty()) { + if (path.isEmpty()) { if (ok) { *ok = true; } @@ -281,7 +270,7 @@ // create a shell process: KProcess proc; proc.setOutputChannelMode(KProcess::SeparateChannels); - proc.setShellCommand(url); + proc.setShellCommand(path); int rc = proc.execute(); // handle errors, if any: @@ -290,7 +279,7 @@ *ok = false; } const QString wmsg = i18n("<qt>Failed to execute signature script<p><b>%1</b>:</p>" - "<p>%2</p></qt>", url, QLatin1String(proc.readAllStandardError())); + "<p>%2</p></qt>", path, QLatin1String(proc.readAllStandardError())); KMessageBox::error(Q_NULLPTR, wmsg); return QString(); } @@ -358,11 +347,11 @@ d->text = text; } -Signature::Signature(const QString &url, bool isExecutable) +Signature::Signature(const QString &path, bool isExecutable) : d(new SignaturePrivate(this)) { d->type = isExecutable ? FromCommand : FromFile; - d->url = url; + d->path = path; } Signature::Signature(const Signature &that) @@ -435,9 +424,9 @@ } } -void Signature::setUrl(const QString &url, bool isExecutable) +void Signature::setPath(const QString &path, bool isExecutable) { - d->url = url; + d->path = path; d->type = isExecutable ? FromCommand : FromFile; } @@ -472,10 +461,10 @@ d->inlinedHtml = config.readEntry(sigTypeInlinedHtmlKey, false); } else if (sigType == QLatin1String(sigTypeFileValue)) { d->type = FromFile; - d->url = config.readPathEntry(sigFileKey, QString()); + d->path = config.readPathEntry(sigFileKey, QString()); } else if (sigType == QLatin1String(sigTypeCommandValue)) { d->type = FromCommand; - d->url = config.readPathEntry(sigCommandKey, QString()); + d->path = config.readPathEntry(sigCommandKey, QString()); } else if (sigType == QLatin1String(sigTypeDisabledValue)) { d->enabled = false; } @@ -510,11 +499,11 @@ break; case FromFile: config.writeEntry(sigTypeKey, sigTypeFileValue); - config.writePathEntry(sigFileKey, d->url); + config.writePathEntry(sigFileKey, d->path); break; case FromCommand: config.writeEntry(sigTypeKey, sigTypeCommandValue); - config.writePathEntry(sigCommandKey, d->url); + config.writePathEntry(sigCommandKey, d->path); break; default: break; @@ -548,7 +537,7 @@ QDataStream &KIdentityManagement::operator<< (QDataStream &stream, const KIdentityManagement::Signature &sig) { - return stream << static_cast<quint8>(sig.type()) << sig.url() << sig.text() + return stream << static_cast<quint8>(sig.type()) << sig.path() << sig.text() << sig.imageLocation() << sig.embeddedImages() << sig.isEnabledSignature(); } @@ -556,14 +545,14 @@ (QDataStream &stream, KIdentityManagement::Signature &sig) { quint8 s; - QString url; + QString path; QString text; QString saveLocation; QList<Signature::EmbeddedImagePtr> lst; bool enabled; - stream >> s >> url >> text >> saveLocation >> lst >> enabled; + stream >> s >> path >> text >> saveLocation >> lst >> enabled; sig.setText(text); - sig.setUrl(url); + sig.setPath(path); sig.setImageLocation(saveLocation); sig.setEmbeddedImages(lst); sig.setEnabledSignature(enabled); @@ -595,7 +584,7 @@ return d->text == other.text(); case FromFile: case FromCommand: - return d->url == other.url(); + return d->path == other.path(); default: case Disabled: return true; @@ -642,9 +631,9 @@ return d->text; } -QString Signature::url() const +QString Signature::path() const { - return d->url; + return d->path; } Signature::Type Signature::type() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/src/signature.h new/kidentitymanagement-16.04.1/src/signature.h --- old/kidentitymanagement-15.12.3/src/signature.h 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/src/signature.h 2016-04-29 19:30:55.000000000 +0200 @@ -125,7 +125,7 @@ /** Constructor for inline text */ Signature(const QString &text); /** Constructor for text from a file or from output of a command */ - Signature(const QString &url, bool isExecutable); + Signature(const QString &path, bool isExecutable); /** Copy constructor */ Signature(const Signature &that); /** Assignment operator */ @@ -158,8 +158,8 @@ /** Set the signature URL and mark this signature as being of "from file" resp. "from output of command" type. */ - void setUrl(const QString &url, bool isExecutable = false); - QString url() const; + void setPath(const QString &path, bool isExecutable = false); + QString path() const; /// @return the type of signature (ie. way to obtain the signature text) Type type() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/src/signatureconfigurator.cpp new/kidentitymanagement-16.04.1/src/signatureconfigurator.cpp --- old/kidentitymanagement-15.12.3/src/signatureconfigurator.cpp 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/src/signatureconfigurator.cpp 2016-04-29 19:30:55.000000000 +0200 @@ -330,7 +330,7 @@ d->mTextEdit->setTextOrHtml(text); } -QString SignatureConfigurator::fileURL() const +QString SignatureConfigurator::filePath() const { QString file = d->mFileRequester->url().path(); @@ -347,7 +347,7 @@ d->mFileRequester->setUrl(QUrl::fromLocalFile(url)); } -QString SignatureConfigurator::commandURL() const +QString SignatureConfigurator::commandPath() const { return d->mCommandEdit->text(); } @@ -376,10 +376,10 @@ } break; case Signature::FromCommand: - sig.setUrl(commandURL(), true); + sig.setPath(commandPath(), true); break; case Signature::FromFile: - sig.setUrl(fileURL(), false); + sig.setPath(filePath(), false); break; case Signature::Disabled: /* do nothing */ @@ -407,13 +407,13 @@ sig.insertIntoTextEdit(KIdentityManagement::Signature::Start, KIdentityManagement::Signature::AddNothing, d->mTextEdit, true); if (sig.type() == Signature::FromFile) { - setFileURL(sig.url()); + setFileURL(sig.path()); } else { setFileURL(QString()); } if (sig.type() == Signature::FromCommand) { - setCommandURL(sig.url()); + setCommandURL(sig.path()); } else { setCommandURL(QString()); } @@ -426,7 +426,7 @@ void SignatureConfigurator::slotEdit() { - QString url = fileURL(); + QString url = filePath(); // slotEnableEditButton should prevent this assert from being hit: assert(!url.isEmpty()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/src/signatureconfigurator.h new/kidentitymanagement-16.04.1/src/signatureconfigurator.h --- old/kidentitymanagement-15.12.3/src/signatureconfigurator.h 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/src/signatureconfigurator.h 2016-04-29 19:30:55.000000000 +0200 @@ -90,7 +90,7 @@ * Returns the file url which the user wants * to use as a signature. */ - QString fileURL() const; + QString filePath() const; /** * Set @p url for the file url part of the @@ -102,7 +102,7 @@ * Returns the url of the command which the * users wants to use as signature. */ - QString commandURL() const; + QString commandPath() const; /** * Sets @p url as the command to execute. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kidentitymanagement-15.12.3/src/utils.h new/kidentitymanagement-16.04.1/src/utils.h --- old/kidentitymanagement-15.12.3/src/utils.h 2015-11-07 19:06:23.000000000 +0100 +++ new/kidentitymanagement-16.04.1/src/utils.h 2016-04-29 19:30:55.000000000 +0200 @@ -27,19 +27,19 @@ namespace KIdentityManagement { - /* - * Very fast version of IdentityManager::thatIsMe, that is using an internal cache (allEmails) - * - make sure that only an email address is used as parameter and NO name <email> - * - emails are tested with email.toLower(), so no need to lower them before. - */ - KIDENTITYMANAGEMENT_EXPORT bool thatIsMe(const QString &email); +/* +* Very fast version of IdentityManager::thatIsMe, that is using an internal cache (allEmails) +* - make sure that only an email address is used as parameter and NO name <email> +* - emails are tested with email.toLower(), so no need to lower them before. +*/ +KIDENTITYMANAGEMENT_EXPORT bool thatIsMe(const QString &email); - /* - * Very fast version of IdentityManager::allEmails , that is using an internal cache. - * The cache is updated with IdentityManager::changed signal. - * All email addresses + alias of the identities. The email addresses are all lowered. - */ - KIDENTITYMANAGEMENT_EXPORT const QSet<QString> &allEmails(); +/* +* Very fast version of IdentityManager::allEmails , that is using an internal cache. +* The cache is updated with IdentityManager::changed signal. +* All email addresses + alias of the identities. The email addresses are all lowered. +*/ +KIDENTITYMANAGEMENT_EXPORT const QSet<QString> &allEmails(); } #endif