From 1c516e0168fee511b220c07b895bc479e73312c0 Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Thu, 18 Jun 2026 11:21:52 +0100 Subject: [PATCH] fix(ipc): remove git sha from version strings as kVersion already includes build metadata --- src/lib/deskflow/ipc/IpcServer.cpp | 3 ++- src/lib/gui/dialogs/AboutDialog.cpp | 5 +++-- src/lib/gui/ipc/IpcClient.cpp | 6 ++++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/lib/deskflow/ipc/IpcServer.cpp b/src/lib/deskflow/ipc/IpcServer.cpp index beb5bbd02..7a9fc3fc5 100644 --- a/src/lib/deskflow/ipc/IpcServer.cpp +++ b/src/lib/deskflow/ipc/IpcServer.cpp @@ -120,7 +120,8 @@ void IpcServer::processMessage(QLocalSocket *clientSocket, const QString &messag return; } - const auto versionId = QStringLiteral("%1+%2").arg(kVersion, kVersionGitSha); + // Divergence from upstream: kVersion already carries the build metadata; don't re-append the git sha. + const auto versionId = QString::fromUtf8(kVersion); const auto clientVersion = parts.at(1); LOG_DEBUG("%s ipc server got hello message (version: %s)", m_typeName.constData(), versionId.toUtf8().constData()); diff --git a/src/lib/gui/dialogs/AboutDialog.cpp b/src/lib/gui/dialogs/AboutDialog.cpp index 74a884ee6..2906a4ee3 100644 --- a/src/lib/gui/dialogs/AboutDialog.cpp +++ b/src/lib/gui/dialogs/AboutDialog.cpp @@ -64,8 +64,9 @@ AboutDialog::AboutDialog(QWidget *parent) : QDialog(parent), ui{std::make_unique void AboutDialog::copyVersionText() const { - QString infoString = QStringLiteral("%1: %2 (%3)\nQt: %4\nSystem: %5") - .arg(kAppName, kVersion, kVersionGitSha, qVersion(), QSysInfo::prettyProductName()); + // Divergence from upstream: kDisplayVersion already carries version + commit; don't append the git sha. + QString infoString = QStringLiteral("%1: %2\nQt: %3\nSystem: %4") + .arg(kAppName, kDisplayVersion, qVersion(), QSysInfo::prettyProductName()); if (Settings::isPortableMode()) { infoString.append(QStringLiteral("\nPortable Mode")); } diff --git a/src/lib/gui/ipc/IpcClient.cpp b/src/lib/gui/ipc/IpcClient.cpp index 93dcdea65..b81ebdf1c 100644 --- a/src/lib/gui/ipc/IpcClient.cpp +++ b/src/lib/gui/ipc/IpcClient.cpp @@ -70,7 +70,8 @@ void IpcClient::attemptConnection() connect( m_socket, &QLocalSocket::connected, this, [this] { - const auto versionId = QStringLiteral("%1+%2").arg(kVersion, kVersionGitSha); + // Divergence from upstream: kVersion already carries the build metadata; don't re-append the git sha. + const auto versionId = QString::fromUtf8(kVersion); m_socket->write(QStringLiteral("hello=%1\n").arg(versionId).toUtf8()); qDebug().noquote() << QStringLiteral("%1 ipc client sent hello with version: %2").arg(m_typeName, versionId); }, @@ -176,7 +177,8 @@ void IpcClient::handleHandshakeMessage(const QStringList &parts) return; } - const auto versionId = QStringLiteral("%1+%2").arg(kVersion, kVersionGitSha); + // Divergence from upstream: kVersion already carries the build metadata; don't re-append the git sha. + const auto versionId = QString::fromUtf8(kVersion); if (parts.at(0) == QStringLiteral("versionMismatch")) { const auto serverVersion = parts.size() >= 2 ? parts.at(1) : QStringLiteral("unknown");