commit: 17334bffac7b00535787761beab813231cfc77bc
Author: Leo Douglas <douglarek <AT> gmail <DOT> com>
AuthorDate: Thu Jun 5 12:51:18 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Thu Jun 5 12:51:56 2025 +0000
URL: https://gitweb.gentoo.org/proj/vim-patches.git/commit/?id=17334bff
update patchset for vim 9.1.1432
- Remove 006_all_vim-8.2.5066-crosscompile.patch since obsoleted by upstream
- Refresh all other patches
- Use git diff | tee xxx.patch to unify the patch format
Signed-off-by: Leo Douglas <douglarek <AT> gmail.com>
001_all_vim-6.3-xorg-75816.patch | 6 ++++--
002_all_vim-7.3-apache-83565.patch | 8 +++++---
003_all_vim-7.0-automake-substitutions-93378.patch | 16 ++++------------
004_all_vim-7.0-grub-splash-96155.patch | 4 +++-
005_all_vim-7.1-ada-default-compiler.patch | 4 +++-
...=> 006_all_vim-8.2.0210-python3-shared-lib.patch | 0
006_all_vim-8.2.5066-crosscompile.patch | 21 ---------------------
7 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/001_all_vim-6.3-xorg-75816.patch b/001_all_vim-6.3-xorg-75816.patch
index 568b47a..fca4fc2 100644
--- a/001_all_vim-6.3-xorg-75816.patch
+++ b/001_all_vim-6.3-xorg-75816.patch
@@ -1,8 +1,10 @@
# Better support for xorg-x11 when syntax highlighting. Gentoo bug 75816.
+diff --git a/runtime/syntax/xf86conf.vim b/runtime/syntax/xf86conf.vim
+index 0f4e503..5f8de7d 100644
--- a/runtime/syntax/xf86conf.vim
+++ b/runtime/syntax/xf86conf.vim
-@@ -68,6 +68,7 @@
+@@ -63,6 +63,7 @@ if b:xf86conf_xfree86_version >= 4
syn region xf86confSectionMonitor matchgroup=xf86confSectionDelim
start="^\s*Section\s\+\"Monitor\"" end="^\s*EndSection\>"
skip="#.*$\|\"[^\"]*\""
contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment,xf86confOption,xf86confKeyword
syn region xf86confSectionModes matchgroup=xf86confSectionDelim
start="^\s*Section\s\+\"Modes\"" end="^\s*EndSection\>" skip="#.*$\|\"[^\"]*\""
contains=xf86confSubsectionMode,xf86confModeLine,xf86confComment
syn region xf86confSectionScreen matchgroup=xf86confSectionDelim
start="^\s*Section\s\+\"Screen\"" end="^\s*EndSection\>"
skip="#.*$\|\"[^\"]*\""
contains=xf86confSubsectionDisplay,xf86confComment,xf86confOption,xf86confKeyword
@@ -10,7 +12,7 @@
syn region xf86confSubSectionAny matchgroup=xf86confSectionDelim
start="^\s*SubSection\s\+\"[^\"]\+\"" end="^\s*EndSubSection\>"
skip="#.*$\|\"[^\"]*\""
contains=xf86confComment,xf86confOption,xf86confKeyword,@xf86confSectionErrors
syn region xf86confSubSectionMode matchgroup=xf86confSectionDelim
start="^\s*Mode\s\+\"[^\"]\+\"" end="^\s*EndMode\>" skip="#.*$\|\"[^\"]*\""
contains=xf86confComment,xf86confKeyword,@xf86confSectionErrors
syn region xf86confSubSectionDisplay matchgroup=xf86confSectionDelim
start="^\s*SubSection\s\+\"Display\"" end="^\s*EndSubSection\>"
skip="#.*$\|\"[^\"]*\""
contains=xf86confComment,xf86confOption,xf86confKeyword,@xf86confSectionErrors
-@@ -174,6 +175,7 @@
+@@ -171,6 +172,7 @@ else
endif
syn sync match xf86confSyncSectionMonitor groupthere xf86confSectionMonitor
"^\s*Section\s\+\"Monitor\""
syn sync match xf86confSyncSectionScreen groupthere xf86confSectionScreen
"^\s*Section\s\+\"Screen\""
diff --git a/002_all_vim-7.3-apache-83565.patch
b/002_all_vim-7.3-apache-83565.patch
index b68dcfa..46034bf 100644
--- a/002_all_vim-7.3-apache-83565.patch
+++ b/002_all_vim-7.3-apache-83565.patch
@@ -1,8 +1,10 @@
+diff --git a/runtime/filetype.vim b/runtime/filetype.vim
+index a6f13c8..585e442 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
-@@ -113,6 +113,9 @@
- au BufNewFile,BufRead .htaccess,/etc/httpd/*.conf setf apache
- au BufNewFile,BufRead
httpd.conf*,srm.conf*,access.conf*,apache.conf*,apache2.conf*,/etc/apache2/*.conf*,/etc/httpd/conf.d/*.conf*
call s:StarSetf('apache')
+@@ -124,6 +124,9 @@ au BufNewFile,BufRead *.asy setf asy
+ au BufNewFile,BufRead .htaccess,*/etc/httpd/*.conf setf apache
+ au BufNewFile,BufRead */etc/apache2/sites-*/*.com setf apache
+" Gentoo apache config file locations (Gentoo bug #83565)
+au BufNewFile,BufRead /etc/apache2/{modules,vhosts}.d/*.conf call
s:StarSetf('apache')
diff --git a/003_all_vim-7.0-automake-substitutions-93378.patch
b/003_all_vim-7.0-automake-substitutions-93378.patch
index ae73eb8..0bd97e6 100644
--- a/003_all_vim-7.0-automake-substitutions-93378.patch
+++ b/003_all_vim-7.0-automake-substitutions-93378.patch
@@ -1,10 +1,5 @@
----
- runtime/syntax/automake.vim | 3 +++
- runtime/syntax/make.vim | 6 ++----
- 2 files changed, 5 insertions(+), 4 deletions(-)
-
diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim
-index 8a7db7c..cb2b82f 100644
+index 2f1ad98..946e833 100644
--- a/runtime/syntax/automake.vim
+++ b/runtime/syntax/automake.vim
@@ -53,6 +53,9 @@ syn region automakeMakeSString start=+'+ skip=+\\'+
end=+'+ contains=makeIde
@@ -18,11 +13,11 @@ index 8a7db7c..cb2b82f 100644
hi def link automakePrimary Statement
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
-index 2a64dcd..7325db1 100644
+index a6d8ad4..2023080 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
-@@ -62,10 +62,8 @@ syn match makeSpecTarget
"^\.\(SUFFIXES\|PHONY\|DEFAULT\|PRECIOUS\|IGNORE\|SILEN
- \ skipnl nextgroup=makeCommands,makeCommandError
+@@ -91,10 +91,8 @@ elseif get(b:, 'make_flavor', s:make_flavor) == 'gnu'
+ endif
syn match makeCommandError "^\s\+\S.*" contained
-syn region makeCommands contained start=";"hs=s+1 start="^\t"
@@ -34,6 +29,3 @@ index 2a64dcd..7325db1 100644
syn match makeCmdNextLine "\\\n."he=e-1 contained
" some directives
---
-2.24.1
-
diff --git a/004_all_vim-7.0-grub-splash-96155.patch
b/004_all_vim-7.0-grub-splash-96155.patch
index b02fa42..b79ece4 100644
--- a/004_all_vim-7.0-grub-splash-96155.patch
+++ b/004_all_vim-7.0-grub-splash-96155.patch
@@ -1,6 +1,8 @@
+diff --git a/runtime/syntax/grub.vim b/runtime/syntax/grub.vim
+index 3743ae3..232a37c 100644
--- a/runtime/syntax/grub.vim
+++ b/runtime/syntax/grub.vim
-@@ -27,7 +27,7 @@
+@@ -27,7 +27,7 @@ syn match grubBegin display '^'
syn cluster grubCommands contains=grubCommand,grubTitleCommand
diff --git a/005_all_vim-7.1-ada-default-compiler.patch
b/005_all_vim-7.1-ada-default-compiler.patch
index 3a3e78b..2162dee 100644
--- a/005_all_vim-7.1-ada-default-compiler.patch
+++ b/005_all_vim-7.1-ada-default-compiler.patch
@@ -1,6 +1,8 @@
+diff --git a/runtime/ftplugin/ada.vim b/runtime/ftplugin/ada.vim
+index a0621e1..98e17ea 100644
--- a/runtime/ftplugin/ada.vim
+++ b/runtime/ftplugin/ada.vim
-@@ -126,9 +126,11 @@
+@@ -126,9 +126,11 @@ if ! exists("g:ada_default_compiler")
endif
endif
diff --git a/007_all_vim-8.2.0210-python3-shared-lib.patch
b/006_all_vim-8.2.0210-python3-shared-lib.patch
similarity index 100%
rename from 007_all_vim-8.2.0210-python3-shared-lib.patch
rename to 006_all_vim-8.2.0210-python3-shared-lib.patch
diff --git a/006_all_vim-8.2.5066-crosscompile.patch
b/006_all_vim-8.2.5066-crosscompile.patch
deleted file mode 100644
index 984c2af..0000000
--- a/006_all_vim-8.2.5066-crosscompile.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Skip failing configure checks during cross-compile builds (bug #473372).
-
---- a/src/configure.ac
-+++ b/src/configure.ac
-@@ -3443,7 +3443,7 @@ else
- # include <stddef.h>
- #endif
- int main() {char *s; s=(char *)tgoto("%p1%d", 0, 1); exit(0); }])],
-- res="OK", res="FAIL", res="FAIL")
-+ res="OK", res="FAIL", res="OK")
- if test "$res" = "OK"; then
- break
- fi
-@@ -3514,7 +3514,7 @@ int main()
- ],[
- vim_cv_tgetent=non-zero
- ],[
-- AC_MSG_ERROR(failed to compile test program.)
-+ vim_cv_tgent=zero
- ])
- ])
