diff options
| author | Gabriel F. T. Gomes <gabriel@inconstante.eti.br> | 2018-03-09 07:14:40 -0300 |
|---|---|---|
| committer | Gabriel F. T. Gomes <gabriel@inconstante.eti.br> | 2018-03-09 07:35:49 -0300 |
| commit | 93343f315600bafc79c547e92c1f84468dd5da68 (patch) | |
| tree | 8ad77cc2ed41a6d1e0054aa96d1915b0b2000dbd /debian/patches | |
| parent | 7ec53ec4112cb2f04fdf13616170b8f2418e3bd7 (diff) | |
| download | bash-completion-93343f315600bafc79c547e92c1f84468dd5da68.tar.gz | |
Remove patch for cc
In Debian, the output of 'cc --version' looks similar to the following:
$ cc --version
cc (Debian 7.3.0-6) 7.3.0
In old versions of bash-completion, this output would not match with the
check in completions/gcc. But since the following upstream commit:
commit ffabc6f2829201815c1a9c69cfdf8bdbe77ff648
Author: Ville Skyttä <ville.skytta@iki.fi>
Date: Sat Sep 7 10:05:03 2013 +0300
cc, c++: Check path to binary when finding out if it's gcc (Alioth: #314417).
a fallback is provided with the use of _realcommand, rendering
05-fix_gcc_detection unnecessary.
Thanks to Ville Skyttä for suggesting this change.
Diffstat (limited to 'debian/patches')
| -rw-r--r-- | debian/patches/05-fix_gcc_detection.patch | 33 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
2 files changed, 0 insertions, 34 deletions
diff --git a/debian/patches/05-fix_gcc_detection.patch b/debian/patches/05-fix_gcc_detection.patch deleted file mode 100644 index 94a08b08..00000000 --- a/debian/patches/05-fix_gcc_detection.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Tomas Janousek <tomi@nomi.cz> -Subject: fix version detection for Debian's GCC -Bug-Debian: https://bugs.debian.org/665651 -Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665651 -Forwarded: no - ---- - completions/gcc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- bash-completion.orig/completions/gcc -+++ bash-completion/completions/gcc -@@ -50,16 +50,16 @@ _gcc() - } && - complete -F _gcc gcc g++ gfortran g77 g95 gcj gpc && - { -- cc --version 2>/dev/null | command grep -q GCC || \ -+ cc --version 2>/dev/null | command grep -q 'GCC\|Debian' || \ - [[ $( _realcommand cc ) == *gcc* ]] && \ - complete -F _gcc cc || complete -F _minimal cc -- c++ --version 2>/dev/null | command grep -q GCC || \ -+ c++ --version 2>/dev/null | command grep -q 'GCC\|Debian' || \ - [[ $( _realcommand c++ ) == *g++* ]] && \ - complete -F _gcc c++ || complete -F _minimal c++ -- f77 --version 2>/dev/null | command grep -q GCC || \ -+ f77 --version 2>/dev/null | command grep -q 'GCC\|Debian' || \ - [[ $( _realcommand f77 ) == *gfortran* ]] && \ - complete -F _gcc f77 || complete -F _minimal f77 -- f95 --version 2>/dev/null | command grep -q GCC || \ -+ f95 --version 2>/dev/null | command grep -q 'GCC\|Debian' || \ - [[ $( _realcommand f95 ) == *gfortran* ]] && \ - complete -F _gcc f95 || complete -F _minimal f95 - } diff --git a/debian/patches/series b/debian/patches/series index 194f7a4b..faf0c704 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,7 +1,6 @@ 00-fix_quote_readline_by_ref.patch 03-disable_avahi_browse.patch 04-xine_add_more_formats.patch -05-fix_gcc_detection.patch 06-xpdf_support_compressed_pdf.patch 07-dpkg_support_raw-extract_vextract.patch 08-dpkg_fix_-W_option.patch |