[arch-commits] CVS update of arch/build/devel/ruby (2 files)

[daniel at archlinux.org]

    Date: Saturday, August 25, 2007 @ 12:42:09
  Author: daniel
    Path: /home/cvs-arch/arch/build/devel/ruby

   Added: ruby-1.8.6_p36-rb_thread_status_prototype.patch (1.1)
Modified: PKGBUILD (1.36 -> 1.37)

fix #7636


-------------------------------------------------+
 PKGBUILD                                        |   10 +++++---
 ruby-1.8.6_p36-rb_thread_status_prototype.patch |   25 ++++++++++++++++++++++
 2 files changed, 31 insertions(+), 4 deletions(-)


Index: arch/build/devel/ruby/PKGBUILD
diff -u arch/build/devel/ruby/PKGBUILD:1.36 arch/build/devel/ruby/PKGBUILD:1.37
--- arch/build/devel/ruby/PKGBUILD:1.36	Wed Jun 13 07:28:48 2007
+++ arch/build/devel/ruby/PKGBUILD	Sat Aug 25 12:42:08 2007
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD,v 1.36 2007/06/13 11:28:48 andyrtr Exp $
+# $Id: PKGBUILD,v 1.37 2007/08/25 16:42:08 daniel Exp $
 # Maintainer: dorphell <dorphell at archlinux.org>
 # Contributors: John Proctor <jproctor at prium.net>
 #               Jeramy Rutley <jrutley at gmail.com>
 pkgname=ruby
 pkgver=1.8.6_p36
 _pkgver=1.8.6-p36
-pkgrel=2
+pkgrel=3
 pkgdesc="An object-oriented language for quick and easy programming"
 arch=(i686 x86_64)
 license=('custom')
 url="http://www.ruby-lang.org/en/"
 depends=('gdbm' 'db>=4.5' 'openssl>=0.9.8b' 'zlib' 'readline')
 makedepends=('tk')
-source=(ftp://ftp.ruby-lang.org/pub/ruby/stable/${pkgname}-${_pkgver}.tar.bz2)
-md5sums=('eb7f25818cb6993839b38d1f21bd4ea1')
+source=(ftp://ftp.ruby-lang.org/pub/ruby/stable/${pkgname}-${_pkgver}.tar.bz2 ruby-1.8.6_p36-rb_thread_status_prototype.patch) 
 force=y
 
 build() {
   cd ${startdir}/src/${pkgname}-${_pkgver}
+  patch -Np0 -i ../ruby-1.8.6_p36-rb_thread_status_prototype.patch || return 1
   ./configure --prefix=/usr --enable-shared --enable-pthread
   make || return 1
   make DESTDIR=${startdir}/pkg install
@@ -25,3 +25,5 @@
   make DESTDIR=${startdir}/pkg install-doc
   install -Dm644 COPYING ${startdir}/pkg/usr/share/licenses/${pkgname}/COPYING
 }
+md5sums=('eb7f25818cb6993839b38d1f21bd4ea1'
+         '974baa2082c6ad34ec6a96bde01ca40a')
Index: arch/build/devel/ruby/ruby-1.8.6_p36-rb_thread_status_prototype.patch
diff -u /dev/null arch/build/devel/ruby/ruby-1.8.6_p36-rb_thread_status_prototype.patch:1.1
--- /dev/null	Sat Aug 25 12:42:09 2007
+++ arch/build/devel/ruby/ruby-1.8.6_p36-rb_thread_status_prototype.patch	Sat Aug 25 12:42:08 2007
@@ -0,0 +1,25 @@
+Index: intern.h
+===================================================================
+--- intern.h	(revision 12566)
++++ intern.h	(revision 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	(revision 12566)
++++ ext/thread/thread.c	(revision 12567)
+@@ -14,6 +14,8 @@
+ #include <rubysig.h>
+ #include <node.h>
+ 
++enum rb_thread_status rb_thread_status _((VALUE));
++
+ static VALUE rb_cMutex;
+ static VALUE rb_cConditionVariable;
+ static VALUE rb_cQueue;