On Sun, Mar 13, 2016 at 11:07:34PM +0100, Joerg Jung wrote:
> On Sun, Mar 13, 2016 at 03:02:24PM +0000, Stuart Henderson wrote:
> > On 2016/03/12 19:18, Florian Stinglmayr wrote:
> > > This is also fixed in the patch below for irssi-otr.
> > >
> > > Also +1 for the irssi patch.
> >
> > irssi-icb, irssi-otr: fixes committed.
> >
> > irssi-xmpp: jung, could you take a look at this please?
>
> Unfortunately I will be very busy this week :(
> I will try to look into this by the end of the week.
>
> > https://github.com/cdidier/irssi-xmpp adds the ABI check,
> > it looks like it will also be affected by the privmsg-to-self
> > API change.
Please find below a diff which switches irssi-xmpp to the most recent
GH_COMMIT as of today, which includes a lot of fixes. config_mk patch is
no longer needed with this and as mentioned above ABI check is also
already in. I also queried upstream for a new release (last 0.52 was
back in 2012).
I tested this with both irssi-0.8.17 and 0.8.18 (using the diff posted
earlier in this thread) and it seems to work fine.
What is the "privmsg-to-self" API change issue about exactly? /query or
/msg to my own <jid>/resource seems to work and does not crash or
something.
Though, I'm unsure about the DISTNAME and chosen a Debian style name,
better suggestions are welcome.
Other than that, OKs?
Regards,
Joerg
Index: Makefile
===================================================================
RCS file: /cvs/ports/net/irssi-xmpp/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile 29 Dec 2015 22:45:48 -0000 1.6
+++ Makefile 17 Mar 2016 21:52:15 -0000
@@ -4,8 +4,11 @@ SHARED_ONLY= Yes
COMMENT= XMPP plugin for irssi
-DISTNAME= irssi-xmpp-0.52
-REVISION = 3
+DISTNAME= irssi-xmpp-0.52+git20160317
+
+GH_ACCOUNT = cdidier
+GH_PROJECT = irssi-xmpp
+GH_COMMIT = 55cc27bd8d60a5c835050f654e80deb1afe36986
CATEGORIES= net
@@ -17,8 +20,6 @@ MAINTAINER = Joerg Jung <jung@openbsd.o
PERMIT_PACKAGE_CDROM= Yes
WANTLIB= glib-2.0 idn loudmouth-1
-
-MASTER_SITES= ${HOMEPAGE}files/
MODULES= devel/gettext
Index: distinfo
===================================================================
RCS file: /cvs/ports/net/irssi-xmpp/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 1 Nov 2012 14:41:03 -0000 1.1.1.1
+++ distinfo 17 Mar 2016 21:52:15 -0000
@@ -1,2 +1,2 @@
-SHA256 (irssi-xmpp-0.52.tar.gz) = xjl14FYufsahtoy2B4KbOTPsgiqkqETD1tzPFvEQ29w=
-SIZE (irssi-xmpp-0.52.tar.gz) = 68105
+SHA256 (irssi-xmpp-0.52+git20160317.tar.gz) =
f3wg2WnU0DudiP54kBc6qkGcfyHXAFgT4VGgPcvXsZY=
+SIZE (irssi-xmpp-0.52+git20160317.tar.gz) = 65589
Index: patches/patch-config_mk
===================================================================
RCS file: patches/patch-config_mk
diff -N patches/patch-config_mk
--- patches/patch-config_mk 1 Nov 2012 14:41:03 -0000 1.1.1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$OpenBSD: patch-config_mk,v 1.1.1.1 2012/11/01 14:41:03 zinke Exp $
---- config.mk.orig Wed Oct 31 12:27:44 2012
-+++ config.mk Wed Oct 31 12:30:55 2012
-@@ -22,11 +22,11 @@ INCS = ${LIB_INCS} \
- LIBS = ${LIB_LIBS}
-
- # flags
--CFLAGS = -fPIC -std=c99 -DUOFF_T_LONG
--LDFLAGS = -shared
-+CFLAGS += -fPIC -std=c99 -DUOFF_T_LONG
-+LDFLAGS += -shared
-
- # debug
- #CFLAGS += -W -g -Wall -Wno-unused-parameter
-
- # compiler and linker
--CC = cc
-+CC ?= cc
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/net/irssi-xmpp/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 1 Nov 2012 14:41:03 -0000 1.1.1.1
+++ pkg/PLIST 17 Mar 2016 21:52:15 -0000
@@ -8,6 +8,7 @@ share/doc/irssi/irssi-xmpp/GENERAL
share/doc/irssi/irssi-xmpp/MUC
share/doc/irssi/irssi-xmpp/STARTUP
share/doc/irssi/irssi-xmpp/XEP
+share/irssi/help/presence
share/irssi/help/roster
share/irssi/help/xmppconnect
share/irssi/help/xmppserver
