From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4817815802C for ; Mon, 16 Dec 2024 07:06:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 795ECE0977; Mon, 16 Dec 2024 07:06:22 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 32066E09D0 for ; Mon, 16 Dec 2024 07:06:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1D09E33BEE8 for ; Mon, 16 Dec 2024 07:06:20 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4ADC71F24 for ; Mon, 16 Dec 2024 07:06:18 +0000 (UTC) From: "Ionen Wolkens" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" Message-ID: <1734332635.8063c7e1100879d0d0467b40373bffe55aa05a26.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/Manifest x11-terms/kitty/kitty-0.38.0.ebuild X-VCS-Directories: x11-terms/kitty/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 8063c7e1100879d0d0467b40373bffe55aa05a26 X-VCS-Branch: master Date: Mon, 16 Dec 2024 07:06:18 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 8da3df37-b550-454b-8b06-d29cafa68619 X-Archives-Hash: c19c355c9c21c816f30876ce7b7a8937 commit: 8063c7e1100879d0d0467b40373bffe55aa05a26 Author: Ionen Wolkens gentoo org> AuthorDate: Mon Dec 16 06:58:35 2024 +0000 Commit: Ionen Wolkens gentoo org> CommitDate: Mon Dec 16 07:03:55 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8063c7e1 x11-terms/kitty: add 0.38.0 Signed-off-by: Ionen Wolkens gentoo.org> x11-terms/kitty/Manifest | 3 + x11-terms/kitty/kitty-0.38.0.ebuild | 187 ++++++++++++++++++++++++++++++++++++ 2 files changed, 190 insertions(+) diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 2050122be123..35f03af6b871 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -7,3 +7,6 @@ DIST kitty-0.36.4.tar.xz.sig 566 BLAKE2B 94f7bc5dd8c121cd9f10b06a3e0644bfb30e9f6 DIST kitty-0.37.0-vendor.tar.xz 1564152 BLAKE2B e7fc6b208221fd4abd67ea6659f7f0853d33bfe4c69395000487902bc29c33d7305361409ce7f9c8f5790a700bbd4ddcc83782d976a3136222a370c3ada05d03 SHA512 1eb187669d18d156ac38f20cb7de18ca95862fc0d1913c62974a5c8d1fd9ebb21b80d574169c443e7ee3632b9c7868157a0f1539e8f701f2d1778d31246b74c8 DIST kitty-0.37.0.tar.xz 8881224 BLAKE2B ad1fb416ac692dcaf6b05306f4cc5838db8e0c172bab483ee52cddf86c21f864071d22d0f122031635227379957c9bd7fd2f4e971c2ddc74f99ad2e6212cb440 SHA512 786b3361147c988e7bbafcc0706940b8dbd172b07b88c1d6b49ae4a3caefba2cb72a05bf4f173ac963989be6d435bef60d6f8e8abb76362f8a07c231cfa04e31 DIST kitty-0.37.0.tar.xz.sig 566 BLAKE2B 6ebf0de7685cd17c573ca72a201496f8892863b92e2f7febd38d02bac5d6abbfc31d42d2a9084f275fd1956241e444f751e11433fc4e666d929315c80328c4d4 SHA512 ac13807941dee89650f46713727de1dce57e50d99ad31b4f5c96ecb14491a5ec781cde7a078c0e8cf29ff5120c28f31cc7279a9251e3349c9c6bbb4c760804dc +DIST kitty-0.38.0-vendor.tar.xz 1568056 BLAKE2B eef05af4e925418b405dd7ed9e923ca5390f8074c85fcfb2fe6b70a21b19329514b79fde9a915d9a9f1b3197889e305acaacdc96ea9d1bcf82ab066ee1f611e3 SHA512 e4c183354801e9fcc64918e5e50593c0853e6a27ffe4476708be43929114ba1fdc2200bb318789642207830bae05253b3cf3405cb04c5a3af628b24a488587e3 +DIST kitty-0.38.0.tar.xz 8927688 BLAKE2B 451bde695143b348bdf6cb2e1bc55c434960b790bbe9d12daf4b3817ef0585df03c253c50161d8495eceefa1becd92dc282ce1ec0d0db02eaeedd415599083b7 SHA512 a7c462b92e5ec4db95ec233963010d20a091cdc0660a6ee250863f9fb8ce07dbc6287075c41ee19e3455933991f77273da90814a5178775f00a5364553809c81 +DIST kitty-0.38.0.tar.xz.sig 566 BLAKE2B a28dc67ea1baf5922c554a989cd88017cb63415a5ae46c313ed960bc8d398ceef638c080ebacae7d2e79b5bab149bdd6f8134155d4fb6b73b710a5cce9e48da6 SHA512 6532a6cd270e1ab8ef3d847f6ef2bebdd742716c621ab625f61dc2a793fd6064941ade5bb74740b12fdc40a0049d7aaaa5e2785bb4182de0b2004396b5160926 diff --git a/x11-terms/kitty/kitty-0.38.0.ebuild b/x11-terms/kitty/kitty-0.38.0.ebuild new file mode 100644 index 000000000000..5b29cd01b6e8 --- /dev/null +++ b/x11-terms/kitty/kitty-0.38.0.ebuild @@ -0,0 +1,187 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit edo go-env optfeature multiprocessing +inherit python-single-r1 toolchain-funcs xdg + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" +else + inherit verify-sig + SRC_URI=" + https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz + https://dev.gentoo.org/~ionen/distfiles/${P}-vendor.tar.xz + verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig ) + " + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/kovidgoyal.gpg + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Fast, feature-rich, GPU-based terminal" +HOMEPAGE="https://sw.kovidgoyal.net/kitty/" + +LICENSE="GPL-3 ZLIB" +LICENSE+=" Apache-2.0 BSD BSD-2 MIT MPL-2.0" # go +SLOT="0" +IUSE="+X test wayland" +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + || ( X wayland ) + test? ( X wayland ) +" +RESTRICT="!test? ( test )" + +# dlopen: fontconfig,libglvnd +RDEPEND=" + ${PYTHON_DEPS} + dev-libs/openssl:= + dev-libs/xxhash + media-fonts/symbols-nerd-font + media-libs/fontconfig + media-libs/harfbuzz:=[truetype] + media-libs/lcms:2 + media-libs/libglvnd[X?] + media-libs/libpng:= + sys-apps/dbus + sys-libs/zlib:= + x11-libs/libxkbcommon[X?] + x11-misc/xkeyboard-config + ~x11-terms/kitty-shell-integration-${PV} + ~x11-terms/kitty-terminfo-${PV} + X? ( + x11-libs/libX11 + x11-libs/libXcursor + ) + wayland? ( dev-libs/wayland ) + !sci-mathematics/kissat +" +DEPEND=" + ${RDEPEND} + amd64? ( >=dev-libs/simde-0.8.0-r1 ) + arm64? ( dev-libs/simde ) + x86? ( dev-libs/simde ) + X? ( + x11-base/xorg-proto + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + ) + wayland? ( dev-libs/wayland-protocols ) +" +# bug #919751 wrt go subslot +BDEPEND=" + ${PYTHON_DEPS} + >=dev-lang/go-1.23:= + sys-libs/ncurses + virtual/pkgconfig + test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) + wayland? ( dev-util/wayland-scanner ) +" +[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" + +QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go + +src_unpack() { + if [[ ${PV} == 9999 ]]; then + git-r3_src_unpack + cd "${S}" || die + edo go mod vendor + else + use verify-sig && + verify-sig_verify_detached "${DISTDIR}"/${P}.tar.xz{,.sig} + default + fi +} + +src_prepare() { + default + + # sed unfortunately feels easier on maintenance than patches here + local sedargs=( + -e "/num_workers =/s/=.*/= $(makeopts_jobs)/" + -e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' + -e "s/cflags.append(fortify_source)/pass/" # use toolchain's _f_s + -e "s/ld_flags.append('-[sw]')/pass/" + ) + + # kitty is often popular on wayland-only setups, try to allow this + use !X && sedargs+=( -e '/gl_libs =/s/=.*/= []/' ) #857918 + use !X || use !wayland && + sedargs+=( -e "s/'x11 wayland'/'$(usex X x11 wayland)'/" ) + + # skip docs for live version, missing dependencies + [[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' ) + + sed -i setup.py "${sedargs[@]}" || die + + local skiptests=( + # relies on 'who' command which doesn't detect users with pid-sandbox + kitty_tests/utmp.py + # may fail/hang depending on environment and shell initialization + kitty_tests/{shell_integration,ssh}.py + # relies on /proc/self/fd and gets confused when ran from here + tools/utils/tpmfile_test.go + ) + use !test || rm "${skiptests[@]}" || die +} + +src_compile() { + tc-export CC + local -x PKGCONFIG_EXE=$(tc-getPKG_CONFIG) + + go-env_set_compile_environment + local -x GOFLAGS="-p=$(makeopts_jobs) -v -x -buildvcs=false" + use ppc64 && [[ $(tc-endian) == big ]] || GOFLAGS+=" -buildmode=pie" + + local conf=( + --disable-link-time-optimization + --ignore-compiler-warnings + --libdir-name=$(get_libdir) + --shell-integration="enabled no-rc no-sudo" + --update-check-interval=0 + --verbose + ) + + edo "${EPYTHON}" setup.py linux-package "${conf[@]}" + use test && edo "${EPYTHON}" setup.py build-launcher "${conf[@]}" + + rm -r linux-package/share/terminfo || die # provided by kitty-terminfo + + if [[ ${PV} == 9999 ]]; then + mkdir -p linux-package/share/doc/${PF} || die + else + mv linux-package/share/doc/{${PN},${PF}} || die + fi + + # generate default config as reference, command taken from docs/conf.rst + if ! tc-is-cross-compiler; then + linux-package/bin/kitty +runpy \ + 'from kitty.config import *; print(commented_out_default_config())' \ + > linux-package/share/doc/${PF}/kitty.conf || die + fi +} + +src_test() { + KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty +} + +src_install() { + edo mv linux-package "${ED}"/usr + + # kitty currently detects and copies the system's nerd font at build + # time, then uses that rather than the system's at runtime + dosym -r /usr/share/fonts/symbols-nerd-font/SymbolsNerdFontMono-Regular.ttf \ + /usr/"$(get_libdir)"/kitty/fonts/SymbolsNerdFontMono-Regular.ttf +} + +pkg_postinst() { + xdg_pkg_postinst + + optfeature "audio-based terminal bell support" media-libs/libcanberra + use X && optfeature "X11 startup notification support" x11-libs/startup-notification + optfeature "opening links from the terminal" x11-misc/xdg-utils +}