From 1eeb3fe4a8fc77420c39dcb9518c52e1b8227782 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Tue, 2 Mar 2021 14:28:01 +0100 Subject: [PATCH] rediff patches --- 010_all_vim-6.3-vixie.patch | 36 +++-- 020_all_vim-7.0-fstab-tmpfs-size.patch | 6 +- desktop.patch | 173 ++++++------------------- vim-apache.patch | 2 +- vim-autopaste.patch | 77 +++++------ vim-awk.patch | 2 +- vim-filetype_vim-perl_tests.patch | 4 +- vim-ft-lib-udevrules.patch | 2 +- vim-ft-mysql.patch | 4 +- vim-home_etc.patch | 2 +- vim-localedir.patch | 6 +- vim-man_installation.patch | 39 +++--- vim-nagios.patch | 6 +- vim-phpscript.patch | 8 +- vim-smarty.patch | 4 +- vim-vimrc.patch | 6 +- 16 files changed, 133 insertions(+), 244 deletions(-) diff --git a/010_all_vim-6.3-vixie.patch b/010_all_vim-6.3-vixie.patch index 9440f65..eb6b6e5 100644 --- a/010_all_vim-6.3-vixie.patch +++ b/010_all_vim-6.3-vixie.patch @@ -1,8 +1,15 @@ ---- vim-7.4.979/runtime/syntax/crontab.vim~ 2015-12-22 11:05:52.000000000 +0200 -+++ vim-7.4.979/runtime/syntax/crontab.vim 2015-12-22 11:06:53.383500266 +0200 -@@ -18,17 +18,20 @@ - finish - endif +--- vim-8.2.2529/runtime/syntax/crontab.vim.orig 2021-03-02 13:31:41.344169187 +0100 ++++ vim-8.2.2529/runtime/syntax/crontab.vim 2021-03-02 13:33:36.243347329 +0100 +@@ -19,25 +19,34 @@ + + syntax match crontabVar "^\s*\k\w*\s*="me=e-1 + ++syntax match crontabVar /^[A-Za-z][A-Za-z0-9\-\_]*/ nextgroup=crontabVarEq skipwhite ++syntax match crontabVarEq contained /=/ nextgroup=CrontabVarValQ,CrontabVarVal skipwhite ++syntax match crontabVarValQ contained /\(["']\).*\1/ skipwhite ++syntax match crontabVarVal contained /["']\@!\S\+/ skipwhite ++ + syntax case ignore -syntax match crontabMin "^\s*[-0-9/,.*]\+" nextgroup=crontabHr skipwhite -syntax match crontabHr "\s[-0-9/,.*]\+" nextgroup=crontabDay skipwhite contained @@ -25,27 +32,14 @@ syntax match crontabCmnt "^\s*#.*" contains=@Spell syntax match crontabPercent "[^\\]%.*"lc=1 contained -@@ -36,6 +39,11 @@ - - syntax match crontabVar "^\s*\k\w*\s*="me=e-1 - -+syntax match crontabVar /^[A-Za-z][A-Za-z0-9\-\_]*/ nextgroup=crontabVarEq skipwhite -+syntax match crontabVarEq contained /=/ nextgroup=CrontabVarValQ,CrontabVarVal skipwhite -+syntax match crontabVarValQ contained /\(["']\).*\1/ skipwhite -+syntax match crontabVarVal contained /["']\@!\S\+/ skipwhite -+ " Define the default highlighting. - " For version 5.7 and earlier: only when not done already - " For version 5.8 and later: only when an item doesn't have highlighting yet -@@ -63,6 +57,7 @@ - command -nargs=+ hi def link hi def link - endif + " Only when an item doesn't have highlighting yet +hi def link crontabSpecial PreProc hi def link crontabMin Number hi def link crontabHr PreProc hi def link crontabDay Type -@@ -84,6 +79,13 @@ +@@ -59,6 +68,13 @@ " comment out next line for to suppress unix commands coloring. hi def link crontabCmd Statement @@ -58,4 +52,4 @@ + hi def link crontabCmnt Comment - hi def link + diff --git a/020_all_vim-7.0-fstab-tmpfs-size.patch b/020_all_vim-7.0-fstab-tmpfs-size.patch index 019f8e4..fff3f52 100644 --- a/020_all_vim-7.0-fstab-tmpfs-size.patch +++ b/020_all_vim-7.0-fstab-tmpfs-size.patch @@ -2,12 +2,12 @@ --- vim7/runtime/syntax/fstab.vim.orig 2005-03-19 16:14:59.057091856 +0000 +++ vim7/runtime/syntax/fstab.vim 2005-03-19 16:17:17.036115856 +0000 @@ -120,6 +120,9 @@ - syn keyword fsOptionsReiserHash contained rupasov tea r5 detect - syn keyword fsOptionsKeywords contained hashed_relocation noborder nolog notail no_unhashed_relocation replayonly + " Options: tmpfs + syn match fsOptionsKeywords contained /\= 30) { -+ cps = 0; -+ do_set(&sPaste, 0); -+ showmode(); -+ } -+ last_call = now; -+ } -+ - /* - * If a character was put back with vungetc, it was already processed. - * Return it directly. +--- vim-8.2.2529/src/getchar.c.orig 2021-02-17 21:57:03.000000000 +0100 ++++ vim-8.2.2529/src/getchar.c 2021-03-02 14:00:33.809422212 +0100 +@@ -1637,6 +1637,13 @@ + int + vgetc(void) + { ++ static time_t last_call = 0; ++ static int cps = 0; ++ char_u sPaste[] = "paste"; ++ time_t now; ++ if (p_apa) ++ now = time(NULL); ++ + int c, c2; + int n; + char_u buf[MB_MAXBYTES + 1]; +@@ -1649,6 +1656,19 @@ + garbage_collect(FALSE); + #endif + ++ if (p_apa && !p_paste) { ++ if (last_call == now) ++ ++cps; ++ else ++ cps = 0; ++ if (cps >= 30) { ++ cps = 0; ++ do_set(&sPaste, 0); ++ showmode(); ++ } ++ last_call = now; ++ } ++ + /* + * If a character was put back with vungetc, it was already processed. + * Return it directly. --- vim72/src/optiondefs.h~ 2009-05-18 22:23:40.000000000 +0300 +++ vim72/src/optiondefs.h 2009-05-18 22:30:25.277259155 +0300 @@ -377,6 +377,9 @@ diff --git a/vim-awk.patch b/vim-awk.patch index 38a56f1..33cb03b 100644 --- a/vim-awk.patch +++ b/vim-awk.patch @@ -10,4 +10,4 @@ + sed -e "s+/usr/bin/nawk+/bin/awk+" $(TOOLSSOURCE)/mve.awk >$(DEST_TOOLS)/mve.awk -chmod $(SCRIPTMOD) `grep -l "^#!" $(DEST_TOOLS)/*` - # install the language specific files, if they were unpacked + # install the language specific files for tools, if they were unpacked diff --git a/vim-filetype_vim-perl_tests.patch b/vim-filetype_vim-perl_tests.patch index 65d40b6..2775dbd 100644 --- a/vim-filetype_vim-perl_tests.patch +++ b/vim-filetype_vim-perl_tests.patch @@ -7,6 +7,6 @@ +" tests for perl modules +au BufNewFile,BufRead t/*.t call s:FTpl() + - " Sysctl - au BufNewFile,BufRead /etc/sysctl.conf setf sysctl + " Sratus VOS command macro + au BufNewFile,BufRead *.cm setf voscm diff --git a/vim-ft-lib-udevrules.patch b/vim-ft-lib-udevrules.patch index 5cec7f5..dbf2aff 100644 --- a/vim-ft-lib-udevrules.patch +++ b/vim-ft-lib-udevrules.patch @@ -1,7 +1,7 @@ --- vim72/runtime/autoload/dist/ft.vim~ 2010-03-16 20:11:19.304293041 +0200 +++ vim72/runtime/autoload/dist/ft.vim 2010-03-16 20:03:33.541017783 +0200 @@ -1830,6 +1830,10 @@ - setf udevrules + setf javascript return endif + if expand(':p') =~ '^/lib/udev/\%(rules\.d/\)\=.*\.rules$' diff --git a/vim-ft-mysql.patch b/vim-ft-mysql.patch index 451df8e..1149602 100644 --- a/vim-ft-mysql.patch +++ b/vim-ft-mysql.patch @@ -7,5 +7,5 @@ -au BufNewFile,BufRead *.mysql setf mysql +au BufNewFile,BufRead *.mysql,.*mysql_history* setf mysql - " M$ Resource files - au BufNewFile,BufRead *.rc setf rc + " Mutt setup files (must be before catch *.rc) + au BufNewFile,BufRead */etc/Muttrc.d/* call s:StarSetf('muttrc') diff --git a/vim-home_etc.patch b/vim-home_etc.patch index faf93c9..9fb574e 100644 --- a/vim-home_etc.patch +++ b/vim-home_etc.patch @@ -58,7 +58,7 @@ diff -Nru vim62.orig/src/misc1.c vim62/src/misc1.c +# define VIMINFO_FILE "$HOME_ETC/.viminfo" # endif # endif - # if !defined(VIMINFO_FILE2) && defined(OS2) + # if !defined(VIMINFO_FILE2) && defined(VMS) @@ -358,7 +358,7 @@ typedef struct dsc$descriptor DESC; # ifdef VMS # define DFLT_VDIR "sys$login:vimfiles/view" diff --git a/vim-localedir.patch b/vim-localedir.patch index 5a4c8e0..05313b0 100644 --- a/vim-localedir.patch +++ b/vim-localedir.patch @@ -42,7 +42,7 @@ -#endif } - #if defined(FEAT_CMDL_COMPL) || defined(PROTO) + /* --- vim72/src/Makefile~ 2009-04-15 01:00:48.000000000 +0300 +++ vim72/src/Makefile 2009-04-15 01:19:18.519171979 +0300 @@ -957,6 +957,7 @@ @@ -63,7 +63,7 @@ DEST_MACRO = $(DESTDIR)$(MACROSUBLOC) @@ -1988,7 +1988,7 @@ -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \ - $(DEST_MAN_RU_U) $(INSTALLMLARGS) + $(DEST_MAN_TR_U) $(INSTALLMLARGS) if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ - cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \ + cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LOCALE) \ @@ -73,7 +73,7 @@ --- vim73/src/po/Makefile~ 2013-02-22 17:28:18.000000000 +0200 +++ vim73/src/po/Makefile 2013-02-22 17:46:40.771918175 +0200 @@ -38,6 +38,7 @@ check: $(CHECKFILES) - + # installing for real install: $(MOFILES) $(MOCONVERTED) @$(MAKE) prefixcheck + install -d $(LOCALEDIR); \ diff --git a/vim-man_installation.patch b/vim-man_installation.patch index eed368f..a4d615d 100644 --- a/vim-man_installation.patch +++ b/vim-man_installation.patch @@ -74,9 +74,9 @@ fi fi fi ---- vim70/src/Makefile~ 2006-06-06 14:56:14.000000000 +0200 -+++ vim70/src/Makefile 2006-06-06 14:56:14.000000000 +0200 -@@ -1325,7 +1325,8 @@ +--- vim-8.2.2529/src/Makefile.orig 2021-03-02 13:50:22.236523989 +0100 ++++ vim-8.2.2529/src/Makefile 2021-03-02 13:50:34.519785983 +0100 +@@ -1565,7 +1565,8 @@ DEST_MAN_PL = $(DEST_MAN_TOP)/pl$(MAN1DIR) DEST_MAN_PL_I = $(DEST_MAN_TOP)/pl.ISO8859-2$(MAN1DIR) DEST_MAN_PL_U = $(DEST_MAN_TOP)/pl.UTF-8$(MAN1DIR) @@ -84,42 +84,42 @@ +DEST_MAN_RU = $(DEST_MAN_TOP)/ru$(MAN1DIR) +DEST_MAN_RU_K = $(DEST_MAN_TOP)/ru.KOI8-R$(MAN1DIR) DEST_MAN_RU_U = $(DEST_MAN_TOP)/ru.UTF-8$(MAN1DIR) - - # BASIC_SRC: files that are always used -@@ -1912,6 +1913,7 @@ + DEST_MAN_TR = $(DEST_MAN_TOP)/tr$(MAN1DIR) + DEST_MAN_TR_I = $(DEST_MAN_TOP)/tr.ISO8859-9$(MAN1DIR) +@@ -2577,6 +2578,7 @@ -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS) -$(SHELL) ./installman.sh xxd $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS) -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS) + -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_K) "-ru" $(INSTALLMANARGS) -$(SHELL) ./installman.sh xxd $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS) - - # install the language specific files, if they were unpacked -@@ -1926,6 +1928,7 @@ + -$(SHELL) ./installman.sh xxd $(DEST_MAN_TR) "-tr" $(INSTALLMANARGS) + -$(SHELL) ./installman.sh xxd $(DEST_MAN_TR_I) "-tr" $(INSTALLMANARGS) +@@ -2602,6 +2604,7 @@ -$(SHELL) ./installman.sh install $(DEST_MAN_PL_I) "-pl" $(INSTALLMANARGS) -$(SHELL) ./installman.sh install $(DEST_MAN_PL_U) "-pl.UTF-8" $(INSTALLMANARGS) -$(SHELL) ./installman.sh install $(DEST_MAN_RU) "-ru" $(INSTALLMANARGS) + -$(SHELL) ./installman.sh install $(DEST_MAN_RU_K) "-ru" $(INSTALLMANARGS) -$(SHELL) ./installman.sh install $(DEST_MAN_RU_U) "-ru.UTF-8" $(INSTALLMANARGS) - -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \ - $(DEST_MAN_FR) $(INSTALLMLARGS) -@@ -1948,6 +1951,8 @@ + -$(SHELL) ./installman.sh install $(DEST_MAN_TR) "-tr" $(INSTALLMANARGS) + -$(SHELL) ./installman.sh install $(DEST_MAN_TR_I) "-tr" $(INSTALLMANARGS) +@@ -2641,6 +2644,8 @@ -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \ $(DEST_MAN_RU) $(INSTALLMLARGS) -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \ + $(DEST_MAN_RU_K) $(INSTALLMLARGS) + -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \ $(DEST_MAN_RU_U) $(INSTALLMLARGS) - if test -n "$(MAKEMO)" -a -f $(PODIR)/Makefile; then \ - cd $(PODIR); $(MAKE) prefix=$(DESTDIR)$(prefix) LOCALEDIR=$(DEST_LANG) \ -@@ -2088,6 +2093,7 @@ + -$(SHELL) ./installml.sh install "$(GUI_MAN_TARGETS)" \ + $(DEST_MAN_TR) $(INSTALLMLARGS) +@@ -2820,6 +2825,7 @@ -$(SHELL) ./installman.sh uninstall $(DEST_MAN_PL_I) "" $(INSTALLMANARGS) -$(SHELL) ./installman.sh uninstall $(DEST_MAN_PL_U) "" $(INSTALLMANARGS) -$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU) "" $(INSTALLMANARGS) + -$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU_K) "" $(INSTALLMANARGS) -$(SHELL) ./installman.sh uninstall $(DEST_MAN_RU_U) "" $(INSTALLMANARGS) - -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \ - $(DEST_MAN) $(INSTALLMLARGS) -@@ -2660,6 +2660,8 @@ uninstall_runtime: + -$(SHELL) ./installman.sh uninstall $(DEST_MAN_TR) "" $(INSTALLMANARGS) + -$(SHELL) ./installman.sh uninstall $(DEST_MAN_TR_I) "" $(INSTALLMANARGS) +@@ -2865,6 +2871,8 @@ -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \ $(DEST_MAN_TR) $(INSTALLMLARGS) -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \ @@ -128,7 +128,7 @@ $(DEST_MAN_TR_I) $(INSTALLMLARGS) -$(SHELL) ./installml.sh uninstall "$(GUI_MAN_TARGETS)" \ $(DEST_MAN_TR_U) $(INSTALLMLARGS) -@@ -2679,7 +2681,7 @@ uninstall_runtime: +@@ -2875,7 +2883,7 @@ -rm -f $(DEST_MAN_IT)/xxd.1 $(DEST_MAN_IT_I)/xxd.1 $(DEST_MAN_IT_U)/xxd.1 -rm -f $(DEST_MAN_JA_U)/xxd.1 -rm -f $(DEST_MAN_PL)/xxd.1 $(DEST_MAN_PL_I)/xxd.1 $(DEST_MAN_PL_U)/xxd.1 @@ -137,4 +137,3 @@ -rm -f $(DEST_HELP)/*.txt $(DEST_HELP)/tags $(DEST_HELP)/*.pl -rm -f $(DEST_HELP)/*.??x $(DEST_HELP)/tags-?? -rm -f $(SYS_RGB_FILE) - diff --git a/vim-nagios.patch b/vim-nagios.patch index 31ce630..ed47869 100644 --- a/vim-nagios.patch +++ b/vim-nagios.patch @@ -1,11 +1,11 @@ --- vim-7.0/runtime/filetype.vim~ 2006-03-30 22:10:33.046344554 +0300 +++ vim-7.0/runtime/filetype.vim 2006-03-30 23:14:19.721780355 +0300 @@ -2095,6 +2095,8 @@ - " Z-Shell script + au BufNewFile,BufRead .zsh*,.zlog*,.zcompdump* call s:StarSetf('zsh') au BufNewFile,BufRead zsh*,zlog* call s:StarSetf('zsh') +" Nagios config +au BufNewFile,BufRead /*etc/nagios/*.cfg,*sample-config/template-object/*.cfg{,.in},/var/lib/nagios/objects.cache set filetype=nagios - " Generic configuration file (check this last, it's just guessing!) - au BufNewFile,BufRead,StdinReadPost * + " Plain text files, needs to be far down to not override others. This avoids + " the "conf" type being used if there is a line starting with '#'. diff --git a/vim-phpscript.patch b/vim-phpscript.patch index d342b0e..c38719a 100644 --- a/vim-phpscript.patch +++ b/vim-phpscript.patch @@ -1,7 +1,7 @@ --- vim72/runtime/scripts.vim~ 2008-10-09 03:12:50.000000000 +0300 +++ vim72/runtime/scripts.vim 2008-10-09 03:12:54.703954160 +0300 @@ -246,6 +246,10 @@ - elseif s:line1 =~ '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} ' + elseif s:line1 =~# '^\x\{7}: \x\{2} \=\x\{2} \=\x\{2} \=\x\{2} ' set ft=xxd + " PHP script tag @@ -9,7 +9,7 @@ + set ft=php + " RCS/CVS log output - elseif s:line1 =~ '^RCS file:' || s:line2 =~ '^RCS file:' + elseif s:line1 =~# '^RCS file:' || s:line2 =~# '^RCS file:' set ft=rcslog --- vim73/runtime/filetype.vim~ 2010-10-31 13:26:19.000000000 +0200 +++ vim73/runtime/filetype.vim 2010-10-31 13:27:17.615314321 +0200 @@ -21,5 +21,5 @@ +" Also .phpt for PHP Test files +au BufNewFile,BufRead *.php,*.php\d,*.phtml,*.ctp,*.phpt setf php - " Pike - au BufNewFile,BufRead *.pike,*.lpc,*.ulpc,*.pmod setf pike + " PHP config + au BufNewFile,BufRead php.ini-* setf dosini diff --git a/vim-smarty.patch b/vim-smarty.patch index 506a715..f8c82d2 100644 --- a/vim-smarty.patch +++ b/vim-smarty.patch @@ -7,8 +7,8 @@ +" Smarty templates (must be before HTML) +au BufNewFile,BufRead *.tpl.html,*.tpl setf smarty + - " Tilde (must be before HTML) - au BufNewFile,BufRead *.t.html setf tilde + " Hollywood + au BufRead,BufNewFile *.hws setf hollywood @@ -1396,9 +1399,6 @@ \ setf st | diff --git a/vim-vimrc.patch b/vim-vimrc.patch index 40bf9ff..a1b0387 100644 --- a/vim-vimrc.patch +++ b/vim-vimrc.patch @@ -11,7 +11,7 @@ endif @@ -56,3 +53,11 @@ endif " has("autocmd") if has('syntax') && has('eval') - packadd matchit + packadd! matchit endif + +" Use :help colorscheme for info @@ -53,8 +53,8 @@ +" endif +"endif - " Switch syntax highlighting on when the terminal has colors or when using the - " GUI (which always has colors). + " Only do this part when Vim was compiled with the +eval feature. + if 1 @@ -99,7 +103,7 @@ " file it was loaded from, thus the changes you made. " Only define it when not defined already. -- 2.44.0