Received: by mail.netbsd.org (Postfix, from userid 605) id 531C784E9E; Tue, 26 May 2020 18:26:08 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D169884DD0 for ; Tue, 26 May 2020 18:26:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id zfiKcukvZvEk for ; Tue, 26 May 2020 18:26:07 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 465E484CCD for ; Tue, 26 May 2020 18:26:07 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 3FFC1FB27; Tue, 26 May 2020 18:26:07 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1590517567123190" MIME-Version: 1.0 Date: Tue, 26 May 2020 18:26:07 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2020Q1] pkgsrc/chat/irssi To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20200526182607.3FFC1FB27@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1590517567123190 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Tue May 26 18:26:07 UTC 2020 Modified Files: pkgsrc/chat/irssi [pkgsrc-2020Q1]: Makefile distinfo Added Files: pkgsrc/chat/irssi/patches [pkgsrc-2020Q1]: patch-src_fe-text_term-terminfo.c Log Message: Pullup ticket #6202 - requested by maya chat/irssi: bugfix Revisions pulled up: - chat/irssi/Makefile 1.98-1.99 - chat/irssi/distinfo 1.52 - chat/irssi/patches/patch-src_fe-text_term-terminfo.c 1.1 --- Module Name: pkgsrc Committed By: maya Date: Mon May 18 18:38:31 UTC 2020 Modified Files: pkgsrc/chat/irssi: Makefile distinfo Added Files: pkgsrc/chat/irssi/patches: patch-src_fe-text_term-terminfo.c Log Message: irssi: grab pull request from upstream fixing hangs with ctrl+space bump pkgrevision --- Module Name: pkgsrc Committed By: maya Date: Mon May 18 19:15:38 UTC 2020 Modified Files: pkgsrc/chat/irssi: Makefile Log Message: irssi: remove random debug leftover To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.97.2.1 pkgsrc/chat/irssi/Makefile cvs rdiff -u -r1.51 -r1.51.4.1 pkgsrc/chat/irssi/distinfo cvs rdiff -u -r0 -r1.1.2.2 \ pkgsrc/chat/irssi/patches/patch-src_fe-text_term-terminfo.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1590517567123190 Content-Disposition: inline Content-Length: 2305 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/chat/irssi/Makefile diff -u pkgsrc/chat/irssi/Makefile:1.97 pkgsrc/chat/irssi/Makefile:1.97.2.1 --- pkgsrc/chat/irssi/Makefile:1.97 Sun Mar 8 16:48:56 2020 +++ pkgsrc/chat/irssi/Makefile Tue May 26 18:26:06 2020 @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.97 2020/03/08 16:48:56 wiz Exp $ +# $NetBSD: Makefile,v 1.97.2.1 2020/05/26 18:26:06 bsiegert Exp $ DISTNAME= ${IRSSI_DISTNAME} -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= chat EXTRACT_SUFX= ${IRSSI_EXTRACT_SUFX} Index: pkgsrc/chat/irssi/distinfo diff -u pkgsrc/chat/irssi/distinfo:1.51 pkgsrc/chat/irssi/distinfo:1.51.4.1 --- pkgsrc/chat/irssi/distinfo:1.51 Sat Aug 31 10:04:26 2019 +++ pkgsrc/chat/irssi/distinfo Tue May 26 18:26:06 2020 @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.51 2019/08/31 10:04:26 nia Exp $ +$NetBSD: distinfo,v 1.51.4.1 2020/05/26 18:26:06 bsiegert Exp $ SHA1 (irssi-1.2.2.tar.gz) = 1004f6adcd949c6ab76bff5abe210521c8af4fd7 RMD160 (irssi-1.2.2.tar.gz) = 49a8681a4a3495e441d8b516304477bdb4d9aa7c SHA512 (irssi-1.2.2.tar.gz) = 708dd72685f89ba5da155b7276addcb3758a000f633c71a9bee88c84585f1b5f69872696c7d107699edd16cf964e0a046fc13fecc0384505c11258ec16ab3342 Size (irssi-1.2.2.tar.gz) = 1843879 bytes SHA1 (patch-ad) = 8cb41612afcd6088b869235166da9a6eb37e6ec7 +SHA1 (patch-src_fe-text_term-terminfo.c) = 3ebf09dfde3fa01c4f53862e126fe13f082d450c Added files: Index: pkgsrc/chat/irssi/patches/patch-src_fe-text_term-terminfo.c diff -u /dev/null pkgsrc/chat/irssi/patches/patch-src_fe-text_term-terminfo.c:1.1.2.2 --- /dev/null Tue May 26 18:26:07 2020 +++ pkgsrc/chat/irssi/patches/patch-src_fe-text_term-terminfo.c Tue May 26 18:26:07 2020 @@ -0,0 +1,18 @@ +$NetBSD: patch-src_fe-text_term-terminfo.c,v 1.1.2.2 2020/05/26 18:26:07 bsiegert Exp $ + +Fix hang when pressing ctrl+space. +From https://github.com/irssi/irssi/issues/1180 + +--- src/fe-text/term-terminfo.c.orig 2019-08-29 13:48:46.000000000 +0000 ++++ src/fe-text/term-terminfo.c +@@ -674,6 +674,10 @@ static int input_utf8(const unsigned cha + { + unichar c = g_utf8_get_char_validated((char *)buffer, size); + ++ /* GLib >= 2.63 do not accept Unicode NUL anymore */ ++ if (c == (unichar) -2 && *buffer == 0 && size > 0) ++ c = 0; ++ + switch (c) { + case (unichar)-1: + /* not UTF8 - fallback to 8bit ascii */ --_----------=_1590517567123190--