From 2709564b550bfad59d1ce851da000aeb938dcbcf Mon Sep 17 00:00:00 2001 From: Anthony Iliopoulos Date: Sun, 11 Apr 2021 13:19:56 +0200 Subject: [PATCH] irssi: update to 1.2.3. --- srcpkgs/irssi/patches/glib-2-63.patch | 40 --------------------------- srcpkgs/irssi/template | 6 ++-- 2 files changed, 3 insertions(+), 43 deletions(-) delete mode 100644 srcpkgs/irssi/patches/glib-2-63.patch diff --git a/srcpkgs/irssi/patches/glib-2-63.patch b/srcpkgs/irssi/patches/glib-2-63.patch deleted file mode 100644 index 669b04d9a6a3..000000000000 --- a/srcpkgs/irssi/patches/glib-2-63.patch +++ /dev/null @@ -1,40 +0,0 @@ -https://github.com/irssi/irssi/releases/download/1.2.2/glib-2-63.patch - -From a0544571a80196e5b7705f56e6e2cbcdf7b4d80e Mon Sep 17 00:00:00 2001 -From: ailin-nemui -Date: Thu, 23 Apr 2020 21:45:15 +0200 -Subject: [PATCH] manually handle NUL unicode in g_utf8_get_next_char_validated - -A change in GLib 2.63 broke some assumptions in Irssi that the null-byte -NUL / U+0000 is a valid Unicode character. This would occur when the -user types Ctrl+Space. As a result, the input loop never manages to -process the NUL-byte (and any other user input that follows, ever). - -This patch adds a manual check that properly advances the input loop if -GLib returns -2 (incomplete character) despite the length being positive -and a NUL is in first position. - -Fixes #1180 -https://gitlab.gnome.org/GNOME/glib/-/merge_requests/967 -https://gitlab.gnome.org/GNOME/glib/-/issues/2093 ---- - src/fe-text/term-terminfo.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/fe-text/term-terminfo.c b/src/fe-text/term-terminfo.c -index 5235f72d2..78496a64f 100644 ---- src/fe-text/term-terminfo.c -+++ src/fe-text/term-terminfo.c -@@ -672,7 +672,11 @@ void term_stop(void) - - static int input_utf8(const unsigned char *buffer, int size, unichar *result) - { -- unichar c = g_utf8_get_char_validated((char *)buffer, size); -+ 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: diff --git a/srcpkgs/irssi/template b/srcpkgs/irssi/template index 4d8df6bfd24f..b47640ec94d9 100644 --- a/srcpkgs/irssi/template +++ b/srcpkgs/irssi/template @@ -1,7 +1,7 @@ # Template file for 'irssi' pkgname=irssi -version=1.2.2 -revision=7 +version=1.2.3 +revision=1 build_style=gnu-configure configure_args="--disable-static --with-proxy --enable-true-color --with-otr --with-perl=module" @@ -15,7 +15,7 @@ maintainer="Orphaned " license="GPL-2.0-or-later" homepage="https://www.irssi.org" distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz" -checksum=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c +checksum=29cbb746d7e57591d8fcf799406fb28cb7c2d734bc4288cbb8b4c4e05cf99c25 LDFLAGS="-lncursesw"