Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
Date: Tue, 02 Feb 2021 13:08:42
Message-Id: 1612270069.a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576.juippis@gentoo
1 commit: a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576
2 Author: Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com>
3 AuthorDate: Fri Jan 29 15:26:10 2021 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 12:47:49 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b7507d
7
8 x11-terms/kitty: Fix broken patch for -9999
9
10 Closes: https://bugs.gentoo.org/767457
11 Package-Manager: Portage-3.0.14, Repoman-3.0.2
12 Signed-off-by: Matthias Coppens <coppens.matthias.abc <AT> gmail.com>
13 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
14
15 x11-terms/kitty/files/kitty-9999-remove-terminfo.patch | 16 ++++++++++++++++
16 x11-terms/kitty/kitty-9999.ebuild | 4 ++--
17 2 files changed, 18 insertions(+), 2 deletions(-)
18
19 diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
20 new file mode 100644
21 index 00000000000..aeb40e60118
22 --- /dev/null
23 +++ b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
24 @@ -0,0 +1,16 @@
25 +diff --git a/setup.py b/setup.py
26 +index ce5309ee..02f38c61 100755
27 +--- a/setup.py
28 ++++ b/setup.py
29 +@@ -1028,11 +1028,6 @@ def package(args: Options, bundle_type: str) -> None:
30 + safe_makedirs(launcher_dir)
31 + build_launcher(args, launcher_dir, bundle_type)
32 + os.makedirs(os.path.join(libdir, 'logo'))
33 +- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') # type: ignore
34 +- for x in (libdir, os.path.join(ddir, 'share')):
35 +- odir = os.path.join(x, 'terminfo')
36 +- safe_makedirs(odir)
37 +- build_terminfo['compile_terminfo'](odir)
38 + shutil.copy2('__main__.py', libdir)
39 + shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo'))
40 + shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))
41
42 diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
43 index 9b101e5a802..caaf77a28e9 100644
44 --- a/x11-terms/kitty/kitty-9999.ebuild
45 +++ b/x11-terms/kitty/kitty-9999.ebuild
46 @@ -1,4 +1,4 @@
47 -# Copyright 1999-2020 Gentoo Authors
48 +# Copyright 1999-2021 Gentoo Authors
49 # Distributed under the terms of the GNU General Public License v2
50
51 EAPI=7
52 @@ -57,7 +57,7 @@ BDEPEND="virtual/pkgconfig"
53
54 PATCHES=(
55 "${FILESDIR}"/kitty-0.17.2-flags.patch
56 - "${FILESDIR}"/kitty-0.16.0-remove-terminfo.patch
57 + "${FILESDIR}"/${P}-remove-terminfo.patch
58 "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
59 )