From 4415f96321b1b3f68457e3c115437477dfadbdb9 Mon Sep 17 00:00:00 2001 From: Marcin Puc Date: Thu, 16 May 2024 18:51:14 +0200 Subject: [PATCH] neovim: update to 0.10.0 --- .../patches/cmake-allow-build-type-none.patch | 39 +++++++++---------- srcpkgs/neovim/template | 10 ++--- 2 files changed, 23 insertions(+), 26 deletions(-) diff --git a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch index 7654cc64a872e2..adffa83e6b2419 100644 --- a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch +++ b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch @@ -1,31 +1,28 @@ +Void uses the "None" build type to apply our chosen compile settings. + +diff --git a/cmake/Util.cmake b/cmake/Util.cmake +index f09de78..f48f2d0 100644 --- a/cmake/Util.cmake +++ b/cmake/Util.cmake -@@ -162,7 +162,7 @@ endfunction() - # Passing CMAKE_BUILD_TYPE for multi-config generators will now not only - # not be used, but also generate a warning for the user. - function(set_default_buildtype) +@@ -193,7 +193,7 @@ endfunction() + # Passing CMAKE_BUILD_TYPE for multi-config generators will not only not be + # used, but also generate a warning for the user. + function(set_default_buildtype BUILD_TYPE) - set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo) + set(allowableBuildTypes Debug Release MinSizeRel RelWithDebInfo None) - - get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) - if(isMultiConfig) -@@ -177,7 +177,7 @@ function(set_default_buildtype) - message(STATUS "CMAKE_BUILD_TYPE not specified, default is 'Debug'") - set(CMAKE_BUILD_TYPE Debug CACHE STRING "Choose the type of build" FORCE) - elseif(NOT CMAKE_BUILD_TYPE IN_LIST allowableBuildTypes) -- message(FATAL_ERROR "Invalid build type: ${CMAKE_BUILD_TYPE}") -+ message(WARNING "Invalid build type: ${CMAKE_BUILD_TYPE}") - else() - message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") - endif() + if(NOT BUILD_TYPE IN_LIST allowableBuildTypes) + message(FATAL_ERROR "Invalid build type: ${BUILD_TYPE}") + endif() +diff --git a/runtime/lua/nvim/health.lua b/runtime/lua/nvim/health.lua +index 5bc0319..40a72c1 100644 --- a/runtime/lua/nvim/health.lua +++ b/runtime/lua/nvim/health.lua -@@ -152,7 +152,7 @@ +@@ -153,7 +153,7 @@ local function check_performance() local buildtype = vim.fn.matchstr(vim.fn.execute('version'), [[\v\cbuild type:?\s*[^\n\r\t ]+]]) - if empty(buildtype) then - health.report_error('failed to get build type from :version') + if buildtype == '' then + health.error('failed to get build type from :version') - elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo)]]):match_str(buildtype) then + elseif vim.regex([[\v(MinSizeRel|Release|RelWithDebInfo|None)]]):match_str(buildtype) then - health.report_ok(buildtype) + health.ok(buildtype) else - health.report_info(buildtype) + health.info(buildtype) diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index d710d54c06a110..ca4bfdb3597851 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,21 +1,21 @@ # Template file for 'neovim' pkgname=neovim -version=0.9.5 -revision=2 +version=0.10.0 +revision=1 build_style=cmake build_helper="qemu" configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)" hostmakedepends="gettext lua51-lpeg lua51-mpack lua51-BitOp $(vopt_if luajit LuaJIT lua51)" -makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel - libluv-devel tree-sitter-devel $(vopt_if luajit LuaJIT-devel lua51-devel)" +makedepends="libuv-devel libvterm-devel msgpack-devel + libluv-devel tree-sitter-devel unibilium-devel $(vopt_if luajit LuaJIT-devel lua51-devel)" short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs" maintainer="Marcin Puc " license="Apache-2.0, Vim" homepage="https://neovim.io" changelog="https://github.com/neovim/neovim/releases" distfiles="https://github.com/neovim/neovim/archive/refs/tags/v${version}.tar.gz" -checksum=fe74369fc30a32ec7a086b1013acd0eacd674e7570eb1acc520a66180c9e9719 +checksum=372ea2584b0ea2a5a765844d95206bda9e4a57eaa1a2412a9a0726bab750f828 build_options=luajit