aboutsummaryrefslogtreecommitdiffstats
path: root/community/plasma-vault
diff options
context:
space:
mode:
authorBart Ribbers <bribbers@disroot.org>2020-10-15 21:17:24 +0200
committerLeo <thinkabit.ukim@gmail.com>2020-10-21 13:02:09 +0000
commit02c5c183e8112ee8680c12fce7f06fe5d31f35f4 (patch)
tree43530ab034bb03ccd0edf80504180552d007cf3e /community/plasma-vault
parentf60c272e0d56825e37f6c359aff5e3f9f6a86c82 (diff)
downloadaports-02c5c183e8112ee8680c12fce7f06fe5d31f35f4.tar.gz
aports-02c5c183e8112ee8680c12fce7f06fe5d31f35f4.tar.bz2
aports-02c5c183e8112ee8680c12fce7f06fe5d31f35f4.tar.xz
community/plasma: upgrade to 5.20.0
Diffstat (limited to 'community/plasma-vault')
-rw-r--r--community/plasma-vault/APKBUILD9
-rw-r--r--community/plasma-vault/fix-422684.patch63
2 files changed, 3 insertions, 69 deletions
diff --git a/community/plasma-vault/APKBUILD b/community/plasma-vault/APKBUILD
index b954271523..4fb2f30ce2 100644
--- a/community/plasma-vault/APKBUILD
+++ b/community/plasma-vault/APKBUILD
@@ -1,16 +1,14 @@
# Contributor: Bart Ribbers <bribbers@disroot.org>
# Maintainer: Bart Ribbers <bribbers@disroot.org>
pkgname=plasma-vault
-pkgver=5.19.5
+pkgver=5.20.0
pkgrel=0
pkgdesc="Plasma applet and services for creating encrypted vaults"
arch="all !armhf" # armhf blocked by extra-cmake-modules
url="https://www.kde.org/workspaces/plasmadesktop/"
license="(GPL-2.0-only OR GPL-3.0-only) AND (LGPL-2.1-only AND LGPL-3.0-only)"
makedepends="extra-cmake-modules qt5-qtbase-dev kactivities-dev kconfig-dev kconfigwidgets-dev kcoreaddons-dev kdbusaddons-dev ki18n-dev kio-dev plasma-framework-dev kwidgetsaddons-dev networkmanager-qt-dev libksysguard-dev"
-source="https://download.kde.org/stable/plasma/$pkgver/plasma-vault-$pkgver.tar.xz
- fix-422684.patch
- "
+source="https://download.kde.org/stable/plasma/$pkgver/plasma-vault-$pkgver.tar.xz"
subpackages="$pkgname-lang"
build() {
@@ -30,5 +28,4 @@ package() {
DESTDIR="$pkgdir" cmake --build build --target install
}
-sha512sums="d2c00601dae41b924ffb174a7fca9b508ff6e6ae052dd72fa2d9b6767718b4d40a25a7b7c9131f197d25e113c23d74df36829634ce8d83d4a76355aa66ce5771 plasma-vault-5.19.5.tar.xz
-4a89604861a494170c7c51e5fbec9320afda8dd16b76ec2ef6434bf7cbafc997890060ab8c576328b164017c45ac68c56129d2669cf590de280195bec99cdad6 fix-422684.patch"
+sha512sums="b16cdd8c40305d402bb378da12b48d39265150f06c10fc7e7b7415934fc10029fdbb21337b9605900a22780f26cea0592c092d3cd622a56ffae4d91b994f9992 plasma-vault-5.20.0.tar.xz"
diff --git a/community/plasma-vault/fix-422684.patch b/community/plasma-vault/fix-422684.patch
deleted file mode 100644
index 69d7439512..0000000000
--- a/community/plasma-vault/fix-422684.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-Requested upstream to backport to fix KDE bug 422684
-https://bugs.kde.org/show_bug.cgi?id=422684
-
-This has been merged upstream and will be unnecessary from the next full
-Plasma release
-
-From f8f7179824f5540ee64900d20af39dfc9bacd490 Mon Sep 17 00:00:00 2001
-From: Nate Graham <nate@kde.org>
-Date: Sun, 14 Jun 2020 09:09:48 -0600
-Subject: [PATCH] Port applet to use PlasmaExtras.PlaceholderMessage
-
-The Kirigami version uses QQC2 elements which don't respect the plasma
-theme and color scheme, leading to thing slooking out of place
-especially when using a dark color theme or scheme.
-
-Depends on https://invent.kde.org/frameworks/plasma-framework/-/merge_requests/13
----
- CMakeLists.txt | 6 ------
- plasma/package/contents/ui/main.qml | 4 +---
- 2 files changed, 1 insertion(+), 9 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e7aa0df..bc7c260 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -66,12 +66,6 @@ if (KF5NetworkManagerQt_FOUND)
- endif()
- find_package (KSysGuard REQUIRED)
-
--find_package(KF5Kirigami2 ${KF5_DEP_VERSION} CONFIG)
--set_package_properties(KF5Kirigami2 PROPERTIES
-- DESCRIPTION "A QtQuick based components set"
-- TYPE RUNTIME
--)
--
- include_directories (
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_SOURCE_DIR}/common
-diff --git a/plasma/package/contents/ui/main.qml b/plasma/package/contents/ui/main.qml
-index 22c7428..bfac7a9 100644
---- a/plasma/package/contents/ui/main.qml
-+++ b/plasma/package/contents/ui/main.qml
-@@ -26,8 +26,6 @@ import org.kde.plasma.plasmoid 2.0
- import org.kde.plasma.components 2.0 as PlasmaComponents
- import org.kde.plasma.extras 2.0 as PlasmaExtras
-
--import org.kde.kirigami 2.12 as Kirigami
--
- Item {
- property var vaultsModel: plasmoid.nativeInterface.vaultsModel
- property var vaultsModelActions: plasmoid.nativeInterface.vaultsModel.actionsModel()
-@@ -77,7 +75,7 @@ Item {
-
- interactive: false
-
-- Kirigami.PlaceholderMessage {
-+ PlasmaExtras.PlaceholderMessage {
- id: noVaultsMessage
-
- anchors.centerIn: parent
---
-GitLab
-