summaryrefslogtreecommitdiff
path: root/app-admin/conky
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-11-25 22:39:15 +0000
commitd934827bf44b7cfcf6711964418148fa60877668 (patch)
tree0625f358789b5e015e49db139cc1dbc9be00428f /app-admin/conky
parent2e34d110f164bf74d55fced27fe0000201b3eec5 (diff)
gentoo resync : 25.11.2020
Diffstat (limited to 'app-admin/conky')
-rw-r--r--app-admin/conky/Manifest8
-rw-r--r--app-admin/conky/conky-1.10.8-r10.ebuild1
-rw-r--r--app-admin/conky/conky-1.11.6-r2.ebuild (renamed from app-admin/conky/conky-1.11.5.ebuild)61
-rw-r--r--app-admin/conky/conky-1.11.6.ebuild184
-rw-r--r--app-admin/conky/files/conky-1.10.8-fpermissive.patch14
-rw-r--r--app-admin/conky/files/conky-1.11.6-fpermissive.patch31
6 files changed, 85 insertions, 214 deletions
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 996e77bfd793..3cc898799f46 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -1,13 +1,13 @@
AUX conky-1.10.8-clang.patch 773 BLAKE2B 1e1920093c8cea54190d2907f1966b66aae343f20bec111df0b6c6009f572d57912869ff879f05b55fa18ac4b40736acaeef03b0ec207baac2053937a305649c SHA512 82c7795c33256bd22575d3133ef20dc3a5cbdc4ae68ef7e6fefc3a9295d5e9f0f2d9d912122a5a22e1d6d42cbe1c40cdd3513d9bd7d08db636d96972a622c2a7
+AUX conky-1.10.8-fpermissive.patch 1081 BLAKE2B 637b91609242272617c146db05f1f6a9e6e620aef353850b2d9db329e4b643ebacada6d6239b8fda5be8e315e76cf3f457a6a57ca92e5be0ba559d84de747737 SHA512 15d53485284f27c300df8365f3ed1eae720538a8dbe0ab44b864b12b5819dcb64e0196a87b72afdab77a26ba452521050f47adfa1d9f1d61f8fc8a50e21b2cc7
AUX conky-1.10.8-libical-3.patch 1395 BLAKE2B a42403799854d0c96e37b654ab1a72897e32cd176d4efee3aa3816f36b782d823502a4a1cb79646995e90c9ac25d9a4bcd6f1879abe365173c3e29fc8583f213 SHA512 40cdd81f975c5198149ac62066af1a7b8eaa2c722d896d71a88663bef5bfdda17521d841a4fa8e08b5c4cc9106929385d626afcbe65709360b669b10a118f397
AUX conky-1.10.8-portmon.patch 551 BLAKE2B 6b69ebb6c8ec194e51d616f487ab8d736062636b12c11b1beb6ae5d599a34c2598a0bc96563fa9e01e55a7187597b78b311ce729a0bdbe3f0c7c7135372aa764 SHA512 2a793c9b297c9ff13eba4cff37af0699c30f30e58edd3c73243090d26235db45a554b9f5751878937606ac6a1bb1759edc2507372412c25ff4df613327aedc03
AUX conky-1.10.8-use-pkgconfig.patch 1115 BLAKE2B d951bdd32ee0e6eace1444d3b8a6453c6ba25c15df2cb5ca4e1ccbb2f7f86fb860e4b43e75d76b62f7d1d12e91018bb03fb3b0237ce1b1af239c53f0bffc832b SHA512 e4b73aa8c0cc917a87e1eaecc3a2e55058fa4ea0acee9c76e409cda29de0c430df3a13f8a6c3ac922dd0a11b6c4cfca781bef39c6d508e903ae81423144c86d4
AUX conky-1.10.8-virtual-sinks.patch 2054 BLAKE2B e047348df61b00dec0de151422a891feede717007e552ffb8fde0f390c0c3208e2c03bb1a615c89f7f4bfaaa8fdb603dd0eb75b4e6bdffe718c9eb6702787c2e SHA512 fe07eb460165bba0521071e7b5c452d4dc5626c7bb8e0c559ac4b275e09e8484a21eec275cfc02ca2162b6461a4198704fd806d6ba3c72504f8d007310a60ccb
+AUX conky-1.11.6-fpermissive.patch 1517 BLAKE2B 6f0c0fc9370955786f74c9a707fd63eb9ead7b5889ab57fe8c6a9326a1ff0253b90c7ccd3f38baa837404787bcded00de46d8132cc0d013ad70910b3fd64f91c SHA512 df645d30e4d6f88348af5dc1c782f6146fab86d744f54d77b0c6561f0f0c2491472e72b55f075a22bc3d16e87a01303955d0a0bffc6495dae390c9904e1f783f
DIST conky-1.10.8.tar.gz 373075 BLAKE2B 749d8bb37557c1eeb8b07955bbd45704fadb41995fad8380dd89afdf7b0c9dce02d19692691e3ef1857d849c05eae1b2fdf20243460d767199a681aeb9e87746 SHA512 743b1d17db4ae654c7a319fe9157e9ebc5eb4ae0462a1f7269332d379e8bdd1dbfecc3ab6f46c8b5176b7e40918301649ac3ee883a84dc4fc8d766abbac6585a
-DIST conky-1.11.5.tar.gz 2400965 BLAKE2B 06b6817ed3cb4bb638b5fa7f9a5f8544c9d274560dbef2bc8f8c10ed681b83d0ab27988f60bed70cd0c13cd4947a2bd9b70ad66c38dbb6f516f5d57165ef5765 SHA512 71ba02acc879dad3c240ed9a38635cb2d30e3c9ac849012ff3db53f8143c28d6cc9e502816834b0a073f7486bded7cea002b58c3bb8e189e542afb1070bb84be
DIST conky-1.11.6.tar.gz 2402216 BLAKE2B 573e2a16781ffb246041052796fd2e2f02937e0e1399edb6b8d0a16b90bbd73f84b3332d7dfba4d8bf53becc05b907efaf33fc48d4efda425c87756d44fe35f4 SHA512 f7bffcef33680d61d0171ba50b29ddda011c1c1989fc847cd4b5b60d46bed4772294eec34fd27c4d642a9c03e3cedaa31855ffc0f3b60791f4bed14ffdf7490a
-EBUILD conky-1.10.8-r10.ebuild 4822 BLAKE2B 9632e70138cbe4323adc317bccc856db9f2e3cd1599b0f4d390f46f3079ff4db626963374a0dcb00f431bd3938f94ca60e2e37a94dec402d7f6e013bcf34041e SHA512 d21b88ca76c9c7d32050b76a270748bfa96ba620a0061a2a392b55bb3e85caa7fe7053266c33639340e54e17fc0aa359a3ef9df18e8188d4c1713994658fc687
+EBUILD conky-1.10.8-r10.ebuild 4860 BLAKE2B bfa7ab46f34c8fac5a395869ad3ce175c75b748d87cabacac03a39f7d19ac904f5fd1fbb989fe4dbb6aee947b6d775c06d7941f7eecdbc566e09c17087bd7299 SHA512 b2160e9147005b2cc90020c07f8a7c4c0de7641a88f87ff983e573d24d52edd04ab3cefcea96cceb6579a48e021975248cb8f066b9137542def3c801ba57b587
EBUILD conky-1.10.8-r9.ebuild 4777 BLAKE2B 42eff9a8b3bb93f1620b301c6b4c313415c39ca4c4f9c81ee860fd15314ab4d12b2a1cbc1b58b58cd533f6dd9c69ce45a527a6e00c337aae9108ed73f9729b08 SHA512 612d3d918499ad3c51816256fb826d432e45be4634cd810d623a26a3138e7feef80639fb98206a8f590ab37f4a90e08bc3352627f5fce2abda0579f75f551d65
-EBUILD conky-1.11.5.ebuild 4626 BLAKE2B 4253a66bfa4639def23e37d97f8b8b9500ae50ca3bde4ed9ccfaacae1d4d1a66f56de536f2f1dc1ba5283ef2b71ddb87680d9adbcdec2ed89ab2a3b6213604e2 SHA512 83fc0bad524ad97e2b796f4023d249497a1b616e47d62fd448a33fc0a263a29e20a832c00745686a58b379a186f464e7363c864fec0147cb5c103561e52d298c
-EBUILD conky-1.11.6.ebuild 4626 BLAKE2B 4253a66bfa4639def23e37d97f8b8b9500ae50ca3bde4ed9ccfaacae1d4d1a66f56de536f2f1dc1ba5283ef2b71ddb87680d9adbcdec2ed89ab2a3b6213604e2 SHA512 83fc0bad524ad97e2b796f4023d249497a1b616e47d62fd448a33fc0a263a29e20a832c00745686a58b379a186f464e7363c864fec0147cb5c103561e52d298c
+EBUILD conky-1.11.6-r2.ebuild 4764 BLAKE2B 5aa4d74f05a7a6301911314c1fed06c451f54ab49a4fa1ba314e128a5e71279a9d342b7ead5e42268c5d9034280b0f14bdc6dedd1900d4084b9c49f7d43fadfd SHA512 7b706907e4669c7cec665893d478fa73129d88c3eda9304c29114f2b91ebd550ca019c1a4415e9e4b8633f42a7df68254582ba1f1a31b0269d2ac18410e8807b
MISC metadata.xml 2469 BLAKE2B 15947c03593a9d5215a9c1dd142458aeb84f61c77a669bbfa4abe256c94e28650516a0226350323f56bbc225c5edc5e9b9e3310d7957e072b6701e77e40623ce SHA512 75e2d5bd8f4848779c03fd983d995d8216f4bc35ca1d3af47cf004d1d43e36c2924523d286e13ea82c720a51a63d91e03af795e6c31471af71716b4c5ce46c4e
diff --git a/app-admin/conky/conky-1.10.8-r10.ebuild b/app-admin/conky/conky-1.10.8-r10.ebuild
index 4097461fbccc..66c0ffbf31c9 100644
--- a/app-admin/conky/conky-1.10.8-r10.ebuild
+++ b/app-admin/conky/conky-1.10.8-r10.ebuild
@@ -71,6 +71,7 @@ PATCHES=(
"${FILESDIR}"/${P}-portmon.patch
"${FILESDIR}"/${P}-clang.patch
"${FILESDIR}"/${P}-virtual-sinks.patch
+ "${FILESDIR}"/${P}-fpermissive.patch
)
DISABLE_AUTOFORMATTING="yes"
diff --git a/app-admin/conky/conky-1.11.5.ebuild b/app-admin/conky/conky-1.11.6-r2.ebuild
index 78607b854ef4..fb7f8a7087d9 100644
--- a/app-admin/conky/conky-1.11.5.ebuild
+++ b/app-admin/conky/conky-1.11.6-r2.ebuild
@@ -3,7 +3,9 @@
EAPI=7
-inherit cmake linux-info readme.gentoo-r1 xdg
+LUA_COMPAT=( lua5-3 )
+
+inherit cmake linux-info lua-single readme.gentoo-r1 xdg
DESCRIPTION="An advanced, highly configurable system monitor for X"
HOMEPAGE="https://github.com/brndnmtthws/conky"
@@ -15,16 +17,9 @@ KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
- vim-syntax weather-metar webserver wifi X xmms2"
+ vim-syntax weather-metar webserver wifi X xinerama xmms2"
COMMON_DEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXinerama
- x11-libs/libXfixes
- x11-libs/libXext
- )
cmus? ( media-sound/cmus )
curl? ( net-misc/curl )
ical? ( dev-libs/libical:= )
@@ -44,8 +39,15 @@ COMMON_DEPEND="
wifi? ( net-wireless/wireless-tools )
weather-metar? ( net-misc/curl )
webserver? ( net-libs/libmicrohttpd )
+ X? (
+ x11-libs/libX11
+ x11-libs/libXdamage
+ x11-libs/libXfixes
+ x11-libs/libXext
+ )
+ xinerama? ( x11-libs/libXinerama )
xmms2? ( media-sound/xmms2 )
- || ( dev-lang/lua:5.3 dev-lang/lua:5.2 )
+ ${LUA_DEPS}
"
RDEPEND="
${COMMON_DEPEND}
@@ -62,17 +64,22 @@ DEPEND="
REQUIRED_USE="
imlib? ( X )
- nvidia? ( X )
- truetype? ( X )
lua-cairo? ( X bundled-toluapp )
lua-imlib? ( X bundled-toluapp )
lua-rsvg? ( X bundled-toluapp )
+ nvidia? ( X )
+ truetype? ( X )
+ xinerama? ( X )
"
CONFIG_CHECK="~IPV6"
DOCS=( README.md AUTHORS )
+PATCHES=(
+ "${FILESDIR}"/${P}-fpermissive.patch
+)
+
DISABLE_AUTOFORMATTING="yes"
DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
@@ -85,6 +92,8 @@ Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
pkg_setup() {
use ipv6 && linux-info_pkg_setup
+
+ lua-single_pkg_setup
}
src_prepare() {
@@ -101,30 +110,29 @@ src_configure() {
if use X; then
mycmakeargs=(
- -DBUILD_ARGB=ON
- -DBUILD_X11=ON
- -DBUILD_XDAMAGE=ON
- -DBUILD_XDBE=ON
- -DBUILD_XINERAMA=ON
- -DBUILD_XSHAPE=ON
- -DOWN_WINDOW=ON
+ -DBUILD_ARGB=yes
+ -DBUILD_X11=yes
+ -DBUILD_XDAMAGE=yes
+ -DBUILD_XDBE=yes
+ -DBUILD_XSHAPE=yes
+ -DOWN_WINDOW=yes
)
else
mycmakeargs=(
- -DBUILD_X11=OFF
+ -DBUILD_X11=no
)
fi
mycmakeargs+=(
-DBUILD_APCUPSD=$(usex apcupsd)
- -DBUILD_AUDACIOUS=OFF
- -DBUILD_BUILTIN_CONFIG=ON
+ -DBUILD_AUDACIOUS=no
+ -DBUILD_BUILTIN_CONFIG=yes
-DBUILD_CMUS=$(usex cmus)
-DBUILD_CURL=$(usex curl)
-DBUILD_DOCS=$(usex doc)
-DBUILD_HDDTEMP=$(usex hddtemp)
-DBUILD_HTTP=$(usex webserver)
- -DBUILD_I18N=ON
+ -DBUILD_I18N=yes
-DBUILD_IBM=$(usex thinkpad)
-DBUILD_ICAL=$(usex ical)
-DBUILD_ICONV=$(usex iconv)
@@ -142,17 +150,18 @@ src_configure() {
-DBUILD_MYSQL=$(usex mysql)
-DBUILD_NCURSES=$(usex ncurses)
-DBUILD_NVIDIA=$(usex nvidia)
- -DBUILD_OLD_CONFIG=ON
+ -DBUILD_OLD_CONFIG=yes
-DBUILD_PORT_MONITORS=$(usex portmon)
-DBUILD_PULSEAUDIO=$(usex pulseaudio)
-DBUILD_RSS=$(usex rss)
-DBUILD_WEATHER_METAR=$(usex weather-metar)
-DBUILD_WLAN=$(usex wifi)
-DBUILD_XFT=$(usex truetype)
+ -DBUILD_XINERAMA=$(usex xinerama)
-DBUILD_XMMS2=$(usex xmms2)
-DDOC_PATH=/usr/share/doc/${PF}
- -DMAINTAINER_MODE=OFF
- -DRELEASE=ON
+ -DMAINTAINER_MODE=no
+ -DRELEASE=yes
)
cmake_src_configure
diff --git a/app-admin/conky/conky-1.11.6.ebuild b/app-admin/conky/conky-1.11.6.ebuild
deleted file mode 100644
index 78607b854ef4..000000000000
--- a/app-admin/conky/conky-1.11.6.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake linux-info readme.gentoo-r1 xdg
-
-DESCRIPTION="An advanced, highly configurable system monitor for X"
-HOMEPAGE="https://github.com/brndnmtthws/conky"
-SRC_URI="https://github.com/brndnmtthws/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3 BSD LGPL-2.1 MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86"
-IUSE="apcupsd bundled-toluapp cmus curl doc hddtemp ical iconv imlib iostats
- ipv6 irc lua-cairo lua-imlib lua-rsvg math moc mpd mysql nano-syntax
- ncurses nvidia +portmon pulseaudio rss systemd thinkpad truetype
- vim-syntax weather-metar webserver wifi X xmms2"
-
-COMMON_DEPEND="
- X? (
- x11-libs/libX11
- x11-libs/libXdamage
- x11-libs/libXinerama
- x11-libs/libXfixes
- x11-libs/libXext
- )
- cmus? ( media-sound/cmus )
- curl? ( net-misc/curl )
- ical? ( dev-libs/libical:= )
- iconv? ( virtual/libiconv )
- imlib? ( media-libs/imlib2[X] )
- irc? ( net-libs/libircclient )
- lua-cairo? ( x11-libs/cairo[X] )
- lua-imlib? ( media-libs/imlib2[X] )
- lua-rsvg? ( gnome-base/librsvg )
- mysql? ( dev-db/mysql-connector-c )
- ncurses? ( sys-libs/ncurses:= )
- nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )
- pulseaudio? ( media-sound/pulseaudio )
- rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 )
- systemd? ( sys-apps/systemd )
- truetype? ( x11-libs/libXft >=media-libs/freetype-2 )
- wifi? ( net-wireless/wireless-tools )
- weather-metar? ( net-misc/curl )
- webserver? ( net-libs/libmicrohttpd )
- xmms2? ( media-sound/xmms2 )
- || ( dev-lang/lua:5.3 dev-lang/lua:5.2 )
-"
-RDEPEND="
- ${COMMON_DEPEND}
- apcupsd? ( sys-power/apcupsd )
- hddtemp? ( app-admin/hddtemp )
- moc? ( media-sound/moc )
- nano-syntax? ( app-editors/nano )
- vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-"
-DEPEND="
- ${COMMON_DEPEND}
- doc? ( app-text/docbook2X dev-libs/libxslt )
-"
-
-REQUIRED_USE="
- imlib? ( X )
- nvidia? ( X )
- truetype? ( X )
- lua-cairo? ( X bundled-toluapp )
- lua-imlib? ( X bundled-toluapp )
- lua-rsvg? ( X bundled-toluapp )
-"
-
-CONFIG_CHECK="~IPV6"
-
-DOCS=( README.md AUTHORS )
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="You can find sample configurations at ${ROOT}/usr/share/doc/${PF}.
-To customize, copy to \${XDG_CONFIG_HOME}/conky/conky.conf
-and edit it to your liking.
-
-There are pretty html docs available at the conky homepage
-or in ${ROOT}/usr/share/doc/${PF}/html when built with USE=doc.
-
-Also see https://wiki.gentoo.org/wiki/Conky/HOWTO"
-
-pkg_setup() {
- use ipv6 && linux-info_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
-
- xdg_environment_reset
-
- sed -i -e "s|find_program(APP_MAN man)|set(APP_MAN $(which man) CACHE FILEPATH MAN_BINARY)|" \
- cmake/ConkyPlatformChecks.cmake || die
-}
-
-src_configure() {
- local mycmakeargs
-
- if use X; then
- mycmakeargs=(
- -DBUILD_ARGB=ON
- -DBUILD_X11=ON
- -DBUILD_XDAMAGE=ON
- -DBUILD_XDBE=ON
- -DBUILD_XINERAMA=ON
- -DBUILD_XSHAPE=ON
- -DOWN_WINDOW=ON
- )
- else
- mycmakeargs=(
- -DBUILD_X11=OFF
- )
- fi
-
- mycmakeargs+=(
- -DBUILD_APCUPSD=$(usex apcupsd)
- -DBUILD_AUDACIOUS=OFF
- -DBUILD_BUILTIN_CONFIG=ON
- -DBUILD_CMUS=$(usex cmus)
- -DBUILD_CURL=$(usex curl)
- -DBUILD_DOCS=$(usex doc)
- -DBUILD_HDDTEMP=$(usex hddtemp)
- -DBUILD_HTTP=$(usex webserver)
- -DBUILD_I18N=ON
- -DBUILD_IBM=$(usex thinkpad)
- -DBUILD_ICAL=$(usex ical)
- -DBUILD_ICONV=$(usex iconv)
- -DBUILD_IMLIB2=$(usex imlib)
- -DBUILD_IOSTATS=$(usex iostats)
- -DBUILD_IPV6=$(usex ipv6)
- -DBUILD_IRC=$(usex irc)
- -DBUILD_JOURNAL=$(usex systemd)
- -DBUILD_LUA_CAIRO=$(usex lua-cairo)
- -DBUILD_LUA_IMLIB2=$(usex lua-imlib)
- -DBUILD_LUA_RSVG=$(usex lua-rsvg)
- -DBUILD_MATH=$(usex math)
- -DBUILD_MOC=$(usex moc)
- -DBUILD_MPD=$(usex mpd)
- -DBUILD_MYSQL=$(usex mysql)
- -DBUILD_NCURSES=$(usex ncurses)
- -DBUILD_NVIDIA=$(usex nvidia)
- -DBUILD_OLD_CONFIG=ON
- -DBUILD_PORT_MONITORS=$(usex portmon)
- -DBUILD_PULSEAUDIO=$(usex pulseaudio)
- -DBUILD_RSS=$(usex rss)
- -DBUILD_WEATHER_METAR=$(usex weather-metar)
- -DBUILD_WLAN=$(usex wifi)
- -DBUILD_XFT=$(usex truetype)
- -DBUILD_XMMS2=$(usex xmms2)
- -DDOC_PATH=/usr/share/doc/${PF}
- -DMAINTAINER_MODE=OFF
- -DRELEASE=ON
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
-
- if use vim-syntax; then
- insinto /usr/share/vim/vimfiles/ftdetect
- doins "${S}"/extras/vim/ftdetect/conkyrc.vim
-
- insinto /usr/share/vim/vimfiles/syntax
- doins "${S}"/extras/vim/syntax/conkyrc.vim
- fi
-
- if use nano-syntax; then
- insinto /usr/share/nano/
- doins "${S}"/extras/nano/conky.nanorc
- fi
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- readme.gentoo_print_elog
-
- xdg_pkg_postinst
-}
diff --git a/app-admin/conky/files/conky-1.10.8-fpermissive.patch b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
new file mode 100644
index 000000000000..42abeb831cd6
--- /dev/null
+++ b/app-admin/conky/files/conky-1.10.8-fpermissive.patch
@@ -0,0 +1,14 @@
+--- conky-1.10.8/src/conky.cc.orig 2020-08-28 13:17:22.330113596 -0400
++++ conky-1.10.8/src/conky.cc 2020-08-28 13:19:48.564891015 -0400
+@@ -478,9 +478,9 @@
+ 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_data(webpage.length(), (void*) webpage.c_str(), MHD_NO, MHD_NO);
+- 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
+ return ret;
diff --git a/app-admin/conky/files/conky-1.11.6-fpermissive.patch b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
new file mode 100644
index 000000000000..1ac1173ba646
--- /dev/null
+++ b/app-admin/conky/files/conky-1.11.6-fpermissive.patch
@@ -0,0 +1,31 @@
+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;
+ 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, unsigned long *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