summaryrefslogtreecommitdiff
path: root/user/plasma-vault
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2020-04-05 08:03:15 +0000
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2020-04-05 08:03:15 +0000
commit87fa95cb12975c66546c1f575475f2b861ffe320 (patch)
treeb147c9ce74c7ff7bfee7da24fde64e7f1bd58efc /user/plasma-vault
parent45c7d18ee3236dae130150d80a32e4a37710cd24 (diff)
downloadpackages-87fa95cb12975c66546c1f575475f2b861ffe320.tar.gz
packages-87fa95cb12975c66546c1f575475f2b861ffe320.tar.bz2
packages-87fa95cb12975c66546c1f575475f2b861ffe320.tar.xz
packages-87fa95cb12975c66546c1f575475f2b861ffe320.zip
user/[KDE Plasma]: Update to 5.18.4.1
Diffstat (limited to 'user/plasma-vault')
-rw-r--r--user/plasma-vault/APKBUILD9
-rw-r--r--user/plasma-vault/fix-crash.patch26
2 files changed, 32 insertions, 3 deletions
diff --git a/user/plasma-vault/APKBUILD b/user/plasma-vault/APKBUILD
index c3f689263..1fdd39903 100644
--- a/user/plasma-vault/APKBUILD
+++ b/user/plasma-vault/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: A. Wilcox <awilfox@adelielinux.org>
# Maintainer: A. Wilcox <awilfox@adelielinux.org>
pkgname=plasma-vault
-pkgver=5.18.3
+pkgver=5.18.4.1
pkgrel=0
pkgdesc="Secure storage plugin for KDE Plasma desktop"
url="https://www.kde.org/"
@@ -13,7 +13,9 @@ 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"
+source="https://download.kde.org/stable/plasma/${pkgver%.*}/plasma-vault-$pkgver.tar.xz
+ fix-crash.patch
+ "
build() {
if [ "$CBUILD" != "$CHOST" ]; then
@@ -39,4 +41,5 @@ package() {
make DESTDIR="$pkgdir" -C build install
}
-sha512sums="aac8ec0bb8e7625d14ca9f359eab1db91417c6d9745067a936bb9e6153d7cfa786a5b15f5e952009faa95155f43810dd85cce0015f41df5b8a11ca401c4be693 plasma-vault-5.18.3.tar.xz"
+sha512sums="c06bb9129e25396c44a9a7155253ebb18eeefe7d44d3f288b79f3308964ae4dbca9375820c1a5c2f389b46e17f2f3a2cee35e73b5d4a0c23051dcad8dfcff6f0 plasma-vault-5.18.4.1.tar.xz
+b093d6fa4e82a3342ec75dc0ef9318f38dbce413a38fef1aa08b6bb74d6b3a46c178e10d3551e88937907f9b3946565084726f158f86f97ea5436f072b2e05d7 fix-crash.patch"
diff --git a/user/plasma-vault/fix-crash.patch b/user/plasma-vault/fix-crash.patch
new file mode 100644
index 000000000..306b7dfe2
--- /dev/null
+++ b/user/plasma-vault/fix-crash.patch
@@ -0,0 +1,26 @@
+From f6a924b37880b7340e796846a6e5474413ca6533 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ivan=20=C4=8Cuki=C4=87?= <ivan.cukic@kde.org>
+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
+