Date: Wednesday, November 26, 2014 @ 18:53:28 Author: bpiotrowski Revision: 123158
upgpkg: fish 2.1.1-5 backport upstream patch fixing GREP_OPTIONS deprecation warning (FS#42911) Added: fish/trunk/fish-2.1.1-grep-options-is-deprecated.patch Modified: fish/trunk/PKGBUILD ---------------------------------------------+ PKGBUILD | 10 +++++++--- fish-2.1.1-grep-options-is-deprecated.patch | 15 +++++++++++++++ 2 files changed, 22 insertions(+), 3 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-26 17:36:20 UTC (rev 123157) +++ PKGBUILD 2014-11-26 17:53:28 UTC (rev 123158) @@ -7,7 +7,7 @@ pkgname=fish pkgver=2.1.1 -pkgrel=4 +pkgrel=5 pkgdesc='Smart and user friendly shell intended mostly for interactive use' arch=('i686' 'x86_64') url='http://fishshell.com/' @@ -16,11 +16,15 @@ optdepends=('python: for manual page completion parser and web configuration tool') makedepends=('doxygen') install=fish.install -source=(https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz) -md5sums=('9c6e98985636b5268eae2da0ff79311d') +source=(https://github.com/fish-shell/fish-shell/archive/$pkgver.tar.gz + fish-2.1.1-grep-options-is-deprecated.patch) +md5sums=('9c6e98985636b5268eae2da0ff79311d' + '0c94b1ca8c54ed1a03b551f9b84160e5') prepare() { cd fish-shell-$pkgver + patch -p1 -i ../fish-2.1.1-grep-options-is-deprecated.patch + echo $pkgver > version autoconf -i } Added: fish-2.1.1-grep-options-is-deprecated.patch =================================================================== --- fish-2.1.1-grep-options-is-deprecated.patch (rev 0) +++ fish-2.1.1-grep-options-is-deprecated.patch 2014-11-26 17:53:28 UTC (rev 123158) @@ -0,0 +1,15 @@ +diff --git a/share/functions/grep.fish b/share/functions/grep.fish +index b0dc958..cd7c31b 100644 +--- a/share/functions/grep.fish ++++ b/share/functions/grep.fish +@@ -6,8 +6,8 @@ if command grep --color=auto --help 1>/dev/null 2>/dev/null + if not set -q GREP_COLOR + set -gx GREP_COLOR '97;45' + end +- if not set -q GREP_OPTIONS +- set -gx GREP_OPTIONS --color=auto ++ function grep ++ command grep --color=auto $argv + end + end +