From nobody Thu Sep 08 10:54:31 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 4MNbbr19YWz4bprM; Thu, 8 Sep 2022 10:54: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 4MNbbr0ktHz422t; Thu, 8 Sep 2022 10:54:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662634472; 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=zuOOmfn9t1NBcjyyqtwtocKRcBTzEh1Nl+BJWNcwniU=; b=wONnbaFPrCR3b+uZOi4KZ8VTI63AiH+EPk+6SYanCJfUGNYVoZguA+hjDNHsOZOl1BqRue elfZpOtvXgJKv/ujJiwKJcavawDWviEawI1Bg0iGV+9z80X/41s1B7HyrDrqjRhv55aVo4 xlF5u7JkzGJb5L3mfYkp14PIxdtwsaUCxEYHRSnX1nMoJQRyVYsjKTL3ynecvaosQ0rBju 0RYslK08T+4F07azsLdDHBA9xAqSQmAn7pPGnXEBTZkcnlt/XuqzwasbBD2w9Q8SV66qSk N1SNzK/6JUbCA4z5WnV63CWkhluYuBtyweEy42Z4LY02s1UIudSbN/mUBt1+XA== 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 4MNbbq6vthzrJY; Thu, 8 Sep 2022 10:54:31 +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 288AsVEq074177; Thu, 8 Sep 2022 10:54:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 288AsVsR074176; Thu, 8 Sep 2022 10:54:31 GMT (envelope-from git) Date: Thu, 8 Sep 2022 10:54:31 GMT Message-Id: <202209081054.288AsVsR074176@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: 7c2d326ef37a - 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: 7c2d326ef37a0d491892e6ad2322978ceb804c4c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662634472; 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=zuOOmfn9t1NBcjyyqtwtocKRcBTzEh1Nl+BJWNcwniU=; b=KsnHNZskMwGaei87VJvAoGnMZ8s2AgnRu9XPcf9kFPdcxpcLYbFp3WJVhUr5+VwyftwpKF d1V1R3RA+rvhylaHq0i8/M+duRXLRZCV14gvqS93QMUNVHQl8bxy2c6qk/3UYQL/XOWZ09 8yS8VcdpJO7t4EfK7ttguKicF+hS5TrcGrvo+XqtzALV1hdOLMeZrG8EFvlQMUctzWHZXh r+AtvF0BQJW/HhBGPa/3kMYoZXK9r+6jO8fDr46QAc/UnDmZzGoG7OtdEWdOIK+AbZ36ys OWXfFE+e8TPCoeg4mLS+W45Ho5/DFx2cmr+hZABj9CPYThP7LvLcJxZOj+h2bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662634472; a=rsa-sha256; cv=none; b=X1BK1LI/S44KJzP6MY9SXo8mK9Qs8MT3lp8L04Ut9t1LwUUATptUgWZ5AGAoLKilZhDtOo 3HqpyNGKqxARL/ucKIcbYcyuUCSLpG0obc6z3FXTtIt4vSOKP9P/XO7xs9zhdkp84Ta+Ra Ke53kVj0pF6NlUYm6x6GhmVHYy+fB5yqvGYA2RqYuHqZ/+4iMSJUJoDd8RDBteLJwdgok4 YHVVFUPLdfpkn749VQgF39NI666tvTzYvn3VWTMKWSMw+hBu9XliOMRnUW/a6Hsklon5mc CYDpnHCBJgtvg7mslo+/g1veNxTcyfA0TZtc250stH3l4+jEzi87ZcBkgwgxwQ== 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=7c2d326ef37a0d491892e6ad2322978ceb804c4c commit 7c2d326ef37a0d491892e6ad2322978ceb804c4c Author: Nuno Teixeira AuthorDate: 2022-08-22 22:11:38 +0000 Commit: Nuno Teixeira CommitDate: 2022-09-08 10:54:02 +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 | 6 ++++++ x11/kitty/files/extra-patch-kitty_data-types.h | 13 +++++++++++++ x11/kitty/files/patch-kitty_data-types.h | 19 ------------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 1fbe8ffb4a5b..13b8eb83bcc7 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,5 +1,6 @@ PORTNAME= kitty DISTVERSION= 0.25.2 +PORTREVISION= 1 CATEGORIES= x11 wayland MASTER_SITES= https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/ @@ -69,6 +70,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_data-types.h b/x11/kitty/files/patch-kitty_data-types.h deleted file mode 100644 index fecb5ab2d450..000000000000 --- a/x11/kitty/files/patch-kitty_data-types.h +++ /dev/null @@ -1,19 +0,0 @@ ---- kitty/data-types.h.orig 2022-08-13 20:17:56 UTC -+++ kitty/data-types.h -@@ -164,14 +164,14 @@ typedef struct { - sprite_index sprite_x, sprite_y, sprite_z; - CellAttrs attrs; - } GPUCell; --static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell"); -+_Static_assert(sizeof(GPUCell) == 20, "Fix the ordering of GPUCell"); - - typedef struct { - char_type ch; - hyperlink_id_type hyperlink_id; - combining_type cc_idx[3]; - } CPUCell; --static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell"); -+_Static_assert(sizeof(CPUCell) == 12, "Fix the ordering of CPUCell"); - - typedef enum { UNKNOWN_PROMPT_KIND = 0, PROMPT_START = 1, SECONDARY_PROMPT = 2, OUTPUT_START = 3 } PromptKind; - typedef union LineAttrs {