[packages/vim] Up to 9.1.1975
arekm
arekm at pld-linux.org
Fri Dec 12 15:24:02 CET 2025
commit 36edcdc92557e6a0f06ebad1642ad16bfcfd4c30
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Fri Dec 12 15:23:48 2025 +0100
Up to 9.1.1975
vim-apache.patch | 13 -------------
vim-doubleparenthesis.patch | 11 -----------
vim-filetype_vim-perl_tests.patch | 16 ++++++++--------
vim-ft-mib.patch | 17 +++++++++--------
vim-home_etc.patch | 8 ++++----
vim-pam.patch | 16 ++++++++--------
vim-smarty.patch | 30 ++++++++++--------------------
vim.spec | 11 ++++-------
8 files changed, 43 insertions(+), 79 deletions(-)
---
diff --git a/vim.spec b/vim.spec
index 80998ba..9dd008e 100644
--- a/vim.spec
+++ b/vim.spec
@@ -31,7 +31,7 @@
# wget ftp://ftp.vim.org/pub/editors/vim/patches/8.0/MD5SUMS -O - | tail -n1 | awk '{print $2}'
# VCS Commits: https://github.com/vim/vim/commits/master
-%define ver 9.1.1757
+%define ver 9.1.1975
%define rel 1
Summary: Vi IMproved - a Vi clone
Summary(de.UTF-8): VIsual editor iMproved
@@ -52,7 +52,7 @@ License: Charityware
Group: Applications/Editors/Vim
#TODO: https://github.com/vim/vim/archive/v%{ver}/%{name}-%{ver}.tar.gz
Source0: https://github.com/vim/vim/archive/v%{ver}.tar.gz
-# Source0-md5: d9f6824b7bfeb4ebc662a7c888e4a88f
+# Source0-md5: 456809167bf10241ad95ace0e9752ed6
Source1: http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
# Source1-md5: bc4d1e115ca506ad7751b9bd2b773a7f
Source2: http://skawina.eu.org/mikolaj/usr_doc_pl.zip
@@ -78,16 +78,14 @@ Patch2: %{name}-paths.patch
Patch5: %{name}-awk.patch
Patch6: %{name}-filetype_vim-perl_tests.patch
-Patch7: %{name}-apache.patch
+
Patch8: %{name}-po-syntax.patch
-Patch10: %{name}-doubleparenthesis.patch
Patch11: %{name}-syntax-fstab.patch
Patch14: 020_all_%{name}-7.0-fstab-tmpfs-size.patch
Patch15: 021_all_%{name}-7.0-fstab-bogus-errors.patch
Patch17: 027_all_%{name}-7.0-automake-substitutions-93378.patch
-Patch18: %{name}-smarty.patch
Patch20: %{name}-nagios.patch
Patch21: %{name}-filetypes.patch
@@ -778,10 +776,9 @@ cp -p runtime/gvim.desktop gvim-motif.desktop
%patch -P5 -p1
%patch -P6 -p1
-%patch -P7 -p1
+
%patch -P8 -p1
-%patch -P10 -p1
%patch -P11 -p1
%patch -P14 -p1
diff --git a/vim-apache.patch b/vim-apache.patch
deleted file mode 100644
index fc05105..0000000
--- a/vim-apache.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- vim74/runtime/filetype.vim~ 2013-09-06 00:03:38.000000000 +0300
-+++ vim74/runtime/filetype.vim 2013-09-06 00:04:54.205952274 +0300
-@@ -110,8 +110,8 @@
- au BufNewFile,BufRead *.asy setf asy
-
- " Apache config file
--au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf setf apache
--au BufNewFile,BufRead */etc/apache2/sites-*/*.com setf apache
-+au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf,apache-*.conf,*-apache.conf let apache_version="2.2" | setf apache
-+au BufNewFile,BufRead */etc/apache/*.conf,apache1-*.conf,*-apache1.conf let apache_version="1.3" | setf apache
-
- " XA65 MOS6510 cross assembler
- au BufNewFile,BufRead *.a65 setf a65
diff --git a/vim-doubleparenthesis.patch b/vim-doubleparenthesis.patch
deleted file mode 100644
index 83f76ed..0000000
--- a/vim-doubleparenthesis.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vim63/src/Makefile.orig 2005-04-26 18:25:11.000000000 +0200
-+++ vim63/src/Makefile 2005-04-26 18:25:57.000000000 +0200
-@@ -2208,7 +2208,7 @@
- - at echo 'char_u *compiled_user = (char_u *)"' | tr -d $(NL) >> $@
- - at if test -n "$(COMPILEDBY)"; then \
- echo "$(COMPILEDBY)" | tr -d $(NL) >> $@; \
-- else ((logname) 2>/dev/null || whoami) | tr -d $(NL) >> $@; fi
-+ else ( (logname 2>/dev/null) || whoami) | tr -d $(NL) >> $@; fi
- - at echo '";' >> $@
- - at echo 'char_u *compiled_sys = (char_u *)"' | tr -d $(NL) >> $@
- - at if test -z "$(COMPILEDBY)"; then hostname | tr -d $(NL) >> $@; fi
diff --git a/vim-filetype_vim-perl_tests.patch b/vim-filetype_vim-perl_tests.patch
index 2775dbd..f49c202 100644
--- a/vim-filetype_vim-perl_tests.patch
+++ b/vim-filetype_vim-perl_tests.patch
@@ -1,12 +1,12 @@
---- vim62/runtime/filetype.vim.orig 2004-04-27 07:44:02.019203248 +0200
-+++ vim62/runtime/filetype.vim 2004-04-27 07:45:18.716543480 +0200
-@@ -1306,6 +1306,9 @@
- " Standard ML
- au BufNewFile,BufRead *.sml setf sml
+--- vim-9.1.1975/runtime/filetype.vim~ 2025-12-12 08:52:07.000000000 +0100
++++ vim-9.1.1975/runtime/filetype.vim 2025-12-12 13:54:21.961914854 +0100
+@@ -1150,6 +1150,9 @@ au BufNewFile,BufRead *.ttl
+ \ setf teraterm |
+ \ endif
+" tests for perl modules
+au BufNewFile,BufRead t/*.t call s:FTpl()
+
- " Sratus VOS command macro
- au BufNewFile,BufRead *.cm setf voscm
-
+ " TeX
+ au BufNewFile,BufRead *.tex call dist#ft#FTtex()
+ au BufNewFile,BufRead texdoc.cnf setf conf
diff --git a/vim-ft-mib.patch b/vim-ft-mib.patch
index 89fc469..0c19bee 100644
--- a/vim-ft-mib.patch
+++ b/vim-ft-mib.patch
@@ -1,11 +1,12 @@
---- vim72/runtime/filetype.vim~ 2009-10-20 18:35:37.000000000 +0300
-+++ vim72/runtime/filetype.vim 2009-10-20 18:36:20.600517648 +0300
-@@ -1818,7 +1818,7 @@
- au BufNewFile,BufRead *.sno,*.spt setf snobol4
-
- " SNMP MIB files
--au BufNewFile,BufRead *.mib,*.my setf mib
-+au BufNewFile,BufRead *.mib,*.my,*/mibs/*.txt setf mib
+--- vim-9.1.1975/runtime/filetype.vim~ 2025-12-12 14:10:10.000000000 +0100
++++ vim-9.1.1975/runtime/filetype.vim 2025-12-12 14:11:42.881271150 +0100
+@@ -1077,6 +1077,9 @@ au BufNewFile,BufRead *.smi
+ " Snakemake
+ au BufNewFile,BufRead Snakefile,*.smk setf snakemake
++" SNMP MIB files (additional to runtime/autoload/dist/ft.vim)
++au BufNewFile,BufRead */mibs/*.txt setf mib
++
" Snort Configuration
au BufNewFile,BufRead *.hog,snort.conf,vision.conf setf hog
+ au BufNewFile,BufRead *.rules call dist#ft#FTRules()
diff --git a/vim-home_etc.patch b/vim-home_etc.patch
index 4a9513e..d01046d 100644
--- a/vim-home_etc.patch
+++ b/vim-home_etc.patch
@@ -68,10 +68,10 @@ diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
# define XDG_VDIR (mch_getenv("XDG_CONFIG_HOME") ? \
"$XDG_CONFIG_HOME/vim/view" : "~/.config/vim/view")
# endif
-@@ -365,18 +365,18 @@
+@@ -361,18 +361,18 @@
# define DFLT_RUNTIMEPATH "~/.vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",~/.vim/after"
- # define XDG_RUNTIMEPATH "$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,$XDG_CONFIG_HOME/vim/after"
- # define XDG_RUNTIMEPATH_FB "~/.config/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER "/after,~/.config/vim/after"
+ # define XDG_RUNTIMEPATH "$XDG_CONFIG_HOME/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",$XDG_CONFIG_HOME/vim/after"
+ # define XDG_RUNTIMEPATH_FB "~/.config/vim," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER ",~/.config/vim/after"
-# define CLEAN_RUNTIMEPATH RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
+# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim/after," RUNTIME_GLOBAL ",$VIMRUNTIME," RUNTIME_GLOBAL_AFTER
# else
@@ -86,7 +86,7 @@ diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c
# define XDG_RUNTIMEPATH "$XDG_CONFIG_HOME/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$XDG_CONFIG_HOME/vim/after"
# define XDG_RUNTIMEPATH_FB "~/.config/vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,~/.config/vim/after"
-# define CLEAN_RUNTIMEPATH "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
-+# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
++# define CLEAN_RUNTIMEPATH "$HOME_ETC/.vim/after,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after"
# endif
# endif
diff --git a/vim-pam.patch b/vim-pam.patch
index a423d54..845d000 100644
--- a/vim-pam.patch
+++ b/vim-pam.patch
@@ -1,11 +1,11 @@
---- vim-9.1.1288/runtime/filetype.vim~ 2025-04-09 10:16:06.000000000 +0200
-+++ vim-9.1.1288/runtime/filetype.vim 2025-04-09 10:25:41.479151284 +0200
-@@ -1823,7 +1823,7 @@ au BufNewFile,BufRead {.,}makepkg.conf
- au BufRead pacman.log* call s:StarSetf('pacmanlog')
+--- vim-9.1.1975/runtime/filetype.vim~ 2025-12-12 14:08:50.000000000 +0100
++++ vim-9.1.1975/runtime/filetype.vim 2025-12-12 14:09:47.976576857 +0100
+@@ -1499,7 +1499,7 @@ au BufNewFile,BufRead [a-zA-Z0-9]*Dict{,
+ \|endif
" Pam conf
--au BufNewFile,BufRead */etc/pam.conf setf pamconf
-+au BufNewFile,BufRead */etc/pam.conf,*.pam,*.pamd setf pamconf
+-au BufNewFile,BufRead */etc/pam.d/* call s:StarSetf('pamconf')
++au BufNewFile,BufRead */etc/pam.d/*,*.pam,*.pamd call s:StarSetf('pamconf')
- " Pam environment
- au BufNewFile,BufRead pam_env.conf,.pam_environment setf pamenv
+ " Pandoc
+ au BufNewFile,BufRead,BufFilePost *.pandoc,*.pdk,*.pd,*.pdc setf pandoc
diff --git a/vim-smarty.patch b/vim-smarty.patch
index f2d85e0..8c9b935 100644
--- a/vim-smarty.patch
+++ b/vim-smarty.patch
@@ -1,20 +1,10 @@
---- ./runtime/filetype.vim 2006-01-12 17:26:15.000000000 +0200
-+++ /tmp/filetype.vim 2006-01-12 17:25:53.000000000 +0200
-@@ -792,6 +792,9 @@ au BufRead,BufNewFile *.heex setf heex
- " HEX (Intel)
- au BufNewFile,BufRead *.hex,*.ihex,*.int,*.ihe,*.ihx,*.mcs,*.h32,*.h80,*.h86,*.a43,*.a90 setf hex
-
-+" Smarty templates (must be before HTML)
-+au BufNewFile,BufRead *.tpl.html,*.tpl setf smarty
-+
- " Hjson
- au BufNewFile,BufRead *.hjson setf hjson
-
-@@ -1396,7 +1399,4 @@
-
--" Smarty templates
--au BufNewFile,BufRead *.tpl setf smarty
--
- " SMIL or XML
- au BufNewFile,BufRead *.smil
- \ if getline(1) =~ '<?\s*xml.*?>' |
+--- vim-9.1.1975/runtime/autoload/dist/ft.vim~ 2025-12-12 08:52:07.000000000 +0100
++++ vim-9.1.1975/runtime/autoload/dist/ft.vim 2025-12-12 14:05:04.138142209 +0100
+@@ -2681,6 +2681,7 @@ const ft_from_ext = {
+ "st": "st",
+ # Smarty templates
+ "tpl": "smarty",
++ "tpl.html": "smarty",
+ # SMITH
+ "smt": "smith",
+ "smith": "smith",
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/vim.git/commitdiff/36edcdc92557e6a0f06ebad1642ad16bfcfd4c30
More information about the pld-cvs-commit
mailing list