summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2008-08-10 14:21:10 +0000
committerHans de Graaff <graaff@gentoo.org>2008-08-10 14:21:10 +0000
commit74dcc46d3391fa17d860f2bbbd1eace8a4e80496 (patch)
tree4557ca973b45608f799d42c3221dd05f214e4284 /dev-lang/ruby/files
parentAdd ~sparc for testing, it now builds. Bug #231962. (diff)
downloadgentoo-2-74dcc46d3391fa17d860f2bbbd1eace8a4e80496.tar.gz
gentoo-2-74dcc46d3391fa17d860f2bbbd1eace8a4e80496.tar.bz2
gentoo-2-74dcc46d3391fa17d860f2bbbd1eace8a4e80496.zip
Remove broken version
(Portage version: 2.1.4.4)
Diffstat (limited to 'dev-lang/ruby/files')
-rw-r--r--dev-lang/ruby/files/ruby-1.8.6-revert-r15856.patch114
1 files changed, 0 insertions, 114 deletions
diff --git a/dev-lang/ruby/files/ruby-1.8.6-revert-r15856.patch b/dev-lang/ruby/files/ruby-1.8.6-revert-r15856.patch
deleted file mode 100644
index dfc2bf3abf21..000000000000
--- a/dev-lang/ruby/files/ruby-1.8.6-revert-r15856.patch
+++ /dev/null
@@ -1,114 +0,0 @@
-$ svn diff -c -15856 http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8
-
-Revert the following commit since it breaks Rails 2.0
-------------------------------------------------------------------------
-r15856 | matz | 2008-03-30 00:47:54 +0900 (Sun, 30 Mar 2008) | 2 lines
-Changed paths:
- M /branches/ruby_1_8/ChangeLog
- M /branches/ruby_1_8/class.c
-
-* class.c (clone_method): should copy cref as well.
- [ruby-core:15833]
-
-
-
-$ svn diff -c -15856 http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8
-
-Revert the following commit since it breaks Rails 2.0
-------------------------------------------------------------------------
-r15856 | matz | 2008-03-30 00:47:54 +0900 (Sun, 30 Mar 2008) | 2 lines
-Changed paths:
- M /branches/ruby_1_8/ChangeLog
- M /branches/ruby_1_8/class.c
-
-* class.c (clone_method): should copy cref as well.
- [ruby-core:15833]
-
-
-
-Index: ruby-1.8.6-p230/class.c
-===================================================================
---- ruby-1.8.6-p230.orig/class.c
-+++ ruby-1.8.6-p230/class.c
-@@ -48,26 +48,13 @@ rb_class_new(super)
- return rb_class_boot(super);
- }
-
--struct clone_method_data {
-- st_table *tbl;
-- VALUE klass;
--};
--
- static int
--clone_method(mid, body, data)
-+clone_method(mid, body, tbl)
- ID mid;
- NODE *body;
-- struct clone_method_data *data;
-+ st_table *tbl;
- {
-- NODE *fbody = body->nd_body;
--
-- if (fbody && nd_type(fbody) == NODE_SCOPE) {
-- VALUE cref = data->klass ?
-- (VALUE)NEW_NODE(NODE_CREF,data->klass,0,fbody->nd_rval) :
-- fbody->nd_rval;
-- fbody = NEW_NODE(NODE_SCOPE, fbody->nd_tbl, cref, fbody->nd_next);
-- }
-- st_insert(data->tbl, mid, (st_data_t)NEW_METHOD(fbody, body->nd_noex));
-+ st_insert(tbl, mid, (st_data_t)NEW_METHOD(body->nd_body, body->nd_noex));
- return ST_CONTINUE;
- }
-
-@@ -78,8 +65,7 @@ rb_mod_init_copy(clone, orig)
- {
- rb_obj_init_copy(clone, orig);
- if (!FL_TEST(CLASS_OF(clone), FL_SINGLETON)) {
-- RBASIC(clone)->klass = RBASIC(orig)->klass;
-- RBASIC(clone)->klass = rb_singleton_class_clone(clone);
-+ RBASIC(clone)->klass = rb_singleton_class_clone(orig);
- }
- RCLASS(clone)->super = RCLASS(orig)->super;
- if (RCLASS(orig)->iv_tbl) {
-@@ -92,12 +78,9 @@ rb_mod_init_copy(clone, orig)
- st_delete(RCLASS(clone)->iv_tbl, (st_data_t*)&id, 0);
- }
- if (RCLASS(orig)->m_tbl) {
-- struct clone_method_data data;
--
-- data.tbl = RCLASS(clone)->m_tbl = st_init_numtable();
-- data.klass = (VALUE)clone;
--
-- st_foreach(RCLASS(orig)->m_tbl, clone_method, (st_data_t)&data);
-+ RCLASS(clone)->m_tbl = st_init_numtable();
-+ st_foreach(RCLASS(orig)->m_tbl, clone_method,
-+ (st_data_t)RCLASS(clone)->m_tbl);
- }
-
- return clone;
-@@ -143,22 +126,9 @@ rb_singleton_class_clone(obj)
- if (RCLASS(klass)->iv_tbl) {
- clone->iv_tbl = st_copy(RCLASS(klass)->iv_tbl);
- }
-- {
-- struct clone_method_data data;
--
-- data.tbl = clone->m_tbl = st_init_numtable();
-- switch (TYPE(obj)) {
-- case T_CLASS:
-- case T_MODULE:
-- data.klass = obj;
-- break;
-- default:
-- data.klass = 0;
-- break;
-- }
--
-- st_foreach(RCLASS(klass)->m_tbl, clone_method, (st_data_t)&data);
-- }
-+ clone->m_tbl = st_init_numtable();
-+ st_foreach(RCLASS(klass)->m_tbl, clone_method,
-+ (st_data_t)clone->m_tbl);
- rb_singleton_class_attached(RBASIC(clone)->klass, (VALUE)clone);
- FL_SET(clone, FL_SINGLETON);
- return (VALUE)clone;