From owner-freebsd-gnome@FreeBSD.ORG Wed Nov 9 02:20:06 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 29E8D16A41F; Wed, 9 Nov 2005 02:20:06 +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 89F9A43D4C; Wed, 9 Nov 2005 02:20:05 +0000 (GMT) (envelope-from root@distalzou.net) Received: from root by mail.distalzou.net with local (Exim 4.54 (FreeBSD)) id 1EZfZE-000Pea-4c; Wed, 09 Nov 2005 11:20:04 +0900 To: FreeBSD-gnats-submit@freebsd.org From: Tod McQuillin X-send-pr-version: 3.113 X-GNATS-Notify: Message-Id: Date: Wed, 09 Nov 2005 11:20:04 +0900 Cc: gnome@FreeBSD.org Subject: [PATCH] databases/libgnomedb: [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: Wed, 09 Nov 2005 02:20:06 -0000 >Submitter-Id: current-users >Originator: Tod McQuillin >Organization: >Confidential: no >Synopsis: [PATCH] databases/libgnomedb: [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: Several source files declare variables in the middle of a block, which gcc 2.95 doesn't like. This patch moves the declarations to the top of the block so that the build succeeds on FreeBSD 4.x. Added file(s): - files/patch-libgnomedb_gnome-db-data-proxy.c - files/patch-libgnomedb_gnome-db-find-dialog.c - files/patch-libgnomedb_gnome-db-grid.c - files/patch-libgnomedb_gnome-db-sql-console.c Port maintainer (gnome@FreeBSD.org) is cc'd. Generated with FreeBSD Port Tools 0.63 >How-To-Repeat: >Fix: --- libgnomedb-1.9.100.patch begins here --- Index: files/patch-libgnomedb_gnome-db-data-proxy.c =================================================================== RCS file: files/patch-libgnomedb_gnome-db-data-proxy.c diff -N files/patch-libgnomedb_gnome-db-data-proxy.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libgnomedb_gnome-db-data-proxy.c 9 Nov 2005 01:02:25 -0000 @@ -0,0 +1,15 @@ +--- libgnomedb/gnome-db-data-proxy.c~ Mon Sep 26 18:32:09 2005 ++++ libgnomedb/gnome-db-data-proxy.c Wed Nov 9 09:51:09 2005 +@@ -1272,10 +1272,10 @@ + void + gnome_db_data_proxy_reset_all (GnomeDbDataProxy *proxy) + { +- g_return_if_fail (proxy && IS_GNOME_DB_DATA_PROXY (proxy)); +- g_return_if_fail (proxy->priv); + GtkTreePath *path; + GtkTreeIter iter; ++ g_return_if_fail (proxy && IS_GNOME_DB_DATA_PROXY (proxy)); ++ g_return_if_fail (proxy->priv); + + /* new rows are first treated and removed (no memory de-allocation here, though) */ + if (proxy->priv->new_rows) { Index: files/patch-libgnomedb_gnome-db-find-dialog.c =================================================================== RCS file: files/patch-libgnomedb_gnome-db-find-dialog.c diff -N files/patch-libgnomedb_gnome-db-find-dialog.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libgnomedb_gnome-db-find-dialog.c 9 Nov 2005 01:02:44 -0000 @@ -0,0 +1,16 @@ +--- libgnomedb/gnome-db-find-dialog.c~ Thu Apr 14 01:26:30 2005 ++++ libgnomedb/gnome-db-find-dialog.c Wed Nov 9 09:48:16 2005 +@@ -216,11 +216,12 @@ + GtkWidget * + gnome_db_find_dialog_new_with_model (const gchar *title, GdaDataModel *dm) + { ++ GnomeDbFindDialog *dialog; + g_return_val_if_fail (GDA_IS_DATA_MODEL (dm), NULL); + + g_object_ref (dm); + +- GnomeDbFindDialog *dialog = gnome_db_find_dialog_new (title); ++ dialog = gnome_db_find_dialog_new (title); + gnome_db_find_dialog_add_fields_from_model (dialog, dm); + + g_object_unref (dm); Index: files/patch-libgnomedb_gnome-db-grid.c =================================================================== RCS file: files/patch-libgnomedb_gnome-db-grid.c diff -N files/patch-libgnomedb_gnome-db-grid.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libgnomedb_gnome-db-grid.c 9 Nov 2005 01:02:34 -0000 @@ -0,0 +1,13 @@ +--- libgnomedb/gnome-db-grid.c~ Thu Sep 8 19:36:57 2005 ++++ libgnomedb/gnome-db-grid.c Wed Nov 9 09:55:03 2005 +@@ -1916,8 +1916,9 @@ + } + else { + /* render all the parameters invalid */ ++ GSList *list; + grid->priv->internal_params_change = TRUE; +- GSList *list = grid->priv->data_set->parameters; ++ list = grid->priv->data_set->parameters; + while (list) { + GnomeDbParameter *tmp; + g_object_get (G_OBJECT (list->data), "simple_bind", &tmp, NULL); Index: files/patch-libgnomedb_gnome-db-sql-console.c =================================================================== RCS file: files/patch-libgnomedb_gnome-db-sql-console.c diff -N files/patch-libgnomedb_gnome-db-sql-console.c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ files/patch-libgnomedb_gnome-db-sql-console.c 9 Nov 2005 01:02:51 -0000 @@ -0,0 +1,12 @@ +--- libgnomedb/gnome-db-sql-console.c~ Thu Aug 11 19:02:22 2005 ++++ libgnomedb/gnome-db-sql-console.c Wed Nov 9 09:53:48 2005 +@@ -596,8 +596,8 @@ + + /* help */ + if (!cmde_ok && !strcmp (pcmde, "?")) { +- cmde_ok = TRUE; + GString *string; ++ cmde_ok = TRUE; + + string = g_string_new (_("SQL statements:\n" + " they can span several lines, and are executed\n" --- libgnomedb-1.9.100.patch ends here ---