Hello community, here is the log from the commit of package threadweaver for openSUSE:Factory checked in at 2017-07-17 10:27:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/threadweaver (Old) and /work/SRC/openSUSE:Factory/.threadweaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "threadweaver" Mon Jul 17 10:27:07 2017 rev:43 rq:509949 version:5.36.0 Changes: -------- --- /work/SRC/openSUSE:Factory/threadweaver/threadweaver.changes 2017-07-05 23:54:43.751582579 +0200 +++ /work/SRC/openSUSE:Factory/.threadweaver.new/threadweaver.changes 2017-07-17 10:27:08.509650565 +0200 @@ -1,0 +2,12 @@ +Wed Jul 12 07:14:05 CEST 2017 - lbeltr...@kde.org + +- Update to 5.36.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.36.0.php +- Changes since 5.35.0: + * Fixup parent commit + * Work-around MSVC2017 compiler bug + * [FEATURE] Option to build & install QCH file with the public API dox + +------------------------------------------------------------------- Old: ---- threadweaver-5.35.0.tar.xz New: ---- threadweaver-5.36.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ threadweaver.spec ++++++ --- /var/tmp/diff_new_pack.NOmPAG/_old 2017-07-17 10:27:09.065572194 +0200 +++ /var/tmp/diff_new_pack.NOmPAG/_new 2017-07-17 10:27:09.065572194 +0200 @@ -17,9 +17,9 @@ %define lname libKF5ThreadWeaver5 -%define _tar_path 5.35 +%define _tar_path 5.36 Name: threadweaver -Version: 5.35.0 +Version: 5.36.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kill_not_needed_stuff.diff ++++++ --- /var/tmp/diff_new_pack.NOmPAG/_old 2017-07-17 10:27:09.101567119 +0200 +++ /var/tmp/diff_new_pack.NOmPAG/_new 2017-07-17 10:27:09.101567119 +0200 @@ -1,8 +1,8 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d93fc27..61d52bc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,9 +34,9 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX THREADWEAVER +Index: threadweaver-5.36.0/CMakeLists.txt +=================================================================== +--- threadweaver-5.36.0.orig/CMakeLists.txt ++++ threadweaver-5.36.0/CMakeLists.txt +@@ -40,9 +40,9 @@ ecm_setup_version(PROJECT VARIABLE_PREFI # -- add_subdirectory(src) ++++++ threadweaver-5.35.0.tar.xz -> threadweaver-5.36.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.35.0/CMakeLists.txt new/threadweaver-5.36.0/CMakeLists.txt --- old/threadweaver-5.35.0/CMakeLists.txt 2017-06-03 11:23:59.000000000 +0200 +++ new/threadweaver-5.36.0/CMakeLists.txt 2017-06-30 12:56:21.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.35.0") # handled by release scripts +set(KF5_VERSION "5.36.0") # handled by release scripts project(ThreadWeaver VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.35.0 NO_MODULE) +find_package(ECM 5.36.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) @@ -24,6 +24,10 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) +include(ECMAddQch) + +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)") IF(THREADWEAVER_USE_GNU_CXX11) ADD_DEFINITIONS(-std=c++11) @@ -43,6 +47,16 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5ThreadWeaver") +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5ThreadWeaver_QCH + FILE KF5ThreadWeaverQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5ThreadWeaverQchTargets.cmake\")") +endif() + include(CMakePackageConfigHelpers) configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5ThreadWeaverConfig.cmake.in" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.35.0/KF5ThreadWeaverConfig.cmake.in new/threadweaver-5.36.0/KF5ThreadWeaverConfig.cmake.in --- old/threadweaver-5.35.0/KF5ThreadWeaverConfig.cmake.in 2017-06-03 11:23:59.000000000 +0200 +++ new/threadweaver-5.36.0/KF5ThreadWeaverConfig.cmake.in 2017-06-30 12:56:21.000000000 +0200 @@ -5,4 +5,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5ThreadWeaverTargets.cmake") - +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.35.0/examples/ThumbNailer/Model.cpp new/threadweaver-5.36.0/examples/ThumbNailer/Model.cpp --- old/threadweaver-5.35.0/examples/ThumbNailer/Model.cpp 2017-06-03 11:23:59.000000000 +0200 +++ new/threadweaver-5.36.0/examples/ThumbNailer/Model.cpp 2017-06-30 12:56:21.000000000 +0200 @@ -113,13 +113,15 @@ { beginResetModel(); Q_ASSERT(m_images.isEmpty()); - m_images.resize(filenames.size()); + m_images.reserve(filenames.size()); int counter = 0; auto initializeImage = [=, &counter] (const QFileInfo& file) { auto const out = QFileInfo(outputDirectory, file.fileName()).absoluteFilePath(); return Image(file.absoluteFilePath(), out, this, counter++); }; - transform(filenames.begin(), filenames.end(), m_images.begin(), initializeImage); + for (const auto& filename : filenames) { + m_images << initializeImage(filename); + } endResetModel(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.35.0/src/CMakeLists.txt new/threadweaver-5.36.0/src/CMakeLists.txt --- old/threadweaver-5.35.0/src/CMakeLists.txt 2017-06-03 11:23:59.000000000 +0200 +++ new/threadweaver-5.36.0/src/CMakeLists.txt 2017-06-30 12:56:21.000000000 +0200 @@ -97,6 +97,30 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/ThreadWeaver/threadweaver COMPONENT Devel ) +if(BUILD_QCH) + ecm_add_qch( + KF5ThreadWeaver_QCH + NAME ThreadWeaver + BASE_NAME KF5ThreadWeaver + VERSION ${KF5_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${ThreadWeaver_HEADERS} + "${CMAKE_SOURCE_DIR}/docs/use-cases.md" + "${CMAKE_SOURCE_DIR}/docs/whymultithreading.md" + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + LINK_QCHS + Qt5Core_QCH + BLANK_MACROS + THREADWEAVER_EXPORT + THREADWEAVER_DEPRECATED + THREADWEAVER_DEPRECATED_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +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) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
