3 files changed, 76 insertions, 6 deletions
diff --git a/x11-terms/kitty/files/kitty-0.20.3-flags.patch b/x11-terms/kitty/files/kitty-0.20.3-flags.patch
new file mode 100644
index 000000000000..131d6214b4c1
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-0.20.3-flags.patch
@@ -0,0 +1,53 @@
+diff --git a/setup.py b/setup.py
+index f751107f..69bf39d4 100755
+--- a/setup.py
++++ b/setup.py
+@@ -293,7 +293,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'),
+@@ -308,8 +308,8 @@ def init_env(
+     cflags_ = os.environ.get(
+         'OVERRIDE_CFLAGS', (
+             f'-Wextra {float_conversion} -Wno-missing-field-initializers -Wall -Wstrict-prototypes {std}'
+-            f' -pedantic-errors {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',
+-        '-Wall ' + ' '.join(sanitize_args) + ('' if debug else ' -O3')
++        '-Wall ' + ' '.join(sanitize_args)
+     )
+     ldflags = shlex.split(ldflags_)
+     ldflags.append('-shared')
+@@ -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:
+@@ -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')
+-    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-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index 39042dbd458a..0e773c677650 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -17,7 +17,7 @@ index f751107f..69bf39d4 100755
              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' {optimize} {sanitize_flag} -fwrapv {stack_protector} {missing_braces}'
 +            f' {march} -fvisibility=hidden {fortify_source}'
          )
      )
@@ -31,14 +31,15 @@ index f751107f..69bf39d4 100755
      )
      ldflags = shlex.split(ldflags_)
      ldflags.append('-shared')
-@@ -789,9 +789,7 @@ def safe_makedirs(path: str) -> None:
- 
- 
+@@ -789,10 +789,7 @@
+
+
  def build_launcher(args: Options, launcher_dir: str = '.', bundle_type: str = 'source') -> None:
--    cflags = '-Wall -Werror -fpie'.split()
+-    werror = '' if args.ignore_compiler_warnings else '-pedantic-errors -Werror'
+-    cflags = f'-Wall {werror} -fpie'.split()
 -    if args.build_universal_binary:
 -        cflags += '-arch x86_64 -arch arm64'.split()
-+    cflags = '-Wall -fpie'.split()
++    cflags = f'-Wall -fpie'.split()
      cppflags = []
      libs: List[str] = []
      if args.profile or args.sanitize:
diff --git a/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
new file mode 100644
index 000000000000..39fe84b3b2a0
--- /dev/null
+++ b/x11-terms/kitty/files/kitty-9999-remove-terminfo.patch
@@ -0,0 +1,16 @@
+diff --git a/setup.py b/setup.py
+index ce5309ee..02f38c61 100755
+--- a/setup.py
++++ a/setup.py
+@@ -1082,11 +1082,6 @@
+     else:
+         build_launcher(args, launcher_dir, bundle_type)
+     os.makedirs(os.path.join(libdir, 'logo'))
+-    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)
+     shutil.copy2('__main__.py', libdir)
+     shutil.copy2('logo/kitty-128.png', os.path.join(libdir, 'logo'))
+     shutil.copy2('logo/kitty.png', os.path.join(libdir, 'logo'))