From ca7553c6a41d8cfee6feefacbaa8055164debb3d Mon Sep 17 00:00:00 2001 From: Leonardo Boshell Date: Sun, 6 Aug 2006 10:40:42 +0000 Subject: [PATCH] Fix compilationg with freetds-0.62 Package-Manager: portage-2.1.1_pre4-r2 --- gnome-extra/libgda/ChangeLog | 6 ++- gnome-extra/libgda/Manifest | 26 ++++------- .../libgda-1.2.3-freetds_api_fixes.patch | 45 ++++++++++++------- 3 files changed, 43 insertions(+), 34 deletions(-) diff --git a/gnome-extra/libgda/ChangeLog b/gnome-extra/libgda/ChangeLog index d2dff98ec186..81fb06262275 100644 --- a/gnome-extra/libgda/ChangeLog +++ b/gnome-extra/libgda/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for gnome-extra/libgda # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.91 2006/08/03 18:26:04 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/gnome-extra/libgda/ChangeLog,v 1.92 2006/08/06 10:40:42 leonardop Exp $ + + 06 Aug 2006; Leonardo Boshell + files/libgda-1.2.3-freetds_api_fixes.patch: + Fix compilation problem with freetds-0.62, as mentioned in bug #142587. 03 Aug 2006; Gustavo Zacarias libgda-1.2.3.ebuild: Stable on sparc diff --git a/gnome-extra/libgda/Manifest b/gnome-extra/libgda/Manifest index ae7e13eb8990..88b6bfcb07de 100644 --- a/gnome-extra/libgda/Manifest +++ b/gnome-extra/libgda/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX libgda-1.0.2-freetds_fix.patch 1338 RMD160 62f2dc9b951f8456d5c034e69abc9c3c21b2e46a SHA1 4c4dc96a4ce8a3dac26714352da9259628dd3fca SHA256 22455fe285d8a14ea52671bcaaba3fa1a8f77f3ec5ca55b19a7f05413411df79 MD5 89d5a7588e21826826be8ecb11218b94 files/libgda-1.0.2-freetds_fix.patch 1338 RMD160 62f2dc9b951f8456d5c034e69abc9c3c21b2e46a files/libgda-1.0.2-freetds_fix.patch 1338 @@ -17,10 +14,10 @@ AUX libgda-1.2.2-freetds_fixes.patch 1771 RMD160 dda830caeb7c609a7a23453ef5f540c MD5 c95ffd3e34df767ced0741bb1ba184e2 files/libgda-1.2.2-freetds_fixes.patch 1771 RMD160 dda830caeb7c609a7a23453ef5f540c1586e3767 files/libgda-1.2.2-freetds_fixes.patch 1771 SHA256 b69939f99e820918d9631cacaec2eb7b0abaf1bf11bff4d51198906f3c8b27f2 files/libgda-1.2.2-freetds_fixes.patch 1771 -AUX libgda-1.2.3-freetds_api_fixes.patch 12778 RMD160 bfb9cfcff95c84cb3cc22814ce9f7633c89d6b4e SHA1 dbaa803761d10a83d88da06acfa35fb11eff091f SHA256 e143f3d1a5aceaef825ffab901006b3dfed8b97ad237e2b1e6ebfc4e7cdc652e -MD5 5e8c971a64b56fb801b49ac4ad599b80 files/libgda-1.2.3-freetds_api_fixes.patch 12778 -RMD160 bfb9cfcff95c84cb3cc22814ce9f7633c89d6b4e files/libgda-1.2.3-freetds_api_fixes.patch 12778 -SHA256 e143f3d1a5aceaef825ffab901006b3dfed8b97ad237e2b1e6ebfc4e7cdc652e files/libgda-1.2.3-freetds_api_fixes.patch 12778 +AUX libgda-1.2.3-freetds_api_fixes.patch 13517 RMD160 3639299b1f4ddfc12ada361b036e1ae887f0206e SHA1 a9e2d6fb3c40876519f43c5391c890e275983afe SHA256 a3c6f727e66f244586184c5433214302e8aab5393d3968657c08a4b93840bf8f +MD5 af02e6861d4aff682d79857ee8c5df2e files/libgda-1.2.3-freetds_api_fixes.patch 13517 +RMD160 3639299b1f4ddfc12ada361b036e1ae887f0206e files/libgda-1.2.3-freetds_api_fixes.patch 13517 +SHA256 a3c6f727e66f244586184c5433214302e8aab5393d3968657c08a4b93840bf8f files/libgda-1.2.3-freetds_api_fixes.patch 13517 DIST libgda-1.2.2.tar.bz2 1242035 DIST libgda-1.2.3.tar.bz2 1075643 RMD160 d429dcce511084287cc63a2d1df93f7ca6d9316c SHA1 a4a7c7835c67987dc846077a3de0512870352ae7 SHA256 17add29bb2d7b57da5874f8a28c1a0af4b6f965ad992fef25002b6c33318f303 EBUILD libgda-1.2.2-r1.ebuild 2254 RMD160 e32f7f96fca843f17fac94600af7a3edce2ceb14 SHA1 51123057938827829d1e8b6657ac94d5f570075c SHA256 1695724cd483582f547e1da79845a6e9d6020ae4c2f50c5c90a29da177d83b1d @@ -31,10 +28,10 @@ EBUILD libgda-1.2.3.ebuild 2067 RMD160 ed00a933c81f42c64e3fab08158fc05449a0294f MD5 6cc8e7905c50d79ce5304a958aea9bc2 libgda-1.2.3.ebuild 2067 RMD160 ed00a933c81f42c64e3fab08158fc05449a0294f libgda-1.2.3.ebuild 2067 SHA256 819613eee289fbfa38c6ec2bedafe90551a068343495f9b8c4172d68c8f51243 libgda-1.2.3.ebuild 2067 -MISC ChangeLog 13992 RMD160 63873607e43dff530f43ad292a620044652d58b9 SHA1 8de194274569d451f02c6a9691d6d363badef27c SHA256 06edbdcb2802e891ae45ca7e76e2c06726b8d644e986153b4bfd9528e50e88db -MD5 b5e6854de21b38aa7e6b3bdbbdac66ed ChangeLog 13992 -RMD160 63873607e43dff530f43ad292a620044652d58b9 ChangeLog 13992 -SHA256 06edbdcb2802e891ae45ca7e76e2c06726b8d644e986153b4bfd9528e50e88db ChangeLog 13992 +MISC ChangeLog 14169 RMD160 142effbdc678e8194623765c36cc52b08110a9a1 SHA1 251caa24a034718e1709702b0bbe1241a37cdaea SHA256 5a1015102e423bd46b21e1b218080c3a836cb0b80226dbae7b1b7659d3a0eb72 +MD5 95f14cfeef203f1a7b89539067323bf5 ChangeLog 14169 +RMD160 142effbdc678e8194623765c36cc52b08110a9a1 ChangeLog 14169 +SHA256 5a1015102e423bd46b21e1b218080c3a836cb0b80226dbae7b1b7659d3a0eb72 ChangeLog 14169 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1 MD5 03ad2e6c4ab41244af1015a8bbb0b39f metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e metadata.xml 158 @@ -45,10 +42,3 @@ SHA256 aa84c5e5b42a9b36925a99199f8072a3e626dfcd66a5db2997b6905c63c77eae files/di MD5 0585ea86d6d935b35b23b5b574db7c87 files/digest-libgda-1.2.3 244 RMD160 9fc9ec61243574b939d96986ec33522214d63c01 files/digest-libgda-1.2.3 244 SHA256 f0c3c9e2af594dd3621ac1914aec3c9695204b2d2bf0ce035931fd31cac4c9f2 files/digest-libgda-1.2.3 244 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) - -iD8DBQFE0j/cKRy60XGEcJIRAsEgAJ0Rt3prcKAYYhmlJMpVir0mhjzKlgCglDWO -+gQdgiOMlafFHp/nLfQK4hE= -=BLME ------END PGP SIGNATURE----- diff --git a/gnome-extra/libgda/files/libgda-1.2.3-freetds_api_fixes.patch b/gnome-extra/libgda/files/libgda-1.2.3-freetds_api_fixes.patch index 35bbad86abe0..0a17bce046dc 100644 --- a/gnome-extra/libgda/files/libgda-1.2.3-freetds_api_fixes.patch +++ b/gnome-extra/libgda/files/libgda-1.2.3-freetds_api_fixes.patch @@ -1,6 +1,6 @@ diff -NurdB libgda-1.2.3/configure.in libgda-1.2.3-patched/configure.in --- libgda-1.2.3/configure.in 2005-10-27 04:18:24.000000000 -0500 -+++ libgda-1.2.3-patched/configure.in 2006-08-02 04:13:23.000000000 -0500 ++++ libgda-1.2.3-patched/configure.in 2006-08-06 02:13:21.000000000 -0500 @@ -440,45 +440,23 @@ AC_MSG_WARN(tds backend not used) else @@ -60,7 +60,7 @@ diff -NurdB libgda-1.2.3/configure.in libgda-1.2.3-patched/configure.in fi diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.c libgda-1.2.3-patched/providers/freetds/gda-freetds-provider.c --- libgda-1.2.3/providers/freetds/gda-freetds-provider.c 2004-12-28 08:26:11.000000000 -0500 -+++ libgda-1.2.3-patched/providers/freetds/gda-freetds-provider.c 2006-08-02 15:09:05.000000000 -0500 ++++ libgda-1.2.3-patched/providers/freetds/gda-freetds-provider.c 2006-08-06 04:13:59.000000000 -0500 @@ -103,7 +103,7 @@ const gint col, const gint row); @@ -144,18 +144,20 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.c libgda-1.2.3-p int result_type = 0; #endif -@@ -802,7 +806,9 @@ +@@ -802,7 +806,11 @@ } /* there should not be any result tokens */ -#ifdef HAVE_FREETDS_VER0_6X -+#if FREETDS_VERSION > 6200 ++#if FREETDS_VERSION >= 6400 ++ while ((tds_cnc->rc = tds_process_tokens (tds_cnc->tds, &tds_cnc->result_type, NULL, TDS_RETURN_ROWFMT | TDS_RETURN_COMPUTEFMT | TDS_RETURN_DONE | TDS_STOPAT_ROW | TDS_STOPAT_COMPUTE | TDS_RETURN_PROC)) ++#elif FREETDS_VERSION >= 6200 + while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds, &tds_cnc->result_type, NULL)) +#elif FREETDS_VERSION > 6000 while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds, &tds_cnc->result_type)) #else while ((tds_cnc->rc = tds_process_result_tokens (tds_cnc->tds)) -@@ -1002,7 +1008,7 @@ +@@ -1002,7 +1010,7 @@ provider_class->supports = gda_freetds_provider_supports; provider_class->get_schema = gda_freetds_provider_get_schema; @@ -164,7 +166,7 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.c libgda-1.2.3-p if (tds_cbs_initialized == FALSE) { tds_cbs_initialized = TRUE; -@@ -1025,7 +1031,7 @@ +@@ -1025,7 +1033,7 @@ g_return_if_fail (GDA_IS_FREETDS_PROVIDER (provider)); @@ -173,7 +175,7 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.c libgda-1.2.3-p tds_cbs_initialized = FALSE; g_tds_msg_handler = NULL; g_tds_err_handler = NULL; -@@ -1058,9 +1064,15 @@ +@@ -1058,9 +1066,15 @@ TDS_SUCCEED); msg = g_strdup_printf(_("Msg %d, Level %d, State %d, Server %s, Line %d\n%s\n"), @@ -189,7 +191,7 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.c libgda-1.2.3-p (msg_info->server ? msg_info->server : ""), msg_info->line_number, msg_info->message ? msg_info->message : ""); -@@ -1070,7 +1082,11 @@ +@@ -1070,7 +1084,11 @@ if (cnc != NULL) { error = gda_error_new (); gda_error_set_description (error, msg); @@ -201,7 +203,7 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.c libgda-1.2.3-p gda_error_set_source (error, "gda-freetds"); if (msg_info->sql_state != NULL) { gda_error_set_sqlstate (error, -@@ -1095,14 +1111,14 @@ +@@ -1095,14 +1113,14 @@ return TDS_SUCCEED; } @@ -218,7 +220,7 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.c libgda-1.2.3-p (void *) msg, #else (void *) tds->msg_info, -@@ -1117,14 +1133,14 @@ +@@ -1117,14 +1135,14 @@ } #endif @@ -237,7 +239,7 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.c libgda-1.2.3-p (void *) tds->msg_info, diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.h libgda-1.2.3-patched/providers/freetds/gda-freetds-provider.h --- libgda-1.2.3/providers/freetds/gda-freetds-provider.h 2005-10-27 04:18:24.000000000 -0500 -+++ libgda-1.2.3-patched/providers/freetds/gda-freetds-provider.h 2006-08-02 15:38:55.000000000 -0500 ++++ libgda-1.2.3-patched/providers/freetds/gda-freetds-provider.h 2006-08-06 02:13:21.000000000 -0500 @@ -30,14 +30,16 @@ G_BEGIN_DECLS @@ -273,7 +275,7 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-provider.h libgda-1.2.3-p TDSCONFIGINFO *config; /* tds config struct */ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-recordset.c libgda-1.2.3-patched/providers/freetds/gda-freetds-recordset.c --- libgda-1.2.3/providers/freetds/gda-freetds-recordset.c 2004-12-28 08:26:11.000000000 -0500 -+++ libgda-1.2.3-patched/providers/freetds/gda-freetds-recordset.c 2006-08-02 15:25:34.000000000 -0500 ++++ libgda-1.2.3-patched/providers/freetds/gda-freetds-recordset.c 2006-08-06 04:09:11.000000000 -0500 @@ -279,7 +279,7 @@ /* set pointers to NULL */ @@ -283,16 +285,29 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-recordset.c libgda-1.2.3- copy->column_varaddr = NULL; #else copy->varaddr = NULL; -@@ -339,7 +339,7 @@ +@@ -339,9 +339,20 @@ recset->priv->tds_cnc = tds_cnc; recset->priv->res = tds_cnc->tds->res_info; -#ifdef HAVE_FREETDS_VER0_6X +#if FREETDS_VERSION > 6000 ++#if FREETDS_VERSION >= 6400 ++ while ((tds_cnc->rc = tds_process_tokens (tds_cnc->tds, ++ &tds_cnc->result_type, NULL, ++ TDS_RETURN_ROWFMT | TDS_RETURN_COMPUTEFMT | ++ TDS_RETURN_DONE | TDS_STOPAT_ROW | ++ TDS_STOPAT_COMPUTE | TDS_RETURN_PROC)) ++#elif FREETDS_VERSION >= 6200 ++ 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, &tds_cnc->result_type)) ++#endif == TDS_SUCCEED) { -@@ -378,7 +378,11 @@ + if (tds_cnc->result_type == TDS_ROW_RESULT) { + gint row_type, compute_id; +@@ -378,7 +389,11 @@ g_object_unref (recset); recset = NULL; return NULL; @@ -306,7 +321,7 @@ diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-recordset.c libgda-1.2.3- gda_connection_add_error (cnc, error); diff -NurdB libgda-1.2.3/providers/freetds/gda-freetds-types.c libgda-1.2.3-patched/providers/freetds/gda-freetds-types.c --- libgda-1.2.3/providers/freetds/gda-freetds-types.c 2003-03-09 13:55:34.000000000 -0500 -+++ libgda-1.2.3-patched/providers/freetds/gda-freetds-types.c 2006-08-02 01:38:55.000000000 -0500 ++++ libgda-1.2.3-patched/providers/freetds/gda-freetds-types.c 2006-08-06 02:13:21.000000000 -0500 @@ -191,7 +191,7 @@ const TDS_INT max_size = 255; TDS_INT col_size = 0; -- 2.26.2