Hello community, here is the log from the commit of package kactivities5 for openSUSE:Factory checked in at 2017-07-17 10:21:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kactivities5 (Old) and /work/SRC/openSUSE:Factory/.kactivities5.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kactivities5" Mon Jul 17 10:21:28 2017 rev:43 rq:509880 version:5.36.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kactivities5/kactivities5.changes 2017-07-05 23:49:23.300719959 +0200 +++ /work/SRC/openSUSE:Factory/.kactivities5.new/kactivities5.changes 2017-07-17 10:22:34.544272157 +0200 @@ -1,0 +2,10 @@ +Wed Jul 12 07:13:58 CEST 2017 - lbeltrame@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: + * [FEATURE] Option to build & install QCH file with the public API dox + +------------------------------------------------------------------- Old: ---- kactivities-5.35.0.tar.xz New: ---- kactivities-5.36.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kactivities5.spec ++++++ --- /var/tmp/diff_new_pack.r0IoR1/_old 2017-07-17 10:22:34.964212958 +0200 +++ /var/tmp/diff_new_pack.r0IoR1/_new 2017-07-17 10:22:34.968212394 +0200 @@ -17,9 +17,9 @@ %define lname libKF5Activities5 -%define _tar_path 5.35 +%define _tar_path 5.36 Name: kactivities5 -Version: 5.35.0 +Version: 5.36.0 Release: 0 %define kf5_version %{version} Summary: KDE Plasma Activities support ++++++ kactivities-5.35.0.tar.xz -> kactivities-5.36.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.35.0/CMakeLists.txt new/kactivities-5.36.0/CMakeLists.txt --- old/kactivities-5.35.0/CMakeLists.txt 2017-06-03 10:46:16.000000000 +0200 +++ new/kactivities-5.36.0/CMakeLists.txt 2017-06-30 12:16:27.000000000 +0200 @@ -3,8 +3,8 @@ cmake_minimum_required(VERSION 3.0) # KDE Frameworks -set(KF5_VERSION "5.35.0") # handled by release scripts -set(KF5_DEP_VERSION "5.35.0") # handled by release scripts +set(KF5_VERSION "5.36.0") # handled by release scripts +set(KF5_DEP_VERSION "5.36.0") # handled by release scripts project (KActivities VERSION ${KF5_VERSION}) option (KACTIVITIES_LIBRARY_ONLY "If true, compiles only the KActivities library, without the QML imports." OFF) @@ -24,7 +24,7 @@ # Extra CMake stuff 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) @@ -35,6 +35,10 @@ include (KDECompilerSettings NO_POLICY_SCOPE) include (GenerateExportHeader) 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)") # Qt set (CMAKE_AUTOMOC ON) @@ -65,8 +69,22 @@ SOVERSION 5 ) +add_subdirectory (src) +add_subdirectory (autotests) +add_subdirectory (tests) + set (CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5Activities") +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5Activities_QCH + FILE KF5ActivitiesLibraryQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5ActivitiesLibraryQchTargets.cmake\")") +endif() + install ( EXPORT KF5ActivitiesLibraryTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" @@ -93,10 +111,6 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel ) -add_subdirectory (src) -add_subdirectory (autotests) -add_subdirectory (tests) - # Write out the features feature_summary (WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.35.0/KF5ActivitiesConfig.cmake.in new/kactivities-5.36.0/KF5ActivitiesConfig.cmake.in --- old/kactivities-5.35.0/KF5ActivitiesConfig.cmake.in 2017-06-03 10:46:16.000000000 +0200 +++ new/kactivities-5.36.0/KF5ActivitiesConfig.cmake.in 2017-06-30 12:16:27.000000000 +0200 @@ -4,3 +4,4 @@ find_dependency(Qt5Core @REQUIRED_QT_VERSION@) include("${CMAKE_CURRENT_LIST_DIR}/KF5ActivitiesLibraryTargets.cmake") +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kactivities-5.35.0/src/lib/CMakeLists.txt new/kactivities-5.36.0/src/lib/CMakeLists.txt --- old/kactivities-5.35.0/src/lib/CMakeLists.txt 2017-06-03 10:46:16.000000000 +0200 +++ new/kactivities-5.36.0/src/lib/CMakeLists.txt 2017-06-30 12:16:27.000000000 +0200 @@ -131,6 +131,28 @@ ${KF5_INSTALL_TARGETS_DEFAULT_ARGS} ) +if(BUILD_QCH) + ecm_add_qch( + KF5Activities_QCH + NAME KActivities + BASE_NAME KF5Activities + VERSION ${KF5_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${KActivities_HEADERS} + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + LINK_QCHS + Qt5Core_QCH + BLANK_MACROS + KACTIVITIES_EXPORT + KACTIVITIES_DEPRECATED + KACTIVITIES_DEPRECATED_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + if (NOT WIN32) configure_file (