From: Rosen Penev <rosenp@gmail.com>
Date: Fri, 26 Feb 2021 03:47:00 +0000 (-0800)
Subject: vim: fix compile with BUILD_NLS
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3764821fee098e89dd4e789e396b1eec457929ab;p=feed%2Fpackages.git

vim: fix compile with BUILD_NLS

Avoids having to use msgfmt, which happens to be broken with gettext-full.

msgfmt is used for the desktop gvim application, which is not used here.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
(cherry picked from commit d5ddc98cb6070b1dd412c13ffab87e43722bb80d)
---

diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index adc3751a7f..da2e376304 100644
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vim
 PKG_VERSION:=8.2
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 VIMVER:=82
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
diff --git a/utils/vim/patches/010-no-msgfmt.patch b/utils/vim/patches/010-no-msgfmt.patch
new file mode 100644
index 0000000000..82e19bbc88
--- /dev/null
+++ b/utils/vim/patches/010-no-msgfmt.patch
@@ -0,0 +1,11 @@
+--- a/src/po/Makefile
++++ b/src/po/Makefile
+@@ -32,7 +32,7 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_
+ 	$(VIM) -u NONE -e -X -S check.vim -c "if error == 0 | q | endif" -c cq $<
+ 	touch $@
+ 
+-all: $(MOFILES) $(MOCONVERTED) $(MSGFMT_DESKTOP)
++all: $(MOFILES) $(MOCONVERTED)
+ 
+ check: $(CHECKFILES)
+