diff options
| author |   Michael Palimaka <kensington@gentoo.org> | 2017-03-18 20:42:03 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2017-03-18 20:42:18 +1100 |
| commit | f162c10aa758133bef29ce39206e3d3a2bb66ec9 (patch) | |
| tree | c954fc3c548af047d84be9ab7a37e67e84cca361 /net-irc | |
| parent | net-irc/irssi-xmpp: remove unused inherit (diff) | |
| download | gentoo-f162c10aa758133bef29ce39206e3d3a2bb66ec9.tar.gz gentoo-f162c10aa758133bef29ce39206e3d3a2bb66ec9.tar.bz2 gentoo-f162c10aa758133bef29ce39206e3d3a2bb66ec9.zip | |
net-irc/irssi-xmpp: backport patch from upstream solving build failure with >=irssi-1.0
Gentoo-bug: 604924
Package-Manager: Portage-2.3.5, Repoman-2.3.2
Diffstat (limited to 'net-irc')
| -rw-r--r-- | net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch | 57 | ||||
| -rw-r--r-- | net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild | 2 |
2 files changed, 59 insertions, 0 deletions
diff --git a/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch b/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch new file mode 100644 index 000000000000..a92d4db4739b --- /dev/null +++ b/net-irc/irssi-xmpp/files/irssi-xmpp-0.53-irssi-1.0.patch @@ -0,0 +1,57 @@ +From 0d9e5f7f1a0edaea0de312828ce47d11f74ee3dc Mon Sep 17 00:00:00 2001 +From: benaryorg <binary@benary.org> +Date: Fri, 20 Jan 2017 06:31:28 +0100 +Subject: [PATCH] fix build with irssi 1.0 + +use_ssl field of SERVER_CONNECT_REC has been renamed to use_tls. + +Original patch from darix. + +Signed-off-by: benaryorg <binary@benary.org> +--- + src/core/xmpp-servers.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) + +diff --git a/src/core/xmpp-servers.c b/src/core/xmpp-servers.c +index 405ecd9..8d0b62d 100644 +--- a/src/core/xmpp-servers.c ++++ b/src/core/xmpp-servers.c +@@ -32,6 +32,11 @@ + #include "rosters-tools.h" + #include "tools.h" + ++/* IRSSI_ABI_VERSION was introduced in 0.8.18 */ ++#if !defined(IRSSI_ABI_VERSION) || IRSSI_ABI_VERSION < 6 ++# define use_tls use_ssl ++#endif ++ + static void + channels_join(SERVER_REC *server, const char *data, int automatic) + { +@@ -151,7 +156,7 @@ xmpp_server_init_connect(SERVER_CONNECT_REC *connrec) + server->connect_pid = -1; + + if (server->connrec->port <= 0) +- server->connrec->port = (server->connrec->use_ssl) ? ++ server->connrec->port = (server->connrec->use_tls) ? + LM_CONNECTION_DEFAULT_PORT_SSL : LM_CONNECTION_DEFAULT_PORT; + + if (conn->real_jid == NULL) +@@ -335,7 +340,7 @@ lm_open_cb(LmConnection *connection, gboolean success, + g_free(host); + } else + signal_emit("server connecting", 1, server); +- if (server->connrec->use_ssl) ++ if (server->connrec->use_tls) + signal_emit("xmpp server status", 2, server, + "Using SSL encryption."); + else if (lm_ssl_get_use_starttls(lm_connection_get_ssl(server->lmconn))) +@@ -470,7 +475,7 @@ xmpp_server_connect(XMPP_SERVER_REC *server) + return; + error = NULL; + err_msg = NULL; +- if (server->connrec->use_ssl) { ++ if (server->connrec->use_tls) { + if (!set_ssl(server->lmconn, &error, server, FALSE)) { + err_msg = "Cannot init ssl"; + goto err; diff --git a/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild b/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild index 83e0c6228bba..897b1d37ddd4 100644 --- a/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild +++ b/net-irc/irssi-xmpp/irssi-xmpp-0.53.ebuild @@ -20,6 +20,8 @@ DEPEND=" RDEPEND="${DEPEND}" +PATCHES=( "${FILESDIR}/${P}-irssi-1.0.patch" ) + src_prepare() { default sed -e "s/{MAKE} doc-install/{MAKE}/" \ |