From d36a64087e0d12fbb46cf5f98958a45fc5c69b81 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Aug 2024 07:04:54 +0530 Subject: [PATCH] Bump Go to 1.23 We need this because Go < 1.23 produces binaries that dont work on modern OpenBSD because OpenBSD decided to remove syscall() from their libc. Mad buggers, who removes functions from libc breaking all binaries!! Also increase minimum macOS version to 11.0 as Go 1.23 requires that --- bypy/macos.conf | 4 ++-- go.mod | 2 +- kitty/simd-string-impl.h | 4 ++-- setup.py | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bypy/macos.conf b/bypy/macos.conf index 63159dbb1..fb687a645 100644 --- a/bypy/macos.conf +++ b/bypy/macos.conf @@ -1,8 +1,8 @@ -# Requires installation of XCode 10.3 and go 1.19 and Python 3 and +# Requires installation of XCode >= 10.3 and go 1.23 and Python 3 and # python3 -m pip install certifi vm_name 'macos-kitty' root '/Users/Shared/kitty-build' python '/usr/local/bin/python3' universal 'true' -deploy_target '10.14' +deploy_target '11.0' diff --git a/go.mod b/go.mod index 1ba8cbb83..b09e1162b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module kitty -go 1.22 +go 1.23 require ( github.com/ALTree/bigfloat v0.2.0 diff --git a/kitty/simd-string-impl.h b/kitty/simd-string-impl.h index 5d32d363a..46bf7244d 100644 --- a/kitty/simd-string-impl.h +++ b/kitty/simd-string-impl.h @@ -29,13 +29,13 @@ void FUNC(xor_data64)(const uint8_t key[64] UNUSED, uint8_t* data UNUSED, const // Boilerplate {{{ START_IGNORE_DIAGNOSTIC("-Wfloat-conversion") START_IGNORE_DIAGNOSTIC("-Wpedantic") -#if defined(__clang__) && __clang_major__ > 12 +#if defined(__clang__) && __clang_major__ > 13 _Pragma("clang diagnostic push") _Pragma("clang diagnostic ignored \"-Wbitwise-instead-of-logical\"") #endif #include #include -#if defined(__clang__) && __clang_major__ > 12 +#if defined(__clang__) && __clang_major__ > 13 _Pragma("clang diagnostic pop") #endif END_IGNORE_DIAGNOSTIC diff --git a/setup.py b/setup.py index 04571907e..3836fb41e 100755 --- a/setup.py +++ b/setup.py @@ -1588,7 +1588,7 @@ def macos_info_plist() -> bytes: NSHumanReadableCopyright=time.strftime('Copyright %Y, Kovid Goyal'), CFBundleGetInfoString='kitty - The fast, feature-rich, GPU based terminal emulator. https://sw.kovidgoyal.net/kitty/', # Operating System Version - LSMinimumSystemVersion='10.15.0', + LSMinimumSystemVersion='11.0.0', # Categorization CFBundlePackageType='APPL', CFBundleSignature='????',