mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-08-05 17:07:49 +00:00
irssi: update to 1.2.3
This commit is contained in:
parent
40e1be9482
commit
92018b05ea
@ -2,8 +2,8 @@
|
|||||||
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
# Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv)
|
||||||
|
|
||||||
PKG_NAME="irssi"
|
PKG_NAME="irssi"
|
||||||
PKG_VERSION="1.2.2"
|
PKG_VERSION="1.2.3"
|
||||||
PKG_SHA256="6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578"
|
PKG_SHA256="a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f"
|
||||||
PKG_LICENSE="GPL"
|
PKG_LICENSE="GPL"
|
||||||
PKG_SITE="http://www.irssi.org/"
|
PKG_SITE="http://www.irssi.org/"
|
||||||
PKG_URL="https://github.com/irssi/irssi/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
PKG_URL="https://github.com/irssi/irssi/releases/download/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.xz"
|
||||||
|
@ -1,38 +0,0 @@
|
|||||||
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
|
|
||||||
--- a/src/fe-text/term-terminfo.c
|
|
||||||
+++ b/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:
|
|
Loading…
x
Reference in New Issue
Block a user