From nobody Thu Sep 08 10:48:04 2022 X-Original-To: dev-commits-ports-branches@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 4MNbSN6l88z4bp7c; Thu, 8 Sep 2022 10:48:04 +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 4MNbSN6G3Hz3yvK; Thu, 8 Sep 2022 10:48:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662634084; 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=Tk9a1bQUqdXhJSHRBYSdTe89vDrbq9ywBq+jDD/pbvs=; b=HnTqOaDAE+hjXW7ZIbG5a2ClmyEAWoV1F70PqVOD6xPPmuL377jyV25y6+C31+M5FOM4RR YWp+sKYB2vizIaxlpv8FdoM5/GJn/Mh91S1ezy7OC1czh3gXiDTddZiOfrRI6sBW0JuDnC mu9ij1nryrY3zLww1bWb/sDN3etHxzmnDKm/gyRvmkT7kLddsc/ihQ7ZX/adxgXumbt37A VoJv6IDtyLG7CwLjVJBf1RWB1NRL38a2uhQoWDwPmsAghRkKcYOjEdAQ3MQymMqlnYzSN7 GW3p2sDLlx8sdVz59wu1RR09K3m3sU32Cmb5zYYGuv/gDvcXaCXyAhmVMcwpNA== 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 4MNbSN5BLXzrQV; Thu, 8 Sep 2022 10:48:04 +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 288Am4Kl062687; Thu, 8 Sep 2022 10:48:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 288Am4Sv062686; Thu, 8 Sep 2022 10:48:04 GMT (envelope-from git) Date: Thu, 8 Sep 2022 10:48:04 GMT Message-Id: <202209081048.288Am4Sv062686@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Nuno Teixeira Subject: git: 3c40124e0729 - 2022Q3 - x11/kitty: reverts commit 9051f0ba8e211de002a1571417ea6cc302c9db44 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eduardo X-Git-Repository: ports X-Git-Refname: refs/heads/2022Q3 X-Git-Reftype: branch X-Git-Commit: 3c40124e07293e6305ab4ea6a66951aaa1d2c320 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662634084; 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=Tk9a1bQUqdXhJSHRBYSdTe89vDrbq9ywBq+jDD/pbvs=; b=J5XEyja6YfboRaLeWk9idR8zTyTuZehnxhAuWsWJYthFecyo7FuHjMTlLei16kCtxUok9S GafkxHlsrdW/I3EXD83RH6vMD/5IxSvnbR/Pmr8/N8EsF429X6313tU/h7aOYzj0vYrHd1 +1qOZZOR3Un2+LYarSHVZgibEiQbP+CxRKxF9QPrFUrxOcIzf9HAJTAaVvCgGW0+aCpgY8 5Q70DkV/mCabRLtGfLGmieaWl8OaEaY7sggR4nL4xX2cAL9XVzDMUcsHRfqNln1Zhr2KoT UC1DBrEUkhdgXlc4NIeyfEQxnxvFw0jDiWbkrWiE73nzX+wH2p6NiiGEVc0LYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662634084; a=rsa-sha256; cv=none; b=MMNTtuw9T6oR2FaJTFY3yFz9DJQ/uARaKmzMFfpcdqQa61FptaD6VvY4jXUC+3lGF9eS7l J8M4srTp100WKkVo5DysQv0iLcbCFe6FRru1Dy4z0IJZNPig6VhyQ0LKTPg47d8cqNcgsr 2eZ0pZ/9iiw8s10upyeQSIgB9EbOlEfhVcW1MtiCMIQ5rVBqqTD6uIHsoz6R+3QP7fQDiG xYUggL24NjjVhhwUvsiEDn62rnrMowkRxs32tMTWZKhiWj2GG62fuuCaWeTdKAr7LG7m0F 3ulQpL00g5LSv1qNon9H9cEKSFC7IFP68D2ed+e6y6KMXid9/u3bhtwWSxMNLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q3 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c40124e07293e6305ab4ea6a66951aaa1d2c320 commit 3c40124e07293e6305ab4ea6a66951aaa1d2c320 Author: Nuno Teixeira AuthorDate: 2022-09-08 10:35:26 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-08 10:47:06 +0000 x11/kitty: reverts commit 9051f0ba8e211de002a1571417ea6cc302c9db44 Revert "x11/kitty: Use upstream patch fix build on 12.x Release" This reverts commit 9051f0ba8e211de002a1571417ea6cc302c9db44. Fix wrong cherry-pick, forgot to commit past updates. --- x11/kitty/Makefile | 8 +------- x11/kitty/files/extra-patch-kitty_data-types.h | 13 ------------- x11/kitty/files/patch-kitty_child.py | 11 +++++++++++ 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index a5812e7129f0..88118c0bbe89 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,6 +1,5 @@ PORTNAME= kitty -DISTVERSION= 0.25.2 -PORTREVISION= 1 +DISTVERSION= 0.25.0 CATEGORIES= x11 wayland MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -67,11 +66,6 @@ USES+=ncurses:port USES+=ncurses .endif -# fix clang static_assert on 12.x releases, https://github.com/kovidgoyal/kitty/pull/5398 -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000 -EXTRA_PATCHES= ${PATCHDIR}/extra-patch-kitty_data-types.h -.endif - # For librsync, we need to set header and library path do-build: (cd ${WRKSRC} && \ diff --git a/x11/kitty/files/extra-patch-kitty_data-types.h b/x11/kitty/files/extra-patch-kitty_data-types.h deleted file mode 100644 index 3926ab024c92..000000000000 --- a/x11/kitty/files/extra-patch-kitty_data-types.h +++ /dev/null @@ -1,13 +0,0 @@ ---- kitty/data-types.h.orig 2022-08-22 11:08:26 UTC -+++ kitty/data-types.h -@@ -159,6 +159,10 @@ typedef union CellAttrs { - #define NUM_UNDERLINE_STYLES (5u) - #define SGR_MASK (~(((CellAttrs){.width=WIDTH_MASK, .mark=MARK_MASK}).val)) - -+#ifndef static_assert -+#define static_assert _Static_assert -+#endif -+ - typedef struct { - color_type fg, bg, decoration_fg; - sprite_index sprite_x, sprite_y, sprite_z; diff --git a/x11/kitty/files/patch-kitty_child.py b/x11/kitty/files/patch-kitty_child.py new file mode 100644 index 000000000000..dfae47085879 --- /dev/null +++ b/x11/kitty/files/patch-kitty_child.py @@ -0,0 +1,11 @@ +--- kitty/child.py.orig 2021-11-10 21:33:51 UTC ++++ kitty/child.py +@@ -45,7 +45,7 @@ else: + return list(filter(None, f.read().decode('utf-8').split('\0'))) + + def cwd_of_process(pid: int) -> str: +- ans = f'/proc/{pid}/cwd' ++ ans = subprocess.run(["pwdx", pid], capture_output=True).stdout.split()[1].decode("utf-8") + return os.path.realpath(ans) + + def _environ_of_process(pid: int) -> str: