From 9452a6e87b6c2c70513bc47a2470bf9f1168920e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 13 Jun 2020 10:39:22 +0100 Subject: gentoo resync : 13.06.2020 --- kde-plasma/libksysguard/Manifest | 3 + .../files/libksysguard-5.18.90-unused-dep.patch | 92 ++++++++++++++++++++++ .../libksysguard/libksysguard-5.19.0.1.ebuild | 69 ++++++++++++++++ 3 files changed, 164 insertions(+) create mode 100644 kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch create mode 100644 kde-plasma/libksysguard/libksysguard-5.19.0.1.ebuild (limited to 'kde-plasma/libksysguard') diff --git a/kde-plasma/libksysguard/Manifest b/kde-plasma/libksysguard/Manifest index 487e558d7473..abac191ddc44 100644 --- a/kde-plasma/libksysguard/Manifest +++ b/kde-plasma/libksysguard/Manifest @@ -1,4 +1,7 @@ AUX libksysguard-5.16.0-no-detailed-mem-message.patch 1039 BLAKE2B c05f1bf38ef733630ec4c2bcb36b8d0cffe0c4ca318e93dfce60dabea6a92e980e94e57f347683b0235499b95cc0f40734d322309321a5ddc792c3a110a5613e SHA512 dd54d1eda30655876916a517fc3f2a9f141975bc2eb3384a3434c23ef591285cf31188aef83a2f2597d8cc9b77800ba95d37e5e2a22a8f0c9b78fa6e767a00ee +AUX libksysguard-5.18.90-unused-dep.patch 3054 BLAKE2B 9d48130d6754fd02a570ea91a17cc35fdb20a14b89e8408d041c983a4893dcf1fe3d35751ccacba845bcb4a8a5a230e0a78b722ba0a7cf720d2123abfdb6b78e SHA512 caf4a646361f3011a5926ae0ba7b10ab6b31bb01d8a5bead676735021096117492f531e8cd9d09dbfbfcfdc83b1d4d94d327c1766928fa6a7684989b967ba354 DIST libksysguard-5.18.5.tar.xz 610320 BLAKE2B c644bfa216ae851eb1520b9135add670ecbc4733be7bde27437a876141ca9f37c3531a78c347e7c00149e1d1f287a680954c3e885cfdc0838398626d6ed3d651 SHA512 a648d0db1378165188187db9de78f816b1dfe647ce7e7ea2d505bc04c5008d2c24b2a113bc73c4fc4b3ddf467682ea3b306286f4bffa2c750918112892d78fb3 +DIST libksysguard-5.19.0.1.tar.xz 670384 BLAKE2B 49f88c3ea111ac86243efa964a397bf887a12e5bef14f21931dc5962db5632b079276def7ba82f6687b4caecaba2f0efbea103bdce9912ff0a43792d6170a62e SHA512 4b4efdb15ddd96cc5755d7f1b2e20100d999edb80e38d92cfa2e518e3a11aac7d4a12192d875b0141fa4bc9734ff5abea94414d9fe02b8c02a9ca1a936decc33 EBUILD libksysguard-5.18.5.ebuild 1532 BLAKE2B bd23ce39743bd0d5f085771371fbe3bf352f0ca0b25191fdce0f3a4b3e638cfc9f3a757d3d5206ba528637bcda4a71f938fa0e5127d847328acfc8636d2d7ad8 SHA512 0987e280ae69e5ba924eb0de04d7163e652122d7e5d59dfa14ce0d5bbb1f09e761126a6f8f2b7c4eda99bae2640c0919ae7f3be9930cdae038758f0883f65772 +EBUILD libksysguard-5.19.0.1.ebuild 1631 BLAKE2B 3862139c8258c68a31e5c763669adde46245b0c7821d106a9d5b22307f1ed9148059c72c91f6d051d0780e06d93faa1897b4b952f5dbc21ff13a5bb0c5083fe8 SHA512 e859944f5d208f0f205b3120c031a336f34a13e7b779f86f4a5802d03dda99e8d101edbdad9d358b1383274ed4dbc96c6cdade23f79893ba73a669efd16d3a2e MISC metadata.xml 379 BLAKE2B 98ef8b13c4f1d761a090ac8b0cb33cfb87b25625955018d7c91d6250b5f83d299058c87944004581eaf13649614667bf2b0301eb00e92a9ef6913dedb753e44f SHA512 036552355dd07f9e255bfb3bee4cd8949cfb437c9df36a85467735c5e4d63f7d7239015f83dbfae9b5151f9cb34b4b4f59a62f893da48f68ed82852411013a86 diff --git a/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch b/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch new file mode 100644 index 000000000000..903b7b8bcf27 --- /dev/null +++ b/kde-plasma/libksysguard/files/libksysguard-5.18.90-unused-dep.patch @@ -0,0 +1,92 @@ +From fa06754147850ba06659f21e57cd7a724ecf8c49 Mon Sep 17 00:00:00 2001 +From: "Martin T. H. Sandsmark" +Date: Sat, 23 May 2020 18:26:12 +0200 +Subject: [PATCH] remove unnecessary dependency + +--- + CMakeLists.txt | 13 +------------ + signalplotter/CMakeLists.txt | 1 - + signalplotter/ksignalplotter.cpp | 2 +- + signalplotter/ksignalplotter_p.h | 2 ++ + 4 files changed, 4 insertions(+), 14 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b12ead7..063cb05 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -46,14 +46,6 @@ set_package_properties(Qt5WebChannel PROPERTIES + + find_package(KF5 REQUIRED COMPONENTS CoreAddons Config I18n JobWidgets WindowSystem Completion Auth WidgetsAddons IconThemes ConfigWidgets Service GlobalAccel KIO Package Declarative NewStuff) + +-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" +@@ -113,10 +105,7 @@ add_subdirectory( processcore ) + add_subdirectory( processui ) + add_subdirectory( sensors ) + add_subdirectory( faces ) +- +-if (KF5Plasma_FOUND) +- add_subdirectory( signalplotter ) +-endif() ++add_subdirectory( signalplotter ) + add_subdirectory( ksgrd ) + + if(BUILD_TESTING) +diff --git a/signalplotter/CMakeLists.txt b/signalplotter/CMakeLists.txt +index fd11f01..231fcf7 100644 +--- a/signalplotter/CMakeLists.txt ++++ b/signalplotter/CMakeLists.txt +@@ -16,7 +16,6 @@ target_link_libraries(ksignalplotter + KF5::IconThemes + PRIVATE + KSysGuard::ProcessCore +- KF5::Plasma + ) + + set_target_properties(ksignalplotter +diff --git a/signalplotter/ksignalplotter.cpp b/signalplotter/ksignalplotter.cpp +index 4e6c278..df7c705 100644 +--- a/signalplotter/ksignalplotter.cpp ++++ b/signalplotter/ksignalplotter.cpp +@@ -42,7 +42,6 @@ + #ifdef GRAPHICS_SIGNAL_PLOTTER + #include + #include +-#include + #endif + + #include +@@ -52,6 +51,7 @@ + + #ifdef SVG_SUPPORT + #include ++#include + #endif + + +diff --git a/signalplotter/ksignalplotter_p.h b/signalplotter/ksignalplotter_p.h +index 81912f5..082f97c 100644 +--- a/signalplotter/ksignalplotter_p.h ++++ b/signalplotter/ksignalplotter_p.h +@@ -24,7 +24,9 @@ + //#define USE_QIMAGE + + // SVG support causes it to crash at the moment :( ++// (when re-enabling this remember to also link against plasma-framework) + //#define SVG_SUPPORT ++ + // Use a separate child widget to draw the graph in + #ifndef KSYSGUARD_KSIGNALPLOTTER_P_H + #define KSYSGUARD_KSIGNALPLOTTER_P_H +-- +2.26.2 + diff --git a/kde-plasma/libksysguard/libksysguard-5.19.0.1.ebuild b/kde-plasma/libksysguard/libksysguard-5.19.0.1.ebuild new file mode 100644 index 000000000000..429c3f28c270 --- /dev/null +++ b/kde-plasma/libksysguard/libksysguard-5.19.0.1.ebuild @@ -0,0 +1,69 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_TEST="true" +KFMIN=5.70.0 +PVCUT=$(ver_cut 1-3) +QTMIN=5.14.1 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Task management and system monitoring library" +LICENSE="LGPL-2+" +SLOT="5/9" +KEYWORDS="~amd64 ~arm64 ~ppc64" +IUSE="minimal webengine X" + +RDEPEND=" + >=dev-qt/qtdbus-${QTMIN}:5 + >=dev-qt/qtdeclarative-${QTMIN}:5 + >=dev-qt/qtgui-${QTMIN}:5 + >=dev-qt/qtnetwork-${QTMIN}:5 + >=dev-qt/qtwidgets-${QTMIN}:5 + >=kde-frameworks/kauth-${KFMIN}:5 + >=kde-frameworks/kcompletion-${KFMIN}:5 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knewstuff-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + sys-libs/zlib + webengine? ( + >=dev-qt/qtwebchannel-${QTMIN}:5 + >=dev-qt/qtwebengine-${QTMIN}:5 + ) + X? ( + >=dev-qt/qtx11extras-${QTMIN}:5 + x11-libs/libX11 + x11-libs/libXres + ) +" +DEPEND="${RDEPEND} + !=kde-frameworks/kiconthemes-${KFMIN}:5 + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" + "${FILESDIR}/${PN}-5.18.90-unused-dep.patch" +) + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package webengine Qt5WebChannel) + $(cmake_use_find_package webengine Qt5WebEngineWidgets) + $(cmake_use_find_package X X11) + ) + + ecm_src_configure +} + +src_test() { + LC_NUMERIC="C" ecm_src_test # bug 695514 +} -- cgit v1.2.3