diff options
| author |   Matthias Coppens <coppens.matthias.abc@gmail.com> | 2021-02-02 13:01:04 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2021-02-02 14:47:49 +0200 |
| commit | e5d0e8614d68462eddda330d57378d1e8bf4ee66 (patch) | |
| tree | ecdd09f317724cfa66a7eec468c3478e0889cc3e /x11-terms | |
| parent | x11-terms/kitty: Fix broken patch for -9999 (diff) | |
| download | gentoo-e5d0e8614d68462eddda330d57378d1e8bf4ee66.tar.gz gentoo-e5d0e8614d68462eddda330d57378d1e8bf4ee66.tar.bz2 gentoo-e5d0e8614d68462eddda330d57378d1e8bf4ee66.zip | |
x11-terms/kitty: Update flags.patch for -9999
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Matthias Coppens <coppens.matthias.abc@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/19250
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'x11-terms')
| -rw-r--r-- | x11-terms/kitty/files/kitty-9999-flags.patch | 49 | ||||
| -rw-r--r-- | x11-terms/kitty/kitty-9999.ebuild | 2 |
2 files changed, 50 insertions, 1 deletions
diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch new file mode 100644 index 000000000000..3bc0431b569a --- /dev/null +++ b/x11-terms/kitty/files/kitty-9999-flags.patch @@ -0,0 +1,49 @@ +diff --git a/setup.py b/setup.py +index ce5309ee..9cb59461 100755 +--- a/setup.py ++++ b/setup.py +@@ -278,7 +278,7 @@ def init_env( + df += ' -Og' + float_conversion = '-Wfloat-conversion' + fortify_source = '-D_FORTIFY_SOURCE=2' +- optimize = df if debug or sanitize else '-O3' ++ optimize = '' + sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set() + cppflags_ = os.environ.get( + 'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'), +@@ -289,7 +289,7 @@ def init_env( + cflags_ = os.environ.get( + 'OVERRIDE_CFLAGS', ( + '-Wextra {} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {}' +- ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden {}' ++ ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden {}' + ).format( + float_conversion, + '' if is_openbsd else '-std=c11', +@@ -306,7 +306,7 @@ def init_env( + ) + ldflags_ = os.environ.get( + 'OVERRIDE_LDFLAGS', +- '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3') ++ '-Wall ' + ' '.join(sanitize_args) + ) + ldflags = shlex.split(ldflags_) + ldflags.append('-shared') +@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None: + + + def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None: +- cflags = '-Wall -Werror -fpie'.split() ++ cflags = '-Wall -fpie'.split() + cppflags = [] + libs: List[str] = [] + if args.profile or args.sanitize: +@@ -776,8 +776,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's + cflags.append('-g') + if args.profile: + libs.append('-lprofiler') +- else: +- cflags.append('-O3') + if bundle_type.endswith('-freeze'): + cppflags.append('-DFOR_BUNDLE') + cppflags.append('-DPYVER="{}"'.format(sysconfig.get_python_version())) diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild index caaf77a28e9f..6aefe3154d48 100644 --- a/x11-terms/kitty/kitty-9999.ebuild +++ b/x11-terms/kitty/kitty-9999.ebuild @@ -56,7 +56,7 @@ BDEPEND="virtual/pkgconfig" $(python_gen_cond_dep '>=dev-python/sphinx-1.7[${PYTHON_MULTI_USEDEP}]')" PATCHES=( - "${FILESDIR}"/kitty-0.17.2-flags.patch + "${FILESDIR}"/${P}-flags.patch "${FILESDIR}"/${P}-remove-terminfo.patch "${FILESDIR}"/${PN}-0.14.4-svg-icon.patch ) |