commit 90cd2e752d0dad5848702aa1c740b158397f6d7e
Author: Jan Rękorajski <[email protected]>
Date: Thu Dec 26 12:00:05 2024 +0100
- rel 3, fix luajit discovery
luajit-lua52.patch | 11 +++++++++++
neovim.spec | 12 +++++++-----
2 files changed, 18 insertions(+), 5 deletions(-)
---
diff --git a/neovim.spec b/neovim.spec
index 11ee285..49fb26f 100644
--- a/neovim.spec
+++ b/neovim.spec
@@ -21,7 +21,7 @@
Summary: Vim-fork focused on extensibility and agility
Name: neovim
Version: 0.10.3
-Release: 2
+Release: 3
License: Apache v2.0
Group: Applications/Editors/Vim
# Source0Download: https://github.com/neovim/neovim/releases
@@ -32,6 +32,7 @@ Source2: %{name}.svg
Patch0: desktop.patch
Patch1: build-type.patch
Patch2: luv.patch
+Patch3: luajit-lua52.patch
BuildRequires: cmake >= 3.13
BuildRequires: gcc >= 6:4.4
BuildRequires: gettext-tools
@@ -59,8 +60,8 @@ BuildRequires: luajit-luv-devel >= 1.43.0
%endif
Requires: libuv >= 1.28.0
Requires: libvterm >= 0.3.3
-Requires: lua%{!?with_prefer_lua:jit}-lpeg
Requires: %{?with_prefer_lua:lua51}%{!?with_prefer_lua:luajit}-luv
+Requires: lua%{!?with_prefer_lua:jit}-lpeg
Requires: tree-sitter >= 0.20.9
Suggests: %{name}-desktop = %{version}-%{release}
Suggests: neovim-parser-c
@@ -104,9 +105,10 @@ Desktop files for Neovim.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1 -R
+%patch -P 0 -p1
+%patch -P 1 -p1
+%patch -P 2 -p1 -R
+%patch -P 3 -p1
%build
%cmake -B build \
diff --git a/luajit-lua52.patch b/luajit-lua52.patch
new file mode 100644
index 0000000..ad33b61
--- /dev/null
+++ b/luajit-lua52.patch
@@ -0,0 +1,11 @@
+--- neovim-0.10.3/cmake/FindLuajit.cmake~ 2024-12-21 18:15:18.000000000
+0100
++++ neovim-0.10.3/cmake/FindLuajit.cmake 2024-12-26 11:58:10.086665426
+0100
+@@ -6,7 +6,7 @@
+ elseif(MINGW)
+ list(APPEND LUAJIT_NAMES libluajit libluajit-5.1)
+ else()
+- list(APPEND LUAJIT_NAMES luajit-5.1)
++ list(APPEND LUAJIT_NAMES luajit-5.1 luajit-5.2)
+ endif()
+
+ find_library2(LUAJIT_LIBRARY NAMES ${LUAJIT_NAMES})
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/neovim.git/commitdiff/90cd2e752d0dad5848702aa1c740b158397f6d7e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
