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

[Andreas Sturmlechner]

commit: e4f5bf1508f0071bafd8366eb2c1dc002987fa45
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Sep 14 16:07:09 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Sep 14 16:07:09 2021 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e4f5bf15

kde-plasma/libksysguard: Rebase no-detailed-mem-message.patch

Closes: https://bugs.gentoo.org/811879
Package-Manager: Portage-3.0.23, Repoman-3.0.3
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 ...bksysguard-5.16.0-no-detailed-mem-message.patch | 26 
 ...ksysguard-5.22.80-no-detailed-mem-message.patch | 28 ++
 kde-plasma/libksysguard/libksysguard-.ebuild   |  2 +-
 3 files changed, 29 insertions(+), 27 deletions(-)

diff --git 
a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch
 
b/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch
deleted file mode 100644
index 477f88d4e5..00
--- 
a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 49c5fdcc3bfdfedfaeaabac4f0070b986a166ce2 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner 
-Date: Fri, 7 Jun 2019 22:58:55 +0200
-Subject: [PATCH] Gentooify message about QtWebEngineWidgets
-
-Translations can not be provided for this.

- processui/scripting.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp
-index 83cf895..647194a 100644
 a/processui/scripting.cpp
-+++ b/processui/scripting.cpp
-@@ -242,7 +242,7 @@ new QWebChannel(window.qt.webChannelTransport, 
function(channel) {
- mScriptingHtmlDialog->webView()->load(fileName);
- #else
- QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"),
--i18n("KSysGuard library was compiled without QtWebEngineWidgets, 
please contact your distribution."));
-+QStringLiteral("kde-plasma/libksysguard was built without USE 
\"webengine\" by user choice, detailed memory information not available."));
- #endif
- }
- #if HAVE_QTWEBENGINEWIDGETS
--- 
-2.21.0
-

diff --git 
a/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
 
b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
new file mode 100644
index 00..c2fcb9551d
--- /dev/null
+++ 
b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch
@@ -0,0 +1,28 @@
+From 2e2ab674038a1102081ead255a172a42d3a1d27a Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner 
+Date: Tue, 7 Sep 2021 16:08:30 +0200
+Subject: [PATCH] Gentooify message about QtWebEngineWidgets
+
+Translations can not be provided for this.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ processui/scripting.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp
+index 1c35f72..7065cbe 100644
+--- a/processui/scripting.cpp
 b/processui/scripting.cpp
+@@ -241,7 +241,7 @@ new QWebChannel(window.qt.webChannelTransport, 
function(channel) {
+ #else
+ QMessageBox::critical(this,
+   i18n("QtWebEngineWidgets not available"),
+-  i18n("KSysGuard library was compiled without 
QtWebEngineWidgets, please contact your distribution."));
++  i18n("kde-plasma/libksysguard was built without USE 
\"webengine\" by user choice, detailed memory information not available."));
+ #endif
+ }
+ #if WEBENGINE_SCRIPTING_ENABLED
+-- 
+2.33.0
+

diff --git a/kde-plasma/libksysguard/libksysguard-.ebuild 
b/kde-plasma/libksysguard/libksysguard-.ebuild
index 2648a3d5bf..d0bc4fb000 100644
--- a/kde-plasma/libksysguard/libksysguard-.ebuild
+++ b/kde-plasma/libksysguard/libksysguard-.ebuild
@@ -58,7 +58,7 @@ RDEPEND="${COMMON_DEPEND}
!

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

[Andreas Sturmlechner]

commit: 6e81fbb81ebaf65f86673fd9eb55d937a878923d
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sat May 23 20:43:39 2020 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sat May 23 20:43:39 2020 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6e81fbb8

kde-plasma/libksysguard: Backport drop IUSE minimal/unused DEPEND

Backport upstream commit fa06754147850ba06659f21e57cd7a724ecf8c49

Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 .../files/libksysguard-5.18.90-unused-dep.patch| 92 ++
 .../libksysguard/libksysguard-5.19.49..ebuild  |  7 +-
 2 files changed, 96 insertions(+), 3 deletions(-)

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 00..903b7b8bcf
--- /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.49..ebuild 
b/kde-plasma/libksysguard/libksysguard-5.19.49..ebuild
index 2fd34810b9..f586afbf06 100644
--- a/kde-plasma/libksysguard/libksysguard-5.19.49..ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.19.49..ebuild
@@ -46,15 +46,16 @@ RDEPEND="
 DEPEND="${RDEPEND}
!=kde-frameworks/kiconthemes-${KFMIN}:5
-   !minimal? ( >=kde-frameworks/plasma-${KFMIN}:5 )
X? ( x11-base/xorg-proto )
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" )
+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 !minimal KF5Plasma)
$(cmake_use_find_package webengine Qt5WebChannel)
$(cmake_use_find_package webengine Qt5WebEngineWidgets)

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

[Andreas Sturmlechner]

commit: 49719f73496479fd5776544e77e953826c1e7158
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Mon Aug  7 06:24:55 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Mon Aug  7 06:24:55 2017 +
URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=49719f73

kde-plasma/libksysguard: Remove unused dep

Package-Manager: Portage-2.3.6, Repoman-2.3.1

 .../files/libksysguard-5.10.4-unused-dep.patch | 56 ++
 .../libksysguard/libksysguard-5.10.49..ebuild  |  2 +
 2 files changed, 58 insertions(+)

diff --git a/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch 
b/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch
new file mode 100644
index 00..f76c8df1cb
--- /dev/null
+++ b/kde-plasma/libksysguard/files/libksysguard-5.10.4-unused-dep.patch
@@ -0,0 +1,56 @@
+From b6ed1afd8a8a4104a9fcf09c3322bf6d69231622 Mon Sep 17 00:00:00 2001
+From: Allan Sandfeld Jensen 
+Date: Mon, 7 Aug 2017 00:25:11 +0200
+Subject: libksysguard does not appear to use QtScript, but just includes it.
+
+Removing it makes it build with a clean Qt5.9 where QtScript no longer exists.
+
+Reviewed by: davidedmundson
+
+Differential Revision: https://phabricator.kde.org/D7036
+---
+ CMakeLists.txt   | 2 +-
+ processui/CMakeLists.txt | 1 -
+ processui/scripting.cpp  | 2 --
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 84a4479..83987ad 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -9,7 +9,7 @@ include(WriteBasicConfigVersionFile)
+ find_package(ECM 1.2.0 REQUIRED NO_MODULE)
+ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
+ 
+-find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets Script)
++find_package(Qt5 REQUIRED CONFIG COMPONENTS DBus Network Widgets)
+ find_package(Qt5WebKitWidgets CONFIG)
+ set_package_properties(Qt5WebKitWidgets PROPERTIES
+URL "git://gitorious.org/qt/qtwebkit.git"
+diff --git a/processui/CMakeLists.txt b/processui/CMakeLists.txt
+index 1927839..4dfcbd4 100644
+--- a/processui/CMakeLists.txt
 b/processui/CMakeLists.txt
+@@ -35,7 +35,6 @@ target_link_libraries(processui
+ KF5::ConfigCore
+ PRIVATE
+ Qt5::DBus
+-Qt5::Script
+ KF5::I18n
+ KF5::WindowSystem
+ KF5::Auth
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp
+index 2aa7088..afdf949 100644
+--- a/processui/scripting.cpp
 b/processui/scripting.cpp
+@@ -28,8 +28,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+-#include 
+ #include 
+ #include 
+ #include 
+-- 
+cgit v0.11.2

diff --git a/kde-plasma/libksysguard/libksysguard-5.10.49..ebuild 
b/kde-plasma/libksysguard/libksysguard-5.10.49..ebuild
index 9f293ee44f..bc70157454 100644
--- a/kde-plasma/libksysguard/libksysguard-5.10.49..ebuild
+++ b/kde-plasma/libksysguard/libksysguard-5.10.49..ebuild
@@ -42,6 +42,8 @@ DEPEND="${COMMON_DEPEND}
X? ( x11-proto/xproto )
 "
 
+PATCHES=( "${FILESDIR}/${PN}-5.10.4-unused-dep.patch" )
+
 src_configure() {
local mycmakeargs=(
$(cmake-utils_use_find_package detailedmemory Qt5WebKitWidgets)

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

[Andreas Sturmlechner]

commit: 2cd554347020cc4847c2c2923ef10e75dc77fbac
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Tue Mar 21 14:50:00 2017 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Mar 21 14:50:00 2017 +
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..ebuild   |  7 +-
 kde-plasma/libksysguard/libksysguard-.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 00..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?= 
+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