x11/kitty: update to 0.28.0

- update maintainer address - work around a hang in sphinx build Changelog: https://sw.kovidgoyal.net/kitty/changelog PR: 270703
freebsd · Apr 20, 2023 · a7f1c84 · a7f1c84
1 parent 15c1c7a
commit a7f1c84
Show file tree

Hide file tree

Showing 19 changed files with 41 additions and 262 deletions.
diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
@@ -1,16 +1,17 @@
 PORTNAME=	kitty
-DISTVERSION=	0.26.5
+DISTVERSION=	0.28.0
+DISTVERSIONPREFIX=v
 CATEGORIES=	x11 wayland
-MASTER_SITES=	https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/
 
-MAINTAINER=	alexis.praga@free.fr
+MAINTAINER=	alexis.praga@proton.me
 COMMENT=	Cross-platform, fast, featureful, GPU-based terminal emulator
 WWW=		https://sw.kovidgoyal.net/kitty/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \
@@ -29,11 +30,12 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
 		libxkbcommon.so:x11/libxkbcommon
 
 USES=		compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \
-		pkgconfig python:3.5+ shebangfix ssl tar:xz terminfo xorg
+		go:modules pkgconfig python:3.5+ shebangfix ssl tar:xz terminfo xorg
 CPE_VENDOR=	kitty_project
 USE_GL=		gl
 USE_XORG=	x11 xcb xcursor xi xinerama xrandr
 
+GO_MODULE=	github.com/kovidgoyal/kitty
 SHEBANG_FILES=	build-terminfo count-lines-of-code mypy-editor-integration \
 		update-on-ox update-on-ubuntu
 SHEBANG_GLOB=	*.py
@@ -46,13 +48,25 @@ LDFLAGS+=	`pkg-config --libs epoll-shim-interpose`
 
 BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
 
+GH_TUPLE=	\
+		ALTree:bigfloat:38c8b72a9924:altree_bigfloat/vendor/github.com/ALTree/bigfloat \
+		disintegration:imaging:v1.6.2:disintegration_imaging/vendor/github.com/disintegration/imaging \
+		golang:exp:54bba9f4231b:golang_exp/vendor/golang.org/x/exp \
+		golang:image:v0.3.0:golang_image/vendor/golang.org/x/image \
+		golang:sys:v0.4.0:golang_sys/vendor/golang.org/x/sys \
+		google:go-cmp:v0.5.8:google_go_cmp/vendor/github.com/google/go-cmp \
+		google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \
+		jamesruan:go-rfc1924:2767ca7c638f:jamesruan_go_rfc1924/vendor/github.com/jamesruan/go-rfc1924 \
+		seancfoley:bintree:v1.2.1:seancfoley_bintree/vendor/github.com/seancfoley/bintree \
+		seancfoley:ipaddress-go:v1.5.3:seancfoley_ipaddress_go/vendor/github.com/seancfoley/ipaddress-go
+
 INSTALL_WRKSRC=	${WRKSRC}/linux-package
 
 _STRIP_TARGETS=	lib/kitty/kitty/fast_data_types.so lib/kitty/kitty/glfw-x11.so \
 		lib/kitty/kittens/diff/diff_speedup.so \
 		lib/kitty/kittens/unicode_input/unicode_names.so \
 		lib/kitty/kitty/glfw-wayland.so \
-		lib/kitty/kittens/choose/subseq_matcher.so bin/kitty \
+		bin/kitten bin/kitty \
 		lib/kitty/kittens/transfer/rsync.so
 
 _EMPTY_DIRS=	kittens/choose kittens/diff kittens/unicode_input kittens kitty

diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1668802214
-SHA256 (kitty-0.26.5.tar.xz) = 5544a580314fec7711187ce28162909b5ecff6780071444fe96fb97f8be5c9ad
-SIZE (kitty-0.26.5.tar.xz) = 4749988
+TIMESTAMP = 1681963421
+SHA256 (go/x11_kitty/kitty-v0.28.0/v0.28.0.mod) = d59caccb23108f9984263959b222c4dbb81774244a7360b07e90864057b90579
+SIZE (go/x11_kitty/kitty-v0.28.0/v0.28.0.mod) = 997
+SHA256 (go/x11_kitty/kitty-v0.28.0/v0.28.0.zip) = d0f9d948f3e0d2206dddd514df73e05f0809458eca6e3a267003f2f8e526c7db
+SIZE (go/x11_kitty/kitty-v0.28.0/v0.28.0.zip) = 8284366
diff --git a/x11/kitty/files/patch-docs_Makefile b/x11/kitty/files/patch-docs_Makefile
@@ -0,0 +1,11 @@
+--- docs/Makefile.orig	2023-04-09 05:08:22 UTC
++++ docs/Makefile
+@@ -6,7 +6,7 @@ override FAIL_WARN=-W
+ endif
+
+ # You can set these variables from the command line.
+-SPHINXOPTS    = -n -q -j auto -T $(FAIL_WARN) $(OPTS)
++SPHINXOPTS    = -n -j auto -T $(FAIL_WARN) $(OPTS)
+ SPHINXBUILD   = sphinx-build
+ SPHINXPROJ    = kitty
+ SOURCEDIR     = .
diff --git a/x11/kitty/files/patch-glfw_dbus__glfw.c b/x11/kitty/files/patch-glfw_dbus__glfw.c
diff --git a/x11/kitty/files/patch-glfw_wl__window.c b/x11/kitty/files/patch-glfw_wl__window.c
diff --git a/x11/kitty/files/patch-kittens_choose_unix__compat.c b/x11/kitty/files/patch-kittens_choose_unix__compat.c
diff --git a/x11/kitty/files/patch-kitty_colors.c b/x11/kitty/files/patch-kitty_colors.c
diff --git a/x11/kitty/files/patch-kitty_cursor.c b/x11/kitty/files/patch-kitty_cursor.c
diff --git a/x11/kitty/files/patch-kitty_data-types.c b/x11/kitty/files/patch-kitty_data-types.c
diff --git a/x11/kitty/files/patch-kitty_gl-wrapper.h b/x11/kitty/files/patch-kitty_gl-wrapper.h
diff --git a/x11/kitty/files/patch-kitty_gl.c b/x11/kitty/files/patch-kitty_gl.c
diff --git a/x11/kitty/files/patch-kitty_glfw.c b/x11/kitty/files/patch-kitty_glfw.c
diff --git a/x11/kitty/files/patch-kitty_graphics.c b/x11/kitty/files/patch-kitty_graphics.c
diff --git a/x11/kitty/files/patch-kitty_line.c b/x11/kitty/files/patch-kitty_line.c
diff --git a/x11/kitty/files/patch-kitty_mouse.c b/x11/kitty/files/patch-kitty_mouse.c
diff --git a/x11/kitty/files/patch-kitty_shaders.c b/x11/kitty/files/patch-kitty_shaders.c
diff --git a/x11/kitty/files/patch-kitty_state.c b/x11/kitty/files/patch-kitty_state.c
diff --git a/x11/kitty/files/patch-setup.py b/x11/kitty/files/patch-setup.py
@@ -1,6 +1,6 @@
---- setup.py.orig	2022-10-19 17:45:56 UTC
+--- setup.py.orig	2023-04-08 12:02:15 UTC
 +++ setup.py
-@@ -130,25 +130,9 @@ def libcrypto_flags() -> Tuple[List[str], List[str]]:
+@@ -126,25 +126,9 @@ def libcrypto_flags() -> Tuple[List[str], List[str]]:
      # Apple use their special snowflake TLS libraries and additionally
      # have an ancient broken system OpenSSL, so we need to check for one
      # installed by all the various macOS package managers.