git: 3c40124e0729 - 2022Q3 - x11/kitty: reverts commit 9051f0ba8e211de002a1571417ea6cc302c9db44

The branch 2022Q3 has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3c40124e07293e6305ab4ea6a66951aaa1d2c320

commit 3c40124e07293e6305ab4ea6a66951aaa1d2c320
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2022-09-08 10:35:26 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
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: