From 87eb70821090f42bc13c119044ded16a9c570479 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Sat, 1 Oct 2022 11:02:59 +0200 Subject: [PATCH] up to 0.8.0 --- build-type.patch | 25 +++++++++++++++++++++++++ neovim.spec | 14 ++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 build-type.patch diff --git a/build-type.patch b/build-type.patch new file mode 100644 index 0000000..6deab87 --- /dev/null +++ b/build-type.patch @@ -0,0 +1,25 @@ +diff --color -ur neovim-0.8.0.orig/cmake/Util.cmake neovim-0.8.0/cmake/Util.cmake +--- neovim-0.8.0.orig/cmake/Util.cmake 2022-09-30 17:15:13.000000000 +0200 ++++ neovim-0.8.0/cmake/Util.cmake 2022-10-01 09:53:36.320939926 +0200 +@@ -162,7 +162,7 @@ + # 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 PLD) + + get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG) + if(isMultiConfig) +diff --color -ur neovim-0.8.0.orig/CMakeLists.txt neovim-0.8.0/CMakeLists.txt +--- neovim-0.8.0.orig/CMakeLists.txt 2022-09-30 17:15:13.000000000 +0200 ++++ neovim-0.8.0/CMakeLists.txt 2022-10-01 09:56:00.395911537 +0200 +@@ -150,7 +150,8 @@ + # Minimize logging for release-type builds. + if(CMAKE_BUILD_TYPE STREQUAL "Release" + OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo" +- OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel") ++ OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel" ++ OR CMAKE_BUILD_TYPE STREQUAL "PLD") + message(STATUS "MIN_LOG_LEVEL not specified, default is 3 (ERROR) for release builds") + set(MIN_LOG_LEVEL 3) + else() diff --git a/neovim.spec b/neovim.spec index 56c0e6e..ba5ee1d 100644 --- a/neovim.spec +++ b/neovim.spec @@ -18,24 +18,24 @@ Summary: Vim-fork focused on extensibility and agility Name: neovim -Version: 0.7.2 +Version: 0.8.0 Release: 1 License: Apache v2.0 Group: Applications/Editors/Vim # Source0Download: https://github.com/neovim/neovim/releases Source0: https://github.com/neovim/neovim/archive/v%{version}/%{name}-%{version}.tar.gz -# Source0-md5: f0fb0aa65462e36ca1ef627833266976 +# Source0-md5: 4fccaf03bd8854e902cabf65e85e3346 URL: https://neovim.io/ Source2: %{name}.svg Patch0: desktop.patch +Patch1: build-type.patch BuildRequires: cmake >= 3.10 BuildRequires: gcc >= 6:4.4 BuildRequires: gettext-tools -BuildRequires: gperf BuildRequires: libstdc++-devel -BuildRequires: libtermkey-devel >= 0.18 +BuildRequires: libtermkey-devel >= 0.22 BuildRequires: libuv-devel >= 1.28.0 -BuildRequires: libvterm-devel >= 0.1.0 +BuildRequires: libvterm-devel >= 0.3 BuildRequires: lua-bitop >= 1.0.2 BuildRequires: lua-lpeg BuildRequires: lua-mpack >= 1.0.2 @@ -54,8 +54,9 @@ BuildRequires: luajit BuildRequires: luajit-devel BuildRequires: luajit-luv-devel >= 1.43.0 %endif -Requires: libtermkey >= 0.18 +Requires: libtermkey >= 0.22 Requires: libuv >= 1.28.0 +Requires: libvterm >= 0.3 Requires: %{?with_prefer_lua:lua51}%{!?with_prefer_lua:luajit}-luv Suggests: %{name}-desktop = %{version}-%{release} Suggests: python-neovim @@ -94,6 +95,7 @@ Desktop files for Neovim. %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %cmake -B build \ -- 2.44.0