[packages/neovim] up to 0.10.0
atler
atler at pld-linux.org
Sat May 18 14:06:12 CEST 2024
commit 6eb6686dfe6a79a6c898e6837fd9672dae352d63
Author: Jan Palus <atler at pld-linux.org>
Date: Sat May 18 14:05:07 2024 +0200
up to 0.10.0
build-type.patch | 20 ++++++++++----------
luv.patch | 36 ++++++++----------------------------
neovim.spec | 22 ++++++++++------------
3 files changed, 28 insertions(+), 50 deletions(-)
---
diff --git a/neovim.spec b/neovim.spec
index ecfb2d2..0ffd6ad 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -18,25 +18,24 @@
Summary: Vim-fork focused on extensibility and agility
Name: neovim
-Version: 0.9.5
+Version: 0.10.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: 106932337799a21cf8d28d488c7fc702
+# Source0-md5: b5ad54391b6a1a30930c1ab392d506ec
URL: https://neovim.io/
Source2: %{name}.svg
Patch0: desktop.patch
Patch1: build-type.patch
Patch2: luv.patch
-BuildRequires: cmake >= 3.10
+BuildRequires: cmake >= 3.13
BuildRequires: gcc >= 6:4.4
BuildRequires: gettext-tools
BuildRequires: libstdc++-devel
-BuildRequires: libtermkey-devel >= 0.22
BuildRequires: libuv-devel >= 1.28.0
-BuildRequires: libvterm-devel >= 0.3
+BuildRequires: libvterm-devel >= 0.3.3
BuildRequires: lua-bitop >= 1.0.2
BuildRequires: lua-lpeg
BuildRequires: lua-mpack >= 1.0.2
@@ -44,7 +43,7 @@ BuildRequires: msgpack-devel >= 1.1.0
BuildRequires: pkgconfig
BuildRequires: rpm-build >= 4.6
BuildRequires: rpmbuild(macros) >= 1.605
-BuildRequires: tree-sitter-devel >= 0.20.8
+BuildRequires: tree-sitter-devel >= 0.20.9
BuildRequires: unibilium-devel >= 2.0.0
%if %{with prefer_lua}
BuildRequires: lua51
@@ -55,11 +54,10 @@ BuildRequires: luajit
BuildRequires: luajit-devel
BuildRequires: luajit-luv-devel >= 1.43.0
%endif
-Requires: libtermkey >= 0.22
Requires: libuv >= 1.28.0
-Requires: libvterm >= 0.3
+Requires: libvterm >= 0.3.3
Requires: %{?with_prefer_lua:lua51}%{!?with_prefer_lua:luajit}-luv
-Requires: tree-sitter >= 0.20.8
+Requires: tree-sitter >= 0.20.9
Suggests: %{name}-desktop = %{version}-%{release}
Suggests: python-neovim
Suggests: python3-neovim
@@ -107,8 +105,8 @@ Desktop files for Neovim.
-DLUA_INCLUDE_DIR=/usr/include/lua5.1 \
-DUSE_BUNDLED=OFF \
-DENABLE_JEMALLOC=ON \
- -DLIBLUV_INCLUDE_DIR=%{luv_includedir} \
- -DLIBLUV_LIBRARY=%{luv_library}
+ -DLUV_INCLUDE_DIR=%{luv_includedir} \
+ -DLUV_LIBRARY=%{luv_library}
%{__make} -C build
@@ -164,7 +162,7 @@ EOF
%files -f nvim.lang
%defattr(644,root,root,755)
-%doc BACKERS.md CONTRIBUTING.md LICENSE.txt README.md
+%doc CONTRIBUTING.md LICENSE.txt README.md
%dir /etc/xdg/nvim
%config(noreplace) %verify(not md5 mtime size) /etc/xdg/nvim/init.vim
%attr(755,root,root) %{_bindir}/nvim
diff --git a/build-type.patch b/build-type.patch
index b29dc0d..1f558ca 100644
--- a/build-type.patch
+++ b/build-type.patch
@@ -2,22 +2,22 @@ diff --color -ur neovim-0.8.0.orig/cmake/Util.cmake neovim-0.8.0/cmake/Util.cmak
--- 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)
+ # 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 PLD)
-
- get_property(isMultiConfig GLOBAL PROPERTY GENERATOR_IS_MULTI_CONFIG)
- if(isMultiConfig)
+ if(NOT BUILD_TYPE IN_LIST allowableBuildTypes)
+ message(FATAL_ERROR "Invalid build type: ${BUILD_TYPE}")
+ endif()
--- neovim-0.9.1/runtime/lua/nvim/health.lua.orig 2023-05-29 13:24:38.000000000 +0200
+++ neovim-0.9.1/runtime/lua/nvim/health.lua 2023-07-02 13:20:36.760937259 +0200
@@ -152,7 +152,7 @@
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|PLD)]]):match_str(buildtype) then
- health.report_ok(buildtype)
+ health.ok(buildtype)
else
- health.report_info(buildtype)
+ health.info(buildtype)
diff --git a/luv.patch b/luv.patch
index f076c7e..e52c247 100644
--- a/luv.patch
+++ b/luv.patch
@@ -11,42 +11,22 @@ anymore.
src/nvim/CMakeLists.txt | 8 ++------
2 files changed, 3 insertions(+), 16 deletions(-)
-diff --git a/cmake/FindLibluv.cmake b/cmake/FindLibluv.cmake
-index 9a74d5d0e1ba0..3dfc53602413c 100644
---- a/cmake/FindLibluv.cmake
-+++ b/cmake/FindLibluv.cmake
-@@ -1,14 +1,5 @@
- find_path(LIBLUV_INCLUDE_DIR luv/luv.h)
--
--# Explicitly look for luv.so. #10407
--list(APPEND LIBLUV_NAMES luv_a luv libluv_a luv${CMAKE_SHARED_LIBRARY_SUFFIX})
--
--find_library(LIBLUV_LIBRARY NAMES ${LIBLUV_NAMES})
--
--set(LIBLUV_LIBRARIES ${LIBLUV_LIBRARY})
--set(LIBLUV_INCLUDE_DIRS ${LIBLUV_INCLUDE_DIR})
--
-+find_library(LIBLUV_LIBRARY NAMES luv_a luv libluv_a luv.so)
- find_package_handle_standard_args(Libluv DEFAULT_MSG
- LIBLUV_LIBRARY LIBLUV_INCLUDE_DIR)
--
- mark_as_advanced(LIBLUV_INCLUDE_DIR LIBLUV_LIBRARY)
diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 61530f5a7bf95..51e0727cd51c4 100755
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -14,12 +14,8 @@ else()
- endif()
-
- find_package(Libluv 1.43.0 REQUIRED)
--target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBLUV_INCLUDE_DIRS})
+ # TODO(dundargoc): unittest stops working if I create an pseudo-imported
+ # library "luv" as with the other dependencies. Figure out why and fix.
+ find_package(Luv 1.43.0 REQUIRED)
+-target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUV_INCLUDE_DIRS})
-# Use "luv" as imported library, to work around CMake using "-lluv" for
-# "luv.so". #10407
-add_library(luv UNKNOWN IMPORTED)
--set_target_properties(luv PROPERTIES IMPORTED_LOCATION ${LIBLUV_LIBRARIES})
+-set_target_properties(luv PROPERTIES IMPORTED_LOCATION ${LUV_LIBRARY})
-target_link_libraries(main_lib INTERFACE luv)
-+target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LIBLUV_INCLUDE_DIR})
-+target_link_libraries(main_lib INTERFACE ${LIBLUV_LIBRARY})
++target_include_directories(main_lib SYSTEM BEFORE INTERFACE ${LUV_INCLUDE_DIR})
++target_link_libraries(main_lib INTERFACE ${LUV_LIBRARY})
find_package(Iconv REQUIRED)
- find_package(Libtermkey 0.22 REQUIRED)
+ find_package(Libuv 1.28.0 REQUIRED)
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/neovim.git/commitdiff/6eb6686dfe6a79a6c898e6837fd9672dae352d63
More information about the pld-cvs-commit
mailing list