[arch-commits] Commit in kdeconnect/kde-unstable (2 files)

Antonio Rojas arojas at gemini.archlinux.org
Fri Mar 18 23:36:52 UTC 2022


    Date: Friday, March 18, 2022 @ 23:36:52
  Author: arojas
Revision: 439979

Drop patch

Modified:
  kdeconnect/kde-unstable/PKGBUILD
Deleted:
  kdeconnect/kde-unstable/kdeconnect-openssh-8.8.patch

------------------------------+
 PKGBUILD                     |   10 ++--------
 kdeconnect-openssh-8.8.patch |   12 ------------
 2 files changed, 2 insertions(+), 20 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-03-18 23:27:23 UTC (rev 439978)
+++ PKGBUILD	2022-03-18 23:36:52 UTC (rev 439979)
@@ -13,20 +13,14 @@
 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/unstable/release-service/$pkgver/src/$pkgname-kde-$pkgver.tar.xz{,.sig}
-        kdeconnect-openssh-8.8.patch)
+source=(https://download.kde.org/unstable/release-service/$pkgver/src/$pkgname-kde-$pkgver.tar.xz{,.sig})
 sha256sums=('766112b55fbc3be7d0cb5ea5672fc249bab9b6b69d2ac0440def941d940aa3df'
-            'SKIP'
-            'e1b43f8b3e0b2a521277d70d4fdeb8dff714f6855f33ae1c3c7d8f03fe69dbb9')
+            'SKIP')
 validpgpkeys=(CA262C6C83DE4D2FB28A332A3A6A4DB839EAA6D7  # Albert Astals Cid <aacid at kde.org>
               F23275E4BF10AFC1DF6914A6DBD2CE893E2D1C87  # Christoph Feck <cfeck at kde.org>
               D81C0CB38EB725EF6691C385BB463350D6EF31EF) # Heiko Becker <heiko.becker at 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 \

Deleted: kdeconnect-openssh-8.8.patch
===================================================================
--- kdeconnect-openssh-8.8.patch	2022-03-18 23:27:23 UTC (rev 439978)
+++ kdeconnect-openssh-8.8.patch	2022-03-18 23:36:52 UTC (rev 439979)
@@ -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")



More information about the arch-commits mailing list