diff options
Diffstat (limited to 'x11-terms/kitty')
-rw-r--r-- | x11-terms/kitty/Manifest | 12 | ||||
-rw-r--r-- | x11-terms/kitty/files/kitty-0.23.1-flags.patch | 17 | ||||
-rw-r--r-- | x11-terms/kitty/kitty-0.23.1-r1.ebuild | 116 | ||||
-rw-r--r-- | x11-terms/kitty/kitty-0.24.1.ebuild | 127 | ||||
-rw-r--r-- | x11-terms/kitty/kitty-0.33.1.ebuild | 189 | ||||
-rw-r--r-- | x11-terms/kitty/kitty-0.34.1.ebuild | 190 | ||||
-rw-r--r-- | x11-terms/kitty/kitty-0.35.0.ebuild | 192 | ||||
-rw-r--r-- | x11-terms/kitty/kitty-9999.ebuild | 163 | ||||
-rw-r--r-- | x11-terms/kitty/metadata.xml | 3 |
9 files changed, 694 insertions, 315 deletions
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest index 007a587a2047..3680ad223a09 100644 --- a/x11-terms/kitty/Manifest +++ b/x11-terms/kitty/Manifest @@ -1,3 +1,9 @@ -DIST kitty-0.23.1.tar.xz 4444184 BLAKE2B f452e338fb72f723f2c028f90c20654cf80c5ee1aff924954f81f16445c9f4c10c77bd67d47ae5564b45496012dd1b7de447cdf3974b6913a39d170749878a73 SHA512 2d0c822e6bfca41b0a5e5e71e62f5073792b10c236287a509a6c790e19d098205c8719dbcb4aa630abbbaa3d44d6c9986c13efde7a9556772a89709383a0fe94 -DIST kitty-0.24.1.tar.xz 4512652 BLAKE2B ea1bf4911a744fb5aaa5fe3d9fc4821880e78c60a0a89ecba12c73623b9b537c2d9d4e494da125669f2fc36f273f49a00cc5825f56184c1b0c69f4c570b2226d SHA512 e590a3abd4ed38ce956ee1e1b9d3679150c83b80df5ed9daf9773d7a278f63dc8a3a563058906d322f9186bece7d479036a502864fd80f45593c4970c056f389 -DIST kitty-0.24.1.tar.xz.sig 566 BLAKE2B efff022baff8b16a4b576c1eb1aba83a7a931857850ae2815f54c06d7e9e7110c8bc27f89bec6ba679a4d1df133e1ec13e061cd880dbef02680a2d8021beadf8 SHA512 a2943d1fe20f6c36015db8b9cb8ddef9461fe6503110eb2dce6646afb141b3a3ceb7ab62ec2cbc027d2e2dc2a25c16a207dfc45f619b6464c0ce1995bae54144 +DIST kitty-0.33.1-vendor.tar.xz 1422996 BLAKE2B 5ea525c501a3e1d845b7338c9644f3b1ba67b7f7f127950ae4493ddb299ad4a9cbe20cd1df7cd6aa49ca53bfb1236a393296c4e64951f9fa9d46d572e3fef47f SHA512 a764e009fd90df31e9aaf90501855949f7fe3c46a383ece60826ecdcbb41cedac1c34587772a6a7c257b42773516d0f753712f94d71689e738139a7291aa961f +DIST kitty-0.33.1.tar.xz 8166164 BLAKE2B 6592ae99f3e05bda5367186096804175f00f21770e7112bf45fa968d161e70d2fdcf956214e29e048e6973ee14457f5eaca753a761824f1c104ba32552122e33 SHA512 5fa2421baf9fac41d4a8ff89bb5e44d1820012e8c960e25980d597dcebbb44ffa97c03818e8a91015691321eedb9d9f53139a97cbb6bd673053fbfd73c77739b +DIST kitty-0.33.1.tar.xz.sig 566 BLAKE2B 568d54993d6c66670279364c317fa0778594852e8c2e4012175640c1cf377c96b6897c8f1bb9735f9ae2624b4c2ee7681a056f3974666db536a086732d49d128 SHA512 aa52d901698ca513c7a996f0a45658a0c23a4c82f365aa782fc24ff075352f69465dfe3d090da1f0fc32ff7522d19324161ff6e7985c97280b99b13bdc41e798 +DIST kitty-0.34.1-vendor.tar.xz 1528400 BLAKE2B fde7ba3a9713e10e1b6f3d4e3a35bb1edf0ed50004862e2f367df30b416a1b8e34c03c38c47ec4f7363bc10eace0dd03215875c1b5121151671c0b22ac47e189 SHA512 875ca8c324b80e3be8fead1c56710f7f9ca7f5aa0f8e4e8f1e825005cbe85837d9b58a2b271ead201637f9b10fd5e61b7e8e52276e950f30fe326546c6ee33ee +DIST kitty-0.34.1.tar.xz 8176176 BLAKE2B c39709a065a04b04bf15e6decb9a96c1699c1082de44690c36e4e05a288f6835fa3c5dd059c363a272c98934b5c66cf5d79078b6403c7f15a9e94f3f72aa680c SHA512 1b361823741c8c2a6ce3c5d56d0cbbd51bd0a0d2574312ef5c05f359c70862e0889a9636e4b95865750cbd239b517763315ed0cf4ec46e1feaffc27cf20e0e66 +DIST kitty-0.34.1.tar.xz.sig 566 BLAKE2B fb01069e33f958bfc1aee3e42ab5d8d775d79cf0c54b427690f4455c524d9baff3789823a6a8dce6494a8006715bc17530f1569c540b30f423c41f8833ae08f8 SHA512 cf60f1044661a62e73191526680ce862ae02e0dd89e017c139261cff8667b20be6aca0fb3b56f06c8ddb0e08a3c55eb428358a9db0b59ef65f2bd246fcf9cd01 +DIST kitty-0.35.0-vendor.tar.xz 1556648 BLAKE2B 58a6844782db908a721f3617ff8ad456eb436d8e589aeba866b5178fdbe7e94cd40453f949f7960f8e3adb3d6f03fae77708b5979114da7b9b69bedee2778d31 SHA512 7cbe76d2ced4e23c63a47cc05306b315456c7ee0ed5cbe7d21eedb56a364ffc2412c798a3f46c7897f90a457899251fae62ac6da471c99c2166bcacb348778dd +DIST kitty-0.35.0.tar.xz 8206476 BLAKE2B 1c03ed7f3bde0c67790cc47da8afc14d31d21513456004042c48451f4b5fc0891de85e467a16029a1f49b90ba6652f4e356d5101c8d773852b614da3f153692d SHA512 b8c310237b1f0e48c1490f1bcfa009490d1592557bd81d6593a2a3ce71696ab03b3d91bb1dc32212adea70a4e6b5491ea6604d43517e679151df49e11b8de604 +DIST kitty-0.35.0.tar.xz.sig 566 BLAKE2B c2fe36945f799c66315da8f11103602981ee4e87ab101e554fa232818cb30745e26d1aed5398f2aa3961134029fbf13f7cd19f6ff3adbc636cee9f64f3e63783 SHA512 b94bb69d66e3e149d8c7a56773f75e3a74136e26569a5864cd6102c2c7764ed662f1b6f0c0e4daa49bd928d3182d7bd6f364802142436bf34544a656957fd615 diff --git a/x11-terms/kitty/files/kitty-0.23.1-flags.patch b/x11-terms/kitty/files/kitty-0.23.1-flags.patch deleted file mode 100644 index 8f23393f8a0e..000000000000 --- a/x11-terms/kitty/files/kitty-0.23.1-flags.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -295,3 +295,3 @@ - fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2' -- optimize = df if debug or sanitize else '-O3' -+ optimize = '' - sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() -@@ -319,3 +319,3 @@ - 'OVERRIDE_LDFLAGS', -- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') -+ '-Wall ' + ' '.join(sanitize_args) - ) -@@ -807,4 +807,2 @@ - libs.append('-lprofiler') -- else: -- cflags.append('-O3') - if bundle_type.endswith('-freeze'): diff --git a/x11-terms/kitty/kitty-0.23.1-r1.ebuild b/x11-terms/kitty/kitty-0.23.1-r1.ebuild deleted file mode 100644 index ee5228eceb68..000000000000 --- a/x11-terms/kitty/kitty-0.23.1-r1.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature python-single-r1 toolchain-funcs xdg - -if [[ ${PV} == 9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git" -else - SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz" - KEYWORDS="amd64 ~x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+X debug test wayland" -REQUIRED_USE=" - || ( X wayland ) - ${PYTHON_REQUIRED_USE}" -RESTRICT="!test? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - 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-terminfo-${PV} - >x11-terms/kitty-terminfo-0.23.1-r0 - X? ( x11-libs/libX11 ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - ) - wayland? ( dev-libs/wayland-protocols )" -BDEPEND=" - ${PYTHON_DEPS} - sys-libs/ncurses - virtual/pkgconfig - test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') ) - wayland? ( dev-util/wayland-scanner )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.23.1-flags.patch -) - -src_prepare() { - default - - sed "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" -i setup.py || die - sed "s/else linux_backends/else [$(usev X "'x11',")$(usev wayland "'wayland'")]/" \ - -i kitty_tests/check_build.py || die - use X || sed "/glfw_path('x11')/s/x11/wayland/" -i kitty_tests/glfw.py || die - - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die -} - -src_compile() { - tc-export CC - export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local setup=( - ${EPYTHON} setup.py - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name=$(get_libdir) - --update-check-interval=0 - --verbose - $(usev debug --debug) - linux-package - ) - - echo "${setup[*]}" - "${setup[@]}" || die "setup.py failed to compile ${PN}" - - [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die -} - -src_test() { - PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ - ${EPYTHON} test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x /usr/bin/kitty -} - -pkg_postinst() { - xdg_icon_cache_update - - optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick - optfeature "audio-based terminal bell support" media-libs/libcanberra -} diff --git a/x11-terms/kitty/kitty-0.24.1.ebuild b/x11-terms/kitty/kitty-0.24.1.ebuild deleted file mode 100644 index 1b783a910a30..000000000000 --- a/x11-terms/kitty/kitty-0.24.1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature 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 - verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )" - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg" - KEYWORDS="~amd64 ~ppc64 ~x86" -fi - -DESCRIPTION="Fast, feature-rich, GPU-based terminal" -HOMEPAGE="https://sw.kovidgoyal.net/kitty/" - -LICENSE="GPL-3" -SLOT="0" -IUSE="+X debug test transfer wayland" -REQUIRED_USE=" - || ( X wayland ) - ${PYTHON_REQUIRED_USE}" -RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" - -RDEPEND=" - ${PYTHON_DEPS} - media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= - 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 ) - transfer? ( net-libs/librsync:= ) - wayland? ( dev-libs/wayland )" -DEPEND=" - ${RDEPEND} - X? ( - x11-base/xorg-proto - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - ) - wayland? ( dev-libs/wayland-protocols )" -BDEPEND=" - ${PYTHON_DEPS} - 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 )" - -PATCHES=( - "${FILESDIR}"/${PN}-0.23.1-flags.patch -) - -src_prepare() { - default - - sed -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die - - if use !transfer; then - sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die - rm -r kittens/transfer || die - fi - - # test relies on 'who' command which doesn't detect users with pid-sandbox - rm kitty_tests/utmp.py || die - - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die -} - -src_compile() { - tc-export CC - export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local setup=( - ${EPYTHON} setup.py linux-package - --disable-link-time-optimization - --ignore-compiler-warnings - --libdir-name=$(get_libdir) - --shell-integration="enabled no-rc" - --update-check-interval=0 - --verbose - $(usev debug --debug) - ) - - echo "${setup[*]}" - "${setup[@]}" || die "setup.py failed to compile ${PN}" - - [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die -} - -src_test() { - PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ - ${EPYTHON} test.py || die -} - -src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x /usr/bin/kitty -} - -pkg_postinst() { - xdg_icon_cache_update - - optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick - optfeature "audio-based terminal bell support" media-libs/libcanberra -} diff --git a/x11-terms/kitty/kitty-0.33.1.ebuild b/x11-terms/kitty/kitty-0.33.1.ebuild new file mode 100644 index 000000000000..932877d093da --- /dev/null +++ b/x11-terms/kitty/kitty-0.33.1.ebuild @@ -0,0 +1,189 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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/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 + optfeature "opening links from the terminal" x11-misc/xdg-utils +} diff --git a/x11-terms/kitty/kitty-0.34.1.ebuild b/x11-terms/kitty/kitty-0.34.1.ebuild new file mode 100644 index 000000000000..2fd93cddd02c --- /dev/null +++ b/x11-terms/kitty/kitty-0.34.1.ebuild @@ -0,0 +1,190 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) +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 + optfeature "opening links from the terminal" x11-misc/xdg-utils +} diff --git a/x11-terms/kitty/kitty-0.35.0.ebuild b/x11-terms/kitty/kitty-0.35.0.ebuild new file mode 100644 index 000000000000..a0231858ba9b --- /dev/null +++ b/x11-terms/kitty/kitty-0.35.0.ebuild @@ -0,0 +1,192 @@ +# 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 + # 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 + +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 + 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 1b783a910a30..a0231858ba9b 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -1,39 +1,49 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) -inherit optfeature python-single-r1 toolchain-funcs xdg +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 +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 - verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )" - VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg" - KEYWORDS="~amd64 ~ppc64 ~x86" + 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 + # 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 DESCRIPTION="Fast, feature-rich, GPU-based terminal" HOMEPAGE="https://sw.kovidgoyal.net/kitty/" -LICENSE="GPL-3" +LICENSE="GPL-3 ZLIB" +LICENSE+=" Apache-2.0 BSD BSD-2 MIT MPL-2.0" # go SLOT="0" -IUSE="+X debug test transfer wayland" +IUSE="+X test wayland" REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} || ( X wayland ) - ${PYTHON_REQUIRED_USE}" -RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )" + test? ( X wayland ) +" +RESTRICT="!test? ( test )" +# dlopen: fontconfig,libglvnd RDEPEND=" ${PYTHON_DEPS} + dev-libs/openssl:= + dev-libs/xxhash media-libs/fontconfig - media-libs/freetype:2 - media-libs/harfbuzz:= + media-libs/harfbuzz:=[truetype] media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= @@ -43,85 +53,140 @@ RDEPEND=" x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-${PV} ~x11-terms/kitty-terminfo-${PV} - X? ( x11-libs/libX11 ) - transfer? ( net-libs/librsync:= ) - wayland? ( dev-libs/wayland )" + 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/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr ) - wayland? ( dev-libs/wayland-protocols )" + 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 )" + wayland? ( dev-util/wayland-scanner ) +" [[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )" -PATCHES=( - "${FILESDIR}"/${PN}-0.23.1-flags.patch -) +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 -i "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" setup.py || die + # 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/" + ) - if use !transfer; then - sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die - rm -r kittens/transfer || die - fi + # 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)'/" ) - # test relies on 'who' command which doesn't detect users with pid-sandbox - rm kitty_tests/utmp.py || die + # skip docs for live version, missing dependencies + [[ ${PV} == 9999 ]] && sedargs+=( -e '/exists.*_build/,/docs(ddir)/d' ) - # skip docs for live version - [[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die + 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 - export PKGCONFIG_EXE=$(tc-getPKG_CONFIG) - - local setup=( - ${EPYTHON} setup.py linux-package + 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" + --shell-integration="enabled no-rc no-sudo" --update-check-interval=0 --verbose - $(usev debug --debug) ) - echo "${setup[*]}" - "${setup[@]}" || die "setup.py failed to compile ${PN}" + 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 - [[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die - rm -r linux-package/share/terminfo || die + 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() { - PATH=linux-package/bin:${PATH} KITTY_CONFIG_DIRECTORY=${T} \ - ${EPYTHON} test.py || die + KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty } src_install() { - insinto /usr - doins -r linux-package/. - - fperms +x /usr/bin/kitty + edo mv linux-package "${ED}"/usr } pkg_postinst() { - xdg_icon_cache_update + xdg_pkg_postinst - optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick optfeature "audio-based terminal bell support" media-libs/libcanberra + optfeature "opening links from the terminal" x11-misc/xdg-utils } diff --git a/x11-terms/kitty/metadata.xml b/x11-terms/kitty/metadata.xml index 6bb38d37be8c..c4f584c5169f 100644 --- a/x11-terms/kitty/metadata.xml +++ b/x11-terms/kitty/metadata.xml @@ -13,9 +13,6 @@ <email>proxy-maint@gentoo.org</email> <name>Proxy Maintainers</name> </maintainer> - <use> - <flag name="transfer">Enable transfer kitten using <pkg>net-libs/librsync</pkg></flag> - </use> <upstream> <remote-id type="github">kovidgoyal/kitty</remote-id> <changelog>https://sw.kovidgoyal.net/kitty/changelog</changelog> |