mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
app-admin/conky: Correct fix for building with libmicrohttpd.
Thanks to Samuel Bernardo and Ionen Wolkens. Closes: https://bugs.gentoo.org/766869 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Daniel Pielmeier <billie@gentoo.org>
This commit is contained in:
@@ -1,17 +1,15 @@
|
||||
From 16be0e1571a586168855bedb6da1ddc732b0bbf4 Mon Sep 17 00:00:00 2001
|
||||
From: Brenden Matthews <brenden@brndn.io>
|
||||
Date: Thu, 22 Oct 2020 13:02:00 -0400
|
||||
Subject: [PATCH] Build fix for libmicrohttpd.
|
||||
|
||||
---
|
||||
src/conky.cc | 9 +++++----
|
||||
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/src/conky.cc b/src/conky.cc
|
||||
index 79633a40..b1743466 100644
|
||||
--- a/src/conky.cc
|
||||
+++ b/src/conky.cc
|
||||
@@ -322,12 +322,13 @@ struct MHD_Daemon *httpd;
|
||||
--- 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);
|
||||
|
||||
@@ -20,7 +18,7 @@ index 79633a40..b1743466 100644
|
||||
- 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, unsigned long *upload_data_size,
|
||||
+ 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);
|
||||
|
||||
Reference in New Issue
Block a user