Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package threadweaver for openSUSE:Factory checked in at 2022-01-11 21:17:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/threadweaver (Old) and /work/SRC/openSUSE:Factory/.threadweaver.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "threadweaver" Tue Jan 11 21:17:03 2022 rev:98 rq:945104 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/threadweaver/threadweaver.changes 2021-12-13 20:45:32.320493474 +0100 +++ /work/SRC/openSUSE:Factory/.threadweaver.new.1892/threadweaver.changes 2022-01-11 21:20:21.289004625 +0100 @@ -1,0 +2,12 @@ +Mon Jan 3 12:48:11 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.90.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.90.0 +- Changes since 5.89.0: + * Use fetchAndStoreOrdered() instead of fetchAndAddOrdered() + * Fix invalid lambda argument for use in std::for_each + * Change the build system to enable building with Qt6 + +------------------------------------------------------------------- Old: ---- threadweaver-5.89.0.tar.xz threadweaver-5.89.0.tar.xz.sig New: ---- threadweaver-5.90.0.tar.xz threadweaver-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ threadweaver.spec ++++++ --- /var/tmp/diff_new_pack.1Oxe3N/_old 2022-01-11 21:20:21.845005016 +0100 +++ /var/tmp/diff_new_pack.1Oxe3N/_new 2022-01-11 21:20:21.849005019 +0100 @@ -17,22 +17,22 @@ %define lname libKF5ThreadWeaver5 -%define _tar_path 5.89 +%define _tar_path 5.90 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %define _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} # Only needed for the package signature condition -%bcond_without lang +%bcond_without released Name: threadweaver -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: KDE Helper for multithreaded programming License: LGPL-2.1-or-later Group: System/GUI/KDE URL: https://www.kde.org Source: %{name}-%{version}.tar.xz -%if %{with lang} +%if %{with released} Source1: %{name}-%{version}.tar.xz.sig Source2: frameworks.keyring %endif ++++++ threadweaver-5.89.0.tar.xz -> threadweaver-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/CMakeLists.txt new/threadweaver-5.90.0/CMakeLists.txt --- old/threadweaver-5.89.0/CMakeLists.txt 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/CMakeLists.txt 2022-01-01 13:22:28.000000000 +0100 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts project(ThreadWeaver VERSION ${KF_VERSION}) include(FeatureSummary) -find_package(ECM 5.89.0 NO_MODULE) +find_package(ECM 5.90.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) @@ -18,7 +18,7 @@ include(KDEGitCommitHooks) set(REQUIRED_QT_VERSION 5.15.2) -find_package(Qt5Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Core ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) include(ECMGenerateExportHeader) include(ECMSetupVersion) @@ -64,7 +64,7 @@ ) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/threadweaver_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5ThreadWeaverConfig.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/KF5ThreadWeaverConfig.cmake.in new/threadweaver-5.90.0/KF5ThreadWeaverConfig.cmake.in --- old/threadweaver-5.89.0/KF5ThreadWeaverConfig.cmake.in 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/KF5ThreadWeaverConfig.cmake.in 2022-01-01 13:22:28.000000000 +0100 @@ -1,7 +1,7 @@ @PACKAGE_INIT@ include(CMakeFindDependencyMacro) -find_dependency(Qt5Core @REQUIRED_QT_VERSION@) +find_dependency(Qt@QT_MAJOR_VERSION@Core @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5ThreadWeaverTargets.cmake") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/autotests/CMakeLists.txt new/threadweaver-5.90.0/autotests/CMakeLists.txt --- old/threadweaver-5.89.0/autotests/CMakeLists.txt 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:22:28.000000000 +0100 @@ -1,4 +1,4 @@ -find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) remove_definitions(-DQT_NO_CAST_FROM_ASCII) kde_enable_exceptions() @@ -13,36 +13,36 @@ WaitForIdleAndFinished.cpp JobLoggingWeaver.cpp JobLoggingDecorator.cpp - TEST_NAME ThreadWeaverJobTests LINK_LIBRARIES Qt5::Test KF5::ThreadWeaver + TEST_NAME ThreadWeaverJobTests LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ThreadWeaver ) set_target_properties(ThreadWeaverJobTests PROPERTIES MACOSX_BUNDLE FALSE) ########### next target ############### -ecm_add_test(SequencesTests.cpp WaitForIdleAndFinished.cpp TEST_NAME ThreadWeaverSequencesTests LINK_LIBRARIES Qt5::Test KF5::ThreadWeaver) +ecm_add_test(SequencesTests.cpp WaitForIdleAndFinished.cpp TEST_NAME ThreadWeaverSequencesTests LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ThreadWeaver) set_target_properties(ThreadWeaverSequencesTests PROPERTIES MACOSX_BUNDLE FALSE) ########### next target ############### -ecm_add_test(QueueTests.cpp TEST_NAME ThreadWeaverQueueTests LINK_LIBRARIES Qt5::Test KF5::ThreadWeaver) +ecm_add_test(QueueTests.cpp TEST_NAME ThreadWeaverQueueTests LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ThreadWeaver) set_target_properties(ThreadWeaverQueueTests PROPERTIES MACOSX_BUNDLE FALSE) ########### next target ############### -ecm_add_test(DeleteTest.cpp TEST_NAME ThreadWeaverDeleteTest LINK_LIBRARIES Qt5::Test KF5::ThreadWeaver) +ecm_add_test(DeleteTest.cpp TEST_NAME ThreadWeaverDeleteTest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ThreadWeaver) set_target_properties(ThreadWeaverDeleteTest PROPERTIES MACOSX_BUNDLE FALSE) ########### next target ############### -ecm_add_test(LifecycleTests.cpp TEST_NAME ThreadWeaverLifecycleTest LINK_LIBRARIES Qt5::Test KF5::ThreadWeaver) +ecm_add_test(LifecycleTests.cpp TEST_NAME ThreadWeaverLifecycleTest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ThreadWeaver) set_target_properties(ThreadWeaverLifecycleTest PROPERTIES MACOSX_BUNDLE FALSE) ########### next target ############### -ecm_add_test(ShutdownOnQApplicationQuitTests.cpp TEST_NAME ThreadWeaverShutdownOnQApplicationQuitTest LINK_LIBRARIES Qt5::Test KF5::ThreadWeaver) +ecm_add_test(ShutdownOnQApplicationQuitTests.cpp TEST_NAME ThreadWeaverShutdownOnQApplicationQuitTest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ThreadWeaver) set_target_properties(ThreadWeaverShutdownOnQApplicationQuitTest PROPERTIES MACOSX_BUNDLE FALSE) ########### next target ############### -ecm_add_test(QueueFactoryTests.cpp TEST_NAME ThreadWeaverQueueFactoryTest LINK_LIBRARIES Qt5::Test KF5::ThreadWeaver) +ecm_add_test(QueueFactoryTests.cpp TEST_NAME ThreadWeaverQueueFactoryTest LINK_LIBRARIES Qt${QT_MAJOR_VERSION}::Test KF5::ThreadWeaver) Set_target_properties(ThreadWeaverQueueFactoryTest PROPERTIES MACOSX_BUNDLE FALSE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/autotests/JobTests.cpp new/threadweaver-5.90.0/autotests/JobTests.cpp --- old/threadweaver-5.89.0/autotests/JobTests.cpp 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/autotests/JobTests.cpp 2022-01-01 13:22:28.000000000 +0100 @@ -1155,8 +1155,8 @@ std::random_device rd; std::mt19937 g(rd()); std::shuffle(elements.begin(), elements.end(), g); - std::for_each(elements.begin(), elements.end(), [this](QVector<GeneratingEnumeratorCollection>::iterator it) { - *this << *it; + std::for_each(elements.begin(), elements.end(), [this](GeneratingEnumeratorCollection *collection) { + *this << *collection; }); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/benchmarks/CMakeLists.txt new/threadweaver-5.90.0/benchmarks/CMakeLists.txt --- old/threadweaver-5.89.0/benchmarks/CMakeLists.txt 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/benchmarks/CMakeLists.txt 2022-01-01 13:22:28.000000000 +0100 @@ -1,4 +1,4 @@ -find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) remove_definitions(-DQT_NO_CAST_FROM_ASCII) @@ -7,5 +7,5 @@ add_executable(ThreadWeaverQueueBenchmarks QueueBenchmarks.cpp) # add_test(ThreadWeaverQueueBenchmarks ThreadWeaverQueueBenchmarks) -target_link_libraries(ThreadWeaverQueueBenchmarks Qt5::Test KF5::ThreadWeaver) +target_link_libraries(ThreadWeaverQueueBenchmarks Qt${QT_MAJOR_VERSION}::Test KF5::ThreadWeaver) set_target_properties(ThreadWeaverQueueBenchmarks PROPERTIES MACOSX_BUNDLE FALSE) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/examples/CMakeLists.txt new/threadweaver-5.90.0/examples/CMakeLists.txt --- old/threadweaver-5.89.0/examples/CMakeLists.txt 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/examples/CMakeLists.txt 2022-01-01 13:22:28.000000000 +0100 @@ -1,5 +1,5 @@ -find_package(Qt5Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) -find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Widgets ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) +find_package(Qt${QT_MAJOR_VERSION}Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE) # CMake file that produces Markdown files to check if all snippet references resolve. find_program(SNIPPETEXTRACTOR snippetextractor) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/examples/HelloInternet/CMakeLists.txt new/threadweaver-5.90.0/examples/HelloInternet/CMakeLists.txt --- old/threadweaver-5.89.0/examples/HelloInternet/CMakeLists.txt 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/examples/HelloInternet/CMakeLists.txt 2022-01-01 13:22:28.000000000 +0100 @@ -1,6 +1,6 @@ # Project name project(HelloInternet) -find_package(Qt5 COMPONENTS Core Network Xml Widgets REQUIRED) +find_package(Qt${QT_MAJOR_VERSION} COMPONENTS Core Network Xml Widgets REQUIRED) # Find includes in corresponding build directories set(CMAKE_INCLUDE_CURRENT_DIR ON) # Instruct CMake to run moc automatically when needed @@ -15,5 +15,5 @@ ) kde_enable_exceptions() -target_link_libraries(ThreadWeaver_HelloInternet Qt5::Network Qt5::Xml Qt5::Widgets KF5::ThreadWeaver) +target_link_libraries(ThreadWeaver_HelloInternet Qt${QT_MAJOR_VERSION}::Network Qt${QT_MAJOR_VERSION}::Xml Qt${QT_MAJOR_VERSION}::Widgets KF5::ThreadWeaver) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/examples/ThumbNailer/CMakeLists.txt new/threadweaver-5.90.0/examples/ThumbNailer/CMakeLists.txt --- old/threadweaver-5.89.0/examples/ThumbNailer/CMakeLists.txt 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/examples/ThumbNailer/CMakeLists.txt 2022-01-01 13:22:28.000000000 +0100 @@ -19,4 +19,4 @@ AverageLoadManager.cpp ${UI_FILES} ) -target_link_libraries(ThreadWeaver_ThumbNailer KF5::ThreadWeaver Qt5::Test Qt5::Widgets) +target_link_libraries(ThreadWeaver_ThumbNailer KF5::ThreadWeaver Qt${QT_MAJOR_VERSION}::Test Qt${QT_MAJOR_VERSION}::Widgets) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/src/CMakeLists.txt new/threadweaver-5.90.0/src/CMakeLists.txt --- old/threadweaver-5.89.0/src/CMakeLists.txt 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/src/CMakeLists.txt 2022-01-01 13:22:28.000000000 +0100 @@ -85,10 +85,10 @@ DEPRECATION_VERSIONS 5.0 5.80 EXCLUDE_DEPRECATED_BEFORE_AND_AT ${EXCLUDE_DEPRECATED_BEFORE_AND_AT} ) -target_link_libraries(KF5ThreadWeaver PUBLIC Qt5::Core) +target_link_libraries(KF5ThreadWeaver PUBLIC Qt${QT_MAJOR_VERSION}::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}>") -target_include_directories(KF5ThreadWeaver INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/ThreadWeaver>") +target_include_directories(KF5ThreadWeaver INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/ThreadWeaver>") #FIXME: make this PUBLIC, so that it applies to anything that links against kde_target_enable_exceptions(KF5ThreadWeaver PRIVATE) @@ -138,12 +138,12 @@ PREFIX ThreadWeaver REQUIRED_HEADERS ThreadWeaver_HEADERS ) -install(FILES ${ThreadWeaver_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/ThreadWeaver/ThreadWeaver COMPONENT Devel) +install(FILES ${ThreadWeaver_CamelCase_HEADERS} DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/ThreadWeaver/ThreadWeaver COMPONENT Devel) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/threadweaver_export.h ${ThreadWeaver_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/ThreadWeaver/threadweaver COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/ThreadWeaver/threadweaver COMPONENT Devel ) if(BUILD_QCH) @@ -174,5 +174,5 @@ endif() include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME ThreadWeaver LIB_NAME KF5ThreadWeaver DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/ThreadWeaver) +ecm_generate_pri_file(BASE_NAME ThreadWeaver LIB_NAME KF5ThreadWeaver DEPS "core" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/ThreadWeaver) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/src/collection_p.cpp new/threadweaver-5.90.0/src/collection_p.cpp --- old/threadweaver-5.89.0/src/collection_p.cpp 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/src/collection_p.cpp 2022-01-01 13:22:28.000000000 +0100 @@ -61,8 +61,17 @@ namespace { struct MutexUnlocker { +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + QMutexLocker<QMutex> *locker; +#else QMutexLocker *locker; +#endif + +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + MutexUnlocker(QMutexLocker<QMutex> *l) +#else MutexUnlocker(QMutexLocker *l) +#endif : locker(l) { locker->unlock(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.89.0/src/executewrapper.cpp new/threadweaver-5.90.0/src/executewrapper.cpp --- old/threadweaver-5.89.0/src/executewrapper.cpp 2021-12-04 18:07:39.000000000 +0100 +++ new/threadweaver-5.90.0/src/executewrapper.cpp 2022-01-01 13:22:28.000000000 +0100 @@ -21,9 +21,8 @@ Executor *ExecuteWrapper::unwrap(const JobPointer &job) { - Executor *executor = job->setExecutor(wrapped.fetchAndAddOrdered(0)); + Executor *executor = job->setExecutor(wrapped.fetchAndStoreOrdered(nullptr)); Q_ASSERT_X(executor == this, Q_FUNC_INFO, "ExecuteWrapper can only unwrap itself!"); - wrapped.fetchAndStoreOrdered(nullptr); return executor; }
