x11/kitty: Update to 0.42.1

- Remove a couple of patches included upstream
- Don't build HTML files when DOCS option is off (only manpages)
- Pet portfmt

Release changes:  https://sw.kovidgoyal.net/kitty/changelog/#detailed-list-of-changes
This commit is contained in:
Nicola Vitale
2025-06-14 11:45:31 +02:00
parent da1f8240f6
commit 4187cfa2f4
6 changed files with 64 additions and 53 deletions
+8 -7
View File
@@ -1,7 +1,7 @@
PORTNAME= kitty
DISTVERSIONPREFIX= v
DISTVERSION= 0.41.1
PORTREVISION= 2
DISTVERSION= 0.42.1
PORTREVISION= 0
CATEGORIES= x11 wayland
MAINTAINER= nivit@FreeBSD.org
@@ -17,12 +17,13 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${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} \
nerd-fonts>=3.1.1:x11-fonts/nerd-fonts \
roboto-fonts-ttf>=2.134:x11-fonts/roboto-fonts-ttf \
simde>=0.7.6:devel/simde \
sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \
urw-base35-fonts>=20200910:x11-fonts/urw-base35-fonts \
wayland-protocols>=0:graphics/wayland-protocols \
roboto-fonts-ttf>=2.134:x11-fonts/roboto-fonts-ttf
LIB_DEPENDS= libcanberra.so:audio/libcanberra \
wayland-protocols>=0:graphics/wayland-protocols
LIB_DEPENDS= libcairo.so:graphics/cairo \
libcanberra.so:audio/libcanberra \
libdbus-1.so:devel/dbus \
libepoll-shim-interpose.so:devel/libepoll-shim \
libfontconfig.so:x11-fonts/fontconfig \
@@ -42,7 +43,6 @@ USES= compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \
CPE_VENDOR= kitty_project
USE_GL= gl
USE_GNOME= cairo
USE_XORG= x11 xcb xcursor xi xinerama xrandr
SHEBANG_FILES= build-terminfo count-lines-of-code update-on-ox
@@ -50,7 +50,7 @@ SHEBANG_GLOB= *.py
GO_MODULE= github.com/kovidgoyal/kitty
MAKE_ENV= PYTHONDONTWRITEBYTECODE=1 BUILD_DOCS=yes
MAKE_ENV= PYTHONDONTWRITEBYTECODE=1
TEST_ENV= PATH="${STAGEDIR}${PREFIX}/bin:${PATH}"
TEST_TARGET= test
@@ -71,6 +71,7 @@ _STRIP_TARGETS= kitty/fast_data_types.so kitty/glfw-x11.so \
_EMPTY_DIRS= kittens/choose kittens/diff kittens/unicode_input kittens kitty
OPTIONS_DEFINE= DOCS
DOCS_MAKE_ENV= BUILD_DOCS=yes
.include <bsd.port.options.mk>
+5 -5
View File
@@ -1,5 +1,5 @@
TIMESTAMP = 1743750004
SHA256 (go/x11_kitty/kitty-v0.41.1/v0.41.1.mod) = 4d8cf5408097a5323dce3d94e1550aef6b99d300892c8702c1e08baebb3ade25
SIZE (go/x11_kitty/kitty-v0.41.1/v0.41.1.mod) = 1259
SHA256 (go/x11_kitty/kitty-v0.41.1/v0.41.1.zip) = f2c380c076aaf73aa298498f83c02fab7b5ca032a1303f3034ca9543b9571032
SIZE (go/x11_kitty/kitty-v0.41.1/v0.41.1.zip) = 6869920
TIMESTAMP = 1749805387
SHA256 (go/x11_kitty/kitty-v0.42.1/v0.42.1.mod) = 26d99beac179dc5f3577bbacd241f4990d531c677c02c252277666e92d8a5df1
SIZE (go/x11_kitty/kitty-v0.42.1/v0.42.1.mod) = 1281
SHA256 (go/x11_kitty/kitty-v0.42.1/v0.42.1.zip) = 61183c0dfb0f4e4c0a439bfd4d6ee11717b55b9ff4d8c32da4f051b6a4ae94d7
SIZE (go/x11_kitty/kitty-v0.42.1/v0.42.1.zip) = 10214652
-13
View File
@@ -1,13 +0,0 @@
--- glfw/wl_platform.h.orig 1979-11-29 21:00:00 UTC
+++ glfw/wl_platform.h
@@ -130,6 +130,10 @@ typedef enum WaylandWindowState {
TOPLEVEL_STATE_TILED_TOP = 64,
TOPLEVEL_STATE_TILED_BOTTOM = 128,
TOPLEVEL_STATE_SUSPENDED = 256,
+ TOPLEVEL_STATE_CONSTRAINED_LEFT = 512,
+ TOPLEVEL_STATE_CONSTRAINED_RIGHT = 1024,
+ TOPLEVEL_STATE_CONSTRAINED_TOP = 2048,
+ TOPLEVEL_STATE_CONSTRAINED_BOTTOM = 4096,
} WaylandWindowState;
typedef struct glfw_wl_xdg_activation_request {
-15
View File
@@ -1,15 +0,0 @@
--- glfw/wl_window.c.orig 1979-11-29 21:00:00 UTC
+++ glfw/wl_window.c
@@ -679,6 +679,12 @@ xdgToplevelHandleConfigure(void* data,
#ifdef XDG_TOPLEVEL_STATE_SUSPENDED_SINCE_VERSION
C(TOPLEVEL_STATE_SUSPENDED);
#endif
+#ifdef XDG_TOPLEVEL_STATE_CONSTRAINED_LEFT_SINCE_VERSION
+ C(TOPLEVEL_STATE_CONSTRAINED_LEFT);
+ C(TOPLEVEL_STATE_CONSTRAINED_RIGHT);
+ C(TOPLEVEL_STATE_CONSTRAINED_TOP);
+ C(TOPLEVEL_STATE_CONSTRAINED_BOTTOM);
+#endif
#undef C
}
}
+23 -6
View File
@@ -1,13 +1,30 @@
--- setup.py.orig 1979-11-29 23:00:00 UTC
+++ setup.py
@@ -1333,8 +1333,8 @@ def create_linux_bundle_gunk(ddir: str, args: Options)
base = Path(ddir)
@@ -1432,12 +1432,16 @@ def create_linux_bundle_gunk(ddir: str, args: Options)
in_src_launcher = base / (f'{libdir_name}/kitty/kitty/launcher/kitty')
launcher = base / 'bin/kitty'
- skip_docs = False
- if not os.path.exists('docs/_build/html'):
+ skip_docs = os.getenv('BUILD_DOCS') != 'yes'
+ if not os.path.exists('docs/_build/html') and not skip_docs:
skip_docs = False
+ build_docs = os.getenv('BUILD_DOCS') == 'yes'
if not os.path.exists('docs/_build/html'):
kitten_exe = os.path.join(os.path.dirname(str(launcher)), 'kitten')
if os.path.exists(kitten_exe):
os.environ['KITTEN_EXE_FOR_DOCS'] = kitten_exe
make = 'gmake' if is_freebsd else 'make'
- run_tool([make, 'docs'])
+ if build_docs:
+ run_tool([make, 'docs'])
+ else:
+ run_tool([make, 'man'])
else:
if args.skip_building_kitten:
skip_docs = True
@@ -1448,7 +1452,8 @@ def create_linux_bundle_gunk(ddir: str, args: Options)
raise SystemExit(f'kitten binary not found at: {kitten_exe}')
if not skip_docs:
copy_man_pages(ddir)
- copy_html_docs(ddir)
+ if build_docs:
+ copy_html_docs(ddir)
for (icdir, ext) in {'256x256': 'png', 'scalable': 'svg'}.items():
icdir = os.path.join(ddir, 'share', 'icons', 'hicolor', icdir, 'apps')
safe_makedirs(icdir)
+28 -7
View File
@@ -2,6 +2,7 @@ bin/kitten
bin/kitty
share/applications/kitty-open.desktop
share/applications/kitty.desktop
%%PORTDOCS%%%%DOCSDIR%%/_downloads/055e3591463099e42785a872ce39996a/quick_access_terminal.conf
%%PORTDOCS%%%%DOCSDIR%%/_downloads/433dadebd0bf504f8b008985378086ce/kitty.conf
%%PORTDOCS%%%%DOCSDIR%%/_downloads/a489ebbb52d84eeb19a12b2fda7debda/diff.conf
%%PORTDOCS%%%%DOCSDIR%%/_downloads/f0a0de9ec8d9ff4456206db8e0814937/rowcolumn-diacritics.txt
@@ -10,12 +11,14 @@ share/applications/kitty.desktop
%%PORTDOCS%%%%DOCSDIR%%/_images/font-fine-tune.png
%%PORTDOCS%%%%DOCSDIR%%/_images/hints_mode.png
%%PORTDOCS%%%%DOCSDIR%%/_images/panel.png
%%PORTDOCS%%%%DOCSDIR%%/_images/quake-hypr.webp
%%PORTDOCS%%%%DOCSDIR%%/_images/quake-macos.webp
%%PORTDOCS%%%%DOCSDIR%%/_images/remote_file.png
%%PORTDOCS%%%%DOCSDIR%%/_images/screenshot.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_actions_1745a1bd.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_binary_478594b0.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_build_e554a463.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_changelog_28f2229d.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_changelog_bb1bec17.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_clipboard_673291d1.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_color-stack_b2e66ffc.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_conf_6d817f14.png
@@ -46,8 +49,9 @@ share/applications/kitty.desktop
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_icat_8f870112.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_intro_2aa247aa.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_notify_4b21ed12.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_panel_acc427d1.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_panel_f0055a23.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_query_terminal_bcf6bdb9.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_quick-access-terminal_cdc578f3.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_remote_file_c5782e6e.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_ssh_d0cb65fa.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_themes_72ee7bcd.png
@@ -58,13 +62,14 @@ share/applications/kitty.desktop
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_mapping_aea5afa6.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_marks_66066db1.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_misc-protocol_baba0cc2.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_open_actions_c69b3759.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_open_actions_b5f13270.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_overview_249bd848.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_performance_fb7e6752.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_pipe_168d77ad.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_pointer-shapes_96e448ee.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_press-mentions_84bca3c2.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_protocol-extensions_ea5204ed.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_quake-screenshots_d232c5bb.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_quickstart_9d1a56df.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_rc_protocol_ea1138ef.png
%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_remote-control_7371e6b3.png
@@ -112,6 +117,7 @@ share/applications/kitty.desktop
%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/notify.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/panel.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/query_terminal.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/quick-access-terminal.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/remote_file.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/ssh.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/kittens/themes.rst.txt
@@ -130,6 +136,7 @@ share/applications/kitty.desktop
%%PORTDOCS%%%%DOCSDIR%%/_sources/pointer-shapes.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/press-mentions.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/protocol-extensions.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quake-screenshots.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/quickstart.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/rc_protocol.rst.txt
%%PORTDOCS%%%%DOCSDIR%%/_sources/remote-control.rst.txt
@@ -213,6 +220,7 @@ share/applications/kitty.desktop
%%PORTDOCS%%%%DOCSDIR%%/kittens/notify.html
%%PORTDOCS%%%%DOCSDIR%%/kittens/panel.html
%%PORTDOCS%%%%DOCSDIR%%/kittens/query_terminal.html
%%PORTDOCS%%%%DOCSDIR%%/kittens/quick-access-terminal.html
%%PORTDOCS%%%%DOCSDIR%%/kittens/remote_file.html
%%PORTDOCS%%%%DOCSDIR%%/kittens/ssh.html
%%PORTDOCS%%%%DOCSDIR%%/kittens/themes.html
@@ -232,6 +240,7 @@ share/applications/kitty.desktop
%%PORTDOCS%%%%DOCSDIR%%/pointer-shapes.html
%%PORTDOCS%%%%DOCSDIR%%/press-mentions.html
%%PORTDOCS%%%%DOCSDIR%%/protocol-extensions.html
%%PORTDOCS%%%%DOCSDIR%%/quake-screenshots.html
%%PORTDOCS%%%%DOCSDIR%%/quickstart.html
%%PORTDOCS%%%%DOCSDIR%%/rc_protocol.html
%%PORTDOCS%%%%DOCSDIR%%/remote-control.html
@@ -356,6 +365,14 @@ share/icons/hicolor/scalable/apps/kitty.svg
%%DATADIR%%/kittens/query_terminal/__pycache__/main%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kittens/query_terminal/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
%%DATADIR%%/kittens/query_terminal/main.py
%%DATADIR%%/kittens/quick_access_terminal/__init__.py
%%DATADIR%%/kittens/quick_access_terminal/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kittens/quick_access_terminal/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kittens/quick_access_terminal/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc
%%DATADIR%%/kittens/quick_access_terminal/__pycache__/main%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kittens/quick_access_terminal/__pycache__/main%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kittens/quick_access_terminal/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc
%%DATADIR%%/kittens/quick_access_terminal/main.py
%%DATADIR%%/kittens/remote_file/__init__.py
%%DATADIR%%/kittens/remote_file/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kittens/remote_file/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
@@ -585,6 +602,9 @@ share/icons/hicolor/scalable/apps/kitty.svg
%%DATADIR%%/kitty/__pycache__/short_uuid%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kitty/__pycache__/short_uuid%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kitty/__pycache__/short_uuid%%PYTHON_EXT_SUFFIX%%.pyc
%%DATADIR%%/kitty/__pycache__/simple_cli_definitions%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kitty/__pycache__/simple_cli_definitions%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kitty/__pycache__/simple_cli_definitions%%PYTHON_EXT_SUFFIX%%.pyc
%%DATADIR%%/kitty/__pycache__/tab_bar%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kitty/__pycache__/tab_bar%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kitty/__pycache__/tab_bar%%PYTHON_EXT_SUFFIX%%.pyc
@@ -597,9 +617,9 @@ share/icons/hicolor/scalable/apps/kitty.svg
%%DATADIR%%/kitty/__pycache__/types%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kitty/__pycache__/types%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kitty/__pycache__/types%%PYTHON_EXT_SUFFIX%%.pyc
%%DATADIR%%/kitty/__pycache__/typing%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kitty/__pycache__/typing%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kitty/__pycache__/typing%%PYTHON_EXT_SUFFIX%%.pyc
%%DATADIR%%/kitty/__pycache__/typing_compat%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kitty/__pycache__/typing_compat%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kitty/__pycache__/typing_compat%%PYTHON_EXT_SUFFIX%%.pyc
%%DATADIR%%/kitty/__pycache__/update_check%%PYTHON_EXT_SUFFIX%%.opt-1.pyc
%%DATADIR%%/kitty/__pycache__/update_check%%PYTHON_EXT_SUFFIX%%.opt-2.pyc
%%DATADIR%%/kitty/__pycache__/update_check%%PYTHON_EXT_SUFFIX%%.pyc
@@ -928,6 +948,7 @@ share/icons/hicolor/scalable/apps/kitty.svg
%%DATADIR%%/kitty/shell_integration.py
%%DATADIR%%/kitty/shm.py
%%DATADIR%%/kitty/short_uuid.py
%%DATADIR%%/kitty/simple_cli_definitions.py
%%DATADIR%%/kitty/tab_bar.py
%%DATADIR%%/kitty/tabs.py
%%DATADIR%%/kitty/terminfo.py
@@ -936,7 +957,7 @@ share/icons/hicolor/scalable/apps/kitty.svg
%%DATADIR%%/kitty/trail_fragment.glsl
%%DATADIR%%/kitty/trail_vertex.glsl
%%DATADIR%%/kitty/types.py
%%DATADIR%%/kitty/typing.py
%%DATADIR%%/kitty/typing_compat.py
%%DATADIR%%/kitty/update_check.py
%%DATADIR%%/kitty/utils.py
%%DATADIR%%/kitty/window.py