From nobody Fri Dec 01 14:35:05 2023 X-Original-To: dev-commits-ports-main@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 4ShbF61SC5z52h19; Fri, 1 Dec 2023 14:35:06 +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 4ShbF60lhpz3L42; Fri, 1 Dec 2023 14:35:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701441306; 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=XknyyalkjIeDceb9mlYuSVw2vv6Vi0bkRN9fYq/qcHw=; b=GECr14yHIQ8JUKbA68WMVWuoUhdUt4jUCG73BHzU6kXUvcFH1pNOQIoFPkYGNUHcmTajyO BCBu5RTDhB2vtrrpTkrAG6UDDhUucL8XlFXmo/xYyj4KTSy0u4zY31Nk8p1BQcemC9fsx2 sKKaiGDCVh3qNbokQ08LfzE2/+smHf2zRaliD8PY2ZSLv8sGh/w/UksIC2AnaUV6Y5lWR/ Tizw8ISgAkF3u+mROhgFMwo6hXwpfo5fxw2h/2UMZDkZSWJAmmpqWNFawVIIG+7fsKm4nF TPu+8hbCjNJxZ8EU/yaiZrW4xPS/RT33xDV2HH6HPy3FI2888hqRrEEBkhj5qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1701441306; 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=XknyyalkjIeDceb9mlYuSVw2vv6Vi0bkRN9fYq/qcHw=; b=NwllMdnOs1VI6LlWdEGRuA59DEoY3ARsFmFXG4eyRWoadhXnYgLqBILUaNo4IThRe+OqXT gY7789uFFZvOdeigrqgrOJnH3pRq3ZzcsVo45711Ut85coM9kjHNvh0ex84ICFBz8HOePr GwtBIH4mYEYb2DOavfxMDu0uafZ1e668OGpWanfoT5YR8gmJfttZ30QqEcMr79WuRaJD14 Pwn2fXoguivKBy6rin48RM2mhSGYn7MXddR670PAMRoTFhTfDzK3CwcvzCGhTPnHzKFULO 3O13p9zZa7FPlpEFRUh7VATxJJvSOP8O7qZNhAoTThIs7PLIPpF7evG92InpaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1701441306; a=rsa-sha256; cv=none; b=Je5gY0iLgfC8Y6pq/UXqvl85+XVXFbw992gIjfw6VgdGZbZ+7xPClCEsDJqnybrXXmqhQz V1Yg1ICo7Sl2djuXc1e57hD8zQ7hc03V6bpvf3lXnugsLXtBJQx7GpwQ3J4evFyC4KDf4f tIC1PPKGCwc5iZg9xCTGvbEHJ4YH30jEIzcjED9HWOSRgiwr+7Go/LOqIC3V5fn2lSgyQ0 guq7pUfU4C+pMgDrK+1RRyIDVH9NNNfnYnprF3r56KwpMhYvDvs2+K03iZARsAOf/Jpxzf YjkwFqeZLe8ChJ+PBTD9cNlZiEbfQBdTLZsVjfTluU+SsU/RC6AfzSra9TOQcw== 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 4ShbF56wgTzcwt; Fri, 1 Dec 2023 14:35:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3B1EZ51Y061080; Fri, 1 Dec 2023 14:35:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3B1EZ5Ue061077; Fri, 1 Dec 2023 14:35:05 GMT (envelope-from git) Date: Fri, 1 Dec 2023 14:35:05 GMT Message-Id: <202312011435.3B1EZ5Ue061077@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: 9792df1e16be - main - x11/kitty: Fix error with kitty+fish without sudo List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9792df1e16be41a313cc76824bbc3a8bb558d5f1 Auto-Submitted: auto-generated The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=9792df1e16be41a313cc76824bbc3a8bb558d5f1 commit 9792df1e16be41a313cc76824bbc3a8bb558d5f1 Author: Alan Somers AuthorDate: 2023-12-01 14:30:06 +0000 Commit: Nicola Vitale CommitDate: 2023-12-01 14:34:10 +0000 x11/kitty: Fix error with kitty+fish without sudo If a user has fish as shell and sudo is not installed, then kitty prints the following error: type: Could not find 'sudo' test: Expected a combining operator like '-a' at index 5 -n /usr/local/share/kitty/terminfo -a file = ^ Standard input (line 114): and test -n "$TERMINFO" -a "file" = (type -t sudo) ^ in function '__ksi_schedule' in event handler: handler for generic event 'fish_prompt' - Add a patch to fix that error and to tests the presence of the xterm-kitty file in DATADIR - Bump PORTREVISION PR: 275339 --- x11/kitty/Makefile | 4 +++- ...gration_fish_vendor__conf.d_kitty-shell-integration.fish | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 9369483e83c0..f13c8bd2147a 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,7 +1,7 @@ PORTNAME= kitty DISTVERSIONPREFIX= v DISTVERSION= 0.31.0 -PORTREVISION= 0 +PORTREVISION= 1 CATEGORIES= x11 wayland MAINTAINER= nivit@FreeBSD.org @@ -103,6 +103,8 @@ EXTRA_PATCHES= ${PATCHDIR}/extra-patch-kitty_data-types.h post-patch: ${REINPLACE_CMD} -i.bak -e "s:'go':'${GO_CMD}':1" ${WRKSRC}/setup.py + ${REINPLACE_CMD} -i.bak -e "s:%%DATADIR%%:${DATADIR}:1" \ + ${WRKSRC}/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish # For librsync, we need to set header and library path do-build: diff --git a/x11/kitty/files/patch-shell-integration_fish_vendor__conf.d_kitty-shell-integration.fish b/x11/kitty/files/patch-shell-integration_fish_vendor__conf.d_kitty-shell-integration.fish new file mode 100644 index 000000000000..3a6ccbc8db7a --- /dev/null +++ b/x11/kitty/files/patch-shell-integration_fish_vendor__conf.d_kitty-shell-integration.fish @@ -0,0 +1,13 @@ +--- shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish.orig 2023-12-01 13:31:58 UTC ++++ shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish +@@ -111,8 +111,8 @@ function __ksi_schedule --on-event fish_prompt -d "Set + # Note that neither alias nor function is recursive in fish so if the user defines an alias/function + # for sudo it will be clobbered by us, so only install this if sudo is not already function + if not contains "no-sudo" $_ksi +- and test -n "$TERMINFO" -a "file" = (type -t sudo) +- and not test -r "/usr/share/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/78/xterm-kitty" ++ and test -n "$TERMINFO" -a "file" = "(type -t sudo)" ++ and not test -r "%%DATADIR%%/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/x/xterm-kitty" -o -r "/usr/share/terminfo/78/xterm-kitty" + # Ensure terminfo is available in sudo + function sudo + set --local is_sudoedit "n"