From 5337202d6ff3c53d9d40e236ce375329b62bf4e6 Mon Sep 17 00:00:00 2001 From: rillig Date: Fri, 29 Apr 2005 22:18:30 +0000 Subject: Added compatibility patches for ISO C90. Approved by wiz. --- databases/mergeant/distinfo | 9 +++++++-- databases/mergeant/patches/patch-ac | 21 ++++++++++++++++++--- databases/mergeant/patches/patch-ae | 19 +++++++++++++++++++ databases/mergeant/patches/patch-af | 21 +++++++++++++++++++++ databases/mergeant/patches/patch-ag | 23 +++++++++++++++++++++++ databases/mergeant/patches/patch-ah | 18 ++++++++++++++++++ 6 files changed, 106 insertions(+), 5 deletions(-) create mode 100644 databases/mergeant/patches/patch-ae create mode 100644 databases/mergeant/patches/patch-af create mode 100644 databases/mergeant/patches/patch-ag create mode 100644 databases/mergeant/patches/patch-ah (limited to 'databases') diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo index e731ca6c23b..bdb80c946db 100644 --- a/databases/mergeant/distinfo +++ b/databases/mergeant/distinfo @@ -1,7 +1,12 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 19:18:57 drochner Exp $ +$NetBSD: distinfo,v 1.6 2005/04/29 22:18:30 rillig Exp $ SHA1 (mergeant-0.52.tar.bz2) = a762127ce6cc6faa6b4b481e97668d9ee6e53f86 +RMD160 (mergeant-0.52.tar.bz2) = eb1d887af1c390dbbe8bcad23c6b0a3f65d93f26 Size (mergeant-0.52.tar.bz2) = 2058623 bytes SHA1 (patch-aa) = 9de4817eda5d142dffe23193bbeef84fb8c81e70 -SHA1 (patch-ac) = 3f01d90b642f94ac6a5863bed3c09b7e6778dec6 +SHA1 (patch-ac) = 73374c77f3cca9f1d9ecbe97a8e82ee8d12b7ef5 SHA1 (patch-ad) = 130ca358b813e2d146784e41616e36cb5a063c68 +SHA1 (patch-ae) = 6a0eda10b0e26dd6f28e39b14b3b1ce75998ff45 +SHA1 (patch-af) = dbbe8a06d9eff06538d149f8f1ed46e59933569b +SHA1 (patch-ag) = b82f6dee6b6964d49431289a74009417bd837576 +SHA1 (patch-ah) = f53f828a13d87c84b5fab5a4b19339cc08007316 diff --git a/databases/mergeant/patches/patch-ac b/databases/mergeant/patches/patch-ac index 46ff225bbea..a75faf0f696 100644 --- a/databases/mergeant/patches/patch-ac +++ b/databases/mergeant/patches/patch-ac @@ -1,7 +1,9 @@ -$NetBSD: patch-ac,v 1.1 2005/02/25 17:51:45 drochner Exp $ +$NetBSD: patch-ac,v 1.2 2005/04/29 22:18:30 rillig Exp $ ---- libmergeant/mg-query.c.orig 2005-01-18 19:45:33.000000000 +0100 -+++ libmergeant/mg-query.c +Needed for ISO C90 compliance. + +--- libmergeant/mg-query.c.orig Sun Aug 8 17:20:06 2004 ++++ libmergeant/mg-query.c Tue Apr 26 13:07:06 2005 @@ -44,7 +44,7 @@ #include "mg-server-aggregate.h" #include "mg-data-handler.h" @@ -11,3 +13,16 @@ $NetBSD: patch-ac,v 1.1 2005/02/25 17:51:45 drochner Exp $ #include "mg-qf-func.h" /* +@@ -5117,9 +5117,10 @@ parsed_create_update_query (MgQuery *que + if (!cond) + has_error = TRUE; + else { ++ MgQfield *field_left, *field_right; + g_assert (mg_condition_get_cond_type (cond) == MG_CONDITION_LEAF_EQUAL); +- MgQfield *field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT); +- MgQfield *field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT); ++ field_left = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_LEFT); ++ field_right = mg_condition_leaf_get_operator (cond, MG_CONDITION_OP_RIGHT); + + if (IS_MG_QF_FIELD (field_left)) { + g_object_set (G_OBJECT (field_left), "value_provider", field_right, NULL); diff --git a/databases/mergeant/patches/patch-ae b/databases/mergeant/patches/patch-ae new file mode 100644 index 00000000000..01f21de6676 --- /dev/null +++ b/databases/mergeant/patches/patch-ae @@ -0,0 +1,19 @@ +$NetBSD: patch-ae,v 1.1 2005/04/29 22:18:30 rillig Exp $ + +Needed for ISO C90 compliance. + +--- libmergeant/mg-work-grid.c.orig Sat Jul 10 15:42:54 2004 ++++ libmergeant/mg-work-grid.c Tue Apr 26 13:17:27 2005 +@@ -2299,10 +2299,11 @@ grid_modif_struct_set_status (MgWorkGrid + GtkTreeModel *tree_model, GtkTreeIter *iter, + MgWorkCore *core, MgDataEntryAttribute requested_status) + { +- g_return_if_fail (user_modif); + guint attrs; + GtkTreePath *path; + gint row; ++ ++ g_return_if_fail (user_modif); + + switch (requested_status) { + case MG_DATA_ENTRY_IS_NULL: diff --git a/databases/mergeant/patches/patch-af b/databases/mergeant/patches/patch-af new file mode 100644 index 00000000000..b35cbffb4bd --- /dev/null +++ b/databases/mergeant/patches/patch-af @@ -0,0 +1,21 @@ +$NetBSD: patch-af,v 1.1 2005/04/29 22:18:30 rillig Exp $ + +Needed for ISO C90 compliance. + +--- libmergeant/graph/mg-canvas-field.c.orig Sat Jul 10 15:42:54 2004 ++++ libmergeant/graph/mg-canvas-field.c Tue Apr 26 13:27:20 2005 +@@ -146,13 +146,13 @@ mg_canvas_field_set_property (GObject + gpointer ptr; + GString *string; + MgServerDataType *dtype; ++ MgEntity *ent; + + cf = MG_CANVAS_FIELD (object); + + switch (param_id) { + case PROP_FIELD: + ptr = g_value_get_pointer (value); +- MgEntity *ent; + g_return_if_fail (IS_MG_FIELD (ptr)); + + /* signals management */ diff --git a/databases/mergeant/patches/patch-ag b/databases/mergeant/patches/patch-ag new file mode 100644 index 00000000000..0c7c069ecd9 --- /dev/null +++ b/databases/mergeant/patches/patch-ag @@ -0,0 +1,23 @@ +$NetBSD: patch-ag,v 1.1 2005/04/29 22:18:30 rillig Exp $ + +Needed for ISO C90 compliance. + +--- libmergeant/mg-form.c.orig Fri Jul 16 21:47:26 2004 ++++ libmergeant/mg-form.c Tue Apr 26 13:04:05 2005 +@@ -586,6 +586,7 @@ mark_not_null_entry_labels (MgForm *form + { + PangoAttrList *attrs = NULL; + PangoAttribute *att; ++ GSList *list; + + if (show_mark) { + attrs = pango_attr_list_new (); +@@ -595,7 +596,7 @@ mark_not_null_entry_labels (MgForm *form + pango_attr_list_insert (attrs, att); + } + +- GSList *list = form->priv->not_null_labels; ++ list = form->priv->not_null_labels; + while (list) { + gtk_label_set_attributes (GTK_LABEL (list->data), attrs); + list = g_slist_next (list); diff --git a/databases/mergeant/patches/patch-ah b/databases/mergeant/patches/patch-ah new file mode 100644 index 00000000000..6ff64f5bb60 --- /dev/null +++ b/databases/mergeant/patches/patch-ah @@ -0,0 +1,18 @@ +$NetBSD: patch-ah,v 1.1 2005/04/29 22:18:30 rillig Exp $ + +Needed for ISO C90 compliance. + +--- libmergeant/mg-parameter.c.orig Sat Jul 10 15:43:03 2004 ++++ libmergeant/mg-parameter.c Tue Apr 26 13:05:11 2005 +@@ -608,9 +608,10 @@ void + mg_parameter_set_value (MgParameter *param, const GdaValue *value) + { + gboolean changed = TRUE; ++ const GdaValue *current_val; ++ + g_return_if_fail (param && IS_MG_PARAMETER (param)); + g_return_if_fail (param->priv); +- const GdaValue *current_val; + + param->priv->invalid_forced = FALSE; + -- cgit v1.2.3