Attachment 230935 Details for Bug 261132 – v0.24.1

[patch] v0.24.1

kitty24.1.patch (text/plain), 5.92 KB, created by Alexis Praga on 2022-01-11 22:25:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexis Praga

Created: 2022-01-11 22:25:09 UTC

Size: 5.92 KB

patch

obsolete

>diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile
>index dd62231775..2ee52c8f63 100644
>--- a/x11/kitty/Makefile
>+++ b/x11/kitty/Makefile
>@@ -1,7 +1,6 @@
> PORTNAME=	kitty
> DISTVERSIONPREFIX=	v
>-DISTVERSION=	0.23.1
>-PORTREVISION=	1
>+DISTVERSION=	0.24.1
> CATEGORIES=	x11
> 
> MAINTAINER=	alexis.praga@free.fr
>@@ -22,6 +21,7 @@ LIB_DEPENDS=	libdbus-1.so:devel/dbus \
> 		libharfbuzz.so:print/harfbuzz \
> 		liblcms2.so:graphics/lcms2 \
> 		libpng.so:graphics/png \
>+		librsync.so:net/librsync \
> 		libwayland-client.so:graphics/wayland \
> 		libwayland-cursor.so:graphics/wayland \
> 		libxkbcommon.so:x11/libxkbcommon
>@@ -49,7 +49,9 @@ _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
>+		lib/kitty/kittens/choose/subseq_matcher.so bin/kitty \
>+		lib/kitty/kittens/transfer/rsync.so
>+
> _EMPTY_DIRS=	kittens/choose kittens/diff kittens/unicode_input kittens kitty
> 
> .include <bsd.port.options.mk>
>@@ -58,9 +60,10 @@ _EMPTY_DIRS=	kittens/choose kittens/diff kittens/unicode_input kittens kitty
> MAKE_ENV+=	KITTY_NO_LTO=1
> .endif
> 
>+# For librsync, we need to set header and library path
> do-build:
> 	(cd ${WRKSRC} && \
>-		${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py linux-package --update-check-interval 0)
>+	        ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py linux-package --update-check-interval 0 --extra-include-dirs ${LOCALBASE}/include/ --extra-library-dirs ${LOCALBASE}/lib)
> 	${FIND} ${INSTALL_WRKSRC} -name __pycache__ -type d -exec ${RM} -r -- {} +
> 
> do-install:
>diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo
>index 48a9139f7f..e5d90811e2 100644
>--- a/x11/kitty/distinfo
>+++ b/x11/kitty/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1629491279
>-SHA256 (kovidgoyal-kitty-v0.23.1_GH0.tar.gz) = 32d3344e357da7012227d49d5031bff254bb8735f3b9edabdb46cfd13cb0e44d
>-SIZE (kovidgoyal-kitty-v0.23.1_GH0.tar.gz) = 5718451
>+TIMESTAMP = 1641939405
>+SHA256 (kovidgoyal-kitty-v0.24.1_GH0.tar.gz) = a49b7ea7d36989fb17bd31935dc6a9a619338647c58ca1eb00400340b0d756ff
>+SIZE (kovidgoyal-kitty-v0.24.1_GH0.tar.gz) = 5828079
>diff --git a/x11/kitty/files/patch-kitty_child.py b/x11/kitty/files/patch-kitty_child.py
>index d55816ecc8..dfae470858 100644
>--- a/x11/kitty/files/patch-kitty_child.py
>+++ b/x11/kitty/files/patch-kitty_child.py
>@@ -4,7 +4,7 @@
>              return list(filter(None, f.read().decode('utf-8').split('\0')))
>  
>      def cwd_of_process(pid: int) -> str:
>--        ans = '/proc/{}/cwd'.format(pid)
>+-        ans = f'/proc/{pid}/cwd'
> +        ans = subprocess.run(["pwdx", pid], capture_output=True).stdout.split()[1].decode("utf-8")
>          return os.path.realpath(ans)
>  
>diff --git a/x11/kitty/pkg-plist b/x11/kitty/pkg-plist
>index 0ff4d61b6c..bca76f19b1 100644
>--- a/x11/kitty/pkg-plist
>+++ b/x11/kitty/pkg-plist
>@@ -32,6 +32,8 @@ lib/kitty/kittens/hyperlinked_grep/__init__.py
> lib/kitty/kittens/hyperlinked_grep/main.py
> lib/kitty/kittens/icat/__init__.py
> lib/kitty/kittens/icat/main.py
>+lib/kitty/kittens/mouse_demo/__init__.py
>+lib/kitty/kittens/mouse_demo/main.py
> lib/kitty/kittens/panel/__init__.py
> lib/kitty/kittens/panel/main.py
> lib/kitty/kittens/query_terminal/__init__.py
>@@ -52,6 +54,13 @@ lib/kitty/kittens/ssh/main.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
>+lib/kitty/kittens/transfer/main.py
>+lib/kitty/kittens/transfer/receive.py
>+lib/kitty/kittens/transfer/rsync.so
>+lib/kitty/kittens/transfer/send.py
>+lib/kitty/kittens/transfer/utils.py
> lib/kitty/kittens/tui/__init__.py
> lib/kitty/kittens/tui/dircolors.py
> lib/kitty/kittens/tui/handler.py
>@@ -61,6 +70,8 @@ lib/kitty/kittens/tui/loop.py
> lib/kitty/kittens/tui/operations.py
> lib/kitty/kittens/tui/operations_stub.py
> lib/kitty/kittens/tui/path_completer.py
>+lib/kitty/kittens/tui/progress.py
>+lib/kitty/kittens/tui/spinners.py
> lib/kitty/kittens/tui/utils.py
> lib/kitty/kittens/unicode_input/__init__.py
> lib/kitty/kittens/unicode_input/main.py
>@@ -91,6 +102,7 @@ lib/kitty/kitty/config.py
> lib/kitty/kitty/constants.py
> lib/kitty/kitty/debug_config.py
> lib/kitty/kitty/fast_data_types.so
>+lib/kitty/kitty/file_transmission.py
> lib/kitty/kitty/fonts/__init__.py
> lib/kitty/kitty/fonts/box_drawing.py
> lib/kitty/kitty/fonts/core_text.py
>@@ -149,19 +161,25 @@ lib/kitty/kitty/rc/remove_marker.py
> lib/kitty/kitty/rc/resize_os_window.py
> lib/kitty/kitty/rc/resize_window.py
> lib/kitty/kitty/rc/scroll_window.py
>+lib/kitty/kitty/rc/select_window.py
> lib/kitty/kitty/rc/send_text.py
> lib/kitty/kitty/rc/set_background_image.py
> lib/kitty/kitty/rc/set_background_opacity.py
> lib/kitty/kitty/rc/set_colors.py
>+lib/kitty/kitty/rc/set_enabled_layouts.py
> lib/kitty/kitty/rc/set_font_size.py
> lib/kitty/kitty/rc/set_spacing.py
>+lib/kitty/kitty/rc/set_tab_color.py
> lib/kitty/kitty/rc/set_tab_title.py
>+lib/kitty/kitty/rc/set_window_logo.py
> lib/kitty/kitty/rc/set_window_title.py
> lib/kitty/kitty/rc/signal_child.py
> lib/kitty/kitty/remote_control.py
> lib/kitty/kitty/rgb.py
> lib/kitty/kitty/session.py
> lib/kitty/kitty/shell.py
>+lib/kitty/kitty/shell_integration.py
>+lib/kitty/kitty/short_uuid.py
> lib/kitty/kitty/tab_bar.py
> lib/kitty/kitty/tabs.py
> lib/kitty/kitty/terminfo.py
>@@ -177,6 +195,13 @@ lib/kitty/logo/beam-cursor.png
> lib/kitty/logo/beam-cursor@2x.png
> 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/kitty.fish
>+lib/kitty/shell-integration/fish/vendor_conf.d/kitty-shell-integration.fish
>+lib/kitty/shell-integration/zsh/.zshenv
>+lib/kitty/shell-integration/zsh/completions/_kitty
>+lib/kitty/shell-integration/zsh/kitty-integration
>+lib/kitty/shell-integration/zsh/kitty.zsh
> lib/kitty/terminfo/x/xterm-kitty
> share/applications/kitty.desktop
> share/icons/hicolor/256x256/apps/kitty.png

Actions: View | Diff

Attachments on bug 261132: 230935