[gentoo-commits] repo/gentoo:master commit in: app-admin/conky/files/

["Daniel Pielmeier" <billie@gentoo.org>]

commit:     68aae342b93b2a0f351795215f4ed2a3499ddb03
Author:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  2 17:17:16 2022 +0000
Commit:     Daniel Pielmeier <billie <AT> gentoo <DOT> org>
CommitDate: Wed Feb  2 17:17:16 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68aae342

app-admin/conky: Remove unused patches.

https://github.com/gentoo/gentoo/pull/23925

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org>

 app-admin/conky/files/conky-1.11.6-ipv6.patch      | 22 -------------
 .../conky/files/conky-1.12.1-network-speed.patch   | 36 ----------------------
 2 files changed, 58 deletions(-)

diff --git a/app-admin/conky/files/conky-1.11.6-ipv6.patch b/app-admin/conky/files/conky-1.11.6-ipv6.patch
deleted file mode 100644
index 65066270a750..000000000000
--- a/app-admin/conky/files/conky-1.11.6-ipv6.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-Fix no-ipv6
-From https://github.com/brndnmtthws/conky/issues/1033#issue-748414180
-
-diff '--color=auto' -aur a/src/linux.cc b/src/linux.cc
---- a/src/linux.cc	2019-08-12 14:53:54.000000000 -0700
-+++ b/src/linux.cc	2020-11-22 18:44:04.394329722 -0700
-@@ -667,6 +667,7 @@
-   }
- }
- 
-+#ifdef BUILD_IPV6
- void update_ipv6_net_stats() {
-   FILE *file;
-   char v6addr[33];
-@@ -731,6 +732,7 @@
- 
-   fclose(file);
- }
-+#endif /* BUILD_IPV6 */
- 
- /**
-  * Parses information from /proc/net/dev and stores them in ???

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
deleted file mode 100644
index 46a7615c589a..000000000000
--- a/app-admin/conky/files/conky-1.12.1-network-speed.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 415c730133476d6652f479242b0638496b5f673b Mon Sep 17 00:00:00 2001
-From: Steven Xu <stevenxxiu@gmail.com>
-Date: Tue, 23 Mar 2021 20:12:52 +1100
-Subject: [PATCH] fix: update `update last_update_time` earlier, so the network
- speed is correctly displayed, otherwise the speed shown is much lower than
- the actual speed (resolves #863)
-
----
- src/conky.cc | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/src/conky.cc b/src/conky.cc
-index b116b2bed..af5602c5b 100644
---- a/src/conky.cc
-+++ b/src/conky.cc
-@@ -766,6 +766,12 @@ static void generate_text() {
-    * some info.mem entries */
-   update_stuff();
- 
-+  /* Update `last_update_time` before `generate_text_internal()`, as the latter
-+   * calls `evaluate()` -> `update_net_stats()`, which needs `last_update_time`
-+   * to be set correctly. If this is not done, than the network speed being
-+   * shown will be much lower than the actual speed.*/
-+  last_update_time = current_update_time;
-+
-   /* populate the text buffer; generate_text_internal() iterates through
-    * global_root_object (an instance of the text_object struct) and calls
-    * any callbacks that were set on startup by construct_text_object(). */
-@@ -822,7 +828,6 @@ static void generate_text() {
-   if (next_update_time < time || next_update_time > time + ui) {
-     next_update_time = time - fmod(time, ui) + ui;
-   }
--  last_update_time = current_update_time;
-   total_updates++;
- }
-