| 1 |
commit: 0fd8a8c809c4603e847267219bb1c87af93027e6 |
| 2 |
Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Nov 2 07:18:27 2020 +0000 |
| 4 |
Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Nov 2 09:49:49 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0fd8a8c8 |
| 7 |
|
| 8 |
app-admin/conky: Build fix for libmicrohttpd. |
| 9 |
|
| 10 |
Thanks to Toralf Förster for the report and Andy Getz for the patch. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/736172 |
| 13 |
Package-Manager: Portage-3.0.8, Repoman-3.0.2 |
| 14 |
Signed-off-by: Daniel Pielmeier <billie <AT> gentoo.org> |
| 15 |
|
| 16 |
app-admin/conky/conky-1.10.8-r10.ebuild | 1 + |
| 17 |
app-admin/conky/conky-1.11.6-r1.ebuild | 4 +++ |
| 18 |
.../conky/files/conky-1.10.8-fpermissive.patch | 14 ++++++++++ |
| 19 |
.../conky/files/conky-1.11.6-fpermissive.patch | 31 ++++++++++++++++++++++ |
| 20 |
4 files changed, 50 insertions(+) |
| 21 |
|
| 22 |
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.10.8-r10.ebuild |
| 23 |
index 4097461fbcc..66c0ffbf31c 100644 |
| 24 |
--- a/app-admin/conky/conky-1.10.8-r10.ebuild |
| 25 |
+++ b/app-admin/conky/conky-1.10.8-r10.ebuild |
| 26 |
@@ -71,6 +71,7 @@ PATCHES=( |
| 27 |
"${FILESDIR}"/${P}-portmon.patch |
| 28 |
"${FILESDIR}"/${P}-clang.patch |
| 29 |
"${FILESDIR}"/${P}-virtual-sinks.patch |
| 30 |
+ "${FILESDIR}"/${P}-fpermissive.patch |
| 31 |
) |
| 32 |
|
| 33 |
DISABLE_AUTOFORMATTING="yes" |
| 34 |
|
| 35 |
diff --git a/app-admin/conky/conky-1.11.6-r1.ebuild b/app-admin/conky/conky-1.11.6-r1.ebuild |
| 36 |
index 7ed7c4ce190..91a17200710 100644 |
| 37 |
--- a/app-admin/conky/conky-1.11.6-r1.ebuild |
| 38 |
+++ b/app-admin/conky/conky-1.11.6-r1.ebuild |
| 39 |
@@ -75,6 +75,10 @@ CONFIG_CHECK="~IPV6" |
| 40 |
|
| 41 |
DOCS=( README.md AUTHORS ) |
| 42 |
|
| 43 |
+PATCHES=( |
| 44 |
+ "${FILESDIR}"/${P}-fpermissive.patch |
| 45 |
+) |
| 46 |
+ |
| 47 |
DISABLE_AUTOFORMATTING="yes" |
| 48 |
DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}. |
| 49 |
To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf |
| 50 |
|
| 51 |
diff --git a/app-admin/conky/files/conky-1.10.8-fpermissive.patch b/app-admin/conky/files/conky-1.10.8-fpermissive.patch |
| 52 |
new file mode 100644 |
| 53 |
index 00000000000..42abeb831cd |
| 54 |
--- /dev/null |
| 55 |
+++ b/app-admin/conky/files/conky-1.10.8-fpermissive.patch |
| 56 |
@@ -0,0 +1,14 @@ |
| 57 |
+--- conky-1.10.8/src/conky.cc.orig 2020-08-28 13:17:22.330113596 -0400 |
| 58 |
++++ conky-1.10.8/src/conky.cc 2020-08-28 13:19:48.564891015 -0400 |
| 59 |
+@@ -478,9 +478,9 @@ |
| 60 |
+ struct MHD_Daemon *httpd; |
| 61 |
+ static conky::simple_config_setting<bool> http_refresh("http_refresh", false, true); |
| 62 |
+ |
| 63 |
+-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) { |
| 64 |
++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) { |
| 65 |
+ struct MHD_Response *response = MHD_create_response_from_data(webpage.length(), (void*) webpage.c_str(), MHD_NO, MHD_NO); |
| 66 |
+- int ret = MHD_queue_response (connection, MHD_HTTP_OK, response); |
| 67 |
++ MHD_Result ret = MHD_queue_response (connection, MHD_HTTP_OK, response); |
| 68 |
+ MHD_destroy_response(response); |
| 69 |
+ if(cls || url || method || version || upload_data || upload_data_size || con_cls) {} //make compiler happy |
| 70 |
+ return ret; |
| 71 |
|
| 72 |
diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch |
| 73 |
new file mode 100644 |
| 74 |
index 00000000000..1ac1173ba64 |
| 75 |
--- /dev/null |
| 76 |
+++ b/app-admin/conky/files/conky-1.11.6-fpermissive.patch |
| 77 |
@@ -0,0 +1,31 @@ |
| 78 |
+From 16be0e1571a586168855bedb6da1ddc732b0bbf4 Mon Sep 17 00:00:00 2001 |
| 79 |
+From: Brenden Matthews <brenden@×××××.io> |
| 80 |
+Date: Thu, 22 Oct 2020 13:02:00 -0400 |
| 81 |
+Subject: [PATCH] Build fix for libmicrohttpd. |
| 82 |
+ |
| 83 |
+--- |
| 84 |
+ src/conky.cc | 9 +++++---- |
| 85 |
+ 1 file changed, 5 insertions(+), 4 deletions(-) |
| 86 |
+ |
| 87 |
+diff --git a/src/conky.cc b/src/conky.cc |
| 88 |
+index 79633a40..b1743466 100644 |
| 89 |
+--- a/src/conky.cc |
| 90 |
++++ b/src/conky.cc |
| 91 |
+@@ -322,12 +322,13 @@ struct MHD_Daemon *httpd; |
| 92 |
+ static conky::simple_config_setting<bool> http_refresh("http_refresh", false, |
| 93 |
+ true); |
| 94 |
+ |
| 95 |
+-int sendanswer(void *cls, struct MHD_Connection *connection, const char *url, |
| 96 |
+- const char *method, const char *version, const char *upload_data, |
| 97 |
+- size_t *upload_data_size, void **con_cls) { |
| 98 |
++MHD_Result sendanswer(void *cls, struct MHD_Connection *connection, |
| 99 |
++ const char *url, const char *method, const char *version, |
| 100 |
++ const char *upload_data, unsigned long *upload_data_size, |
| 101 |
++ void **con_cls) { |
| 102 |
+ struct MHD_Response *response = MHD_create_response_from_buffer( |
| 103 |
+ webpage.length(), (void *)webpage.c_str(), MHD_RESPMEM_PERSISTENT); |
| 104 |
+- int ret = MHD_queue_response(connection, MHD_HTTP_OK, response); |
| 105 |
++ MHD_Result ret = MHD_queue_response(connection, MHD_HTTP_OK, response); |
| 106 |
+ MHD_destroy_response(response); |
| 107 |
+ if (cls || url || method || version || upload_data || upload_data_size || |
| 108 |
+ con_cls) {} // make compiler happy |
Archives