Andy Lutomirski
10 years ago
parent
c1d2cfb49d
commit
a4ee7be31c
@ -1,2 +1,3 @@
|
||||
/fish-2.1.0.tar.gz
|
||||
/fish-2.1.1.tar.gz
|
||||
/fish-2.2.0.tar.gz
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
--- fish-2.1.0/Makefile.in.orig 2013-12-13 09:12:28.963387757 -0800
|
||||
+++ fish-2.1.0/Makefile.in 2013-12-13 09:12:55.599383681 -0800
|
||||
@@ -742,7 +742,7 @@
|
||||
#
|
||||
|
||||
fish: $(FISH_OBJS) fish.o
|
||||
- $(CXX) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
|
||||
+ $(CXX) $(CXXFLAGS) $(FISH_OBJS) fish.o $(LDFLAGS_FISH) -o $@
|
||||
|
||||
|
||||
#
|
||||
@@ -750,7 +750,7 @@
|
||||
#
|
||||
|
||||
fish_pager: $(FISH_PAGER_OBJS)
|
||||
- $(CXX) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
|
||||
+ $(CXX) $(CXXFLAGS) $(FISH_PAGER_OBJS) $(LDFLAGS_FISH_PAGER) -o $@
|
||||
|
||||
|
||||
#
|
||||
@@ -758,7 +758,7 @@
|
||||
#
|
||||
|
||||
fishd: $(FISHD_OBJS)
|
||||
- $(CXX) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
|
||||
+ $(CXX) $(CXXFLAGS) $(FISHD_OBJS) $(LDFLAGS_FISHD) -o $@
|
||||
|
||||
|
||||
#
|
||||
@@ -766,7 +766,7 @@
|
||||
#
|
||||
|
||||
fish_tests: $(FISH_TESTS_OBJS)
|
||||
- $(CXX) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
|
||||
+ $(CXX) $(CXXFLAGS) $(FISH_TESTS_OBJS) $(LDFLAGS_FISH) -o $@
|
||||
|
||||
|
||||
#
|
||||
@@ -776,7 +776,7 @@
|
||||
#
|
||||
|
||||
mimedb: $(MIME_OBJS)
|
||||
- $(CXX) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
|
||||
+ $(CXX) $(CXXFLAGS) $(MIME_OBJS) $(LDFLAGS_MIMEDB) -o $@
|
||||
|
||||
|
||||
#
|
||||
@@ -784,7 +784,7 @@
|
||||
#
|
||||
|
||||
fish_indent: $(FISH_INDENT_OBJS)
|
||||
- $(CXX) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
|
||||
+ $(CXX) $(CXXFLAGS) $(FISH_INDENT_OBJS) $(LDFLAGS_FISH_INDENT) -o $@
|
||||
|
||||
|
||||
#
|
||||
@@ -792,7 +792,7 @@
|
||||
#
|
||||
|
||||
key_reader: key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o
|
||||
- $(CXX) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@
|
||||
+ $(CXX) $(CXXFLAGS) key_reader.o input_common.o common.o env_universal.o env_universal_common.o wutil.o iothread.o $(LDFLAGS_FISH) -o $@
|
||||
|
||||
|
||||
#
|
||||
@ -1,28 +0,0 @@
|
||||
From efc3846fcfa6f0bae8312645c41b132c6156b3d1 Mon Sep 17 00:00:00 2001
|
||||
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
|
||||
Date: Tue, 25 Nov 2014 08:47:30 +0800
|
||||
Subject: [PATCH] grep.fish: don't use GREP_OPTIONS as it is deprecated
|
||||
|
||||
Closes #1825.
|
||||
---
|
||||
share/functions/grep.fish | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/share/functions/grep.fish b/share/functions/grep.fish
|
||||
index b0dc9586ce21..cd7c31baffcf 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
|
||||
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
From 190cac07a3ff7cd2c65ac24b600808e7c1674412 Mon Sep 17 00:00:00 2001
|
||||
From: David Adam <zanchey@ucc.gu.uwa.edu.au>
|
||||
Date: Tue, 25 Nov 2014 08:48:10 +0800
|
||||
Subject: [PATCH] grep.fish: don't set GREP_COLOR
|
||||
|
||||
grep will fall back to the default colors.
|
||||
|
||||
Closes #1316.
|
||||
---
|
||||
share/functions/grep.fish | 3 ---
|
||||
1 file changed, 3 deletions(-)
|
||||
|
||||
diff --git a/share/functions/grep.fish b/share/functions/grep.fish
|
||||
index cd7c31baffcf..73f21922dc6f 100644
|
||||
--- a/share/functions/grep.fish
|
||||
+++ b/share/functions/grep.fish
|
||||
@@ -3,9 +3,6 @@
|
||||
#
|
||||
|
||||
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
|
||||
function grep
|
||||
command grep --color=auto $argv
|
||||
end
|
||||
--
|
||||
2.1.0
|
||||
|
||||
@ -1,14 +0,0 @@
|
||||
--- fish-2.1.0/configure.orig 2013-12-13 09:08:36.716424191 -0800
|
||||
+++ fish-2.1.0/configure 2013-12-13 09:09:04.875419686 -0800
|
||||
@@ -2922,7 +2922,10 @@
|
||||
#
|
||||
# It also helps FreeBSD which puts libiconv in /usr/local/lib
|
||||
|
||||
-for i in /usr/pkg /sw /opt /opt/local /usr/local; do
|
||||
+# This is problematic for RPM, though -- builds have no business
|
||||
+# looking in /usr/local.
|
||||
+
|
||||
+for i in ; do
|
||||
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $i/include include directory" >&5
|
||||
$as_echo_n "checking for $i/include include directory... " >&6; }
|
||||
@ -1,27 +0,0 @@
|
||||
diff -up fish-2.1.0/share/tools/create_manpage_completions.py.orig fish-2.1.0/share/tools/create_manpage_completions.py
|
||||
--- fish-2.1.0/share/tools/create_manpage_completions.py.orig 2013-10-19 13:10:26.000000000 -0700
|
||||
+++ fish-2.1.0/share/tools/create_manpage_completions.py 2013-12-13 09:35:05.528351152 -0800
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
# Run me like this: ./create_manpage_completions.py /usr/share/man/man{1,8}/* > man_completions.fish
|
||||
diff -up fish-2.1.0/share/tools/deroff.py.orig fish-2.1.0/share/tools/deroff.py
|
||||
--- fish-2.1.0/share/tools/deroff.py.orig 2013-10-19 13:10:26.000000000 -0700
|
||||
+++ fish-2.1.0/share/tools/deroff.py 2013-12-13 09:35:26.421351108 -0800
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
""" Deroff.py, ported to Python from the venerable deroff.c """
|
||||
diff -up fish-2.1.0/share/tools/web_config/webconfig.py.orig fish-2.1.0/share/tools/web_config/webconfig.py
|
||||
--- fish-2.1.0/share/tools/web_config/webconfig.py.orig 2013-10-19 13:10:26.000000000 -0700
|
||||
+++ fish-2.1.0/share/tools/web_config/webconfig.py 2013-12-13 09:35:32.681351122 -0800
|
||||
@@ -1,4 +1,4 @@
|
||||
-#!/usr/bin/env python
|
||||
+#!/usr/bin/python
|
||||
|
||||
# Whether we're Python 2
|
||||
import sys, os
|
||||
Loading…
Reference in new issue