From nobody Mon Sep 18 18:59:35 2023 X-Original-To: dev-commits-ports-all@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 4RqDcS0kJ0z4tcYr; Mon, 18 Sep 2023 18:59:36 +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 4RqDcS01qkz4Fd8; Mon, 18 Sep 2023 18:59:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695063576; 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=p3du8MZ4lLQrdGi+1/Ks1C07Srvbqbr39K0e0Ka+MsQ=; b=MJBC60WCjkYiSVLQG7VQJLqQE3PsjqSjliKxG26Sto2O6PU8bruxNH6dG9Xbu2l4+9c+7V LzW4rkKpM2fK9KMgvnR8poMbzmO6uhXoFdX0xuxmOG25B3aID+31c6/wbTNqE8kI/25EkO X5BKeHJMAPMeYbkq48ozuO6Nlbcy8v5rcVSCHQX6Ao9OEAV+kdarJlSgqfIui5OstnZ9jl GuWJ9xCezYrGxz1WW18S1XnCkC8krfPZpu1RCGQy+CLKcqzLg/X1dz34PzYUTOQ/iPzSuW jYyfzwAIbfeSY5IxDfcpC9iopAkvFKsG3Bzxl8al3E/hUvK2B6u55u3A2aqjqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695063576; a=rsa-sha256; cv=none; b=WPqQ7JqPxLv/57CoTmUlpW6F4q104Sdp6hPrcHMhn/oU9PajWMFCoZ2mwfnPnxo1peVMCh WLbkbjW0Rw+5D90ljn2ADH+ctCDEqeFomjfJyMIVJ3+EAIo6FU9LgDrsVB/tLuuZ0WdBcR l1cbp8GaISbExuhjyEdkYnitn6GI4OnG3/On2pwzNqfF9NvxQ8W4/1eoIGDPYh++alHAuj K6XHXyR+Ws4PaIwoyFDj8GptRoKkHMiQ1UsQIaRaKYIRXMpZecWipNBnA22An+y83sZS23 LMrQY1SNKPKTKbxH92G16RK47cqSQ413KmkD1hyLJTTPBg6VKSS87TdRZErSwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695063576; 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=p3du8MZ4lLQrdGi+1/Ks1C07Srvbqbr39K0e0Ka+MsQ=; b=opJXzN8qIXDu//9cixaYadYKj/LcO/QcOmXVokT+eZtuATed5qL44/7Yib0+q0zxkThgES ZljSprlQosBpiC3wgJgVyi3UdZrdMDywjWUhfgpPQrjUpZP7XAu811l5yuitmMBmWqswiL DMpPj6Bq8yhc6R3tadFAyvrusd3IbePZn0jjSJuyMCVRe4uBYAT+eeTBE0iY02Zvg2Egqz tEIxfkldfi8ii1Xv3FZ4MpBSqoE1eCFRhTW0ArGGkAd9+eQsLQhJk8OClK2/vMwRk2ItdJ ABGnv488HSbNfpoahtZtwPcsJzT0VLr2lXCLLUfsb5aTQu/8On3PohaJfayQPQ== 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 4RqDcR65DXzjX1; Mon, 18 Sep 2023 18:59:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38IIxZsO044984; Mon, 18 Sep 2023 18:59:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38IIxZZX044981; Mon, 18 Sep 2023 18:59:35 GMT (envelope-from git) Date: Mon, 18 Sep 2023 18:59:35 GMT Message-Id: <202309181859.38IIxZZX044981@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: 38d0c656543e - main - x11/kitty: Update to 0.30.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 38d0c656543ec6b76fd90077be34fb5f1099b8ee Auto-Submitted: auto-generated The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=38d0c656543ec6b76fd90077be34fb5f1099b8ee commit 38d0c656543ec6b76fd90077be34fb5f1099b8ee Author: Nicola Vitale AuthorDate: 2023-09-18 18:57:19 +0000 Commit: Nicola Vitale CommitDate: 2023-09-18 18:59:30 +0000 x11/kitty: Update to 0.30.0 - Add x11-fonts/roboto-fonts-ttf to build dependencies - Add devel/xxhash to lib dependencies - Use version 1.21 of go language - Set up the variable PYTHONDONTWRITEBYTECODE in the build environment to fix the following error in poudriere: =>> Checking for filesystem violations... done =>> Error: Filesystem touched during build: extra: usr/local/lib/python3.9/site-packages/_distutils_hack/__pycache__/__init__.cpython-39.opt-2.pyc It's probably caused by sphinx when building docs. - However, pass the option -OO to python command, in the build stage, so that we can install kitty's bytecode. - Remove files/patch-docs_conf.rst Release notes: https://sw.kovidgoyal.net/kitty/changelog/#id1 --- x11/kitty/Makefile | 15 +++++++++------ x11/kitty/distinfo | 10 +++++----- x11/kitty/files/patch-docs_conf.py | 11 +---------- x11/kitty/files/patch-docs_conf.rst | 18 ------------------ x11/kitty/pkg-plist | 22 +++++++--------------- 5 files changed, 22 insertions(+), 54 deletions(-) diff --git a/x11/kitty/Makefile b/x11/kitty/Makefile index 24abbd9829ef..4b0a3d81ab4d 100644 --- a/x11/kitty/Makefile +++ b/x11/kitty/Makefile @@ -1,7 +1,7 @@ PORTNAME= kitty DISTVERSIONPREFIX= v -DISTVERSION= 0.29.2 -PORTREVISION= 2 +DISTVERSION= 0.30.0 +PORTREVISION= 0 CATEGORIES= x11 wayland MAINTAINER= nivit@FreeBSD.org @@ -16,6 +16,7 @@ BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}furo>0:textproc/py-furo@${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} \ + roboto-fonts-ttf>0:x11-fonts/roboto-fonts-ttf \ sphinx-build:textproc/py-sphinx@${PY_FLAVOR} \ wayland-protocols>=0:graphics/wayland-protocols LIB_DEPENDS= libcanberra.so:audio/libcanberra \ @@ -29,10 +30,11 @@ LIB_DEPENDS= libcanberra.so:audio/libcanberra \ librsync.so:net/librsync \ libwayland-client.so:graphics/wayland \ libwayland-cursor.so:graphics/wayland \ - libxkbcommon.so:x11/libxkbcommon + libxkbcommon.so:x11/libxkbcommon \ + libxxhash.so:devel/xxhash USES= compiler:c11 cpe desktop-file-utils gettext-runtime gl gmake \ - go:modules magick pkgconfig python shebangfix ssl tar:xz \ + go:1.21,modules magick pkgconfig python shebangfix ssl tar:xz \ terminfo xorg CPE_VENDOR= kitty_project GH_TUPLE= ALTree:bigfloat:38c8b72a9924:altree_bigfloat/vendor/github.com/ALTree/bigfloat \ @@ -50,11 +52,12 @@ USE_GL= gl USE_XORG= x11 xcb xcursor xi xinerama xrandr SHEBANG_FILES= build-terminfo count-lines-of-code mypy-editor-integration \ - update-on-ox update-on-ubuntu + update-on-ox SHEBANG_GLOB= *.py GO_MODULE= github.com/kovidgoyal/kitty +MAKE_ENV= PYTHONDONTWRITEBYTECODE=1 TEST_ENV= PATH="${STAGEDIR}${PREFIX}/bin:${PATH}" TEST_TARGET= test @@ -104,7 +107,7 @@ post-patch: # For librsync, we need to set header and library path do-build: (cd ${WRKSRC} && \ - ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} setup.py \ + ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} -OO setup.py \ --extra-include-dirs ${LOCALBASE}/include \ --extra-library-dirs ${LOCALBASE}/lib \ --libdir-name share \ diff --git a/x11/kitty/distinfo b/x11/kitty/distinfo index da3cb307acdd..9354a41f41ff 100644 --- a/x11/kitty/distinfo +++ b/x11/kitty/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1690441790 -SHA256 (go/x11_kitty/kitty-v0.29.2/v0.29.2.mod) = 824f1a4725be13881152b849609fb73128c19513c25ec3e8495a298e627c3c02 -SIZE (go/x11_kitty/kitty-v0.29.2/v0.29.2.mod) = 1063 -SHA256 (go/x11_kitty/kitty-v0.29.2/v0.29.2.zip) = fe377082db2a645e66ffe693465e967c17ba0f0b05d3ce4d4a78c6b430fb2ea4 -SIZE (go/x11_kitty/kitty-v0.29.2/v0.29.2.zip) = 8321800 +TIMESTAMP = 1695020779 +SHA256 (go/x11_kitty/kitty-v0.30.0/v0.30.0.mod) = 50c8a85d659acc58a69cbe704b317a359c8df08f3f36dae5edc343f8dfb515f6 +SIZE (go/x11_kitty/kitty-v0.30.0/v0.30.0.mod) = 1076 +SHA256 (go/x11_kitty/kitty-v0.30.0/v0.30.0.zip) = e0372635de17b0948b93b28d7b2f5dac70e8723341d82ebaced84f559b0a47b6 +SIZE (go/x11_kitty/kitty-v0.30.0/v0.30.0.zip) = 8373252 diff --git a/x11/kitty/files/patch-docs_conf.py b/x11/kitty/files/patch-docs_conf.py index 58693f67f47e..8b651d34b08f 100644 --- a/x11/kitty/files/patch-docs_conf.py +++ b/x11/kitty/files/patch-docs_conf.py @@ -1,14 +1,5 @@ ---- docs/conf.py.orig 2023-08-26 07:33:11 UTC +--- docs/conf.py.orig 2023-09-18 07:09:42 UTC +++ docs/conf.py -@@ -177,7 +177,7 @@ manpages_url = 'https://man7.org/linux/man-pages/man{s - # (source start file, name, description, authors, manual section). - man_pages = [ - ('invocation', 'kitty', 'kitty Documentation', [author], 1), -- ('conf', 'kitty.conf', 'kitty.conf Documentation', [author], 5) -+ ('conf', 'kitty.conf', 'kitty terminal emulator configuration file', [author], 5) - ] - - @@ -207,18 +207,10 @@ def commit_role( name: str, rawtext: str, text: str, lineno: int, inliner: Any, options: Any = {}, content: Any = [] ) -> Tuple[List[nodes.reference], List[nodes.problematic]]: diff --git a/x11/kitty/files/patch-docs_conf.rst b/x11/kitty/files/patch-docs_conf.rst deleted file mode 100644 index b205a7978b11..000000000000 --- a/x11/kitty/files/patch-docs_conf.rst +++ /dev/null @@ -1,18 +0,0 @@ ---- docs/conf.rst.orig 1979-11-29 23:00:00 UTC -+++ docs/conf.rst -@@ -1,7 +1,14 @@ - kitty.conf ------------------------- -+================ - - .. highlight:: conf -+ -+ -+.. only:: man -+ -+ Overview -+ -------------- -+ - - |kitty| is highly customizable, everything from keyboard shortcuts, to rendering - frames-per-second. See below for an overview of all customization possibilities. diff --git a/x11/kitty/pkg-plist b/x11/kitty/pkg-plist index a6e5d52cef38..6e5a241ea193 100644 --- a/x11/kitty/pkg-plist +++ b/x11/kitty/pkg-plist @@ -14,8 +14,8 @@ share/applications/kitty.desktop %%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_f0c36ed4.png -%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_changelog_72acb199.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_build_7ee1e14e.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_changelog_439aee19.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_clipboard_673291d1.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_color-stack_587105f7.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_conf_6d817f14.png @@ -45,7 +45,7 @@ share/applications/kitty.desktop %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_query_terminal_bcf6bdb9.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_01df1569.png +%%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_themes_72ee7bcd.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_transfer_009949a9.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_kittens_unicode_input_f1ba948b.png %%PORTDOCS%%%%DOCSDIR%%/_images/social_previews/summary_launch_717c78bb.png @@ -357,26 +357,14 @@ share/icons/hicolor/scalable/apps/kitty.svg %%DATADIR%%/kittens/transfer/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%DATADIR%%/kittens/transfer/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-2.pyc %%DATADIR%%/kittens/transfer/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc -%%DATADIR%%/kittens/transfer/__pycache__/librsync%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -%%DATADIR%%/kittens/transfer/__pycache__/librsync%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -%%DATADIR%%/kittens/transfer/__pycache__/librsync%%PYTHON_EXT_SUFFIX%%.pyc %%DATADIR%%/kittens/transfer/__pycache__/main%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%DATADIR%%/kittens/transfer/__pycache__/main%%PYTHON_EXT_SUFFIX%%.opt-2.pyc %%DATADIR%%/kittens/transfer/__pycache__/main%%PYTHON_EXT_SUFFIX%%.pyc -%%DATADIR%%/kittens/transfer/__pycache__/receive%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -%%DATADIR%%/kittens/transfer/__pycache__/receive%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -%%DATADIR%%/kittens/transfer/__pycache__/receive%%PYTHON_EXT_SUFFIX%%.pyc -%%DATADIR%%/kittens/transfer/__pycache__/send%%PYTHON_EXT_SUFFIX%%.opt-1.pyc -%%DATADIR%%/kittens/transfer/__pycache__/send%%PYTHON_EXT_SUFFIX%%.opt-2.pyc -%%DATADIR%%/kittens/transfer/__pycache__/send%%PYTHON_EXT_SUFFIX%%.pyc %%DATADIR%%/kittens/transfer/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%DATADIR%%/kittens/transfer/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.opt-2.pyc %%DATADIR%%/kittens/transfer/__pycache__/utils%%PYTHON_EXT_SUFFIX%%.pyc -%%DATADIR%%/kittens/transfer/librsync.py %%DATADIR%%/kittens/transfer/main.py -%%DATADIR%%/kittens/transfer/receive.py %%DATADIR%%/kittens/transfer/rsync.so -%%DATADIR%%/kittens/transfer/send.py %%DATADIR%%/kittens/transfer/utils.py %%DATADIR%%/kittens/tui/__init__.py %%DATADIR%%/kittens/tui/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.opt-1.pyc @@ -800,6 +788,9 @@ share/icons/hicolor/scalable/apps/kitty.svg %%DATADIR%%/kitty/rc/__pycache__/set_tab_title%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%DATADIR%%/kitty/rc/__pycache__/set_tab_title%%PYTHON_EXT_SUFFIX%%.opt-2.pyc %%DATADIR%%/kitty/rc/__pycache__/set_tab_title%%PYTHON_EXT_SUFFIX%%.pyc +%%DATADIR%%/kitty/rc/__pycache__/set_user_vars%%PYTHON_EXT_SUFFIX%%.opt-1.pyc +%%DATADIR%%/kitty/rc/__pycache__/set_user_vars%%PYTHON_EXT_SUFFIX%%.opt-2.pyc +%%DATADIR%%/kitty/rc/__pycache__/set_user_vars%%PYTHON_EXT_SUFFIX%%.pyc %%DATADIR%%/kitty/rc/__pycache__/set_window_logo%%PYTHON_EXT_SUFFIX%%.opt-1.pyc %%DATADIR%%/kitty/rc/__pycache__/set_window_logo%%PYTHON_EXT_SUFFIX%%.opt-2.pyc %%DATADIR%%/kitty/rc/__pycache__/set_window_logo%%PYTHON_EXT_SUFFIX%%.pyc @@ -841,6 +832,7 @@ share/icons/hicolor/scalable/apps/kitty.svg %%DATADIR%%/kitty/rc/set_spacing.py %%DATADIR%%/kitty/rc/set_tab_color.py %%DATADIR%%/kitty/rc/set_tab_title.py +%%DATADIR%%/kitty/rc/set_user_vars.py %%DATADIR%%/kitty/rc/set_window_logo.py %%DATADIR%%/kitty/rc/set_window_title.py %%DATADIR%%/kitty/rc/signal_child.py