diff --git a/srcpkgs/neovim/patches/helptags.patch.gz b/srcpkgs/neovim/patches/helptags.patch.gz index e9dfc32a05f..244e6310713 100644 Binary files a/srcpkgs/neovim/patches/helptags.patch.gz and b/srcpkgs/neovim/patches/helptags.patch.gz differ diff --git a/srcpkgs/neovim/patches/msgpack-1.4.0-compat.patch b/srcpkgs/neovim/patches/msgpack-1.4.0-compat.patch deleted file mode 100644 index e5b533d6af5..00000000000 --- a/srcpkgs/neovim/patches/msgpack-1.4.0-compat.patch +++ /dev/null @@ -1,49 +0,0 @@ -commit feb70192a85d04343ecc383ea9a42aa8cd15e98d -Author: James McCoy -Date: Fri Jan 22 14:37:19 2016 -0500 - - cmake: Search for both libmsgpackc and libmsgpack #4075 - - libmsgpack was the old C++ library provided by msgpack-c. The C library - is libmsgpackc. - - The C++ support became header-only, but there was a bug - (msgpack/msgpack-c#395) wherein using msgpack-c's CMake build system - would only install libmsgpack instead of libmsgpackc. - - Searching for both libraries, but preferring libmsgpackc, allows for - building against older msgpack-c releases and prepares for the upcoming - msgpack-c release which fixes the aforementioned issues. - - Signed-off-by: James McCoy - -diff --git a/cmake/FindMsgpack.cmake b/cmake/FindMsgpack.cmake -index 7d88137..fbd107e 100644 ---- ./cmake/FindMsgpack.cmake -+++ ./cmake/FindMsgpack.cmake -@@ -7,7 +7,7 @@ - if(NOT MSGPACK_USE_BUNDLED) - find_package(PkgConfig) - if (PKG_CONFIG_FOUND) -- pkg_check_modules(PC_MSGPACK QUIET msgpack) -+ pkg_search_module(PC_MSGPACK QUIET msgpackc msgpack) - endif() - else() - set(PC_MSGPACK_INCLUDEDIR) -@@ -23,13 +23,14 @@ find_path(MSGPACK_INCLUDE_DIR msgpack.h - HINTS ${PC_MSGPACK_INCLUDEDIR} ${PC_MSGPACK_INCLUDE_DIRS} - ${LIMIT_SEARCH}) - --# If we're asked to use static linkage, add libmsgpack.a as a preferred library name. -+# If we're asked to use static linkage, add libmsgpack{,c}.a as a preferred library name. - if(MSGPACK_USE_STATIC) - list(APPEND MSGPACK_NAMES -+ "${CMAKE_STATIC_LIBRARY_PREFIX}msgpackc${CMAKE_STATIC_LIBRARY_SUFFIX}" - "${CMAKE_STATIC_LIBRARY_PREFIX}msgpack${CMAKE_STATIC_LIBRARY_SUFFIX}") - endif() - --list(APPEND MSGPACK_NAMES msgpack) -+list(APPEND MSGPACK_NAMES msgpackc msgpack) - - find_library(MSGPACK_LIBRARY NAMES ${MSGPACK_NAMES} - HINTS ${PC_MSGPACK_LIBDIR} ${PC_MSGPACK_LIBRARY_DIRS} diff --git a/srcpkgs/neovim/template b/srcpkgs/neovim/template index 1a40376c941..dec127f2776 100644 --- a/srcpkgs/neovim/template +++ b/srcpkgs/neovim/template @@ -1,18 +1,17 @@ # Template file for 'neovim' pkgname=neovim -version=0.1.1 -revision=4 +version=0.1.2 +revision=1 build_style=cmake configure_args="-DENABLE_JEMALLOC=0 -DLUA_PRG=/usr/bin/lua5.2" hostmakedepends="cmake lua52-lpeg lua52-MessagePack lua52-BitOp" -makedepends="libtermkey-devel libuv-devel libvterm-devel LuaJIT-devel - jemalloc-devel msgpack-devel" +makedepends="libtermkey-devel libuv-devel libvterm-devel LuaJIT-devel msgpack-devel" short_desc="Fork of Vim aiming to improve user experience, plugins and GUIs" maintainer="Steve Prybylski " license="Apache-2.0, GPL-2" homepage="http://neovim.io" distfiles="https://github.com/${pkgname}/${pkgname}/archive/v${version}.tar.gz" -checksum=f39bcab23457c66ce0d67dcf8029743703f860413db0070f75d4f0ffad27c6c1 +checksum=549881465eff82454660ae92d857d6ffa22383d45c94c46f3753fd1b0e699247 alternatives=" vi:vi:/usr/bin/nvim