Hello community,
here is the log from the commit of package neovim for openSUSE:Leap:15.2
checked in at 2020-05-21 12:57:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/neovim (Old)
and /work/SRC/openSUSE:Leap:15.2/.neovim.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "neovim"
Thu May 21 12:57:39 2020 rev:17 rq:807387 version:0.4.3
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/neovim/neovim.changes 2020-01-15
15:33:09.666848809 +0100
+++ /work/SRC/openSUSE:Leap:15.2/.neovim.new.2738/neovim.changes
2020-05-21 12:57:43.090583221 +0200
@@ -2 +2 @@
-Thu Jun 6 18:15:47 CEST 2019 - Matej Cepl <mc...@suse.com>
+Tue May 19 16:42:50 UTC 2020 - Matej Cepl <mc...@suse.com>
@@ -4,2 +4,53 @@
-- boo#1137443: Add CVE-2019-12735.patch fixing the security bug
- "Modelines allow arbitrary code execution".
+- For compatibility with Leap 15.2 add libuv-compat.patch
+ (applied conditionally only on the appropriate distribution),
+ which works around too old version of libuv on Leap 15.*
+ by not using UV_FS_COPYFILE_FICLONE flag to uv_fs_copyfile,
+ and not using uv_stream_get_write_queue_size at all.
+ sr#793088 gh#neovim/neovim#12108
+
+-------------------------------------------------------------------
+Mon Apr 6 11:12:59 UTC 2020 - Matej Cepl <mc...@suse.com>
+
+- Remove unnecessary fix-buf_set_term_title.patch, which actually
+ breaks the build.
+
+-------------------------------------------------------------------
+Tue Jan 21 20:45:43 UTC 2020 - Martin Liška <mli...@suse.cz>
+
+- Add fix-buf_set_term_title.patch in order to fix build issue.
+- Set CFLAGS and CXXFLAGS in order to respect $optflags.
+
+-------------------------------------------------------------------
+Fri Dec 13 11:42:39 UTC 2019 - Dominique Leuenberger <dims...@opensuse.org>
+
+- Unconditionally use luajit-devle instead of sometimes
+ luajit-devel and sometimes lua51-luajit-devel.
+
+-------------------------------------------------------------------
+Sun Nov 10 20:54:57 CET 2019 - Matej Cepl <mc...@suse.com>
+
+- Update to version 0.4.3.
+
+-------------------------------------------------------------------
+Thu Sep 19 12:25:08 CEST 2019 - Matej Cepl <mc...@suse.com>
+
+- Update to version 0.4.2. There is toooooo many changes to list
+ it there. Also fixes boo#1151203.
+- Reapplied patches:
+ - neovim-0.1.7-bitop.patch
+ - neovim-0.2.0-gcc-prototype.patch
+ - neovim.patch
+
+-------------------------------------------------------------------
+Thu Sep 19 07:02:32 UTC 2019 - Martin Liška <mli...@suse.cz>
+
+- Remove neovim-0.2.0-gcc-prototype.patch patch.
+- Add run-time dependency to lua51-luv.
+
+-------------------------------------------------------------------
+Mon Jul 8 08:31:03 UTC 2019 - Martin Liška <mli...@suse.cz>
+
+- Update to version 0.3.8:
+
+ * 5b47e4d #10341 security: 'modeline', 'modelineexpr'
+ * e4ecb70 #10345 Disallow API calls in the sandbox.
@@ -13 +64 @@
- (CVE-2019-12735 boo#1137443), removed CVE-2019-12735.patch
+ (CVE-2019-12735 boo#1137443)
Old:
----
neovim-0.2.0-gcc-prototype.patch
neovim-0.3.7.tar.gz
New:
----
libuv-compat.patch
neovim-0.4.3.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ neovim.spec ++++++
--- /var/tmp/diff_new_pack.6T64Hu/_old 2020-05-21 12:57:43.542584205 +0200
+++ /var/tmp/diff_new_pack.6T64Hu/_new 2020-05-21 12:57:43.546584214 +0200
@@ -1,7 +1,7 @@
#
# spec file for package neovim
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: neovim
-Version: 0.3.7
+Version: 0.4.3
Release: 0
Summary: Vim-fork focused on extensibility and agility
License: Apache-2.0 AND Vim
@@ -32,35 +32,42 @@
Patch0: neovim.patch
# PATCH-FIX-OPENSUSE neovim-0.1.7-bitop.patch mc...@cepl.eu build with old Lua
with external bit module
Patch1: neovim-0.1.7-bitop.patch
-# fix build issue on ppc64
-Patch2: neovim-0.2.0-gcc-prototype.patch
-BuildRequires: autoconf
-BuildRequires: automake
+# 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
BuildRequires: cmake
+BuildRequires: desktop-file-utils
BuildRequires: fdupes
BuildRequires: filesystem
BuildRequires: gcc-c++
BuildRequires: gettext
BuildRequires: git-core
BuildRequires: gperf
+BuildRequires: hicolor-icon-theme
+BuildRequires: libnsl-devel
+BuildRequires: libtermkey-devel
BuildRequires: libtool
+BuildRequires: libuv-devel
+BuildRequires: libvterm-devel >= 0.1
+BuildRequires: lua-macros
BuildRequires: lua51-LPeg
BuildRequires: lua51-bit32
-BuildRequires: lua51-luajit-devel
BuildRequires: lua51-luarocks
+BuildRequires: lua51-luv-devel
BuildRequires: lua51-mpack
+BuildRequires: luajit-devel
BuildRequires: make
BuildRequires: msgpack-devel
BuildRequires: pkgconfig
+BuildRequires: python-rpm-macros
+BuildRequires: unibilium-devel
BuildRequires: unzip
BuildRequires: update-desktop-files
-BuildRequires: pkgconfig(jemalloc)
-BuildRequires: pkgconfig(libnsl)
-BuildRequires: pkgconfig(libuv)
-BuildRequires: pkgconfig(termkey) >= 0.20
-BuildRequires: pkgconfig(unibilium)
-BuildRequires: pkgconfig(vterm)
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
Recommends: xsel
@@ -88,7 +95,9 @@
%setup -q
%patch0 -p1
%patch1 -p1
+%if 0%{?suse_version} == 1500
%patch2 -p1
+%endif
# Remove __DATE__ and __TIME__.
BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}')
@@ -100,12 +109,24 @@
# set vars to make build reproducible in spite of config/CMakeLists.txt
HOSTNAME=OBS
USERNAME=OBS
-%cmake \
- -DUSE_BUNDLED=OFF \
- -DLUAJIT_USE_BUNDLED=OFF \
- -DENABLE_JEMALLOC=ON \
- -Wno-dev
-%make_jobs
+mkdir -p build
+pushd build
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
+%{__cmake} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+%ifarch aarch64 ppc64
+ -DPREFER_LUA=ON \
+%endif
+ -DCMAKE_SKIP_RPATH=ON -DCMAKE_VERBOSE_MAKEFILE=ON \
+ -DUSE_BUNDLED=OFF -DLUAJIT_USE_BUNDLED=OFF \
+ -DCMAKE_COLOR_MAKEFILE=OFF \
+ -DCMAKE_C_FLAGS_RELWITHDEBINFO="$opts" \
+ -DCMAKE_INSTALL_PREFIX:PATH=%{_prefix} \
+ -DLIBLUV_LIBRARY=%{lua_archdir}/luv.so \
+ -DLIBLUV_INCLUDE_DIR:PATH=%{lua_incdir}
+make %{?_smp_mflags} VERBOSE=1
+
+popd
%install
%cmake_install
@@ -128,6 +149,10 @@
%fdupes %{buildroot}%{_datadir}/
%find_lang nvim
+# We have to have rpath
+# https://en.opensuse.org/openSUSE:Packaging_checks
+export NO_BRP_CHECK_RPATH=true
+
%if 0%{?suse_version} < 1330
%post
%desktop_database_post
++++++ libuv-compat.patch ++++++
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -62,6 +62,11 @@
#define BUFSIZE 8192 /* size of normal write buffer */
#define SMBUFSIZE 256 /* size of emergency write buffer */
+// For compatibility with libuv < 1.20.0 (tested on 1.18.0)
+#ifndef UV_FS_COPYFILE_FICLONE
+#define UV_FS_COPYFILE_FICLONE 0
+#endif
+
//
// The autocommands are stored in a list for each event.
// Autocommands for the same pattern, that are consecutive, are joined
--- a/src/nvim/event/stream.c
+++ b/src/nvim/event/stream.c
@@ -16,6 +16,11 @@
# include "event/stream.c.generated.h"
#endif
+// For compatbility with libuv < 1.19.0 (tested on 1.18.0)
+#if UV_VERSION_MINOR < 19
+#define uv_stream_get_write_queue_size(stream) stream->write_queue_size
+#endif
+
/// Sets the stream associated with `fd` to "blocking" mode.
///
/// @return `0` on success, or libuv error code on failure.
++++++ neovim-0.1.7-bitop.patch ++++++
--- /var/tmp/diff_new_pack.6T64Hu/_old 2020-05-21 12:57:43.570584266 +0200
+++ /var/tmp/diff_new_pack.6T64Hu/_new 2020-05-21 12:57:43.574584274 +0200
@@ -1,6 +1,6 @@
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -477,7 +477,7 @@ endforeach()
+@@ -483,7 +483,7 @@ endforeach()
# Find Lua interpreter
include(LuaHelpers)
++++++ neovim-0.3.7.tar.gz -> neovim-0.4.3.tar.gz ++++++
/work/SRC/openSUSE:Leap:15.2/neovim/neovim-0.3.7.tar.gz
/work/SRC/openSUSE:Leap:15.2/.neovim.new.2738/neovim-0.4.3.tar.gz differ: char
12, line 1
++++++ neovim.patch ++++++
--- /var/tmp/diff_new_pack.6T64Hu/_old 2020-05-21 12:57:43.622584380 +0200
+++ /var/tmp/diff_new_pack.6T64Hu/_new 2020-05-21 12:57:43.626584388 +0200
@@ -1,6 +1,6 @@
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
-@@ -66,7 +66,9 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILI
+@@ -75,7 +75,9 @@ if(UNIX OR (MINGW AND CMAKE_CROSSCOMPILI
BuildLuarocks(
CONFIGURE_COMMAND ${DEPS_BUILD_DIR}/src/luarocks/configure
--prefix=${HOSTDEPS_INSTALL_DIR} --force-config ${LUAROCKS_OPTS}
