Attachment 235631 Details for Bug 265571 – irc/irssi-xmpp: Fix build with irssi 1.4

[patch] irc/irssi-xmpp: Fix build with irssi 1.4

irc_irssi-xmpp-unbreak_with_irssi_1.4.patch (text/plain), 3.11 KB, created by Thibault Jouan on 2022-08-02 11:12:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Thibault Jouan

Created: 2022-08-02 11:12:14 UTC

Size: 3.11 KB

patch

obsolete

>From 852dee3f5cb9c42b0974006c1b532eb53c9149af Mon Sep 17 00:00:00 2001
>From: Thibault Jouan <tj+freebsd_ports@a13.fr>
>Date: Tue, 2 Aug 2022 11:00:30 +0000
>Subject: [PATCH] Unbreak irc/irssi-xmpp with Irssi 1.4
>
>  It is marked as broken since 942aa8f2 because it does not build with
>Irssi 1.4. Another issue is that the original distribution site is
>down, so we now use github instead.
>
>  While here, change PORTVERSION as DISTVERSION.
>
>diff --git irc/irssi-xmpp/Makefile irc/irssi-xmpp/Makefile
>index 105f760df11e..f9fd24ad8117 100644
>--- irc/irssi-xmpp/Makefile
>+++ irc/irssi-xmpp/Makefile
>@@ -1,15 +1,18 @@
> PORTNAME=	irssi-xmpp
>-PORTVERSION=	0.54
>+DISTVERSION=	0.54
>+PORTREVISION=	1
>+DISTVERSIONPREFIX=	v
> CATEGORIES=	irc
>-MASTER_SITES=	http://cybione.org/~irssi-xmpp/files/
>+
>+PATCH_SITES=	https://github.com/ailin-nemui/${PORTNAME}/commit/
>+PATCHFILES+=	f84cca86f6cbfa34.patch:-p1 # Use full paths to irssi includes
>+PATCHFILES+=	c7728ea5aa2f4e58.patch:-p1 # GTimeVal -> gint64 transition
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Irssi plugin to connect to Jabber network
> 
> LICENSE=	GPLv2
> 
>-BROKEN=		Doesn't build with Irssi 1.4.1
>-
> BUILD_DEPENDS=	irssi:irc/irssi
> LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth
> RUN_DEPENDS:=	${BUILD_DEPENDS}
>@@ -25,6 +28,9 @@ CFLAGS_amd64=	-fPIC
> CFLAGS_i386=	-fPIC
> CFLAGS_powerpc64=	-fPIC
> 
>+USE_GITHUB=	yes
>+GH_ACCOUNT=	cdidier
>+
> OPTIONS_DEFINE=	DOCS
> 
> post-patch:
>diff --git irc/irssi-xmpp/distinfo irc/irssi-xmpp/distinfo
>index 7dead12f2d6b..db7fa1412fc6 100644
>--- irc/irssi-xmpp/distinfo
>+++ irc/irssi-xmpp/distinfo
>@@ -1,3 +1,7 @@
>-TIMESTAMP = 1515367493
>-SHA256 (irssi-xmpp-0.54.tar.gz) = 1033cc6bf03abaacdb083e1fbe7d75d8a62622339e06d889422d8f0705fa7776
>-SIZE (irssi-xmpp-0.54.tar.gz) = 65618
>+TIMESTAMP = 1659436456
>+SHA256 (cdidier-irssi-xmpp-v0.54_GH0.tar.gz) = 1033cc6bf03abaacdb083e1fbe7d75d8a62622339e06d889422d8f0705fa7776
>+SIZE (cdidier-irssi-xmpp-v0.54_GH0.tar.gz) = 65618
>+SHA256 (f84cca86f6cbfa34.patch) = 127828da74eb80f003e920e484f4f6fa834b081e8cc6e8a1153d2e0515d2c0ca
>+SIZE (f84cca86f6cbfa34.patch) = 29431
>+SHA256 (c7728ea5aa2f4e58.patch) = 0c6b906ff1047eda1aa55f0d9952bf74e33a49f8a0c528807f0835de0a61700d
>+SIZE (c7728ea5aa2f4e58.patch) = 3930
>diff --git irc/irssi-xmpp/files/patch-src_fe-common_xmpp-completion.c irc/irssi-xmpp/files/patch-src_fe-common_xmpp-completion.c
>new file mode 100644
>index 000000000000..5bbc55c55cff
>--- /dev/null
>+++ irc/irssi-xmpp/files/patch-src_fe-common_xmpp-completion.c
>@@ -0,0 +1,17 @@
>+Fix module loading:
>+
>+    Irssi: Error loading module xmpp/fe:
>+    /usr/local/lib/irssi/modules/libfe_xmpp.so: Undefined symbol
>+    "glist_find_string"
>+
>+--- src/fe-common/xmpp-completion.c.orig	2022-08-02 10:48:55 UTC
>++++ src/fe-common/xmpp-completion.c
>+@@ -287,7 +287,7 @@ get_channels(XMPP_SERVER_REC *server, const char *word
>+ 		    chat_type, XMPP_PROTOCOL_NAME)
>+ 		    || *channel_setup->name != '#')
>+ 		    && g_ascii_strncasecmp(channel_setup->name, word, len) == 0
>+-		    && glist_find_string(list, channel_setup->name) == NULL)
>++		    && i_list_find_string(list, channel_setup->name) == NULL)
>+ 			list = g_list_append(list,
>+ 			    g_strdup(channel_setup->name));
>+ 	}

Actions: View | Diff

Attachments on bug 265571: 235631 | 235717