diff options
author | taca <taca@pkgsrc.org> | 2013-08-04 16:42:11 +0000 |
---|---|---|
committer | taca <taca@pkgsrc.org> | 2013-08-04 16:42:11 +0000 |
commit | f72c4da480d55db059c9f1cf2dc6b4a8328d7632 (patch) | |
tree | c0404b71c32bc10077934cca3a3eb9220748217e /math | |
parent | 5ddca4db6fbf6e6cc4040b681b2d556e2db26336 (diff) | |
download | pkgsrc-f72c4da480d55db059c9f1cf2dc6b4a8328d7632.tar.gz |
Add patches to fix build problem with gsl-1.16.
Diffstat (limited to 'math')
-rw-r--r-- | math/ruby-gsl/distinfo | 4 | ||||
-rw-r--r-- | math/ruby-gsl/patches/patch-ext_fft.c | 21 | ||||
-rw-r--r-- | math/ruby-gsl/patches/patch-ext_wavelet.c | 39 |
3 files changed, 63 insertions, 1 deletions
diff --git a/math/ruby-gsl/distinfo b/math/ruby-gsl/distinfo index f0a03a49aab..b3d125c745a 100644 --- a/math/ruby-gsl/distinfo +++ b/math/ruby-gsl/distinfo @@ -1,5 +1,7 @@ -$NetBSD: distinfo,v 1.6 2013/03/11 12:28:46 taca Exp $ +$NetBSD: distinfo,v 1.7 2013/08/04 16:42:11 taca Exp $ SHA1 (gsl-1.15.3.gem) = c3e3d8d47d4e456bcc40be9f43f7da2667622ed5 RMD160 (gsl-1.15.3.gem) = 73d5d601c4ace8c5a0cabd4bab6045191d1a4077 Size (gsl-1.15.3.gem) = 620032 bytes +SHA1 (patch-ext_fft.c) = cee5d2d4a9caac1125720ed257c73074d9151be6 +SHA1 (patch-ext_wavelet.c) = f152a903a76a84c1ff86c6917d4c68ce50c4f81e diff --git a/math/ruby-gsl/patches/patch-ext_fft.c b/math/ruby-gsl/patches/patch-ext_fft.c new file mode 100644 index 00000000000..1fe895eb53b --- /dev/null +++ b/math/ruby-gsl/patches/patch-ext_fft.c @@ -0,0 +1,21 @@ +$NetBSD: patch-ext_fft.c,v 1.1 2013/08/04 16:42:11 taca Exp $ + +Fix for gsl 1.6 and later; stop using deprecated API. + +--- ext/fft.c.orig 2013-08-04 16:38:23.000000000 +0000 ++++ ext/fft.c +@@ -907,10 +907,10 @@ void Init_gsl_fft(VALUE module) + + /*****/ + +- rb_define_const(mgsl_fft, "Forward", INT2FIX(forward)); +- rb_define_const(mgsl_fft, "FORWARD", INT2FIX(forward)); +- rb_define_const(mgsl_fft, "Backward", INT2FIX(backward)); +- rb_define_const(mgsl_fft, "BACKWARD", INT2FIX(backward)); ++ rb_define_const(mgsl_fft, "Forward", INT2FIX(gsl_fft_forward)); ++ rb_define_const(mgsl_fft, "FORWARD", INT2FIX(gsl_fft_forward)); ++ rb_define_const(mgsl_fft, "Backward", INT2FIX(gsl_fft_backward)); ++ rb_define_const(mgsl_fft, "BACKWARD", INT2FIX(gsl_fft_backward)); + + /* Transforms for complex vectors */ + rb_define_method(cgsl_vector_complex, "radix2_forward", diff --git a/math/ruby-gsl/patches/patch-ext_wavelet.c b/math/ruby-gsl/patches/patch-ext_wavelet.c new file mode 100644 index 00000000000..9c85a5c5c1b --- /dev/null +++ b/math/ruby-gsl/patches/patch-ext_wavelet.c @@ -0,0 +1,39 @@ +$NetBSD: patch-ext_wavelet.c,v 1.1 2013/08/04 16:42:11 taca Exp $ + +Fix for gsl 1.6 and later; stop using deprecated API. + +--- ext/wavelet.c.orig 2013-08-04 16:38:23.000000000 +0000 ++++ ext/wavelet.c +@@ -152,10 +152,10 @@ static void rb_gsl_wavelet_define_const( + rb_define_const(klass, "BSPLINE", INT2FIX(GSL_WAVELET_BSPLINE)); + rb_define_const(klass, "BSPLINE_CENTERED", INT2FIX(GSL_WAVELET_BSPLINE_CENTERED)); + /*****/ +- rb_define_const(klass, "FORWARD", INT2FIX(forward)); +- rb_define_const(klass, "Forward", INT2FIX(forward)); +- rb_define_const(klass, "BACKWARD", INT2FIX(backward)); +- rb_define_const(klass, "Backward", INT2FIX(backward)); ++ rb_define_const(klass, "FORWARD", INT2FIX(gsl_wavelet_forward)); ++ rb_define_const(klass, "Forward", INT2FIX(gsl_wavelet_forward)); ++ rb_define_const(klass, "BACKWARD", INT2FIX(gsl_wavelet_backward)); ++ rb_define_const(klass, "Backward", INT2FIX(gsl_wavelet_backward)); + } + + static VALUE rb_gsl_wavelet_name(VALUE ww) +@@ -191,7 +191,7 @@ static VALUE rb_gsl_wavelet_transform0(i + { + gsl_wavelet *w = NULL; + gsl_vector *v = NULL, *vnew; +- gsl_wavelet_direction dir = forward; ++ gsl_wavelet_direction dir = gsl_wavelet_forward; + gsl_wavelet_workspace *work = NULL; + int itmp, flag = 0; + // local variable "status" declared and set, but never used +@@ -531,7 +531,7 @@ static VALUE rb_gsl_wavelet2d(int argc, + { + gsl_wavelet *w = NULL; + gsl_matrix *m = NULL, *mnew; +- gsl_wavelet_direction dir = forward; ++ gsl_wavelet_direction dir = gsl_wavelet_forward; + gsl_wavelet_workspace *work = NULL; + VALUE ary, ret; + int itmp, flag = 0; |