summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-21 23:23:25 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-23 15:48:44 +0200
commit9c531ba1634519ad24cd00ccdf8dae89042aae43 (patch)
tree11af0a615268483ae83871988bce3519424b474a
parentkde-plasma/bluedevil: systray [3/4]: Fix unreadable text w/ Breeze Dark (diff)
downloadgentoo-9c531ba1634519ad24cd00ccdf8dae89042aae43.tar.gz
gentoo-9c531ba1634519ad24cd00ccdf8dae89042aae43.tar.bz2
gentoo-9c531ba1634519ad24cd00ccdf8dae89042aae43.zip
kde-plasma/plasma-vault: systray [4/4]: Fix unreadable text w/ Breeze Dark
See also: https://mail.kde.org/pipermail/distributions/2020-June/000368.html KDE-Bug: https://bugs.kde.org/show_bug.cgi?id=422684 Upstream commit f8f7179824f5540ee64900d20af39dfc9bacd490 "Port applet to use PlasmaExtras.PlaceholderMessage" Package-Manager: Portage-2.3.101, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
-rw-r--r--kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch57
-rw-r--r--kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild4
2 files changed, 61 insertions, 0 deletions
diff --git a/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch b/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
new file mode 100644
index 000000000000..9e5785d9d527
--- /dev/null
+++ b/kde-plasma/plasma-vault/files/plasma-vault-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch
@@ -0,0 +1,57 @@
+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
+--
+2.27.0
+
diff --git a/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild
index 88f55af78e51..954b81f723f0 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.19.2.ebuild
@@ -38,6 +38,10 @@ RDEPEND="${DEPEND}
|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
"
+PATCHES=(
+ "${FILESDIR}/${PN}-5.19.2-use-PlasmaExtras.PlaceholderMessage.patch" # KDE-Bug #422684
+)
+
src_configure() {
local mycmakeargs=(
$(cmake_use_find_package networkmanager KF5NetworkManagerQt)