Bas Couwenberg pushed to branch master at Debian GIS Project / grass


Commits:
12a592b0 by Bas Couwenberg at 2024-07-27T09:57:18+02:00
Add upstream patch to fix FTBFS with GCC 14. (closes: #1075041)

- - - - -
e722b5ef by Bas Couwenberg at 2024-07-27T09:57:19+02:00
Set distribution to unstable.

- - - - -


3 changed files:

- debian/changelog
- + debian/patches/pr3325-mysql-driver.patch
- debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,10 @@
+grass (8.3.2-3) unstable; urgency=medium
+
+  * Add upstream patch to fix FTBFS with GCC 14.
+    (closes: #1075041)
+
+ -- Bas Couwenberg <[email protected]>  Sat, 27 Jul 2024 09:16:02 +0200
+
 grass (8.3.2-2) unstable; urgency=medium
 
   * Drop python3-distutils dependency.


=====================================
debian/patches/pr3325-mysql-driver.patch
=====================================
@@ -0,0 +1,22 @@
+Description: use integer port argument with mysql_real_connect in mysql driver
+ The port argument is not a string, but a plain integer.  In the past,
+ compilers ignore such type errors and produced a warning only, but
+ this is changing, so this change also addresses a potential build
+ failure.
+Author: Florian Weimer <[email protected]>
+Bug: https://github.com/OSGeo/grass/pull/3325
+
+--- a/db/drivers/mysql/db.c
++++ b/db/drivers/mysql/db.c
+@@ -53,8 +53,9 @@ int db__driver_open_database(dbHandle *h
+         db_get_login2("mysql", name, &user, &password, &host, &port);
+ 
+         connection = mysql_init(NULL);
+-        res = mysql_real_connect(connection, host, user, password,
+-                                 connpar.dbname, port, NULL, 0);
++        res =
++            mysql_real_connect(connection, host, user, password, 
connpar.dbname,
++                               port != NULL ? atoi(port) : 0, NULL, 0);
+ 
+         if (res == NULL) {
+             db_d_append_error("%s\n%s", _("Connection failed."),


=====================================
debian/patches/series
=====================================
@@ -2,3 +2,4 @@ pager
 instdir
 no-fail-html.patch
 jquery.patch
+pr3325-mysql-driver.patch



View it on GitLab: 
https://salsa.debian.org/debian-gis-team/grass/-/compare/5fc7e376381c0580fc6d531b8c2f0bd37be1be7b...e722b5ef024dca7668f95431da4b62166f59f296

-- 
This project does not include diff previews in email notifications.
View it on GitLab: 
https://salsa.debian.org/debian-gis-team/grass/-/compare/5fc7e376381c0580fc6d531b8c2f0bd37be1be7b...e722b5ef024dca7668f95431da4b62166f59f296
You're receiving this email because of your account on salsa.debian.org.


_______________________________________________
Pkg-grass-devel mailing list
[email protected]
https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to