vim: bump to 9.1.1918

Switch source to GitHub for the most recent releases.

Changes: https://github.com/vim/vim/compare/v9.1.0...v9.1.1918
Signed-off-by: George Sapkin <redacted>

diff --git a/utils/vim/Makefile b/utils/vim/Makefile
index 60124b67a5076e61a31948a869e5b498dd52dc7d..1a1bbad1dc15dd742725b962d540cb0a1906afe5 100644 (file)
--- a/utils/vim/Makefile
+++ b/utils/vim/Makefile
@@ -8,21 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=vim
-PKG_VERSION:=9.1
-PKG_XXD_VERSION:=2023.10.25
-PKG_RELEASE:=2
+PKG_VERSION:=9.1.1918
+PKG_XXD_VERSION:=2025.08.24
+PKG_RELEASE:=1
 VIMVER:=91
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
-PKG_SOURCE_URL:=https://www.vim.org/downloads
-PKG_HASH:=9c2d1d6763a672f6c5210a2bc4bad5a58e4eb8e8e3f293d950d9647811647ec7
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/vim/vim.git
+PKG_SOURCE_VERSION=v$(PKG_VERSION)
+PKG_MIRROR_HASH:=51c2d2492d884c879c61b1451f4690f221b2dbccacfe3ddf8abde4d6fcc5e2bf
 
 PKG_MAINTAINER:=Marko Ratkaj <markoratkaj@gmail.com>
 PKG_LICENSE:=Vim
 PKG_LICENSE_FILES:=LICENSE
 PKG_CPE_ID:=cpe:/a:vim:vim
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)$(VIMVER)
 PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
@@ -49,7 +49,6 @@ define Package/vim-full
   CONFLICTS:=vim
 endef
 
-
 define Package/vim-fuller
   $(call Package/vim/Default)
   TITLE+= (Big)
@@ -95,7 +94,6 @@ define Package/vim-full/description
  (Normal build)
 endef
 
-
 define Package/vim-fuller/description
  Vim is an almost compatible version of the UNIX editor Vi.
  (Big build)
@@ -183,8 +181,6 @@ define Build/Compile/vim-fuller
 endef
 endif
 
-
-
 ifneq ($(CONFIG_PACKAGE_xxd),)
 define Build/Compile/xxd
        +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \
@@ -222,7 +218,6 @@ define Package/vim-full/install
        $(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc
 endef
 
-
 define Package/vim-fuller/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(INSTALL_BIN) $(PKG_BUILD_DIR)/vim_big $(1)/usr/bin/vim
@@ -232,8 +227,6 @@ define Package/vim-fuller/install
        $(INSTALL_CONF) ./files/vimrc.full $(1)/usr/share/vim/vimrc
 endef
 
-
-
 define Package/vim-runtime/install
        $(CP) $(PKG_INSTALL_DIR)/* $(1)
        rm -rf $(1)/usr/share/vim/vim$(VIMVER)/doc

diff --git a/utils/vim/patches/010-no-msgfmt.patch b/utils/vim/patches/010-no-msgfmt.patch
index d74eea09220658ad20354b14e6192033ab63d35d..b7579dd824db765973002cf92b9de22a71ba488a 100644 (file)
--- a/utils/vim/patches/010-no-msgfmt.patch
+++ b/utils/vim/patches/010-no-msgfmt.patch
@@ -1,11 +1,11 @@
 --- a/src/po/Makefile
 +++ b/src/po/Makefile
-@@ -36,7 +36,7 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_
-               -c "if error == 0 | q | else | num 2 | cq | endif" $<
-       touch $@
+@@ -30,7 +30,7 @@ MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_
+ .PHONY: all install uninstall prefixcheck originals converted check clean \
+       checkclean distclean update-po $(LANGUAGES)
  
 -all: $(MOFILES) $(MOCONVERTED) $(MSGFMT_DESKTOP)
 +all: $(MOFILES) $(MOCONVERTED)
  
- check: $(CHECKFILES)
+ originals: $(MOFILES)
  

diff --git a/utils/vim/patches/002-remove_helptags_generation.patch b/utils/vim/patches/020-remove-helptags-generation.patch
similarity index 74%
rename from utils/vim/patches/002-remove_helptags_generation.patch
rename to utils/vim/patches/020-remove-helptags-generation.patch
index 3bc413845d9623110d2ab29fbd57c15324330c76..135e750c690759cfb8108ede5faf6eeab8ed8c09 100644 (file)
--- a/utils/vim/patches/002-remove_helptags_generation.patch
+++ b/utils/vim/patches/020-remove-helptags-generation.patch
@@ -2,9 +2,9 @@
 +++ b/runtime/doc/Makefile
 @@ -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.
+ # compiled.  Supports multiple languages.
  vimtags: $(DOCS)
--      @$(VIMEXE) --clean -esX -V1 -u doctags.vim
+-      @$(VIMPROG) --clean -esX -V1 -u doctags.vim
  
  # Use "doctags" to generate the tags file.  Only works for English!
  tags: doctags $(DOCS)