From 4ed98532a254f699243b7a8d9f4698604f03b3d3 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 24 Mar 2020 12:05:05 +0100
Subject: kitty: 0.16.0 -> 0.17.1

https://github.com/kovidgoyal/kitty/releases/tag/v0.17.1

The png2icns patch is no longer needed because kitty will now automatically use `png2icns` when `iconutil` cannot be found.
The zsh completions will now work without needing to invoke them with `source`, which means, that we can just install them like the other shell completions.
---
 pkgs/applications/misc/kitty/default.nix    |  6 +++---
 pkgs/applications/misc/kitty/no-lto.patch   |  5 +++--
 pkgs/applications/misc/kitty/png2icns.patch | 21 ---------------------
 3 files changed, 6 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/misc/kitty/png2icns.patch

(limited to 'pkgs/applications/misc')

diff --git a/pkgs/applications/misc/kitty/default.nix b/pkgs/applications/misc/kitty/default.nix
index f5553cac6b59..6860f04f99c1 100644
--- a/pkgs/applications/misc/kitty/default.nix
+++ b/pkgs/applications/misc/kitty/default.nix
@@ -20,14 +20,14 @@
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.16.0";
+  version = "0.17.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     rev = "v${version}";
-    sha256 = "1bszyddar0g1gdz67h8rd3gbrdhi6ahjg7j14cjiqxm1938z9ajf";
+    sha256 = "1ydli1phgcy17iz6jxgixn8yc86dp8q2yfxk08c8lwh7gxjnjz7f";
   };
 
   buildInputs = [
@@ -72,7 +72,6 @@ buildPythonApplication rec {
     })
   ] ++ stdenv.lib.optionals stdenv.isDarwin [
     ./no-lto.patch
-    ./png2icns.patch
   ];
 
   # Causes build failure due to warning
@@ -106,6 +105,7 @@ buildPythonApplication rec {
     mkdir -p "$out/share/"{bash-completion/completions,fish/vendor_completions.d,zsh/site-functions}
     "$out/bin/kitty" + complete setup fish > "$out/share/fish/vendor_completions.d/kitty.fish"
     "$out/bin/kitty" + complete setup bash > "$out/share/bash-completion/completions/kitty.bash"
+    "$out/bin/kitty" + complete setup zsh > "$out/share/zsh/site-functions/_kitty"
   '';
 
   postInstall = ''
diff --git a/pkgs/applications/misc/kitty/no-lto.patch b/pkgs/applications/misc/kitty/no-lto.patch
index 44d231cb07f9..8073c11fbd2a 100644
--- a/pkgs/applications/misc/kitty/no-lto.patch
+++ b/pkgs/applications/misc/kitty/no-lto.patch
@@ -1,12 +1,13 @@
 --- a/setup.py
 +++ b/setup.py
-@@ -233,9 +233,6 @@ def init_env(
+@@ -277,10 +277,6 @@ def init_env(
      cppflags += shlex.split(os.environ.get('CPPFLAGS', ''))
      cflags += shlex.split(os.environ.get('CFLAGS', ''))
      ldflags += shlex.split(os.environ.get('LDFLAGS', ''))
 -    if not debug and not sanitize:
 -        # See https://github.com/google/sanitizers/issues/647
--        cflags.append('-flto'), ldflags.append('-flto')
+-        cflags.append('-flto')
+-        ldflags.append('-flto')
 
      if profile:
          cppflags.append('-DWITH_PROFILER')
diff --git a/pkgs/applications/misc/kitty/png2icns.patch b/pkgs/applications/misc/kitty/png2icns.patch
deleted file mode 100644
index 68566e2a899f..000000000000
--- a/pkgs/applications/misc/kitty/png2icns.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -aru a/setup.py b/setup.py
---- a/setup.py	2019-07-29 11:09:32.000000000 -0400
-+++ b/setup.py	2019-07-29 11:11:37.000000000 -0400
-@@ -784,9 +784,15 @@
- def create_macos_app_icon(where='Resources'):
-     logo_dir = os.path.abspath(os.path.join('logo', appname + '.iconset'))
-     subprocess.check_call([
--        'iconutil', '-c', 'icns', logo_dir, '-o',
-+        'png2icns',
-         os.path.join(where, os.path.basename(logo_dir).partition('.')[0] + '.icns')
--    ])
-+    ] + [os.path.join(logo_dir, logo) for logo in [
-+        'icon_128x128.png',
-+        'icon_16x16.png',
-+        'icon_256x256.png',
-+        'icon_32x32.png',
-+        'icon_512x512.png',
-+    ]])
- 
- 
- def create_minimal_macos_bundle(args, where):
-- 
cgit 1.4.1