summaryrefslogtreecommitdiffstats
path: root/kde
diff options
context:
space:
mode:
Diffstat (limited to 'kde')
-rw-r--r--kde/build/kdeconnect-framework1
-rw-r--r--kde/modules/applications2
-rw-r--r--kde/modules/plasma-extra1
-rw-r--r--kde/patch/kdeconnect-framework.patch5
-rw-r--r--kde/patch/kdeconnect-framework/kdeconnect-kde_qca.diff72
-rw-r--r--kde/patch/kdeconnect-kde.patch3
-rw-r--r--kde/patch/kdeconnect-kde/kdeconnect-kde_openssh-8.2.diff12
-rw-r--r--kde/pkgsrc/kdeconnect-framework1
-rw-r--r--kde/slack-desc/kdeconnect-framework19
-rw-r--r--kde/slack-desc/kdeconnect-kde19
10 files changed, 36 insertions, 99 deletions
diff --git a/kde/build/kdeconnect-framework b/kde/build/kdeconnect-framework
deleted file mode 100644
index 0cfbf08..0000000
--- a/kde/build/kdeconnect-framework
+++ /dev/null
@@ -1 +0,0 @@
-2
diff --git a/kde/modules/applications b/kde/modules/applications
index 28585de..8e3b970 100644
--- a/kde/modules/applications
+++ b/kde/modules/applications
@@ -183,3 +183,5 @@ kimagemapeditor
# New in 19.08:
yakuake
+# New in 20.04:
+kdeconnect-kde
diff --git a/kde/modules/plasma-extra b/kde/modules/plasma-extra
index 385ef12..1f68d9b 100644
--- a/kde/modules/plasma-extra
+++ b/kde/modules/plasma-extra
@@ -1,7 +1,6 @@
sddm-qt5
kpeoplevcard
pulseaudio-qt
-kdeconnect-framework
polkit-kde-kcmodules-framework
kde-wallpapers
latte-dock
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);
diff --git a/kde/pkgsrc/kdeconnect-framework b/kde/pkgsrc/kdeconnect-framework
deleted file mode 100644
index 6e9a21c..0000000
--- a/kde/pkgsrc/kdeconnect-framework
+++ /dev/null
@@ -1 +0,0 @@
-plasma-extra/kdeconnect-kde
diff --git a/kde/slack-desc/kdeconnect-framework b/kde/slack-desc/kdeconnect-framework
deleted file mode 100644
index 4efa154..0000000
--- a/kde/slack-desc/kdeconnect-framework
+++ /dev/null
@@ -1,19 +0,0 @@
-# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
-# up the first '|' above the ':' following the base package name, and the '|' on
-# the right side marks the last column you can put a character in. You must make
-# exactly 11 lines for the formatting to be correct. It's also customary to
-# leave one space after the ':'.
-
- |-----handy-ruler------------------------------------------------------|
-kdeconnect-framework: kdeconnect-framework (Integrate Android with the Plasma Desktop)
-kdeconnect-framework:
-kdeconnect-framework: KDE Connect is a module to connect KDE with your smartphone.
-kdeconnect-framework: Prominent features are: clipboard share, notifications sync,
-kdeconnect-framework: multimedia remote control over secured network connections.
-kdeconnect-framework: Please note you will need to install KDE Connect on Android
-kdeconnect-framework: for this app to work:
-kdeconnect-framework: https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp
-kdeconnect-framework:
-kdeconnect-framework: See also:
-kdeconnect-framework: https://albertvaka.wordpress.com/2013/08/05/introducing-kde-connect/
diff --git a/kde/slack-desc/kdeconnect-kde b/kde/slack-desc/kdeconnect-kde
new file mode 100644
index 0000000..7fe5334
--- /dev/null
+++ b/kde/slack-desc/kdeconnect-kde
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description. Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in. You must make
+# exactly 11 lines for the formatting to be correct. It's also customary to
+# leave one space after the ':'.
+
+ |-----handy-ruler------------------------------------------------------|
+kdeconnect-kde: kdeconnect-kde (Integrate Android with the Plasma Desktop)
+kdeconnect-kde:
+kdeconnect-kde: KDE Connect is a module to connect KDE with your smartphone.
+kdeconnect-kde: Prominent features are: clipboard share, notifications sync,
+kdeconnect-kde: multimedia remote control over secured network connections.
+kdeconnect-kde: Please note you will need to install KDE Connect on Android
+kdeconnect-kde: for this app to work:
+kdeconnect-kde: https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp
+kdeconnect-kde:
+kdeconnect-kde: See also:
+kdeconnect-kde: https://albertvaka.wordpress.com/2013/08/05/introducing-kde-connect/