diff options
Diffstat (limited to 'app-admin/conky/files')
-rw-r--r-- | app-admin/conky/files/conky-1.11.6-fpermissive.patch | 29 | ||||
-rw-r--r-- | app-admin/conky/files/conky-1.11.6-ipv6.patch | 22 | ||||
-rw-r--r-- | app-admin/conky/files/conky-1.12.1-network-speed.patch | 36 |
3 files changed, 0 insertions, 87 deletions
diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch deleted file mode 100644 index f608769b6433..000000000000 --- a/app-admin/conky/files/conky-1.11.6-fpermissive.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- old/src/conky.cc 2021-01-24 17:05:43.361378726 +0100 -+++ new/src/conky.cc 2021-01-24 17:05:49.055378611 +0100 -@@ -317,17 +321,22 @@ - static FILE *append_fpointer = nullptr; - - #ifdef BUILD_HTTP -+#ifdef MHD_YES -+/* older API */ -+#define MHD_Result int -+#endif /* MHD_YES */ - std::string webpage; - struct MHD_Daemon *httpd; - static conky::simple_config_setting<bool> http_refresh("http_refresh", false, - true); - --int sendanswer(void *cls, struct MHD_Connection *connection, const char *url, -- const char *method, const char *version, const char *upload_data, -- size_t *upload_data_size, void **con_cls) { -+MHD_Result sendanswer(void *cls, struct MHD_Connection *connection, -+ const char *url, const char *method, const char *version, -+ const char *upload_data, size_t *upload_data_size, -+ void **con_cls) { - struct MHD_Response *response = MHD_create_response_from_buffer( - webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT); -- int ret = MHD_queue_response(connection, MHD_HTTP_OK, response); -+ MHD_Result ret = MHD_queue_response(connection, MHD_HTTP_OK, response); - MHD_destroy_response(response); - if (cls || url || method || version || upload_data || upload_data_size || - con_cls) {} // make compiler happy 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++; - } - |