mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-28 01:06:17 +00:00
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 adf824b09c
)
This commit is contained in:
parent
08a37e52dd
commit
9051f0ba8e
@ -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} && \
|
||||
|
13
x11/kitty/files/extra-patch-kitty_data-types.h
Normal file
13
x11/kitty/files/extra-patch-kitty_data-types.h
Normal file
@ -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;
|
@ -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:
|
Loading…
Reference in New Issue
Block a user