From nobody Tue Apr 12 13:06:32 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 7A9F35D08F8; Tue, 12 Apr 2022 13:06:32 +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 4Kd5Zw2zXMz4rlx; Tue, 12 Apr 2022 13:06:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649768792; 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=T5Is6hLiocFIt9CTGFcKMDwPrDlyazlv9OFNnfkTMNM=; b=bIqlcIX+HFMfMPhzdaAv/fLuemlaQXEAB0OEVBqSt7RxPPin9Ge01TXW/CLPwDg1hcsI3e K3WMm2Lr+eFzBDLqkylYEB2YmJUADmS49WJwg++tNr47FY0yWEvK/vKQMYoOm/D+kNztNH Psl8jszVkS+hBHdSHr3FGlnFG+G/eU/TSsIGm5QR6KP+DWF1oxFi4FLqtICAJRMn32dtIU SEJsPCR9f/5HXCBm5oAktWlFPrGVwfk+tIDkMIpiazqPeljB+cpTVnesRbvom5yUpbOoMX gx53JjwtEulsp+47o+1/eyTDirZZOlfxAKs59ouLCrb+gYATphvQS4Z2fDvJvA== 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 4219617FE0; Tue, 12 Apr 2022 13:06:32 +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 23CD6Wuw017101; Tue, 12 Apr 2022 13:06:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23CD6Wls017100; Tue, 12 Apr 2022 13:06:32 GMT (envelope-from git) Date: Tue, 12 Apr 2022 13:06:32 GMT Message-Id: <202204121306.23CD6Wls017100@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Emanuel Haupt Subject: git: b5a08339f852 - 2022Q2 - 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/2022Q2 X-Git-Reftype: branch X-Git-Commit: b5a08339f85294c93af1af5abeb68c4074e2b1d8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649768792; 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=T5Is6hLiocFIt9CTGFcKMDwPrDlyazlv9OFNnfkTMNM=; b=LERJE3/9Fw33NlAmNB/z9XV7h2OhFZ0XvzQFzLnoAGdI8IefSv7/dTczR1Wq7hCQUIBtMf JUlt2h8rWFRBvtla06VUjeCLmsRU7mmaQxfeJ8EeB5nz5fFXPxxdXmKq/Uam+WkddPgFjW uX+DA4ACsP+Hs0q9Qc9K7zDiPjp8QNYQeVcYAQ5+x76nT8cFU78KAqwpfkmqEyZKCQLjou 3FpXEyjxS38ylPdxTfVZisEnXcdhQ/rb1VBrZqGNVa6QAgZPx6uHWVL/XOH3nQmlXC0gzH SJn8iTnqLndCNnOMmGUIAPttMUiz7u7JKaWiI3eIN/r5PD1KqDAU5gYIzgIItw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649768792; a=rsa-sha256; cv=none; b=cxfBWujBp23htE8p8rkLAYPkPsTi6tdQs/qxVwQdKrafVZQ/cFHXXu4eYd47bTVJSj2yCo Dot1sVYglqZ7gEMbT6lNU7/8AAuAq+P+zEIxohK32FvboRnCm3FFUag/rsxl6jTRJol2Mn 05fP4Q0ylNrpCl2pumC1hRSCNo17/iPdnqUSFMDVKoZfsPKA5A/Z3P02ZmCDx07+a0uarb rsDmkcyejY4E9H24aSPCrnCFVpreE10E3iyXsyBsMVatE4h7rsczMkClI1+DwaIwxjhoFT mG8sDSLtuM6NcGDgvJ/TR0OE73h6Uh7HVwpwY6/lK5zgWZHl1ggBvTRkVPlO8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q2 has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=b5a08339f85294c93af1af5abeb68c4074e2b1d8 commit b5a08339f85294c93af1af5abeb68c4074e2b1d8 Author: Emanuel Haupt AuthorDate: 2022-04-12 13:01:37 +0000 Commit: Emanuel Haupt CommitDate: 2022-04-12 13:06:25 +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 (cherry picked from commit fa4b531894f88d21307b3e8640b197fbe99038ec) --- 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 + }