diff options
| author |   Petr Vaněk <arkamar@atlas.cz> | 2021-04-12 11:52:46 +0200 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2021-04-15 11:40:59 +0300 |
| commit | 05dc33a126ab1b84858d1bed82a594b7c5dbad9e (patch) | |
| tree | 4db6b5c4c1c6acced67aaf26ac3432002a5ee999 /net-im/bitlbee | |
| parent | app-emulation/img: bump to 0.5.11 (diff) | |
| download | gentoo-05dc33a126ab1b84858d1bed82a594b7c5dbad9e.tar.gz gentoo-05dc33a126ab1b84858d1bed82a594b7c5dbad9e.tar.bz2 gentoo-05dc33a126ab1b84858d1bed82a594b7c5dbad9e.zip | |
net-im/bitlbee: fix compilation with disabled plugins use
The patch is taken from upstream where it was already merged.
Upstream-PR: https://github.com/bitlbee/bitlbee/pull/156
Closes: https://bugs.gentoo.org/739510
Signed-off-by: Petr Vaněk <arkamar@atlas.cz>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'net-im/bitlbee')
| -rw-r--r-- | net-im/bitlbee/bitlbee-3.6-r1.ebuild | 1 | ||||
| -rw-r--r-- | net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch | 55 |
2 files changed, 56 insertions, 0 deletions
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 126e7ae66fc7..320da052e957 100644 --- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild +++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild @@ -64,6 +64,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.5-systemd-user.patch "${FILESDIR}"/${PN}-3.5-libcheck.patch "${FILESDIR}"/${PN}-3.5-libevent.patch + "${FILESDIR}"/${P}-disabled-plugins-use.patch ) src_configure() { diff --git a/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch new file mode 100644 index 000000000000..0973bd4bd5fa --- /dev/null +++ b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch @@ -0,0 +1,55 @@ +This patch is taken from upstrem https://github.com/bitlbee/bitlbee/pull/156 +where it was already merged. + +From a8196d6f72b44be9c315b9ad7dc45276d2aaca0c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@atlas.cz> +Date: Tue, 23 Mar 2021 13:07:18 +0100 +Subject: [PATCH] root_commands: prevent linker error when plugins are disabled + +This commit fixes compilation issue with disabled plugin support +(./configure --plugins=0), where get_plugins function is unavailable. +The problem has been introduced with addition of new 'plugins info' +subcommand, where get_plugins is used in cmd_plugins_info function, +which should be conditionally available only if WITH_PLUGINS is defined. + +Bug: https://bugs.gentoo.org/739510 +Bug: https://bugs.gentoo.org/617604 +Fixes: 6908ab747d1e ("Add 'plugins info' subcommand, only show plugin details there") +Signed-off-by: Petr Vaněk <arkamar@atlas.cz> +--- + root_commands.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/root_commands.c b/root_commands.c +index 8358c030..a4e72f83 100644 +--- a/root_commands.c ++++ b/root_commands.c +@@ -1168,6 +1168,7 @@ static void prplstr(GList *prpls, GString *gstr) + g_list_free(prpls); + } + ++#ifdef WITH_PLUGINS + static void cmd_plugins_info(irc_t *irc, char **cmd) + { + GList *l; +@@ -1201,6 +1202,7 @@ static void cmd_plugins_info(irc_t *irc, char **cmd) + irc_rootmsg(irc, " URL: %s", info->url); + } + } ++#endif + + static void cmd_plugins(irc_t *irc, char **cmd) + { +@@ -1208,7 +1210,9 @@ static void cmd_plugins(irc_t *irc, char **cmd) + GString *gstr; + + if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) { ++#ifdef WITH_PLUGINS + cmd_plugins_info(irc, cmd); ++#endif + return; + } + +-- +2.26.3 + |