Date: Mon, 22 Aug 2022 22:26:53 GMT From: Nuno Teixeira <eduardo@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 9051f0ba8e21 - 2022Q3 - x11/kitty: Use upstream patch fix build on 12.x Release Message-ID: <202208222226.27MMQrPK064173@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2022Q3 has been updated by eduardo: URL: https://cgit.FreeBSD.org/ports/commit/?id=9051f0ba8e211de002a1571417ea6cc302c9db44 commit 9051f0ba8e211de002a1571417ea6cc302c9db44 Author: Nuno Teixeira <eduardo@FreeBSD.org> AuthorDate: 2022-08-22 22:11:38 +0000 Commit: Nuno Teixeira <eduardo@FreeBSD.org> 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202208222226.27MMQrPK064173>