| 1 |
flameeyes 10/04/26 14:09:08 |
| 2 |
|
| 3 |
Added: eventmachine-0.12.10-gentoo.patch |
| 4 |
Log: |
| 5 |
Add a patch to fix a few more problems in eventmachine, such as bug #317281. |
| 6 |
(Portage version: 2.2_rc67/cvs/Linux x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.1 dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch?rev=1.1&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-ruby/eventmachine/files/eventmachine-0.12.10-gentoo.patch?rev=1.1&content-type=text/plain |
| 13 |
|
| 14 |
Index: eventmachine-0.12.10-gentoo.patch |
| 15 |
=================================================================== |
| 16 |
unchanged: |
| 17 |
--- a/Rakefile |
| 18 |
+++ b/Rakefile |
| 19 |
@@ -86,7 +86,7 @@ |
| 20 |
s.rdoc_options = %w(--title EventMachine --main README --line-numbers -x lib/em/version -x lib/emva -x lib/evma/ -x lib/pr_eventmachine -x lib/jeventmachine) |
| 21 |
s.extra_rdoc_files = Dir['README,docs/*'] |
| 22 |
|
| 23 |
- s.files = `git ls-files`.split("\n") |
| 24 |
+ s.files = `git ls-files`.split("\n") rescue Errno::ENOENT |
| 25 |
|
| 26 |
s.require_path = 'lib' |
| 27 |
|
| 28 |
@@ -301,7 +301,7 @@ rescue LoadError |
| 29 |
require 'rake/rdoctask' |
| 30 |
Rake::RDocTask |
| 31 |
end |
| 32 |
-df = begin; require 'rdoc/generator/darkfish'; true; rescue LoadError; end |
| 33 |
+df = begin; require 'rdoc/rdoc'; require 'rdoc/generator/darkfish'; true; rescue LoadError; end |
| 34 |
rdtask = rdoc_task_type.new do |rd| |
| 35 |
rd.title = Spec.name |
| 36 |
rd.rdoc_dir = 'rdoc' |
| 37 |
unchanged: |
| 38 |
--- a/tests/test_defer.rb |
| 39 |
+++ b/tests/test_defer.rb |
| 40 |
@@ -28,6 +28,7 @@ $:.unshift "../lib" |
| 41 |
require 'eventmachine' |
| 42 |
require 'test/unit' |
| 43 |
|
| 44 |
+unless RUBY_VERSION >= '1.9.0' |
| 45 |
class TestDeferUsage < Test::Unit::TestCase |
| 46 |
|
| 47 |
def test_defers |
| 48 |
@@ -41,7 +42,8 @@ class TestDeferUsage < Test::Unit::TestCase |
| 49 |
} |
| 50 |
} |
| 51 |
assert_equal( n, n_times ) |
| 52 |
- end unless RUBY_VERSION >= '1.9.0' |
| 53 |
+ end |
| 54 |
|
| 55 |
end |
| 56 |
+end |
| 57 |
|
| 58 |
only in patch2: |
| 59 |
unchanged: |
| 60 |
--- a/tests/test_process_watch.rb |
| 61 |
+++ b/tests/test_process_watch.rb |
| 62 |
@@ -2,6 +2,7 @@ $:.unshift "../lib" |
| 63 |
require 'eventmachine' |
| 64 |
require 'test/unit' |
| 65 |
|
| 66 |
+if EM.kqueue? |
| 67 |
class TestProcessWatch < Test::Unit::TestCase |
| 68 |
module ParentProcessWatcher |
| 69 |
def process_forked |
| 70 |
@@ -45,4 +46,5 @@ class TestProcessWatch < Test::Unit::TestCase |
| 71 |
assert($exited) |
| 72 |
assert($unbind) |
| 73 |
end |
| 74 |
-end |
| 75 |
\ No newline at end of file |
| 76 |
+end |
| 77 |
+end |
Archives