vim: update to 9.1

Fixes compilation with GCC15.

Signed-off-by: Rosen Penev <[email protected]>

diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index 125acbf99be00bb1d04907fad6ddd9a2fba827ce..7726765178705ddf80bc516c0afdee9d1941cdff 100644 (file)
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -8,13 +8,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vim
-PKG_VERSION:=9.0
+PKG_VERSION:=9.1
 PKG_RELEASE:=1
-VIMVER:=90
+VIMVER:=91
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=http://ftp.vim.org/pub/vim/unix
-PKG_HASH:=a6456bc154999d83d0c20d968ac7ba6e7df0d02f3cb6427fb248660bacfb336e
+PKG_SOURCE_URL:=https://www.vim.org/downloads
+PKG_HASH:=9c2d1d6763a672f6c5210a2bc4bad5a58e4eb8e8e3f293d950d9647811647ec7
+
 PKG_MAINTAINER:=Marko Ratkaj <[email protected]>
 PKG_LICENSE:=Vim
 PKG_LICENSE_FILES:=LICENSE

diff --git a/utils/vim/patches/002-remove_helptags_generation.patch b/utils/vim/patches/002-remove_helptags_generation.patch
index 83ec82e1d6f624a42c735a27f40144d6bec1e7c7..3bc413845d9623110d2ab29fbd57c15324330c76 100644 (file)
--- a/utils/vim/patches/002-remove_helptags_generation.patch
+++ b/utils/vim/patches/002-remove_helptags_generation.patch
@@ -1,6 +1,6 @@
 --- a/runtime/doc/Makefile
 +++ b/runtime/doc/Makefile
-@@ -345,7 +345,6 @@ all: tags vim.man evim.man vimdiff.man v
+@@ -24,7 +24,6 @@ all: tags vim.man evim.man vimdiff.man v
  # Use Vim to generate the tags file.  Can only be used when Vim has been
  # compiled and installed.  Supports multiple languages.
  vimtags: $(DOCS)

diff --git a/utils/vim/patches/010-no-msgfmt.patch b/utils/vim/patches/010-no-msgfmt.patch
index 82e19bbc88de05722754c411b8c7f05a2480eb0a..d74eea09220658ad20354b14e6192033ab63d35d 100644 (file)
--- a/utils/vim/patches/010-no-msgfmt.patch
+++ b/utils/vim/patches/010-no-msgfmt.patch
@@ -1,7 +1,7 @@
 --- 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 $<
+@@ -36,7 +36,7 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_
+               -c "if error == 0 | q | else | num 2 | cq | endif" $<
        touch $@
  
 -all: $(MOFILES) $(MOCONVERTED) $(MSGFMT_DESKTOP)