aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDirk Meyer <dinoex@FreeBSD.org>2023-03-11 18:43:50 +0000
committerDirk Meyer <dinoex@FreeBSD.org>2023-03-11 18:43:50 +0000
commit4cb2610f45243a8454e6e940f218c82f8bdd1b21 (patch)
treee3976e52a6830b562ec6fb7db4405e6ce91078ee
parentc0db0e28c144c63af216a8d8f3bd741e62832994 (diff)
downloadports-4cb2610f45243a8454e6e940f218c82f8bdd1b21.tar.gz
ports-4cb2610f45243a8454e6e940f218c82f8bdd1b21.zip
databases/rubygem-mysql: fix runtime error with mariadb 10.4 and above
-rw-r--r--databases/rubygem-mysql/Makefile1
-rw-r--r--databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c18
2 files changed, 18 insertions, 1 deletions
diff --git a/databases/rubygem-mysql/Makefile b/databases/rubygem-mysql/Makefile
index 28d99ce0528f..d0a20eb92c53 100644
--- a/databases/rubygem-mysql/Makefile
+++ b/databases/rubygem-mysql/Makefile
@@ -1,5 +1,6 @@
PORTNAME= mysql
PORTVERSION= 2.9.1
+PORTREVISION= 1
CATEGORIES= databases rubygems
MASTER_SITES= RG
diff --git a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c
index b7f8cf385303..ce59e04255ac 100644
--- a/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c
+++ b/databases/rubygem-mysql/files/patch-ext-mysql_api-mysql.c
@@ -1,4 +1,4 @@
---- ext/mysql_api/mysql.c.orig 2022-03-10 04:04:50 UTC
+--- ext/mysql_api/mysql.c.orig 2023-03-11 18:29:50 UTC
+++ ext/mysql_api/mysql.c
@@ -273,7 +273,10 @@ static VALUE real_connect(int argc, VALUE* argv, VALUE
rb_thread_start_timer();
@@ -68,3 +68,19 @@
s->result.bind[i].buffer_type = MYSQL_TYPE_LONGLONG;
else if (argv[i] == rb_cFloat)
s->result.bind[i].buffer_type = MYSQL_TYPE_DOUBLE;
+@@ -1884,6 +1898,7 @@ static VALUE error_sqlstate(VALUE obj)
+
+ void Init_mysql_api(void)
+ {
++#if 0
+ int i;
+ int dots = 0;
+ const char *lib = mysql_get_client_info();
+@@ -1898,6 +1913,7 @@ void Init_mysql_api(void)
+ return;
+ }
+ }
++#endif
+
+ cMysql = rb_define_class("Mysql", rb_cObject);
+ cMysqlRes = rb_define_class_under(cMysql, "Result", rb_cObject);