Author: caleb Date: Mon May 3 10:55:01 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- made patch portable across ruby versions per suggestion from radek
---- Files affected:
packages/flvtool2:
flvtool2-ruby19.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: packages/flvtool2/flvtool2-ruby19.patch
diff -u packages/flvtool2/flvtool2-ruby19.patch:1.1
packages/flvtool2/flvtool2-ruby19.patch:1.2
--- packages/flvtool2/flvtool2-ruby19.patch:1.1 Sat May 1 13:14:48 2010
+++ packages/flvtool2/flvtool2-ruby19.patch Mon May 3 12:54:56 2010
@@ -1,10 +1,12 @@
--- flvtool2-1.0.6/setup.rb~ 2006-10-10 23:46:57.000000000 +0300
-+++ flvtool2-1.0.6/setup.rb 2010-05-01 14:11:48.846696545 +0300
-@@ -1311,6 +1311,7 @@
++++ flvtool2-1.0.6/setup.rb 2010-05-03 13:51:01.395678449 +0300
+@@ -1311,6 +1311,9 @@
File.open(path) {|f|
line = f.gets
}
-+ line.force_encoding('ASCII-8BIT')
++ if RUBY_VERSION >= "1.9"
++ line.force_encoding('ASCII-8BIT')
++ end
return nil unless /\A#!/ =~ line
parse(line)
end
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/flvtool2/flvtool2-ruby19.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
