From: Alastair Tse <liquidx@gentoo.org>
Date: Tue, 23 Nov 2004 17:18:46 +0000 (+0000)
Subject: added firebird provider patch (#71708)
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=636589e356d26986b5c929a94571b84d860301d8;p=gentoo.git

added firebird provider patch (#71708)
---

diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog
index 3179eef7ae9d..06fa63c3d0d5 100644
--- a/gnome-extra/libgda/ChangeLog
+++ b/gnome-extra/libgda/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for gnome-extra/libgda
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.52 2004/10/29 08:16:58 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.53 2004/11/23 17:18:46 liquidx Exp $
+
+  23 Nov 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/libgda-1.0.4-firebird-provider.patch, libgda-1.0.4.ebuild:
+  added firebird provider patch (#71708)
 
   29 Oct 2004; Joseph Jezak <josejx@gentoo.org> libgda-1.0.3.ebuild:
   Keyworded ppc to fix compiling with gcc 3.4
diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest
index 885008dfe401..6b305b27a72e 100644
--- a/gnome-extra/libgda/Manifest
+++ b/gnome-extra/libgda/Manifest
@@ -1,8 +1,11 @@
-MD5 68bb26148286efe7ab82f17211284d36 ChangeLog 8339
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 1766d28be4707d9e4b3a8ba20d2a6824 ChangeLog 8499
 MD5 d0438930f010eab60bbc5b319fcb1d22 libgda-0.2.96-r2.ebuild 3424
 MD5 9dbecc1f94a890f7f01a80cb22460d47 libgda-1.0.2.ebuild 2601
 MD5 626977fd74e56d7a8f390ecfe28f8ddb libgda-1.0.3.ebuild 2752
-MD5 6378d9eae25d9e112b4546cf30b503ea libgda-1.0.4.ebuild 2841
+MD5 8bad9c7b85984f3e67193225b2a54c2e libgda-1.0.4.ebuild 2938
 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158
 MD5 e92331f7677fcfc3e82541f08676bb32 files/digest-libgda-0.2.96-r2 66
 MD5 46b8c0b40219635d47ca4583d42dc814 files/digest-libgda-1.0.2 66
@@ -13,3 +16,11 @@ MD5 adf80d651f1d75c9745c44264f58708e files/libgda-1.0.2-gcc2_fix.patch 641
 MD5 f2110a1cc61b61b9f52a346427e19874 files/libgda-1.0.3-gcc3.4.patch 4236
 MD5 a3ad0589779cdb39f897e554dd9862fb files/libgda-1.0.3-gtkdoc_fixes.patch 15598
 MD5 42fbab3bc532505fcd7e85aafb9c5a41 files/libgda-1.0.4-freetds-0.6x.patch 482
+MD5 b87a0e5fdf7e23d29ee4452e694140c4 files/libgda-1.0.4-firebird-provider.patch 1055
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBo3ErRkyva5PS18kRAglgAJ4yYifaaoJWVJgIYob95q8UBQf3NwCfbFMK
+QVxwbtU7aXv1blE8SVd8teE=
+=kpzr
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/libgda/files/libgda-1.0.4-firebird-provider.patch b/gnome-extra/libgda/files/libgda-1.0.4-firebird-provider.patch
new file mode 100644
index 000000000000..cfede126522a
--- /dev/null
+++ b/gnome-extra/libgda/files/libgda-1.0.4-firebird-provider.patch
@@ -0,0 +1,40 @@
+--- providers/firebird/gda-firebird-provider.c_old	2004-11-19 08:23:39.164945104 +0900
++++ providers/firebird/gda-firebird-provider.c	2004-11-19 08:24:18.867909336 +0900
+@@ -346,6 +346,20 @@
+ 	return model;
+ }
+ 
++isc_tr_handle *
++gda_firebird_command_get_transaction (GdaCommand *cmd)
++{
++	GdaTransaction *xaction;
++	isc_tr_handle *itr;
++
++	xaction = gda_command_get_transaction (cmd);
++	if (!GDA_IS_TRANSACTION (xaction))
++		return NULL;
++
++	itr = g_object_get_data (G_OBJECT (xaction), TRANSACTION_DATA);
++	return itr;
++}
++
+ /* execute_command handler for the GdaFirebirdProvider class */
+ static GList *
+ gda_firebird_provider_execute_command (GdaServerProvider *provider,
+@@ -547,16 +561,3 @@
+ 	gda_connection_add_error (cnc, error);
+ }
+ 
+-isc_tr_handle *
+-gda_firebird_command_get_transaction (GdaCommand *cmd)
+-{
+-	GdaTransaction *xaction;
+-	isc_tr_handle *itr;
+-
+-	xaction = gda_command_get_transaction (cmd);
+-	if (!GDA_IS_TRANSACTION (xaction))
+-		return NULL;
+-
+-	itr = g_object_get_data (G_OBJECT (xaction), TRANSACTION_DATA);
+-	return itr;
+-}
diff --git a/gnome-extra/libgda/libgda-1.0.4.ebuild b/gnome-extra/libgda/libgda-1.0.4.ebuild
index 75aae774468a..490c920aee4e 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-2004 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.3 2004/08/06 01:34:08 arj Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/libgda-1.0.4.ebuild,v 1.4 2004/11/23 17:18:46 liquidx Exp $
 
 inherit gnome2 eutils
 
@@ -49,7 +49,8 @@ src_unpack() {
 	epatch ${FILESDIR}/${PN}-1.0.3-gcc3.4.patch
 	# freetds patch (#48611)
 	epatch ${FILESDIR}/${PN}-1.0.4-freetds-0.6x.patch
-
+	# firebird function reorder (#71708)
+	epatch ${FILESDIR}/${PN}-1.0.4-firebird-provider.patch
 }
 
 src_compile() {