[DRE-commits] [SCM] ruby-pgplot.git branch, master, updated. upstream/0.1.3-15-g426f6c5

[Youhei SASAKI]

The following commit has been merged in the master branch:
commit 2bbd9fac5c8d7686630ea7b64c1e885208af4d37
Author: Youhei SASAKI <uwabami at gfd-dennou.org>
Date:   Fri Jun 1 19:05:57 2012 +0900

    Fix FTBFS (Closes: #675390)
    
    Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>

diff --git a/debian/patches/0003-Update-Cogen-for-Ruby1.9.2.patch b/debian/patches/0003-Update-Cogen-for-Ruby1.9.2.patch
new file mode 100644
index 0000000..70b4b0b
--- /dev/null
+++ b/debian/patches/0003-Update-Cogen-for-Ruby1.9.2.patch
@@ -0,0 +1,44 @@
+From: Youhei SASAKI <uwabami at gfd-dennou.org>
+Date: Fri, 1 Jun 2012 18:57:48 +0900
+Subject: Update Cogen for Ruby1.9.2
+
+Signed-off-by: Youhei SASAKI <uwabami at gfd-dennou.org>
+---
+ cogen.rb |   10 +++++++---
+ 1 file changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/cogen.rb b/cogen.rb
+index 2494f5f..15c4174 100644
+--- a/cogen.rb
++++ b/cogen.rb
+@@ -120,6 +120,10 @@ def pgfuncgen(name, inp, out)
+     retn = "rb_ary_new3(#{nout},"+retn.join(",")+")"
+   end
+ 
++  unless retn.class == String
++    retn = retn.join(" ")
++  end
++
+   prot = prot.join(",")
+   pass = pass.join(",")
+ 
+@@ -127,7 +131,7 @@ def pgfuncgen(name, inp, out)
+ static VALUE
+   rb_pgplot_#{name}(#{prot})
+ {
+-  #{vars}
++  #{vars.join(" ")}
+   c#{name}(#{pass});
+   return #{retn};
+ }
+@@ -143,8 +147,8 @@ def cogen_pgplot
+       $pgfuncs.each{|x| fout.print pgfuncgen(*x)}
+     elsif /--- auto-generated defs will be placed here ---/  =~ l
+       $pgfuncs.each{|x|
+-	n = x[1].split(",").size
+-	fout.print "  rb_define_module_function(mPgplot,\"#{x[0]}\",rb_pgplot_#{x[0]},#{n});\n"}
++        n = x[1].split(",").size
++        fout.print "  rb_define_module_function(mPgplot,\"#{x[0]}\",rb_pgplot_#{x[0]},#{n});\n"}
+     else
+       fout.print
+     end
diff --git a/debian/patches/series b/debian/patches/series
index c73decf..e2e94be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-Update-extconf-and-Add-support-for-Ruby-1.9.2.patch
 0002-Fix-mkdoc-for-Ruby-1.9.2.patch
+0003-Update-Cogen-for-Ruby1.9.2.patch

-- 
ruby-pgplot.git