grass: drop clang integer patch

Problem is fixed in
https://github.com/OSGeo/grass/pull/3325

Closes #340475
This commit is contained in:
Ivan Mincik 2024-09-18 15:16:42 +02:00
parent f0d832e36f
commit 160e8ad614
2 changed files with 0 additions and 26 deletions

View File

@ -1,21 +0,0 @@
diff -ur a/db/drivers/mysql/db.c b/db/drivers/mysql/db.c
--- a/db/drivers/mysql/db.c 1969-12-31 19:00:01.000000000 -0500
+++ b/db/drivers/mysql/db.c 2023-11-09 23:26:25.329700495 -0500
@@ -52,9 +52,16 @@
db_get_login2("mysql", name, &user, &password, &host, &port);
+ const char* errstr;
+ unsigned int port_number = (unsigned int)strtonum(port, 0, 65536, &errstr);
+ if (errstr != NULL) {
+ db_d_append_error("%s", errstr);
+ return DB_FAILED;
+ }
+
connection = mysql_init(NULL);
res = mysql_real_connect(connection, host, user, password,
- connpar.dbname, port, NULL, 0);
+ connpar.dbname, port_number, NULL, 0);
if (res == NULL) {
db_d_append_error("%s\n%s", _("Connection failed."),

View File

@ -90,11 +90,6 @@ stdenv.mkDerivation (finalAttrs: {
strictDeps = true;
patches = lib.optionals stdenv.isDarwin [
# Fix conversion of const char* to unsigned int.
./clang-integer-conversion.patch
];
configureFlags = [
"--with-blas"
"--with-cairo-ldflags=-lfontconfig"