Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package threadweaver for openSUSE:Factory checked in at 2021-02-17 18:12:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/threadweaver (Old) and /work/SRC/openSUSE:Factory/.threadweaver.new.28504 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "threadweaver" Wed Feb 17 18:12:07 2021 rev:87 rq:871742 version:5.79.0 Changes: -------- --- /work/SRC/openSUSE:Factory/threadweaver/threadweaver.changes 2021-01-13 18:30:22.493830438 +0100 +++ /work/SRC/openSUSE:Factory/.threadweaver.new.28504/threadweaver.changes 2021-02-17 18:13:10.830021130 +0100 @@ -1,0 +2,12 @@ +Mon Feb 8 08:46:58 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 5.79.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.79.0 +- Changes since 5.78.0: + * Fix map interators when building against Qt6 + * Don't explicitly init mutexes as NonRecursive + * Remove unused include + +------------------------------------------------------------------- Old: ---- threadweaver-5.78.0.tar.xz threadweaver-5.78.0.tar.xz.sig New: ---- threadweaver-5.79.0.tar.xz threadweaver-5.79.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ threadweaver.spec ++++++ --- /var/tmp/diff_new_pack.n8dcnu/_old 2021-02-17 18:13:11.446021634 +0100 +++ /var/tmp/diff_new_pack.n8dcnu/_new 2021-02-17 18:13:11.450021637 +0100 @@ -17,7 +17,7 @@ %define lname libKF5ThreadWeaver5 -%define _tar_path 5.78 +%define _tar_path 5.79 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -25,7 +25,7 @@ # Only needed for the package signature condition %bcond_without lang Name: threadweaver -Version: 5.78.0 +Version: 5.79.0 Release: 0 Summary: KDE Helper for multithreaded programming License: LGPL-2.1-or-later ++++++ threadweaver-5.78.0.tar.xz -> threadweaver-5.79.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/.gitignore new/threadweaver-5.79.0/.gitignore --- old/threadweaver-5.78.0/.gitignore 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/.gitignore 2021-02-02 02:07:55.000000000 +0100 @@ -20,3 +20,4 @@ CMakeLists.txt.user* *.unc-backup* .cmake/ +/.clang-format diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/CMakeLists.txt new/threadweaver-5.79.0/CMakeLists.txt --- old/threadweaver-5.78.0/CMakeLists.txt 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/CMakeLists.txt 2021-02-02 02:07:55.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.78.0") # handled by release scripts +set(KF5_VERSION "5.79.0") # handled by release scripts project(ThreadWeaver VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.78.0 NO_MODULE) +find_package(ECM 5.79.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://commits.kde.org/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/autotests/DeleteTest.cpp new/threadweaver-5.79.0/autotests/DeleteTest.cpp --- old/threadweaver-5.78.0/autotests/DeleteTest.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/autotests/DeleteTest.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -262,14 +262,14 @@ void DeleteTest::deleteSequence(ThreadWeaver::JobPointer) { if (m_finishCount.fetchAndAddRelease(-1) == 1) { // if it *was* 1... - emit deleteSequenceTestCompleted(); + Q_EMIT deleteSequenceTestCompleted(); } } void DeleteTest::countCompletedDecoratedCollection(JobPointer) { if (m_finishCount.fetchAndAddRelease(-1) == 1) { // if it *was* 1... - emit deleteDecoratedCollectionTestCompleted(); + Q_EMIT deleteDecoratedCollectionTestCompleted(); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/examples/HelloInternet/ViewController.cpp new/threadweaver-5.79.0/examples/HelloInternet/ViewController.cpp --- old/threadweaver-5.78.0/examples/HelloInternet/ViewController.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/examples/HelloInternet/ViewController.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -43,7 +43,7 @@ { QThread::msleep(500); showResourceImage("IMG_20140813_004131.png"); - emit setStatus(tr("Downloading post...")); + Q_EMIT setStatus(tr("Downloading post...")); } //@@snippet_end @@ -53,7 +53,7 @@ const QUrl url(m_apiPostUrl); auto const data = download(url); - emit setStatus(tr("Post downloaded...")); + Q_EMIT setStatus(tr("Post downloaded...")); QDomDocument doc; if (!doc.setContent(data)) { @@ -71,7 +71,7 @@ if (caption.isEmpty()) { error(tr("Post does not contain a caption!")); } - emit setCaption(caption); + Q_EMIT setCaption(caption); auto const imageUrl = textOfFirst("photo-url"); if (imageUrl.isEmpty()) { error(tr("Post does not contain an image!")); @@ -83,7 +83,7 @@ } m_imageUrl = QUrl(imageUrl); showResourceImage("IMG_20140813_004131-colors-cubed.png"); - emit setStatus(tr("Downloading image...")); + Q_EMIT setStatus(tr("Downloading image...")); QThread::msleep(500); } //@@snippet_end @@ -91,11 +91,11 @@ void ViewController::loadImageFromTumblr() { auto const data = download(m_imageUrl); - emit setStatus(tr("Image downloaded...")); + Q_EMIT setStatus(tr("Image downloaded...")); const QImage image=QImage::fromData(data); if (!image.isNull()) { - emit setImage(image); - emit setStatus(tr("Download complete (see %1).") + Q_EMIT setImage(image); + Q_EMIT setStatus(tr("Download complete (see %1).") .arg(m_fullPostUrl)); } else { error(tr("Image format error!")); @@ -124,8 +124,8 @@ void ViewController::error(const QString &message) { showResourceImage("IMG_20140813_004131-colors-cubed.png"); - emit setCaption(tr("Error")); - emit setStatus(tr("%1").arg(message)); + Q_EMIT setCaption(tr("Error")); + Q_EMIT setStatus(tr("%1").arg(message)); throw ThreadWeaver::JobFailed(message); } //@@snippet_end @@ -137,7 +137,7 @@ Q_ASSERT(QFile::exists(path)); const QImage i(path); Q_ASSERT(!i.isNull()); - emit setImage(i); + Q_EMIT setImage(i); } QString ViewController::attributeTextFor(const QDomDocument &doc, const char *tag, const char *attribute) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/examples/ThumbNailer/AverageLoadManager.cpp new/threadweaver-5.79.0/examples/ThumbNailer/AverageLoadManager.cpp --- old/threadweaver-5.78.0/examples/ThumbNailer/AverageLoadManager.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/examples/ThumbNailer/AverageLoadManager.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -65,7 +65,7 @@ const float y = linearLoadFunction(x); const int threads = qBound(m_min, qRound(processors * y), m_max); qDebug() << threads << y << x << relativeLoadPerProcessor << averages[0] << processors; - emit recommendedWorkerCount(threads); + Q_EMIT recommendedWorkerCount(threads); #endif } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/examples/ThumbNailer/Model.cpp new/threadweaver-5.79.0/examples/ThumbNailer/Model.cpp --- old/threadweaver-5.78.0/examples/ThumbNailer/Model.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/examples/ThumbNailer/Model.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -186,7 +186,7 @@ void Model::progressChanged() { auto const p = progress(); - emit progress(p.first, p.second); + Q_EMIT progress(p.first, p.second); } void Model::elementChanged(int id) @@ -229,6 +229,6 @@ { if (id >= 0 && id < m_images.count()) { auto const i = index(id, 0); - emit dataChanged(i, i); + Q_EMIT dataChanged(i, i); } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/src/dependencypolicy.cpp new/threadweaver-5.79.0/src/dependencypolicy.cpp --- old/threadweaver-5.78.0/src/dependencypolicy.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/src/dependencypolicy.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -83,7 +83,11 @@ QMutexLocker l(d->mutex()); // there may be only one (!) occurrence of [this, dep]: +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QMutableMultiMapIterator<JobPointer, JobPointer> it(d->dependencies()); +#else QMutableMapIterator<JobPointer, JobPointer> it(d->dependencies()); +#endif while (it.hasNext()) { it.next(); if (it.key() == jobA && it.value() == jobB) { @@ -107,7 +111,11 @@ { if (job->success()) { QMutexLocker l(d->mutex()); +#if QT_VERSION >= QT_VERSION_CHECK(6,0,0) + QMutableMultiMapIterator<JobPointer, JobPointer> it(d->dependencies()); +#else QMutableMapIterator<JobPointer, JobPointer> it(d->dependencies()); +#endif // there has to be a better way to do this: (?) while (it.hasNext()) { // we remove all entries where jobs depend on *this* : it.next(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/src/job_p.cpp new/threadweaver-5.79.0/src/job_p.cpp --- old/threadweaver-5.78.0/src/job_p.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/src/job_p.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -15,8 +15,7 @@ ThreadWeaver::Private::DefaultExecutor ThreadWeaver::Private::defaultExecutor; ThreadWeaver::Private::Job_Private::Job_Private() - : mutex(QMutex::NonRecursive) - , status(Job::Status_NoStatus) + : status(Job::Status_NoStatus) , executor(&defaultExecutor) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/src/thread.cpp new/threadweaver-5.79.0/src/thread.cpp --- old/threadweaver-5.78.0/src/thread.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/src/thread.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -72,7 +72,7 @@ Q_ASSERT(QCoreApplication::instance() != nullptr); d->parent->threadEnteredRun(this); - emit started(this); + Q_EMIT started(this); TWDEBUG(3, "Thread::run [%u]: running.\n", id()); bool wasBusy = false; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/src/weaver.cpp new/threadweaver-5.79.0/src/weaver.cpp --- old/threadweaver-5.78.0/src/weaver.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/src/weaver.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -108,7 +108,7 @@ "retrying.\n", th->id()); } } - emit(threadExited(th)); + Q_EMIT(threadExited(th)); delete th; } Q_ASSERT(d()->inventory.isEmpty()); @@ -136,9 +136,9 @@ newState->activated(); TWDEBUG(2, "WeaverImpl::setState: state changed to \"%s\".\n", newState->stateName().toLatin1().constData()); if (id == Suspended) { - emit(suspended()); + Q_EMIT(suspended()); } - emit(stateChanged(newState)); + Q_EMIT(stateChanged(newState)); } } @@ -456,7 +456,7 @@ if (d()->assignments.isEmpty() && d()->active == 0) { P_ASSERT(diff < 0); // cannot reach zero otherwise - emit(finished()); + Q_EMIT(finished()); } } @@ -474,7 +474,7 @@ void Weaver::threadEnteredRun(Thread *thread) { d()->semaphore.release(1); - emit threadStarted(thread); + Q_EMIT threadStarted(thread); } /** @brief Take the first available job out of the queue and return it. @@ -576,7 +576,7 @@ Q_ASSERT(!d()->mutex->tryLock()); //mutex has to be held when this method is called TWDEBUG(4, "WeaverImpl::blockThreadUntilJobsAreBeingAssigned_locked: thread %i blocked (%s state).\n", th->id(), qPrintable(state()->stateName())); - emit threadSuspended(th); + Q_EMIT threadSuspended(th); d()->jobAvailable.wait(d()->mutex); TWDEBUG(4, "WeaverImpl::blockThreadUntilJobsAreBeingAssigned_locked: thread %i resumed (%s state).\n", th->id(), qPrintable(state()->stateName())); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/src/weaver_p.cpp new/threadweaver-5.79.0/src/weaver_p.cpp --- old/threadweaver-5.78.0/src/weaver_p.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/src/weaver_p.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -26,7 +26,7 @@ : QueueSignals_Private() , active(0) , inventoryMax(qMax(4, 2 * QThread::idealThreadCount())) - , mutex(new QMutex(QMutex::NonRecursive)) + , mutex(new QMutex) { } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.78.0/src/workinghardstate.cpp new/threadweaver-5.79.0/src/workinghardstate.cpp --- old/threadweaver-5.78.0/src/workinghardstate.cpp 2021-01-02 13:37:17.000000000 +0100 +++ new/threadweaver-5.79.0/src/workinghardstate.cpp 2021-02-02 02:07:55.000000000 +0100 @@ -10,8 +10,6 @@ #include "workinghardstate.h" -#include <QByteRef> - #include "job.h" #include "thread.h" #include "threadweaver.h"
