summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeonardo Boshell <leonardop@gentoo.org>2005-05-11 22:47:00 +0000
committerLeonardo Boshell <leonardop@gentoo.org>2005-05-11 22:47:00 +0000
commit4b7cd6f4534f9dc7420d26b050c98ac819cd7329 (patch)
treec08935c4d1095137e86ecf10b62f91434d113942 /gnome-extra/libgda
parentInitial commit, closes bug #81376. (diff)
downloadgentoo-2-4b7cd6f4534f9dc7420d26b050c98ac819cd7329.tar.gz
gentoo-2-4b7cd6f4534f9dc7420d26b050c98ac819cd7329.tar.bz2
gentoo-2-4b7cd6f4534f9dc7420d26b050c98ac819cd7329.zip
Fixes in 1.0.2 for bugs #78314, #81724 and #87545. Marking 1.0.4 stable on x86.
(Portage version: 2.0.51.21-r1)
Diffstat (limited to 'gnome-extra/libgda')
-rw-r--r--gnome-extra/libgda/ChangeLog16
-rw-r--r--gnome-extra/libgda/files/libgda-1.0.2-firebird_fix.patch11
-rw-r--r--gnome-extra/libgda/files/libgda-1.0.2-freetds_fix.patch24
-rw-r--r--gnome-extra/libgda/files/libgda-1.0.2-gcc3.4_fix.patch96
-rw-r--r--gnome-extra/libgda/libgda-1.0.2.ebuild14
-rw-r--r--gnome-extra/libgda/libgda-1.0.4.ebuild4
6 files changed, 159 insertions, 6 deletions
diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 6962338c649d..745b47587cb9 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,7 +1,19 @@
# ChangeLog for gnome-extra/libgda
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.56 2005/05/08 20:39:09 agriffis Exp $
-
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.57 2005/05/11 22:47:00 leonardop Exp $
+
+ 11 May 2005; Leonardo Boshell <leonardop@gentoo.org> libgda-1.0.4.ebuild:
+ Stable on x86.
+
+ 11 May 2005; Leonardo Boshell <leonardop@gentoo.org> libgda-1.0.2.ebuild,
+ files/libgda-1.0.2-gcc3.4_fix.patch, files/libgda-1.0.2-freetds_fix.patch,
+ files/libgda-1.0.2-firebird_fix.patch:
+ Added a patch to fix compilation with gcc-3.4 (bug #87545). Added a patch
+ and updated the freetds dependency to version >= 0.62 to fix a compilation
+ problem due to API changes (bug #81724). Added a patch to fix compilation
+ of the firebird provider. Apply patch from libgda-1.0.3 to fix docbook
+ documentation.
+
08 May 2005; Aron Griffis <agriffis@gentoo.org> libgda-1.0.4.ebuild:
stable on ia64
diff --git a/gnome-extra/libgda/files/libgda-1.0.2-firebird_fix.patch b/gnome-extra/libgda/files/libgda-1.0.2-firebird_fix.patch
new file mode 100644
index 000000000000..2087f354e1a3
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-1.0.2-firebird_fix.patch
@@ -0,0 +1,11 @@
+diff -NurdB libgda-1.0.2/providers/firebird/gda-firebird-provider.c libgda-1.0.2-firebird-fix/providers/firebird/gda-firebird-provider.c
+--- libgda-1.0.2/providers/firebird/gda-firebird-provider.c 2003-01-15 19:10:29.000000000 -0500
++++ libgda-1.0.2-firebird-fix/providers/firebird/gda-firebird-provider.c 2005-05-11 15:24:29.000000000 -0500
+@@ -29,6 +29,7 @@
+ #define TRANSACTION_DATA "GDA_Firebird_TransactionData"
+ #define STATEMENT_DATA "GDA_Firebird_StatementData"
+
++static isc_tr_handle *gda_firebird_command_get_transaction (GdaCommand *cmd);
+ static void gda_firebird_provider_class_init (GdaFirebirdProviderClass *klass);
+ static void gda_firebird_provider_init (GdaFirebirdProvider *provider,
+ GdaFirebirdProviderClass *klass);
diff --git a/gnome-extra/libgda/files/libgda-1.0.2-freetds_fix.patch b/gnome-extra/libgda/files/libgda-1.0.2-freetds_fix.patch
new file mode 100644
index 000000000000..c07dd3cf40f5
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-1.0.2-freetds_fix.patch
@@ -0,0 +1,24 @@
+diff -NurdB libgda-1.0.2/providers/freetds/gda-freetds-provider.c libgda-1.0.2-freetds-update/providers/freetds/gda-freetds-provider.c
+--- libgda-1.0.2/providers/freetds/gda-freetds-provider.c 2005-05-11 10:53:19.000000000 -0500
++++ libgda-1.0.2-freetds-update/providers/freetds/gda-freetds-provider.c 2005-05-11 14:47:06.000000000 -0500
+@@ -803,7 +803,7 @@
+
+ /* there should not be any result tokens */
+ #ifdef HAVE_FREETDS_VER0_6X
+- while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds, &tds_cnc->result_type))
++ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds, &tds_cnc->result_type, NULL))
+ #else
+ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds))
+ #endif
+diff -NurdB libgda-1.0.2/providers/freetds/gda-freetds-recordset.c libgda-1.0.2-freetds-update/providers/freetds/gda-freetds-recordset.c
+--- libgda-1.0.2/providers/freetds/gda-freetds-recordset.c 2005-05-11 10:53:19.000000000 -0500
++++ libgda-1.0.2-freetds-update/providers/freetds/gda-freetds-recordset.c 2005-05-11 14:59:02.000000000 -0500
+@@ -341,7 +341,7 @@
+
+ #ifdef HAVE_FREETDS_VER0_6X
+ while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds,
+- &tds_cnc->result_type))
++ &tds_cnc->result_type, NULL))
+ == TDS_SUCCEED) {
+ if (tds_cnc->result_type == TDS_ROW_RESULT) {
+ gint row_type, compute_id;
diff --git a/gnome-extra/libgda/files/libgda-1.0.2-gcc3.4_fix.patch b/gnome-extra/libgda/files/libgda-1.0.2-gcc3.4_fix.patch
new file mode 100644
index 000000000000..fc04b14cc653
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-1.0.2-gcc3.4_fix.patch
@@ -0,0 +1,96 @@
+diff -NurdB libgda-1.0.2/libgda/gda-util.c libgda-1.0.2-gcc3.4/libgda/gda-util.c
+--- libgda-1.0.2/libgda/gda-util.c 2003-11-03 04:48:05.000000000 -0500
++++ libgda-1.0.2-gcc3.4/libgda/gda-util.c 2005-05-11 15:58:31.000000000 -0500
+@@ -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";
+diff -NurdB libgda-1.0.2/providers/ldap/gda-ldap-provider.c libgda-1.0.2-gcc3.4/providers/ldap/gda-ldap-provider.c
+--- libgda-1.0.2/providers/ldap/gda-ldap-provider.c 2003-02-03 12:12:13.000000000 -0500
++++ libgda-1.0.2-gcc3.4/providers/ldap/gda-ldap-provider.c 2005-05-11 15:59:16.000000000 -0500
+@@ -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;
+diff -NurdB libgda-1.0.2/providers/mysql/gda-mysql-provider.c libgda-1.0.2-gcc3.4/providers/mysql/gda-mysql-provider.c
+--- libgda-1.0.2/providers/mysql/gda-mysql-provider.c 2003-11-26 16:01:22.000000000 -0500
++++ libgda-1.0.2-gcc3.4/providers/mysql/gda-mysql-provider.c 2005-05-11 15:58:31.000000000 -0500
+@@ -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;
+diff -NurdB libgda-1.0.2/providers/sqlite/gda-sqlite-provider.c libgda-1.0.2-gcc3.4/providers/sqlite/gda-sqlite-provider.c
+--- libgda-1.0.2/providers/sqlite/gda-sqlite-provider.c 2003-01-15 19:13:28.000000000 -0500
++++ libgda-1.0.2-gcc3.4/providers/sqlite/gda-sqlite-provider.c 2005-05-11 15:58:31.000000000 -0500
+@@ -588,7 +588,7 @@
+ case GDA_CONNECTION_FEATURE_TRIGGERS :
+ case GDA_CONNECTION_FEATURE_VIEWS :
+ return TRUE;
+- default:
++ default: ;
+ }
+
+ return FALSE;
+@@ -774,7 +774,7 @@
+ return get_tables (cnc);
+ case GDA_CONNECTION_SCHEMA_TYPES :
+ return get_types ();
+- default:
++ default: ;
+ }
+
+ return NULL;
+diff -NurdB libgda-1.0.2/providers/xml/gda-xml-provider.c libgda-1.0.2-gcc3.4/providers/xml/gda-xml-provider.c
+--- libgda-1.0.2/providers/xml/gda-xml-provider.c 2003-09-01 18:55:02.000000000 -0500
++++ libgda-1.0.2-gcc3.4/providers/xml/gda-xml-provider.c 2005-05-11 15:58:31.000000000 -0500
+@@ -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.2.ebuild b/gnome-extra/libgda/libgda-1.0.2.ebuild
index a52b9b1da2f8..6ce85129ed21 100644
--- a/gnome-extra/libgda/libgda-1.0.2.ebuild
+++ b/gnome-extra/libgda/libgda-1.0.2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.2.ebuild,v 1.13 2005/02/01 14:45:21 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.2.ebuild,v 1.14 2005/05/11 22:47:00 leonardop Exp $
IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
@@ -23,7 +23,7 @@ RDEPEND=">=dev-libs/glib-2.0
odbc? ( >=dev-db/unixODBC-2.0.6 )
ldap? ( >=net-nds/openldap-2.0.25 )
x86? ( firebird? ( dev-db/firebird ) )
- freetds? ( >=dev-db/freetds-0.5 )
+ freetds? ( >=dev-db/freetds-0.62 )
sqlite? ( =dev-db/sqlite-2* )
!ia64? ( mdb? ( >=app-office/mdbtools-0.5 ) )"
@@ -43,6 +43,16 @@ src_unpack() {
unpack ${A}
gnome2_omf_fix ${S}/doc/Makefile.in
epatch ${FILESDIR}/${P}-gcc2_fix.patch
+
+ cd ${S}
+ # See bug #87545
+ epatch ${FILESDIR}/${P}-gcc3.4_fix.patch
+ # See bug #81724.
+ epatch ${FILESDIR}/${P}-freetds_fix.patch
+ # See bug #78314
+ epatch ${FILESDIR}/${PN}-1.0.3-gtkdoc_fixes.patch
+ # Fix compilation of firebird provider
+ epatch ${FILESDIR}/${P}-firebird_fix.patch
}
src_compile() {
diff --git a/gnome-extra/libgda/libgda-1.0.4.ebuild b/gnome-extra/libgda/libgda-1.0.4.ebuild
index 286a37a792b6..face721f9baa 100644
--- a/gnome-extra/libgda/libgda-1.0.4.ebuild
+++ b/gnome-extra/libgda/libgda-1.0.4.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.4.ebuild,v 1.7 2005/05/08 20:39:09 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.4.ebuild,v 1.8 2005/05/11 22:47:00 leonardop Exp $
inherit gnome2 eutils
@@ -10,7 +10,7 @@ LICENSE="GPL-2 LGPL-2"
IUSE="odbc postgres mysql ldap firebird freetds sqlite mdb oci8 doc"
SLOT="1"
-KEYWORDS="~alpha ~amd64 ia64 ~ppc ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ia64 ~ppc ppc64 ~sparc x86"
RDEPEND=">=dev-libs/glib-2.0
>=dev-libs/libxml2-2.0