Hello community, here is the log from the commit of package kmbox for openSUSE:Factory checked in at 2017-12-18 08:51:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmbox (Old) and /work/SRC/openSUSE:Factory/.kmbox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmbox" Mon Dec 18 08:51:24 2017 rev:28 rq:556215 version:17.12.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kmbox/kmbox.changes 2017-11-16 14:26:36.410003832 +0100 +++ /work/SRC/openSUSE:Factory/.kmbox.new/kmbox.changes 2017-12-18 08:51:27.182129529 +0100 @@ -1,0 +2,35 @@ +Sat Dec 09 14:59:07 CET 2017 - [email protected] + +- Update to 17.12.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12.0.php +- Changes since 17.11.90: + * None + +------------------------------------------------------------------- +Sat Dec 02 10:12:37 CET 2017 - [email protected] + +- Update to 17.11.90 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12-rc.php +- Changes since 17.11.80: + * None + +------------------------------------------------------------------- +Mon Nov 20 06:59:17 CET 2017 - [email protected] + +- Update to 17.11.80 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/announce-applications-17.12-beta.php +- Changes since 17.08.3: + * Don't forget to include CMakeFindDependencyMacro. + * Initialize variables + * initialize variables + * Allow to run test without install it + * Remove unused virtual keyword + * Remove qt check + +------------------------------------------------------------------- Old: ---- kmbox-17.08.3.tar.xz New: ---- kmbox-17.12.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmbox.spec ++++++ --- /var/tmp/diff_new_pack.IVhV2f/_old 2017-12-18 08:51:29.178033179 +0100 +++ /var/tmp/diff_new_pack.IVhV2f/_new 2017-12-18 08:51:29.182032986 +0100 @@ -18,7 +18,7 @@ %define kf5_version 5.19.0 Name: kmbox -Version: 17.08.3 +Version: 17.12.0 Release: 0 %define kf5_version 5.26.0 # Latest stable Applications (e.g. 17.08 in KA, but 17.11.80 in KUA) ++++++ kmbox-17.08.3.tar.xz -> kmbox-17.12.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/.reviewboardrc new/kmbox-17.12.0/.reviewboardrc --- old/kmbox-17.08.3/.reviewboardrc 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/.reviewboardrc 1970-01-01 01:00:00.000000000 +0100 @@ -1,5 +0,0 @@ -REVIEWBOARD_URL = "https://git.reviewboard.kde.org"; -REPOSITORY = "git://anongit.kde.org/kmbox" -BRANCH = "master" -TARGET_GROUPS = "kdepimlibs" -TARGET_PEOPLE = "mlaurent" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/CMakeLists.txt new/kmbox-17.12.0/CMakeLists.txt --- old/kmbox-17.08.3/CMakeLists.txt 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/CMakeLists.txt 2017-12-04 11:20:23.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(PIM_VERSION "5.6.3") +set(PIM_VERSION "5.7.0") project(KMbox VERSION ${PIM_VERSION}) # ECM setup -set(KF5_VERSION "5.35.0") +set(KF5_VERSION "5.39.0") find_package(ECM ${KF5_VERSION} CONFIG REQUIRED) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH}) @@ -23,7 +23,7 @@ set(KMBOX_LIB_VERSION ${PIM_VERSION}) -set(KMIME_LIB_VERSION "5.6.3") +set(KMIME_LIB_VERSION "5.7.0") ecm_setup_version(PROJECT VARIABLE_PREFIX KMBOX VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kmbox_version.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/KF5MboxConfig.cmake.in new/kmbox-17.12.0/KF5MboxConfig.cmake.in --- old/kmbox-17.08.3/KF5MboxConfig.cmake.in 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/KF5MboxConfig.cmake.in 2017-12-04 11:20:23.000000000 +0100 @@ -1,5 +1,6 @@ @PACKAGE_INIT@ +include(CMakeFindDependencyMacro) find_dependency(KF5Mime "@KMIME_LIB_VERSION@") include("${CMAKE_CURRENT_LIST_DIR}/KF5MboxTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/autotests/mboxbenchmark.cpp new/kmbox-17.12.0/autotests/mboxbenchmark.cpp --- old/kmbox-17.08.3/autotests/mboxbenchmark.cpp 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/autotests/mboxbenchmark.cpp 2017-12-04 11:20:23.000000000 +0100 @@ -68,8 +68,7 @@ mbox2.setLockType(MBox::None); mbox2.setUnlockTimeout(5000); mbox2.load(fileName()); - foreach (const MBoxEntry &entry, mbox2.entries()) - { + foreach (const MBoxEntry &entry, mbox2.entries()) { mbox2.readMessage(entry); } } @@ -96,8 +95,7 @@ mbox2.load(fileName()); mbox2.setUnlockTimeout(5000); // Keep the mbox locked for five seconds. - foreach (const MBoxEntry &entry, mbox2.entries()) - { + foreach (const MBoxEntry &entry, mbox2.entries()) { mbox2.readMessage(entry); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/autotests/mboxbenchmark.h new/kmbox-17.12.0/autotests/mboxbenchmark.h --- old/kmbox-17.08.3/autotests/mboxbenchmark.h 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/autotests/mboxbenchmark.h 2017-12-04 11:20:23.000000000 +0100 @@ -40,7 +40,7 @@ QString fileName(); private: - QTemporaryDir *mTempDir; + QTemporaryDir *mTempDir = nullptr; KMime::Message::Ptr mMail1; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/autotests/mboxtest.cpp new/kmbox-17.12.0/autotests/mboxtest.cpp --- old/kmbox-17.08.3/autotests/mboxtest.cpp 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/autotests/mboxtest.cpp 2017-12-04 11:20:23.000000000 +0100 @@ -319,30 +319,30 @@ mbox1.appendMessage(mMail1); MBoxEntry::List infos = mbox1.entries(); - QCOMPARE(infos.size() , 3); + QCOMPARE(infos.size(), 3); MBoxEntry::List deletedEntries; deletedEntries << infos.at(0); MBoxEntry::List infos2 = mbox1.entries(deletedEntries); - QCOMPARE(infos2.size() , 2); + QCOMPARE(infos2.size(), 2); QVERIFY(infos2.first() != infos.first()); QVERIFY(infos2.last() != infos.first()); deletedEntries << infos.at(1); infos2 = mbox1.entries(deletedEntries); - QCOMPARE(infos2.size() , 1); + QCOMPARE(infos2.size(), 1); QVERIFY(infos2.first() != infos.at(0)); QVERIFY(infos2.first() != infos.at(1)); deletedEntries << infos.at(2); infos2 = mbox1.entries(deletedEntries); - QCOMPARE(infos2.size() , 0); + QCOMPARE(infos2.size(), 0); QVERIFY(!deletedEntries.contains(MBoxEntry(10))); // some random offset infos2 = mbox1.entries(MBoxEntry::List() << MBoxEntry(10)); - QCOMPARE(infos2.size() , 3); + QCOMPARE(infos2.size(), 3); QCOMPARE(infos2.at(0), infos.at(0)); QCOMPARE(infos2.at(1), infos.at(1)); QCOMPARE(infos2.at(2), infos.at(2)); @@ -523,8 +523,8 @@ file.open(QIODevice::WriteOnly | QIODevice::Append); QByteArray message = KMime::CRLFtoLF(sEntry1); - file.write(QByteArray("From [email protected] ") + - QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8() + "\n"); + file.write(QByteArray("From [email protected] ") + +QDateTime::currentDateTime().toString(Qt::ISODate).toUtf8() + "\n"); file.write(message); file.write("\n\n"); file.close(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/autotests/mboxtest.h new/kmbox-17.12.0/autotests/mboxtest.h --- old/kmbox-17.08.3/autotests/mboxtest.h 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/autotests/mboxtest.h 2017-12-04 11:20:23.000000000 +0100 @@ -52,7 +52,7 @@ void removeTestFile(); private: - QTemporaryDir *mTempDir; + QTemporaryDir *mTempDir = nullptr; KMime::Message::Ptr mMail1; KMime::Message::Ptr mMail2; }; @@ -65,10 +65,10 @@ explicit ThreadFillsMBox(const QString &fileName); protected: - virtual void run() override; + void run() override; private: - KMBox::MBox *mbox; + KMBox::MBox *mbox = nullptr; }; #endif // MBOXTEST_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/src/mbox.cpp new/kmbox-17.12.0/src/mbox.cpp --- old/kmbox-17.08.3/src/mbox.cpp 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/src/mbox.cpp 2017-12-04 11:20:23.000000000 +0100 @@ -169,9 +169,8 @@ // if atEnd, use mail only if there was a separator line at all, // otherwise it's not a valid mbox - if (d->isMBoxSeparator(line) || - (d->mMboxFile.atEnd() && (prevSeparator.size() != 0))) { - + if (d->isMBoxSeparator(line) + || (d->mMboxFile.atEnd() && (prevSeparator.size() != 0))) { // if we are the at the file end, update pos to not forget the last line if (d->mMboxFile.atEnd()) { pos = d->mMboxFile.pos(); @@ -239,8 +238,8 @@ if (!d->mLockFileName.isEmpty()) { args << QString::fromLocal8Bit(QFile::encodeName(d->mLockFileName)); } else { - args << QString::fromLocal8Bit(QFile::encodeName(d->mMboxFile.fileName() + - QLatin1String(".lock"))); + args << QString::fromLocal8Bit(QFile::encodeName(d->mMboxFile.fileName() + +QLatin1String(".lock"))); } rc = QProcess::execute(QStringLiteral("lockfile"), args); @@ -313,7 +312,7 @@ bool MBox::purge(const MBoxEntry::List &deletedEntries, QList<MBoxEntry::Pair> *movedEntries) { - if ( d->mMboxFile.fileName().isEmpty() || d->mReadOnly ) { + if (d->mMboxFile.fileName().isEmpty() || d->mReadOnly) { return false; // No file loaded yet or it's readOnly } @@ -359,9 +358,9 @@ if (deletedEntries.contains(entry) && !writeOffSetInitialized) { writeOffset = entry.messageOffset(); writeOffSetInitialized = true; - } else if (writeOffSetInitialized && - writeOffset < entry.messageOffset() && - !deletedEntries.contains(entry)) { + } else if (writeOffSetInitialized + && writeOffset < entry.messageOffset() + && !deletedEntries.contains(entry)) { // The current message doesn't have to be deleted, but must be moved. // First determine the size of the entry that must be moved. quint64 entrySize = 0; @@ -593,8 +592,9 @@ return true; } - if ( d->mReadOnly ) + if (d->mReadOnly) { return false; + } if (d->mAppendedEntries.isEmpty()) { return true; // Nothing to do. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/src/mbox.h new/kmbox-17.12.0/src/mbox.h --- old/kmbox-17.08.3/src/mbox.h 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/src/mbox.h 2017-12-04 11:20:23.000000000 +0100 @@ -25,9 +25,7 @@ #include <kmime/kmime_message.h> -namespace KMBox -{ - +namespace KMBox { class MBoxPrivate; /** @@ -257,7 +255,6 @@ */ bool isReadOnly() const; - private: //@cond PRIVATE Q_DISABLE_COPY(MBox) @@ -265,7 +262,6 @@ MBoxPrivate *const d; //@endcond }; - } #endif // KMBOX_MBOX_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/src/mbox_p.cpp new/kmbox-17.12.0/src/mbox_p.cpp --- old/kmbox-17.08.3/src/mbox_p.cpp 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/src/mbox_p.cpp 2017-12-04 11:20:23.000000000 +0100 @@ -26,8 +26,12 @@ using namespace KMBox; MBoxPrivate::MBoxPrivate(MBox *mbox) - : mInitialMboxFileSize(0), mMBox(mbox), - mSeparatorMatcher(QStringLiteral("^From .*[0-9][0-9]:[0-9][0-9]")), mLockType(MBox::None), mFileLocked(false), mReadOnly(false) + : mInitialMboxFileSize(0) + , mMBox(mbox) + , mSeparatorMatcher(QStringLiteral("^From .*[0-9][0-9]:[0-9][0-9]")) + , mLockType(MBox::None) + , mFileLocked(false) + , mReadOnly(false) { connect(&mUnlockTimer, &QTimer::timeout, this, &MBoxPrivate::unlockMBox); } @@ -47,11 +51,11 @@ QIODevice::OpenMode mode = mReadOnly ? QIODevice::ReadOnly : QIODevice::ReadWrite; - if ( !mMboxFile.open( mode ) ) { // messages file + if (!mMboxFile.open(mode)) { // messages file // failed to open readWrite -> try to open readOnly - if ( !mMboxFile.open( QIODevice::ReadOnly ) ) { + if (!mMboxFile.open(QIODevice::ReadOnly)) { qCDebug(KMBOX_LOG) << "Cannot open mbox file `" << mMboxFile.fileName() << "' FileError:" - << mMboxFile.errorString(); + << mMboxFile.errorString(); return false; } else { mReadOnly = true; @@ -152,10 +156,8 @@ if (onlyAnglesAfterLF && qstrncmp(s + 1, "rom ", STRDIM("rom ")) == 0) { *d++ = '>'; } - // fall through -#if QT_VERSION >= QT_VERSION_CHECK(5,8,0) - Q_FALLTHROUGH(); -#endif + // fall through + Q_FALLTHROUGH(); default: onlyAnglesAfterLF = false; break; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/src/mbox_p.h new/kmbox-17.12.0/src/mbox_p.h --- old/kmbox-17.08.3/src/mbox_p.h 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/src/mbox_p.h 2017-12-04 11:20:23.000000000 +0100 @@ -26,9 +26,7 @@ #include <QObject> #include <QTimer> -namespace KMBox -{ - +namespace KMBox { class MBoxPrivate : public QObject { Q_OBJECT @@ -52,18 +50,17 @@ void unlockMBox(); public: - QByteArray mAppendedEntries; + QByteArray mAppendedEntries; MBoxEntry::List mEntries; - quint64 mInitialMboxFileSize; - QString mLockFileName; - MBox *mMBox; - QFile mMboxFile; - QTimer mUnlockTimer; - QRegExp mSeparatorMatcher; - MBox::LockType mLockType; - bool mFileLocked; - bool mReadOnly; - + quint64 mInitialMboxFileSize = 0; + QString mLockFileName; + MBox *mMBox = nullptr; + QFile mMboxFile; + QTimer mUnlockTimer; + QRegExp mSeparatorMatcher; + MBox::LockType mLockType; + bool mFileLocked = false; + bool mReadOnly = false; public: /// Static helper methods static QByteArray escapeFrom(const QByteArray &msg); @@ -78,7 +75,6 @@ */ static void unescapeFrom(char *msg, size_t size); }; - } #endif // KMBOX_MBOX_P_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/src/mboxentry.cpp new/kmbox-17.12.0/src/mboxentry.cpp --- old/kmbox-17.08.3/src/mboxentry.cpp 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/src/mboxentry.cpp 2017-12-04 11:20:23.000000000 +0100 @@ -54,7 +54,7 @@ bool MBoxEntry::operator==(const MBoxEntry &other) const { - return (d->mOffset == other.d->mOffset); + return d->mOffset == other.d->mOffset; } bool MBoxEntry::operator!=(const MBoxEntry &other) const @@ -64,7 +64,7 @@ bool MBoxEntry::isValid() const { - return ((d->mOffset != 0) && (d->mMessageSize != 0)); + return (d->mOffset != 0) && (d->mMessageSize != 0); } quint64 MBoxEntry::messageOffset() const diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/src/mboxentry.h new/kmbox-17.12.0/src/mboxentry.h --- old/kmbox-17.08.3/src/mboxentry.h 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/src/mboxentry.h 2017-12-04 11:20:23.000000000 +0100 @@ -27,8 +27,7 @@ #include <QPair> #include <QSharedDataPointer> -namespace KMBox -{ +namespace KMBox { class MBoxEntryPrivate; /** * @short A class that encapsulates an entry of a MBox. @@ -116,7 +115,6 @@ QSharedDataPointer<MBoxEntryPrivate> d; //@endcond }; - } Q_DECLARE_TYPEINFO(KMBox::MBoxEntry, Q_MOVABLE_TYPE); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmbox-17.08.3/src/mboxentry_p.h new/kmbox-17.12.0/src/mboxentry_p.h --- old/kmbox-17.08.3/src/mboxentry_p.h 2017-10-29 08:12:36.000000000 +0100 +++ new/kmbox-17.12.0/src/mboxentry_p.h 2017-12-04 11:20:23.000000000 +0100 @@ -22,14 +22,11 @@ #include <QSharedData> -namespace KMBox -{ - +namespace KMBox { class MBoxEntryPrivate : public QSharedData { public: MBoxEntryPrivate() - : mOffset(0), mMessageSize(0), mSeparatorSize(0) { } @@ -41,11 +38,10 @@ mSeparatorSize = other.mSeparatorSize; } - quint64 mOffset; - quint64 mMessageSize; - quint64 mSeparatorSize; + quint64 mOffset = 0; + quint64 mMessageSize = 0; + quint64 mSeparatorSize = 0; }; - } #endif // KMBOX_MBOXENTRY_P_H
