View | Details | Raw Unified | Return to bug 270703 | Differences between
and this patch

Collapse All | Expand All

(-)b/x11/kitty/Makefile (-4 / +18 lines)
Lines 1-9 Link Here
1
PORTNAME=	kitty
1
PORTNAME=	kitty
2
DISTVERSION=	0.26.5
2
PORTVERSION=	0.27.1
3
DISTVERSIONPREFIX=v
3
CATEGORIES=	x11 wayland
4
CATEGORIES=	x11 wayland
4
MASTER_SITES=	https://github.com/kovidgoyal/${PORTNAME}/releases/download/v${DISTVERSION}/
5
5
6
MAINTAINER=	alexis.praga@free.fr
6
MAINTAINER=	alexis.praga@proton.me
7
COMMENT=	Cross-platform, fast, featureful, GPU-based terminal emulator
7
COMMENT=	Cross-platform, fast, featureful, GPU-based terminal emulator
8
WWW=		https://sw.kovidgoyal.net/kitty/
8
WWW=		https://sw.kovidgoyal.net/kitty/
9
9
Lines 11-16 LICENSE= GPLv3 Link Here
11
LICENSE_FILE=	${WRKSRC}/LICENSE
11
LICENSE_FILE=	${WRKSRC}/LICENSE
12
12
13
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
13
BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${PY_FLAVOR} \
14
		${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR} \
14
		${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
15
		${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
16
		${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
16
		${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \
17
		${PYTHON_PKGNAMEPREFIX}sphinxext-opengraph>0:textproc/py-sphinxext-opengraph@${PY_FLAVOR} \
Lines 29-39 LIB_DEPENDS= libdbus-1.so:devel/dbus \ Link Here
29
		libxkbcommon.so:x11/libxkbcommon
30
		libxkbcommon.so:x11/libxkbcommon
30
31
31
USES=		compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \
32
USES=		compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \
32
		pkgconfig python:3.5+ shebangfix ssl tar:xz terminfo xorg
33
		go:modules pkgconfig python:3.5+ shebangfix ssl tar:xz terminfo xorg
33
CPE_VENDOR=	kitty_project
34
CPE_VENDOR=	kitty_project
34
USE_GL=		gl
35
USE_GL=		gl
35
USE_XORG=	x11 xcb xcursor xi xinerama xrandr
36
USE_XORG=	x11 xcb xcursor xi xinerama xrandr
36
37
38
GO_MODULE = github.com/kovidgoyal/kitty
37
SHEBANG_FILES=	build-terminfo count-lines-of-code mypy-editor-integration \
39
SHEBANG_FILES=	build-terminfo count-lines-of-code mypy-editor-integration \
38
		update-on-ox update-on-ubuntu
40
		update-on-ox update-on-ubuntu
39
SHEBANG_GLOB=	*.py
41
SHEBANG_GLOB=	*.py
Lines 46-51 LDFLAGS+= `pkg-config --libs epoll-shim-interpose` Link Here
46
48
47
BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
49
BINARY_ALIAS=	python3=${PYTHON_CMD} python=${PYTHON_CMD}
48
50
51
GH_TUPLE=	\
52
		ALTree:bigfloat:38c8b72a9924:altree_bigfloat/vendor/github.com/ALTree/bigfloat \
53
		disintegration:imaging:v1.6.2:disintegration_imaging/vendor/github.com/disintegration/imaging \
54
		golang:exp:54bba9f4231b:golang_exp/vendor/golang.org/x/exp \
55
		golang:image:v0.3.0:golang_image/vendor/golang.org/x/image \
56
		golang:sys:v0.4.0:golang_sys/vendor/golang.org/x/sys \
57
		google:go-cmp:v0.5.8:google_go_cmp/vendor/github.com/google/go-cmp \
58
		google:uuid:v1.3.0:google_uuid/vendor/github.com/google/uuid \
59
		jamesruan:go-rfc1924:2767ca7c638f:jamesruan_go_rfc1924/vendor/github.com/jamesruan/go-rfc1924 \
60
		seancfoley:bintree:v1.2.1:seancfoley_bintree/vendor/github.com/seancfoley/bintree \
61
		seancfoley:ipaddress-go:v1.5.3:seancfoley_ipaddress_go/vendor/github.com/seancfoley/ipaddress-go
62
49
INSTALL_WRKSRC=	${WRKSRC}/linux-package
63
INSTALL_WRKSRC=	${WRKSRC}/linux-package
50
64
51
_STRIP_TARGETS=	lib/kitty/kitty/fast_data_types.so lib/kitty/kitty/glfw-x11.so \
65
_STRIP_TARGETS=	lib/kitty/kitty/fast_data_types.so lib/kitty/kitty/glfw-x11.so \
(-)b/x11/kitty/distinfo (-3 / +5 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1668802214
1
TIMESTAMP = 1676826123
2
SHA256 (kitty-0.26.5.tar.xz) = 5544a580314fec7711187ce28162909b5ecff6780071444fe96fb97f8be5c9ad
2
SHA256 (go/x11_kitty/kitty-v0.27.1/v0.27.1.mod) = e09311ef7e02c6fdff667a25a9c816429a2f345f20896b7656bb37bd111e0b30
3
SIZE (kitty-0.26.5.tar.xz) = 4749988
3
SIZE (go/x11_kitty/kitty-v0.27.1/v0.27.1.mod) = 478
4
SHA256 (go/x11_kitty/kitty-v0.27.1/v0.27.1.zip) = f5e87c03c58d237db655bd3183abc983f30e87151b5eddb3b3ccabf5f22a6c36
5
SIZE (go/x11_kitty/kitty-v0.27.1/v0.27.1.zip) = 8934424
(-)a/x11/kitty/files/patch-glfw_dbus__glfw.c (-20 lines)
Removed Link Here
1
--- glfw/dbus_glfw.c.orig	2022-11-07 10:06:42 UTC
2
+++ glfw/dbus_glfw.c
3
@@ -174,7 +174,7 @@ glfw_dbus_dispatch(DBusConnection *conn) {
4
 }
5
 
6
 void
7
-glfw_dbus_session_bus_dispatch() {
8
+glfw_dbus_session_bus_dispatch(void) {
9
     if (session_bus) glfw_dbus_dispatch(session_bus);
10
 }
11
 
12
@@ -344,7 +344,7 @@ glfw_dbus_connect_to_session_bus(void) {
13
 }
14
 
15
 DBusConnection *
16
-glfw_dbus_session_bus() {
17
+glfw_dbus_session_bus(void) {
18
     if (!session_bus) glfw_dbus_connect_to_session_bus();
19
     return session_bus;
20
 }
(-)a/x11/kitty/files/patch-glfw_wl__window.c (-17 lines)
Removed Link Here
1
--- glfw/wl_window.c.orig	2022-11-07 10:06:42 UTC
2
+++ glfw/wl_window.c
3
@@ -1964,12 +1964,12 @@ primary_selection_copy_callback_done(void *data, struc
4
     wl_callback_destroy(callback);
5
 }
6
 
7
-void _glfwSetupWaylandDataDevice() {
8
+void _glfwSetupWaylandDataDevice(void) {
9
     _glfw.wl.dataDevice = wl_data_device_manager_get_data_device(_glfw.wl.dataDeviceManager, _glfw.wl.seat);
10
     if (_glfw.wl.dataDevice) wl_data_device_add_listener(_glfw.wl.dataDevice, &data_device_listener, NULL);
11
 }
12
 
13
-void _glfwSetupWaylandPrimarySelectionDevice() {
14
+void _glfwSetupWaylandPrimarySelectionDevice(void) {
15
     _glfw.wl.primarySelectionDevice = zwp_primary_selection_device_manager_v1_get_device(_glfw.wl.primarySelectionDeviceManager, _glfw.wl.seat);
16
     if (_glfw.wl.primarySelectionDevice) zwp_primary_selection_device_v1_add_listener(_glfw.wl.primarySelectionDevice, &primary_selection_device_listener, NULL);
17
 }
(-)a/x11/kitty/files/patch-kittens_choose_unix__compat.c (-11 lines)
Removed Link Here
1
--- kittens/choose/unix_compat.c.orig	2022-11-07 10:06:42 UTC
2
+++ kittens/choose/unix_compat.c
3
@@ -19,7 +19,7 @@
4
 #endif
5
 
6
 int
7
-cpu_count() {
8
+cpu_count(void) {
9
     return sysconf(_SC_NPROCESSORS_ONLN);
10
 }
11
 
(-)a/x11/kitty/files/patch-kitty_colors.c (-20 lines)
Removed Link Here
1
--- kitty/colors.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/colors.c
3
@@ -47,7 +47,7 @@ init_FG_BG_table(void) {
4
     }
5
 }
6
 
7
-PyObject* create_256_color_table() {
8
+PyObject* create_256_color_table(void) {
9
     init_FG_BG_table();
10
     PyObject *ans = PyTuple_New(arraysz(FG_BG_256));
11
     if (ans == NULL) return PyErr_NoMemory();
12
@@ -83,7 +83,7 @@ dealloc_cp(ColorProfile* self) {
13
 }
14
 
15
 ColorProfile*
16
-alloc_color_profile() {
17
+alloc_color_profile(void) {
18
     return (ColorProfile*)new_cp(&ColorProfile_Type, NULL, NULL);
19
 }
20
 
(-)a/x11/kitty/files/patch-kitty_cursor.c (-11 lines)
Removed Link Here
1
--- kitty/cursor.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/cursor.c
3
@@ -321,7 +321,7 @@ copy(Cursor *self, PyObject *a UNUSED) {
4
     return (PyObject*)cursor_copy(self);
5
 }
6
 
7
-Cursor *alloc_cursor() {
8
+Cursor *alloc_cursor(void) {
9
     return (Cursor*)new(&Cursor_Type, NULL, NULL);
10
 }
11
 
(-)a/x11/kitty/files/patch-kitty_data-types.c (-19 lines)
Removed Link Here
1
--- kitty/data-types.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/data-types.c
3
@@ -40,14 +40,14 @@
4
 #include <xlocale.h>
5
 
6
 static PyObject*
7
-user_cache_dir() {
8
+user_cache_dir(void) {
9
     static char buf[1024];
10
     if (!confstr(_CS_DARWIN_USER_CACHE_DIR, buf, sizeof(buf) - 1)) return PyErr_SetFromErrno(PyExc_OSError);
11
     return PyUnicode_FromString(buf);
12
 }
13
 
14
 static PyObject*
15
-process_group_map() {
16
+process_group_map(void) {
17
     int num_of_processes = proc_listallpids(NULL, 0);
18
     size_t bufsize = sizeof(pid_t) * (num_of_processes + 1024);
19
     FREE_AFTER_FUNCTION pid_t *buf = malloc(bufsize);
(-)a/x11/kitty/files/patch-kitty_gl-wrapper.h (-20 lines)
Removed Link Here
1
--- kitty/gl-wrapper.h.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/gl-wrapper.h
3
@@ -6146,7 +6146,7 @@ int gladLoadGLUserPtr( GLADuserptrloadfunc load, void 
4
 int gladLoadGL( GLADloadfunc load) {
5
     return gladLoadGLUserPtr( glad_gl_get_proc_from_userptr, GLAD_GNUC_EXTENSION (void*) load);
6
 }
7
-void gladInstallGLDebug() {
8
+void gladInstallGLDebug(void) {
9
     glad_debug_glActiveTexture = glad_debug_impl_glActiveTexture;
10
     glad_debug_glAttachShader = glad_debug_impl_glAttachShader;
11
     glad_debug_glBeginConditionalRender = glad_debug_impl_glBeginConditionalRender;
12
@@ -6517,7 +6517,7 @@ void gladInstallGLDebug() {
13
     glad_debug_glViewport = glad_debug_impl_glViewport;
14
     glad_debug_glWaitSync = glad_debug_impl_glWaitSync;
15
 }
16
-void gladUninstallGLDebug() {
17
+void gladUninstallGLDebug(void) {
18
     glad_debug_glActiveTexture = glad_glActiveTexture;
19
     glad_debug_glAttachShader = glad_glAttachShader;
20
     glad_debug_glBeginConditionalRender = glad_glBeginConditionalRender;
(-)a/x11/kitty/files/patch-kitty_gl.c (-11 lines)
Removed Link Here
1
--- kitty/gl.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/gl.c
3
@@ -39,7 +39,7 @@ check_for_gl_error(void UNUSED *ret, const char *name,
4
 }
5
 
6
 void
7
-gl_init() {
8
+gl_init(void) {
9
     static bool glad_loaded = false;
10
     if (!glad_loaded) {
11
         int gl_version = gladLoadGL(glfwGetProcAddress);
(-)a/x11/kitty/files/patch-kitty_glfw.c (-20 lines)
Removed Link Here
1
--- kitty/glfw.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/glfw.c
3
@@ -176,7 +176,7 @@ log_event(const char *format, ...) {
4
 // callbacks {{{
5
 
6
 void
7
-update_os_window_references() {
8
+update_os_window_references(void) {
9
     for (size_t i = 0; i < global_state.num_os_windows; i++) {
10
         OSWindow *w = global_state.os_windows + i;
11
         if (w->handle) glfwSetWindowUserPointer(w->handle, w);
12
@@ -1395,7 +1395,7 @@ swap_window_buffers(OSWindow *os_window) {
13
 }
14
 
15
 void
16
-wakeup_main_loop() {
17
+wakeup_main_loop(void) {
18
     glfwPostEmptyEvent();
19
 }
20
 
(-)a/x11/kitty/files/patch-kitty_graphics.c (-11 lines)
Removed Link Here
1
--- kitty/graphics.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/graphics.c
3
@@ -60,7 +60,7 @@ cache_size(const GraphicsManager *self) { return disk_
4
 
5
 
6
 GraphicsManager*
7
-grman_alloc() {
8
+grman_alloc(void) {
9
     GraphicsManager *self = (GraphicsManager *)GraphicsManager_Type.tp_alloc(&GraphicsManager_Type, 0);
10
     self->images_capacity = self->capacity = 64;
11
     self->images = calloc(self->images_capacity, sizeof(Image));
(-)a/x11/kitty/files/patch-kitty_line.c (-11 lines)
Removed Link Here
1
--- kitty/line.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/line.c
3
@@ -944,7 +944,7 @@ PyTypeObject Line_Type = {
4
     .tp_new = new
5
 };
6
 
7
-Line *alloc_line() {
8
+Line *alloc_line(void) {
9
     Line *ans = (Line*)PyType_GenericAlloc(&Line_Type, 0);
10
     ans->needs_free = 0;
11
     return ans;
(-)a/x11/kitty/files/patch-kitty_mouse.c (-20 lines)
Removed Link Here
1
--- kitty/mouse.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/mouse.c
3
@@ -639,7 +639,7 @@ closest_window_for_event(unsigned int *window_idx) {
4
 }
5
 
6
 void
7
-focus_in_event() {
8
+focus_in_event(void) {
9
     // Ensure that no URL is highlighted and the mouse cursor is in default shape
10
     bool in_tab_bar;
11
     unsigned int window_idx = 0;
12
@@ -653,7 +653,7 @@ focus_in_event() {
13
 }
14
 
15
 void
16
-enter_event() {
17
+enter_event(void) {
18
 #ifdef __APPLE__
19
     // On cocoa there is no way to configure the window manager to
20
     // focus windows on mouse enter, so we do it ourselves
(-)a/x11/kitty/files/patch-kitty_shaders.c (-20 lines)
Removed Link Here
1
--- kitty/shaders.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/shaders.c
3
@@ -223,7 +223,7 @@ init_cell_program(void) {
4
 #define CELL_BUFFERS enum { cell_data_buffer, selection_buffer, uniform_buffer };
5
 
6
 ssize_t
7
-create_cell_vao() {
8
+create_cell_vao(void) {
9
     ssize_t vao_idx = create_vao();
10
 #define A(name, size, dtype, offset, stride) \
11
     add_attribute_to_vao(CELL_PROGRAM, vao_idx, #name, \
12
@@ -246,7 +246,7 @@ create_cell_vao() {
13
 }
14
 
15
 ssize_t
16
-create_graphics_vao() {
17
+create_graphics_vao(void) {
18
     ssize_t vao_idx = create_vao();
19
     add_buffer_to_vao(vao_idx, GL_ARRAY_BUFFER);
20
     add_attribute_to_vao(GRAPHICS_PROGRAM, vao_idx, "src", 4, GL_FLOAT, 0, NULL, 0);
(-)a/x11/kitty/files/patch-kitty_state.c (-11 lines)
Removed Link Here
1
--- kitty/state.c.orig	2022-11-07 10:06:42 UTC
2
+++ kitty/state.c
3
@@ -187,7 +187,7 @@ free_bgimage(BackgroundImage **bgimage, bool release_t
4
 }
5
 
6
 OSWindow*
7
-add_os_window() {
8
+add_os_window(void) {
9
     WITH_OS_WINDOW_REFS
10
     ensure_space_for(&global_state, os_windows, OSWindow, global_state.num_os_windows + 1, capacity, 1, true);
11
     OSWindow *ans = global_state.os_windows + global_state.num_os_windows++;
(-)b/x11/kitty/files/patch-setup.py (-2 / +2 lines)
Lines 1-6 Link Here
1
--- setup.py.orig	2022-10-19 17:45:56 UTC
1
--- setup.py.orig	2023-04-08 12:02:15 UTC
2
+++ setup.py
2
+++ setup.py
3
@@ -130,25 +130,9 @@ def libcrypto_flags() -> Tuple[List[str], List[str]]:
3
@@ -126,25 +126,9 @@ def libcrypto_flags() -> Tuple[List[str], List[str]]:
4
     # Apple use their special snowflake TLS libraries and additionally
4
     # Apple use their special snowflake TLS libraries and additionally
5
     # have an ancient broken system OpenSSL, so we need to check for one
5
     # have an ancient broken system OpenSSL, so we need to check for one
6
     # installed by all the various macOS package managers.
6
     # installed by all the various macOS package managers.
(-)b/x11/kitty/pkg-plist (-4 lines)
Lines 49-55 lib/kitty/kittens/show_key/__init__.py Link Here
49
lib/kitty/kittens/show_key/kitty_mode.py
49
lib/kitty/kittens/show_key/kitty_mode.py
50
lib/kitty/kittens/show_key/main.py
50
lib/kitty/kittens/show_key/main.py
51
lib/kitty/kittens/ssh/__init__.py
51
lib/kitty/kittens/ssh/__init__.py
52
lib/kitty/kittens/ssh/completion.py
53
lib/kitty/kittens/ssh/config.py
52
lib/kitty/kittens/ssh/config.py
54
lib/kitty/kittens/ssh/copy.py
53
lib/kitty/kittens/ssh/copy.py
55
lib/kitty/kittens/ssh/main.py
54
lib/kitty/kittens/ssh/main.py
Lines 102-108 lib/kitty/kitty/cli.py Link Here
102
lib/kitty/kitty/cli_stub.py
101
lib/kitty/kitty/cli_stub.py
103
lib/kitty/kitty/client.py
102
lib/kitty/kitty/client.py
104
lib/kitty/kitty/clipboard.py
103
lib/kitty/kitty/clipboard.py
105
lib/kitty/kitty/complete.py
106
lib/kitty/kitty/conf/__init__.py
104
lib/kitty/kitty/conf/__init__.py
107
lib/kitty/kitty/conf/generate.py
105
lib/kitty/kitty/conf/generate.py
108
lib/kitty/kitty/conf/types.py
106
lib/kitty/kitty/conf/types.py
Lines 189-195 lib/kitty/kitty/remote_control.py Link Here
189
lib/kitty/kitty/rgb.py
187
lib/kitty/kitty/rgb.py
190
lib/kitty/kitty/search_query_parser.py
188
lib/kitty/kitty/search_query_parser.py
191
lib/kitty/kitty/session.py
189
lib/kitty/kitty/session.py
192
lib/kitty/kitty/shell.py
193
lib/kitty/kitty/shell_integration.py
190
lib/kitty/kitty/shell_integration.py
194
lib/kitty/kitty/shm.py
191
lib/kitty/kitty/shm.py
195
lib/kitty/kitty/short_uuid.py
192
lib/kitty/kitty/short_uuid.py
Lines 210-216 lib/kitty/logo/kitty-128.png Link Here
210
lib/kitty/logo/kitty.png
207
lib/kitty/logo/kitty.png
211
lib/kitty/shell-integration/bash/kitty.bash
208
lib/kitty/shell-integration/bash/kitty.bash
212
lib/kitty/shell-integration/fish/vendor_completions.d/clone-in-kitty.fish
209
lib/kitty/shell-integration/fish/vendor_completions.d/clone-in-kitty.fish
213
lib/kitty/shell-integration/fish/vendor_completions.d/edit-in-kitty.fish
214
lib/kitty/shell-integration/fish/vendor_completions.d/kitty.fish
210
lib/kitty/shell-integration/fish/vendor_completions.d/kitty.fish
215
lib/kitty/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
211
lib/kitty/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
216
lib/kitty/shell-integration/ssh/askpass.py
212
lib/kitty/shell-integration/ssh/askpass.py

Return to bug 270703