[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/

[Ionen Wolkens]

commit:     8e67bd076bb9774e0578eae3a3184c6c015206e5
Author:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Feb  4 12:20:32 2025 +0000
Commit:     Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Feb  4 12:22:24 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e67bd07

x11-terms/kitty: update live

wrt cairo and fontconfig, it switched to using fontconfig
through cairo (cairo-fc).

For shell_integration, just doing a quick workaround for now
else it fails to build and haven't spent more time on this.

Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>

 x11-terms/kitty/kitty-9999.ebuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/x11-terms/kitty/kitty-9999.ebuild 
b/x11-terms/kitty/kitty-9999.ebuild
index 5b29cd01b6e8..88bbd192ca41 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2024 Gentoo Authors
+# Copyright 1999-2025 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -41,13 +41,14 @@ RDEPEND="
        dev-libs/openssl:=
        dev-libs/xxhash
        media-fonts/symbols-nerd-font
-       media-libs/fontconfig
+       media-libs/freetype
        media-libs/harfbuzz:=[truetype]
        media-libs/lcms:2
        media-libs/libglvnd[X?]
        media-libs/libpng:=
        sys-apps/dbus
        sys-libs/zlib:=
+       x11-libs/cairo
        x11-libs/libxkbcommon[X?]
        x11-misc/xkeyboard-config
        ~x11-terms/kitty-shell-integration-${PV}
@@ -118,6 +119,10 @@ src_prepare() {
 
        sed -i setup.py "${sedargs[@]}" || die
 
+       # temporary, see --shell-integration below and try again on bump
+       sed -e "/shell_integration: /s/'enabled'/&, 'no-rc', 'no-sudo'/" \
+               -i kitty/options/types.py || die
+
        local skiptests=(
                # relies on 'who' command which doesn't detect users with 
pid-sandbox
                kitty_tests/utmp.py
@@ -141,7 +146,8 @@ src_compile() {
                --disable-link-time-optimization
                --ignore-compiler-warnings
                --libdir-name=$(get_libdir)
-               --shell-integration="enabled no-rc no-sudo"
+               # option seems(?) currently broken, needs looking into (see sed 
above)
+#              --shell-integration="enabled no-rc no-sudo"
                --update-check-interval=0
                --verbose
        )