CVS commit: pkgsrc/databases/ruby-mysql28

["Takahiro Kambe" <taca%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   taca
Date:           Sun Feb 14 14:55:42 UTC 2021

Modified Files:
        pkgsrc/databases/ruby-mysql28: distinfo
        pkgsrc/databases/ruby-mysql28/patches: patch-mysql.c

Log Message:
databases/ruby-mysql28: fix build with Ruby 3.0


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/databases/ruby-mysql28/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/databases/ruby-mysql28/patches/patch-mysql.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/ruby-mysql28/distinfo
diff -u pkgsrc/databases/ruby-mysql28/distinfo:1.2 pkgsrc/databases/ruby-mysql28/distinfo:1.3
--- pkgsrc/databases/ruby-mysql28/distinfo:1.2  Fri Oct 13 16:07:51 2017
+++ pkgsrc/databases/ruby-mysql28/distinfo      Sun Feb 14 14:55:42 2021
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2017/10/13 16:07:51 taca Exp $
+$NetBSD: distinfo,v 1.3 2021/02/14 14:55:42 taca Exp $
 
 SHA1 (mysql-ruby-2.8.2.tar.gz) = c20ec0f41f19f11270963d9c9e0d5a2bba27801e
 RMD160 (mysql-ruby-2.8.2.tar.gz) = 0cd9a6071f0878a5ab4b47d9a023066f5ae39955
 SHA512 (mysql-ruby-2.8.2.tar.gz) = f39bba5679031bab2d78bc5cb44bb00e7818c1f94e20af374e7b843ced85981e82f185f7442962728165abf9afa9f4d384e3ff6ca22c32320cf4bfa3af84c0e6
 Size (mysql-ruby-2.8.2.tar.gz) = 32710 bytes
 SHA1 (patch-extconf.rb) = 339b618a3057a3868448f971932b9231fd059404
-SHA1 (patch-mysql.c) = 5072b514a748845a279539b5b526c66ae052b1ca
+SHA1 (patch-mysql.c) = 33283b67e5beae587577a45a5cc4466962ded6c2

Index: pkgsrc/databases/ruby-mysql28/patches/patch-mysql.c
diff -u pkgsrc/databases/ruby-mysql28/patches/patch-mysql.c:1.1 pkgsrc/databases/ruby-mysql28/patches/patch-mysql.c:1.2
--- pkgsrc/databases/ruby-mysql28/patches/patch-mysql.c:1.1     Fri Oct 13 16:07:51 2017
+++ pkgsrc/databases/ruby-mysql28/patches/patch-mysql.c Sun Feb 14 14:55:42 2021
@@ -1,9 +1,24 @@
-$NetBSD: patch-mysql.c,v 1.1 2017/10/13 16:07:51 taca Exp $
+$NetBSD: patch-mysql.c,v 1.2 2021/02/14 14:55:42 taca Exp $
 
-* Fix build with ruby24.
+* Fix build with ruby24 and ruby30.
 
 --- mysql.c.orig       2010-02-11 10:42:54.000000000 +0000
 +++ mysql.c
+@@ -875,12 +875,12 @@ static VALUE stmt_init(VALUE obj)
+     MYSQL *m = GetHandler(obj);
+     MYSQL_STMT *s;
+     struct mysql_stmt* stmt;
+-    my_bool true = 1;
++    my_bool my_true = 1;
+     VALUE st_obj;
+ 
+     if ((s = mysql_stmt_init(m)) == NULL)
+       mysql_raise(m);
+-    if (mysql_stmt_attr_set(s, STMT_ATTR_UPDATE_MAX_LENGTH, &true))
++    if (mysql_stmt_attr_set(s, STMT_ATTR_UPDATE_MAX_LENGTH, &my_true))
+       rb_raise(rb_eArgError, "mysql_stmt_attr_set() failed");
+     st_obj = Data_Make_Struct(cMysqlStmt, struct mysql_stmt, 0, free_mysqlstmt, stmt);
+     memset(stmt, 0, sizeof(*stmt));
 @@ -1317,7 +1317,11 @@ static VALUE stmt_bind_result(int argc, 
        }
        else if (argv[i] == rb_cString)