From 9b0a2c686b7ac39f1aa099074bd38cead2dfcd27 Mon Sep 17 00:00:00 2001 From: Akira TAGOH Date: Mon, 25 Jun 2007 03:35:51 +0000 Subject: [PATCH] - ruby-r12567.patch: backport patch from upstream svn to get rid of the unnecessary declarations. (#245446) --- ruby-r12567.patch | 30 ++++++++++++++++++++++++++++++ ruby.spec | 8 +++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 ruby-r12567.patch diff --git a/ruby-r12567.patch b/ruby-r12567.patch new file mode 100644 index 0000000..0a15fc9 --- /dev/null +++ b/ruby-r12567.patch @@ -0,0 +1,30 @@ +Mon Jun 18 11:29:49 2007 Nobuyoshi Nakada + + * intern.h, ext/thread/thread.c: moved prototype of rb_thread_status() + to get rid of error in C++. [ruby-list:43615] + +Index: intern.h +=================================================================== +--- intern.h (リビジョン 12566) ++++ intern.h (リビジョン 12567) +@@ -204,7 +204,6 @@ + void rb_thread_polling _((void)); + void rb_thread_sleep _((int)); + void rb_thread_sleep_forever _((void)); +-enum rb_thread_status rb_thread_status _((VALUE)); + VALUE rb_thread_stop _((void)); + VALUE rb_thread_wakeup _((VALUE)); + VALUE rb_thread_wakeup_alive _((VALUE)); +Index: ext/thread/thread.c +=================================================================== +--- ext/thread/thread.c (リビジョン 12566) ++++ ext/thread/thread.c (リビジョン 12567) +@@ -14,6 +14,8 @@ + #include + #include + ++enum rb_thread_status rb_thread_status _((VALUE)); ++ + static VALUE rb_cMutex; + static VALUE rb_cConditionVariable; + static VALUE rb_cQueue; diff --git a/ruby.spec b/ruby.spec index bc87254..56aaa09 100644 --- a/ruby.spec +++ b/ruby.spec @@ -11,7 +11,7 @@ Name: ruby Version: %{rubyver}%{?dotpatchlevel} -Release: 2%{?dist} +Release: 3%{?dist} License: Ruby License/GPL - see COPYING URL: http://www.ruby-lang.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -36,6 +36,7 @@ Patch20: ruby-rubyprefix.patch Patch21: ruby-deprecated-sitelib-search-path.patch Patch22: ruby-deprecated-search-path.patch Patch23: ruby-multilib.patch +Patch24: ruby-r12567.patch Summary: An interpreter of object-oriented scripting language Group: Development/Languages @@ -152,6 +153,7 @@ pushd %{name}-%{rubyver}%{?patchlevel} %patch22 -p1 %patch23 -p1 %endif +%patch24 -p0 popd %build @@ -469,6 +471,10 @@ rm -rf tmp-ruby-docs %endif %changelog +* Mon Jul 25 2007 Akira TAGOH - 1.8.6.36-3 +- ruby-r12567.patch: backport patch from upstream svn to get rid of + the unnecessary declarations. (#245446) + * Wed Jul 20 2007 Akira TAGOH - 1.8.6.36-2 - New upstream release. - Fix Etc::getgrgid to get the correct gid as requested. (#236647)