diff options
| author | bsiegert <bsiegert@pkgsrc.org> | 2020-05-26 18:26:06 +0000 |
|---|---|---|
| committer | bsiegert <bsiegert@pkgsrc.org> | 2020-05-26 18:26:06 +0000 |
| commit | f85325b2fa3cc0f71d0c4d1b27617bd9749a809e (patch) | |
| tree | aa17f9c2043cdb515d681dc2384c07185fa02953 | |
| parent | adc062596b4acf40b243133dfe653c79c7af0e2b (diff) | |
| download | pkgsrc-f85325b2fa3cc0f71d0c4d1b27617bd9749a809e.tar.gz | |
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
| -rw-r--r-- | chat/irssi/Makefile | 4 | ||||
| -rw-r--r-- | chat/irssi/distinfo | 3 | ||||
| -rw-r--r-- | chat/irssi/patches/patch-src_fe-text_term-terminfo.c | 18 |
3 files changed, 22 insertions, 3 deletions
diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile index bcb58923b3d..d74f77257cb 100644 --- a/chat/irssi/Makefile +++ b/chat/irssi/Makefile @@ -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} diff --git a/chat/irssi/distinfo b/chat/irssi/distinfo index 5b38aa92476..6ce29a561ae 100644 --- a/chat/irssi/distinfo +++ b/chat/irssi/distinfo @@ -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 diff --git a/chat/irssi/patches/patch-src_fe-text_term-terminfo.c b/chat/irssi/patches/patch-src_fe-text_term-terminfo.c new file mode 100644 index 00000000000..af93f61f4a4 --- /dev/null +++ b/chat/irssi/patches/patch-src_fe-text_term-terminfo.c @@ -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 */ |