Hello community, here is the log from the commit of package kpty for openSUSE:Factory checked in at 2020-08-12 12:25:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kpty (Old) and /work/SRC/openSUSE:Factory/.kpty.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kpty" Wed Aug 12 12:25:04 2020 rev:82 rq:825101 version:5.73.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kpty/kpty.changes 2020-07-14 07:55:18.369015749 +0200 +++ /work/SRC/openSUSE:Factory/.kpty.new.3399/kpty.changes 2020-08-12 12:29:09.148176470 +0200 @@ -1,0 +2,11 @@ +Sun Aug 2 07:13:43 UTC 2020 - Christophe Giboudeaux <[email protected]> + +- Update to 5.73.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/kde-frameworks-5.73.0 +- Changes since 5.72.0: + * Use Qt's categorized logging, install kpty.categories file + * Use camelcase include. (scripted) + +------------------------------------------------------------------- Old: ---- kpty-5.72.0.tar.xz kpty-5.72.0.tar.xz.sig New: ---- kpty-5.73.0.tar.xz kpty-5.73.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kpty.spec ++++++ --- /var/tmp/diff_new_pack.Q3lp0s/_old 2020-08-12 12:29:09.660176454 +0200 +++ /var/tmp/diff_new_pack.Q3lp0s/_new 2020-08-12 12:29:09.664176454 +0200 @@ -17,14 +17,14 @@ %define lname libKF5Pty5 -%define _tar_path 5.72 +%define _tar_path 5.73 # 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 Name: kpty -Version: 5.72.0 +Version: 5.73.0 Release: 0 Summary: Primitives to interface with pseudo terminal devices License: LGPL-2.1-or-later @@ -102,6 +102,7 @@ %files -n %{lname} %license LICENSES/* %{_kf5_libdir}/libKF5Pty.so.* +%{_kf5_debugdir}/kpty.categories %files devel %license LICENSES/* ++++++ kpty-5.72.0.tar.xz -> kpty-5.73.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.72.0/CMakeLists.txt new/kpty-5.73.0/CMakeLists.txt --- old/kpty-5.72.0/CMakeLists.txt 2020-07-04 15:20:05.000000000 +0200 +++ new/kpty-5.73.0/CMakeLists.txt 2020-08-01 21:53:39.000000000 +0200 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.5) -set(KF5_VERSION "5.72.0") # handled by release scripts -set(KF5_DEP_VERSION "5.72.0") # handled by release scripts +set(KF5_VERSION "5.73.0") # handled by release scripts +set(KF5_DEP_VERSION "5.73.0") # handled by release scripts project(KPty VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.72.0 NO_MODULE) +find_package(ECM 5.73.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) @@ -40,6 +40,7 @@ include(ECMMarkNonGuiExecutable) include(ECMSetupVersion) include(ECMGenerateHeaders) +include(ECMQtDeclareLoggingCategory) include(CMakePackageConfigHelpers) include(ECMAddQch) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.72.0/po/zh_CN/kpty5.po new/kpty-5.73.0/po/zh_CN/kpty5.po --- old/kpty-5.72.0/po/zh_CN/kpty5.po 2020-07-04 15:20:05.000000000 +0200 +++ new/kpty-5.73.0/po/zh_CN/kpty5.po 2020-08-01 21:53:39.000000000 +0200 @@ -15,7 +15,7 @@ "Project-Id-Version: kdeorg\n" "Report-Msgid-Bugs-To: https://bugs.kde.org\n"; "POT-Creation-Date: 2020-06-30 02:01+0200\n" -"PO-Revision-Date: 2020-06-24 08:00\n" +"PO-Revision-Date: 2020-07-31 15:01\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.72.0/src/CMakeLists.txt new/kpty-5.73.0/src/CMakeLists.txt --- old/kpty-5.72.0/src/CMakeLists.txt 2020-07-04 15:20:05.000000000 +0200 +++ new/kpty-5.73.0/src/CMakeLists.txt 2020-08-01 21:53:39.000000000 +0200 @@ -4,6 +4,14 @@ kptyprocess.cpp ) +ecm_qt_declare_logging_category(kpty_LIB_SRCS + HEADER kpty_debug.h + IDENTIFIER KPTY_LOG + CATEGORY_NAME kf.pty + DESCRIPTION "KPty" + EXPORT KPTY +) + add_library(KF5Pty ${kpty_LIB_SRCS}) generate_export_header(KF5Pty BASE_NAME KPty) add_library(KF5::Pty ALIAS KF5Pty) @@ -81,3 +89,9 @@ 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) install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR}) + +ecm_qt_install_logging_categories( + EXPORT KPTY + FILE kpty.categories + DESTINATION "${KDE_INSTALL_LOGGINGCATEGORIESDIR}" +) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.72.0/src/kpty.cpp new/kpty-5.73.0/src/kpty.cpp --- old/kpty-5.72.0/src/kpty.cpp 2020-07-04 15:20:05.000000000 +0200 +++ new/kpty-5.73.0/src/kpty.cpp 2020-08-01 21:53:39.000000000 +0200 @@ -10,6 +10,7 @@ #include "kpty_p.h" +#include <kpty_debug.h> #include <QProcess> #ifdef __sgi @@ -128,7 +129,6 @@ # define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode) #endif -#include <QDebug> #include <qplatformdefs.h> #include <Q_PID> @@ -217,7 +217,7 @@ if (::openpty(&d->masterFd, &d->slaveFd, ptsn, nullptr, nullptr)) { d->masterFd = -1; d->slaveFd = -1; - qWarning() << "Can't open a pseudo teletype"; + qCWarning(KPTY_LOG) << "Can't open a pseudo teletype"; return false; } d->ttyName = ptsn; @@ -307,7 +307,7 @@ } } - qWarning() << "Can't open a pseudo teletype"; + qCWarning(KPTY_LOG) << "Can't open a pseudo teletype"; return false; gotpty: @@ -320,7 +320,7 @@ if (((info.ownerId() != getuid()) || (info.permissions() & (QFile::ReadGroup | QFile::ExeGroup | QFile::ReadOther | QFile::WriteOther | QFile::ExeOther))) && !d->chownpty(true)) { - qWarning() + qCWarning(KPTY_LOG) << "chownpty failed for device " << ptyName << "::" << d->ttyName << "\nThis means the communication can be eavesdropped." << endl; } @@ -340,7 +340,7 @@ d->slaveFd = QT_OPEN(d->ttyName.data(), QT_OPEN_RDWR | O_NOCTTY); if (d->slaveFd < 0) { - qWarning() << "Can't open slave pseudo teletype"; + qCWarning(KPTY_LOG) << "Can't open slave pseudo teletype"; ::close(d->masterFd); d->masterFd = -1; return false; @@ -374,13 +374,13 @@ bool KPty::open(int fd) { #if !HAVE_PTSNAME && !defined(TIOCGPTN) - qWarning() << "Unsupported attempt to open pty with fd" << fd; + qCWarning(KPTY_LOG) << "Unsupported attempt to open pty with fd" << fd; return false; #else Q_D(KPty); if (d->masterFd >= 0) { - qWarning() << "Attempting to open an already open pty"; + qCWarning(KPTY_LOG) << "Attempting to open an already open pty"; return false; } @@ -398,7 +398,7 @@ d->ttyName = buf; # endif } else { - qWarning() << "Failed to determine pty slave device for fd" << fd; + qCWarning(KPTY_LOG) << "Failed to determine pty slave device for fd" << fd; return false; } @@ -431,12 +431,12 @@ return true; } if (d->masterFd < 0) { - qWarning() << "Attempting to open pty slave while master is closed"; + qCWarning(KPTY_LOG) << "Attempting to open pty slave while master is closed"; return false; } d->slaveFd = QT_OPEN(d->ttyName.data(), QT_OPEN_RDWR | O_NOCTTY); if (d->slaveFd < 0) { - qWarning() << "Can't open slave pseudo teletype"; + qCWarning(KPTY_LOG) << "Can't open slave pseudo teletype"; return false; } fcntl(d->slaveFd, F_SETFD, FD_CLOEXEC); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.72.0/src/kptydevice.cpp new/kpty-5.73.0/src/kptydevice.cpp --- old/kpty-5.72.0/src/kptydevice.cpp 2020-07-04 15:20:05.000000000 +0200 +++ new/kpty-5.73.0/src/kptydevice.cpp 2020-08-01 21:53:39.000000000 +0200 @@ -14,7 +14,7 @@ #include <QSocketNotifier> -#include <klocalizedstring.h> +#include <KLocalizedString> #include <unistd.h> #include <errno.h> @@ -46,8 +46,8 @@ // Helper. Remove when QRingBuffer becomes public. // ///////////////////////////////////////////////////// -#include <qbytearray.h> -#include <qlinkedlist.h> +#include <QByteArray> +#include <QLinkedList> #define CHUNKSIZE 4096 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kpty-5.72.0/src/kptyprocess.h new/kpty-5.73.0/src/kptyprocess.h --- old/kpty-5.72.0/src/kptyprocess.h 2020-07-04 15:20:05.000000000 +0200 +++ new/kpty-5.73.0/src/kptyprocess.h 2020-08-01 21:53:39.000000000 +0200 @@ -8,7 +8,7 @@ #ifndef KPTYPROCESS_H #define KPTYPROCESS_H -#include <kprocess.h> +#include <KProcess> #include "kpty_export.h"
