diff --git a/libgda-1.9.100-64bit.patch b/libgda-1.9.100-64bit.patch new file mode 100644 index 0000000..955839d --- /dev/null +++ b/libgda-1.9.100-64bit.patch @@ -0,0 +1,93 @@ +--- libgda-1.9.100/libgda/gda-data-model-hash.c~ 2006-05-03 23:04:11.000000000 +0200 ++++ libgda-1.9.100/libgda/gda-data-model-hash.c 2006-05-03 23:04:11.000000000 +0200 +@@ -70,7 +70,7 @@ + return GDA_DATA_MODEL_HASH (model)->priv->number_of_columns; + } + +-static GdaRow * ++GdaRow * + gda_data_model_hash_get_row (GdaDataModelBase *model, gint row) + { + gint hash_entry; +--- libgda-1.9.100/libgda/gda-data-model-array.c~ 2006-05-03 22:48:02.000000000 +0200 ++++ libgda-1.9.100/libgda/gda-data-model-array.c 2006-05-03 22:48:02.000000000 +0200 +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + + #define PARENT_TYPE GDA_TYPE_DATA_MODEL_BASE + +@@ -430,7 +431,7 @@ + } + + if (! cur) { +- g_set_error (error, 0, 0, _("No specified in "), node->name); ++ g_set_error (error, 0, 0, _("No specified in ")); + clean_field_specs (fields); + return NULL; + } +--- libgda-1.9.100/libgda/gda-data-model-hash.h~ 2006-05-03 23:03:48.000000000 +0200 ++++ libgda-1.9.100/libgda/gda-data-model-hash.h 2006-05-03 23:03:48.000000000 +0200 +@@ -60,6 +60,7 @@ + gint rownum, + GdaRow *row); + ++GdaRow *gda_data_model_hash_get_row (GdaDataModelBase *model, gint row); + + G_END_DECLS + +--- libgda-1.9.100/providers/postgres/utils.c~ 2006-05-03 23:08:57.000000000 +0200 ++++ libgda-1.9.100/providers/postgres/utils.c 2006-05-03 23:08:57.000000000 +0200 +@@ -289,7 +289,7 @@ + break; + case GDA_VALUE_TYPE_BLOB : + blob = gda_postgres_blob_new (cnc); +- gda_postgres_blob_set_id (GDA_POSTRES_BLOB (blob), atoi (thevalue)); ++ gda_postgres_blob_set_id (GDA_POSTGRES_BLOB (blob), atoi (thevalue)); + gda_value_set_blob (value, blob); + break; + default : +--- libgda-1.9.100/providers/odbc/gda-odbc-provider.c~ 2006-05-03 23:06:12.000000000 +0200 ++++ libgda-1.9.100/providers/odbc/gda-odbc-provider.c 2006-05-03 23:06:12.000000000 +0200 +@@ -502,7 +502,7 @@ + return FALSE; + } + +- rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (UDWORD) name ); ++ rc = SQLSetConnectOption( priv_data->hdbc, SQL_CURRENT_QUALIFIER, (unsigned long) name ); + + if ( SQL_SUCCEEDED( rc )) { + return TRUE; +--- libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c~ 2006-05-03 22:49:54.000000000 +0200 ++++ libgda-1.9.100/providers/sqlite/gda-sqlite-provider.c 2006-05-03 22:49:54.000000000 +0200 +@@ -882,7 +882,7 @@ + { + GdaDataModel *model = NULL; + gchar *sql; +- gchar reference = NULL; ++ gchar *reference = NULL; + GList *reclist; + + /* use the SQLite PRAGMA command to get the list of FK keys for the table */ +--- libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c~ 2006-05-03 22:50:39.000000000 +0200 ++++ libgda-1.9.100/providers/sqlite/gda-sqlite-recordset.c 2006-05-03 22:50:39.000000000 +0200 +@@ -24,6 +24,7 @@ + + #include + #include ++#include + #include "gda-sqlite.h" + #include "gda-sqlite-recordset.h" + #include "gda-sqlite-provider.h" +--- libgda-1.9.100/providers/bdb/libmain.c~ 2006-05-04 22:41:59.000000000 +0200 ++++ libgda-1.9.100/providers/bdb/libmain.c 2006-05-04 22:41:59.000000000 +0200 +@@ -20,6 +20,7 @@ + */ + + #include ++#include + #include "gda-bdb.h" + + const gchar *plugin_get_name (void); diff --git a/libgda.spec b/libgda.spec index 81f8a97..9394b6a 100644 --- a/libgda.spec +++ b/libgda.spec @@ -35,7 +35,7 @@ Summary: Library for writing gnome database programs Name: libgda Version: 1.9.100 -Release: 4%{?dist} +Release: 5%{?dist} Epoch: 1 Source: %{name}-%{version}.tar.bz2 URL: http://www.gnome-db.org/ @@ -76,6 +76,7 @@ BuildRequires: openldap-devel Patch0: libgda-1.9.100-configure.patch Patch1: libgda-1.9.100-sharp.patch Patch2: libgda-1.9.100-syslibs.patch +Patch3: libgda-1.9.100-64bit.patch %description libgda is a library that eases the task of writing @@ -211,6 +212,7 @@ rm -fr providers/sqlite/sqlite-src %patch0 -p1 -b .configure %patch1 -p1 -b .sharp %patch2 -p1 -b .syslibs +%patch3 -p1 -b .64bit %build @@ -397,6 +399,9 @@ rm -rf %{buildroot} %changelog +* Thu May 4 2006 Hans de Goede 1:1.9.100-5 +- Add patch3 fixing a couple of x86_64 bugs (bz 190366) + * Mon Feb 13 2006 Hans de Goede 1:1.9.100-4 - Bump release and rebuild for new gcc4.1 and glibc. - Make sqlite plugin use system sqlite not build in version