Le Thu, Jun 16, 2022 at 09:43:42AM +0100, Stuart Henderson a écrit : > On 2022/06/16 16:11, Lauri Tirkkonen wrote: > > upstream has removed that file, shipping a pkg-config file instead. Not sure > > what to do with this; irssi-icb seems like it hasn't been maintained for a > > while, and I suspect there might have been other changes in irssi's plugin > > support that require some effort. > > irssi-icb is really a blocker for updating this in ports.
the new below diff works for me in very light testing - extensive testing welcome now :D
Index: Makefile =================================================================== RCS file: /cvs/ports/net/irssi-icb/Makefile,v retrieving revision 1.46 diff -u -r1.46 Makefile --- Makefile 11 Mar 2022 19:46:10 -0000 1.46 +++ Makefile 16 Jun 2022 08:51:07 -0000 @@ -5,7 +5,7 @@ GH_COMMIT= c4e2ea8939b5b75d1941ebe3335475482d218838 DISTNAME= irssi-icb-0.17 -REVISION= 1 +REVISION= 2 CATEGORIES= net Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_ac 16 Jun 2022 08:51:07 -0000 @@ -0,0 +1,12 @@ +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -33,7 +33,7 @@ IRSSI_INCLUDE=`cd $with_irssi; pwd` + + AC_SUBST(IRSSI_INCLUDE) + +-AS_IF([test ! -f "$IRSSI_INCLUDE/irssi-config"], ++AS_IF([test ! -f "$IRSSI_INCLUDE/irssi-config.h"], + [AC_ERROR(Not irssi directory: $IRSSI_INCLUDE)] + ) + Index: patches/patch-src_core_icb-protocol_c =================================================================== RCS file: patches/patch-src_core_icb-protocol_c diff -N patches/patch-src_core_icb-protocol_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_core_icb-protocol_c 16 Jun 2022 08:51:07 -0000 @@ -0,0 +1,14 @@ +Index: src/core/icb-protocol.c +--- src/core/icb-protocol.c.orig ++++ src/core/icb-protocol.c +@@ -340,8 +340,8 @@ static void sig_server_connected(ICB_SERVER_REC *serve + return; + + server->readtag = +- g_input_add(net_sendbuffer_handle(server->handle), +- G_INPUT_READ, ++ i_input_add(net_sendbuffer_handle(server->handle), ++ I_INPUT_READ, + (GInputFunction) icb_parse_incoming, server); + } +
