From cd8eec9f21cd570c8674d55761936a407df983c3 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Tue, 21 Mar 2017 17:00:32 +0100 Subject: kde-plasma: Add KDE Plasma 5.9.4 release Package-Manager: Portage-2.3.3, Repoman-2.3.1 --- kde-plasma/libksysguard/Manifest | 1 + .../files/libksysguard-5.9.4-plasma-optional.patch | 88 ++++++++++++++++++++++ kde-plasma/libksysguard/libksysguard-5.9.4.ebuild | 56 ++++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 kde-plasma/libksysguard/files/libksysguard-5.9.4-plasma-optional.patch create mode 100644 kde-plasma/libksysguard/libksysguard-5.9.4.ebuild (limited to 'kde-plasma/libksysguard') diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index c481d1a9de6d..2f73e96d1f89 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,3 +1,4 @@ DIST libksysguard-5.8.5.tar.xz 575840 SHA256 976f9506037b45570475ba71a7445810cfd57c6079589038d63742d9fe2497a9 SHA512 5f3f1b924589dbb50e7e7f133da5325817a6ce100915682d3b6bbf80124299d85e66f83cd7adc33771dfdc9ee49c226fcb8a47204873a21231c2fe2829685089 WHIRLPOOL 89e7b1ba622356d572b31fbabc471c2b54312c26361b16183ab9f278c0bf3d877be7f7df2e95156b5ef5df3be80c263e3c521b02cd16dd3e642117e23cb36745 DIST libksysguard-5.8.6.tar.xz 575748 SHA256 a8ae640da5fedae7b59735a745d6da36eb4a3231afb116f2b453ff443f2c6244 SHA512 0f78ca2ef2b862da941cc58e8bb781a23c02e885a3545aeefae43b14b32b5b3cf03b4f6393141966e0d72490afab9f350a479ab319cfce15082f3ef38f761a20 WHIRLPOOL 1f70a97c17e904a01d2800e2579bd124fa5d6f397ac45be3be2a6979a4115fad0e82ea2a71eccbac9ff25ab5c0d8e810bbdd621210e1fc62ec29a38b06767444 DIST libksysguard-5.9.3.tar.xz 574840 SHA256 2f9aedeeaeb616cdd6ea90156a85e2b4fb6981e01dd0da7c3c2f2bae98cf473a SHA512 5654dea4379696e948a1c14882ac476ad5fd47cc3876fa18d27ef6efaa21f3e0aa0613a6372fa2229f5f3fa530ef6c21c11fb48a144c4c9d7fca9c4f4db7faa4 WHIRLPOOL 980bc5881c80199ef08d210eeecd95b6688ecca6c3a2c91d069cfce42669d6451cce5df9306921c0f6cf36a8791aae91354bc5ce99cc31570a7647818e731507 +DIST libksysguard-5.9.4.tar.xz 574944 SHA256 15df1b40cedc28d4634d2ceb301401930d46897bb4cf963cdf26cd7c51c6eebe SHA512 d3757caa7c439c765467bef573dbe9caddb175025065465ab0260aeb80e162e949b6019636a99759ec5261a4ea858c8234682838b385d4adeb2f355eb91beec4 WHIRLPOOL 05045e81bb9a6bd4bc93e2a76f75f444da8c3524697f87c9308a4d8b120883438b5c2554932525565038ca1d01ce1ea7ade8df0d60cf9c215a645212dc9099d5 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 000000000000..107056e37c42 --- /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?= +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.4.ebuild b/kde-plasma/libksysguard/libksysguard-5.9.4.ebuild new file mode 100644 index 000000000000..476f4cbdce06 --- /dev/null +++ b/kde-plasma/libksysguard/libksysguard-5.9.4.ebuild @@ -0,0 +1,56 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_TEST="true" +VIRTUALX_REQUIRED="test" +inherit kde5 + +DESCRIPTION="Task management and system monitoring library" +LICENSE="LGPL-2+" +KEYWORDS="~amd64 ~arm ~x86" +IUSE="+detailedmemory minimal X" + +COMMON_DEPEND=" + $(add_frameworks_dep kauth) + $(add_frameworks_dep kcompletion) + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kwindowsystem) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtwidgets) + sys-libs/zlib + detailedmemory? ( $(add_qt_dep qtwebkit) ) + X? ( + $(add_qt_dep qtx11extras) + x11-libs/libX11 + x11-libs/libXres + ) +" +RDEPEND="${COMMON_DEPEND} + !kde-plasma/ksysguard:4 + !kde-base/libksysguard:4 +" +DEPEND="${COMMON_DEPEND} + $(add_frameworks_dep kiconthemes) + !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) + ) + + kde5_src_configure +} -- cgit v1.2.3-65-gdbad