From nobody Tue Apr 12 13:01:57 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0EAC71A9F565; Tue, 12 Apr 2022 13:01:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kd5Td6nw3z4rK2; Tue, 12 Apr 2022 13:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649768518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iWUDjYwy78NgmOqKHVitqn4NNd5yKJaADxXDME5OtPY=; b=P9/wTt5/noZ0OZH3A/9vSffkzVRgY0yAdOhcU9Nlk9fo7HhA7i7ABjzAAyM8lq+FILltnY kLRaHsY8+0yK2B72BBCkpe17ZxjnWL7LqKAmpZQ1RYY5/A3mb/479zbNu12lyRramYKcu8 kNOVDhZUB7Wge9Z/iy+IVeIERzB67GcqyF/DFaYzJL8wUVVCIn9TW+SvzJb2onFE8NxJBs N2ajXbVuK+oHi06gXCkxPnTOIPvBW7cvaa2ColXMtvAWZEGfC5hlXzJD892jkoOlTeibXF 3BojPuCGA2UN62IbwDvRTfeQj6XIL/arVKaEA0It1Jqs0GQWscUTx+VDvD2OBA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C94CD17A48; Tue, 12 Apr 2022 13:01:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23CD1vHN016642; Tue, 12 Apr 2022 13:01:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CD1vv5016641; Tue, 12 Apr 2022 13:01:57 GMT (envelope-from git) Date: Tue, 12 Apr 2022 13:01:57 GMT Message-Id: <202204121301.23CD1vv5016641@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: fa4b531894f8 - main - net-im/gomuks: Fix runtime within a tmux session List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa4b531894f88d21307b3e8640b197fbe99038ec Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649768518; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iWUDjYwy78NgmOqKHVitqn4NNd5yKJaADxXDME5OtPY=; b=Din9zDWMNKCsDqzPHz5Rc/IgUNlW9dvIv5PHt1rqsT/3rqNs7u+dIKtJmV/UKq4mDc2Fw2 4bEkawAsoE5X5Jlo5zl8ZyXU7GhfHIaBcxJqfQqLrpYMaczcD/styxPWaSJyNn5MWh6RLZ u4wZNGM4qbsvjlGvq1daK03oD0DOlxqIyrwjNf0+0gxmDKex2rvjypKKbER8uXLuiymgPM mUz+fOQdnill3L+lRVrEw9lGzlD3JixNgPD2nZnvCl4S0topaHZgB9olgzoVX4fgev1h/u ws5KvTgkVPETRjJwdirfGAdnbXJhAW3+3Q3bi+ejSR9SWvFJZ43Ct52eKh6gNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649768518; a=rsa-sha256; cv=none; b=l5PfIhWsNRchsNzSDEz6a+GYcaFb9AOCYqJQNRCYVoByd9QT3jfOUinU2CH1MvIJH7dqP7 lnWInpPRZiuzl8ew7+rxHmWPC2AWFF0+orXV5T1GTzMA6RMH/hiNMhx2DkkKyXRqpN9mY4 O5hDv+B29BRal2h1xOOaNezbZANv8Ak+9HLEVMCJT/1wWfACXKYJYZfr+05vxwOmdGz4H9 U2KHXYsWoLGW7pIr1s6wqd/iTTkcok4JCqPhJ+6kdoKhpAhtVtsHA4MclD/4/VhK2/K105 GhKz64DBW5jaT2anitaAdOTmhZz7IZUhzV7erP0wQWnmt7FoVewjD860vPxEJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=fa4b531894f88d21307b3e8640b197fbe99038ec commit fa4b531894f88d21307b3e8640b197fbe99038ec Author: Emanuel Haupt AuthorDate: 2022-04-12 13:01:37 +0000 Commit: Emanuel Haupt CommitDate: 2022-04-12 13:01:54 +0000 net-im/gomuks: Fix runtime within a tmux session An upstream change [1] made it a requirement to have `infocmp` installed for parsing terminal capabilities within a tmux session. While ncurses from base works perfectly fine with gomuks, base does not ship with `infocmp` thus creating a hard dependency to devel/ncurses. Patch port to revert upstream change. [1] https://github.com/tulir/tcell/commit/aef08b141333dfbaad8a7f0c187d7ab7d2b203c9 https://github.com/tulir/tcell/blob/bb9a2b9b1937b1ede6a00450b2650b7b0befe2fc/terminfo/dynamic/dynamic.go#L121 PR: 263213 Upstream issue: https://github.com/tulir/gomuks/issues/363 Reported by: parakleta@darkreality.org --- net-im/gomuks/Makefile | 2 +- .../files/patch-vendor_maunium.net_go_tcell_tscreen.go | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/net-im/gomuks/Makefile b/net-im/gomuks/Makefile index 126fa4b15e67..c78dcbc0e549 100644 --- a/net-im/gomuks/Makefile +++ b/net-im/gomuks/Makefile @@ -3,7 +3,7 @@ PORTNAME= gomuks PORTVERSION= 0.2.4 DISTVERSIONPREFIX= v -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= net-im MAINTAINER= ehaupt@FreeBSD.org diff --git a/net-im/gomuks/files/patch-vendor_maunium.net_go_tcell_tscreen.go b/net-im/gomuks/files/patch-vendor_maunium.net_go_tcell_tscreen.go new file mode 100644 index 000000000000..a556e946df72 --- /dev/null +++ b/net-im/gomuks/files/patch-vendor_maunium.net_go_tcell_tscreen.go @@ -0,0 +1,18 @@ +--- vendor/maunium.net/go/tcell/tscreen.go.orig 2022-04-12 11:45:41 UTC ++++ vendor/maunium.net/go/tcell/tscreen.go +@@ -50,13 +50,9 @@ const ( + // $COLUMNS environment variables can be set to the actual window size, + // otherwise defaults taken from the terminal database are used. + func NewTerminfoScreen() (Screen, error) { +- term := os.Getenv("TERM") +- if len(term) >= 6 && term[:6] == "screen" && len(os.Getenv("TMUX")) > 0 { +- term = "tmux" +- } +- ti, e := terminfo.LookupTerminfo(term) ++ ti, e := terminfo.LookupTerminfo(os.Getenv("TERM")) + if e != nil { +- ti, e = loadDynamicTerminfo(term) ++ ti, e = loadDynamicTerminfo(os.Getenv("TERM")) + if e != nil { + return nil, e + }