diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-05-11 19:55:43 +0100 |
commit | 185fa19bbf68a4d4dca534d2b46729207a177f16 (patch) | |
tree | a8a537b82fda83a0799c2ca9887f212558363aa7 /x11-terms/kitty/files | |
parent | c8fd0d84af0bfd1949542adc2cbb735b1d28f9ed (diff) |
gentoo resync : 11.05.2021
Diffstat (limited to 'x11-terms/kitty/files')
-rw-r--r-- | x11-terms/kitty/files/kitty-0.20.1-flags.patch | 49 | ||||
-rw-r--r-- | x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch (renamed from x11-terms/kitty/files/kitty-9999-remove-terminfo.patch) | 0 | ||||
-rw-r--r-- | x11-terms/kitty/files/kitty-0.20.1-tests.patch | 11 | ||||
-rw-r--r-- | x11-terms/kitty/files/kitty-9999-flags.patch | 30 |
4 files changed, 77 insertions, 13 deletions
diff --git a/x11-terms/kitty/files/kitty-0.20.1-flags.patch b/x11-terms/kitty/files/kitty-0.20.1-flags.patch new file mode 100644 index 000000000000..27a44f56794c --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.20.1-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 = '' if sanitize and is_macos else '-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/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch index aeb40e601185..aeb40e601185 100644 --- a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch +++ b/x11-terms/kitty/files/kitty-0.20.1-remove-terminfo.patch diff --git a/x11-terms/kitty/files/kitty-0.20.1-tests.patch b/x11-terms/kitty/files/kitty-0.20.1-tests.patch new file mode 100644 index 000000000000..210898b888d9 --- /dev/null +++ b/x11-terms/kitty/files/kitty-0.20.1-tests.patch @@ -0,0 +1,11 @@ +--- a/kitty/constants.py ++++ b/kitty/constants.py +@@ -64,7 +64,7 @@ + def kitty_exe() -> str: + rpath = sys._xoptions.get('bundle_exe_dir') + if not rpath: +- items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, 'kitty', 'launcher')] ++ items = os.environ.get('PATH', '').split(os.pathsep) + [os.path.join(kitty_base_dir, '../linux-package/bin')] + seen: Set[str] = set() + for candidate in filter(None, items): + if candidate not in seen: diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch index 3bc0431b569a..39042dbd458a 100644 --- a/x11-terms/kitty/files/kitty-9999-flags.patch +++ b/x11-terms/kitty/files/kitty-9999-flags.patch @@ -1,26 +1,28 @@ diff --git a/setup.py b/setup.py -index ce5309ee..9cb59461 100755 +index f751107f..69bf39d4 100755 --- a/setup.py +++ b/setup.py -@@ -278,7 +278,7 @@ def init_env( +@@ -293,7 +293,7 @@ def init_env( df += ' -Og' float_conversion = '-Wfloat-conversion' - fortify_source = '-D_FORTIFY_SOURCE=2' + fortify_source = '' if sanitize and is_macos else '-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( +@@ -308,8 +308,8 @@ 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( + f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}' +- f' {werror} {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' +- f' -pipe {march} -fvisibility=hidden {fortify_source}' ++ f' -pedantic-errors {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}' ++ f' {march} -fvisibility=hidden {fortify_source}' + ) + ) + cflags = shlex.split(cflags_) + shlex.split( +@@ -317,7 +317,7 @@ def init_env( ) ldflags_ = os.environ.get( 'OVERRIDE_LDFLAGS', @@ -29,16 +31,18 @@ index ce5309ee..9cb59461 100755 ) ldflags = shlex.split(ldflags_) ldflags.append('-shared') -@@ -764,7 +764,7 @@ def safe_makedirs(path: str) -> None: +@@ -789,9 +789,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() +- if args.build_universal_binary: +- cflags += '-arch x86_64 -arch arm64'.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 +@@ -803,8 +801,6 @@ def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 's cflags.append('-g') if args.profile: libs.append('-lprofiler') |