packages: qdbm/qdbm.spec, qdbm/qdbm-ruby1.9.patch (NEW) - use ruby 1.9 comp...

[baggins]

Author: baggins                      Date: Mon Mar  1 15:44:18 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use ruby 1.9 compatible macros

---- Files affected:
packages/qdbm:
   qdbm.spec (1.31 -> 1.32) , qdbm-ruby1.9.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/qdbm/qdbm.spec
diff -u packages/qdbm/qdbm.spec:1.31 packages/qdbm/qdbm.spec:1.32
--- packages/qdbm/qdbm.spec:1.31	Sat Sep 19 16:03:58 2009
+++ packages/qdbm/qdbm.spec	Mon Mar  1 16:44:12 2010
@@ -21,6 +21,7 @@
 # Source0-md5:	084e07824e231969356ec7cefac97985
 Patch0:		%{name}-am_ac.patch
 Patch1:		%{name}-Makefile.patch
+Patch2:		%{name}-ruby1.9.patch
 URL:		http://qdbm.sourceforge.net/
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -192,6 +193,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -468,6 +470,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2010/03/01 15:44:12  baggins
+- use ruby 1.9 compatible macros
+
 Revision 1.31  2009/09/19 14:03:58  kali
 - added Makefile.patch (fix install)
 - rel up

================================================================
Index: packages/qdbm/qdbm-ruby1.9.patch
diff -u /dev/null packages/qdbm/qdbm-ruby1.9.patch:1.1
--- /dev/null	Mon Mar  1 16:44:18 2010
+++ packages/qdbm/qdbm-ruby1.9.patch	Mon Mar  1 16:44:12 2010
@@ -0,0 +1,41 @@
+--- qdbm-1.8.77/ruby/depot/mod_depot.c~	2006-09-25 14:21:38.000000000 +0200
++++ qdbm-1.8.77/ruby/depot/mod_depot.c	2010-03-01 16:43:18.451249361 +0100
+@@ -274,9 +274,9 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   vbuf = STR2CSTR(vval);
+-  vsiz = RSTRING(vval)->len;
++  vsiz = RSTRING_LEN(vval);
+   FIXNUM_P(vdmode);
+   dmode = FIX2INT(vdmode);
+   depot = dptable[index];
+@@ -295,7 +295,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   depot = dptable[index];
+   if(!dpout(depot, kbuf, ksiz)){
+     if(dpsltable[index] && dpecode == DP_ENOITEM) return Qfalse;
+@@ -314,7 +314,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   FIXNUM_P(vstart);
+   start = FIX2INT(vstart);
+   FIXNUM_P(vmax);
+@@ -337,7 +337,7 @@
+   FIXNUM_P(vindex);
+   if((index = FIX2INT(vindex)) == -1) myerror(DP_EMISC);
+   kbuf = STR2CSTR(vkey);
+-  ksiz = RSTRING(vkey)->len;
++  ksiz = RSTRING_LEN(vkey);
+   depot = dptable[index];
+   if((vsiz = dpvsiz(depot, kbuf, ksiz)) == -1){
+     if(dpsltable[index] && dpecode == DP_ENOITEM) return INT2FIX(-1);
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/qdbm/qdbm.spec?r1=1.31&r2=1.32&f=u