From 2ddb211aa63b67c3af419b1693378b93737eb0ef Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Tue, 22 Aug 2017 11:57:37 +0200
Subject: [PATCH] neovim: Add patch to fix unibilium assertion

---
 packages/neovim/build.sh                 |  6 +++---
 packages/neovim/src-nvim-tui-tui.c.patch | 14 ++++++++++++++
 2 files changed, 17 insertions(+), 3 deletions(-)
 create mode 100644 packages/neovim/src-nvim-tui-tui.c.patch

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index 4b5710e26..359397d1c 100644
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,8 +1,8 @@
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
-local _COMMIT=5b32bce73c93a64970afe0e92e0a8ba2fed88619
-TERMUX_PKG_VERSION=0.2.1~20170816
-TERMUX_PKG_SHA256=7f7e9879a81f8484569f00e8cc510056fca4990485ffbb7bf24884f53724014a
+local _COMMIT=9ff0cc70855fc3eb11ad0162ee02e742f354d360
+TERMUX_PKG_VERSION=0.2.1~20170822
+TERMUX_PKG_SHA256=8d97b6d3e7b185ee41992fb599db5df10beeba311b57580c75ec8fb078aa3e02
 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil, liblua"
 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
diff --git a/packages/neovim/src-nvim-tui-tui.c.patch b/packages/neovim/src-nvim-tui-tui.c.patch
new file mode 100644
index 000000000..f95316c8e
--- /dev/null
+++ b/packages/neovim/src-nvim-tui-tui.c.patch
@@ -0,0 +1,14 @@
+Submitted upstream at https://github.com/neovim/neovim/pull/7204
+
+diff -u -r ../neovim-9ff0cc70855fc3eb11ad0162ee02e742f354d360/src/nvim/tui/tui.c ./src/nvim/tui/tui.c
+--- ../neovim-9ff0cc70855fc3eb11ad0162ee02e742f354d360/src/nvim/tui/tui.c	2017-08-22 01:46:43.000000000 +0200
++++ ./src/nvim/tui/tui.c	2017-08-22 11:43:41.213726717 +0200
+@@ -1189,7 +1189,7 @@
+   const char *str = NULL;
+ 
+   if (unibi_index >= 0) {
+-    if (unibi_index < unibi_string_begin_) {
++    if (unibi_index <= unibi_string_begin_) {
+       str = unibi_get_ext_str(data->ut, (unsigned)unibi_index);
+     } else {
+       str = unibi_get_str(data->ut, (unsigned)unibi_index);