From nobody Mon Aug 22 22:26:53 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 4MBRmY2nx1z4Zqgh; Mon, 22 Aug 2022 22:26:53 +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 4MBRmY2FcGz3wTV; Mon, 22 Aug 2022 22:26:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661207213; 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=DBPlKleK+O8Uu8u66dez1ENMC/YSZDeQuVfX/afwJmw=; b=tXsIk7rvE8Ls3FayoyhEp0Ppk7aHigsFvvhy5bmMvh2pe/y8qpTyBD/5Bex1nvmZhEY3Xq EZ/l2oPZ2hVLN2sYJPvFK5z4h77J9qG5hb9QnKSICnbkFp3g9eIF9oezoesRkOAwsPXJdC RJVgFNBOWVEhnsHHjs7zQayJNT+Ug00b3LLH6H0Es8q6gchVDvYdLhy/1IWviprr+8JENg fJHQ27dniAaMrad/vvLcDjWrgNLjm1rAw57ofw8aRjDogXdG8o8ZdT+tswgplnX1h9TbIm fe6I6LDOfthhjNHjQURXo4bvW4VxyRhKuq6RA0ArxRe1Fu/kCFFXZsCKUlhl7Q== 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 4MBRmY109nz15QQ; Mon, 22 Aug 2022 22:26:53 +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 27MMQr7u064174; Mon, 22 Aug 2022 22:26:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27MMQrPK064173; Mon, 22 Aug 2022 22:26:53 GMT (envelope-from git) Date: Mon, 22 Aug 2022 22:26:53 GMT Message-Id: <202208222226.27MMQrPK064173@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: 9051f0ba8e21 - 2022Q3 - x11/kitty: Use upstream patch fix build on 12.x Release 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: 9051f0ba8e211de002a1571417ea6cc302c9db44 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661207213; 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=DBPlKleK+O8Uu8u66dez1ENMC/YSZDeQuVfX/afwJmw=; b=AwGRzhDTOuFIly6mZY0L7KuZS7QdDq20clg3W6J/JTn49HQzjxaG+KFYPXlLpN4oUBOjSs yvzx6QP56q5GyfmH5Ze+AH4+MwAsFtzGNvrQ8+HHCGU1zDaBEzK+d3O3C47hNznpJUZFp/ J65cQzBfnelh+PZY7VKFhhYkM2HEsj36OskEJYLAK3lV82ono5eFf41a1PIXWGeeFZKXYI SHGhXezC4Cih0iP7qPJXQPtzW6UB3433g3b/gTCuF0DkzL8mn7W2FsB60dvi3wNvjLgUTG nWTa9Dgp6Krp77+x059TjaIJVgoFoWj/J08E5TYpWfv8hVlbLkXROfrtFzMqmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661207213; a=rsa-sha256; cv=none; b=GmD69ikc9rZC48/w88liHGmZqSBViWxCyxMo1tamwUzY/iI1fyQ/r7k4nJTm2Ly8ISsJnr K0prDiltRccgbqAlsWxMsxRF9LcqCStMgPTjhesoJwCQYuaiMyHjSLt19YrDlbFNpkzYIH vvKNt42wbBNaeAP6vpJ4oTHiJ4IPwQOGPwac3TDQeo4/S7WNhLK0HgBs0c8EqlGnORv+Xc g2v0WmZZmzInqIsGIi+KmmDVs6YLp4UEuRWd46+7tL1pGYulD08xn2v8SaZ55ECxtz1Ls1 tpLn49CQicCMKnmMTRVNA+BlQfQaVJykorRBF0+yyHYtgHNa0hIcw0uVjXm/4w== 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=9051f0ba8e211de002a1571417ea6cc302c9db44 commit 9051f0ba8e211de002a1571417ea6cc302c9db44 Author: Nuno Teixeira AuthorDate: 2022-08-22 22:11:38 +0000 Commit: Nuno Teixeira CommitDate: 2022-08-22 22:25:45 +0000 x11/kitty: Use upstream patch fix build on 12.x Release - Use upstream patch instead of workaround fix https://github.com/kovidgoyal/kitty/pull/5398 - Bump PORTREVISION PR: 265393 MFH: 2022Q3 (cherry picked from commit adf824b09c349ee00ac25189c2f98e3fc2c48953) --- 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, 20 insertions(+), 12 deletions(-) diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 88118c0bbe89..a5812e7129f0 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,5 +1,6 @@ PORTNAME= kitty -DISTVERSION= 0.25.0 +DISTVERSION= 0.25.2 +PORTREVISION= 1 CATEGORIES= x11 wayland MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -66,6 +67,11 @@ 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 new file mode 100644 index 000000000000..3926ab024c92 --- /dev/null +++ b/x11/kitty/files/extra-patch-kitty_data-types.h @@ -0,0 +1,13 @@ +--- 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 deleted file mode 100644 index dfae47085879..000000000000 --- a/x11/kitty/files/patch-kitty_child.py +++ /dev/null @@ -1,11 +0,0 @@ ---- 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: