neovim: Fix malformed clipboard.vim patch

Fixes #1096.

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 502873173ab0b1e8a216e8296a4ed5c9e8f189b3..8e2b90ee3f91b1de87198c7505b498c83b04de3b 100644 (file)
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,9 +1,9 @@
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"

-local _COMMIT=76ea97c809e50fccc5ca6615943ac6da1db1e030
-TERMUX_PKG_VERSION=0.2.1~20170619
+local _COMMIT=dcbeefcd23b8b54de7b2ae16fbf1af39ab91e480
+TERMUX_PKG_VERSION=0.2.1~20170620

 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip

-TERMUX_PKG_SHA256=36cfbc908457b953cbe9f49ed50b7745670d788d2256bef972e01ad6aa79c121
+TERMUX_PKG_SHA256=47c44153e940c3fab51147118b1a06a0197c7b1f4cc3279329e32333ef3272ae

 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua"
 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
 TERMUX_PKG_HOSTBUILD=true
 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua"
 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
 TERMUX_PKG_HOSTBUILD=true

diff --git a/packages/neovim/runtime-autoload-provider-clipboard.vim.patch b/packages/neovim/runtime-autoload-provider-clipboard.vim.patch
index 28512c29d49cad999829ecf1458e481f11091aed..0c249bd1ce0a96cc0fede5736171766385ffae1a 100644 (file)
--- a/packages/neovim/runtime-autoload-provider-clipboard.vim.patch
+++ b/packages/neovim/runtime-autoload-provider-clipboard.vim.patch
@@ -1,7 +1,7 @@
 diff -u -r ../neovim-76ea97c809e50fccc5ca6615943ac6da1db1e030/runtime/autoload/provider/clipboard.vim ./runtime/autoload/provider/clipboard.vim
 --- ../neovim-76ea97c809e50fccc5ca6615943ac6da1db1e030/runtime/autoload/provider/clipboard.vim 2017-06-19 00:01:29.000000000 +0000
 +++ ./runtime/autoload/provider/clipboard.vim  2017-06-19 20:10:55.376978820 +0000
 diff -u -r ../neovim-76ea97c809e50fccc5ca6615943ac6da1db1e030/runtime/autoload/provider/clipboard.vim ./runtime/autoload/provider/clipboard.vim
 --- ../neovim-76ea97c809e50fccc5ca6615943ac6da1db1e030/runtime/autoload/provider/clipboard.vim 2017-06-19 00:01:29.000000000 +0000
 +++ ./runtime/autoload/provider/clipboard.vim  2017-06-19 20:10:55.376978820 +0000

-@@ -90,6 +90,14 @@
+@@ -90,6 +90,12 @@

      let s:copy['*'] = s:copy['+']
      let s:paste['*'] = s:paste['+']
      return 'tmux'
      let s:copy['*'] = s:copy['+']
      let s:paste['*'] = s:paste['+']
      return 'tmux'


@@ -11,8 +11,6 @@ diff -u -r ../neovim-76ea97c809e50fccc5ca6615943ac6da1db1e030/runtime/autoload/p
 +    let s:copy['*'] = s:copy['+']
 +    let s:paste['*'] = s:paste['+']
 +    return 'termux-clipboard'
 +    let s:copy['*'] = s:copy['+']
 +    let s:paste['*'] = s:paste['+']
 +    return 'termux-clipboard'

-+  endif
-+

    endif
  
    let s:err = 'clipboard: No clipboard tool available. :help clipboard'
    endif
  
    let s:err = 'clipboard: No clipboard tool available. :help clipboard'