From 3d8094d30a384f0b391aeafd36d16eebb74e4e49 Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Thu, 17 Sep 2020 04:05:12 +0000 Subject: user/[KDE Plasma]: Update to 5.18.5 --- user/plasma-vault/APKBUILD | 9 +++------ user/plasma-vault/fix-crash.patch | 26 -------------------------- 2 files changed, 3 insertions(+), 32 deletions(-) delete mode 100644 user/plasma-vault/fix-crash.patch (limited to 'user/plasma-vault') diff --git a/user/plasma-vault/APKBUILD b/user/plasma-vault/APKBUILD index 1fdd39903..24c15321a 100644 --- a/user/plasma-vault/APKBUILD +++ b/user/plasma-vault/APKBUILD @@ -1,7 +1,7 @@ # Contributor: A. Wilcox # Maintainer: A. Wilcox pkgname=plasma-vault -pkgver=5.18.4.1 +pkgver=5.18.5 pkgrel=0 pkgdesc="Secure storage plugin for KDE Plasma desktop" url="https://www.kde.org/" @@ -13,9 +13,7 @@ makedepends="cmake extra-cmake-modules kactivities-dev kconfig-dev kwidgetsaddons-dev libksysguard-dev plasma-framework-dev qt5-qtbase-dev qt5-qtdeclarative-dev" subpackages="$pkgname-lang" -source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-vault-$pkgver.tar.xz - fix-crash.patch - " +source="https://download.kde.org/stable/plasma/$pkgver/plasma-vault-$pkgver.tar.xz" build() { if [ "$CBUILD" != "$CHOST" ]; then @@ -41,5 +39,4 @@ package() { make DESTDIR="$pkgdir" -C build install } -sha512sums="c06bb9129e25396c44a9a7155253ebb18eeefe7d44d3f288b79f3308964ae4dbca9375820c1a5c2f389b46e17f2f3a2cee35e73b5d4a0c23051dcad8dfcff6f0 plasma-vault-5.18.4.1.tar.xz -b093d6fa4e82a3342ec75dc0ef9318f38dbce413a38fef1aa08b6bb74d6b3a46c178e10d3551e88937907f9b3946565084726f158f86f97ea5436f072b2e05d7 fix-crash.patch" +sha512sums="66fcd87dee7e696aa0f5fa41adcb41134bb0da1ee9920f51057ee8729f8d88052b28f4e422795fc229767b7861226d1386086748afb356f4cb7281c1da4af7e8 plasma-vault-5.18.5.tar.xz" diff --git a/user/plasma-vault/fix-crash.patch b/user/plasma-vault/fix-crash.patch deleted file mode 100644 index 306b7dfe2..000000000 --- a/user/plasma-vault/fix-crash.patch +++ /dev/null @@ -1,26 +0,0 @@ -From f6a924b37880b7340e796846a6e5474413ca6533 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= -Date: Tue, 17 Mar 2020 14:37:24 +0100 -Subject: Make sure we have saved network state before accessing it - -BUG:418262 ---- - kded/service.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/kded/service.cpp b/kded/service.cpp -index 4b5f65a..ff67d43 100644 ---- a/kded/service.cpp -+++ b/kded/service.cpp -@@ -420,7 +420,7 @@ void PlasmaVaultService::openVaultInFileManager(const QString &device) - new KRun(QUrl::fromLocalFile((QString)vault->mountPoint().data()), nullptr); - }, - [this, vault] { -- if (vault->status() != VaultInfo::Opened) { -+ if (vault->status() != VaultInfo::Opened && d->savedNetworkingState) { - auto& devicesInhibittingNetworking = d->savedNetworkingState->devicesInhibittingNetworking; - devicesInhibittingNetworking.removeAll(vault->device().data()); - d->restoreNetworkingState(); --- -cgit v1.1 - -- cgit v1.2.3-60-g2f50