From f6c0a37b021cebe7fda730f2116c763b6464203d Mon Sep 17 00:00:00 2001 From: Christian Clason Date: Tue, 5 Oct 2021 17:23:42 +0200 Subject: [PATCH] build(deps)!: use libuv 1.42.0 upstream for WIN32 (#15889) Switch libuv from https://github.com/neovim/libuv fork to upstream for WIN32. Upstream at 1.42.0 is now used for all platforms. BREAKING CHANGE: removes Windows 7 support BREAKING CHANGE: removes support for mouse and alternate buffers in TUI for Windows 8 and 8.1 --- ci/build.ps1 | 2 +- third-party/CMakeLists.txt | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/ci/build.ps1 b/ci/build.ps1 index 53e4328e02..8876ac31ef 100644 --- a/ci/build.ps1 +++ b/ci/build.ps1 @@ -72,7 +72,7 @@ if ($compiler -eq 'MINGW') { & C:\msys64\usr\bin\mkdir -p /var/cache/pacman/pkg # Build third-party dependencies - C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" ; exitIfFailed + C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Syu" ; exitIfFailed C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S $mingwPackages" ; exitIfFailed } elseif ($compiler -eq 'MSVC') { diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt index 8dc9644ae5..12e429da24 100644 --- a/third-party/CMakeLists.txt +++ b/third-party/CMakeLists.txt @@ -144,14 +144,8 @@ endif() include(ExternalProject) -if(WIN32) - # "nvim" branch of https://github.com/neovim/libuv - set(LIBUV_URL https://github.com/neovim/libuv/archive/b899d12b0d56d217f31222da83f8c398355b69ef.tar.gz) - set(LIBUV_SHA256 eb7e37b824887e1b31a4e31d1d9bad4c03d8b98532d9cce5f67a3b70495a4b2a) -else() - set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.42.0.tar.gz) - set(LIBUV_SHA256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764) -endif() +set(LIBUV_URL https://github.com/libuv/libuv/archive/v1.42.0.tar.gz) +set(LIBUV_SHA256 371e5419708f6aaeb8656671f89400b92a9bba6443369af1bb70bcd6e4b3c764) set(MSGPACK_URL https://github.com/msgpack/msgpack-c/releases/download/cpp-3.0.0/msgpack-3.0.0.tar.gz) set(MSGPACK_SHA256 bfbb71b7c02f806393bc3cbc491b40523b89e64f83860c58e3e54af47de176e4)