| 1 |
commit: 05dc33a126ab1b84858d1bed82a594b7c5dbad9e |
| 2 |
Author: Petr Vaněk <arkamar <AT> atlas <DOT> cz> |
| 3 |
AuthorDate: Mon Apr 12 09:52:46 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 15 08:40:59 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05dc33a1 |
| 7 |
|
| 8 |
net-im/bitlbee: fix compilation with disabled plugins use |
| 9 |
|
| 10 |
The patch is taken from upstream where it was already merged. |
| 11 |
|
| 12 |
Upstream-PR: https://github.com/bitlbee/bitlbee/pull/156 |
| 13 |
Closes: https://bugs.gentoo.org/739510 |
| 14 |
Signed-off-by: Petr Vaněk <arkamar <AT> atlas.cz> |
| 15 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 16 |
|
| 17 |
net-im/bitlbee/bitlbee-3.6-r1.ebuild | 1 + |
| 18 |
.../files/bitlbee-3.6-disabled-plugins-use.patch | 55 ++++++++++++++++++++++ |
| 19 |
2 files changed, 56 insertions(+) |
| 20 |
|
| 21 |
diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild |
| 22 |
index 126e7ae66fc..320da052e95 100644 |
| 23 |
--- a/net-im/bitlbee/bitlbee-3.6-r1.ebuild |
| 24 |
+++ b/net-im/bitlbee/bitlbee-3.6-r1.ebuild |
| 25 |
@@ -64,6 +64,7 @@ PATCHES=( |
| 26 |
"${FILESDIR}"/${PN}-3.5-systemd-user.patch |
| 27 |
"${FILESDIR}"/${PN}-3.5-libcheck.patch |
| 28 |
"${FILESDIR}"/${PN}-3.5-libevent.patch |
| 29 |
+ "${FILESDIR}"/${P}-disabled-plugins-use.patch |
| 30 |
) |
| 31 |
|
| 32 |
src_configure() { |
| 33 |
|
| 34 |
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 |
| 35 |
new file mode 100644 |
| 36 |
index 00000000000..0973bd4bd5f |
| 37 |
--- /dev/null |
| 38 |
+++ b/net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch |
| 39 |
@@ -0,0 +1,55 @@ |
| 40 |
+This patch is taken from upstrem https://github.com/bitlbee/bitlbee/pull/156 |
| 41 |
+where it was already merged. |
| 42 |
+ |
| 43 |
+From a8196d6f72b44be9c315b9ad7dc45276d2aaca0c Mon Sep 17 00:00:00 2001 |
| 44 |
+From: =?UTF-8?q?Petr=20Van=C4=9Bk?= <arkamar@×××××.cz> |
| 45 |
+Date: Tue, 23 Mar 2021 13:07:18 +0100 |
| 46 |
+Subject: [PATCH] root_commands: prevent linker error when plugins are disabled |
| 47 |
+ |
| 48 |
+This commit fixes compilation issue with disabled plugin support |
| 49 |
+(./configure --plugins=0), where get_plugins function is unavailable. |
| 50 |
+The problem has been introduced with addition of new 'plugins info' |
| 51 |
+subcommand, where get_plugins is used in cmd_plugins_info function, |
| 52 |
+which should be conditionally available only if WITH_PLUGINS is defined. |
| 53 |
+ |
| 54 |
+Bug: https://bugs.gentoo.org/739510 |
| 55 |
+Bug: https://bugs.gentoo.org/617604 |
| 56 |
+Fixes: 6908ab747d1e ("Add 'plugins info' subcommand, only show plugin details there") |
| 57 |
+Signed-off-by: Petr Vaněk <arkamar@×××××.cz> |
| 58 |
+--- |
| 59 |
+ root_commands.c | 4 ++++ |
| 60 |
+ 1 file changed, 4 insertions(+) |
| 61 |
+ |
| 62 |
+diff --git a/root_commands.c b/root_commands.c |
| 63 |
+index 8358c030..a4e72f83 100644 |
| 64 |
+--- a/root_commands.c |
| 65 |
++++ b/root_commands.c |
| 66 |
+@@ -1168,6 +1168,7 @@ static void prplstr(GList *prpls, GString *gstr) |
| 67 |
+ g_list_free(prpls); |
| 68 |
+ } |
| 69 |
+ |
| 70 |
++#ifdef WITH_PLUGINS |
| 71 |
+ static void cmd_plugins_info(irc_t *irc, char **cmd) |
| 72 |
+ { |
| 73 |
+ GList *l; |
| 74 |
+@@ -1201,6 +1202,7 @@ static void cmd_plugins_info(irc_t *irc, char **cmd) |
| 75 |
+ irc_rootmsg(irc, " URL: %s", info->url); |
| 76 |
+ } |
| 77 |
+ } |
| 78 |
++#endif |
| 79 |
+ |
| 80 |
+ static void cmd_plugins(irc_t *irc, char **cmd) |
| 81 |
+ { |
| 82 |
+@@ -1208,7 +1210,9 @@ static void cmd_plugins(irc_t *irc, char **cmd) |
| 83 |
+ GString *gstr; |
| 84 |
+ |
| 85 |
+ if (cmd[1] && g_strcasecmp(cmd[1], "info") == 0) { |
| 86 |
++#ifdef WITH_PLUGINS |
| 87 |
+ cmd_plugins_info(irc, cmd); |
| 88 |
++#endif |
| 89 |
+ return; |
| 90 |
+ } |
| 91 |
+ |
| 92 |
+-- |
| 93 |
+2.26.3 |
| 94 |
+ |
Archives