diff options
| author | Tim Biermann <tbier@posteo.de> | 2021-04-12 18:32:50 +0000 |
|---|---|---|
| committer | Tim Biermann <tbier@posteo.de> | 2021-04-12 18:32:50 +0000 |
| commit | 9dd6f92fbbf0b997e5a78540f18b9e937c6fe4ca (patch) | |
| tree | e73ebe7dde4e958216cf28b210d199aab00323e8 /irssi | |
| parent | c3f5bef55cabffc3fd70268e7d9b2b874448e1ba (diff) | |
| download | opt-9dd6f92fbbf0b997e5a78540f18b9e937c6fe4ca.tar.gz opt-9dd6f92fbbf0b997e5a78540f18b9e937c6fe4ca.tar.xz | |
irssi: 1.2.2 -> 1.2.3
Diffstat (limited to 'irssi')
| -rw-r--r-- | irssi/.signature | 7 | ||||
| -rw-r--r-- | irssi/Pkgfile | 9 | ||||
| -rw-r--r-- | irssi/glib-2-63.patch | 38 |
3 files changed, 6 insertions, 48 deletions
diff --git a/irssi/.signature b/irssi/.signature index 492f3eb5a..4fce6ae70 100644 --- a/irssi/.signature +++ b/irssi/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/opt.pub -RWSE3ohX2g5d/eIe1cNJ2vvDRBhQYS7VXY8JbWfNpf0HUmlPjAwFx5UTa5FERc3a1myY7V/VhsWvNi6kGL+Ijnlfcvwb5UbWMwc= -SHA256 (Pkgfile) = 00a1c816cc14e6d399a4117ffddab002a6598552169206af3b566a6cc73d859e +RWSE3ohX2g5d/QuxpTGU2lP0fNP7rWsubPdVirjcVAcawJPUqyq355SzKskT3HP1ZLecSlhZEAdYDWDzOSiYqXVWrIPAYYdnWg8= +SHA256 (Pkgfile) = 284dbe863d36161c71ccf084a7a488e3a2fce3b3d8fb8ed80543bc2fa373d3cb SHA256 (.footprint) = f0bfabe52acde2f43d7c0ce0b950656077214a5f42e55bf177ba0c5c3114713e -SHA256 (irssi-1.2.2.tar.xz) = 6727060c918568ba2ff4295ad736128dba0b995d7b20491bca11f593bd857578 -SHA256 (glib-2-63.patch) = 6a899083058d83f4a2d134977202afebea845641b346303fde563bf6205cef8e +SHA256 (irssi-1.2.3.tar.xz) = a647bfefed14d2221fa77b6edac594934dc672c4a560417b1abcbbc6b88d769f diff --git a/irssi/Pkgfile b/irssi/Pkgfile index 703864760..eb0cf5977 100644 --- a/irssi/Pkgfile +++ b/irssi/Pkgfile @@ -4,16 +4,13 @@ # Depends on: glib name=irssi -version=1.2.2 -release=2 -source=(https://github.com/irssi-import/irssi/releases/download/$version/$name-$version.tar.xz - glib-2-63.patch) +version=1.2.3 +release=1 +source=(https://github.com/irssi-import/irssi/releases/download/$version/$name-$version.tar.xz) build () { cd $name-$version - patch -p1 -i $SRC/glib-2-63.patch - export CFLAGS+=" -Wno-deprecated-declarations" ./configure \ diff --git a/irssi/glib-2-63.patch b/irssi/glib-2-63.patch deleted file mode 100644 index 63d26958b..000000000 --- a/irssi/glib-2-63.patch +++ /dev/null @@ -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: |