| 1 |
commit: 5e72d22a2ea5a5dd58fd99ad345c9cae0fde82f1 |
| 2 |
Author: Pablo <pord <AT> tuta <DOT> io> |
| 3 |
AuthorDate: Thu Jun 10 21:50:40 2021 +0000 |
| 4 |
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jun 11 07:21:23 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e72d22a |
| 7 |
|
| 8 |
x11-terms/kitty: fix live ebuild and update python compatibility |
| 9 |
|
| 10 |
Signed-off-by: Pablo Orduna <pabloorduna98 <AT> gmail.com> |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/789285 |
| 13 |
Closes: https://github.com/gentoo/gentoo/pull/21179 |
| 14 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 15 |
|
| 16 |
x11-terms/kitty/files/kitty-9999-flags.patch | 13 +++++++------ |
| 17 |
x11-terms/kitty/files/kitty-9999-remove-terminfo.patch | 16 ++++++++++++++++ |
| 18 |
x11-terms/kitty/kitty-9999.ebuild | 4 ++-- |
| 19 |
3 files changed, 25 insertions(+), 8 deletions(-) |
| 20 |
|
| 21 |
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch |
| 22 |
index 39042dbd458..0e773c67765 100644 |
| 23 |
--- a/x11-terms/kitty/files/kitty-9999-flags.patch |
| 24 |
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch |
| 25 |
@@ -17,7 +17,7 @@ index f751107f..69bf39d4 100755 |
| 26 |
f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}' |
| 27 |
- f' {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' |
| 28 |
- f' -pipe {march} -fvisibility=hidden {fortify_source}' |
| 29 |
-+ f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' |
| 30 |
++ f' {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' |
| 31 |
+ f' {march} -fvisibility=hidden {fortify_source}' |
| 32 |
) |
| 33 |
) |
| 34 |
@@ -31,14 +31,15 @@ index f751107f..69bf39d4 100755 |
| 35 |
) |
| 36 |
ldflags = shlex.split(ldflags_) |
| 37 |
ldflags.append('-shared') |
| 38 |
-@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None: |
| 39 |
- |
| 40 |
- |
| 41 |
+@@ -789,10 +789,7 @@ |
| 42 |
+ |
| 43 |
+ |
| 44 |
def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: |
| 45 |
-- cflags = '-Wall -Werror -fpie'.split() |
| 46 |
+- werror = '' if args.ignore_compiler_warnings else '-pedantic-errors -Werror' |
| 47 |
+- cflags = f'-Wall {werror} -fpie'.split() |
| 48 |
- if args.build_universal_binary: |
| 49 |
- cflags += '-arch x86_64 -arch arm64'.split() |
| 50 |
-+ cflags = '-Wall -fpie'.split() |
| 51 |
++ cflags = f'-Wall -fpie'.split() |
| 52 |
cppflags = [] |
| 53 |
libs: List[str] = [] |
| 54 |
if args.profile or args.sanitize: |
| 55 |
|
| 56 |
diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch |
| 57 |
new file mode 100644 |
| 58 |
index 00000000000..39fe84b3b2a |
| 59 |
--- /dev/null |
| 60 |
+++ b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch |
| 61 |
@@ -0,0 +1,16 @@ |
| 62 |
+diff --git a/setup.py b/setup.py |
| 63 |
+index ce5309ee..02f38c61 100755 |
| 64 |
+--- a/setup.py |
| 65 |
++++ a/setup.py |
| 66 |
+@@ -1082,11 +1082,6 @@ |
| 67 |
+ else: |
| 68 |
+ build_launcher(args, launcher_dir, bundle_type) |
| 69 |
+ os.makedirs(os.path.join(libdir, 'logo')) |
| 70 |
+- build_terminfo = runpy.run_path('build-terminfo', run_name='import_build') |
| 71 |
+- for x in (libdir, os.path.join(ddir, 'share')): |
| 72 |
+- odir = os.path.join(x, 'terminfo') |
| 73 |
+- safe_makedirs(odir) |
| 74 |
+- build_terminfo['compile_terminfo'](odir) |
| 75 |
+ shutil.copy2('__main__.py', libdir) |
| 76 |
+ shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo')) |
| 77 |
+ shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo')) |
| 78 |
|
| 79 |
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild |
| 80 |
index fb9de537a83..e67ade73823 100644 |
| 81 |
--- a/x11-terms/kitty/kitty-9999.ebuild |
| 82 |
+++ b/x11-terms/kitty/kitty-9999.ebuild |
| 83 |
@@ -3,7 +3,7 @@ |
| 84 |
|
| 85 |
EAPI=7 |
| 86 |
|
| 87 |
-PYTHON_COMPAT=( python3_{7,8} ) |
| 88 |
+PYTHON_COMPAT=( python3_{7,8,9} ) |
| 89 |
|
| 90 |
inherit optfeature python-single-r1 toolchain-funcs xdg |
| 91 |
|
| 92 |
@@ -58,7 +58,7 @@ BDEPEND="virtual/pkgconfig" |
| 93 |
|
| 94 |
PATCHES=( |
| 95 |
"${FILESDIR}"/${P}-flags.patch |
| 96 |
- "${FILESDIR}"/kitty-0.20.1-remove-terminfo.patch |
| 97 |
+ "${FILESDIR}"/${P}-remove-terminfo.patch |
| 98 |
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch |
| 99 |
) |
Archives