| 1 |
commit: 68aae342b93b2a0f351795215f4ed2a3499ddb03 |
| 2 |
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Feb 2 17:17:16 2022 +0000 |
| 4 |
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Feb 2 17:17:16 2022 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68aae342 |
| 7 |
|
| 8 |
app-admin/conky: Remove unused patches. |
| 9 |
|
| 10 |
https://github.com/gentoo/gentoo/pull/23925 |
| 11 |
|
| 12 |
Package-Manager: Portage-3.0.30, Repoman-3.0.3 |
| 13 |
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org> |
| 14 |
|
| 15 |
app-admin/conky/files/conky-1.11.6-ipv6.patch | 22 ------------- |
| 16 |
.../conky/files/conky-1.12.1-network-speed.patch | 36 ---------------------- |
| 17 |
2 files changed, 58 deletions(-) |
| 18 |
|
| 19 |
diff --git a/app-admin/conky/files/conky-1.11.6-ipv6.patch b/app-admin/conky/files/conky-1.11.6-ipv6.patch |
| 20 |
deleted file mode 100644 |
| 21 |
index 65066270a750..000000000000 |
| 22 |
--- a/app-admin/conky/files/conky-1.11.6-ipv6.patch |
| 23 |
+++ /dev/null |
| 24 |
@@ -1,22 +0,0 @@ |
| 25 |
-Fix no-ipv6 |
| 26 |
-From https://github.com/brndnmtthws/conky/issues/1033#issue-748414180 |
| 27 |
- |
| 28 |
-diff '--color=auto' -aur a/src/linux.cc b/src/linux.cc |
| 29 |
---- a/src/linux.cc 2019-08-12 14:53:54.000000000 -0700 |
| 30 |
-+++ b/src/linux.cc 2020-11-22 18:44:04.394329722 -0700 |
| 31 |
-@@ -667,6 +667,7 @@ |
| 32 |
- } |
| 33 |
- } |
| 34 |
- |
| 35 |
-+#ifdef BUILD_IPV6 |
| 36 |
- void update_ipv6_net_stats() { |
| 37 |
- FILE *file; |
| 38 |
- char v6addr[33]; |
| 39 |
-@@ -731,6 +732,7 @@ |
| 40 |
- |
| 41 |
- fclose(file); |
| 42 |
- } |
| 43 |
-+#endif /* BUILD_IPV6 */ |
| 44 |
- |
| 45 |
- /** |
| 46 |
- * Parses information from /proc/net/dev and stores them in ??? |
| 47 |
|
| 48 |
diff --git a/app-admin/conky/files/conky-1.12.1-network-speed.patch b/app-admin/conky/files/conky-1.12.1-network-speed.patch |
| 49 |
deleted file mode 100644 |
| 50 |
index 46a7615c589a..000000000000 |
| 51 |
--- a/app-admin/conky/files/conky-1.12.1-network-speed.patch |
| 52 |
+++ /dev/null |
| 53 |
@@ -1,36 +0,0 @@ |
| 54 |
-From 415c730133476d6652f479242b0638496b5f673b Mon Sep 17 00:00:00 2001 |
| 55 |
-From: Steven Xu <stevenxxiu@×××××.com> |
| 56 |
-Date: Tue, 23 Mar 2021 20:12:52 +1100 |
| 57 |
-Subject: [PATCH] fix: update `update last_update_time` earlier, so the network |
| 58 |
- speed is correctly displayed, otherwise the speed shown is much lower than |
| 59 |
- the actual speed (resolves #863) |
| 60 |
- |
| 61 |
---- |
| 62 |
- src/conky.cc | 7 ++++++- |
| 63 |
- 1 file changed, 6 insertions(+), 1 deletion(-) |
| 64 |
- |
| 65 |
-diff --git a/src/conky.cc b/src/conky.cc |
| 66 |
-index b116b2bed..af5602c5b 100644 |
| 67 |
---- a/src/conky.cc |
| 68 |
-+++ b/src/conky.cc |
| 69 |
-@@ -766,6 +766,12 @@ static void generate_text() { |
| 70 |
- * some info.mem entries */ |
| 71 |
- update_stuff(); |
| 72 |
- |
| 73 |
-+ /* Update `last_update_time` before `generate_text_internal()`, as the latter |
| 74 |
-+ * calls `evaluate()` -> `update_net_stats()`, which needs `last_update_time` |
| 75 |
-+ * to be set correctly. If this is not done, than the network speed being |
| 76 |
-+ * shown will be much lower than the actual speed.*/ |
| 77 |
-+ last_update_time = current_update_time; |
| 78 |
-+ |
| 79 |
- /* populate the text buffer; generate_text_internal() iterates through |
| 80 |
- * global_root_object (an instance of the text_object struct) and calls |
| 81 |
- * any callbacks that were set on startup by construct_text_object(). */ |
| 82 |
-@@ -822,7 +828,6 @@ static void generate_text() { |
| 83 |
- if (next_update_time < time || next_update_time > time + ui) { |
| 84 |
- next_update_time = time - fmod(time, ui) + ui; |
| 85 |
- } |
| 86 |
-- last_update_time = current_update_time; |
| 87 |
- total_updates++; |
| 88 |
- } |
| 89 |
- |
Archives