From bff543bb632933380da922cbfc07c67157d72d42 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 23 Jun 2024 00:11:31 +0100 Subject: gentoo auto-resync : 23:06:2024 - 00:11:30 --- x11-terms/kitty/Manifest | 8 +- x11-terms/kitty/kitty-0.35.1.ebuild | 2 - x11-terms/kitty/kitty-0.35.2.ebuild | 191 ++++++++++++++++++++++++++++++++++++ x11-terms/kitty/kitty-9999.ebuild | 2 - 4 files changed, 197 insertions(+), 6 deletions(-) create mode 100644 x11-terms/kitty/kitty-0.35.2.ebuild (limited to 'x11-terms/kitty') diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 745b7186b049..877b4d885eab 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -4,7 +4,11 @@ DIST kitty-0.34.1.tar.xz.sig 566 BLAKE2B fb01069e33f958bfc1aee3e42ab5d8d775d79cf DIST kitty-0.35.1-vendor.tar.xz 1556700 BLAKE2B 5ddd5dfee2d443ba74cabe86c2681e957f18533a55f0d2ee8937218fd147c31c661b6ab6f4b66cecf8c1f24fbd515684ac7d89d38d3b4c09753ff787274a64b2 SHA512 12f924a9c1ae7458cdc252295c01ca722e325f28e2f918655fa996a10e5b619b9d21b31218a86fe23674df99bab7d5eb1560fd4f4e19eed26b5a836b0e0a2e43 DIST kitty-0.35.1.tar.xz 8206388 BLAKE2B cb50b1d6011cf5eac61175c07a8365004c22505363a0a43114f010e6d47388959b308343124b427422797836d6b0e1954ec278301d98ff33acd103d611052727 SHA512 aecda31410b8d52ec7df5a9947f29be04249fadb6af24ee7e0cbb649f09a9e510d9fe6913d24d10c36ef7227187c96a1e3f25a8da840a16ed0bcb8cb46f1f089 DIST kitty-0.35.1.tar.xz.sig 566 BLAKE2B 2df73c05b410daf39ee03f7f330ef18e13f5457022e081c2fda9992a8b143b8364a0d407abb2e5262419e2924a40009e40f7128c60b9459d34bcf1b309cf1af4 SHA512 3de27d82d48eac0a46c9431b52e857acf5d33407e4b5559aa8c09935fecd88199b0e0be4919cff3892900c43ce0ca28681674525622eeeed285ba9081329b55a +DIST kitty-0.35.2-vendor.tar.xz 1558376 BLAKE2B be02d81411e8549afa81f1f84f05fbc9f9aef8b634bb5572f4301721b25b18c22381e5d8d9ab724cd98e5aee45ac58c338b56e69813cc5d38b6ec1eb39c2b3fb SHA512 bd1ecd57b7a29bbc391fcc093c3a92223656422ee7726815f07015bfd9fd829118570d8177c19867a3e6a200d1f5ba73919e7a7639584d1bfcae21853c3d7140 +DIST kitty-0.35.2.tar.xz 8220608 BLAKE2B 277803c7036890af34f2e0497ab1d33cb578cba4bfba425d6699e02e2106cde4e10f7dcc6859ce7eea1b4f34795a2f5180328665450ccb49d8a6da4183fa4f50 SHA512 edc78046f942965c823a1202a6d7c85cc2d2acb376824a0f5224d4ba6f48ed0978a00eb7a3e1e6053622a7d5fdcf80009ecfb61a63272cf407dd30f828f47b56 +DIST kitty-0.35.2.tar.xz.sig 566 BLAKE2B 89e636f2fcd8ee12be37e41187d131d2092e667ec8b62a5ca1c745d8c5813e55c1d776cafa7d1b9ba7b6142f6bd9c204c6943f22ecc0236329a02912d767831c SHA512 bc3d6734012e81727494c5879f847a72e0a84263a9c156578260592b5ae55558b880315977c586e0f9c4845485d2a10ef414929fb3a12a27ae3248df46338bfc EBUILD kitty-0.34.1.ebuild 5017 BLAKE2B 1a518658f92f75a5035eece6d9d6d0e1412b5cabb0d75648736d787b4cb72d8e0302c2d1b49ea900cd1fd22e148a4b73e8f8130a72d8a5cc82f7fc8bddc4b13e SHA512 a8077df09ea5efdc36c14026ea068cad4d0ee98e54b93b2d19ffe4281b89b596f01122b454c0e893a39f28cecb4751aaa800290d0964403f91ac63f18c0cc4e7 -EBUILD kitty-0.35.1.ebuild 5257 BLAKE2B 4b0480c98159c001df41dc4021d2f53fe91dd23f8999159c6240ccb84d8768e2b318c78011942b69b618266815e4d0d9fef333c64ea9698d45d368a31dea50a2 SHA512 11de41f0d50625e88c14d1bbfc4f88e9adc893bd245aa4ac47540969d406c504512597b722b432fc47a5c7b5d8c5ac092a6f158401e1c9f6fb450d1a94460246 -EBUILD kitty-9999.ebuild 5257 BLAKE2B 4b0480c98159c001df41dc4021d2f53fe91dd23f8999159c6240ccb84d8768e2b318c78011942b69b618266815e4d0d9fef333c64ea9698d45d368a31dea50a2 SHA512 11de41f0d50625e88c14d1bbfc4f88e9adc893bd245aa4ac47540969d406c504512597b722b432fc47a5c7b5d8c5ac092a6f158401e1c9f6fb450d1a94460246 +EBUILD kitty-0.35.1.ebuild 5106 BLAKE2B 26c9fed8db011ca2aae749a601e3350329b7c070665e60c0222dca4be890204b2f053aadb9fca6d19258a4f5ea70a4a48939f5ba62e0a9baf6873bfff03506fe SHA512 cc53d66837626429a8f6ba5d006e2a3724946c79e53de28f0859af96bccd4f2a203bad7cf08e049826b3e83f29633e8a28db2793742d0b5c96d60cf797fda3ee +EBUILD kitty-0.35.2.ebuild 5106 BLAKE2B 26c9fed8db011ca2aae749a601e3350329b7c070665e60c0222dca4be890204b2f053aadb9fca6d19258a4f5ea70a4a48939f5ba62e0a9baf6873bfff03506fe SHA512 cc53d66837626429a8f6ba5d006e2a3724946c79e53de28f0859af96bccd4f2a203bad7cf08e049826b3e83f29633e8a28db2793742d0b5c96d60cf797fda3ee +EBUILD kitty-9999.ebuild 5106 BLAKE2B 26c9fed8db011ca2aae749a601e3350329b7c070665e60c0222dca4be890204b2f053aadb9fca6d19258a4f5ea70a4a48939f5ba62e0a9baf6873bfff03506fe SHA512 cc53d66837626429a8f6ba5d006e2a3724946c79e53de28f0859af96bccd4f2a203bad7cf08e049826b3e83f29633e8a28db2793742d0b5c96d60cf797fda3ee MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003 diff --git a/x11-terms/kitty/kitty-0.35.1.ebuild b/x11-terms/kitty/kitty-0.35.1.ebuild index 77384a8a8578..7656c827e9ed 100644 --- a/x11-terms/kitty/kitty-0.35.1.ebuild +++ b/x11-terms/kitty/kitty-0.35.1.ebuild @@ -18,8 +18,6 @@ else 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 - # x86 currently still works but note that upstream has dropped support and - # may ignore issues: https://github.com/kovidgoyal/kitty/commit/29cb128fd KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi diff --git a/x11-terms/kitty/kitty-0.35.2.ebuild b/x11-terms/kitty/kitty-0.35.2.ebuild new file mode 100644 index 000000000000..7656c827e9ed --- /dev/null +++ b/x11-terms/kitty/kitty-0.35.2.ebuild @@ -0,0 +1,191 @@ +# 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 flag-o-matic 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-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.22:= + 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" + + # workaround link errors with Go + gcc + -g3 (bug #924436), + # retry now and then to see if can be dropped + tc-is-gcc && + CGO_CFLAGS=$( + CFLAGS=${CGO_CFLAGS} + replace-flags -g3 -g + replace-flags -ggdb3 -ggdb + printf %s "${CFLAGS}" + ) + + 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 +} + +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 +} diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index 77384a8a8578..7656c827e9ed 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -18,8 +18,6 @@ else 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 - # x86 currently still works but note that upstream has dropped support and - # may ignore issues: https://github.com/kovidgoyal/kitty/commit/29cb128fd KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86" fi -- cgit v1.2.3