aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRosen Penev <rosenp@gmail.com>2021-02-27 12:24:33 -0800
committerGitHub <noreply@github.com>2021-02-27 12:24:33 -0800
commite8d431e64930edfb75c3c47d386efbeacac73ba1 (patch)
tree58aad0d24fa65240d3b41696988fc74247270b1b
parentd216b47dbfa8378b2d04a9fe2dd7786e57fb5a21 (diff)
parentd5ddc98cb6070b1dd412c13ffab87e43722bb80d (diff)
Merge pull request #14905 from neheb/vim
vim: fix compile with BUILD_NLS
-rw-r--r--utils/vim/Makefile2
-rw-r--r--utils/vim/patches/010-no-msgfmt.patch11
2 files changed, 12 insertions, 1 deletions
diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index adc3751a7..da2e37630 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 000000000..82e19bbc8
--- /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)
+