kitty: build with go not go1.20

This commit is contained in:
classabbyamp 2023-08-30 21:28:53 -04:00
parent 3da89a1760
commit d44c8bf51a
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
2 changed files with 2 additions and 33 deletions

View File

@ -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]':

View File

@ -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