kpriv
/
pkgsrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/ruby-sqlite: fix build with Ruby 3.2

This commit is contained in:
taca 2023-01-30 13:40:06 +00:00
parent 1fd716065d
commit 64a3a8abf4
3 changed files with 44 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
databases/ruby-sqlite/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2023/01/25 11:07:40 taca Exp $
# $NetBSD: Makefile,v 1.6 2023/01/30 13:40:06 taca Exp $
DISTNAME= sqlite-ruby-2.2.3
PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME:S/-ruby//}
@ -10,9 +10,6 @@ MAINTAINER= pkgsrc-users@NetBSD.org
COMMENT= Ruby interface for the SQLite database engine
LICENSE= modified-bsd
# dose not support ruby32
RUBY_VERSIONS_ACCEPTED= 27 30 31
.include "../../lang/ruby/gem.mk"
.include "../../databases/sqlite/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

4
databases/ruby-sqlite/distinfo
View File

@ -1,6 +1,6 @@
$NetBSD: distinfo,v 1.5 2021/10/26 10:10:04 nia Exp $
$NetBSD: distinfo,v 1.6 2023/01/30 13:40:06 taca Exp $
BLAKE2s (sqlite-ruby-2.2.3.gem) = 8bbdb432da51c2c4e95101a8da4c7fcd9836562e2f9816b62e83f6b1737494d2
SHA512 (sqlite-ruby-2.2.3.gem) = 2cf1a5d6c74b910e75b29f4ce8599c690ed492ffe457f029f58b76b9fe85a0a667322bfe743a7aa06c28ce12b001cf662282b3fc31d82c59613cef5378db99bf
Size (sqlite-ruby-2.2.3.gem) = 41472 bytes
SHA1 (patch-aa) = 09f1daf1a514ff3fa06994d31a0f1fab6a7a8bf3
SHA1 (patch-aa) = 968aa3bea2c1d4bf6d4d7ad4c53e484590c73336

43
databases/ruby-sqlite/patches/patch-aa
View File

@ -1,6 +1,9 @@
$NetBSD: patch-aa,v 1.1 2010/09/10 04:52:59 taca Exp $
$NetBSD: patch-aa,v 1.2 2023/01/30 13:40:06 taca Exp $
--- ext/sqlite-api.c.orig 2010-08-27 23:55:51.000000000 +0000
* Use Modern Ruby API.
* Avoid use of rb_cData for Ruby 3.2.
--- ext/sqlite-api.c.orig 2023-01-30 13:22:14.778692763 +0000
+++ ext/sqlite-api.c
@@ -270,7 +270,7 @@ static_api_open( VALUE module, VALUE fil
Check_Type( file_name, T_STRING );
@ -11,6 +14,15 @@ $NetBSD: patch-aa,v 1.1 2010/09/10 04:52:59 taca Exp $
i_mode = FIX2INT( mode );
db = sqlite_open( s_file_name, i_mode, &errmsg );
@@ -280,7 +280,7 @@ static_api_open( VALUE module, VALUE fil
/* "raise" does not return */
}
- return Data_Wrap_Struct( rb_cData, NULL, sqlite_close, db );
+ return Data_Wrap_Struct( rb_cObject, NULL, sqlite_close, db );
}
/**
@@ -329,7 +329,7 @@ static_api_compile( VALUE module, VALUE
Check_Type( sql, T_STRING );
@ -20,6 +32,15 @@ $NetBSD: patch-aa,v 1.1 2010/09/10 04:52:59 taca Exp $
&sql_tail,
&vm,
&errmsg );
@@ -341,7 +341,7 @@ static_api_compile( VALUE module, VALUE
}
tuple = rb_ary_new();
- rb_ary_push( tuple, Data_Wrap_Struct( rb_cData, NULL, static_free_vm, vm ) );
+ rb_ary_push( tuple, Data_Wrap_Struct( rb_cObject, NULL, static_free_vm, vm ) );
rb_ary_push( tuple, rb_str_new2( sql_tail ) );
return tuple;
@@ -545,7 +545,7 @@ static VALUE
static_api_complete( VALUE module, VALUE sql )
{
@ -60,3 +81,21 @@ $NetBSD: patch-aa,v 1.1 2010/09/10 04:52:59 taca Exp $
}
static void
@@ -1241,7 +1241,7 @@ static_function_callback( sqlite_func *f
proc = rb_ary_entry( proc, 0 );
args = rb_ary_new2( argc + 1 );
- rb_ary_push( args, Data_Wrap_Struct( rb_cData, NULL, NULL, func ) );
+ rb_ary_push( args, Data_Wrap_Struct( rb_cObject, NULL, NULL, func ) );
for( index = 0; index < argc; index++ )
{
@@ -1273,7 +1273,7 @@ static_aggregate_finalize_callback( sqli
int exception = 0;
proc = rb_ary_entry( (VALUE)sqlite_user_data( func ), 1 );
- args = rb_ary_new3( 1, Data_Wrap_Struct( rb_cData, NULL, NULL, func ) );
+ args = rb_ary_new3( 1, Data_Wrap_Struct( rb_cObject, NULL, NULL, func ) );
protect_args = rb_ary_new3( 2, proc, args );