From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8DFE913835B for ; Tue, 2 Feb 2021 13:08:42 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0375E0938; Tue, 2 Feb 2021 13:08:41 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6ECB4E093B for ; Tue, 2 Feb 2021 13:08:41 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EF0613416A3 for ; Tue, 2 Feb 2021 13:08:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0AFA64BF for ; Tue, 2 Feb 2021 13:08:37 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1612270069.a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/, x11-terms/kitty/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-terms/kitty/files/kitty-9999-remove-terminfo.patch x11-terms/kitty/kitty-9999.ebuild X-VCS-Directories: x11-terms/kitty/files/ x11-terms/kitty/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576 X-VCS-Branch: master Date: Tue, 2 Feb 2021 13:08:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 9d206abb-7126-4266-8abc-0ece2845c6eb X-Archives-Hash: 4479a897656ee0f6c2556528e56519df commit: a3b7507dd5e7dde6c5ea7fb61920ee9e91ea9576 Author: Matthias Coppens gmail com> AuthorDate: Fri Jan 29 15:26:10 2021 +0000 Commit: Joonas Niilola gentoo 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 gmail.com> Signed-off-by: Joonas Niilola 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 )