From c865535abd12c3696e28dd5c76b3ef3167fa7150 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?= Date: Wed, 1 Feb 2023 15:42:22 +0700 Subject: [PATCH] neovim: reduce log Fix: #42010 --- .../patches/cmake-allow-build-type-none.patch | 13 +++++++++---- srcpkgs/neovim/template | 9 +++++++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch index d6d8c8f1b15..d98563e0025 100644 --- a/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch +++ b/srcpkgs/neovim/patches/cmake-allow-build-type-none.patch @@ -1,7 +1,14 @@ -diff --git a/cmake/Util.cmake b/cmake/Util.cmake -index 343a729..d7d15e1 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) +- 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) @@ -11,8 +18,6 @@ index 343a729..d7d15e1 100644 else() message(STATUS "CMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}") endif() -diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim -index be56658..46fdd0f 100644 --- a/runtime/autoload/health/nvim.vim +++ b/runtime/autoload/health/nvim.vim @@ -135,7 +135,7 @@ function! s:check_performance() abort diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index 95c1f073106..2cd7bafd0dd 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,10 +1,12 @@ # Template file for 'neovim' pkgname=neovim version=0.8.2 -revision=2 +revision=3 build_style=cmake build_helper="qemu" -configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON)" +# MIN_LOG_LEVEL 1: INFO, 3: ERROR, upstream's release's default is 3 +configure_args="-DCOMPILE_LUA=OFF -DPREFER_LUA=$(vopt_if luajit OFF ON) + -DMIN_LOG_LEVEL=3" hostmakedepends="pkg-config gettext gperf lua51-lpeg lua51-mpack lua51-BitOp $(vopt_if luajit LuaJIT lua51)" makedepends="libtermkey-devel libuv-devel libvterm-devel msgpack-devel @@ -31,6 +33,9 @@ alternatives=" vim:vim:/usr/bin/nvim vim:vim.1:/usr/share/man/man1/nvim.1" +# They want assertion +CFLAGS=-UNDEBUG + pre_configure() { vsed -i runtime/CMakeLists.txt \ -e "s|\".*/bin/nvim|\${CMAKE_CROSSCOMPILING_EMULATOR} &|g"