openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-22 01:44:32 +04:00
Code Issues Packages Projects Releases Wiki Activity

vim: bump to 9.1.1918

Browse Source 
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 <george@sapk.in>
This commit is contained in:
George Sapkin
2025-11-17 11:15:55 +02:00
committed by Hannu Nyman
parent 3365ba873b
commit 4406b792e7
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
utils/vim/Makefile
View File

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

8
utils/vim/patches/010-no-msgfmt.patch
View File

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

4
utils/vim/patches/002-remove_helptags_generation.patch → utils/vim/patches/020-remove-helptags-generation.patch
View File

@@ -2,9 +2,9 @@
+++ b/runtime/doc/Makefile +++ b/runtime/doc/Makefile
@@ -24,7 +24,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 # 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) 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! # Use "doctags" to generate the tags file. Only works for English!
tags: doctags $(DOCS) tags: doctags $(DOCS)