Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package kwayland for openSUSE:Factory checked in at 2022-03-14 19:34:48 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kwayland (Old) and /work/SRC/openSUSE:Factory/.kwayland.new.25692 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kwayland" Mon Mar 14 19:34:48 2022 rev:97 rq:961278 version:5.92.0 Changes: -------- --- /work/SRC/openSUSE:Factory/kwayland/kwayland.changes 2022-03-11 11:45:50.742915760 +0100 +++ /work/SRC/openSUSE:Factory/.kwayland.new.25692/kwayland.changes 2022-03-14 19:36:22.254076351 +0100 @@ -1,0 +2,10 @@ +Mon Mar 7 23:01:13 UTC 2022 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 5.92.0 + * New feature release + * For more details please see: + * https://kde.org/announcements/frameworks/5/5.92.0 +- Changes since 5.91.0: + * Check executables exist in PATH before passing them to QProcess + +------------------------------------------------------------------- Old: ---- kwayland-5.91.0.tar.xz kwayland-5.91.0.tar.xz.sig New: ---- kwayland-5.92.0.tar.xz kwayland-5.92.0.tar.xz.sig ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kwayland.spec ++++++ --- /var/tmp/diff_new_pack.clysb8/_old 2022-03-14 19:36:22.754076951 +0100 +++ /var/tmp/diff_new_pack.clysb8/_new 2022-03-14 19:36:22.758076956 +0100 @@ -16,7 +16,7 @@ # -%define _tar_path 5.91 +%define _tar_path 5.92 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) @@ -24,7 +24,7 @@ # Only needed for the package signature condition %bcond_without released Name: kwayland -Version: 5.91.0 +Version: 5.92.0 Release: 0 Summary: KDE Wayland library License: LGPL-2.1-or-later ++++++ kwayland-5.91.0.tar.xz -> kwayland-5.92.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.91.0/CMakeLists.txt new/kwayland-5.92.0/CMakeLists.txt --- old/kwayland-5.91.0/CMakeLists.txt 2022-02-05 16:18:12.000000000 +0100 +++ new/kwayland-5.92.0/CMakeLists.txt 2022-03-05 12:19:09.000000000 +0100 @@ -1,11 +1,11 @@ cmake_minimum_required(VERSION 3.16) -set(KF_VERSION "5.91.0") # handled by release scripts +set(KF_VERSION "5.92.0") # handled by release scripts project(KWayland VERSION ${KF_VERSION}) # ECM setup include(FeatureSummary) -find_package(ECM 5.91.0 NO_MODULE) +find_package(ECM 5.92.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) set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/Modules) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.91.0/autotests/client/test_wayland_fullscreen_shell.cpp new/kwayland-5.92.0/autotests/client/test_wayland_fullscreen_shell.cpp --- old/kwayland-5.91.0/autotests/client/test_wayland_fullscreen_shell.cpp 2022-02-05 16:18:12.000000000 +0100 +++ new/kwayland-5.92.0/autotests/client/test_wayland_fullscreen_shell.cpp 2022-03-05 12:19:09.000000000 +0100 @@ -43,7 +43,9 @@ QVERIFY(!m_westonProcess); // starts weston m_westonProcess = new QProcess(this); - m_westonProcess->setProgram(QStringLiteral("weston")); + const QString exec = QStandardPaths::findExecutable(QStringLiteral("weston")); + QVERIFY(!exec.isEmpty()); + m_westonProcess->setProgram(exec); m_westonProcess->setArguments(QStringList( {QStringLiteral("--socket=%1").arg(s_socketName), QStringLiteral("--backend=headless-backend.so"), QStringLiteral("--shell=fullscreen-shell.so")})); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.91.0/src/tools/generator.cpp new/kwayland-5.92.0/src/tools/generator.cpp --- old/kwayland-5.91.0/src/tools/generator.cpp 2022-02-05 16:18:12.000000000 +0100 +++ new/kwayland-5.92.0/src/tools/generator.cpp 2022-03-05 12:19:09.000000000 +0100 @@ -479,32 +479,49 @@ } } +static QString findGitExec() +{ + const QString exec = QStandardPaths::findExecutable(QStringLiteral("git")); + if (exec.isEmpty()) { + qWarning() << "Could not find git executable in PATH."; + } + return exec; +} + void Generator::startAuthorNameProcess() { - QProcess *git = new QProcess(this); - git->setArguments(QStringList{QStringLiteral("config"), QStringLiteral("--get"), QStringLiteral("user.name")}); - git->setProgram(QStringLiteral("git")); - connect(git, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, [this, git] { + const QString exec = findGitExec(); + if (exec.isEmpty()) { + return; + } + QProcess *proc = new QProcess(this); + proc->setArguments(QStringList{QStringLiteral("config"), QStringLiteral("--get"), QStringLiteral("user.name")}); + proc->setProgram(exec); + connect(proc, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, [this, proc] { QMutexLocker locker(&m_mutex); - m_authorName = QString::fromLocal8Bit(git->readAllStandardOutput()).trimmed(); - git->deleteLater(); + m_authorName = QString::fromLocal8Bit(proc->readAllStandardOutput()).trimmed(); + proc->deleteLater(); m_waitCondition.wakeAll(); }); - git->start(); + proc->start(); } void Generator::startAuthorEmailProcess() { - QProcess *git = new QProcess(this); - git->setArguments(QStringList{QStringLiteral("config"), QStringLiteral("--get"), QStringLiteral("user.email")}); - git->setProgram(QStringLiteral("git")); - connect(git, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, [this, git] { + const QString exec = findGitExec(); + if (exec.isEmpty()) { + return; + } + QProcess *proc = new QProcess(this); + proc->setArguments(QStringList{QStringLiteral("config"), QStringLiteral("--get"), QStringLiteral("user.email")}); + proc->setProgram(exec); + connect(proc, static_cast<void (QProcess::*)(int, QProcess::ExitStatus)>(&QProcess::finished), this, [this, proc] { QMutexLocker locker(&m_mutex); - m_authorEmail = QString::fromLocal8Bit(git->readAllStandardOutput()).trimmed(); - git->deleteLater(); + m_authorEmail = QString::fromLocal8Bit(proc->readAllStandardOutput()).trimmed(); + proc->deleteLater(); m_waitCondition.wakeAll(); }); - git->start(); + proc->start(); } void Generator::generateCopyrightHeader() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kwayland-5.91.0/src/tools/testserver/testserver.cpp new/kwayland-5.92.0/src/tools/testserver/testserver.cpp --- old/kwayland-5.91.0/src/tools/testserver/testserver.cpp 2022-02-05 16:18:12.000000000 +0100 +++ new/kwayland-5.92.0/src/tools/testserver/testserver.cpp 2022-03-05 12:19:09.000000000 +0100 @@ -17,7 +17,9 @@ #include <QCoreApplication> #include <QElapsedTimer> #include <QProcess> +#include <QStandardPaths> #include <QTimer> + // system #include <sys/socket.h> #include <sys/types.h> @@ -137,6 +139,14 @@ QCoreApplication::instance()->exit(1); return; } + + const QString exec = QStandardPaths::findExecutable(app); + if (exec.isEmpty()) { + qWarning() << "Couldn't find executable:" << app; + QCoreApplication::instance()->exit(1); + return; + } + QProcess *p = new QProcess(this); p->setProcessChannelMode(QProcess::ForwardedChannels); QProcessEnvironment environment = QProcessEnvironment::systemEnvironment(); @@ -148,7 +158,7 @@ connect(p, &QProcess::errorOccurred, this, [] { QCoreApplication::instance()->exit(1); }); - p->start(app, arguments); + p->start(exec, arguments); } void TestServer::repaint()
