rpms/libgnomedb/devel libgnomedb-1.9.100-unknown-datatype-fix.patch, NONE, 1.1 libgnomedb.spec, 1.12, 1.13
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Mar 24 10:22:03 UTC 2006
Author: jwrdegoede
Update of /cvs/extras/rpms/libgnomedb/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28836
Modified Files:
libgnomedb.spec
Added Files:
libgnomedb-1.9.100-unknown-datatype-fix.patch
Log Message:
* Fri Mar 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-6
- Add patch2 fixing bz 186517
libgnomedb-1.9.100-unknown-datatype-fix.patch:
--- NEW FILE libgnomedb-1.9.100-unknown-datatype-fix.patch ---
diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c
--- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-data-set.c 2005-08-07 15:07:13.000000000 +0200
+++ libgnomedb-1.9.100/libgnomedb/gnome-db-data-set.c 2006-03-24 10:22:13.000000000 +0100
@@ -1056,6 +1056,12 @@
GSList *params;
GnomeDbParameter *similar = NULL;
GSList *param_dest_fields;
+
+ /* If people try to call us to add a NULL param do notting. */
+ if (!param) {
+ g_warning ("Cannot add NULL param");
+ return;
+ }
if (g_slist_find (dataset->parameters, param))
return;
Only in libgnomedb-1.9.100/libgnomedb: gnome-db-data-set.c~
diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c
--- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-server-info.c 2005-09-08 12:36:57.000000000 +0200
+++ libgnomedb-1.9.100/libgnomedb/gnome-db-server-info.c 2006-03-24 10:16:17.000000000 +0100
@@ -99,6 +99,7 @@
{GDA_VALUE_TYPE_TINYUINT, ""},
{GDA_VALUE_TYPE_TYPE, ""},
{GDA_VALUE_TYPE_UINTEGER, ""},
+ {GDA_VALUE_TYPE_UNKNOWN, ""}
};
/* Assoc transl[] = { */
@@ -181,6 +182,7 @@
{GDA_VALUE_TYPE_TINYUINT, ""},
{GDA_VALUE_TYPE_TYPE, ""},
{GDA_VALUE_TYPE_UINTEGER, ""},
+ {GDA_VALUE_TYPE_UNKNOWN, ""}
};
info = g_new0 (GnomeDbServerInfo, 1);
@@ -254,6 +256,7 @@
{GDA_VALUE_TYPE_TINYUINT, ""},
{GDA_VALUE_TYPE_TYPE, ""},
{GDA_VALUE_TYPE_UINTEGER, ""},
+ {GDA_VALUE_TYPE_UNKNOWN, ""}
};
info = g_new0 (GnomeDbServerInfo, 1);
@@ -327,6 +330,7 @@
{GDA_VALUE_TYPE_TINYUINT, ""},
{GDA_VALUE_TYPE_TYPE, ""},
{GDA_VALUE_TYPE_UINTEGER, ""},
+ {GDA_VALUE_TYPE_UNKNOWN, ""}
};
info = g_new0 (GnomeDbServerInfo, 1);
@@ -386,7 +390,7 @@
info->value_test_gda_types = g_new0 (GdaValueType, GDA_VALUE_TYPE_UNKNOWN);
gda_type = GDA_VALUE_TYPE_NULL;
- for (gda_type ++; gda_type < GDA_VALUE_TYPE_UNKNOWN; gda_type ++) {
+ for (gda_type ++; gda_type <= GDA_VALUE_TYPE_UNKNOWN; gda_type ++) {
info->value_test_data_types [gda_type - 1] = gda_type_to_string (gda_type);
info->value_test_gda_types [gda_type - 1] = gda_type;
}
Only in libgnomedb-1.9.100/libgnomedb: gnome-db-server-info.c~
diff -ur libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c
--- libgnomedb-1.9.100.orig/libgnomedb/gnome-db-wrapper-field.c 2005-08-07 15:07:14.000000000 +0200
+++ libgnomedb-1.9.100/libgnomedb/gnome-db-wrapper-field.c 2006-03-24 10:25:21.000000000 +0100
@@ -285,7 +285,13 @@
}
}
- if (type) {
+ if (!type)
+ {
+ g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs));
+ type = "unknown";
+ }
+
+ {
retval = gnome_db_server_get_data_type_by_name (srv, type);
if (!retval) {
/* create a GnomeDbServerDataType for that 'type' */
@@ -297,8 +303,6 @@
g_object_unref (retval);
}
}
- else
- g_warning ("Could not determine the DBMS data type for Gda type %d", gda_column_get_gdatype (col_attrs));
return retval;
}
Only in libgnomedb-1.9.100/libgnomedb: gnome-db-wrapper-field.c~
Index: libgnomedb.spec
===================================================================
RCS file: /cvs/extras/rpms/libgnomedb/devel/libgnomedb.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- libgnomedb.spec 14 Feb 2006 21:29:02 -0000 1.12
+++ libgnomedb.spec 24 Mar 2006 10:22:02 -0000 1.13
@@ -1,7 +1,7 @@
Summary: Library for writing gnome database programs
Name: libgnomedb
Version: 1.9.100
-Release: 5%{?dist}
+Release: 6%{?dist}
Epoch: 1
Source: %{name}-%{version}.tar.bz2
URL: http://www.gnome-db.org/
@@ -17,6 +17,7 @@
Patch0: libgnomedb-1.2.0-desktop.patch
Patch1: libgnomedb-1.9.100-sharp.patch
+Patch2: libgnomedb-1.9.100-unknown-datatype-fix.patch
%description
libgnomedb is a library that eases the task of writing
@@ -54,6 +55,7 @@
%setup -q
%patch0 -p1 -b .desktop.patch
%patch1 -p1 -b .sharp
+%patch2 -p1 -b .unknown
%build
@@ -153,6 +155,9 @@
%changelog
+* Fri Mar 24 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-6
+- Add patch2 fixing bz 186517
+
* Mon Feb 13 2006 Hans de Goede <j.w.r.degoede at hhs.nl> 1:1.9.100-5
- Bump release and rebuild for new gcc4.1 and glibc
- Attempt to properly install C-sharp/mono bindings
More information about the fedora-extras-commits
mailing list