mirror of
https://github.com/void-linux/void-packages.git
synced 2025-06-07 07:33:48 +02:00
parent
b0028b3988
commit
a35bb7fbb4
2 changed files with 3 additions and 43 deletions
|
@ -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 <ailin-nemui@users.noreply.github.com>
|
|
||||||
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:
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Template file for 'irssi'
|
# Template file for 'irssi'
|
||||||
pkgname=irssi
|
pkgname=irssi
|
||||||
version=1.2.2
|
version=1.2.3
|
||||||
revision=7
|
revision=1
|
||||||
build_style=gnu-configure
|
build_style=gnu-configure
|
||||||
configure_args="--disable-static --with-proxy --enable-true-color
|
configure_args="--disable-static --with-proxy --enable-true-color
|
||||||
--with-otr --with-perl=module"
|
--with-otr --with-perl=module"
|
||||||
|
@ -15,7 +15,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://www.irssi.org"
|
homepage="https://www.irssi.org"
|
||||||
distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz"
|
distfiles="https://github.com/irssi/irssi/releases/download/${version}/irssi-${version}.tar.gz"
|
||||||
checksum=53182861d4d2be6db35fa7e3f0524a64d2a54a374307574dab5f5362bfea563c
|
checksum=29cbb746d7e57591d8fcf799406fb28cb7c2d734bc4288cbb8b4c4e05cf99c25
|
||||||
|
|
||||||
LDFLAGS="-lncursesw"
|
LDFLAGS="-lncursesw"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue