Make ruby-gnome2 build with Ruby 1.8.7 again.

It looks like ruby-gnome2 accidently broke backward compatibility.

8 files changed, 187 insertions, 1 deletions

diff --git a/meta-pkgs/ruby-gnome2/distinfo b/meta-pkgs/ruby-gnome2/distinfo
index f55db4e2b23..6895fd857b5 100644
--- a/meta-pkgs/ruby-gnome2/distinfo
+++ b/meta-pkgs/ruby-gnome2/distinfo
@@ -1,6 +1,13 @@
-$NetBSD: distinfo,v 1.37 2013/06/15 09:39:33 obache Exp $
+$NetBSD: distinfo,v 1.38 2013/06/20 17:16:06 taca Exp $
 
 SHA1 (ruby-gnome2-all-2.0.2.tar.gz) = 4713b11909fe6f52c3164cfe88eadeaeed261e93
 RMD160 (ruby-gnome2-all-2.0.2.tar.gz) = ad7781ab68ccca373d1e56050255f63417db0675
 Size (ruby-gnome2-all-2.0.2.tar.gz) = 1674872 bytes
+SHA1 (patch-glib2_ext_glib2_rbglib.c) = 96020dc24dae210fb0ae06aefce0810393af1f88
+SHA1 (patch-glib2_ext_glib2_rbglib__utils.c) = 85210204e6d2fe31f6dcf1f9d918856ab4d61d08
+SHA1 (patch-glib2_ext_glib2_rbgobj__object.c) = 9c4e6cbb21ff3d7c67cf2371ad832bffbe994a94
+SHA1 (patch-glib2_ext_glib2_rbgobject.c) = f7923f1b2dd01754322dc5cf5f96aa2c3d363c3b
+SHA1 (patch-glib2_ext_glib2_rbgutil.c) = b223b9f762b33f6e39b572f283ee6538e0d09a07
 SHA1 (patch-glib2_lib_mkmf-gnome2.rb) = 7ea9f2066aae905e64d8477f500245e3e3b5df9e
+SHA1 (patch-gobject-introspection_ext_gobject-introspection_rb-gi-function-info.c) = 088cecdecd7a2158dbd560f72660c13c42886c29
+SHA1 (patch-gobject-introspection_ext_gobject-introspection_rb-gi-struct-info.c) = d16351c0bdb4ad26a3c1ffb9c29478b0d0d45c10
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.c b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.c
new file mode 100644
index 00000000000..f33df98f44d
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-glib2_ext_glib2_rbglib.c,v 1.1 2013/06/20 17:16:06 taca Exp $
+
+Ruby 1.8 compatibility.
+
+--- glib2/ext/glib2/rbglib.c.orig	2013-05-08 15:01:55.000000000 +0000
++++ glib2/ext/glib2/rbglib.c
+@@ -828,13 +828,13 @@ rbg_inspect (VALUE object)
+ VALUE
+ rbg_to_array (VALUE object)
+ {
+-    return rb_convert_type(object, RUBY_T_ARRAY, "Array", "to_ary");
++    return rb_convert_type(object, T_ARRAY, "Array", "to_ary");
+ }
+ 
+ VALUE
+ rbg_to_hash (VALUE object)
+ {
+-    return rb_convert_type(object, RUBY_T_HASH, "Hash", "to_hash");
++    return rb_convert_type(object, T_HASH, "Hash", "to_hash");
+ }
+ 
+ VALUE
+@@ -843,7 +843,7 @@ rbg_check_array_type (VALUE object)
+ #ifdef HAVE_RB_CHECK_ARRAY_TYPE
+     return rb_check_array_type(object);
+ #else
+-    return rb_check_convert_type(object, RUBY_T_ARRAY, "Array", "to_ary");
++    return rb_check_convert_type(object, T_ARRAY, "Array", "to_ary");
+ #endif
+ }
+ 
+@@ -853,7 +853,7 @@ rbg_check_hash_type (VALUE object)
+ #ifdef HAVE_RB_CHECK_HASH_TYPE
+     return rb_check_hash_type(object);
+ #else
+-    return rb_check_convert_type(object, RUBY_T_HASH, "Hash", "to_hash");
++    return rb_check_convert_type(object, T_HASH, "Hash", "to_hash");
+ #endif
+ }
+ 
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib__utils.c b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib__utils.c
new file mode 100644
index 00000000000..5943cf059a4
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbglib__utils.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-glib2_ext_glib2_rbglib__utils.c,v 1.1 2013/06/20 17:16:06 taca Exp $
+
+Ruby 1.8 compatibility.
+
+--- glib2/ext/glib2/rbglib_utils.c.orig	2013-05-08 15:01:55.000000000 +0000
++++ glib2/ext/glib2/rbglib_utils.c
+@@ -255,7 +255,7 @@ rg_s_parse_debug_string(G_GNUC_UNUSED VA
+     VALUE ary;
+     GDebugKey* gkeys;
+ 
+-    Check_Type(keys, RUBY_T_HASH);
++    Check_Type(keys, T_HASH);
+     ary = rb_funcall(keys, rb_intern("to_a"), 0);
+     nkeys = RARRAY_LEN(ary);
+     gkeys = ALLOCA_N(GDebugKey, nkeys);
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobj__object.c b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobj__object.c
new file mode 100644
index 00000000000..c4db5e127fa
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobj__object.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-glib2_ext_glib2_rbgobj__object.c,v 1.1 2013/06/20 17:16:06 taca Exp $
+
+Ruby 1.8 compatibility.
+
+--- glib2/ext/glib2/rbgobj_object.c.orig	2013-05-08 15:01:55.000000000 +0000
++++ glib2/ext/glib2/rbgobj_object.c
+@@ -225,7 +225,7 @@ rg_s_new_bang(int argc, VALUE *argv, VAL
+     rb_scan_args(argc, argv, "01", &params_hash);
+ 
+     if (!NIL_P(params_hash))
+-        Check_Type(params_hash, RUBY_T_HASH);
++        Check_Type(params_hash, T_HASH);
+ 
+     if (cinfo->klass != self)
+         rb_raise(rb_eTypeError, "%s isn't registered class",
+@@ -635,7 +635,7 @@ rg_initialize(int argc, VALUE *argv, VAL
+     rb_scan_args(argc, argv, "01", &params_hash);
+ 
+     if (!NIL_P(params_hash))
+-        Check_Type(params_hash, RUBY_T_HASH);
++        Check_Type(params_hash, T_HASH);
+ 
+     gobj = rbgobj_gobject_new(RVAL2GTYPE(self), params_hash);
+ 
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobject.c b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobject.c
new file mode 100644
index 00000000000..24f7a14732f
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgobject.c
@@ -0,0 +1,42 @@
+$NetBSD: patch-glib2_ext_glib2_rbgobject.c,v 1.1 2013/06/20 17:16:06 taca Exp $
+
+Ruby 1.8 compatibility.
+
+--- glib2/ext/glib2/rbgobject.c.orig	2013-05-08 15:01:55.000000000 +0000
++++ glib2/ext/glib2/rbgobject.c
+@@ -182,7 +182,7 @@ rbgobj_add_relative(VALUE obj, VALUE rel
+     if (RVAL2CBOOL(rb_ivar_defined(obj, id_relatives)))
+         hash = rb_ivar_get(obj, id_relatives);
+ 
+-    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
++    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+         hash = rb_hash_new();
+         rb_ivar_set(obj, id_relatives, hash);
+     }
+@@ -206,7 +206,7 @@ rbgobj_add_relative_removable(VALUE obj,
+     if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
+         hash = rb_ivar_get(obj, obj_ivar_id);
+ 
+-    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
++    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+         hash = rb_hash_new();
+         rb_ivar_set(obj, obj_ivar_id, hash);
+     }
+@@ -221,7 +221,7 @@ rbgobj_get_relative_removable(VALUE obj,
+     if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
+         hash = rb_ivar_get(obj, obj_ivar_id);
+ 
+-    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
++    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+         return Qnil;
+     }
+     return rb_hash_aref(hash, hash_key);
+@@ -235,7 +235,7 @@ rbgobj_remove_relative(VALUE obj, ID obj
+     if (RVAL2CBOOL(rb_ivar_defined(obj, obj_ivar_id)))
+         hash = rb_ivar_get(obj, obj_ivar_id);
+ 
+-    if (NIL_P(hash) || TYPE(hash) != RUBY_T_HASH) {
++    if (NIL_P(hash) || TYPE(hash) != T_HASH) {
+         /* should not happen. */
+     } else {
+         rb_funcall(hash, id_delete, 1, hash_key);
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgutil.c b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgutil.c
new file mode 100644
index 00000000000..ba66e7bd0ae
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-glib2_ext_glib2_rbgutil.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-glib2_ext_glib2_rbgutil.c,v 1.1 2013/06/20 17:16:06 taca Exp $
+
+Ruby 1.8 compatibility.
+
+--- glib2/ext/glib2/rbgutil.c.orig	2013-05-26 03:25:49.000000000 +0000
++++ glib2/ext/glib2/rbgutil.c
+@@ -62,7 +62,7 @@ rbgutil_set_properties(VALUE self, VALUE
+     VALUE ary;
+     GObject* obj;
+ 
+-    Check_Type(hash, RUBY_T_HASH);
++    Check_Type(hash, T_HASH);
+     ary = rb_funcall(hash, id_to_a, 0);
+     obj = RVAL2GOBJ(self);
+ 
+@@ -121,10 +121,10 @@ gboolean
+ rbgutil_key_equal(VALUE rb_key, const char *key)
+ {
+     switch (TYPE(rb_key)) {
+-      case RUBY_T_STRING:
++      case T_STRING:
+         return RVAL2CBOOL(rb_funcall(rb_key, id_equal, 1, rb_str_new_cstr(key)));
+         break;
+-      case RUBY_T_SYMBOL:
++      case T_SYMBOL:
+         return SYM2ID(rb_key) == rb_intern(key);
+         break;
+       default:
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-gobject-introspection_ext_gobject-introspection_rb-gi-function-info.c b/meta-pkgs/ruby-gnome2/patches/patch-gobject-introspection_ext_gobject-introspection_rb-gi-function-info.c
new file mode 100644
index 00000000000..07083fc0c75
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-gobject-introspection_ext_gobject-introspection_rb-gi-function-info.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-gobject-introspection_ext_gobject-introspection_rb-gi-function-info.c,v 1.1 2013/06/20 17:16:06 taca Exp $
+
+Ruby 1.8 compatibility.
+
+--- gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c.orig	2013-05-24 14:43:47.000000000 +0000
++++ gobject-introspection/ext/gobject-introspection/rb-gi-function-info.c
+@@ -627,7 +627,7 @@ rb_gi_function_info_invoke_raw(GIFunctio
+     gboolean unlock_gvl = FALSE;
+     VALUE rb_receiver, rb_arguments, rb_unlock_gvl;
+ 
+-    if (RB_TYPE_P(rb_options, RUBY_T_ARRAY)) {
++    if (RB_TYPE_P(rb_options, T_ARRAY)) {
+         rb_receiver = Qnil;
+         rb_arguments = rb_options;
+         rb_unlock_gvl = Qnil;
diff --git a/meta-pkgs/ruby-gnome2/patches/patch-gobject-introspection_ext_gobject-introspection_rb-gi-struct-info.c b/meta-pkgs/ruby-gnome2/patches/patch-gobject-introspection_ext_gobject-introspection_rb-gi-struct-info.c
new file mode 100644
index 00000000000..b8b33137b03
--- /dev/null
+++ b/meta-pkgs/ruby-gnome2/patches/patch-gobject-introspection_ext_gobject-introspection_rb-gi-struct-info.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-gobject-introspection_ext_gobject-introspection_rb-gi-struct-info.c,v 1.1 2013/06/20 17:16:06 taca Exp $
+
+Ruby 1.8 compatibility.
+
+--- gobject-introspection/ext/gobject-introspection/rb-gi-struct-info.c.orig	2013-03-17 09:57:52.000000000 +0000
++++ gobject-introspection/ext/gobject-introspection/rb-gi-struct-info.c
+@@ -119,7 +119,7 @@ rg_get_method(VALUE self, VALUE rb_n_or_
+     GIFunctionInfo *function_info;
+ 
+     info = SELF(self);
+-    if (RB_TYPE_P(rb_n_or_name, RUBY_T_FIXNUM)) {
++    if (RB_TYPE_P(rb_n_or_name, T_FIXNUM)) {
+         gint n;
+         n = NUM2INT(rb_n_or_name);
+         function_info = g_struct_info_get_method(info, n);