Update to 1.3.3.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4033 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 53 insertions, 114 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index 94100397f..49e7ac69d 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgda2
-PORTVERSION=	1.3.2
+PORTVERSION=	1.3.3
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/${PORTVERSION:R}
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index 071fd1366..eeedd48de 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgda-1.3.2.tar.bz2) = acdbd0a24faacd9f5ba5f10fa3084ab1
-SIZE (gnome2/libgda-1.3.2.tar.bz2) = 1633224
+MD5 (gnome2/libgda-1.3.3.tar.bz2) = 07ee81e14cf7aa0f85a83c2a66150b85
+SIZE (gnome2/libgda-1.3.3.tar.bz2) = 1311363
diff --git a/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
new file mode 100644
index 000000000..3f0d58148
--- /dev/null
+++ b/databases/libgda2/files/patch-providers_mysql_gda-mysql-recordset.c
@@ -0,0 +1,32 @@
+--- providers/mysql/gda-mysql-recordset.c.orig	Tue Jun  7 16:23:21 2005
++++ providers/mysql/gda-mysql-recordset.c	Tue Jun  7 16:24:00 2005
+@@ -615,6 +615,7 @@ gda_mysql_recordset_remove_row (GdaDataM
+ 	     colnum != gda_data_model_get_n_columns (GDA_DATA_MODEL(model));
+ 	     colnum++)
+ 	{
++		gchar *curval;
+ 		attrs = gda_data_model_describe_column (GDA_DATA_MODEL(model), colnum);
+ 
+ 		mysql_field = mysql_fetch_field_direct (priv_data->mysql_res, colnum);
+@@ -623,7 +624,7 @@ gda_mysql_recordset_remove_row (GdaDataM
+ 		else
+ 			column_name = gda_data_model_get_column_title (GDA_DATA_MODEL (model), colnum);
+ 
+-		gchar *curval = gda_mysql_provider_value_to_sql_string (
++		curval = gda_mysql_provider_value_to_sql_string (
+ 				NULL, 	 
+ 				priv_data->cnc, 	 
+ 				gda_row_get_value ((GdaRow *) row, colnum) 	 
+@@ -900,11 +901,11 @@ gda_mysql_recordset_new (GdaConnection *
+ 		gda_data_model_array_set_n_columns (GDA_DATA_MODEL_ARRAY (model),
+ 					    model->priv->ncolumns);
+ 		for (i = 0; i < model->priv->ncolumns; i++) {
++			gboolean multi_table = FALSE;
+ 			gda_data_model_set_column_title (GDA_DATA_MODEL (model),
+ 							 i, mysql_fields[i].name);
+ 
+ 			/* determine table name */
+-			gboolean multi_table = FALSE;
+ 			if (strcmp(mysql_fields[i].table, mysql_fields[0].table) != 0)
+ 				multi_table = TRUE;
+ 
diff --git a/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c b/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c
new file mode 100644
index 000000000..f226df162
--- /dev/null
+++ b/databases/libgda2/files/patch-providers_sqlite_gda-sqlite-provider.c
@@ -0,0 +1,12 @@
+--- providers/sqlite/gda-sqlite-provider.c.orig	Tue Jun  7 16:22:30 2005
++++ providers/sqlite/gda-sqlite-provider.c	Tue Jun  7 16:21:28 2005
+@@ -1087,8 +1087,8 @@ get_types (GdaConnection *cnc, GdaParame
+ 					Column *column = &(table->aCol[j]);
+ 					
+ 					if (column->zType && !g_hash_table_lookup (names, column->zType)) {
+-						g_hash_table_insert (names, g_strdup (column->zType), GINT_TO_POINTER (1));
+ 						GdaValueType type;
++						g_hash_table_insert (names, g_strdup (column->zType), GINT_TO_POINTER (1));
+ 						switch (column->affinity) {
+ 						case SQLITE_AFF_INTEGER:
+ 							type = GDA_VALUE_TYPE_INTEGER;
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 8f5317055..9ae1371f0 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -93,117 +93,12 @@ lib/libgdasql.so.3
 lib/libgda-1.3/providers/libgda-sqlite.so
 lib/libgda-1.3/providers/libgda-xml.so
 libdata/pkgconfig/libgda.pc
-%%DOCSDIR%%/GdaClient.html
-%%DOCSDIR%%/GdaColumn.html
-%%DOCSDIR%%/GdaColumnIndex.html
-%%DOCSDIR%%/GdaDataModel.html
-%%DOCSDIR%%/GdaDataModelArray.html
-%%DOCSDIR%%/GdaDataModelHash.html
-%%DOCSDIR%%/GdaDataModelList.html
-%%DOCSDIR%%/GdaSelect.html
-%%DOCSDIR%%/GdaServerProvider.html
-%%DOCSDIR%%/GdaTable.html
-%%DOCSDIR%%/GdaTransaction.html
-%%DOCSDIR%%/architecture.html
-%%DOCSDIR%%/ch06.html
-%%DOCSDIR%%/ch09s04.html
-%%DOCSDIR%%/ch09s05.html
-%%DOCSDIR%%/ch09s06.html
-%%DOCSDIR%%/compiling.html
-%%DOCSDIR%%/connecting.html
-%%DOCSDIR%%/connections.html
-%%DOCSDIR%%/data-model.html
-%%DOCSDIR%%/fdl-section1.html
-%%DOCSDIR%%/fdl-section10.html
-%%DOCSDIR%%/fdl-section2.html
-%%DOCSDIR%%/fdl-section3.html
-%%DOCSDIR%%/fdl-section4.html
-%%DOCSDIR%%/fdl-section5.html
-%%DOCSDIR%%/fdl-section6.html
-%%DOCSDIR%%/fdl-section7.html
-%%DOCSDIR%%/fdl-section8.html
-%%DOCSDIR%%/fdl-section9.html
-%%DOCSDIR%%/fdl-using.html
-%%DOCSDIR%%/fdl.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/installation-configuring.html
-%%DOCSDIR%%/installation-installing.html
-%%DOCSDIR%%/installation.html
-%%DOCSDIR%%/introduction.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/libgda.devhelp
-%%DOCSDIR%%/libgda-BLOBs.html
-%%DOCSDIR%%/libgda-Commands.html
-%%DOCSDIR%%/libgda-GdaConnection.html
-%%DOCSDIR%%/libgda-GdaDataModelIndex.html
-%%DOCSDIR%%/libgda-GdaError.html
-%%DOCSDIR%%/libgda-GdaExport.html
-%%DOCSDIR%%/libgda-GdaParameter.html
-%%DOCSDIR%%/libgda-GdaReportDocument.html
-%%DOCSDIR%%/libgda-GdaReportItem.html
-%%DOCSDIR%%/libgda-GdaReportItemDetail.html
-%%DOCSDIR%%/libgda-GdaReportItemLabel.html
-%%DOCSDIR%%/libgda-GdaReportItemPageFooter.html
-%%DOCSDIR%%/libgda-GdaReportItemPageHeader.html
-%%DOCSDIR%%/libgda-GdaReportItemRepField.html
-%%DOCSDIR%%/libgda-GdaReportItemReport.html
-%%DOCSDIR%%/libgda-GdaReportItemReportFooter.html
-%%DOCSDIR%%/libgda-GdaReportItemReportHeader.html
-%%DOCSDIR%%/libgda-GdaReportItemSqlQuery.html
-%%DOCSDIR%%/libgda-GdaReportResult.html
-%%DOCSDIR%%/libgda-GdaReportValid.html
-%%DOCSDIR%%/libgda-GdaRow.html
-%%DOCSDIR%%/libgda-GdaValue.html
-%%DOCSDIR%%/libgda-GdaXmlConnection.html
-%%DOCSDIR%%/libgda-GdaXmlDatabase.html
-%%DOCSDIR%%/libgda-GdaXmlDocument.html
-%%DOCSDIR%%/libgda-GdaXqlAtom.html
-%%DOCSDIR%%/libgda-GdaXqlBin.html
-%%DOCSDIR%%/libgda-GdaXqlColumn.html
-%%DOCSDIR%%/libgda-GdaXqlConst.html
-%%DOCSDIR%%/libgda-GdaXqlDelete.html
-%%DOCSDIR%%/libgda-GdaXqlDml.html
-%%DOCSDIR%%/libgda-GdaXqlDual.html
-%%DOCSDIR%%/libgda-GdaXqlField.html
-%%DOCSDIR%%/libgda-GdaXqlFunc.html
-%%DOCSDIR%%/libgda-GdaXqlInsert.html
-%%DOCSDIR%%/libgda-GdaXqlItem.html
-%%DOCSDIR%%/libgda-GdaXqlJoin.html
-%%DOCSDIR%%/libgda-GdaXqlList.html
-%%DOCSDIR%%/libgda-GdaXqlQuery.html
-%%DOCSDIR%%/libgda-GdaXqlSelect.html
-%%DOCSDIR%%/libgda-GdaXqlStack.html
-%%DOCSDIR%%/libgda-GdaXqlTarget.html
-%%DOCSDIR%%/libgda-GdaXqlUpdate.html
-%%DOCSDIR%%/libgda-GdaXqlValue.html
-%%DOCSDIR%%/libgda-GdaXqlValueRef.html
-%%DOCSDIR%%/libgda-Libgda-Initialization.html
-%%DOCSDIR%%/libgda-Logging.html
-%%DOCSDIR%%/libgda-Quark-lists.html
-%%DOCSDIR%%/libgda-Utility-functions.html
-%%DOCSDIR%%/libgda-api.html
-%%DOCSDIR%%/libgda-gda-config.html
-%%DOCSDIR%%/libgda-gda-data-model-base.html
-%%DOCSDIR%%/libgda-gda-report-types.html
-%%DOCSDIR%%/libgda-gda-xql-utils.html
-%%DOCSDIR%%/libgda-provider-class.html
-%%DOCSDIR%%/libgda-provider-recordset.html
-%%DOCSDIR%%/libgda-providers.html
-%%DOCSDIR%%/libgda-reports.html
-%%DOCSDIR%%/libgda-server-provider-details.html
-%%DOCSDIR%%/libgda-xql.html
-%%DOCSDIR%%/main_example.html
-%%DOCSDIR%%/manage-gdavalue.html
-%%DOCSDIR%%/managing-errors.html
-%%DOCSDIR%%/migration-configuration.html
-%%DOCSDIR%%/migration-executing-commands.html
-%%DOCSDIR%%/migration.html
-%%DOCSDIR%%/processing-queries.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
+%%MYSQL:%%share/gnome/libgda/mysql_specs_create_db.xml
+%%MYSQL:%%share/gnome/libgda/mysql_specs_dsn.xml
+%%POSTGRES:%%share/gnome/libgda/postgres_specs_create_db.xml
+%%POSTGRES:%%share/gnome/libgda/postgres_specs_dsn.xml
+share/gnome/libgda/sqlite_specs_create_db.xml
+share/gnome/libgda/sqlite_specs_dsn.xml
 share/gnome/libgda/xml/gda-report.dtd
 share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd