From fa4ec51389ecbb448179b4f0a92de9a2695b4600 Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Thu, 17 Oct 2019 09:28:37 +0200
Subject: [PATCH] bvi: Update from 1.4.0 to 1.4.1

---
 packages/bvi/build.sh                   | 5 ++---
 packages/bvi/column_number_bugfix.patch | 9 ---------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/packages/bvi/build.sh b/packages/bvi/build.sh
index 74e0c3426..9f05c7ff7 100644
--- a/packages/bvi/build.sh
+++ b/packages/bvi/build.sh
@@ -2,10 +2,9 @@ TERMUX_PKG_HOMEPAGE=http://bvi.sourceforge.net/
 TERMUX_PKG_DESCRIPTION="Binary file editor based on vi"
 TERMUX_PKG_LICENSE="GPL-2.0"
 TERMUX_PKG_DEPENDS="ncurses"
-TERMUX_PKG_VERSION=1.4.0
-TERMUX_PKG_REVISION=1
+TERMUX_PKG_VERSION=1.4.1
 TERMUX_PKG_SRCURL=http://sourceforge.net/projects/bvi/files/bvi/${TERMUX_PKG_VERSION}/bvi-${TERMUX_PKG_VERSION}.src.tar.gz
-TERMUX_PKG_SHA256=015a3c2832c7c097d98a5527deef882119546287ba8f2a70c736227d764ef802
+TERMUX_PKG_SHA256=3035255ca79e0464567d255baa5544f7794e2b7eb791dcc60cc339cf1aa01e28
 TERMUX_PKG_BUILD_IN_SRC=true
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="ac_cv_lib_ncursesw6_addnwstr=yes"
 TERMUX_PKG_RM_AFTER_INSTALL="share/applications share/pixmaps"
diff --git a/packages/bvi/column_number_bugfix.patch b/packages/bvi/column_number_bugfix.patch
index 0df86e005..088d5f45b 100644
--- a/packages/bvi/column_number_bugfix.patch
+++ b/packages/bvi/column_number_bugfix.patch
@@ -1,14 +1,5 @@
 --- bvi-1.4.0/bvi.c	2014-10-07 13:09:45.000000000 -0700
 +++ src/bvi.c	2017-02-19 00:35:24.587363303 -0800
-@@ -276,7 +276,7 @@
-        if (AnzAdd > sizeof(block_begin) * 2)
-            AnzAdd = sizeof(block_begin) * 2;
-        sprintf(addr_form,  "%%0%dllX  ", AnzAdd);
--       AnzAdd = sprintf(tmp, addr_form, block_begin);
-+       AnzAdd = sprintf(tmp, addr_form, (long long unsigned)block_begin);
- 	}
- 
- 	Anzahl = ((COLS - AnzAdd - 1) / 16) * 4;
 @@ -729,7 +729,6 @@
  	char	*arg;
  {