commit: e3011184e4d9428d16b551966546d4b524d2989a Author: Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com> AuthorDate: Mon Feb 22 07:53:29 2021 +0000 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> CommitDate: Wed Feb 24 08:30:57 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3011184
x11-terms/kitty-terminfo: Update patch file for 9999 Closes: https://bugs.gentoo.org/772008 Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Matthias Coppens <coppens.matthias.abc <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/19590 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> .../files/kitty-terminfo-setup-9999.patch | 46 ++++++++++++++++++++++ .../kitty-terminfo/kitty-terminfo-9999.ebuild | 4 +- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-9999.patch b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-9999.patch new file mode 100644 index 00000000000..67772bfae03 --- /dev/null +++ b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-9999.patch @@ -0,0 +1,46 @@ +diff --git a/setup.py b/setup.py +index 115739fc..b933165c 100755 +--- a/setup.py ++++ b/setup.py +@@ -906,6 +906,14 @@ def create_linux_bundle_gunk(ddir: str, libdir_name: str) -> None: + os.makedirs(os.path.dirname(in_src_launcher), exist_ok=True) + os.symlink(os.path.relpath(launcher, os.path.dirname(in_src_launcher)), in_src_launcher) + ++def terminfo(args): ++ ddir = args.prefix ++ libdir = os.path.join(ddir, args.libdir_name.strip('/'), 'kitty') ++ build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') ++ for x in (libdir, os.path.join(ddir, 'share')): ++ odir = os.path.join(x, 'terminfo') ++ safe_makedirs(odir) ++ build_terminfo['compile_terminfo'](odir) + + def macos_info_plist() -> bytes: + import plistlib +@@ -1093,7 +1101,7 @@ def safe_remove(*entries: str) -> None: + + safe_remove( + 'build', 'compile_commands.json', 'link_commands.json', +- 'linux-package', 'kitty.app', 'asan-launcher', ++ 'linux-package', 'linux-terminfo', 'kitty.app', 'asan-launcher', + 'kitty-profile', 'kitty/launcher') + exclude = ('.git',) + for root, dirs, files in os.walk('.', topdown=True): +@@ -1116,7 +1124,7 @@ def option_parser() -> argparse.ArgumentParser: # {{{ + 'action', + nargs='?', + default=Options.action, +- choices='build test linux-package kitty.app linux-freeze macos-freeze build-launcher build-frozen-launcher clean export-ci-bundles'.split(), ++ choices='build test linux-package linux-terminfo kitty.app linux-freeze macos-freeze build-launcher build-frozen-launcher clean export-ci-bundles'.split(), + help='Action to perform (default is build)' + ) + p.add_argument( +@@ -1246,6 +1254,8 @@ def main() -> None: + elif args.action == 'linux-package': + build(args, native_optimizations=False) + package(args, bundle_type='linux-package') ++ elif args.action == 'linux-terminfo': ++ terminfo(args) + elif args.action == 'linux-freeze': + build(args, native_optimizations=False) + package(args, bundle_type='linux-freeze') diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild index 63bab342414..29e70470581 100644 --- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild +++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,7 +18,7 @@ IUSE="debug" DEPEND="${PYTHON_DEPS}" PATCHES=( - "${FILESDIR}"/kitty-terminfo-setup-0.19.1.patch + "${FILESDIR}"/kitty-terminfo-setup-9999.patch ) # kitty-terminfo is a split package from kitty that only installs the terminfo
