From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A3652158042 for ; Fri, 18 Oct 2024 19:30:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BE659E0844; Fri, 18 Oct 2024 19:30:07 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 5A4C6E0844 for ; Fri, 18 Oct 2024 19:30:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 651653430A4 for ; Fri, 18 Oct 2024 19:30:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CAB3FEA0 for ; Fri, 18 Oct 2024 19:30:04 +0000 (UTC) From: "Arthur Zamarin" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Arthur Zamarin" Message-ID: <1729279741.41ffaf555975bb44a4f6bd8e406e55ef954bedcd.arthurzam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/tmux/files/, app-misc/tmux/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch app-misc/tmux/tmux-3.5-r1.ebuild app-misc/tmux/tmux-3.5.ebuild X-VCS-Directories: app-misc/tmux/ app-misc/tmux/files/ X-VCS-Committer: arthurzam X-VCS-Committer-Name: Arthur Zamarin X-VCS-Revision: 41ffaf555975bb44a4f6bd8e406e55ef954bedcd X-VCS-Branch: master Date: Fri, 18 Oct 2024 19:30:04 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: a7e9b694-b1c5-4b17-abaf-de101c44590f X-Archives-Hash: d55629de86d783b64724c78b29b5014b commit: 41ffaf555975bb44a4f6bd8e406e55ef954bedcd Author: Arthur Zamarin gentoo org> AuthorDate: Fri Oct 18 19:29:01 2024 +0000 Commit: Arthur Zamarin gentoo org> CommitDate: Fri Oct 18 19:29:01 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41ffaf55 app-misc/tmux: add fix for TERM=xterm Triaged-by: Sam James gentoo.org> Closes: https://bugs.gentoo.org/941713 Signed-off-by: Arthur Zamarin gentoo.org> app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch | 38 ++++++++++++++++++++++ .../tmux/{tmux-3.5.ebuild => tmux-3.5-r1.ebuild} | 1 + 2 files changed, 39 insertions(+) diff --git a/app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch b/app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch new file mode 100644 index 000000000000..17d56664bcad --- /dev/null +++ b/app-misc/tmux/files/tmux-3.5-fix-xterm-sym.patch @@ -0,0 +1,38 @@ +https://github.com/tmux/tmux/commit/934035db7197d4510b330df8d8963f78e9c8756d + +From: nicm +Date: Mon, 14 Oct 2024 20:26:45 +0000 +Subject: [PATCH] Set ACS flag for REP. Reported by Romain Francoise, GitHub + issue 4182. + +--- a/input.c ++++ b/input.c +@@ -1145,7 +1145,6 @@ input_print(struct input_ctx *ictx) + ictx->cell.cell.attr |= GRID_ATTR_CHARSET; + else + ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET; +- + utf8_set(&ictx->cell.cell.data, ictx->ch); + screen_write_collect_add(sctx, &ictx->cell.cell); + +@@ -1349,7 +1348,7 @@ input_csi_dispatch(struct input_ctx *ictx) + struct screen_write_ctx *sctx = &ictx->ctx; + struct screen *s = sctx->s; + struct input_table_entry *entry; +- int i, n, m, ek; ++ int i, n, m, ek, set; + u_int cx, bg = ictx->cell.cell.bg; + + if (ictx->flags & INPUT_DISCARD) +@@ -1592,6 +1591,11 @@ input_csi_dispatch(struct input_ctx *ictx) + if (~ictx->flags & INPUT_LAST) + break; + ++ set = ictx->cell.set == 0 ? ictx->cell.g0set : ictx->cell.g1set; ++ if (set == 1) ++ ictx->cell.cell.attr |= GRID_ATTR_CHARSET; ++ else ++ ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET; + utf8_copy(&ictx->cell.cell.data, &ictx->last); + for (i = 0; i < n; i++) + screen_write_collect_add(sctx, &ictx->cell.cell); diff --git a/app-misc/tmux/tmux-3.5.ebuild b/app-misc/tmux/tmux-3.5-r1.ebuild similarity index 97% rename from app-misc/tmux/tmux-3.5.ebuild rename to app-misc/tmux/tmux-3.5-r1.ebuild index 4678ac49407e..1be48e6b4f30 100644 --- a/app-misc/tmux/tmux-3.5.ebuild +++ b/app-misc/tmux/tmux-3.5-r1.ebuild @@ -54,6 +54,7 @@ DOCS=( CHANGES README ) PATCHES=( "${FILESDIR}"/${PN}-2.4-flags.patch + "${FILESDIR}"/${P}-fix-xterm-sym.patch # merged upstream ) src_prepare() {