diff options
| author |   Joshua Nichols <nichoj@gentoo.org> | 2007-03-08 03:00:41 +0000 |
|---|---|---|
| committer | Joshua Nichols <nichoj@gentoo.org> | 2007-03-08 03:00:41 +0000 |
| commit | f6fe9640abfe9db8e9b01e7c306764b420ca7e47 (patch) | |
| tree | 2a20903c46fef5515462361a1e788b1cb0f3915b | |
| parent | Add mask for xserver 1.3 RC. (diff) | |
| download | gentoo-2-f6fe9640abfe9db8e9b01e7c306764b420ca7e47.tar.gz gentoo-2-f6fe9640abfe9db8e9b01e7c306764b420ca7e47.tar.bz2 gentoo-2-f6fe9640abfe9db8e9b01e7c306764b420ca7e47.zip | |
Fixed bad patch.
(Portage version: 2.1.2-r12)
| -rw-r--r-- | dev-java/jruby/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-java/jruby/files/jruby-0.9.8-old_jline.patch | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog index 1e6a294ce8a3..8ec3d899065a 100644 --- a/dev-java/jruby/ChangeLog +++ b/dev-java/jruby/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/jruby # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.14 2007/03/08 00:08:26 nichoj Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.15 2007/03/08 03:00:41 nichoj Exp $ + + 08 Mar 2007; Joshua Nichols <nichoj@gentoo.org> + files/jruby-0.9.8-old_jline.patch: + Fixed bad patch. *jruby-0.9.8 (08 Mar 2007) diff --git a/dev-java/jruby/files/jruby-0.9.8-old_jline.patch b/dev-java/jruby/files/jruby-0.9.8-old_jline.patch index 49a82dfa9a4d..ec0fd57bd88a 100644 --- a/dev-java/jruby/files/jruby-0.9.8-old_jline.patch +++ b/dev-java/jruby/files/jruby-0.9.8-old_jline.patch @@ -1,7 +1,8 @@ +Only in jruby-0.9.8-patched/src/org/jruby/ext: .Readline.java.swp diff -ru jruby-0.9.8/src/org/jruby/ext/Readline.java jruby-0.9.8-patched/src/org/jruby/ext/Readline.java --- jruby-0.9.8/src/org/jruby/ext/Readline.java 2007-03-05 18:42:13.000000000 -0500 -+++ jruby-0.9.8-patched/src/org/jruby/ext/Readline.java 2007-03-07 08:48:25.000000000 -0500 -@@ -85,11 +85,11 @@ ++++ jruby-0.9.8-patched/src/org/jruby/ext/Readline.java 2007-03-07 21:59:00.000000000 -0500 +@@ -85,9 +85,9 @@ protected static void initReadline() throws IOException { readline = new ConsoleReader(); readline.setUseHistory(false); @@ -11,7 +12,5 @@ diff -ru jruby-0.9.8/src/org/jruby/ext/Readline.java jruby-0.9.8-patched/src/org - ((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false); + //((CandidateListCompletionHandler) readline.getCompletionHandler()).setAlwaysIncludeNewline(false); if (currentCompletor == null) - currentCompletor = new RubyFileNameCompletor(); + currentCompletor = new RubyFileNameCompletor(); readline.addCompletor(currentCompletor); - history = readline.getHistory(); - readline.setHistory(history); |