From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 448681382C5 for ; Thu, 15 Apr 2021 08:41:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69F34E0827; Thu, 15 Apr 2021 08:41:10 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4DD9BE0827 for ; Thu, 15 Apr 2021 08:41:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 39EB8335D16 for ; Thu, 15 Apr 2021 08:41:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC0FC64C for ; Thu, 15 Apr 2021 08:41:07 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1618476059.05dc33a126ab1b84858d1bed82a594b7c5dbad9e.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/bitlbee/, net-im/bitlbee/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/bitlbee/bitlbee-3.6-r1.ebuild net-im/bitlbee/files/bitlbee-3.6-disabled-plugins-use.patch X-VCS-Directories: net-im/bitlbee/files/ net-im/bitlbee/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 05dc33a126ab1b84858d1bed82a594b7c5dbad9e X-VCS-Branch: master Date: Thu, 15 Apr 2021 08:41:07 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: c2d3ddb5-50db-4e01-98da-c6576ad1dd06 X-Archives-Hash: c956cf451b92bbbd202908d00bf5fdde commit: 05dc33a126ab1b84858d1bed82a594b7c5dbad9e Author: Petr Vaněk atlas cz> AuthorDate: Mon Apr 12 09:52:46 2021 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Apr 15 08:40:59 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05dc33a1 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 atlas.cz> Signed-off-by: Joonas Niilola gentoo.org> net-im/bitlbee/bitlbee-3.6-r1.ebuild | 1 + .../files/bitlbee-3.6-disabled-plugins-use.patch | 55 ++++++++++++++++++++++ 2 files changed, 56 insertions(+) diff --git a/net-im/bitlbee/bitlbee-3.6-r1.ebuild b/net-im/bitlbee/bitlbee-3.6-r1.ebuild index 126e7ae66fc..320da052e95 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 00000000000..0973bd4bd5f --- /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?= +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 +--- + 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 +