Hello community, here is the log from the commit of package kwindowsystem for openSUSE:Factory checked in at 2017-07-17 10:26:14 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwindowsystem (Old) and /work/SRC/openSUSE:Factory/.kwindowsystem.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwindowsystem" Mon Jul 17 10:26:14 2017 rev:47 rq:509938 version:5.36.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwindowsystem/kwindowsystem.changes 2017-07-05 23:53:39.356653369 +0200 +++ /work/SRC/openSUSE:Factory/.kwindowsystem.new/kwindowsystem.changes 2017-07-17 10:26:15.445131364 +0200 @@ -1,0 +2,11 @@ +Wed Jul 12 07:14:02 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: + * cmake: use ecm_add_test more + * [FEATURE] Option to build & install QCH file with the public API dox + +------------------------------------------------------------------- Old: ---- kwindowsystem-5.35.0.tar.xz New: ---- kwindowsystem-5.36.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwindowsystem.spec ++++++ --- /var/tmp/diff_new_pack.X723rh/_old 2017-07-17 10:26:15.945060887 +0200 +++ /var/tmp/diff_new_pack.X723rh/_new 2017-07-17 10:26:15.949060323 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5WindowSystem5 -%define _tar_path 5.35 +%define _tar_path 5.36 Name: kwindowsystem -Version: 5.35.0 +Version: 5.36.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_tar_path} ++++++ kwindowsystem-5.35.0.tar.xz -> kwindowsystem-5.36.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.35.0/CMakeLists.txt new/kwindowsystem-5.36.0/CMakeLists.txt --- old/kwindowsystem-5.35.0/CMakeLists.txt 2017-06-03 12:22:49.000000000 +0200 +++ new/kwindowsystem-5.36.0/CMakeLists.txt 2017-07-02 10:13:10.000000000 +0200 @@ -1,11 +1,11 @@ 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(KWindowSystem VERSION ${KF5_VERSION}) # ECM setup 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) @@ -18,8 +18,11 @@ include(ECMGenerateHeaders) include(CMakeFindFrameworks) +include(ECMAddQch) include(ECMPoQmTools) +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)") ecm_setup_version(PROJECT VARIABLE_PREFIX KWINDOWSYSTEM VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwindowsystem_version.h" @@ -70,6 +73,16 @@ # create a Config.cmake and a ConfigVersion.cmake file and install them set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/KF5WindowSystem") +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5WindowSystem_QCH + FILE KF5WindowSystemQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemQchTargets.cmake\")") +endif() + configure_package_config_file("${CMAKE_CURRENT_SOURCE_DIR}/KF5WindowSystemConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/KF5WindowSystemConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.35.0/KF5WindowSystemConfig.cmake.in new/kwindowsystem-5.36.0/KF5WindowSystemConfig.cmake.in --- old/kwindowsystem-5.35.0/KF5WindowSystemConfig.cmake.in 2017-06-03 12:22:49.000000000 +0200 +++ new/kwindowsystem-5.36.0/KF5WindowSystemConfig.cmake.in 2017-07-02 10:13:10.000000000 +0200 @@ -5,4 +5,4 @@ include("${CMAKE_CURRENT_LIST_DIR}/KF5WindowSystemTargets.cmake") - +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.35.0/autotests/CMakeLists.txt new/kwindowsystem-5.36.0/autotests/CMakeLists.txt --- old/kwindowsystem-5.35.0/autotests/CMakeLists.txt 2017-06-03 12:22:49.000000000 +0200 +++ new/kwindowsystem-5.36.0/autotests/CMakeLists.txt 2017-07-02 10:13:10.000000000 +0200 @@ -4,6 +4,7 @@ add_definitions(-DAUTOTEST_BUILD_DIR="${CMAKE_CURRENT_BINARY_DIR}") include(ECMMarkAsTest) +include(ECMAddTests) find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test) @@ -16,13 +17,11 @@ macro(KWINDOWSYSTEM_UNIT_TESTS) foreach(_testname ${ARGN}) - add_executable(${_testname} ${_testname}.cpp) - add_test(kwindowsystem-${_testname} ${_testname}) - target_link_libraries(${_testname} KF5::WindowSystem Qt5::Test Qt5::Widgets Qt5::X11Extras ) + set(libs KF5::WindowSystem Qt5::Test Qt5::Widgets Qt5::X11Extras) if(X11_FOUND) - target_link_libraries(${_testname} ${XCB_XCB_LIBRARY}) + list(APPEND libs ${XCB_XCB_LIBRARY}) endif() - ecm_mark_as_test(${_testname}) + ecm_add_test(${_testname}.cpp LINK_LIBRARIES ${libs} NAME_PREFIX "kwindowsystem-" GUI) endforeach(_testname) endmacro(KWINDOWSYSTEM_UNIT_TESTS) macro(KWINDOWSYSTEM_EXECUTABLE_TESTS) @@ -60,7 +59,4 @@ ) endif() -add_executable(kwindowsystemplatformwaylandtest kwindowsystem_platform_wayland_test.cpp) -add_test(kwindowsystem-kwindowsystemplatformwaylandtest kwindowsystemplatformwaylandtest) -target_link_libraries(kwindowsystemplatformwaylandtest KF5::WindowSystem Qt5::Test) -ecm_mark_as_test(kwindowsystemplatformwaylandtest) +ecm_add_test(kwindowsystem_platform_wayland_test.cpp LINK_LIBRARIES KF5::WindowSystem Qt5::Test TEST_NAME kwindowsystemplatformwaylandtest NAME_PREFIX "kwindowsystem-" GUI) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwindowsystem-5.35.0/src/CMakeLists.txt new/kwindowsystem-5.36.0/src/CMakeLists.txt --- old/kwindowsystem-5.35.0/src/CMakeLists.txt 2017-06-03 12:22:49.000000000 +0200 +++ new/kwindowsystem-5.36.0/src/CMakeLists.txt 2017-07-02 10:13:10.000000000 +0200 @@ -125,6 +125,30 @@ Devel ) +if(BUILD_QCH) + ecm_add_qch( + KF5WindowSystem_QCH + NAME KWindowSystem + BASE_NAME KF5WindowSystem + VERSION ${KF5_VERSION} + ORG_DOMAIN org.kde + SOURCE_DIRS + # using dir for now, to cover any platform dependant code + # TODO: should only use public headers, to cover only public API + ${CMAKE_CURRENT_SOURCE_DIR} + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + LINK_QCHS + Qt5Widgets_QCH + BLANK_MACROS + KWINDOWSYSTEM_EXPORT + KWINDOWSYSTEM_DEPRECATED + KWINDOWSYSTEM_DEPRECATED_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + add_subdirectory(platforms) include(ECMGeneratePriFile)
