vim: update to v9.1 (#6398)

* vim: update to v9.1

* vim: abandon build with python feature
- this rarely used feature was already lacking in former release (since we used prebuilt python)

* use vim9 as alternate name
- avoid hard coded specific version
- use 9 instead of 91 as specific version

cross/vim/Makefile

@@ -1,16 +1,12 @@
 PKG_NAME = vim
-PKG_VERS = 9.0
-PKG_EXT = tar.bz2
-PKG_DIST_NAME = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
-PKG_DIST_SITE = https://ftp.nluug.nl/pub/vim/unix
-SPECIFIC_VERSION=$(subst .,,$(PKG_VERS))
-PKG_DIR = $(PKG_NAME)$(SPECIFIC_VERSION)
+PKG_VERS = 9.1.0
+PKG_EXT = tar.gz
+PKG_DIST_NAME = v$(PKG_VERS).$(PKG_EXT)
+PKG_DIST_SITE = https://github.com/vim/vim/archive
+PKG_DIST_FILE = $(PKG_NAME)-$(PKG_VERS).$(PKG_EXT)
+SPECIFIC_VERSION=$(firstword $(subst ., ,$(PKG_VERS)))
+PKG_DIR = $(PKG_NAME)-$(PKG_VERS)
 
-ifeq ($(strip $(PYTHON_PACKAGE)),)
-PYTHON_PACKAGE = python311
-endif
-
-OPTIONAL_DEPENDS = cross/python311
 DEPENDS = cross/ncursesw
 
 HOMEPAGE = https://www.vim.org/
@@ -19,30 +15,19 @@ LICENSE  = Charityware
 
 GNU_CONFIGURE = 1
 CONFIGURE_ARGS  = --with-compiledby=SynoCommunity
-CONFIGURE_ARGS += --with-features=huge --with-tlib=ncursesw
-CONFIGURE_ARGS += vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tgetent=zero vim_cv_tty_group=world
-CONFIGURE_ARGS += vim_cv_getcwd_broken=yes vim_cv_stat_ignores_slash=yes vim_cv_memmove_handles_overlap=yes
-
-include ../../mk/spksrc.archs.mk
-
-ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
-BUILD_DEPENDS = cross/python311
-CONFIGURE_ARGS += --enable-python3interp=dynamic --with-python3-command=$(HOSTPYTHON) 
-CONFIGURE_ARGS += vi_cv_path_python3_conf=$(PYTHON_CFG_PATH)
-CONFIGURE_ARGS += vi_cv_path_python3_pfx=$(PYTHON_PREFIX)
-CONFIGURE_ARGS += vi_cv_path_python3_epfx=$(PYTHON_EXEC_PREFIX)
-CONFIGURE_ARGS += vi_cv_path_python3path=$(PYTHONPATH)
-endif
-
-# Avoid warning that _FORTIFY_SOURCE requires compiling with optimization
-ifeq ($(findstring $(ARCH),$(OLD_PPC_ARCHS)),$(ARCH))
-# With -O2 optimization there is an ICE with older ppc cross compilers
-# usercmd.c:1535: internal compiler error: in set_uids_in_ptset, at tree-ssa-structalias.c:4775
-# bug of GCC 4.2/4.3 in tree-optimization
-   ADDITIONAL_CFLAGS += -O
-else
-   ADDITIONAL_CFLAGS += -O2
-endif
+CONFIGURE_ARGS += --with-features=huge
+CONFIGURE_ARGS += --with-tlib=ncursesw
+CONFIGURE_ARGS += vim_cv_toupper_broken=no
+CONFIGURE_ARGS += vim_cv_terminfo=yes
+CONFIGURE_ARGS += vim_cv_tgetent=zero
+CONFIGURE_ARGS += vim_cv_tty_group=world
+CONFIGURE_ARGS += vim_cv_getcwd_broken=yes
+CONFIGURE_ARGS += vim_cv_stat_ignores_slash=yes
+CONFIGURE_ARGS += vim_cv_memmove_handles_overlap=yes
+CONFIGURE_ARGS += vim_cv_timer_create=no
+CONFIGURE_ARGS += vim_cv_timer_create_with_lrt=no
+
+ADDITIONAL_CFLAGS += -O2
 
 PLIST_TRANSFORM = sed -e 's%@SPECIFIC_VERSION@%$(SPECIFIC_VERSION)%'
 
@@ -52,22 +37,7 @@ POST_INSTALL_TARGET = vim_post_install
 
 include ../../mk/spksrc.cross-cc.mk
 
-ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
-# Only trigger building of dependencies (for the Python config) for targets where it's used
-ifeq ($(strip $(filter-out configure compile install plist all,$(MAKECMDGOALS))),)
-$(WORK_DIR)/python-cc.mk: depend ;
-include $(WORK_DIR)/python-cc.mk
-endif
-
-PYTHONPATH = $(PYTHON_SITE_PACKAGES_NATIVE):$(PYTHON_LIB_NATIVE):$(STAGING_INSTALL_PREFIX)/$(PYTHON_LIB_DIR)/site-packages/
-PYTHON_PREFIX = $(STAGING_INSTALL_PREFIX)
-PYTHON_EXEC_PREFIX = $(STAGING_INSTALL_PREFIX)
-PYTHON_CFG_PATH = $(shell $(STAGING_INSTALL_PREFIX)/bin/python3-config --configdir)
-
-ENV += PYTHONPATH=$(PYTHONPATH)
-endif
-
 .PHONY: vim_post_install
 vim_post_install:
 	@install -m 644 src/vimrc $(STAGING_INSTALL_PREFIX)/share/vim/vimrc
-	cd $(STAGING_INSTALL_PREFIX)/bin; ln -sf vim vim$(SPECIFIC_VERSION)
+	@cd $(STAGING_INSTALL_PREFIX)/bin; ln -sf vim vim$(SPECIFIC_VERSION)

cross/vim/PLIST

@@ -7,4 +7,4 @@ lnk:bin/vim@SPECIFIC_VERSION@
 lnk:bin/vimdiff
 rsc:bin/vimtutor
 bin:bin/xxd
-rsc:share/vim
+rsc:share/vim/

cross/vim/digests

@@ -1,3 +1,3 @@
-vim-9.0.tar.bz2 SHA1 ff061751df99a5baff557c60a2ab5344f9f9e70d
-vim-9.0.tar.bz2 SHA256 a6456bc154999d83d0c20d968ac7ba6e7df0d02f3cb6427fb248660bacfb336e
-vim-9.0.tar.bz2 MD5 a28acac9c6bfd2c14af33140d38e3dce
+vim-9.1.0.tar.gz SHA1 5d166be118fc80e43b2e6fcd6c1011816135887a
+vim-9.1.0.tar.gz SHA256 ddb435f6e386c53799a3025bdc5a3533beac735a0ee596cb27ada97366a1c725
+vim-9.1.0.tar.gz MD5 3c3af80d56bfe534c80445663d101bae

spk/vim/Makefile

@@ -1,10 +1,9 @@
 SPK_NAME = vim
-SPK_VERS = 9.0
-SPK_REV = 6
+SPK_VERS = 9.1
+SPK_REV = 7
 SPK_ICON = src/vim.png
 
-DEPENDS = cross/$(SPK_NAME)
-PYTHON_PACKAGE = python311
+DEPENDS = cross/vim
 
 MAINTAINER = SynoCommunity
 DESCRIPTION = Vim is a highly configurable text editor built to enable efficient text editing. It is an improved version of the vi editor distributed with most UNIX systems.
@@ -13,20 +12,12 @@ DESCRIPTION_FRE = Vim est un éditeur de texte avancé basé sur Vi \(unix\) ave
 DISPLAY_NAME = Vim
 STARTABLE = no
 
-CHANGELOG = "1. Update vim to v9.0"
+CHANGELOG = "1. Update vim to v9.1. <br/>2. Finally remove python feature."
 
 HOMEPAGE = https://www.vim.org/
 LICENSE  = Charityware
 
-include ../../mk/spksrc.archs.mk
+SPK_COMMANDS = bin/vim bin/vim$(firstword $(subst ., ,$(PKG_VERS)))
+SPK_COMMANDS += bin/view bin/vimdiff bin/rvim bin/rview bin/vimtutor
 
-ifneq ($(findstring $(ARCH),$(ARMv5_ARCHS) $(OLD_PPC_ARCHS)),$(ARCH))
-CHANGELOG += "<br/>2. Migrate to Python 3.11"
-DESCRIPTION += "NOTE: You need to install Python 3.11 package to enable Python support."
-else
-CHANGELOG += "<br/>2. Remove  python support"
-DESCRIPTION += "NOTE: This package is built without Python support."
-endif
-SPK_COMMANDS = bin/vim bin/vim$(subst .,,$(SPK_VERS)) bin/view bin/vimdiff bin/rvim bin/rview bin/vimtutor
-
-include ../../mk/spksrc.python.mk
+include ../../mk/spksrc.spk.mk