From owner-freebsd-gnome@FreeBSD.ORG Tue Nov 8 06:10:56 2005 Return-Path: X-Original-To: gnome@FreeBSD.org Delivered-To: freebsd-gnome@FreeBSD.ORG Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 6652D16A41F; Tue, 8 Nov 2005 06:10:56 +0000 (GMT) (envelope-from root@distalzou.net) Received: from mail.distalzou.net (203.141.139.231.user.ad.il24.net [203.141.139.231]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2685E43D5C; Tue, 8 Nov 2005 06:10:54 +0000 (GMT) (envelope-from root@distalzou.net) Received: from root by mail.distalzou.net with local (Exim 4.54 (FreeBSD)) id 1EZMh2-000K9H-R6; Tue, 08 Nov 2005 15:10:52 +0900 To: FreeBSD-gnats-submit@freebsd.org From: Tod McQuillin X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: Date: Tue, 08 Nov 2005 15:10:52 +0900 Cc: gnome@FreeBSD.org Subject: [PATCH] databases/libgda2: [Fix build on 4.x] X-BeenThere: freebsd-gnome@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: GNOME for FreeBSD -- porting and maintaining List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Nov 2005 06:10:56 -0000 >Submitter-Id: current-users >Originator: Tod McQuillin >Organization: >Confidential: no >Synopsis: [PATCH] databases/libgda2: [Fix build on 4.x] >Severity: non-critical >Priority: low >Category: ports >Class: change-request >Release: FreeBSD 4.11-STABLE i386 >Environment: System: FreeBSD plexi.pun-pun.prv 4.11-STABLE FreeBSD 4.11-STABLE #0: Fri Oct 21 00:15:17 JST 2005 >Description: A couple of source files assume they are using a version of gcc which permits non-C extensions (like declaring variables in the middle of a block). This patch fixes these assumptions which fail using gcc 2.95.4. Also please remove the empty patch files/patch-doc::libgda-C.omf.in Added file(s): - files/patch-libgda_gda-value.c - files/patch-providers_mysql_gda-mysql-recordset.c Port maintainer (gnome@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- libgda2-1.9.100_1.patch begins here --- Index: files/patch-doc::libgda-C.omf.in =================================================================== RCS file: files/patch-doc::libgda-C.omf.in diff -N files/patch-doc::libgda-C.omf.in Index: files/patch-libgda_gda-value.c =================================================================== RCS file: files/patch-libgda_gda-value.c diff -N files/patch-libgda_gda-value.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libgda_gda-value.c 8 Nov 2005 06:03:52 -0000 @@ -0,0 +1,24 @@ +--- ../../work-/libgda-1.9.100/libgda/gda-value.c Tue Nov 8 14:56:44 2005 ++++ libgda/gda-value.c Tue Nov 8 14:57:29 2005 +@@ -1263,8 +1263,8 @@ + gboolean + gda_value_is_number (GdaValue *value) + { +- g_return_val_if_fail (value && G_IS_VALUE(value), FALSE); + GdaValueType type; ++ g_return_val_if_fail (value && G_IS_VALUE(value), FALSE); + + type = GDA_VALUE_TYPE(value); + switch (type) { +@@ -1437,10 +1437,10 @@ + void + gda_value_set_blob (GdaValue *value, const GdaBlob *val) + { ++ GdaBlob *blob; + g_return_if_fail (value); + g_return_if_fail (GDA_IS_BLOB (val)); + +- GdaBlob *blob; + l_g_value_unset (value); + g_value_init (value, G_VALUE_TYPE_BLOB); + Index: files/patch-providers_mysql_gda-mysql-recordset.c =================================================================== RCS file: files/patch-providers_mysql_gda-mysql-recordset.c diff -N files/patch-providers_mysql_gda-mysql-recordset.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-providers_mysql_gda-mysql-recordset.c 8 Nov 2005 06:04:38 -0000 @@ -0,0 +1,19 @@ +--- ../../work-/libgda-1.9.100/providers/mysql/gda-mysql-recordset.c Tue Nov 8 14:56:45 2005 ++++ providers/mysql/gda-mysql-recordset.c Tue Nov 8 14:59:26 2005 +@@ -569,6 +569,7 @@ + colnum != gda_data_model_get_n_columns (GDA_DATA_MODEL(model)); + colnum++) + { ++ gchar *curval; + attrs = gda_data_model_describe_column (GDA_DATA_MODEL(model), colnum); + + mysql_field = mysql_fetch_field_direct (priv_data->mysql_res, colnum); +@@ -577,7 +578,7 @@ + else + column_name = gda_data_model_get_column_title (GDA_DATA_MODEL (model), colnum); + +- gchar *curval = gda_mysql_provider_value_to_sql_string ( ++ curval = gda_mysql_provider_value_to_sql_string ( + NULL, + priv_data->cnc, + gda_row_get_value ((GdaRow *) row, colnum) --- libgda2-1.9.100_1.patch ends here ---