Attachment #235631 for bug #265571

Lines 1-15 Link Here

(-)irc/irssi-xmpp/Makefile (-4 / +10 lines)
1	PORTNAME= irssi-xmpp	1	PORTNAME= irssi-xmpp
2	PORTVERSION= 0.54	2	DISTVERSION= 0.54
		3	PORTREVISION= 1
		4	DISTVERSIONPREFIX= v
3	CATEGORIES= irc	5	CATEGORIES= irc
4	MASTER_SITES= http://cybione.org/~irssi-xmpp/files/	6
		7	PATCH_SITES= https://github.com/ailin-nemui/${PORTNAME}/commit/
		8	PATCHFILES+= f84cca86f6cbfa34.patch:-p1 # Use full paths to irssi includes
		9	PATCHFILES+= c7728ea5aa2f4e58.patch:-p1 # GTimeVal -> gint64 transition
5		10
6	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
7	COMMENT= Irssi plugin to connect to Jabber network	12	COMMENT= Irssi plugin to connect to Jabber network
8		13
9	LICENSE= GPLv2	14	LICENSE= GPLv2
10		15
11	BROKEN= Doesn't build with Irssi 1.4.1
12
13	BUILD_DEPENDS= irssi:irc/irssi	16	BUILD_DEPENDS= irssi:irc/irssi
14	LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth	17	LIB_DEPENDS= libloudmouth-1.so:net-im/loudmouth
15	RUN_DEPENDS:= ${BUILD_DEPENDS}	18	RUN_DEPENDS:= ${BUILD_DEPENDS}
Lines 25-30 CFLAGS_amd64= -fPIC Link Here
25	CFLAGS_i386= -fPIC	28	CFLAGS_i386= -fPIC
26	CFLAGS_powerpc64= -fPIC	29	CFLAGS_powerpc64= -fPIC
27		30
		31	USE_GITHUB= yes
		32	GH_ACCOUNT= cdidier
		33
28	OPTIONS_DEFINE= DOCS	34	OPTIONS_DEFINE= DOCS
29		35
30	post-patch:	36	post-patch:

Lines 1-3 Link Here

(-)irc/irssi-xmpp/distinfo (-3 / +7 lines)
1	TIMESTAMP = 1515367493	1	TIMESTAMP = 1659436456
2	SHA256 (irssi-xmpp-0.54.tar.gz) = 1033cc6bf03abaacdb083e1fbe7d75d8a62622339e06d889422d8f0705fa7776	2	SHA256 (cdidier-irssi-xmpp-v0.54_GH0.tar.gz) = 1033cc6bf03abaacdb083e1fbe7d75d8a62622339e06d889422d8f0705fa7776
3	SIZE (irssi-xmpp-0.54.tar.gz) = 65618	3	SIZE (cdidier-irssi-xmpp-v0.54_GH0.tar.gz) = 65618
		4	SHA256 (f84cca86f6cbfa34.patch) = 127828da74eb80f003e920e484f4f6fa834b081e8cc6e8a1153d2e0515d2c0ca
		5	SIZE (f84cca86f6cbfa34.patch) = 29431
		6	SHA256 (c7728ea5aa2f4e58.patch) = 0c6b906ff1047eda1aa55f0d9952bf74e33a49f8a0c528807f0835de0a61700d
		7	SIZE (c7728ea5aa2f4e58.patch) = 3930




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));
 	}

Return to bug 265571

Added Link Here

(-)irc/irssi-xmpp/files/patch-src_fe-common_xmpp-completion.c (+17 lines)
1	Fix module loading:
2
3	Irssi: Error loading module xmpp/fe:
4	/usr/local/lib/irssi/modules/libfe_xmpp.so: Undefined symbol
5	"glist_find_string"
6
7	--- src/fe-common/xmpp-completion.c.orig 2022-08-02 10:48:55 UTC
8	+++ src/fe-common/xmpp-completion.c
9	@@ -287,7 +287,7 @@ get_channels(XMPP_SERVER_REC server, const char word
10	chat_type, XMPP_PROTOCOL_NAME)
11	\|\| *channel_setup->name != '#')
12	&& g_ascii_strncasecmp(channel_setup->name, word, len) == 0
13	- && glist_find_string(list, channel_setup->name) == NULL)
14	+ && i_list_find_string(list, channel_setup->name) == NULL)
15	list = g_list_append(list,
16	g_strdup(channel_setup->name));
17	}