gentoo resync : 25.09.2021

3 files changed, 141 insertions, 1 deletions

diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index b831f7ded72a..0eb2b5484461 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,5 +1,6 @@
 AUX libgda-4.99.1-control-center-icon-collision.patch 2266 BLAKE2B 4005c1a3d7b71f9a264321941be67bad1c339cf90fe47d749eeb88ebe0a2ef1abf20e3b6d856a0289b359a66b7f9f140d1bbf61eb83d279407270e1ff70c2b46 SHA512 ebe5db64f552b5623598d9545d09af138a80578eec99e83962a958b5bc44c1c7ae1746f71302f5f56fee0112a2bd64a0372d32bbda7ace0d9c7a648dcefd51e5
 AUX libgda-4.99.1-gda-browser-doc-collision.patch 914 BLAKE2B a8dc2b9359aaf3f74939dda29cd4157c20a50b724a7648c517d4fccd1a0d696f1eb5cebc6199a775e96d2687542e5a815bb63f01684d9c68497279b7f45adc08 SHA512 578a08e1b7adb59706f28f811efe2f7b68d2b406f49bd605253a14f3b415df945a3948dd2994013429b0e31768fb7a7f382321568babe0bca0bb34ba5aa16353
+AUX libgda-5.2-my_bool-error.patch 5804 BLAKE2B 85068c8d3164bb9fd6d5c26bd144cc389f3e7df28c56163dd3294fed2a1e709674031e0bb903aa8f111010d6682c7aef26692b1e16821f2a9002106eb8a250db SHA512 33a734e4f21364d4657db1347022129eef48b9b7cebd3743445963c74fb2d1b1043927c52a2e165db966df595a1b69dfcc8d9f3b2cddf328291bc7976273ecef
 DIST libgda-5.2.9.tar.xz 12619160 BLAKE2B b82c304f6054a1de24b72e688fc03a7a9b416f14f47c95087c4901b7bce0ea5c642667feb14f1701bc62403359c752f3f5b121a697316340829af64b83fb7980 SHA512 a28324533298d42aacfce5d9f3d699314ddb5d5fe7e492433dbbe4232fb310b798d312ac08dffd4f4ebef5ceea3c6c49ef3c679ab97b5e9d1f64e3fed50b2231
-EBUILD libgda-5.2.9.ebuild 4491 BLAKE2B 7f839b0338fb7f54389028a7843283981771a299a3e7ba42f6febb27822eab833ef7f8c20d99c63245d7ea5512f8a0628172f2e0cb517e839b6a73f3d8b68d41 SHA512 bc3e067c7bb6d8cd7ee5942a290a25df67e23c0d086219a3b7a26f000b319ae700df3722410a802373e40db8ad810be257ad25ab5e0d2ada832a458d725217da
+EBUILD libgda-5.2.9.ebuild 4574 BLAKE2B 3a5acb619176e5f3f860031544f8fa3a172710e1fd0603d1772688af0d534584c977671fc10a399c4db0e6dfaa497c9511f7b271267bbc87c98b626faf658b6e SHA512 1df58c3335f2b3bd67c23ab7e83d5a6d871153dc468d93ce1a46c2e8c0d03b74c37c795b2e569f530f41a698abaa2463bd0095007d1d938271102217e76306b2
 MISC metadata.xml 683 BLAKE2B f0a94d1eecbd3715d628dce3f5411f13bc70204beac9204c41a2e0cb68333b391b008b047d97be4a8a5458d318d992766029886d78e21b1e014845f0ee448d5d SHA512 09479faba765f287c36e5eda88c491c7b144260936dddd3fe526cde175f67ed9c3db223d2328eeac150e7648889ef9476f5608a78b3670033a8c284c4ffcae01
diff --git a/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch b/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch
new file mode 100644
index 000000000000..9e696ef1c4d9
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-5.2-my_bool-error.patch
@@ -0,0 +1,136 @@
+https://bugs.gentoo.org/692672
+
+--- a/providers/mysql/gda-mysql-provider.c
++++ b/providers/mysql/gda-mysql-provider.c
+@@ -1835,7 +1835,7 @@ real_prepare (GdaServerProvider *provider, GdaConnection *cnc, GdaStatement *stm
+ 		return FALSE;
+ 	}
+ 
+-	my_bool update_max_length = 1;
++	_Bool update_max_length = 1;
+ 	if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) {
+ 		_gda_mysql_make_error (cnc, NULL, mysql_stmt, error);
+ 		mysql_stmt_close (mysql_stmt);
+@@ -1941,7 +1941,7 @@ prepare_stmt_simple (MysqlConnectionData  *cdata,
+ 		return FALSE;
+ 	}
+ 
+-	my_bool update_max_length = 1;
++	_Bool update_max_length = 1;
+ 	if (mysql_stmt_attr_set (mysql_stmt, STMT_ATTR_UPDATE_MAX_LENGTH, (const void *) &update_max_length)) {
+ 		_gda_mysql_make_error (cdata->cnc, NULL, mysql_stmt, error);
+ 		mysql_stmt_close (mysql_stmt);
+@@ -2327,7 +2327,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			if (allow_noparam) {
+                                 /* bind param to NULL */
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+                                 empty_rs = TRUE;
+                                 continue;
+ 			}
+@@ -2347,7 +2347,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			if (allow_noparam) {
+                                 /* bind param to NULL */
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+                                 empty_rs = TRUE;
+                                 continue;
+ 			}
+@@ -2399,7 +2399,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			GdaStatement *rstmt;
+ 			if (! gda_rewrite_statement_for_null_parameters (stmt, params, &rstmt, error)) {
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+ 			}
+ 			else if (!rstmt)
+ 				return NULL;
+@@ -2459,7 +2459,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			ts = (GdaTimestamp*) gda_value_get_timestamp (value);
+ 			if (!ts) {
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+ 			}
+ 			else {
+ 				gboolean tofree = FALSE;
+@@ -2495,7 +2495,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			ts = (GdaTime*) gda_value_get_time (value);
+ 			if (!ts) {
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+ 			}
+ 			else {
+ 				gboolean tofree = FALSE;
+@@ -2528,7 +2528,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			ts = (GDate*) g_value_get_boxed (value);
+ 			if (!ts) {
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+ 			}
+ 			else {
+ 				MYSQL_TIME *mtime;
+@@ -2548,7 +2548,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			str = g_value_get_string (value);
+ 			if (!str) {
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+ 			}
+ 			else {
+ 				mysql_bind_param[i].buffer_type= MYSQL_TYPE_STRING;
+@@ -2624,7 +2624,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			bin = ((GdaBinary*) blob);
+ 			if (!bin) {
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+ 			}
+ 			else {
+ 				gchar *str = NULL;
+@@ -2665,7 +2665,7 @@ gda_mysql_provider_statement_execute (GdaServerProvider               *provider,
+ 			bin = gda_value_get_binary (value);
+ 			if (!bin) {
+ 				mysql_bind_param[i].buffer_type = MYSQL_TYPE_NULL;
+-				mysql_bind_param[i].is_null = (my_bool*)1;
++				mysql_bind_param[i].is_null = (_Bool *) 1;
+ 			}
+ 			else {
+ 				mysql_bind_param[i].buffer_type= MYSQL_TYPE_BLOB;
+--- a/providers/mysql/gda-mysql-recordset.c
++++ b/providers/mysql/gda-mysql-recordset.c
+@@ -627,7 +627,7 @@ gda_mysql_recordset_new (GdaConnection            *cnc,
+ 		/* binding results with types */
+ 		mysql_bind_result[i].buffer_type = field->type;
+ 		mysql_bind_result[i].is_unsigned = field->flags & UNSIGNED_FLAG ? TRUE : FALSE;
+-		mysql_bind_result[i].is_null = g_malloc0 (sizeof (my_bool));
++		mysql_bind_result[i].is_null = g_malloc0 (sizeof (_Bool));
+ 		
+ 		switch (mysql_bind_result[i].buffer_type) {
+ 		case MYSQL_TYPE_TINY:
+@@ -753,7 +753,7 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, G_GNUC_UNUSED gint rownum, G
+ 
+ 		gint col;
+ 		for (col = 0; col < ((GdaDataSelect *) imodel)->prep_stmt->ncols; ++col) {
+-			my_bool truncated;
++			_Bool truncated;
+ 			mysql_bind_result[col].error = &truncated;
+ 			mysql_stmt_fetch_column (imodel->priv->mysql_stmt, &(mysql_bind_result[col]),
+ 						 (unsigned int)col, 0);
+@@ -784,10 +784,10 @@ new_row_from_mysql_stmt (GdaMysqlRecordset *imodel, G_GNUC_UNUSED gint rownum, G
+ 		
+ 		/*g_print ("%s: #%d : TYPE=%d, GTYPE=%s\n", __func__, i, mysql_bind_result[i].buffer_type, g_type_name (type));*/
+ 
+-		my_bool is_null = FALSE;
++		_Bool is_null = FALSE;
+ 		unsigned long length;
+ 		
+-		memmove (&is_null, mysql_bind_result[i].is_null, sizeof (my_bool));
++		memmove (&is_null, mysql_bind_result[i].is_null, sizeof (_Bool));
+ 		if (is_null) {
+ 			gda_value_set_null (value);
+ 			continue;
diff --git a/gnome-extra/libgda/libgda-5.2.9.ebuild b/gnome-extra/libgda/libgda-5.2.9.ebuild
index ac392e8d05d6..135738d0063e 100644
--- a/gnome-extra/libgda/libgda-5.2.9.ebuild
+++ b/gnome-extra/libgda/libgda-5.2.9.ebuild
@@ -84,6 +84,9 @@ src_prepare() {
 		-e '/SUBDIRS =/ s/trml2pdf//' \
 		-i libgda-report/RML/Makefile.{am,in} || die
 
+	# replace my_bool with _Bool
+	eapply "${FILESDIR}/${PN}-5.2-my_bool-error.patch"
+
 	# Prevent file collisions with libgda:4
 	eapply "${FILESDIR}/${PN}-4.99.1-gda-browser-doc-collision.patch"
 	eapply "${FILESDIR}/${PN}-4.99.1-control-center-icon-collision.patch"