* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-terminfo/, x11-terms/kitty-terminfo/files/
@ 2020-08-12 7:59 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-08-12 7:59 UTC (permalink / raw
To: gentoo-commits
commit: d2e5337024968ab153be042b8939f80d52d81761
Author: end222 <pabloorduna98 <AT> gmail <DOT> com>
AuthorDate: Fri Jul 31 13:41:47 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 07:59:40 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2e53370
x11-terms/kitty-terminfo: fix live ebuild
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://bugs.gentoo.org/734720
Closes: https://github.com/gentoo/gentoo/pull/16917
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
.../files/kitty-terminfo-setup-9999.patch | 46 ++++++++++++++++++++++
.../kitty-terminfo/kitty-terminfo-9999.ebuild | 2 +-
2 files changed, 47 insertions(+), 1 deletion(-)
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..ae6f087069c
--- /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 7c4295bd..8d31e2d1 100755
+--- a/setup.py
++++ b/setup.py
+@@ -856,6 +856,14 @@ Categories=System;TerminalEmulator;
+ 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
+@@ -1022,7 +1030,7 @@ def clean() -> 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):
+@@ -1045,7 +1053,7 @@ def option_parser() -> argparse.ArgumentParser: # {{{
+ 'action',
+ nargs='?',
+ default=Options.action,
+- choices='build test linux-package kitty.app linux-freeze macos-freeze build-launcher clean'.split(),
++ choices='build test linux-package linux-terminfo kitty.app linux-freeze macos-freeze build-launcher clean'.split(),
+ help='Action to perform (default is build)'
+ )
+ p.add_argument(
+@@ -1166,6 +1174,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 b43704ce0df..6e6b7a4abe7 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="debug"
DEPEND="${PYTHON_DEPS}"
PATCHES=(
- "${FILESDIR}"/kitty-terminfo-setup-0.17.2.patch
+ "${FILESDIR}"/kitty-terminfo-setup-9999.patch
)
# kitty-terminfo is a split package from kitty that only installs the terminfo
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-terminfo/, x11-terms/kitty-terminfo/files/
@ 2020-10-17 14:04 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2020-10-17 14:04 UTC (permalink / raw
To: gentoo-commits
commit: 300c582e39d7ce33461b29da6c825fa8899d17b1
Author: Pablo <pord <AT> tuta <DOT> io>
AuthorDate: Wed Oct 14 19:09:03 2020 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Oct 17 14:04:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=300c582e
x11-terms/kitty-terminfo: bump to 0.19.1
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/17930
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
x11-terms/kitty-terminfo/Manifest | 1 +
...erminfo-setup-9999.patch => kitty-terminfo-setup-0.19.1.patch} | 0
.../{kitty-terminfo-9999.ebuild => kitty-terminfo-0.19.1.ebuild} | 8 +++++---
x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild | 2 +-
4 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 4fc88074c08..f0519148934 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -4,3 +4,4 @@ DIST kitty-0.17.4.tar.xz 3068456 BLAKE2B 7c3be1bd9e1be814ca2c98ac8bed5c8ac906021
DIST kitty-0.18.1.tar.xz 3098940 BLAKE2B c54f9e7996e8e17182d5cdb3f915964b2626985992dc9f8bf2f11d086475fd7b13ee131aaf942f521cd6356ac13f7efdf436253237022532ffc68cb7923bc645 SHA512 d1870fa8c1c42c9a20251ba7819fb649760a98070653cff6bbc0ef86160d6b20070bbfe4e549b80d75d7a78b37cb3c1153e4be246709cf630129cd4d09a76604
DIST kitty-0.18.2.tar.xz 3100228 BLAKE2B ac7c1c6dc9ced4f8ca59c9a9a9ff2d0c6410bbed64efc8528a899b5b55ad008e65bed6ef1b1fdb74da6b4df2ccef63e1d64ffc375ad225243999bcbb2c1378ec SHA512 12b17f241884347e841b597cc86ac7dec9f509350af33de4e790f586b1cb8a5b89222f25f710f1f5ab82ea09cb1c7b0fa9ffee869cbae497e2a2ab0c6ef1b5a0
DIST kitty-0.18.3.tar.xz 3107268 BLAKE2B 5a81552d59f5232253c0c23a9a4eb88950a5d6e9c3ca69412ca7d56d521cb69f424461df2718774489de42c78de8253d2336e4bf7f352b488364fe30f418b0c4 SHA512 77636c4d1c21157e86cae3a88bca8b161207c1f1112ce60d11d04e79cf6e8ed331085f99e0caa20b7b4f297d8bf193aeb7afa8679c871085cc9d328ed8da3ad7
+DIST kitty-0.19.1.tar.xz 3262516 BLAKE2B 82520e79125483a9e3b6592bdf38e782231934214a989fe44ad6c587a025338a98f1d09219a315dfbffc8264be5f5b2352db457b5e11edc2d08af594989a8092 SHA512 3a61d15598f32634646cbf0be596e9023420452130be1b9a718d2ce7daf3edeee6d2ba3abfe91c768758b043ed46423a2382680f9dd65fd6a6c57dbcd0fc1fd3
diff --git a/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-9999.patch b/x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.19.1.patch
similarity index 100%
rename from x11-terms/kitty-terminfo/files/kitty-terminfo-setup-9999.patch
rename to x11-terms/kitty-terminfo/files/kitty-terminfo-setup-0.19.1.patch
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild
similarity index 76%
copy from x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
copy to x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild
index 6e6b7a4abe7..cc2defc9868 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.19.1.ebuild
@@ -5,20 +5,22 @@ EAPI=7
PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-any-r1 toolchain-funcs xdg git-r3
+inherit python-any-r1 toolchain-funcs xdg
DESCRIPTION="Terminfo for kitty, an OpenGL-based terminal emulator"
HOMEPAGE="https://github.com/kovidgoyal/kitty"
-EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
LICENSE="GPL-3"
SLOT="0"
+KEYWORDS="~amd64 ~x86"
IUSE="debug"
DEPEND="${PYTHON_DEPS}"
PATCHES=(
- "${FILESDIR}"/kitty-terminfo-setup-9999.patch
+ "${FILESDIR}"/kitty-terminfo-setup-0.19.1.patch
)
# kitty-terminfo is a split package from kitty that only installs the terminfo
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
index 6e6b7a4abe7..09d8d433727 100644
--- a/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-9999.ebuild
@@ -18,7 +18,7 @@ IUSE="debug"
DEPEND="${PYTHON_DEPS}"
PATCHES=(
- "${FILESDIR}"/kitty-terminfo-setup-9999.patch
+ "${FILESDIR}"/kitty-terminfo-setup-0.19.1.patch
)
# kitty-terminfo is a split package from kitty that only installs the terminfo
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-terminfo/, x11-terms/kitty-terminfo/files/
@ 2021-02-24 8:31 Joonas Niilola
0 siblings, 0 replies; 3+ messages in thread
From: Joonas Niilola @ 2021-02-24 8:31 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-24 8:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-17 14:04 [gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty-terminfo/, x11-terms/kitty-terminfo/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-02-24 8:31 Joonas Niilola
2020-08-12 7:59 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox