[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-vault/, kde-plasma/plasma-vault/files/

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-vault/, kde-plasma/plasma-vault/files/

[Johannes Huber]

commit:     ab8355de6555a802b38180d9e4a664a52bdfa82a
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 29 10:44:27 2018 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 29 10:44:52 2018 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=ab8355de

kde-plasma/plasma-vault: Backport use networkmanager

Closes: https://bugs.gentoo.org/656940
Package-Manager: Portage-2.3.41, Repoman-2.3.9

 .../files/plasma-vault-5.13.2-nm-qt-optional.patch | 74 ++++++++++++++++++++++
 kde-plasma/plasma-vault/plasma-vault-5.13.2.ebuild | 14 +++-
 .../plasma-vault/plasma-vault-5.13.49.9999.ebuild  | 14 +++-
 3 files changed, 98 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch b/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch
new file mode 100644
index 0000000000..38fbccf56c
--- /dev/null
+++ b/kde-plasma/plasma-vault/files/plasma-vault-5.13.2-nm-qt-optional.patch
@@ -0,0 +1,74 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -58,8 +58,11 @@
+    KIO
+    Plasma
+    WidgetsAddons
+-   NetworkManagerQt
+    )
++find_package (KF5NetworkManagerQt ${KF5_DEP_VERSION})
++if (KF5NetworkManagerQt_FOUND)
++    set (HAVE_NETWORKMANAGER TRUE)
++endif()
+ find_package (KF5SysGuard REQUIRED)
+ 
+ include_directories (
+diff --git a/kded/CMakeLists.txt b/kded/CMakeLists.txt
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
+@@ -1,3 +1,5 @@
++configure_file (config-plasma-vault.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-plasma-vault.h)
++
+ include_directories (
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_SOURCE_DIR}/engine
+@@ -85,8 +87,13 @@
+    KF5::SysGuard
+    KF5::WidgetsAddons
+    KF5::ProcessCore
+-   KF5::NetworkManagerQt
+    )
++if (HAVE_NETWORKMANAGER)
++    target_link_libraries (
++       kded_plasmavault
++       KF5::NetworkManagerQt
++    )
++endif ()
+ 
+ 
+ install (
+diff --git a/kded/config-plasma-vault.cmake b/kded/config-plasma-vault.cmake
+new file mode 100644
+--- /dev/null
++++ b/kded/config-plasma-vault.cmake
+@@ -0,0 +1 @@
++#cmakedefine HAVE_NETWORKMANAGER
+diff --git a/kded/service.cpp b/kded/service.cpp
+--- a/kded/service.cpp
++++ b/kded/service.cpp
+@@ -37,7 +37,23 @@
+ 
+ #include <functional>
+ 
++#include <config-plasma-vault.h>
++#ifdef HAVE_NETWORKMANAGER
+ #include <NetworkManagerQt/Manager>
++#else
++namespace NetworkManager
++{
++    bool isNetworkingEnabled()
++    {
++        return true;
++    }
++
++    void setNetworkingEnabled(bool enabled)
++    {
++        Q_UNUSED(enabled);
++    }
++}
++#endif
+ 
+ K_PLUGIN_FACTORY_WITH_JSON(PlasmaVaultServiceFactory,
+                            "plasmavault.json",
+

diff --git a/kde-plasma/plasma-vault/plasma-vault-5.13.2.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.13.2.ebuild
index 941e3fe386..8f2b721966 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.13.2.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.13.2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE=""
+IUSE="networkmanager"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -21,7 +21,6 @@ DEPEND="
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep networkmanager-qt)
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_plasma_dep libksysguard)
@@ -29,7 +28,18 @@ DEPEND="
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
 "
 RDEPEND="${DEPEND}
 	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
 "
+
+PATCHES=( "${FILESDIR}/${P}-nm-qt-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}

diff --git a/kde-plasma/plasma-vault/plasma-vault-5.13.49.9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.13.49.9999.ebuild
index e50a5f832f..863c60b868 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.13.49.9999.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.13.49.9999.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE+=" https://cukic.co/2017/02/03/vaults-encryption-in-plasma/"
 
 LICENSE="LGPL-3"
 KEYWORDS=""
-IUSE=""
+IUSE="networkmanager"
 
 DEPEND="
 	$(add_frameworks_dep kactivities)
@@ -21,7 +21,6 @@ DEPEND="
 	$(add_frameworks_dep kdbusaddons)
 	$(add_frameworks_dep ki18n)
 	$(add_frameworks_dep kio)
-	$(add_frameworks_dep networkmanager-qt)
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_plasma_dep libksysguard)
@@ -29,7 +28,18 @@ DEPEND="
 	$(add_qt_dep qtdeclarative)
 	$(add_qt_dep qtgui)
 	$(add_qt_dep qtwidgets)
+	networkmanager? ( $(add_frameworks_dep networkmanager-qt) )
 "
 RDEPEND="${DEPEND}
 	|| ( >=sys-fs/cryfs-0.9.9 >=sys-fs/encfs-1.9.2 )
 "
+
+PATCHES=( "${FILESDIR}/${PN}-5.13.2-nm-qt-optional.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package networkmanager KF5NetworkManagerQt)
+	)
+
+	kde5_src_configure
+}

[gentoo-commits] proj/kde:master commit in: kde-plasma/plasma-vault/, kde-plasma/plasma-vault/files/

[Andreas Sturmlechner]

commit:     17cb764043c0aac7da3c952e3fee8724623a46ac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 21 21:23:25 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Jun 21 21:41:41 2020 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=17cb7640

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 <AT> gentoo.org>

 ....19.2-use-PlasmaExtras.PlaceholderMessage.patch | 57 ++++++++++++++++++++++
 .../plasma-vault/plasma-vault-5.19.49.9999.ebuild  |  4 ++
 2 files changed, 61 insertions(+)

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 0000000000..9e5785d9d5
--- /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.49.9999.ebuild b/kde-plasma/plasma-vault/plasma-vault-5.19.49.9999.ebuild
index 4545e96559..1246d34f79 100644
--- a/kde-plasma/plasma-vault/plasma-vault-5.19.49.9999.ebuild
+++ b/kde-plasma/plasma-vault/plasma-vault-5.19.49.9999.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)