1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-25 09:34:11 +00:00

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
This commit is contained in:
Alexis Praga 2023-04-20 11:39:59 +02:00 committed by Robert Clausecker
parent 15c1c7abcf
commit a7f1c84d77
19 changed files with 41 additions and 262 deletions

View File

@ -1,9 +1,9 @@
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/
@ -11,6 +11,7 @@ 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

View File

@ -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

View File

@ -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 = .

View File

@ -1,20 +0,0 @@
--- glfw/dbus_glfw.c.orig 2022-11-07 10:06:42 UTC
+++ glfw/dbus_glfw.c
@@ -174,7 +174,7 @@ glfw_dbus_dispatch(DBusConnection *conn) {
}
void
-glfw_dbus_session_bus_dispatch() {
+glfw_dbus_session_bus_dispatch(void) {
if (session_bus) glfw_dbus_dispatch(session_bus);
}
@@ -344,7 +344,7 @@ glfw_dbus_connect_to_session_bus(void) {
}
DBusConnection *
-glfw_dbus_session_bus() {
+glfw_dbus_session_bus(void) {
if (!session_bus) glfw_dbus_connect_to_session_bus();
return session_bus;
}

View File

@ -1,17 +0,0 @@
--- glfw/wl_window.c.orig 2022-11-07 10:06:42 UTC
+++ glfw/wl_window.c
@@ -1964,12 +1964,12 @@ primary_selection_copy_callback_done(void *data, struc
wl_callback_destroy(callback);
}
-void _glfwSetupWaylandDataDevice() {
+void _glfwSetupWaylandDataDevice(void) {
_glfw.wl.dataDevice = wl_data_device_manager_get_data_device(_glfw.wl.dataDeviceManager, _glfw.wl.seat);
if (_glfw.wl.dataDevice) wl_data_device_add_listener(_glfw.wl.dataDevice, &data_device_listener, NULL);
}
-void _glfwSetupWaylandPrimarySelectionDevice() {
+void _glfwSetupWaylandPrimarySelectionDevice(void) {
_glfw.wl.primarySelectionDevice = zwp_primary_selection_device_manager_v1_get_device(_glfw.wl.primarySelectionDeviceManager, _glfw.wl.seat);
if (_glfw.wl.primarySelectionDevice) zwp_primary_selection_device_v1_add_listener(_glfw.wl.primarySelectionDevice, &primary_selection_device_listener, NULL);
}

View File

@ -1,11 +0,0 @@
--- kittens/choose/unix_compat.c.orig 2022-11-07 10:06:42 UTC
+++ kittens/choose/unix_compat.c
@@ -19,7 +19,7 @@
#endif
int
-cpu_count() {
+cpu_count(void) {
return sysconf(_SC_NPROCESSORS_ONLN);
}

View File

@ -1,20 +0,0 @@
--- kitty/colors.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/colors.c
@@ -47,7 +47,7 @@ init_FG_BG_table(void) {
}
}
-PyObject* create_256_color_table() {
+PyObject* create_256_color_table(void) {
init_FG_BG_table();
PyObject *ans = PyTuple_New(arraysz(FG_BG_256));
if (ans == NULL) return PyErr_NoMemory();
@@ -83,7 +83,7 @@ dealloc_cp(ColorProfile* self) {
}
ColorProfile*
-alloc_color_profile() {
+alloc_color_profile(void) {
return (ColorProfile*)new_cp(&ColorProfile_Type, NULL, NULL);
}

View File

@ -1,11 +0,0 @@
--- kitty/cursor.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/cursor.c
@@ -321,7 +321,7 @@ copy(Cursor *self, PyObject *a UNUSED) {
return (PyObject*)cursor_copy(self);
}
-Cursor *alloc_cursor() {
+Cursor *alloc_cursor(void) {
return (Cursor*)new(&Cursor_Type, NULL, NULL);
}

View File

@ -1,19 +0,0 @@
--- kitty/data-types.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/data-types.c
@@ -40,14 +40,14 @@
#include <xlocale.h>
static PyObject*
-user_cache_dir() {
+user_cache_dir(void) {
static char buf[1024];
if (!confstr(_CS_DARWIN_USER_CACHE_DIR, buf, sizeof(buf) - 1)) return PyErr_SetFromErrno(PyExc_OSError);
return PyUnicode_FromString(buf);
}
static PyObject*
-process_group_map() {
+process_group_map(void) {
int num_of_processes = proc_listallpids(NULL, 0);
size_t bufsize = sizeof(pid_t) * (num_of_processes + 1024);
FREE_AFTER_FUNCTION pid_t *buf = malloc(bufsize);

View File

@ -1,20 +0,0 @@
--- kitty/gl-wrapper.h.orig 2022-11-07 10:06:42 UTC
+++ kitty/gl-wrapper.h
@@ -6146,7 +6146,7 @@ int gladLoadGLUserPtr( GLADuserptrloadfunc load, void
int gladLoadGL( GLADloadfunc load) {
return gladLoadGLUserPtr( glad_gl_get_proc_from_userptr, GLAD_GNUC_EXTENSION (void*) load);
}
-void gladInstallGLDebug() {
+void gladInstallGLDebug(void) {
glad_debug_glActiveTexture = glad_debug_impl_glActiveTexture;
glad_debug_glAttachShader = glad_debug_impl_glAttachShader;
glad_debug_glBeginConditionalRender = glad_debug_impl_glBeginConditionalRender;
@@ -6517,7 +6517,7 @@ void gladInstallGLDebug() {
glad_debug_glViewport = glad_debug_impl_glViewport;
glad_debug_glWaitSync = glad_debug_impl_glWaitSync;
}
-void gladUninstallGLDebug() {
+void gladUninstallGLDebug(void) {
glad_debug_glActiveTexture = glad_glActiveTexture;
glad_debug_glAttachShader = glad_glAttachShader;
glad_debug_glBeginConditionalRender = glad_glBeginConditionalRender;

View File

@ -1,11 +0,0 @@
--- kitty/gl.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/gl.c
@@ -39,7 +39,7 @@ check_for_gl_error(void UNUSED *ret, const char *name,
}
void
-gl_init() {
+gl_init(void) {
static bool glad_loaded = false;
if (!glad_loaded) {
int gl_version = gladLoadGL(glfwGetProcAddress);

View File

@ -1,20 +0,0 @@
--- kitty/glfw.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/glfw.c
@@ -176,7 +176,7 @@ log_event(const char *format, ...) {
// callbacks {{{
void
-update_os_window_references() {
+update_os_window_references(void) {
for (size_t i = 0; i < global_state.num_os_windows; i++) {
OSWindow *w = global_state.os_windows + i;
if (w->handle) glfwSetWindowUserPointer(w->handle, w);
@@ -1395,7 +1395,7 @@ swap_window_buffers(OSWindow *os_window) {
}
void
-wakeup_main_loop() {
+wakeup_main_loop(void) {
glfwPostEmptyEvent();
}

View File

@ -1,11 +0,0 @@
--- kitty/graphics.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/graphics.c
@@ -60,7 +60,7 @@ cache_size(const GraphicsManager *self) { return disk_
GraphicsManager*
-grman_alloc() {
+grman_alloc(void) {
GraphicsManager *self = (GraphicsManager *)GraphicsManager_Type.tp_alloc(&GraphicsManager_Type, 0);
self->images_capacity = self->capacity = 64;
self->images = calloc(self->images_capacity, sizeof(Image));

View File

@ -1,11 +0,0 @@
--- kitty/line.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/line.c
@@ -944,7 +944,7 @@ PyTypeObject Line_Type = {
.tp_new = new
};
-Line *alloc_line() {
+Line *alloc_line(void) {
Line *ans = (Line*)PyType_GenericAlloc(&Line_Type, 0);
ans->needs_free = 0;
return ans;

View File

@ -1,20 +0,0 @@
--- kitty/mouse.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/mouse.c
@@ -639,7 +639,7 @@ closest_window_for_event(unsigned int *window_idx) {
}
void
-focus_in_event() {
+focus_in_event(void) {
// Ensure that no URL is highlighted and the mouse cursor is in default shape
bool in_tab_bar;
unsigned int window_idx = 0;
@@ -653,7 +653,7 @@ focus_in_event() {
}
void
-enter_event() {
+enter_event(void) {
#ifdef __APPLE__
// On cocoa there is no way to configure the window manager to
// focus windows on mouse enter, so we do it ourselves

View File

@ -1,20 +0,0 @@
--- kitty/shaders.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/shaders.c
@@ -223,7 +223,7 @@ init_cell_program(void) {
#define CELL_BUFFERS enum { cell_data_buffer, selection_buffer, uniform_buffer };
ssize_t
-create_cell_vao() {
+create_cell_vao(void) {
ssize_t vao_idx = create_vao();
#define A(name, size, dtype, offset, stride) \
add_attribute_to_vao(CELL_PROGRAM, vao_idx, #name, \
@@ -246,7 +246,7 @@ create_cell_vao() {
}
ssize_t
-create_graphics_vao() {
+create_graphics_vao(void) {
ssize_t vao_idx = create_vao();
add_buffer_to_vao(vao_idx, GL_ARRAY_BUFFER);
add_attribute_to_vao(GRAPHICS_PROGRAM, vao_idx, "src", 4, GL_FLOAT, 0, NULL, 0);

View File

@ -1,11 +0,0 @@
--- kitty/state.c.orig 2022-11-07 10:06:42 UTC
+++ kitty/state.c
@@ -187,7 +187,7 @@ free_bgimage(BackgroundImage **bgimage, bool release_t
}
OSWindow*
-add_os_window() {
+add_os_window(void) {
WITH_OS_WINDOW_REFS
ensure_space_for(&global_state, os_windows, OSWindow, global_state.num_os_windows + 1, capacity, 1, true);
OSWindow *ans = global_state.os_windows + global_state.num_os_windows++;

View File

@ -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.

View File

@ -1,3 +1,4 @@
bin/kitten
bin/kitty
lib/kitty/__main__.py
lib/kitty/kittens/__init__.py
@ -5,29 +6,13 @@ lib/kitty/kittens/ask/__init__.py
lib/kitty/kittens/ask/main.py
lib/kitty/kittens/broadcast/__init__.py
lib/kitty/kittens/broadcast/main.py
lib/kitty/kittens/choose/__init__.py
lib/kitty/kittens/choose/main.py
lib/kitty/kittens/choose/match.py
lib/kitty/kittens/choose/subseq_matcher.so
lib/kitty/kittens/clipboard/__init__.py
lib/kitty/kittens/clipboard/main.py
lib/kitty/kittens/diff/__init__.py
lib/kitty/kittens/diff/collect.py
lib/kitty/kittens/diff/config.py
lib/kitty/kittens/diff/diff_speedup.so
lib/kitty/kittens/diff/highlight.py
lib/kitty/kittens/diff/main.py
lib/kitty/kittens/diff/options/__init__.py
lib/kitty/kittens/diff/options/definition.py
lib/kitty/kittens/diff/options/parse.py
lib/kitty/kittens/diff/options/types.py
lib/kitty/kittens/diff/options/utils.py
lib/kitty/kittens/diff/patch.py
lib/kitty/kittens/diff/render.py
lib/kitty/kittens/diff/search.py
lib/kitty/kittens/hints/__init__.py
lib/kitty/kittens/hints/main.py
lib/kitty/kittens/hints/url_regex.py
lib/kitty/kittens/hyperlinked_grep/__init__.py
lib/kitty/kittens/hyperlinked_grep/main.py
lib/kitty/kittens/icat/__init__.py
@ -49,18 +34,9 @@ lib/kitty/kittens/show_key/__init__.py
lib/kitty/kittens/show_key/kitty_mode.py
lib/kitty/kittens/show_key/main.py
lib/kitty/kittens/ssh/__init__.py
lib/kitty/kittens/ssh/completion.py
lib/kitty/kittens/ssh/config.py
lib/kitty/kittens/ssh/copy.py
lib/kitty/kittens/ssh/main.py
lib/kitty/kittens/ssh/options/__init__.py
lib/kitty/kittens/ssh/options/definition.py
lib/kitty/kittens/ssh/options/parse.py
lib/kitty/kittens/ssh/options/types.py
lib/kitty/kittens/ssh/options/utils.py
lib/kitty/kittens/ssh/utils.py
lib/kitty/kittens/themes/__init__.py
lib/kitty/kittens/themes/collection.py
lib/kitty/kittens/themes/main.py
lib/kitty/kittens/transfer/__init__.py
lib/kitty/kittens/transfer/librsync.py
@ -86,6 +62,7 @@ lib/kitty/kittens/unicode_input/main.py
lib/kitty/kittens/unicode_input/unicode_names.so
lib/kitty/kitty/__init__.py
lib/kitty/kitty/actions.py
lib/kitty/kitty/bash.py
lib/kitty/kitty/bgimage_fragment.glsl
lib/kitty/kitty/bgimage_vertex.glsl
lib/kitty/kitty/blit_fragment.glsl
@ -102,7 +79,6 @@ lib/kitty/kitty/cli.py
lib/kitty/kitty/cli_stub.py
lib/kitty/kitty/client.py
lib/kitty/kitty/clipboard.py
lib/kitty/kitty/complete.py
lib/kitty/kitty/conf/__init__.py
lib/kitty/kitty/conf/generate.py
lib/kitty/kitty/conf/types.py
@ -148,7 +124,6 @@ lib/kitty/kitty/options/parse.py
lib/kitty/kitty/options/types.py
lib/kitty/kitty/options/utils.py
lib/kitty/kitty/os_window_size.py
lib/kitty/kitty/prewarm.py
lib/kitty/kitty/rc/__init__.py
lib/kitty/kitty/rc/base.py
lib/kitty/kitty/rc/close_tab.py
@ -189,7 +164,6 @@ lib/kitty/kitty/remote_control.py
lib/kitty/kitty/rgb.py
lib/kitty/kitty/search_query_parser.py
lib/kitty/kitty/session.py
lib/kitty/kitty/shell.py
lib/kitty/kitty/shell_integration.py
lib/kitty/kitty/shm.py
lib/kitty/kitty/short_uuid.py
@ -210,13 +184,13 @@ lib/kitty/logo/kitty-128.png
lib/kitty/logo/kitty.png
lib/kitty/shell-integration/bash/kitty.bash
lib/kitty/shell-integration/fish/vendor_completions.d/clone-in-kitty.fish
lib/kitty/shell-integration/fish/vendor_completions.d/edit-in-kitty.fish
lib/kitty/shell-integration/fish/vendor_completions.d/kitten.fish
lib/kitty/shell-integration/fish/vendor_completions.d/kitty.fish
lib/kitty/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
lib/kitty/shell-integration/ssh/askpass.py
lib/kitty/shell-integration/ssh/bootstrap-utils.sh
lib/kitty/shell-integration/ssh/bootstrap.py
lib/kitty/shell-integration/ssh/bootstrap.sh
lib/kitty/shell-integration/ssh/kitten
lib/kitty/shell-integration/ssh/kitty
lib/kitty/shell-integration/zsh/.zshenv
lib/kitty/shell-integration/zsh/completions/_kitty