From nobody Thu Apr 20 13:35:51 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q2JZb5HW9z465DT; Thu, 20 Apr 2023 13:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q2JZb2Rpgz453w; Thu, 20 Apr 2023 13:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681997751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzzHJnynpkGoJbcNZ6OIZRDnDiJLKgu/lxSop+LtHQM=; b=q6+cYzOuQr1gDTxX8OV8YAzNgGJlKKm54v1sDRwWO2WcyByLIfxwBN/VNvUp2rfTPBRxhL BT2oWNBLPMmSnuiQOiv9IVzqgQsQKzLC20hsyvpmJE8XHB/WD9hjDaR7IyHntD2f5u7G0/ MpE47Ck0YNSBbpe3A3OcwzTFOPS7q8BXUsZlgQP32lizGA1hbjhZNb713QOddC4iai7dRJ CN+D9O4cmnCAILpW1BAFY8vCNSsqYJEz1rfHADUUp0fp4/4u2K71/p6g5F88Io7gFEfnlR ffyzJwl4kglP8F8/YGR/a5jpEwadNucjz5hKZMW5fiOQ1ZZe+Icc6egqfB0dcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681997751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzzHJnynpkGoJbcNZ6OIZRDnDiJLKgu/lxSop+LtHQM=; b=Q8aLFSKWM7K5MpOJE0qZ7uU3Svn4NH7vB4nerMRidGIm4f8xTwHAOxtUxN/B2KMTcDvWEe cTN8i8Wfi9JbBHJUpRiNNzSw825P8/3718ifMO6X72Irb0cWpUkoC6gKbs6BaHWPsWYZJK 2M1s6PkxM9nM9pLu3TiLM7JWvkYKDzgmWNwvUtbr/bOT2G+qcG05iYlyqHq65EBDHL+BH2 Y8J82Dsr+CoTORJZJGgBbNCBMmMo0BMg5SukgKfFBCC3sQ9+QOp6nZ27J8jELZ2al39SQ3 MYZ9QycdUirnFIvCrzHSDs378f7J57ObMIlA1znIzFuvGoYq2dkYJOKiAMNNQg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681997751; a=rsa-sha256; cv=none; b=DVDx9QrcPC/xCiQvdYMgrWa8EhKG1ivHUX7n135t7mSEkJJFqymgMtrTjb7AqjunOvMz15 E21tcCO3XVEnr1BRFdRhhp1mBTxPOVLnCwh66JiXN0E/y8gF960rghbV+wGt9u70YYf59A hw6XAKUgXKCfJmx4bq/t7EvnMAlEHky7K4QNPjy27L6SWckkPYoOZd8ewAB9yDAnbOn6yG IEHOXjf9j0YZXZ9+32xH0IVjZyyFkfFIaZZVohJPd5AMZylKEmgh5EliarNeT+GLWtkxdS MYbGgYSvT94KyCrjx9lDZl6pWj3tYP7FWTrrJKwEj5LLDYziNqUuT/m4M6e3EA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Q2JZb0SdhzfVk; Thu, 20 Apr 2023 13:35:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33KDZpe4081707; Thu, 20 Apr 2023 13:35:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33KDZpPu081706; Thu, 20 Apr 2023 13:35:51 GMT (envelope-from git) Date: Thu, 20 Apr 2023 13:35:51 GMT Message-Id: <202304201335.33KDZpPu081706@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: a7f1c84d7794 - main - x11/kitty: update to 0.28.0 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7f1c84d77946c9f27714088099183c2344642b0 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7f1c84d77946c9f27714088099183c2344642b0 commit a7f1c84d77946c9f27714088099183c2344642b0 Author: Alexis Praga AuthorDate: 2023-04-20 09:39:59 +0000 Commit: Robert Clausecker CommitDate: 2023-04-20 11:49:24 +0000 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 --- x11/kitty/Makefile | 24 +++++++++++---- x11/kitty/distinfo | 8 +++-- x11/kitty/files/patch-docs_Makefile | 11 +++++++ x11/kitty/files/patch-glfw_dbus__glfw.c | 20 ------------- x11/kitty/files/patch-glfw_wl__window.c | 17 ----------- .../files/patch-kittens_choose_unix__compat.c | 11 ------- x11/kitty/files/patch-kitty_colors.c | 20 ------------- x11/kitty/files/patch-kitty_cursor.c | 11 ------- x11/kitty/files/patch-kitty_data-types.c | 19 ------------ x11/kitty/files/patch-kitty_gl-wrapper.h | 20 ------------- x11/kitty/files/patch-kitty_gl.c | 11 ------- x11/kitty/files/patch-kitty_glfw.c | 20 ------------- x11/kitty/files/patch-kitty_graphics.c | 11 ------- x11/kitty/files/patch-kitty_line.c | 11 ------- x11/kitty/files/patch-kitty_mouse.c | 20 ------------- x11/kitty/files/patch-kitty_shaders.c | 20 ------------- x11/kitty/files/patch-kitty_state.c | 11 ------- x11/kitty/files/patch-setup.py | 4 +-- x11/kitty/pkg-plist | 34 +++------------------- 19 files changed, 41 insertions(+), 262 deletions(-) diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 32f26499bf00..0dbbb82ab2e2 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -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 diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo index 5feb6edf5842..a4084b379ba1 100644 --- 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 new file mode 100644 index 000000000000..80e46e007c2f --- /dev/null +++ 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 deleted file mode 100644 index 85ea778b05d6..000000000000 --- a/x11/kitty/files/patch-glfw_dbus__glfw.c +++ /dev/null @@ -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; - } diff --git a/x11/kitty/files/patch-glfw_wl__window.c b/x11/kitty/files/patch-glfw_wl__window.c deleted file mode 100644 index 652ee6f5ece4..000000000000 --- a/x11/kitty/files/patch-glfw_wl__window.c +++ /dev/null @@ -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); - } diff --git a/x11/kitty/files/patch-kittens_choose_unix__compat.c b/x11/kitty/files/patch-kittens_choose_unix__compat.c deleted file mode 100644 index 35b3ae9268d3..000000000000 --- a/x11/kitty/files/patch-kittens_choose_unix__compat.c +++ /dev/null @@ -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); - } - diff --git a/x11/kitty/files/patch-kitty_colors.c b/x11/kitty/files/patch-kitty_colors.c deleted file mode 100644 index 15c60494844a..000000000000 --- a/x11/kitty/files/patch-kitty_colors.c +++ /dev/null @@ -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); - } - diff --git a/x11/kitty/files/patch-kitty_cursor.c b/x11/kitty/files/patch-kitty_cursor.c deleted file mode 100644 index 08349bb6598e..000000000000 --- a/x11/kitty/files/patch-kitty_cursor.c +++ /dev/null @@ -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); - } - diff --git a/x11/kitty/files/patch-kitty_data-types.c b/x11/kitty/files/patch-kitty_data-types.c deleted file mode 100644 index 5c841378f385..000000000000 --- a/x11/kitty/files/patch-kitty_data-types.c +++ /dev/null @@ -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 - - 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); diff --git a/x11/kitty/files/patch-kitty_gl-wrapper.h b/x11/kitty/files/patch-kitty_gl-wrapper.h deleted file mode 100644 index 3d8b89f3c401..000000000000 --- a/x11/kitty/files/patch-kitty_gl-wrapper.h +++ /dev/null @@ -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; diff --git a/x11/kitty/files/patch-kitty_gl.c b/x11/kitty/files/patch-kitty_gl.c deleted file mode 100644 index 83b688fd1e13..000000000000 --- a/x11/kitty/files/patch-kitty_gl.c +++ /dev/null @@ -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); diff --git a/x11/kitty/files/patch-kitty_glfw.c b/x11/kitty/files/patch-kitty_glfw.c deleted file mode 100644 index 663733c59190..000000000000 --- a/x11/kitty/files/patch-kitty_glfw.c +++ /dev/null @@ -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(); - } - diff --git a/x11/kitty/files/patch-kitty_graphics.c b/x11/kitty/files/patch-kitty_graphics.c deleted file mode 100644 index 797047a55c2a..000000000000 --- a/x11/kitty/files/patch-kitty_graphics.c +++ /dev/null @@ -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)); diff --git a/x11/kitty/files/patch-kitty_line.c b/x11/kitty/files/patch-kitty_line.c deleted file mode 100644 index c8e33052545e..000000000000 --- a/x11/kitty/files/patch-kitty_line.c +++ /dev/null @@ -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; diff --git a/x11/kitty/files/patch-kitty_mouse.c b/x11/kitty/files/patch-kitty_mouse.c deleted file mode 100644 index 3c66acf716c0..000000000000 --- a/x11/kitty/files/patch-kitty_mouse.c +++ /dev/null @@ -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 diff --git a/x11/kitty/files/patch-kitty_shaders.c b/x11/kitty/files/patch-kitty_shaders.c deleted file mode 100644 index 9b6fe49153ff..000000000000 --- a/x11/kitty/files/patch-kitty_shaders.c +++ /dev/null @@ -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); diff --git a/x11/kitty/files/patch-kitty_state.c b/x11/kitty/files/patch-kitty_state.c deleted file mode 100644 index 6107f027f8dd..000000000000 --- a/x11/kitty/files/patch-kitty_state.c +++ /dev/null @@ -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++; diff --git a/x11/kitty/files/patch-setup.py b/x11/kitty/files/patch-setup.py index a0d54d1c5a3b..8e2753461889 100644 --- 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. diff --git a/x11/kitty/pkg-plist b/x11/kitty/pkg-plist index a911dc0d1b30..a7873f395480 100644 --- a/x11/kitty/pkg-plist +++ b/x11/kitty/pkg-plist @@ -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