From 3f151e8ff6663c50979e19950238dd21ca6f4b59 Mon Sep 17 00:00:00 2001 From: Markus Linnala Date: Nov 20 2019 16:24:47 +0000 Subject: Add patch vim-syntastic-3.10.0-5-rvim.patch to fix bz#1773723 --- diff --git a/vim-syntastic-3.10.0-5-rvim.patch b/vim-syntastic-3.10.0-5-rvim.patch new file mode 100644 index 0000000..8d70cea --- /dev/null +++ b/vim-syntastic-3.10.0-5-rvim.patch @@ -0,0 +1,43 @@ +# Upstream version bump removed +commit 39b35b23b952d620b8ec7cabb13110f586663837 +Author: LCD 47 +Date: Wed Nov 20 10:00:33 2019 +0200 + + Sanity check: syntastic can't run in rvim. + +diff --git a/autoload/syntastic/util.vim b/autoload/syntastic/util.vim +index 8a17fe64..41b40e6a 100644 +--- a/autoload/syntastic/util.vim ++++ b/autoload/syntastic/util.vim +@@ -42,6 +42,11 @@ function! syntastic#util#system(command) abort " {{{2 + try + let out = system(a:command) + catch ++ if v:exception =~# '\m^Vim\%((\a\+)\)\=:\%(E145\|E484\|E684\)' ++ " XXX re-throwing unmodified v:exception triggers E608 ++ throw substitute(v:exception, '.*:\(E145\|E484\|E684\).*', '\1', '') ++ endif ++ + let crashed = 1 + call syntastic#log#error('exception running system(' . string(a:command) . '): ' . v:exception) + if syntastic#util#isRunningWindows() +diff --git a/plugin/syntastic.vim b/plugin/syntastic.vim +index d48a8d12..4a113eee 100644 +--- a/plugin/syntastic.vim ++++ b/plugin/syntastic.vim +@@ -57,10 +57,13 @@ if s:_running_windows + elseif executable('uname') + try + let g:_SYNTASTIC_UNAME = split(syntastic#util#system('uname'), "\n")[0] +- catch /\m^Vim\%((\a\+)\)\=:E484/ ++ catch /\m^E145$/ ++ call syntastic#log#error("can't run in rvim") ++ finish ++ catch /\m^E484$/ + call syntastic#log#error("can't run external programs (misconfigured shell options?)") + finish +- catch /\m^Vim\%((\a\+)\)\=:E684/ ++ catch /\m^E684$/ + let g:_SYNTASTIC_UNAME = 'Unknown' + endtry + else diff --git a/vim-syntastic.spec b/vim-syntastic.spec index bc311e0..4df3ba7 100644 --- a/vim-syntastic.spec +++ b/vim-syntastic.spec @@ -6,7 +6,7 @@ Name: vim-%{upstream_name} Version: 3.10.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A vim plugins to check syntax for programming languages Summary(fr): Une extension de vim vérifiant la syntaxe pour les langages de programmation @@ -16,6 +16,7 @@ Source0: https://github.com/scrooloose/syntastic/archive/%{version}/%{ups Source1: vim-syntastic.metainfo.xml Patch0: vim-syntastic-3.9.0-python3-shebang.patch +Patch1: vim-syntastic-3.10.0-5-rvim.patch BuildArch: noarch Requires: vim @@ -275,6 +276,9 @@ appstream-util validate-relax --nonet %{buildroot}%{appdata_dir}/vim-syntastic.m %changelog +* Wed Nov 20 2019 Markus Linnala - 3.10.0-3 +- Add upstream patch vim-syntastic-3.10.0-5-rvim.patch to fix bz#1773723 + * Wed Nov 20 2019 Markus Linnala - 3.10.0-2 - Simplify install/mkdir using install -D