rpms/ruby/devel ruby-1.8.2-deadcode.patch, NONE, 1.1 ruby.spec, 1.28, 1.29
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Wed Apr 6 18:09:21 UTC 2005
Update of /cvs/dist/rpms/ruby/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv26783
Modified Files:
ruby.spec
Added Files:
ruby-1.8.2-deadcode.patch
Log Message:
* Thu Apr 7 2005 Akira TAGOH <tagoh at redhat.com> - 1.8.2-7
- ruby-1.8.2-deadcode.patch: removed the dead code from the source. (#146108)
- make sure that all documentation files in ruby-docs are the world-
readable. (#147279)
ruby-1.8.2-deadcode.patch:
ext/bigdecimal/bigdecimal.c | 2 ++
ext/pty/pty.c | 2 ++
ext/tcltklib/tcltklib.c | 8 ++++++++
ext/tk/tkutil.c | 4 ++++
parse.y | 4 ++++
regex.c | 4 ++++
6 files changed, 24 insertions(+)
--- NEW FILE ruby-1.8.2-deadcode.patch ---
diff -ruN ruby-1.8.2.orig/ext/bigdecimal/bigdecimal.c ruby-1.8.2/ext/bigdecimal/bigdecimal.c
--- ruby-1.8.2.orig/ext/bigdecimal/bigdecimal.c 2004-10-19 19:25:20.000000000 +0900
+++ ruby-1.8.2/ext/bigdecimal/bigdecimal.c 2005-04-07 02:44:15.000000000 +0900
@@ -1570,12 +1570,14 @@
return nzero;
}
+#if 0
VP_EXPORT int
VpIsNegDoubleZero(double v)
{
double z = VpGetDoubleNegZero();
return MemCmp(&v,&z,sizeof(v))==0;
}
+#endif
VP_EXPORT int
VpException(unsigned short f,char *str,int always)
diff -ruN ruby-1.8.2.orig/ext/pty/pty.c ruby-1.8.2/ext/pty/pty.c
--- ruby-1.8.2.orig/ext/pty/pty.c 2003-12-11 11:39:59.000000000 +0900
+++ ruby-1.8.2/ext/pty/pty.c 2005-04-07 02:44:34.000000000 +0900
@@ -400,12 +400,14 @@
#endif /* HAVE__GETPTY */
#endif /* HAVE_OPENPTY */
+#if 0
static void
freeDevice()
{
chmod(SlaveName, 0666);
chown(SlaveName, 0, 0);
}
+#endif
/* ruby function: getpty */
static VALUE
diff -ruN ruby-1.8.2.orig/ext/tcltklib/tcltklib.c ruby-1.8.2/ext/tcltklib/tcltklib.c
--- ruby-1.8.2.orig/ext/tcltklib/tcltklib.c 2004-12-23 13:16:42.000000000 +0900
+++ ruby-1.8.2/ext/tcltklib/tcltklib.c 2005-04-07 02:46:48.000000000 +0900
@@ -247,6 +247,7 @@
}
/* call original 'exit' command */
+#if 0
static void
call_original_exit(ptr, state)
struct tcltkip *ptr;
@@ -318,6 +319,7 @@
rb_thread_critical = thr_crit_bup;
}
+#endif
/* Tk_ThreadTimer */
static Tcl_TimerToken timer_token = (Tcl_TimerToken)NULL;
@@ -1128,6 +1130,7 @@
}
/* Tcl command `ruby'|`ruby_eval' */
+#if 0
static VALUE
ip_ruby_eval_rescue(failed, einfo)
VALUE failed;
@@ -1137,6 +1140,7 @@
RARRAY(failed)->ptr[0] = einfo;
return Qnil;
}
+#endif
struct eval_body_arg {
char *string;
@@ -1484,6 +1488,7 @@
return ret;
}
+#if 0
static VALUE
ip_ruby_cmd_rescue(failed, einfo)
VALUE failed;
@@ -1493,6 +1498,7 @@
RARRAY(failed)->ptr[0] = einfo;
return Qnil;
}
+#endif
static VALUE
ip_ruby_cmd_body(arg)
@@ -5147,6 +5153,7 @@
return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_TAIL);
}
+#if 0
static VALUE
ip_invoke_immediate(argc, argv, obj)
int argc;
@@ -5155,6 +5162,7 @@
{
return ip_invoke_with_position(argc, argv, obj, TCL_QUEUE_HEAD);
}
+#endif
/* access Tcl variables */
static VALUE
diff -ruN ruby-1.8.2.orig/ext/tk/tkutil.c ruby-1.8.2/ext/tk/tkutil.c
--- ruby-1.8.2.orig/ext/tk/tkutil.c 2004-12-23 13:16:43.000000000 +0900
+++ ruby-1.8.2/ext/tk/tkutil.c 2005-04-07 02:45:13.000000000 +0900
@@ -188,6 +188,7 @@
return tk_toUTF8(1, argv, self);
}
+#if 0
static VALUE
fromUTF8_toDefaultEnc(str, self)
VALUE str;
@@ -198,6 +199,7 @@
argv[0] = str;
return tk_fromUTF8(1, argv, self);
}
+#endif
static void
@@ -835,12 +837,14 @@
}
}
+#if 0
static VALUE
tkstr_to_dec(value)
VALUE value;
{
return rb_cstr_to_inum(RSTRING(value)->ptr, 10, 1);
}
+#endif
static VALUE
tkstr_to_int(value)
diff -ruN ruby-1.8.2.orig/parse.y ruby-1.8.2/parse.y
--- ruby-1.8.2.orig/parse.y 2004-11-29 15:13:51.000000000 +0900
+++ ruby-1.8.2/parse.y 2005-04-07 02:42:52.000000000 +0900
@@ -4445,19 +4445,23 @@
return n;
}
+#if 0
static enum node_type
nodetype(node) /* for debug */
NODE *node;
{
return (enum node_type)nd_type(node);
}
+#endif
+#if 0
static int
nodeline(node)
NODE *node;
{
return nd_line(node);
}
+#endif
static NODE*
newline_node(node)
diff -ruN ruby-1.8.2.orig/regex.c ruby-1.8.2/regex.c
--- ruby-1.8.2.orig/regex.c 2004-11-23 00:29:50.000000000 +0900
+++ ruby-1.8.2/regex.c 2005-04-07 02:43:37.000000000 +0900
@@ -995,6 +995,7 @@
}
+#if 0
static void
print_compiled_pattern(bufp)
struct re_pattern_buffer *bufp;
@@ -1003,6 +1004,7 @@
print_partial_compiled_pattern(buffer, buffer + bufp->used);
}
+#endif
static char*
calculate_must_string(start, end)
@@ -2581,6 +2583,7 @@
If you call this function, you must zero out pending_exact. */
+#if 0
static void
insert_op(op, there, current_end)
int op;
@@ -2594,6 +2597,7 @@
there[0] = (char)op;
}
+#endif
/* Open up space at location THERE, and insert operation OP followed by
Index: ruby.spec
===================================================================
RCS file: /cvs/dist/rpms/ruby/devel/ruby.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- ruby.spec 22 Mar 2005 10:36:16 -0000 1.28
+++ ruby.spec 6 Apr 2005 18:09:19 -0000 1.29
@@ -4,7 +4,7 @@
Name: ruby
Version: 1.8.2
-Release: 6
+Release: 7
License: Distributable
URL: http://www.ruby-lang.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -24,6 +24,7 @@
Patch1: ruby-1.8.0-multilib.patch
Patch2: ruby-1.8.2-strscan-memset.patch
+Patch3: ruby-1.8.2-deadcode.patch
Summary: An interpreter of object-oriented scripting language
Group: Development/Languages
@@ -126,6 +127,7 @@
pushd %{name}-%{version}
%patch1 -p1
%patch2 -p1
+%patch3 -p1
popd
%build
@@ -229,6 +231,8 @@
< $f > `echo $f | sed -e's/-jp//'`
rm -f $f; \
done)
+# make sure that all doc files are the world-readable
+find -type f | xargs chmod 0644
cd ..
@@ -404,6 +408,11 @@
%dir %{_datadir}/emacs/site-lisp/ruby-mode
%changelog
+* Thu Apr 7 2005 Akira TAGOH <tagoh at redhat.com> - 1.8.2-7
+- ruby-1.8.2-deadcode.patch: removed the dead code from the source. (#146108)
+- make sure that all documentation files in ruby-docs are the world-
+ readable. (#147279)
+
* Tue Mar 22 2005 Akira TAGOH <tagoh at redhat.com> - 1.8.2-6
- ruby-1.8.2-strscan-memset.patch: fixed an wrong usage of memset(3).
More information about the fedora-cvs-commits
mailing list