[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/

[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/

[Matthew Thode]

commit:     0ba4df877b3ba07fef8f63083767deb47171f052
Author:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 17 19:59:23 2019 +0000
Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Wed Jul 17 19:59:36 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ba4df87

x11-terms/kitty: fix 9999 patch one more time

Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Matthew Thode <prometheanfire <AT> gentoo.org>

 x11-terms/kitty/files/kitty-9999-flags.patch | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index f7efa3b305b..0593cfd706d 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -1,5 +1,5 @@
---- setup.py.orig	2019-07-16 18:04:24.052780940 -0500
-+++ setup.py	2019-07-16 18:05:54.564383192 -0500
+--- kitty-9999/setup.py	2019-07-16 18:04:24.052780940 -0500
++++ kitty-9999/setup.py	2019-07-16 18:05:54.564383192 -0500
 @@ -202,7 +202,7 @@
      df = '-g3'
      if ccver >= (5, 0):

[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/

[Tim Harder]

commit:     ecaebe887cfce9bb61ee95574ed373f694f9a2ec
Author:     Tim Harder <radhermit <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 18 21:59:20 2019 +0000
Commit:     Tim Harder <radhermit <AT> gentoo <DOT> org>
CommitDate: Mon Nov 18 21:59:20 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ecaebe88

x11-terms/kitty: update flags patch for live ebuild

Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>

 x11-terms/kitty/files/kitty-9999-flags.patch | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index 0593cfd706d..1c53cfcc84c 100644
--- a/x11-terms/kitty/files/kitty-9999-flags.patch
+++ b/x11-terms/kitty/files/kitty-9999-flags.patch
@@ -1,6 +1,8 @@
---- kitty-9999/setup.py	2019-07-16 18:04:24.052780940 -0500
-+++ kitty-9999/setup.py	2019-07-16 18:05:54.564383192 -0500
-@@ -202,7 +202,7 @@
+diff --git a/setup.py b/setup.py
+index 22423119..b1f4dfe0 100755
+--- a/setup.py
++++ b/setup.py
+@@ -202,7 +202,7 @@ def init_env(
      df = '-g3'
      if ccver >= (5, 0):
          df += ' -Og'
@@ -9,16 +11,16 @@
      sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
      cppflags = os.environ.get(
          'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
-@@ -213,7 +213,7 @@
+@@ -213,7 +213,7 @@ def init_env(
      cflags = os.environ.get(
          'OVERRIDE_CFLAGS', (
-             '-Wextra -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
+             '-Wextra -Wfloat-conversion -Wno-missing-field-initializers -Wall -Wstrict-prototypes -std=c11'
 -            ' -pedantic-errors -Werror {} {} -fwrapv {} {} -pipe {} -fvisibility=hidden'
 +            ' -pedantic-errors {} {} -fwrapv {} {} {} -fvisibility=hidden'
          ).format(
              optimize,
              ' '.join(sanitize_args),
-@@ -227,7 +227,7 @@
+@@ -227,7 +227,7 @@ def init_env(
      )
      ldflags = os.environ.get(
          'OVERRIDE_LDFLAGS',
@@ -27,7 +29,7 @@
      )
      ldflags = shlex.split(ldflags)
      ldflags.append('-shared')
-@@ -606,20 +606,17 @@
+@@ -606,20 +606,17 @@ def safe_makedirs(path):
  
  
  def build_launcher(args, launcher_dir='.', bundle_type='source'):

[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/

[Joonas Niilola]

commit:     b6722f49733ee33dce839bce0b3e386ecb82e78f
Author:     Luke Peterson <hazelnusse <AT> gmail <DOT> com>
AuthorDate: Mon May 10 17:44:56 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue May 11 07:17:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b6722f49

x11-terms/kitty: fix kitty-9999-flags.patch

Upstream updated setup.py to use Python f-strings, breaking the previous
version of kitty-9999-flags.patch.

Closes: https://bugs.gentoo.org/789282
Signed-off-by: Dale Lukas Peterson <hazelnusse <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/20609
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 x11-terms/kitty/files/kitty-9999-flags.patch | 30 ++++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/x11-terms/kitty/files/kitty-9999-flags.patch b/x11-terms/kitty/files/kitty-9999-flags.patch
index 3bc0431b569..39042dbd458 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')

[gentoo-commits] repo/gentoo:master commit in: x11-terms/kitty/files/

[Conrad Kostecki]

commit:     092d34666c7117b376e3b6b0b3a309879a7209b2
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Thu Apr 18 18:17:17 2024 +0000
Commit:     Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 19:31:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=092d3466

x11-terms/kitty: remove unused patch(es)

Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/36312
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>

 x11-terms/kitty/files/kitty-0.33.0-no-simd.patch | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/x11-terms/kitty/files/kitty-0.33.0-no-simd.patch b/x11-terms/kitty/files/kitty-0.33.0-no-simd.patch
deleted file mode 100644
index c1366c0ce73c..000000000000
--- a/x11-terms/kitty/files/kitty-0.33.0-no-simd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Backport of fix for -DKITTY_NO_SIMD (aka for non-x86/amd64/arm64)
-https://github.com/kovidgoyal/kitty/issues/7225
-https://github.com/kovidgoyal/kitty/commit/393169f79daf60c038b3e11e657fa5f3ee41c24c
---- a/kitty/simd-string-impl.h
-+++ b/kitty/simd-string-impl.h
-@@ -21,5 +21,5 @@
- bool FUNC(utf8_decode_to_esc)(UTF8Decoder *d UNUSED, const uint8_t *src UNUSED, size_t src_sz UNUSED) NOSIMD
- const uint8_t* FUNC(find_either_of_two_bytes)(const uint8_t *haystack UNUSED, const size_t sz UNUSED, const uint8_t a UNUSED, const uint8_t b UNUSED) NOSIMD
--void FUNC(xor_data64)(const uint8_t key[64], uint8_t* data, const size_t data_sz);
-+void FUNC(xor_data64)(const uint8_t key[64] UNUSED, uint8_t* data UNUSED, const size_t data_sz UNUSED) NOSIMD
- #undef NOSIMD
- #else