Hello community, here is the log from the commit of package threadweaver for openSUSE:Factory checked in at 2019-11-12 11:53:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/threadweaver (Old) and /work/SRC/openSUSE:Factory/.threadweaver.new.2990 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "threadweaver" Tue Nov 12 11:53:08 2019 rev:72 rq:747158 version:5.64.0 Changes: -------- --- /work/SRC/openSUSE:Factory/threadweaver/threadweaver.changes 2019-10-14 13:41:05.793460881 +0200 +++ /work/SRC/openSUSE:Factory/.threadweaver.new.2990/threadweaver.changes 2019-11-12 11:53:22.959215383 +0100 @@ -1,0 +2,11 @@ +Sun Nov 3 15:47:25 UTC 2019 - Christophe Giboudeaux <[email protected]> + +- Update to 5.64.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.64.0.php +- Changes since 5.63.0: + * Make it compile against qt5.15 + * Use ECMGenerateExportHeader to manage deprecated API better + +------------------------------------------------------------------- Old: ---- threadweaver-5.63.0.tar.xz threadweaver-5.63.0.tar.xz.sig New: ---- threadweaver-5.64.0.tar.xz threadweaver-5.64.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ threadweaver.spec ++++++ --- /var/tmp/diff_new_pack.Gh6NOD/_old 2019-11-12 11:53:24.779217245 +0100 +++ /var/tmp/diff_new_pack.Gh6NOD/_new 2019-11-12 11:53:24.783217248 +0100 @@ -17,7 +17,7 @@ %define lname libKF5ThreadWeaver5 -%define _tar_path 5.63 +%define _tar_path 5.64 # 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.63.0 +Version: 5.64.0 Release: 0 Summary: KDE Helper for multithreaded programming License: LGPL-2.1-or-later ++++++ threadweaver-5.63.0.tar.xz -> threadweaver-5.64.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.63.0/CMakeLists.txt new/threadweaver-5.64.0/CMakeLists.txt --- old/threadweaver-5.63.0/CMakeLists.txt 2019-10-06 11:39:08.000000000 +0200 +++ new/threadweaver-5.64.0/CMakeLists.txt 2019-11-02 12:47:49.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.63.0") # handled by release scripts +set(KF5_VERSION "5.64.0") # handled by release scripts project(ThreadWeaver VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.63.0 NO_MODULE) +find_package(ECM 5.64.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) @@ -19,13 +19,13 @@ set(REQUIRED_QT_VERSION 5.11.0) find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) - -include(GenerateExportHeader) - +include(ECMGenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(ECMAddQch) +set(EXCLUDE_DEPRECATED_BEFORE_AND_AT 0 CACHE STRING "Control the range of deprecated API excluded from the build [default=0].") + option(BUILD_QCH "Build API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)" OFF) add_feature_info(QCH ${BUILD_QCH} "API documentation in QCH format (for e.g. Qt Assistant, Qt Creator & KDevelop)") @@ -36,6 +36,7 @@ # -- add_definitions(-DQT_NO_FOREACH) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00) +add_definitions(-DQT_DEPRECATED_WARNINGS_SINCE=0x060000) add_subdirectory(src) if (BUILD_TESTING) add_subdirectory(autotests) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.63.0/docs/Doxyfile.local new/threadweaver-5.64.0/docs/Doxyfile.local --- old/threadweaver-5.63.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100 +++ new/threadweaver-5.64.0/docs/Doxyfile.local 2019-11-02 12:47:49.000000000 +0100 @@ -0,0 +1,7 @@ +### KApiDox Project-specific Overrides File + +# define so that deprecated API is not skipped +PREDEFINED += \ + "THREADWEAVER_ENABLE_DEPRECATED_SINCE(x, y)=1" \ + "THREADWEAVER_BUILD_DEPRECATED_SINCE(x, y)=1" \ + "THREADWEAVER_DEPRECATED_VERSION(x, y, t)=" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.63.0/examples/ThumbNailer/Image.cpp new/threadweaver-5.64.0/examples/ThumbNailer/Image.cpp --- old/threadweaver-5.63.0/examples/ThumbNailer/Image.cpp 2019-10-06 11:39:08.000000000 +0200 +++ new/threadweaver-5.64.0/examples/ThumbNailer/Image.cpp 2019-11-02 12:47:49.000000000 +0100 @@ -54,7 +54,11 @@ Progress Image::progress() const { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) return qMakePair(m_progress.load(), Step_NumberOfSteps); +#else + return qMakePair(m_progress.loadRelaxed(), Step_NumberOfSteps); +#endif } QString Image::description() const @@ -178,7 +182,11 @@ void Image::error(Image::Steps step, const QString &message) { +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) m_failedStep.store(step); +#else + m_failedStep.storeRelaxed(step); +#endif announceProgress(Step_Complete); throw ThreadWeaver::JobFailed(message); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.63.0/src/CMakeLists.txt new/threadweaver-5.64.0/src/CMakeLists.txt --- old/threadweaver-5.63.0/src/CMakeLists.txt 2019-10-06 11:39:08.000000000 +0200 +++ new/threadweaver-5.64.0/src/CMakeLists.txt 2019-11-02 12:47:49.000000000 +0100 @@ -35,8 +35,15 @@ ) add_library(KF5ThreadWeaver ${ThreadWeaver_LIB_SRCS}) -generate_export_header(KF5ThreadWeaver BASE_NAME ThreadWeaver) add_library(KF5::ThreadWeaver ALIAS KF5ThreadWeaver) +ecm_generate_export_header(KF5ThreadWeaver + BASE_NAME ThreadWeaver + GROUP_BASE_NAME KF + VERSION ${KF5_VERSION} + DEPRECATED_BASE_VERSION 0 + DEPRECATION_VERSIONS 5.0 + EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} +) target_link_libraries(KF5ThreadWeaver PUBLIC Qt5::Core) set(threadweaver_BUILD_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/.. ${CMAKE_CURRENT_BINARY_DIR}) target_include_directories(KF5ThreadWeaver PUBLIC "$<BUILD_INTERFACE:${threadweaver_BUILD_INCLUDE_DIRS}>") @@ -118,6 +125,7 @@ THREADWEAVER_EXPORT THREADWEAVER_DEPRECATED THREADWEAVER_DEPRECATED_EXPORT + "THREADWEAVER_DEPRECATED_VERSION(x, y, t)" TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} COMPONENT Devel diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.63.0/src/collection.cpp new/threadweaver-5.64.0/src/collection.cpp --- old/threadweaver-5.63.0/src/collection.cpp 2019-10-06 11:39:08.000000000 +0200 +++ new/threadweaver-5.64.0/src/collection.cpp 2019-11-02 12:47:49.000000000 +0100 @@ -180,11 +180,13 @@ } +#if THREADWEAVER_BUILD_DEPRECATED_SINCE(5, 0) int Collection::jobListLength() const { QMutexLocker l(mutex()); Q_UNUSED(l); return jobListLength_locked(); } +#endif int Collection::jobListLength_locked() const { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.63.0/src/collection.h new/threadweaver-5.64.0/src/collection.h --- old/threadweaver-5.63.0/src/collection.h 2019-10-06 11:39:08.000000000 +0200 +++ new/threadweaver-5.64.0/src/collection.h 2019-11-02 12:47:49.000000000 +0100 @@ -68,9 +68,11 @@ /** Return the number of elements in the collection. */ int elementCount() const; - //FIXME remove - /** @deprecated Use elementCount(). */ +#if THREADWEAVER_ENABLE_DEPRECATED_SINCE(5, 0) + /** @deprecated Since 5.0, use elementCount(). */ + THREADWEAVER_DEPRECATED_VERSION(5, 0, "Use Collection::elementCount()") int jobListLength() const; +#endif /** @brief Add the job to this collection by pointer. */ Collection &operator<<(ThreadWeaver::JobInterface *job); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.63.0/src/queue.cpp new/threadweaver-5.64.0/src/queue.cpp --- old/threadweaver-5.63.0/src/queue.cpp 2019-10-06 11:39:08.000000000 +0200 +++ new/threadweaver-5.64.0/src/queue.cpp 2019-11-02 12:47:49.000000000 +0100 @@ -135,7 +135,11 @@ , instance_(instance) { Q_ASSERT_X(app != nullptr, Q_FUNC_INFO, "Calling ThreadWeaver::Weaver::instance() requires a QCoreApplication!"); +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) QObject *impl = instance.load()->findChild<QueueSignals*>(); +#else + QObject *impl = instance.loadRelaxed()->findChild<QueueSignals*>(); +#endif Q_ASSERT(impl); impl->setObjectName(QStringLiteral("GlobalQueue")); qAddPostRoutine(shutDownGlobalQueue); @@ -178,9 +182,17 @@ //the object s_instance pointed to. static StaticThreadWeaverInstanceGuard *s_instanceGuard = new StaticThreadWeaverInstanceGuard(s_instance, qApp); Q_UNUSED(s_instanceGuard); - Q_ASSERT_X(s_instance.load() == nullptr || s_instance.load()->thread() == QCoreApplication::instance()->thread(), +#if QT_VERSION < QT_VERSION_CHECK(5, 15, 0) + Q_ASSERT_X(s_instance.load() == nullptr || + s_instance.load()->thread() == QCoreApplication::instance()->thread(), Q_FUNC_INFO, "The global ThreadWeaver queue needs to be instantiated (accessed first) from the main thread!"); +#else + Q_ASSERT_X(s_instance.loadRelaxed() == nullptr || + s_instance.loadRelaxed()->thread() == QCoreApplication::instance()->thread(), + Q_FUNC_INFO, + "The global ThreadWeaver queue needs to be instantiated (accessed first) from the main thread!"); +#endif return s_instance.loadAcquire(); }
