| 1 |
commit: e4f5bf1508f0071bafd8366eb2c1dc002987fa45 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Sep 14 16:07:09 2021 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Sep 14 16:07:09 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=e4f5bf15 |
| 7 |
|
| 8 |
kde-plasma/libksysguard: Rebase no-detailed-mem-message.patch |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/811879 |
| 11 |
Package-Manager: Portage-3.0.23, Repoman-3.0.3 |
| 12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 13 |
|
| 14 |
...bksysguard-5.16.0-no-detailed-mem-message.patch | 26 -------------------- |
| 15 |
...ksysguard-5.22.80-no-detailed-mem-message.patch | 28 ++++++++++++++++++++++ |
| 16 |
kde-plasma/libksysguard/libksysguard-9999.ebuild | 2 +- |
| 17 |
3 files changed, 29 insertions(+), 27 deletions(-) |
| 18 |
|
| 19 |
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 |
| 20 |
deleted file mode 100644 |
| 21 |
index 477f88d4e5..0000000000 |
| 22 |
--- a/kde-plasma/libksysguard/files/libksysguard-5.16.0-no-detailed-mem-message.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,26 +0,0 @@ |
| 25 |
-From 49c5fdcc3bfdfedfaeaabac4f0070b986a166ce2 Mon Sep 17 00:00:00 2001 |
| 26 |
-From: Andreas Sturmlechner <asturm@g.o> |
| 27 |
-Date: Fri, 7 Jun 2019 22:58:55 +0200 |
| 28 |
-Subject: [PATCH] Gentooify message about QtWebEngineWidgets |
| 29 |
- |
| 30 |
-Translations can not be provided for this. |
| 31 |
---- |
| 32 |
- processui/scripting.cpp | 2 +- |
| 33 |
- 1 file changed, 1 insertion(+), 1 deletion(-) |
| 34 |
- |
| 35 |
-diff --git a/processui/scripting.cpp b/processui/scripting.cpp |
| 36 |
-index 83cf895..647194a 100644 |
| 37 |
---- a/processui/scripting.cpp |
| 38 |
-+++ b/processui/scripting.cpp |
| 39 |
-@@ -242,7 +242,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) { |
| 40 |
- mScriptingHtmlDialog->webView()->load(fileName); |
| 41 |
- #else |
| 42 |
- QMessageBox::critical(this, i18n("QtWebEngineWidgets not available"), |
| 43 |
-- i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution.")); |
| 44 |
-+ QStringLiteral("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available.")); |
| 45 |
- #endif |
| 46 |
- } |
| 47 |
- #if HAVE_QTWEBENGINEWIDGETS |
| 48 |
--- |
| 49 |
-2.21.0 |
| 50 |
- |
| 51 |
|
| 52 |
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 |
| 53 |
new file mode 100644 |
| 54 |
index 0000000000..c2fcb9551d |
| 55 |
--- /dev/null |
| 56 |
+++ b/kde-plasma/libksysguard/files/libksysguard-5.22.80-no-detailed-mem-message.patch |
| 57 |
@@ -0,0 +1,28 @@ |
| 58 |
+From 2e2ab674038a1102081ead255a172a42d3a1d27a Mon Sep 17 00:00:00 2001 |
| 59 |
+From: Andreas Sturmlechner <asturm@g.o> |
| 60 |
+Date: Tue, 7 Sep 2021 16:08:30 +0200 |
| 61 |
+Subject: [PATCH] Gentooify message about QtWebEngineWidgets |
| 62 |
+ |
| 63 |
+Translations can not be provided for this. |
| 64 |
+ |
| 65 |
+Signed-off-by: Andreas Sturmlechner <asturm@g.o> |
| 66 |
+--- |
| 67 |
+ processui/scripting.cpp | 2 +- |
| 68 |
+ 1 file changed, 1 insertion(+), 1 deletion(-) |
| 69 |
+ |
| 70 |
+diff --git a/processui/scripting.cpp b/processui/scripting.cpp |
| 71 |
+index 1c35f72..7065cbe 100644 |
| 72 |
+--- a/processui/scripting.cpp |
| 73 |
++++ b/processui/scripting.cpp |
| 74 |
+@@ -241,7 +241,7 @@ new QWebChannel(window.qt.webChannelTransport, function(channel) { |
| 75 |
+ #else |
| 76 |
+ QMessageBox::critical(this, |
| 77 |
+ i18n("QtWebEngineWidgets not available"), |
| 78 |
+- i18n("KSysGuard library was compiled without QtWebEngineWidgets, please contact your distribution.")); |
| 79 |
++ i18n("kde-plasma/libksysguard was built without USE \"webengine\" by user choice, detailed memory information not available.")); |
| 80 |
+ #endif |
| 81 |
+ } |
| 82 |
+ #if WEBENGINE_SCRIPTING_ENABLED |
| 83 |
+-- |
| 84 |
+2.33.0 |
| 85 |
+ |
| 86 |
|
| 87 |
diff --git a/kde-plasma/libksysguard/libksysguard-9999.ebuild b/kde-plasma/libksysguard/libksysguard-9999.ebuild |
| 88 |
index 2648a3d5bf..d0bc4fb000 100644 |
| 89 |
--- a/kde-plasma/libksysguard/libksysguard-9999.ebuild |
| 90 |
+++ b/kde-plasma/libksysguard/libksysguard-9999.ebuild |
| 91 |
@@ -58,7 +58,7 @@ RDEPEND="${COMMON_DEPEND} |
| 92 |
!<kde-plasma/plasma-workspace-5.18.80:5 |
| 93 |
" |
| 94 |
|
| 95 |
-PATCHES=( "${FILESDIR}/${PN}-5.16.0-no-detailed-mem-message.patch" ) |
| 96 |
+PATCHES=( "${FILESDIR}/${PN}-5.22.80-no-detailed-mem-message.patch" ) |
| 97 |
|
| 98 |
src_configure() { |
| 99 |
local mycmakeargs=( |
Archives