commit: 0e89d2c69070d53f08b49394c8e108a49392809b Author: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> AuthorDate: Tue Mar 10 18:19:47 2026 +0000 Commit: Michael Mair-Keimberger <mm1ke <AT> gentoo <DOT> org> CommitDate: Tue Mar 10 18:19:47 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e89d2c6
kde-misc/kdeconnect: remove unused patch(es) Signed-off-by: Michael Mair-Keimberger <mm1ke <AT> gentoo.org> ...kdeconnect-25.08.2-check-dev-ID-no-change.patch | 47 -------- .../files/kdeconnect-25.08.3-qt6.10.patch | 123 --------------------- 2 files changed, 170 deletions(-) diff --git a/kde-misc/kdeconnect/files/kdeconnect-25.08.2-check-dev-ID-no-change.patch b/kde-misc/kdeconnect/files/kdeconnect-25.08.2-check-dev-ID-no-change.patch deleted file mode 100644 index 81dbe4632cc9..000000000000 --- a/kde-misc/kdeconnect/files/kdeconnect-25.08.2-check-dev-ID-no-change.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 1d757349d0f517ef12c119565ffb1f79503fbcdf Mon Sep 17 00:00:00 2001 -From: Albert Vaca Cintora <[email protected]> -Date: Sun, 16 Nov 2025 17:56:53 +0100 -Subject: [PATCH] Check that the device ID doesn't change during the handshake - -(cherry picked from commit b42d0392d047a7326232d4e534db4bc26626fb81) ---- - core/backends/lan/lanlinkprovider.cpp | 9 ++++++++- - 1 file changed, 8 insertions(+), 1 deletion(-) - -diff --git a/core/backends/lan/lanlinkprovider.cpp b/core/backends/lan/lanlinkprovider.cpp -index f1a029d77..b4634523f 100644 ---- a/core/backends/lan/lanlinkprovider.cpp -+++ b/core/backends/lan/lanlinkprovider.cpp -@@ -418,6 +418,7 @@ void LanLinkProvider::encrypted() - - NetworkPacket *identityPacket = m_receivedIdentityPackets[socket].np; - -+ QString deviceId = identityPacket->get<QString>(QStringLiteral("deviceId")); - int protocolVersion = identityPacket->get<int>(QStringLiteral("protocolVersion"), -1); - if (protocolVersion >= 8) { - disconnect(socket, &QObject::destroyed, nullptr, nullptr); -@@ -426,7 +427,7 @@ void LanLinkProvider::encrypted() - NetworkPacket myIdentity = KdeConnectConfig::instance().deviceInfo().toIdentityPacket(); - socket->write(myIdentity.serialize()); - socket->flush(); -- connect(socket, &QIODevice::readyRead, this, [this, socket, protocolVersion]() { -+ connect(socket, &QIODevice::readyRead, this, [this, socket, protocolVersion, deviceId]() { - if (!socket->canReadLine()) { - // This can happen if the packet is large enough to be split in two chunks - return; -@@ -443,6 +444,12 @@ void LanLinkProvider::encrypted() - int newProtocolVersion = secureIdentityPacket->get<int>(QStringLiteral("protocolVersion"), 0); - if (newProtocolVersion != protocolVersion) { - qCWarning(KDECONNECT_CORE) << "Protocol version changed half-way through the handshake:" << protocolVersion << "->" << newProtocolVersion; -+ return; -+ } -+ QString newDeviceId = secureIdentityPacket->get<QString>(QStringLiteral("deviceId")); -+ if (newDeviceId != deviceId) { -+ qCWarning(KDECONNECT_CORE) << "Device ID changed half-way through the handshake:" << deviceId << "->" << newDeviceId; -+ return; - } - DeviceInfo deviceInfo = DeviceInfo::FromIdentityPacketAndCert(*secureIdentityPacket, socket->peerCertificate()); - --- -GitLab - diff --git a/kde-misc/kdeconnect/files/kdeconnect-25.08.3-qt6.10.patch b/kde-misc/kdeconnect/files/kdeconnect-25.08.3-qt6.10.patch deleted file mode 100644 index 06b0e5b006aa..000000000000 --- a/kde-misc/kdeconnect/files/kdeconnect-25.08.3-qt6.10.patch +++ /dev/null @@ -1,123 +0,0 @@ -From 55e3302d56e1eb22ff174d8f6afd7a7b1c9db819 Mon Sep 17 00:00:00 2001 -From: Albert Vaca Cintora <[email protected]> -Date: Sun, 19 Oct 2025 11:17:04 +0200 -Subject: [PATCH] Fix build in latest Qt - ---- - interfaces/conversationmessage.h | 93 ++++++++++++++++---------------- - 1 file changed, 45 insertions(+), 48 deletions(-) - -diff --git a/interfaces/conversationmessage.h b/interfaces/conversationmessage.h -index b60daea13..3b6c2a15a 100644 ---- a/interfaces/conversationmessage.h -+++ b/interfaces/conversationmessage.h -@@ -11,8 +11,51 @@ - - #include "kdeconnectinterfaces_export.h" - --class ConversationAddress; --class Attachment; -+class KDECONNECTINTERFACES_EXPORT ConversationAddress -+{ -+public: -+ ConversationAddress(QString address = QString()); -+ -+ QString address() const -+ { -+ return m_address; -+ } -+ -+private: -+ QString m_address; -+}; -+ -+class KDECONNECTINTERFACES_EXPORT Attachment -+{ -+public: -+ Attachment() -+ { -+ } -+ Attachment(qint64 prtID, QString mimeType, QString base64EncodedFile, QString uniqueIdentifier); -+ -+ qint64 partID() const -+ { -+ return m_partID; -+ } -+ QString mimeType() const -+ { -+ return m_mimeType; -+ } -+ QString base64EncodedFile() const -+ { -+ return m_base64EncodedFile; -+ } -+ QString uniqueIdentifier() const -+ { -+ return m_uniqueIdentifier; -+ } -+ -+private: -+ qint64 m_partID; // Part ID of the attachment of the message -+ QString m_mimeType; // Type of attachment (image, video, audio etc.) -+ QString m_base64EncodedFile; // Base64 encoded string of a file -+ QString m_uniqueIdentifier; // unique name of the attachment -+}; - - class KDECONNECTINTERFACES_EXPORT ConversationMessage - { -@@ -179,52 +222,6 @@ protected: - QList<Attachment> m_attachments; - }; - --class KDECONNECTINTERFACES_EXPORT ConversationAddress --{ --public: -- ConversationAddress(QString address = QString()); -- -- QString address() const -- { -- return m_address; -- } -- --private: -- QString m_address; --}; -- --class KDECONNECTINTERFACES_EXPORT Attachment --{ --public: -- Attachment() -- { -- } -- Attachment(qint64 prtID, QString mimeType, QString base64EncodedFile, QString uniqueIdentifier); -- -- qint64 partID() const -- { -- return m_partID; -- } -- QString mimeType() const -- { -- return m_mimeType; -- } -- QString base64EncodedFile() const -- { -- return m_base64EncodedFile; -- } -- QString uniqueIdentifier() const -- { -- return m_uniqueIdentifier; -- } -- --private: -- qint64 m_partID; // Part ID of the attachment of the message -- QString m_mimeType; // Type of attachment (image, video, audio etc.) -- QString m_base64EncodedFile; // Base64 encoded string of a file -- QString m_uniqueIdentifier; // unique name of the attachment --}; -- - inline QDBusArgument &operator<<(QDBusArgument &argument, const ConversationMessage &message) - { - argument.beginStructure(); --- -GitLab -
