| 1 |
commit: e5d0e8614d68462eddda330d57378d1e8bf4ee66 |
| 2 |
Author: Matthias Coppens <coppens.matthias.abc <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Tue Feb 2 12:01:04 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=e5d0e861 |
| 7 |
|
| 8 |
x11-terms/kitty: Update flags.patch for -9999 |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
| 11 |
Signed-off-by: Matthias Coppens <coppens.matthias.abc <AT> gmail.com> |
| 12 |
Closes: https://github.com/gentoo/gentoo/pull/19250 |
| 13 |
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org> |
| 14 |
|
| 15 |
x11-terms/kitty/files/kitty-9999-flags.patch | 49 ++++++++++++++++++++++++++++ |
| 16 |
x11-terms/kitty/kitty-9999.ebuild | 2 +- |
| 17 |
2 files changed, 50 insertions(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..3bc0431b569 |
| 22 |
--- /dev/null |
| 23 |
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch |
| 24 |
@@ -0,0 +1,49 @@ |
| 25 |
+diff --git a/setup.py b/setup.py |
| 26 |
+index ce5309ee..9cb59461 100755 |
| 27 |
+--- a/setup.py |
| 28 |
++++ b/setup.py |
| 29 |
+@@ -278,7 +278,7 @@ def init_env( |
| 30 |
+ df += ' -Og' |
| 31 |
+ float_conversion = '-Wfloat-conversion' |
| 32 |
+ fortify_source = '-D_FORTIFY_SOURCE=2' |
| 33 |
+- optimize = df if debug or sanitize else '-O3' |
| 34 |
++ optimize = '' |
| 35 |
+ sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() |
| 36 |
+ cppflags_ = os.environ.get( |
| 37 |
+ 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), |
| 38 |
+@@ -289,7 +289,7 @@ def init_env( |
| 39 |
+ cflags_ = os.environ.get( |
| 40 |
+ 'OVERRIDE_CFLAGS', ( |
| 41 |
+ '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}' |
| 42 |
+- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}' |
| 43 |
++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}' |
| 44 |
+ ).format( |
| 45 |
+ float_conversion, |
| 46 |
+ '' if is_openbsd else '-std=c11', |
| 47 |
+@@ -306,7 +306,7 @@ def init_env( |
| 48 |
+ ) |
| 49 |
+ ldflags_ = os.environ.get( |
| 50 |
+ 'OVERRIDE_LDFLAGS', |
| 51 |
+- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') |
| 52 |
++ '-Wall ' + ' '.join(sanitize_args) |
| 53 |
+ ) |
| 54 |
+ ldflags = shlex.split(ldflags_) |
| 55 |
+ ldflags.append('-shared') |
| 56 |
+@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None: |
| 57 |
+ |
| 58 |
+ |
| 59 |
+ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: |
| 60 |
+- cflags = '-Wall -Werror -fpie'.split() |
| 61 |
++ cflags = '-Wall -fpie'.split() |
| 62 |
+ cppflags = [] |
| 63 |
+ libs: List[str] = [] |
| 64 |
+ if args.profile or args.sanitize: |
| 65 |
+@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's |
| 66 |
+ cflags.append('-g') |
| 67 |
+ if args.profile: |
| 68 |
+ libs.append('-lprofiler') |
| 69 |
+- else: |
| 70 |
+- cflags.append('-O3') |
| 71 |
+ if bundle_type.endswith('-freeze'): |
| 72 |
+ cppflags.append('-DFOR_BUNDLE') |
| 73 |
+ cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) |
| 74 |
|
| 75 |
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild |
| 76 |
index caaf77a28e9..6aefe3154d4 100644 |
| 77 |
--- a/x11-terms/kitty/kitty-9999.ebuild |
| 78 |
+++ b/x11-terms/kitty/kitty-9999.ebuild |
| 79 |
@@ -56,7 +56,7 @@ BDEPEND="virtual/pkgconfig" |
| 80 |
$(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')" |
| 81 |
|
| 82 |
PATCHES=( |
| 83 |
- "${FILESDIR}"/kitty-0.17.2-flags.patch |
| 84 |
+ "${FILESDIR}"/${P}-flags.patch |
| 85 |
"${FILESDIR}"/${P}-remove-terminfo.patch |
| 86 |
"${FILESDIR}"/${PN}-0.14.4-svg-icon.patch |
| 87 |
) |
Archives