From 765a33aedd06f7553d81077b08f844a7cb2394cc Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Sun, 26 Apr 2020 14:52:08 +0200
Subject: Kdeconnect moved from plasma-extra to applications

Also, the name was changed from kdeconnect-framework back to kdeconnect-kde.
---
 kde/patch/kdeconnect-framework.patch               |  5 --
 .../kdeconnect-framework/kdeconnect-kde_qca.diff   | 72 ----------------------
 kde/patch/kdeconnect-kde.patch                     |  3 +
 .../kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff | 12 ++++
 4 files changed, 15 insertions(+), 77 deletions(-)
 delete mode 100644 kde/patch/kdeconnect-framework.patch
 delete mode 100644 kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff
 create mode 100644 kde/patch/kdeconnect-kde.patch
 create mode 100644 kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff

(limited to 'kde/patch')

diff --git a/kde/patch/kdeconnect-framework.patch b/kde/patch/kdeconnect-framework.patch
deleted file mode 100644
index 835a0de..0000000
--- a/kde/patch/kdeconnect-framework.patch
+++ /dev/null
@@ -1,5 +0,0 @@
-# We now use Qca-qt5, not Qca.
-# Change the lines with #include <QtCrypto> to #include <QtCrypto/QtCrypto> :
-# No longer needed for kdeconnect-kde 5.2.0:
-#cat $CWD/patch/kdeconnect-framework/kdeconnect-kde_qca.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
-
diff --git a/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff b/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff
deleted file mode 100644
index 6b63821..0000000
--- a/kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff
+++ /dev/null
@@ -1,72 +0,0 @@
-diff -uar kdeconnect-kde-c7c1974_20150111git.orig/CMakeLists.txt kdeconnect-kde-c7c1974_20150111git/CMakeLists.txt
---- kdeconnect-kde-c7c1974_20150111git.orig/CMakeLists.txt	2015-01-11 05:14:01.000000000 +0100
-+++ kdeconnect-kde-c7c1974_20150111git/CMakeLists.txt	2015-01-13 19:35:36.186346803 +0100
-@@ -7,7 +7,7 @@
- 
- find_package(Qt5 5.2 REQUIRED COMPONENTS Quick Test)
- find_package(KF5 REQUIRED COMPONENTS I18n KIO Notifications ConfigWidgets DBusAddons KCMUtils IconThemes)
--find_package(Qca REQUIRED)
-+find_package(Qca-qt5 REQUIRED)
- 
- include(KDEInstallDirs)
- include(KDECompilerSettings)
-diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/backends/devicelink.h kdeconnect-kde-c7c1974_20150111git/core/backends/devicelink.h
---- kdeconnect-kde-c7c1974_20150111git.orig/core/backends/devicelink.h	2015-01-11 05:14:01.000000000 +0100
-+++ kdeconnect-kde-c7c1974_20150111git/core/backends/devicelink.h	2015-01-13 19:37:54.472349672 +0100
-@@ -22,7 +22,7 @@
- #define DEVICELINK_H
- 
- #include <QObject>
--#include <QtCrypto>
-+#include <QtCrypto/QtCrypto>
- 
- #include "../networkpackage.h"
- 
-diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/daemon.cpp kdeconnect-kde-c7c1974_20150111git/core/daemon.cpp
---- kdeconnect-kde-c7c1974_20150111git.orig/core/daemon.cpp	2015-01-11 05:14:01.000000000 +0100
-+++ kdeconnect-kde-c7c1974_20150111git/core/daemon.cpp	2015-01-13 19:36:20.832347218 +0100
-@@ -27,7 +27,7 @@
- #include <QDBusConnection>
- #include <QNetworkSession>
- #include <QNetworkConfigurationManager>
--#include <QtCrypto>
-+#include <QtCrypto/QtCrypto>
- #include <QStandardPaths>
- #include <QNetworkAccessManager>
- 
-diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/device.h kdeconnect-kde-c7c1974_20150111git/core/device.h
---- kdeconnect-kde-c7c1974_20150111git.orig/core/device.h	2015-01-11 05:14:01.000000000 +0100
-+++ kdeconnect-kde-c7c1974_20150111git/core/device.h	2015-01-13 19:36:48.824345985 +0100
-@@ -27,7 +27,7 @@
- #include <QSet>
- #include <QSslKey>
- #include <QTimer>
--#include <QtCrypto>
-+#include <QtCrypto/QtCrypto>
- 
- #include "networkpackage.h"
- 
-diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/networkpackage.cpp kdeconnect-kde-c7c1974_20150111git/core/networkpackage.cpp
---- kdeconnect-kde-c7c1974_20150111git.orig/core/networkpackage.cpp	2015-01-11 05:14:01.000000000 +0100
-+++ kdeconnect-kde-c7c1974_20150111git/core/networkpackage.cpp	2015-01-13 19:37:33.492347812 +0100
-@@ -32,7 +32,7 @@
- #include <QSslKey>
- #include <QDateTime>
- #include <qjsondocument.h>
--#include <QtCrypto>
-+#include <QtCrypto/QtCrypto>
- #include <QDebug>
- 
- #include "dbushelper.h"
-diff -uar kdeconnect-kde-c7c1974_20150111git.orig/core/networkpackage.h kdeconnect-kde-c7c1974_20150111git/core/networkpackage.h
---- kdeconnect-kde-c7c1974_20150111git.orig/core/networkpackage.h	2015-01-11 05:14:01.000000000 +0100
-+++ kdeconnect-kde-c7c1974_20150111git/core/networkpackage.h	2015-01-13 19:35:36.224346806 +0100
-@@ -28,7 +28,7 @@
- #include <QVariant>
- #include <QStringList>
- #include <QIODevice>
--#include <QtCrypto>
-+#include <QtCrypto/QtCrypto>
- #include <QSharedPointer>
- #include <QUrl>
- 
diff --git a/kde/patch/kdeconnect-kde.patch b/kde/patch/kdeconnect-kde.patch
new file mode 100644
index 0000000..47f98f5
--- /dev/null
+++ b/kde/patch/kdeconnect-kde.patch
@@ -0,0 +1,3 @@
+# Fix remote device browsing with openssh 8.2:
+cat $CWD/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff b/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
new file mode 100644
index 0000000..ff067aa
--- /dev/null
+++ b/kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff
@@ -0,0 +1,12 @@
+diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
+index fca9907c..f673c9f7 100644
+--- a/plugins/sftp/mounter.cpp
++++ b/plugins/sftp/mounter.cpp
+@@ -145,6 +145,7 @@ void Mounter::onPackageReceived(const NetworkPacket& np)
+         << QStringLiteral("-o") << QStringLiteral("reconnect")
+         << QStringLiteral("-o") << QStringLiteral("ServerAliveInterval=30")
+         << QStringLiteral("-o") << QStringLiteral("password_stdin")
++        << QStringLiteral("-o") << QStringLiteral("KexAlgorithms=+diffie-hellman-group14-sha1")
+         ;
+ 
+     m_proc->setProgram(program, arguments);
-- 
cgit v1.2.3