summaryrefslogtreecommitdiff
path: root/deskutils/kdeconnect-kde
diff options
context:
space:
mode:
Diffstat (limited to 'deskutils/kdeconnect-kde')
-rw-r--r--deskutils/kdeconnect-kde/Makefile4
-rw-r--r--deskutils/kdeconnect-kde/distinfo8
-rw-r--r--deskutils/kdeconnect-kde/files/patch-core_backends_lan_lanlinkprovider.cpp45
-rw-r--r--deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp6
-rw-r--r--deskutils/kdeconnect-kde/pkg-plist15
5 files changed, 23 insertions, 55 deletions
diff --git a/deskutils/kdeconnect-kde/Makefile b/deskutils/kdeconnect-kde/Makefile
index a8c39ad2d87e..d3083ca92e82 100644
--- a/deskutils/kdeconnect-kde/Makefile
+++ b/deskutils/kdeconnect-kde/Makefile
@@ -1,11 +1,7 @@
PORTNAME= kdeconnect-kde
DISTVERSION= ${KDE_APPLICATIONS_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde kde-applications
-PATCH_SITES= https://invent.kde.org/network/kdeconnect-kde/-/commit/
-PATCHFILES+= 55e3302d56e1eb22ff174d8f6afd7a7b1c9db819.patch:-p1 # Fix build with Qt 6.10
-
MAINTAINER= kde@FreeBSD.org
COMMENT= Support for KDE to interface between your phone and your computer
WWW= https://community.kde.org/KDEConnect
diff --git a/deskutils/kdeconnect-kde/distinfo b/deskutils/kdeconnect-kde/distinfo
index dda2c3d73919..fa65ccd1041b 100644
--- a/deskutils/kdeconnect-kde/distinfo
+++ b/deskutils/kdeconnect-kde/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1763712489
-SHA256 (KDE/release-service/25.08.3/kdeconnect-kde-25.08.3.tar.xz) = 6e41f1f22e85f5e70a92dd6ca3e6968364896de37afe5daeb7cda599f03e5e2b
-SIZE (KDE/release-service/25.08.3/kdeconnect-kde-25.08.3.tar.xz) = 635720
-SHA256 (KDE/release-service/25.08.3/55e3302d56e1eb22ff174d8f6afd7a7b1c9db819.patch) = ab8bf619f0c7f781c521809d50a9f1a232075ebadd7b16b6b487ced876ffc2e4
-SIZE (KDE/release-service/25.08.3/55e3302d56e1eb22ff174d8f6afd7a7b1c9db819.patch) = 2988
+TIMESTAMP = 1765478347
+SHA256 (KDE/release-service/25.12.0/kdeconnect-kde-25.12.0.tar.xz) = 0fff24d371ccfefc858d7d6e01385c4d57dc40bf46d6702a34d1bf6727cc72a8
+SIZE (KDE/release-service/25.12.0/kdeconnect-kde-25.12.0.tar.xz) = 638256
diff --git a/deskutils/kdeconnect-kde/files/patch-core_backends_lan_lanlinkprovider.cpp b/deskutils/kdeconnect-kde/files/patch-core_backends_lan_lanlinkprovider.cpp
index 9fb5f425bff6..61b97c9f081a 100644
--- a/deskutils/kdeconnect-kde/files/patch-core_backends_lan_lanlinkprovider.cpp
+++ b/deskutils/kdeconnect-kde/files/patch-core_backends_lan_lanlinkprovider.cpp
@@ -1,32 +1,19 @@
---- core/backends/lan/lanlinkprovider.cpp.orig 2025-11-01 18:19:03 UTC
+--- core/backends/lan/lanlinkprovider.cpp.orig 2025-12-03 23:06:29 UTC
+++ core/backends/lan/lanlinkprovider.cpp
-@@ -427,6 +427,7 @@ void LanLinkProvider::encrypted()
+@@ -303,6 +303,16 @@ void LanLinkProvider::udpBroadcastReceived()
+ m_lastConnectionTime[deviceId] = now;
- 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);
-@@ -435,7 +436,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;
-@@ -452,6 +453,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;
+ int tcpPort = receivedPacket->get<int>(QStringLiteral("tcpPort"));
++ // convert IPv6 addresses of type "v4-mapped" to IPv4
++ QHostAddress addr = sender;
++ if (addr.protocol() == QAbstractSocket::IPv6Protocol) {
++ bool success;
++ QHostAddress convertedAddr = QHostAddress(addr.toIPv4Address(&success));
++ if (success) {
++ // qCDebug(KDECONNECT_CORE) << "Converting IPv6" << addr << "to IPv4" << convertedAddr;
++ sender = convertedAddr;
+ }
-+ 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());
-
++ }
+ if (tcpPort < MIN_TCP_PORT || tcpPort > MAX_TCP_PORT) {
+ qCDebug(KDECONNECT_CORE) << "TCP port outside of kdeconnect's range";
+ delete receivedPacket;
diff --git a/deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp b/deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp
index 5554b24703e9..abdb880a32f4 100644
--- a/deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp
+++ b/deskutils/kdeconnect-kde/files/patch-plugins_sftp_mounter.cpp
@@ -1,6 +1,6 @@
---- plugins/sftp/mounter.cpp.orig 2023-12-18 22:14:59 UTC
+--- plugins/sftp/mounter.cpp.orig 2025-12-03 23:06:29 UTC
+++ plugins/sftp/mounter.cpp
-@@ -128,7 +128,7 @@ void Mounter::onPacketReceived(const NetworkPacket &np
+@@ -102,7 +102,7 @@ void Mounter::onPacketReceived(const NetworkPacket &np
<< QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid())
<< QStringLiteral("-o") << QStringLiteral("reconnect")
<< QStringLiteral("-o") << QStringLiteral("ServerAliveInterval=30")
@@ -9,7 +9,7 @@
// clang-format on
m_proc->setProgram(program, arguments);
-@@ -137,8 +137,8 @@ void Mounter::onPacketReceived(const NetworkPacket &np
+@@ -111,8 +111,8 @@ void Mounter::onPacketReceived(const NetworkPacket &np
m_proc->start();
// qCDebug(KDECONNECT_PLUGIN_SFTP) << "Passing password: " << np.get<QString>("password").toLatin1();
diff --git a/deskutils/kdeconnect-kde/pkg-plist b/deskutils/kdeconnect-kde/pkg-plist
index b145ff772a4a..6f31945e0b63 100644
--- a/deskutils/kdeconnect-kde/pkg-plist
+++ b/deskutils/kdeconnect-kde/pkg-plist
@@ -4,12 +4,12 @@ bin/kdeconnect-handler
bin/kdeconnect-indicator
bin/kdeconnect-sms
bin/kdeconnectd
+etc/ufw/applications.d/kdeconnect
etc/xdg/autostart/org.kde.kdeconnect.daemon.desktop
lib/libkdeconnectcore.so.%%KDE_APPLICATIONS_VERSION_SHORT%%
lib/libkdeconnectcore.so.%%KDE_APPLICATIONS_SHLIB_VER%%
lib/libkdeconnectinterfaces.a
%%QT_PLUGINDIR%%/kdeconnect/kdeconnect_battery.so
-%%QT_PLUGINDIR%%/kdeconnect/kdeconnect_bigscreen.so
%%QT_PLUGINDIR%%/kdeconnect/kdeconnect_clipboard.so
%%QT_PLUGINDIR%%/kdeconnect/kdeconnect_connectivity_report.so
%%QT_PLUGINDIR%%/kdeconnect/kdeconnect_contacts.so
@@ -304,19 +304,6 @@ share/locale/eu/LC_MESSAGES/kdeconnect-plugins.mo
share/locale/eu/LC_MESSAGES/kdeconnect-sms.mo
share/locale/eu/LC_MESSAGES/kdeconnect-urlhandler.mo
share/locale/eu/LC_MESSAGES/plasma_applet_org.kde.kdeconnect.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-app.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-cli.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-core.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-fileitemaction.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-indicator.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-interfaces.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-kded.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-kio.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-nautilus-extension.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-plugins.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-sms.mo
-share/locale/fa/LC_MESSAGES/kdeconnect-urlhandler.mo
-share/locale/fa/LC_MESSAGES/plasma_applet_org.kde.kdeconnect.mo
share/locale/fi/LC_MESSAGES/kdeconnect-app.mo
share/locale/fi/LC_MESSAGES/kdeconnect-cli.mo
share/locale/fi/LC_MESSAGES/kdeconnect-core.mo
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-15 05:52:31 +0000