Accepting request 731915 from editors

OBS-URL: https://build.opensuse.org/request/show/731915
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/neovim?expand=0&rev=25

neovim-0.1.7-bitop.patch

@@ -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.2.0-gcc-prototype.patch

@@ -1,36 +0,0 @@
---- a/src/nvim/ex_cmds.c
-+++ b/src/nvim/ex_cmds.c
-@@ -67,6 +67,8 @@
- #include "nvim/os/input.h"
- #include "nvim/os/time.h"
- 
-+bool do_sub_msg(bool count_only);
-+
- /*
-  * Struct to hold the sign properties.
-  */
---- a/src/nvim/normal.c
-+++ b/src/nvim/normal.c
-@@ -62,6 +62,22 @@
- #include "nvim/os/time.h"
- #include "nvim/os/input.h"
- 
-+bool
-+find_decl (
-+    char_u *ptr,
-+    size_t len,
-+    bool locally,
-+    bool thisblock,
-+    int flags_arg
-+);
-+
-+bool
-+get_visual_text (
-+    cmdarg_T *cap,
-+    char_u **pp,
-+    size_t *lenp
-+);
-+
- typedef struct normal_state {
-   VimState state;
-   linenr_T conceal_old_cursor_line;

neovim-0.3.8.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:953e134568d824dad7cbf32ee3114951732f9a750c462e430e6b593f418af76c
-size 9233661

neovim-0.4.2.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9f874d3d2a74f33b931db62adebe28f8d2ec116270d1e13998b58a73348b6e56
+size 9552134

neovim.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Thu Sep 19 12:25:08 CEST 2019 - Matej Cepl <mcepl@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 <mliska@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 <mliska@suse.cz>
 

neovim.patch

@@ -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}

neovim.spec

@@ -17,7 +17,7 @@
 
 
 Name:           neovim
-Version:        0.3.8
+Version:        0.4.2
 Release:        0
 Summary:        Vim-fork focused on extensibility and agility
 License:        Apache-2.0 AND Vim
@@ -32,38 +32,48 @@ Source99:       neovim-rpmlintrc
 Patch0:         neovim.patch
 # PATCH-FIX-OPENSUSE neovim-0.1.7-bitop.patch mcepl@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
 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:  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
+# gh#neovim/neovim#7879
+%ifarch aarch64 ppc64
+BuildRequires:  lua51-devel
+%else
+BuildRequires:  lua51-luajit-devel
+%endif
 %if 0%{?suse_version} < 1330
 BuildRequires:  hicolor-icon-theme
 Requires(post): gtk3-tools
@@ -88,7 +98,6 @@ parts of Vim, without compromise, and more.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 
 # Remove __DATE__ and __TIME__.
 BUILD_TIME=$(LC_ALL=C date -ur %{_sourcedir}/%{name}.changes +'%{H}:%{M}')
@@ -100,12 +109,22 @@ sed -i "s/__DATE__/\"$BUILD_DATE\"/" $(grep -rl '__DATE__')
 # set vars to make build reproducible in spite of config/CMakeLists.txt
 HOSTNAME=OBS
 USERNAME=OBS
-%cmake \
+mkdir -p build
-  -DUSE_BUNDLED=OFF        \
+pushd build
-  -DLUAJIT_USE_BUNDLED=OFF \
+%{__cmake} .. -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-  -DENABLE_JEMALLOC=ON \
+%ifarch aarch64 ppc64
-  -Wno-dev
+       -DPREFER_LUA=ON \
-%make_jobs
+%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 +147,10 @@ mkdir -p %{buildroot}%{vimplugin_dir}/{after,after/syntax,autoload,colors,doc,ft
 %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