Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kpty for openSUSE:Factory checked in at 2022-01-11 21:16:40 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpty (Old) and /work/SRC/openSUSE:Factory/.kpty.new.1892 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpty" Tue Jan 11 21:16:40 2022 rev:99 rq:945079 version:5.90.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpty/kpty.changes 2021-12-13 20:44:39.072486952 +0100 +++ /work/SRC/openSUSE:Factory/.kpty.new.1892/kpty.changes 2022-01-11 21:19:24.060964373 +0100 @@ -1,0 +2,11 @@ +Mon Jan 3 12:47:51 UTC 2022 - Christophe Giboudeaux <[email protected]> + +- 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: + * Adapt to QProcess::setupChildProcess() removal in Qt6 + * Change the build system to enable building with Qt6 + +------------------------------------------------------------------- Old: ---- kpty-5.89.0.tar.xz kpty-5.89.0.tar.xz.sig New: ---- kpty-5.90.0.tar.xz kpty-5.90.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpty.spec ++++++ --- /var/tmp/diff_new_pack.C537YV/_old 2022-01-11 21:19:24.984965023 +0100 +++ /var/tmp/diff_new_pack.C537YV/_new 2022-01-11 21:19:24.992965029 +0100 @@ -17,21 +17,21 @@ %define lname libKF5Pty5 -%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}')} -%bcond_without lang +%bcond_without released Name: kpty -Version: 5.89.0 +Version: 5.90.0 Release: 0 Summary: Primitives to interface with pseudo terminal devices 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 @@ -52,9 +52,6 @@ %package -n %{lname} Summary: Interfacing with pseudo terminal devices Group: System/GUI/KDE -%if %{with lang} -Recommends: %{lname}-lang = %{version} -%endif %description -n %{lname} This library provides primitives to interface with pseudo terminal devices @@ -87,14 +84,14 @@ %kf5_makeinstall -C build %fdupes %{buildroot} -%if %{with lang} +%if %{with released} %find_lang %{name}5 %endif %post -n %{lname} -p /sbin/ldconfig %postun -n %{lname} -p /sbin/ldconfig -%if %{with lang} +%if %{with released} %files -n %{lname}-lang -f %{name}5.lang %endif ++++++ kpty-5.89.0.tar.xz -> kpty-5.90.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/CMakeLists.txt new/kpty-5.90.0/CMakeLists.txt --- old/kpty-5.89.0/CMakeLists.txt 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/CMakeLists.txt 2022-01-01 13:35:12.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.89.0") # handled by release scripts -set(KF_DEP_VERSION "5.89.0") # handled by release scripts +set(KF_VERSION "5.90.0") # handled by release scripts +set(KF_DEP_VERSION "5.90.0") # handled by release scripts project(KPty 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) @@ -17,7 +17,7 @@ include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE) include(KDECMakeSettings) include(KDEGitCommitHooks) -find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Core) +find_package(Qt${QT_MAJOR_VERSION} "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Core) find_package(KF5CoreAddons ${KF_DEP_VERSION} REQUIRED) find_package(KF5I18n ${KF_DEP_VERSION} REQUIRED) @@ -58,7 +58,7 @@ add_definitions(-DTRANSLATION_DOMAIN=\"kpty5\") ki18n_install(po) add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050f02) -add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055100) +add_definitions(-DKF_DISABLE_DEPRECATED_BEFORE_AND_AT=0x055900) add_subdirectory( src ) if (BUILD_TESTING) add_subdirectory( autotests ) @@ -91,7 +91,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpty_version.h - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5} COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF} COMPONENT Devel ) feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/autotests/CMakeLists.txt new/kpty-5.90.0/autotests/CMakeLists.txt --- old/kpty-5.89.0/autotests/CMakeLists.txt 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/autotests/CMakeLists.txt 2022-01-01 13:35:12.000000000 +0100 @@ -1,12 +1,12 @@ include(ECMMarkAsTest) include(ECMMarkNonGuiExecutable) -find_package(Qt5 "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Test) +find_package(Qt${QT_MAJOR_VERSION} "${REQUIRED_QT_VERSION}" CONFIG REQUIRED Test) remove_definitions(-DQT_NO_CAST_FROM_ASCII) add_executable(kptyprocesstest kptyprocesstest.cpp) -target_link_libraries(kptyprocesstest KF5::Pty Qt5::Test) +target_link_libraries(kptyprocesstest KF5::Pty Qt${QT_MAJOR_VERSION}::Test) ecm_mark_as_test(kptyprocesstest) ecm_mark_nongui_executable(kptyprocesstest) add_test(NAME kptyprocesstest COMMAND kptyprocesstest) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/po/ca@valencia/kpty5.po new/kpty-5.90.0/po/ca@valencia/kpty5.po --- old/kpty-5.89.0/po/ca@valencia/kpty5.po 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/po/ca@valencia/kpty5.po 2022-01-01 13:35:12.000000000 +0100 @@ -6,17 +6,17 @@ # Sebasti?? Pla i Sanz <[email protected]>, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007. # Antoni Bella P??rez <[email protected]>, 2003, 2006, 2011, 2012, 2013, 2014. # Albert Astals Cid <[email protected]>, 2004, 2005, 2007. -# Josep Ma. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. +# Josep M. Ferrer <[email protected]>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014. # Robert Millan <[email protected]>, 2009. # Orestes Mas <[email protected]>, 2010. -# Empar <[email protected]>, 2019. +# Empar Montoro Mart??n <[email protected]>, 2019. msgid "" msgstr "" "Project-Id-Version: kpty\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-14 00:14+0000\n" "PO-Revision-Date: 2019-06-18 13:33+0200\n" -"Last-Translator: Empar <[email protected]>\n" +"Last-Translator: Empar Montoro Mart??n <[email protected]>\n" "Language-Team: Catalan <[email protected]>\n" "Language: ca@valencia\n" "MIME-Version: 1.0\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/po/zh_CN/kpty5.po new/kpty-5.90.0/po/zh_CN/kpty5.po --- old/kpty-5.89.0/po/zh_CN/kpty5.po 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/po/zh_CN/kpty5.po 2022-01-01 13:35:12.000000000 +0100 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2021-08-14 00:14+0000\n" -"PO-Revision-Date: 2021-11-30 15:21\n" +"PO-Revision-Date: 2021-12-22 14:06\n" "Last-Translator: \n" "Language-Team: Chinese Simplified\n" "Language: zh_CN\n" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/src/CMakeLists.txt new/kpty-5.90.0/src/CMakeLists.txt --- old/kpty-5.89.0/src/CMakeLists.txt 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/src/CMakeLists.txt 2022-01-01 13:35:12.000000000 +0100 @@ -24,9 +24,9 @@ include(ConfigureChecks.cmake) configure_file(config-pty.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-pty.h ) -target_include_directories(KF5Pty INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF5}/KPty>") +target_include_directories(KF5Pty INTERFACE "$<INSTALL_INTERFACE:${KDE_INSTALL_INCLUDEDIR_KF}/KPty>") -target_link_libraries(KF5Pty PUBLIC Qt5::Core +target_link_libraries(KF5Pty PUBLIC Qt${QT_MAJOR_VERSION}::Core KF5::CoreAddons # KProcess PRIVATE ${UTIL_LIBRARY} @@ -54,7 +54,7 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kpty_export.h ${KPty_HEADERS} - DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF5}/KPty COMPONENT Devel + DESTINATION ${KDE_INSTALL_INCLUDEDIR_KF}/KPty COMPONENT Devel ) if(BUILD_QCH) @@ -87,11 +87,11 @@ if (NOT HAVE_OPENPTY) add_executable(kgrantpty kgrantpty.c) ecm_mark_nongui_executable(kgrantpty) - install(TARGETS kgrantpty DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF5}) + install(TARGETS kgrantpty DESTINATION ${KDE_INSTALL_LIBEXECDIR_KF}) endif () include(ECMGeneratePriFile) -ecm_generate_pri_file(BASE_NAME KPty LIB_NAME KF5Pty DEPS "core KCoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KPty) +ecm_generate_pri_file(BASE_NAME KPty LIB_NAME KF5Pty DEPS "core KCoreAddons" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF}/KPty) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) ecm_qt_install_logging_categories( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/src/config-pty.h.cmake new/kpty-5.90.0/src/config-pty.h.cmake --- old/kpty-5.89.0/src/config-pty.h.cmake 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/src/config-pty.h.cmake 2022-01-01 13:35:12.000000000 +0100 @@ -44,4 +44,4 @@ #endif #define CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" -#define KDE_INSTALL_LIBEXECDIR_KF5 "${KDE_INSTALL_LIBEXECDIR_KF5}" +#define KDE_INSTALL_LIBEXECDIR_KF "${KDE_INSTALL_LIBEXECDIR_KF}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/src/kpty.cpp new/kpty-5.90.0/src/kpty.cpp --- old/kpty-5.89.0/src/kpty.cpp 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/src/kpty.cpp 2022-01-01 13:35:12.000000000 +0100 @@ -59,6 +59,17 @@ class UtemptProcess : public QProcess { public: +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + UtemptProcess() + { + setChildProcessModifier([this]() { + // These are the file descriptors the utempter helper wants + dup2(cmdFd, 0); + dup2(cmdFd, 1); + dup2(cmdFd, 3); + }); + } +#else void setupChildProcess() override { // These are the file descriptors the utempter helper wants @@ -66,6 +77,8 @@ dup2(cmdFd, 1); dup2(cmdFd, 3); } +#endif + int cmdFd; }; #else @@ -118,8 +131,6 @@ #include <qplatformdefs.h> -#include <Q_PID> - #define TTY_GROUP "tty" #ifndef PATH_MAX @@ -156,7 +167,7 @@ #if !HAVE_OPENPTY bool KPtyPrivate::chownpty(bool grant) { - return !QProcess::execute(QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBEXECDIR_KF5 "/kgrantpty"), + return !QProcess::execute(QFile::decodeName(CMAKE_INSTALL_PREFIX "/" KDE_INSTALL_LIBEXECDIR_KF "/kgrantpty"), QStringList() << (grant ? "--grant" : "--revoke") << QString::number(masterFd)); } #endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/src/kptyprocess.cpp new/kpty-5.90.0/src/kptyprocess.cpp --- old/kpty-5.89.0/src/kptyprocess.cpp 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/src/kptyprocess.cpp 2022-01-01 13:35:12.000000000 +0100 @@ -40,6 +40,24 @@ { Q_D(KPtyProcess); +#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) + setChildProcessModifier([d]() { + d->pty->setCTty(); + if (d->addUtmp) { + d->pty->login(KUser(KUser::UseRealUserID).loginName().toLocal8Bit().constData(), qgetenv("DISPLAY").constData()); + } + if (d->ptyChannels & StdinChannel) { + dup2(d->pty->slaveFd(), 0); + } + if (d->ptyChannels & StdoutChannel) { + dup2(d->pty->slaveFd(), 1); + } + if (d->ptyChannels & StderrChannel) { + dup2(d->pty->slaveFd(), 2); + } + }); +#endif + d->pty = std::make_unique<KPtyDevice>(this); if (ptyMasterFd == -1) { @@ -100,6 +118,7 @@ return d->pty.get(); } +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void KPtyProcess::setupChildProcess() { Q_D(KPtyProcess); @@ -120,5 +139,6 @@ KProcess::setupChildProcess(); } +#endif #include "moc_kptyprocess.cpp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.89.0/src/kptyprocess.h new/kpty-5.90.0/src/kptyprocess.h --- old/kpty-5.89.0/src/kptyprocess.h 2021-12-04 19:41:39.000000000 +0100 +++ new/kpty-5.90.0/src/kptyprocess.h 2022-01-01 13:35:12.000000000 +0100 @@ -122,7 +122,9 @@ /** * @reimp */ +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) void setupChildProcess() override; +#endif private: std::unique_ptr<KPtyProcessPrivate> const d_ptr;
