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

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     2cd554347020cc4847c2c2923ef10e75dc77fbac
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 21 14:50:00 2017 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Mar 21 14:50:00 2017 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=2cd55434

kde-plasma/libksysguard: Add USE=minimal to disable KF5Plasma DEPEND

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 .../files/libksysguard-5.9.4-plasma-optional.patch | 88 ++++++++++++++++++++++
 .../libksysguard/libksysguard-5.9.49.9999.ebuild   |  7 +-
 kde-plasma/libksysguard/libksysguard-9999.ebuild   |  5 +-
 3 files changed, 96 insertions(+), 4 deletions(-)

diff --git a/kde-plasma/libksysguard/files/libksysguard-5.9.4-plasma-optional.patch b/kde-plasma/libksysguard/files/libksysguard-5.9.4-plasma-optional.patch
new file mode 100644
index 0000000000..107056e37c
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.9.4-plasma-optional.patch
@@ -0,0 +1,88 @@
+From a0e69617442d720c76da5ebe3323e7a977929db4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=80lex=20Fiestas?= <afiestas@kde.org>
+Date: Wed, 22 Feb 2017 15:18:27 +0100
+Subject: Make Plasma optional in exchange of disabling signalplotter
+
+Plama is a solution with lots of dependencies which makes it really
+difficult to use libksysguard in third party applications. This patch
+makes it optional by disabling signalplotter when Plasma is not found.
+
+REVIEW: 129964
+---
+ CMakeLists.txt       | 14 ++++++++++++--
+ tests/CMakeLists.txt | 25 ++++++++++++++-----------
+ 2 files changed, 26 insertions(+), 13 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9660cdb..61c41c6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -18,7 +18,15 @@ set_package_properties(Qt5WebKitWidgets PROPERTIES
+                        PURPOSE "Used by the HTML-based GUI ksysguard library"
+                       )
+ 
+-find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service Plasma)
++find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service)
++find_package(KF5 OPTIONAL_COMPONENTS Plasma)
++set_package_properties(KF5Plasma PROPERTIES
++                       URL "https://cgit.kde.org/plasma-framework.git/"
++                       DESCRIPTION "The library of the plasma project"
++                       TYPE OPTIONAL
++                       PURPOSE "Used by signalplotter to use Plasma themes"
++                      )
++
+ find_package(ZLIB REQUIRED)
+ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams"
+                        URL "http://www.zlib.net"
+@@ -66,7 +74,9 @@ configure_file(config-ksysguard.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-ksysg
+ add_subdirectory( lsofui )
+ add_subdirectory( processcore )
+ add_subdirectory( processui )
+-add_subdirectory( signalplotter )
++if (KF5Plasma_FOUND)
++    add_subdirectory( signalplotter )
++endif()
+ add_subdirectory( ksgrd )
+ 
+ if(BUILD_TESTING)
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 967b03f..7ae9fec 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -7,19 +7,22 @@ if(Qt5WebKitWidgets_FOUND)
+             LINK_LIBRARIES KF5::ProcessUi Qt5::Test)
+ endif()
+ 
+-ecm_add_test(signalplotterbenchmark.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/ksignalplotter.cpp
+-    TEST_NAME signalplotterbenchmark
+-    LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes)
++if (KF5Plasma_FOUND)
++    ecm_add_test(signalplotterbenchmark.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/ksignalplotter.cpp
++        TEST_NAME signalplotterbenchmark
++        LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes
++    )
+ 
+-ecm_add_test(graphicssignalplotterbenchmark.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/kgraphicssignalplotter.cpp
+-    TEST_NAME graphicssignalplotterbenchmark
+-    LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes KF5::Plasma
+-)
++    ecm_add_test(graphicssignalplotterbenchmark.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/kgraphicssignalplotter.cpp
++        TEST_NAME graphicssignalplotterbenchmark
++        LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes KF5::Plasma
++    )
+ 
+-ecm_add_test(signalplottertest.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/ksignalplotter.cpp
+-    TEST_NAME signalplottertest
+-    LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes
+-)
++    ecm_add_test(signalplottertest.cpp ${libksysguard_SOURCE_DIR}/processcore/processcore_debug.cpp ../signalplotter/ksignalplotter.cpp
++        TEST_NAME signalplottertest
++        LINK_LIBRARIES KF5::SignalPlotter Qt5::Test Qt5::Widgets KF5::IconThemes
++    )
++endif()
+ 
+ ecm_add_test(chronotest.cpp
+     TEST_NAME chronotest
+-- 
+cgit v0.11.2
+

diff --git a/kde-plasma/libksysguard/libksysguard-5.9.49.9999.ebuild b/kde-plasma/libksysguard/libksysguard-5.9.49.9999.ebuild
index 09c839131f..adf82b410c 100644
--- a/kde-plasma/libksysguard/libksysguard-5.9.49.9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.9.49.9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="+detailedmemory X"
+IUSE="+detailedmemory minimal X"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kauth)
@@ -39,13 +39,16 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep plasma)
+	!minimal? ( $(add_frameworks_dep plasma) )
 	X? ( x11-proto/xproto )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.9.4-plasma-optional.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package !minimal KF5Plasma)
 		$(cmake-utils_use_find_package X X11)
 	)
 

diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild
index 09c839131f..44e6238255 100644
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 DESCRIPTION="Task management and system monitoring library"
 LICENSE="LGPL-2+"
 KEYWORDS=""
-IUSE="+detailedmemory X"
+IUSE="+detailedmemory minimal X"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep kauth)
@@ -39,13 +39,14 @@ RDEPEND="${COMMON_DEPEND}
 "
 DEPEND="${COMMON_DEPEND}
 	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep plasma)
+	!minimal? ( $(add_frameworks_dep plasma) )
 	X? ( x11-proto/xproto )
 "
 
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)
+		$(cmake-utils_use_find_package !minimal KF5Plasma)
 		$(cmake-utils_use_find_package X X11)
 	)