From d44c8bf51ad0ff6ed5e50f2a0cf6f648cd47246f Mon Sep 17 00:00:00 2001
From: classabbyamp <void@placeviolette.net>
Date: Wed, 30 Aug 2023 21:28:53 -0400
Subject: [PATCH] kitty: build with go not go1.20

---
 srcpkgs/kitty/patches/go1.20.patch | 31 ------------------------------
 srcpkgs/kitty/template             |  4 ++--
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 srcpkgs/kitty/patches/go1.20.patch

diff --git a/srcpkgs/kitty/patches/go1.20.patch b/srcpkgs/kitty/patches/go1.20.patch
deleted file mode 100644
index 8d0ce6b2ec0..00000000000
--- a/srcpkgs/kitty/patches/go1.20.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -972,7 +972,7 @@
- ) -> str:
-     sys.stdout.flush()
-     sys.stderr.flush()
--    go = shutil.which('go')
-+    go = shutil.which('go1.20')
-     if not go:
-         raise SystemExit('The go tool was not found on this system. Install Go')
-     required_go_version = subprocess.check_output([go] + 'list -f {{.GoVersion}} -m'.split()).decode().strip()
-@@ -1599,7 +1599,7 @@
-     for x in glob.glob('kittens/*'):
-         if os.path.isdir(x) and not os.path.exists(os.path.join(x, '__init__.py')):
-             shutil.rmtree(x)
--    subprocess.check_call(['go', 'clean', '-cache', '-testcache', '-modcache', '-fuzzcache'])
-+    subprocess.check_call(['go1.20', 'clean', '-cache', '-testcache', '-modcache', '-fuzzcache'])
- 
- 
- def option_parser() -> argparse.ArgumentParser:  # {{{
---- a/kitty_tests/main.py
-+++ b/kitty_tests/main.py
-@@ -136,7 +136,7 @@
- 
- @lru_cache
- def go_exe() -> str:
--    return shutil.which('go') or ''
-+    return shutil.which('go1.20') or ''
- 
- 
- def run_go(packages: Set[str], names: str) -> 'subprocess.Popen[bytes]':
diff --git a/srcpkgs/kitty/template b/srcpkgs/kitty/template
index 7b5bc7fa59e..0cea59aa6b6 100644
--- a/srcpkgs/kitty/template
+++ b/srcpkgs/kitty/template
@@ -1,10 +1,10 @@
 # Template file for 'kitty'
 pkgname=kitty
 version=0.29.2
-revision=2
+revision=3
 build_helper="python3"
 pycompile_dirs="usr/lib/kitty"
-hostmakedepends="go1.20 pkg-config python3 wayland-devel wayland-protocols"
+hostmakedepends="go pkg-config python3 wayland-devel wayland-protocols"
 makedepends="gettext-devel glfw-devel harfbuzz-devel libxkbcommon-devel
  python3-devel wayland-devel wayland-protocols librsync-devel libcanberra-devel
  openssl-devel dbus-devel libXcursor-devel libXrandr-devel libXi-devel