From 4713776af4f8c28c11b9be3aab36203c9cc5dbbb Mon Sep 17 00:00:00 2001 From: Mikle Kolyada Date: Sun, 16 May 2021 11:26:25 +0300 Subject: net-irc/irssi: Drop old Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Mikle Kolyada --- net-irc/irssi/Manifest | 1 - .../irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch | 38 ------------- net-irc/irssi/irssi-1.2.2-r1.ebuild | 66 ---------------------- 3 files changed, 105 deletions(-) delete mode 100644 net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch delete mode 100644 net-irc/irssi/irssi-1.2.2-r1.ebuild (limited to 'net-irc') diff --git a/net-irc/irssi/Manifest b/net-irc/irssi/Manifest index bb8944a93b0b..dc5612c9c0f4 100644 --- a/net-irc/irssi/Manifest +++ b/net-irc/irssi/Manifest @@ -1,2 +1 @@ -DIST irssi-1.2.2.tar.xz 1140844 BLAKE2B c1758828285c3f3210d6920455382e52279587280ecdc4ba7d73562c164ebd6618b1bb32d387439be2696f948044f66eb73b78ed2b0635286f8c3d93530167f2 SHA512 5444ac102ff9ad3a6399a47c967d138e181330dd226eac68886d35fee4ad455932b9306a367bee3478095158e41ba67fb46deb8f0a33512046b9b83bae37c610 DIST irssi-1.2.3.tar.xz 1145292 BLAKE2B 7b2b7cb8d1533a06ad3cd5e0b2e45bba636cf19d26c69e19fc7e9408313f80d80a26ff2bf5f21a8763d8adec722bb33f6b076a863e6a55e178a814a3e79c9db7 SHA512 826b7bfd86a54647f2d344b6c461e1118b7382fb1637cf33c395af41a9a4ca5d8a794a415f0f0737178968cf2463bb46a0e7b7fd7014c968668b16183e0644bc diff --git a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch b/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch deleted file mode 100644 index 63d26958b7bf..000000000000 --- a/net-irc/irssi/files/irssi-1.2.2-glib-2.63_NUL_unicode_fix.patch +++ /dev/null @@ -1,38 +0,0 @@ -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 ---- 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: diff --git a/net-irc/irssi/irssi-1.2.2-r1.ebuild b/net-irc/irssi/irssi-1.2.2-r1.ebuild deleted file mode 100644 index 53254a9175ca..000000000000 --- a/net-irc/irssi/irssi-1.2.2-r1.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -GENTOO_DEPEND_ON_PERL="no" - -inherit perl-module - -# Keep for _rc compability -MY_P="${P/_/-}" - -DESCRIPTION="A modular textUI IRC client with IPv6 support" -HOMEPAGE="https://irssi.org/" -SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_/-}/${MY_P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="otr +perl selinux socks5 +proxy" - -COMMON_DEPEND=" - sys-libs/ncurses:0= - >=dev-libs/glib-2.6.0 - dev-libs/openssl:= - otr? ( >=dev-libs/libgcrypt-1.2.0:0= - >=net-libs/libotr-4.1.0 ) - perl? ( dev-lang/perl:= ) - socks5? ( >=net-proxy/dante-1.1.18 )" - -DEPEND=" - ${COMMON_DEPEND} - virtual/pkgconfig" - -RDEPEND=" - ${COMMON_DEPEND} - selinux? ( sec-policy/selinux-irc )" - -RESTRICT="test" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( - "${FILESDIR}/${PN}-1.2.2-glib-2.63_NUL_unicode_fix.patch" #746704 -) - -src_configure() { - # Disable automagic dependency on dev-libs/libutf8proc (bug #677804) - export ac_cv_lib_utf8proc_utf8proc_version=no - - local myeconfargs=( - --with-perl-lib=vendor - --enable-true-color - $(use_with otr) - $(use_with proxy) - $(use_with perl) - $(use_with socks5 socks) - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - use perl && perl_delete_localpod - rm -f "${ED}"/usr/$(get_libdir)/irssi/modules/*.{a,la} || die -} -- cgit v1.2.3-65-gdbad