Browse Source

irc/irssi-xmpp: Fix build with irssi 1.4

PR:	265571
Reported by:	tj+freebsd_ports@a13.fr
main
Thibault Jouan 7 days ago committed by Fernando Apesteguía
parent
commit
079567cc48
  1. 21
      irc/irssi-xmpp/Makefile
  2. 10
      irc/irssi-xmpp/distinfo
  3. 17
      irc/irssi-xmpp/files/patch-src_fe-common_xmpp-completion.c

21
irc/irssi-xmpp/Makefile

@ -1,30 +1,39 @@
PORTNAME= irssi-xmpp
PORTVERSION= 0.54
DISTVERSIONPREFIX= v
DISTVERSION= 0.54
PORTREVISION= 1
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}
USES= gettext-runtime gnome pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= cdidier
USE_GNOME= glib20
USE_LDCONFIG= yes
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
DATADIR= ${PREFIX}/share/irssi
DOCSDIR= ${PREFIX}/share/doc/irssi
CFLAGS_aarch64= -fPIC
CFLAGS_amd64= -fPIC
CFLAGS_i386= -fPIC
CFLAGS_powerpc64= -fPIC
DATADIR= ${PREFIX}/share/irssi
DOCSDIR= ${PREFIX}/share/doc/irssi
OPTIONS_DEFINE= DOCS
post-patch:

10
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

17
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));
}
Loading…
Cancel
Save