sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by David Kowis (10dfcbbda2a08be593df5ae4d72f4e17ce8dd74c)
- From: David Kowis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by David Kowis (10dfcbbda2a08be593df5ae4d72f4e17ce8dd74c)
- Date: Mon, 28 Jun 2010 11:35:58 -0500
GIT changes to master grimoire by David Kowis <dkowis AT Kain.shlrm.org>:
ruby-raa/ncurses-ruby/BUILD | 4 ++
ruby-raa/ncurses-ruby/HISTORY | 5 +++
ruby-raa/ncurses-ruby/ncurses_ruby_1.9.patch | 38
+++++++++++++++++++++++++++
3 files changed, 47 insertions(+)
New commits:
commit 10dfcbbda2a08be593df5ae4d72f4e17ce8dd74c
Author: David Kowis <dkowis AT shlrm.org>
Commit: David Kowis <dkowis AT Kain.shlrm.org>
ncurses-ruby: updated to allow building in 1.9
Thanks to whomever did this patch:
http://trickyco.de/tag/ncurses
diff --git a/ruby-raa/ncurses-ruby/BUILD b/ruby-raa/ncurses-ruby/BUILD
new file mode 100755
index 0000000..4904241
--- /dev/null
+++ b/ruby-raa/ncurses-ruby/BUILD
@@ -0,0 +1,4 @@
+if spell_ok ruby-1.9 ; then
+ patch -p0 < $SPELL_DIRECTORY/ncurses_ruby_1.9.patch
+fi &&
+default_build
diff --git a/ruby-raa/ncurses-ruby/HISTORY b/ruby-raa/ncurses-ruby/HISTORY
index 67132f2..770f018 100644
--- a/ruby-raa/ncurses-ruby/HISTORY
+++ b/ruby-raa/ncurses-ruby/HISTORY
@@ -1,3 +1,8 @@
+2010-06-28 David Kowis <dkowis AT shlrm.org>
+ * BUILD: added patch for ruby 1.9
+ * ncurses_ruby_1.9.patch: added patch from
+ http://trickyco.de/tag/ncurses to make it build
+
2010-02-25 Remko van der Vossen <wich AT sourcemage.org>
* DEPENDS: updated ruby dependency to RUBY provider
diff --git a/ruby-raa/ncurses-ruby/ncurses_ruby_1.9.patch
b/ruby-raa/ncurses-ruby/ncurses_ruby_1.9.patch
new file mode 100644
index 0000000..859fee9
--- /dev/null
+++ b/ruby-raa/ncurses-ruby/ncurses_ruby_1.9.patch
@@ -0,0 +1,38 @@
+--- form_wrap.c 2010-06-28 11:30:02.000000000 -0500
++++ ../form_wrap.new 2010-06-28 11:29:49.000000000 -0500
+@@ -392,7 +392,7 @@
+ */
+ static VALUE rbncurs_m_new_form(VALUE dummy, VALUE rb_field_array)
+ {
+- long n = RARRAY(rb_field_array)->len;
++ long n = RARRAY_LEN(rb_field_array);
+ /* Will ncurses free this array? If not, must do it after calling
free_form(). */
+ FIELD** fields = ALLOC_N(FIELD*, (n+1));
+ long i;
+@@ -616,7 +616,7 @@
+ rb_raise(rb_eArgError, "TYPE_ENUM requires three additional
arguments");
+ }
+ else {
+- int n = RARRAY(arg3)->len;
++ int n = RARRAY_LEN(arg3);
+ /* Will ncurses free this array of strings in free_field()?
*/
+ char** list = ALLOC_N(char*, n+1);
+ int i;
+@@ -775,7 +775,7 @@
+ * form_field
+ */
+ static VALUE rbncurs_c_set_form_fields(VALUE rb_form, VALUE rb_field_array)
{
+- long n = RARRAY(rb_field_array)->len;
++ long n = RARRAY_LEN(rb_field_array);
+ /* If ncurses does not free memory used by the previous array of
strings, */
+ /* we will have to do it now. */
+ FIELD** fields = ALLOC_N(FIELD*, (n+1));
+@@ -1123,7 +1123,7 @@
+ VALUE argc = rb_funcall(proc, rb_intern("arity"),0);
+ VALUE args = get_proc(field, FIELDTYPE_ARGS);
+ if (args != Qnil) {
+- if (NUM2INT(argc)-1 != RARRAY(args)->len) {
++ if (NUM2INT(argc)-1 != RARRAY(args)) {
+ char msg[500];
+ snprintf(msg, 500, "The validation functions for this field
type need %d additional arguments.",NUM2INT(argc)-1);
+ msg[499]=0;
- [SM-Commit] GIT changes to master grimoire by David Kowis (10dfcbbda2a08be593df5ae4d72f4e17ce8dd74c), David Kowis, 06/28/2010
Archive powered by MHonArc 2.6.24.