From d90bdea9f08ccc5002e8574148877ca3f689d3b9 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sun, 1 Oct 2023 12:21:39 +0200 Subject: [PATCH] Up to 9.0.1968; fixie patch no longer in gentoo (and doesn't look that needed), so we drop it, too --- 010_all_vim-6.3-vixie.patch | 55 ------------------------------------- vim-autopaste.patch | 6 ++-- vim.spec | 10 +++---- 3 files changed, 8 insertions(+), 63 deletions(-) delete mode 100644 010_all_vim-6.3-vixie.patch diff --git a/010_all_vim-6.3-vixie.patch b/010_all_vim-6.3-vixie.patch deleted file mode 100644 index eb6b6e5..0000000 --- a/010_all_vim-6.3-vixie.patch +++ /dev/null @@ -1,55 +0,0 @@ ---- 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 --syntax match crontabDay "\s[-0-9/,.*]\+" nextgroup=crontabMnth skipwhite contained -+syntax match crontabMin "\_^[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?" nextgroup=crontabHr skipwhite -+syntax match crontabHr "\_^[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?" nextgroup=crontabDay skipwhite contained -+syntax match crontabDay "\_^[0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?" nextgroup=crontabMnth skipwhite contained - --syntax match crontabMnth "\s[-a-z0-9/,.*]\+" nextgroup=crontabDow skipwhite contained -+syntax match crontabMnth "\<[a-z0-9\-\/\,\.]\{}\>\|\*\(/[0-9]\{}\)\?" nextgroup=crontabDow skipwhite contained - syntax keyword crontabMnth12 contained jan feb mar apr may jun jul aug sep oct nov dec - - syntax match crontabDow "\s[-a-z0-9/,.*]\+" nextgroup=crontabCmd skipwhite contained - syntax keyword crontabDow7 contained sun mon tue wed thu fri sat - -+syntax match crontabSpecial "@\w\+" nextgroup=crontabCmd skipwhite -+syntax match crontabCmdSpecial contained /\\.\|%/ - syntax region crontabCmd start="\S" end="$" skipwhite contained keepend contains=crontabPercent -+syntax region crontabCmd start="\S" end="$" nextgroup=crontabCmnt skipwhite contained contains=crontabCmnt,crontabCmdSpecial keepend - syntax match crontabCmnt "^\s*#.*" contains=@Spell - syntax match crontabPercent "[^\\]%.*"lc=1 contained - - " Define the default highlighting. - " 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 -@@ -59,6 +68,13 @@ - " comment out next line for to suppress unix commands coloring. - hi def link crontabCmd Statement - -+hi def link crontabCmdSpecial Special -+ -+hi def link crontabVar Identifier -+hi def link crontabVarEq Special -+hi def link crontabVarVal Constant -+hi def link crontabVarValQ String -+ - hi def link crontabCmnt Comment - - diff --git a/vim-autopaste.patch b/vim-autopaste.patch index 8a7c0d1..af8c1b3 100644 --- a/vim-autopaste.patch +++ b/vim-autopaste.patch @@ -38,13 +38,13 @@ +++ vim72/src/optiondefs.h 2009-05-18 22:30:25.277259155 +0300 @@ -377,6 +377,9 @@ {"autoindent", "ai", P_BOOL|P_VI_DEF, - (char_u *)&p_ai, PV_AI, NULL, + (char_u *)&p_ai, PV_AI, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, + {"autopaste", "apa", P_BOOL|P_VI_DEF, -+ (char_u *)&p_apa, PV_NONE, NULL, ++ (char_u *)&p_apa, PV_NONE, NULL, NULL, + {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, {"autoprint", "ap", P_BOOL|P_VI_DEF, - (char_u *)NULL, PV_NONE, NULL, + (char_u *)NULL, PV_NONE, NULL, NULL, {(char_u *)FALSE, (char_u *)0L} SCTX_INIT}, --- vim72/src/option.h~ 2009-05-18 22:23:40.000000000 +0300 +++ vim72/src/option.h 2009-05-18 22:30:25.277259155 +0300 diff --git a/vim.spec b/vim.spec index 2855d6e..e936f83 100644 --- a/vim.spec +++ b/vim.spec @@ -31,8 +31,8 @@ # 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.0.1664 -%define rel 2 +%define ver 9.0.1968 +%define rel 1 Summary: Vi IMproved - a Vi clone Summary(de.UTF-8): VIsual editor iMproved Summary(es.UTF-8): Editor visual incrementado @@ -52,7 +52,7 @@ License: Charityware Group: Applications/Editors/Vim #Source0: ftp://ftp.vim.org/pub/vim/unix/%{name}-%{ver}.tar.bz2 Source0: https://github.com/vim/vim/archive/v%{ver}.tar.gz -# Source0-md5: 6ca4affc0ea89b798b1b2a9f4c972afd +# Source0-md5: 66147348ba84ea9c78b9d6595015f5a6 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 @@ -84,7 +84,7 @@ Patch8: %{name}-po-syntax.patch Patch10: %{name}-doubleparenthesis.patch Patch11: %{name}-syntax-fstab.patch -Patch12: 010_all_%{name}-6.3-vixie.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 @@ -784,7 +784,7 @@ cp -p runtime/gvim.desktop gvim-motif.desktop %patch10 -p1 %patch11 -p1 -%patch12 -p1 + %patch14 -p1 %patch15 -p1 %patch17 -p1 -- 2.44.0