public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Joonas Niilola" <juippis@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/
Date: Tue,  2 Feb 2021 13:08:37 +0000 (UTC)	[thread overview]
Message-ID: <1612270069.a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576.juippis@gentoo> (raw)

commit:     a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576
Author:     Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com>
AuthorDate: Fri Jan 29 15:26:10 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb  2 12:47:49 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a3b7507d

x11-terms/kitty: Fix broken patch for -9999

Closes: https://bugs.gentoo.org/767457
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Matthias Coppens <coppens.matthias.abc <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-terms/kitty/files/kitty-9999-remove-terminfo.patch | 16 ++++++++++++++++
 x11-terms/kitty/kitty-9999.ebuild                      |  4 ++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
new file mode 100644
index 00000000000..aeb40e60118
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index ce5309ee..02f38c61 100755
+--- a/setup.py
++++ b/setup.py
+@@ -1028,11 +1028,6 @@ def package(args: Options, bundle_type: str) -> None:
+     safe_makedirs(launcher_dir)
+     build_launcher(args, launcher_dir, bundle_type)
+     os.makedirs(os.path.join(libdir, 'logo'))
+-    build_terminfo = runpy.run_path('build-terminfo', run_name='import_build')  # type: ignore
+-    for x in (libdir, os.path.join(ddir, 'share')):
+-        odir = os.path.join(x, 'terminfo')
+-        safe_makedirs(odir)
+-        build_terminfo['compile_terminfo'](odir)
+     shutil.copy2('__main__.py', libdir)
+     shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo'))
+     shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))

diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 9b101e5a802..caaf77a28e9 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-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
@@ -57,7 +57,7 @@ BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${FILESDIR}"/kitty-0.17.2-flags.patch
-	"${FILESDIR}"/kitty-0.16.0-remove-terminfo.patch
+	"${FILESDIR}"/${P}-remove-terminfo.patch
 	"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch
 )
 


             reply	other threads:[~2021-02-02 13:08 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-02 13:08 Joonas Niilola [this message]
  -- strict thread matches above, loose matches on Subject: below --
2023-10-05 15:23 [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/ Ionen Wolkens
2023-08-11  4:59 Ionen Wolkens
2021-11-03  6:41 Ionen Wolkens
2021-11-03  6:41 Ionen Wolkens
2021-10-17 20:39 John Helmert III
2021-06-11  7:21 Joonas Niilola
2020-05-01 15:09 Joonas Niilola
2020-04-04  7:39 Joonas Niilola
2020-01-09  6:01 Joonas Niilola
2019-12-03 13:13 Joonas Niilola
2019-11-12  4:00 Tim Harder
2019-08-31 10:28 Tim Harder
2019-08-31 10:28 Tim Harder
2019-07-16 23:17 Matthew Thode
2019-06-15 21:27 Tim Harder
2018-06-17  9:18 Tim Harder
2018-06-05  4:34 Tim Harder

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1612270069.a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576.juippis@gentoo \
    --to=juippis@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox