git » kdeconnect.git » commit 32432d4

Update to 22.04.0

author Antonio Rojas
2022-04-21 08:58:40 UTC
committer Antonio Rojas
2022-04-21 08:58:40 UTC
parent 76adfcc5a854de05467bbaf6e3bae1bdfc372869

Update to 22.04.0

PKGBUILD +4 -10
kdeconnect-openssh-8.8.patch +0 -12

diff --git a/PKGBUILD b/PKGBUILD
index e35eabb..bb37d03 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Kuba Serafinowski <zizzfizzix(at)gmail(dot)com>
 
 pkgname=kdeconnect
-pkgver=21.12.3
+pkgver=22.04.0
 pkgrel=1
 pkgdesc='Adds communication between KDE and your smartphone'
 url='https://kdeconnect.kde.org/'
@@ -13,20 +13,14 @@ groups=(kde-applications kde-network)
 depends=(kcmutils kwayland libfakekey qca-qt5 kpeoplevcard pulseaudio-qt qqc2-desktop-style hicolor-icon-theme)
 makedepends=(extra-cmake-modules kdoctools)
 optdepends=('sshfs: remote filesystem browser' 'python-nautilus: Nautilus integration' 'qt5-tools: for some runcommand plugin actions')
-source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-kde-$pkgver.tar.xz{,.sig}
-        kdeconnect-openssh-8.8.patch)
-sha256sums=('8fc84f22ad5fa1371a109679f283baaf8728c05a92b9a6f36629b8f8d9a933d9'
-            'SKIP'
-            'e1b43f8b3e0b2a521277d70d4fdeb8dff714f6855f33ae1c3c7d8f03fe69dbb9')
+source=(https://download.kde.org/stable/release-service/$pkgver/src/$pkgname-kde-$pkgver.tar.xz{,.sig})
+sha256sums=('9b2137a2c5540448ac3af7176f30da3c6e790ea217924de7ce685a5a3450ff9f'
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid@kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck@kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker@kde.org>
 options=(debug)
 
-prepare() {
-  patch -d $pkgname-kde-$pkgver -p1 < kdeconnect-openssh-8.8.patch # Fix file browsing with openssh 8.8
-}
-
 build() {
   cmake -B build -S $pkgname-kde-$pkgver \
     -DBUILD_TESTING=OFF \
diff --git a/kdeconnect-openssh-8.8.patch b/kdeconnect-openssh-8.8.patch
deleted file mode 100644
index de26603..0000000
--- a/kdeconnect-openssh-8.8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/plugins/sftp/mounter.cpp b/plugins/sftp/mounter.cpp
-index 2a484186..23ddc616 100644
---- a/plugins/sftp/mounter.cpp
-+++ b/plugins/sftp/mounter.cpp
-@@ -129,6 +129,7 @@ void Mounter::onPackageReceived(const NetworkPacket& np)
-         << QStringLiteral("-o") << QStringLiteral("StrictHostKeyChecking=no") //Do not ask for confirmation because it is not a known host
-         << QStringLiteral("-o") << QStringLiteral("UserKnownHostsFile=/dev/null") //Prevent storing as a known host
-         << QStringLiteral("-o") << QStringLiteral("HostKeyAlgorithms=+ssh-dss\\,ssh-rsa") //https://bugs.kde.org/show_bug.cgi?id=351725
-+        << QStringLiteral("-o") << QStringLiteral("PubkeyAcceptedKeyTypes=+ssh-rsa")
-         << QStringLiteral("-o") << QStringLiteral("uid=") + QString::number(getuid())
-         << QStringLiteral("-o") << QStringLiteral("gid=") + QString::number(getgid())
-         << QStringLiteral("-o") << QStringLiteral("reconnect")