gcc 3.4 fixes for bug #49234.

4 files changed, 192 insertions, 11 deletions

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 56088960b538..7cb5fdca641f 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.45 2004/06/03 23:11:13 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.46 2004/06/13 07:02:08 eradicator Exp $
+
+  12 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/libgda-1.0.3-gcc3.4.patch:
+  gcc 3.4 fixes for bug #49234.
 
   03 Jun 2004; Aron Griffis <agriffis@gentoo.org> libgda-0.2.95-r1.ebuild,
   libgda-0.2.96-r2.ebuild:
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 83f95da97605..c8803fbc4a8f 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,19 +1,20 @@
-MD5 b7989597424f1f051a2f26b3bf49eec8 libgda-0.2.96-r2.ebuild 3461
-MD5 f7d9b0f24663789c4edb09e9d51790eb libgda-1.0.3.ebuild 2691
+MD5 6b0293ee3ad1b26a83f460368b2738f4 ChangeLog 7289
 MD5 68cd5cbd778ea42cdbf67c5ed964dfd6 libgda-0.12.1.ebuild 2582
+MD5 be07991f6c6da12c5e507f84bdf5c6a5 libgda-0.2.95-r1.ebuild 3253
+MD5 b7989597424f1f051a2f26b3bf49eec8 libgda-0.2.96-r2.ebuild 3461
 MD5 93b36a10d4318ea17b298ca7434223a9 libgda-1.0.0.ebuild 2550
+MD5 3d9d43f000cfba1f530fdf76f9bf38b4 libgda-1.0.1.ebuild 2570
 MD5 127f0c60bd7c215dfb3118c8f85f112a libgda-1.0.2.ebuild 2625
-MD5 be07991f6c6da12c5e507f84bdf5c6a5 libgda-0.2.95-r1.ebuild 3253
-MD5 d6f72907b54e70da6dfba45073860796 ChangeLog 7161
+MD5 f6be12aced4b0a916f00f97ed817dfb3 libgda-1.0.3.ebuild 2776
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
-MD5 3d9d43f000cfba1f530fdf76f9bf38b4 libgda-1.0.1.ebuild 2570
+MD5 b8ef30c01c11ee3f373d99d6173d71a9 files/digest-libgda-0.12.1 66
+MD5 40bbf8acf6e08a15e8e61573f6f07724 files/digest-libgda-0.2.95-r1 66
+MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
 MD5 3ca3af1e56c86303037c0792d9c90d3d files/digest-libgda-1.0.0 66
 MD5 49ea693a813a629d57b5fe1ac8001ff6 files/digest-libgda-1.0.1 66
 MD5 46b8c0b40219635d47ca4583d42dc814 files/digest-libgda-1.0.2 66
 MD5 907142ea1e11bcf5b01f25dfa2fd2b54 files/digest-libgda-1.0.3 66
+MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
 MD5 adf80d651f1d75c9745c44264f58708e files/libgda-1.0.2-gcc2_fix.patch 641
 MD5 a3ad0589779cdb39f897e554dd9862fb files/libgda-1.0.3-gtkdoc_fixes.patch 15598
-MD5 40bbf8acf6e08a15e8e61573f6f07724 files/digest-libgda-0.2.95-r1 66
-MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
-MD5 b8ef30c01c11ee3f373d99d6173d71a9 files/digest-libgda-0.12.1 66
-MD5 b25e6e812f6a42246239fb79f338c09e files/libgda-0.2.96-gentoo.patch 3345
+MD5 f2110a1cc61b61b9f52a346427e19874 files/libgda-1.0.3-gcc3.4.patch 4236
diff --git a/gnome-extra/libgda/files/libgda-1.0.3-gcc3.4.patch b/gnome-extra/libgda/files/libgda-1.0.3-gcc3.4.patch
new file mode 100644
index 000000000000..df07f34bb07f
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-1.0.3-gcc3.4.patch
@@ -0,0 +1,173 @@
+--- libgda/gda-util.c.old	2004-04-29 02:19:25.721878904 +0100
++++ libgda/gda-util.c	2004-04-29 02:19:47.399583392 +0100
+@@ -60,7 +60,7 @@
+ 	case GDA_VALUE_TYPE_TIME : return "time";
+ 	case GDA_VALUE_TYPE_TIMESTAMP : return "timestamp";
+ 	case GDA_VALUE_TYPE_TINYINT : return "tinyint";
+-	default:
++	default:;
+ 	}
+ 
+ 	return "string";
+--- libgda/gda-value.c.old	2004-04-29 02:19:25.724878448 +0100
++++ libgda/gda-value.c	2004-04-29 02:20:24.490944648 +0100
+@@ -2072,7 +2072,7 @@
+ 	case GDA_VALUE_TYPE_TYPE :
+ 		retval = g_strdup (gda_type_to_string (value->value.v_type));
+ 		break;
+-	default:
++	default:;
+ 		retval = g_strdup ("");
+ 	}
+         	
+@@ -2222,7 +2222,7 @@
+ 		else
+ 			retval = g_strdup ("false");
+ 		break;
+-	default:
++	default:;
+ 		retval = gda_value_stringify (value);
+ 	}
+         	
+--- libsql/lexer.c.old	2004-04-29 02:19:25.726878144 +0100
++++ libsql/lexer.c	2004-04-29 02:20:41.545351984 +0100
+@@ -1165,7 +1165,7 @@
+ 		break;
+ 		}
+ 
+-	default:
++	default:;
+ 		YY_FATAL_ERROR(
+ 			"fatal flex scanner internal error--no action found" );
+ 	} /* end of action switch */
+--- providers/ldap/gda-ldap-provider.c.old	2004-04-29 02:50:51.237237000 +0100
++++ providers/ldap/gda-ldap-provider.c	2004-04-29 02:32:49.725651752 +0100
+@@ -275,7 +275,7 @@
+ 	switch (feature) {
+ 	case GDA_CONNECTION_FEATURE_SQL :
+ 		return TRUE;
+-	default :
++	default :;
+ 	}
+ 
+ 	return FALSE;
+@@ -466,7 +466,7 @@
+ 		return get_ldap_tables (cnc, params);
+ 	case GDA_CONNECTION_SCHEMA_TYPES :
+ 		return get_ldap_types (cnc, params);
+-	default :
++	default :;
+ 	}
+ 
+ 	return NULL;
+--- providers/mdb/gda-mdb-provider.c.old	2004-04-29 02:50:51.244235936 +0100
++++ providers/mdb/gda-mdb-provider.c	2004-04-29 02:31:22.540905848 +0100
+@@ -389,7 +389,7 @@
+ 			g_strfreev (arr);
+ 		}
+ 		break;
+-	default :
++	default :;
+ 	}
+ 
+ 	return reclist;
+@@ -438,7 +438,7 @@
+ 	case GDA_CONNECTION_FEATURE_PROCEDURES :
+ 	case GDA_CONNECTION_FEATURE_SQL :
+ 		return TRUE;
+-	default :
++	default :;
+ 	}
+ 
+ 	return FALSE;
+--- providers/mysql/gda-mysql-provider.c.old	2004-04-29 02:19:25.779870088 +0100
++++ providers/mysql/gda-mysql-provider.c	2004-04-29 02:34:15.204656968 +0100
+@@ -510,7 +510,7 @@
+ 
+ 		g_free (str);
+ 		break;
+-	default:
++	default:;
+ 	}
+ 
+ 	return reclist;
+@@ -655,7 +655,7 @@
+ 	case GDA_CONNECTION_FEATURE_SQL :
+ 	case GDA_CONNECTION_FEATURE_TRANSACTIONS :
+ 		return TRUE;
+-	default :
++	default :;
+ 	}
+ 
+ 	return FALSE;
+@@ -1187,7 +1187,7 @@
+ 		return get_mysql_tables (cnc, params);
+ 	case GDA_CONNECTION_SCHEMA_TYPES :
+ 		return get_mysql_types (cnc, params);
+-	default :
++	default :;
+ 	}
+ 
+ 	return NULL;
+--- providers/oracle/gda-oracle-provider.c.old	2004-04-29 02:19:25.793867960 +0100
++++ providers/oracle/gda-oracle-provider.c	2004-04-29 02:35:03.048383616 +0100
+@@ -825,7 +825,7 @@
+ 		reclist = process_sql_commands (reclist, cnc, str, NULL, options);
+ 		g_free (str);
+ 		break;
+-	default:
++	default:;
+ 	}
+ 	/* don't know what to do here yet. */
+ 	return reclist;
+@@ -1044,7 +1044,7 @@
+ 	case GDA_CONNECTION_FEATURE_USERS :
+ 	case GDA_CONNECTION_FEATURE_VIEWS :
+ 		return TRUE;
+-	default :
++	default :;
+ 	}
+ 
+ 	return FALSE;
+--- providers/oracle/utils.c.old	2004-04-29 02:19:25.791868264 +0100
++++ providers/oracle/utils.c	2004-04-29 02:27:26.541783168 +0100
+@@ -110,7 +110,7 @@
+ 			break;
+ 		case OCI_HTYPE_ENV:
+ 			gda_connection_add_error (cnc, gda_oracle_make_error (priv_data->henv, type, file, line));
+-		default:
++		default:;
+ 		}
+ 		break;
+ 	default:
+--- providers/sqlite/gda-sqlite-provider.c.old	2004-04-29 02:19:25.795867656 +0100
++++ providers/sqlite/gda-sqlite-provider.c	2004-04-29 02:28:07.584543720 +0100
+@@ -586,7 +586,7 @@
+ 	case GDA_CONNECTION_FEATURE_TRIGGERS :
+ 	case GDA_CONNECTION_FEATURE_VIEWS :
+ 		return TRUE;
+-	default:
++	default:;
+ 	}
+ 
+ 	return FALSE;
+@@ -772,7 +772,7 @@
+ 		return get_tables (cnc);
+ 	case GDA_CONNECTION_SCHEMA_TYPES :
+ 		return get_types ();
+-	default:
++	default:;
+ 	}
+ 
+ 	return NULL;
+--- providers/xml/gda-xml-provider.c.old	2004-04-29 02:19:25.735876776 +0100
++++ providers/xml/gda-xml-provider.c	2004-04-29 02:31:47.992036688 +0100
+@@ -681,7 +681,7 @@
+ 		return get_tables (cnc, xmldb);
+ 	case GDA_CONNECTION_SCHEMA_TYPES :
+ 		return get_types (cnc);
+-	default :
++	default :;
+ 	}
+ 
+ 	return NULL;
diff --git a/gnome-extra/libgda/libgda-1.0.3.ebuild b/gnome-extra/libgda/libgda-1.0.3.ebuild
index d1bd4f162bea..422785f278b2 100644
--- a/gnome-extra/libgda/libgda-1.0.3.ebuild
+++ b/gnome-extra/libgda/libgda-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.3.ebuild,v 1.5 2004/04/27 21:17:34 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.3.ebuild,v 1.6 2004/06/13 07:02:08 eradicator Exp $
 
 inherit gnome2 eutils
 
@@ -45,6 +45,9 @@ src_unpack() {
 	cd ${S}
 	# Fix libgda's manual source. See bug #46337.
 	epatch ${FILESDIR}/${P}-gtkdoc_fixes.patch
+
+	# Fix gcc 3.4 compilation.  See bug #49234
+	epatch ${FILESDIR}/${P}-gcc3.4.patch
 }
 
 src_compile() {