Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package neovim for openSUSE:Factory checked
in at 2021-01-15 19:46:28
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/neovim (Old)
and /work/SRC/openSUSE:Factory/.neovim.new.28504 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "neovim"
Fri Jan 15 19:46:28 2021 rev:33 rq:863148 version:0.4.4
Changes:
--------
--- /work/SRC/openSUSE:Factory/neovim/neovim.changes 2020-08-05
20:30:32.799134550 +0200
+++ /work/SRC/openSUSE:Factory/.neovim.new.28504/neovim.changes 2021-01-15
19:46:36.606055929 +0100
@@ -1,0 +2,7 @@
+Tue Jan 12 09:36:47 UTC 2021 - Guillaume GARDET <guillaume.gar...@opensuse.org>
+
+- Fix build on aarch64 (luajit not supported yet)
+- Add patch to find lua 5.4:
+ * neovim-0.4.4-findlua54.patch
+
+-------------------------------------------------------------------
New:
----
neovim-0.4.4-findlua54.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ neovim.spec ++++++
--- /var/tmp/diff_new_pack.rjsnDe/_old 2021-01-15 19:46:37.298056959 +0100
+++ /var/tmp/diff_new_pack.rjsnDe/_new 2021-01-15 19:46:37.302056965 +0100
@@ -1,7 +1,7 @@
#
# spec file for package neovim
#
-# Copyright (c) 2020 SUSE LLC
+# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,6 +16,22 @@
#
+# Luajit not available on all platforms
+%ifarch %{arm} %{ix86} x86_64
+%bcond_without luajit
+%else
+%bcond_with luajit
+%endif
+%if %{with luajit}
+%define luaver 5.1
+%define luaver_nopoint 51
+%else
+%define luaver 5.4
+%define luaver_nopoint 54
+%endif
+
+%define luv_min_ver 1.30.0
+
Name: neovim
Version: 0.4.4
Release: 0
@@ -35,6 +51,8 @@
# PATCH-FIX-SLE libuv-compat.patch sr#793088 gh#neovim/neovim#12108
mc...@suse.com
# works around too old version of libuv on Leap 15.*
Patch2: libuv-compat.patch
+# PATCH-FIx-UPSTREAM https://github.com/neovim/neovim/pull/12820
+Patch3: neovim-0.4.4-findlua54.patch
BuildRequires: cmake
BuildRequires: desktop-file-utils
BuildRequires: fdupes
@@ -50,12 +68,29 @@
BuildRequires: libuv-devel
BuildRequires: libvterm-devel >= 0.1
BuildRequires: lua-macros
+
+%if %{with luajit}
+# luajit implements version 5.1 of the lua language spec, so it needs the
+# compat versions of libs.
BuildRequires: lua51-LPeg
BuildRequires: lua51-bit32
BuildRequires: lua51-luarocks
-BuildRequires: lua51-luv-devel
+BuildRequires: lua51-luv-devel >= %{luv_min_ver}
BuildRequires: lua51-mpack
BuildRequires: luajit-devel
+Requires: lua51-bit32
+Requires: lua51-luv >= %{luv_min_ver}
+%else
+BuildRequires: lua%{luaver_nopoint}-devel
+BuildRequires: lua%{luaver_nopoint}-lpeg
+BuildRequires: lua%{luaver_nopoint}-luarocks
+BuildRequires: lua%{luaver_nopoint}-luv-devel >= %{luv_min_ver}
+BuildRequires: lua%{luaver_nopoint}-mpack
+Requires: lua%{luaver_nopoint}-luv >= %{luv_min_ver}
+# built-in bit32 removed in Lua 5.4
+BuildRequires: lua%{luaver_nopoint}-compat-5.3
+Requires: lua%{luaver_nopoint}-compat-5.3
+%endif
BuildRequires: make
BuildRequires: msgpack-devel
BuildRequires: pkgconfig
@@ -65,11 +100,10 @@
BuildRequires: update-desktop-files
Requires: gperf
Requires: libvterm0 >= 0.1
-Requires: lua51-bit32
-Requires: lua51-luv
Requires: python3-neovim
Requires(post): desktop-file-utils
Requires(postun): desktop-file-utils
+# XSel provides access to the system clipboard
Recommends: xsel
%if 0%{?suse_version} < 1330
BuildRequires: hicolor-icon-theme
@@ -98,6 +132,7 @@
%if 0%{?suse_version} == 1500
%patch2 -p1
%endif
+%patch3 -p1
# Remove __DATE__ and __TIME__.
BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}')
@@ -114,9 +149,10 @@
export CFLAGS="%{optflags} -fcommon"
export CXXFLAGS="%{optflags} -fcommon"
%{__cmake} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-%ifarch aarch64 ppc64
- -DPREFER_LUA=ON \
-%endif
+ -DPREFER_LUA=%{?with_luajit:OFF}%{!?with_luajit:ON} \
+ -DLUA_PRG=%{_bindir}/%{?with_luajit:luajit}%{!?with_luajit:lua} \
+ -DLIBLUV_INCLUDE_DIR=%{_includedir}/lua-%{luaver} \
+ -DLIBLUV_LIBRARY=%{_libdir}/lua/%{luaver}/luv.so \
-DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON \
-DUSE_BUNDLED=OFF -DLUAJIT_USE_BUNDLED=OFF \
-DCMAKE_COLOR_MAKEFILE=OFF \
++++++ neovim-0.4.4-findlua54.patch ++++++
>From 26a47f998c4884df7ba96a0f3ad6b268a832ae10 Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <mic...@michel-slm.name>
Date: Mon, 31 Aug 2020 18:11:02 -0700
Subject: [PATCH] Patch FindLua to support locating Lua 5.4
Lua 5.4 is out, and will be shipped with Fedora 33.
Since there are architectures where LuaJIT is not available, being able
to compile against Lua 5.4 is needed to get Neovim to build for this
release.
Signed-off-by: Michel Alexandre Salim <mic...@michel-slm.name>
---
cmake/FindLua.cmake | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/cmake/FindLua.cmake b/cmake/FindLua.cmake
index b669a49f2..7ba13e1f5 100644
--- a/cmake/FindLua.cmake
+++ b/cmake/FindLua.cmake
@@ -42,7 +42,7 @@ unset(_lua_append_versions)
# this is a function only to have all the variables inside go away
automatically
function(_lua_set_version_vars)
- set(LUA_VERSIONS5 5.3 5.2 5.1 5.0)
+ set(LUA_VERSIONS5 5.4 5.3 5.2 5.1 5.0)
if (Lua_FIND_VERSION_EXACT)
if (Lua_FIND_VERSION_COUNT GREATER 1)
--
2.26.2
