Hello community, here is the log from the commit of package kpty for openSUSE:Factory checked in at 2017-07-17 10:25:25 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpty (Old) and /work/SRC/openSUSE:Factory/.kpty.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpty" Mon Jul 17 10:25:25 2017 rev:44 rq:509928 version:5.36.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpty/kpty.changes 2017-07-05 23:52:36.457513183 +0200 +++ /work/SRC/openSUSE:Factory/.kpty.new/kpty.changes 2017-07-17 10:25:26.508030231 +0200 @@ -1,0 +2,11 @@ +Wed Jul 12 07:14:02 CEST 2017 - [email protected] + +- 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: + * tests: fix bash path in KPtyProcessTest::test_pty_basic + * [FEATURE] Option to build & install QCH file with the public API dox + +------------------------------------------------------------------- Old: ---- kpty-5.35.0.tar.xz New: ---- kpty-5.36.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpty.spec ++++++ --- /var/tmp/diff_new_pack.93JFvo/_old 2017-07-17 10:25:27.075950170 +0200 +++ /var/tmp/diff_new_pack.93JFvo/_new 2017-07-17 10:25:27.075950170 +0200 @@ -18,9 +18,9 @@ %bcond_without lang %define lname libKF5Pty5 -%define _tar_path 5.35 +%define _tar_path 5.36 Name: kpty -Version: 5.35.0 +Version: 5.36.0 Release: 0 %define kf5_version %{version} BuildRequires: cmake >= 3.0 ++++++ kpty-5.35.0.tar.xz -> kpty-5.36.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.35.0/CMakeLists.txt new/kpty-5.36.0/CMakeLists.txt --- old/kpty-5.35.0/CMakeLists.txt 2017-06-03 12:19:11.000000000 +0200 +++ new/kpty-5.36.0/CMakeLists.txt 2017-07-02 10:09:37.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.0) -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(KPty 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) @@ -43,6 +43,10 @@ include(ECMSetupVersion) include(ECMGenerateHeaders) include(CMakePackageConfigHelpers) +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)") ecm_setup_version( PROJECT @@ -51,12 +55,6 @@ PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5PtyConfigVersion.cmake" SOVERSION 5) -configure_package_config_file( - "${CMAKE_CURRENT_SOURCE_DIR}/KF5PtyConfig.cmake.in" - "${CMAKE_CURRENT_BINARY_DIR}/KF5PtyConfig.cmake" - INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} -) - add_definitions(-DTRANSLATION_DOMAIN=\"kpty5\") if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") ki18n_install(po) @@ -64,6 +62,22 @@ add_subdirectory( src ) add_subdirectory( autotests ) +if (BUILD_QCH) + ecm_install_qch_export( + TARGETS KF5Pty_QCH + FILE KF5PtyQchTargets.cmake + DESTINATION "${CMAKECONFIG_INSTALL_DIR}" + COMPONENT Devel + ) + set(PACKAGE_INCLUDE_QCHTARGETS "include(\"\${CMAKE_CURRENT_LIST_DIR}/KF5PtyQchTargets.cmake\")") +endif() + +configure_package_config_file( + "${CMAKE_CURRENT_SOURCE_DIR}/KF5PtyConfig.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/KF5PtyConfig.cmake" + INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} +) + install(FILES "${CMAKE_CURRENT_BINARY_DIR}/KF5PtyConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/KF5PtyConfigVersion.cmake" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.35.0/KF5PtyConfig.cmake.in new/kpty-5.36.0/KF5PtyConfig.cmake.in --- old/kpty-5.35.0/KF5PtyConfig.cmake.in 2017-06-03 12:19:11.000000000 +0200 +++ new/kpty-5.36.0/KF5PtyConfig.cmake.in 2017-07-02 10:09:37.000000000 +0200 @@ -6,4 +6,4 @@ set(KPty_HAVE_UTEMPTER "@UTEMPTER_FOUND@") include("${CMAKE_CURRENT_LIST_DIR}/KF5PtyTargets.cmake") - +@PACKAGE_INCLUDE_QCHTARGETS@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.35.0/autotests/kptyprocesstest.cpp new/kpty-5.36.0/autotests/kptyprocesstest.cpp --- old/kpty-5.35.0/autotests/kptyprocesstest.cpp 2017-06-03 12:19:11.000000000 +0200 +++ new/kpty-5.36.0/autotests/kptyprocesstest.cpp 2017-07-02 10:09:37.000000000 +0200 @@ -26,6 +26,7 @@ #include <QSignalSpy> #include <QThread> #include <QDebug> +#include <QStandardPaths> void KPtyProcessTest::test_suspend_pty() { @@ -119,8 +120,13 @@ void KPtyProcessTest::test_pty_basic() { + const QString bash = QStandardPaths::findExecutable("bash"); + if (bash.isEmpty()) { + QSKIP("bash is not installed"); + } + KPtyProcess p; - p.setProgram("/bin/bash", QStringList() << "-c" << "read -s VAL; echo \"1: $VAL\"; echo \"2: $VAL\" >&2"); + p.setProgram(bash, QStringList() << "-c" << "read -s VAL; echo \"1: $VAL\"; echo \"2: $VAL\" >&2"); p.setPtyChannels(KPtyProcess::AllChannels); p.pty()->setEcho(false); p.start(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.35.0/src/CMakeLists.txt new/kpty-5.36.0/src/CMakeLists.txt --- old/kpty-5.35.0/src/CMakeLists.txt 2017-06-03 12:19:11.000000000 +0200 +++ new/kpty-5.36.0/src/CMakeLists.txt 2017-07-02 10:09:37.000000000 +0200 @@ -45,6 +45,29 @@ DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPty COMPONENT Devel ) +if(BUILD_QCH) + ecm_add_qch( + KF5Pty_QCH + NAME KPty + BASE_NAME KF5Pty + VERSION ${KF5_VERSION} + ORG_DOMAIN org.kde + SOURCES # using only public headers, to cover only public API + ${KPty_HEADERS} + MD_MAINPAGE "${CMAKE_SOURCE_DIR}/README.md" + LINK_QCHS + Qt5Core_QCH + KF5CoreAddons_QCH + BLANK_MACROS + KPTY_EXPORT + KPTY_DEPRECATED + KPTY_DEPRECATED_EXPORT + TAGFILE_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + QCH_INSTALL_DESTINATION ${KDE_INSTALL_QTQCHDIR} + COMPONENT Devel + ) +endif() + ########### next target ############### if (NOT HAVE_OPENPTY)
