ruby-musicbrainz: make it work with ruby 1.9.

This commit is contained in:
Tilman Sauerbeck 2009-10-27 19:34:01 +01:00
parent 2cdbf53a5d
commit 4884173b2a
4 changed files with 52 additions and 6 deletions

View File

@ -2,6 +2,6 @@ drwxr-xr-x root/root usr/
drwxr-xr-x root/root usr/lib/
drwxr-xr-x root/root usr/lib/ruby/
drwxr-xr-x root/root usr/lib/ruby/site_ruby/
drwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/
drwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/
-rwxr-xr-x root/root usr/lib/ruby/site_ruby/1.8/linux/musicbrainz.so
drwxr-xr-x root/root usr/lib/ruby/site_ruby/1.9/
drwxr-xr-x root/root usr/lib/ruby/site_ruby/1.9/linux/
-rwxr-xr-x root/root usr/lib/ruby/site_ruby/1.9/linux/musicbrainz.so

View File

@ -1 +1,2 @@
eb3815d4b363069165de97c99ad31d11 mb-ruby-0.3.0.tar.gz
46e7970500cf1f2ecb1d1472588155d9 ruby-musicbrainz.diff

View File

@ -5,14 +5,18 @@
name=ruby-musicbrainz
version=0.3.0
release=1
source=(http://pablotron.org/download/mb-ruby-$version.tar.gz)
release=2
source=(http://pablotron.org/download/mb-ruby-$version.tar.gz $name.diff)
build () {
cd mb-ruby-$version
# make it build with ruby 1.9
patch -p1 -i $SRC/$name.diff
ruby extconf.rb
make
make DESTDIR=$PKG install
install -m 755 -D musicbrainz.so \
$PKG/usr/lib/ruby/site_ruby/1.9/linux/musicbrainz.so
}

View File

@ -0,0 +1,41 @@
diff -aur mb-ruby-0.3.0.orig/musicbrainz.c mb-ruby-0.3.0/musicbrainz.c
--- mb-ruby-0.3.0.orig/musicbrainz.c 2006-08-29 01:47:03.000000000 +0200
+++ mb-ruby-0.3.0/musicbrainz.c 2009-10-26 19:33:21.397764820 +0100
@@ -462,7 +462,7 @@
break;
default:
/* grab object */
- obj = RSTRING(argv[0])->ptr;
+ obj = RSTRING_PTR(argv[0]);
/* allocate argument list */
if ((args = malloc(sizeof(char*) * argc)) == NULL)
@@ -470,7 +470,7 @@
/* add each argument list, then terminate the list */
for (i = 1; i < argc; i++)
- args[i - 1] = RSTRING(argv[i])->ptr;
+ args[i - 1] = RSTRING_PTR(argv[i]);
args[argc - 1] = NULL;
/* execute query and free argument list */
@@ -1128,8 +1128,8 @@
int len;
Data_Get_Struct(self, trm_t, trm);
- ptr = RSTRING(buf)->ptr;
- len = RSTRING(buf)->len;
+ ptr = RSTRING_PTR(buf);
+ len = RSTRING_LEN(buf);
return trm_GenerateSignature(*trm, ptr, len) ? Qtrue : Qfalse;
}
@@ -1159,7 +1159,7 @@
break;
case 1:
if (argv[0] != Qnil)
- id = RSTRING(argv[0])->ptr;
+ id = RSTRING_PTR(argv[0]);
break;
default:
rb_raise(eErr, "Invalid argument count: %d.", argc);