Revision bump with updates to latest API updates

Package-Manager: portage-2.1.2-r9

diff --git a/dev-db/mergeant/ChangeLog b/dev-db/mergeant/ChangeLog
index 288b7c7aff2c68a10b25f187ea782d6696cda4ba..9ef03ec8f9ea067c46821e9e1013a141b3075f4b 100644 (file)
--- a/dev-db/mergeant/ChangeLog
+++ b/dev-db/mergeant/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-db/mergeant
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.11 2007/01/29 22:58:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/ChangeLog,v 1.12 2007/02/13 22:27:55 leonardop Exp $
+
+*mergeant-0.65-r1 (13 Feb 2007)
+
+  13 Feb 2007; Leonardo Boshell <leonardop@gentoo.org>
+  files/mergeant-0.65-api_updates.patch, -mergeant-0.65.ebuild,
+  +mergeant-0.65-r1.ebuild:
+  Updated patch to latest API updates.
 
 *mergeant-0.65 (29 Jan 2007)
 

diff --git a/dev-db/mergeant/Manifest b/dev-db/mergeant/Manifest
index 38e030f42134c414d9aa3319687ad9c4dc20060a..de1b3e692bfdc79703fb4ef10109d7571c814edd 100644 (file)
--- a/dev-db/mergeant/Manifest
+++ b/dev-db/mergeant/Manifest
@@ -1,20 +1,20 @@
-AUX mergeant-0.65-api_updates.patch 6391 RMD160 9b615f84d615d5ed4322534302ebc6618c9f787f SHA1 10f18eb15ece27afafe524e6c436a4b049e1b8c5 SHA256 9081d64069d76dfa77899c68d98ef729ca48933cc93a879a3d7aed0c92215139
-MD5 7276dc09c16cd2834b2e34a326503d01 files/mergeant-0.65-api_updates.patch 6391
-RMD160 9b615f84d615d5ed4322534302ebc6618c9f787f files/mergeant-0.65-api_updates.patch 6391
-SHA256 9081d64069d76dfa77899c68d98ef729ca48933cc93a879a3d7aed0c92215139 files/mergeant-0.65-api_updates.patch 6391
+AUX mergeant-0.65-api_updates.patch 13460 RMD160 c0b8e664eed6f36bf9c865f8f7923bc1d392e912 SHA1 22053a1cabd60766649967187b9aabbbbf91a28c SHA256 569cb783ab77cfa2490cb917a8f5162a8d912a5138b9bc44280ed5ed46ba5871
+MD5 a704496227639749ac40e91575fa8427 files/mergeant-0.65-api_updates.patch 13460
+RMD160 c0b8e664eed6f36bf9c865f8f7923bc1d392e912 files/mergeant-0.65-api_updates.patch 13460
+SHA256 569cb783ab77cfa2490cb917a8f5162a8d912a5138b9bc44280ed5ed46ba5871 files/mergeant-0.65-api_updates.patch 13460
 DIST mergeant-0.65.tar.bz2 986229 RMD160 c0acc4415b3ad0a98a88907791289fdcf79e03c3 SHA1 7081de474d687ff9a7b3bbe5ddb8b05ca67256f4 SHA256 340a6d77b58f9f03079fbd6ff7298b22fb8b218a06e863fb1005844aa8f4eee0
-EBUILD mergeant-0.65.ebuild 1047 RMD160 b6461ae09a6beb0a5de90c41859c592ca4b85836 SHA1 ea91c8841f561b96e0881e3140bb2884463fd9b2 SHA256 204782f8f16c4c2be30511465afda992b49ccf189b0ee2016fadce49393d4596
-MD5 1017ff2771a5459ce9380db077e9aac8 mergeant-0.65.ebuild 1047
-RMD160 b6461ae09a6beb0a5de90c41859c592ca4b85836 mergeant-0.65.ebuild 1047
-SHA256 204782f8f16c4c2be30511465afda992b49ccf189b0ee2016fadce49393d4596 mergeant-0.65.ebuild 1047
-MISC ChangeLog 1744 RMD160 8bf8f1ba161248bbe5f911c89ae004c3f61d6a49 SHA1 5a4dc290e2393df8efad22dd9e7c0b5d56d5e4a3 SHA256 bb09971221fb355dd38497730b96cb4917561872f707b53abb70c96925d50948
-MD5 76d188532f9e00c282b2b9271c453a6a ChangeLog 1744
-RMD160 8bf8f1ba161248bbe5f911c89ae004c3f61d6a49 ChangeLog 1744
-SHA256 bb09971221fb355dd38497730b96cb4917561872f707b53abb70c96925d50948 ChangeLog 1744
+EBUILD mergeant-0.65-r1.ebuild 1050 RMD160 841f6e53d306ab365208c87ef0b81e321b1271d9 SHA1 6e7985dc195931757aff28304705413b35a620e8 SHA256 7a26b92c77c52fca17acfbb870fffaf290a01725e69b191d8e7f0e5e40bdbfeb
+MD5 778e9a29987a4986b566d22c40fbeffe mergeant-0.65-r1.ebuild 1050
+RMD160 841f6e53d306ab365208c87ef0b81e321b1271d9 mergeant-0.65-r1.ebuild 1050
+SHA256 7a26b92c77c52fca17acfbb870fffaf290a01725e69b191d8e7f0e5e40bdbfeb mergeant-0.65-r1.ebuild 1050
+MISC ChangeLog 1964 RMD160 da0dda04ad67c69676d0bc0c4add576ccd0be379 SHA1 a2db38785baade2fc7f60842ce85d83d217cbeaa SHA256 02aa6f36c794a349afca57f096b9bc754bad075267573c328b6e75b9f441e041
+MD5 7157105c542d9537800252c009a2ad23 ChangeLog 1964
+RMD160 da0dda04ad67c69676d0bc0c4add576ccd0be379 ChangeLog 1964
+SHA256 02aa6f36c794a349afca57f096b9bc754bad075267573c328b6e75b9f441e041 ChangeLog 1964
 MISC metadata.xml 223 RMD160 b838a1b78a7909ef0d6b335da68d2cc5634c8780 SHA1 8f61ac9df493a913ac92dcbfd3cc2d90966a559d SHA256 051b289f968f9d1c388270c2798a17bdd6b02db8b69c8628e52dd6fea97c0e15
 MD5 1351f9a4a772bff3c6917bd5fc18ddb0 metadata.xml 223
 RMD160 b838a1b78a7909ef0d6b335da68d2cc5634c8780 metadata.xml 223
 SHA256 051b289f968f9d1c388270c2798a17bdd6b02db8b69c8628e52dd6fea97c0e15 metadata.xml 223
-MD5 89f32e84b49b5e585324e7fc76c1180f files/digest-mergeant-0.65 244
-RMD160 f1194dcb02600c0818e83147d0946909092b328e files/digest-mergeant-0.65 244
-SHA256 7d15244cae5e3cf349df8319a0c91019d031a4fc1a0867e589c8108b0ce32bfd files/digest-mergeant-0.65 244
+MD5 89f32e84b49b5e585324e7fc76c1180f files/digest-mergeant-0.65-r1 244
+RMD160 f1194dcb02600c0818e83147d0946909092b328e files/digest-mergeant-0.65-r1 244
+SHA256 7d15244cae5e3cf349df8319a0c91019d031a4fc1a0867e589c8108b0ce32bfd files/digest-mergeant-0.65-r1 244

diff --git a/dev-db/mergeant/files/digest-mergeant-0.65 b/dev-db/mergeant/files/digest-mergeant-0.65-r1
similarity index 100%
rename from dev-db/mergeant/files/digest-mergeant-0.65
rename to dev-db/mergeant/files/digest-mergeant-0.65-r1

diff --git a/dev-db/mergeant/files/mergeant-0.65-api_updates.patch b/dev-db/mergeant/files/mergeant-0.65-api_updates.patch
index 43fbc365667d19707fa059402d00d5fff5198796..df306d22a50b360648026116e3b52f83e39761c6 100644 (file)
--- a/dev-db/mergeant/files/mergeant-0.65-api_updates.patch
+++ b/dev-db/mergeant/files/mergeant-0.65-api_updates.patch
@@ -1,37 +1,76 @@
-diff -NurdpB mergeant-0.65/configure.in mergeant-0.65-patched/configure.in
+diff -NurdB mergeant-0.65/configure.in mergeant-0.65-patched/configure.in
 --- mergeant-0.65/configure.in 2006-12-22 14:57:36.000000000 -0500
-+++ mergeant-0.65-patched/configure.in 2007-01-29 16:47:26.000000000 -0500
-@@ -80,6 +80,7 @@ ALL_LINGUAS="am ar az ca cs da de el en_
++++ mergeant-0.65-patched/configure.in 2007-02-13 05:42:58.000000000 -0500
+@@ -79,8 +79,10 @@
+ ALL_LINGUAS="am ar az ca cs da de el en_CA en_GB es eu fa fi fr gl hr it ja lt ml ms nb ne nl pl pt pt_BR ru rw sk sq sr sr@Latn sv tr uk vi zh_CN  zh_HK zh_TW"
  AM_GLIB_GNU_GETTEXT
  
- PKG_CHECK_MODULES(MERGEANT, libgnomedb-3.0 >= 2.99.2 \
-+      libgnomedb-graph-3.0 \
-         libgda-3.0 >= 2.99.2 \
+-PKG_CHECK_MODULES(MERGEANT, libgnomedb-3.0 >= 2.99.2 \
+-        libgda-3.0 >= 2.99.2 \
++PKG_CHECK_MODULES(MERGEANT, libgnomedb-3.0 >= 2.99.5 \
++      libgnomedb-graph-3.0 >= 2.99.5 \
++      libgnomedb-extra-3.0 >= 2.99.5 \
++      libgda-3.0 >= 2.99.5 \
        gconf-2.0 \
          gtk+-2.0 >= 2.6.0 \
-diff -NurdpB mergeant-0.65/src/query-druid.c mergeant-0.65-patched/src/query-druid.c
+       gdk-pixbuf-2.0 \
+diff -NurdB mergeant-0.65/src/mg-extra-formgrid.c mergeant-0.65-patched/src/mg-extra-formgrid.c
+--- mergeant-0.65/src/mg-extra-formgrid.c      2006-12-21 03:40:36.000000000 -0500
++++ mergeant-0.65-patched/src/mg-extra-formgrid.c      2007-02-13 14:09:56.000000000 -0500
+@@ -184,7 +184,7 @@
+ 
+       formgrid->priv->info = gnome_db_data_widget_info_new (GNOME_DB_DATA_WIDGET (formgrid->priv->raw_grid), 
+                                                             GNOME_DB_DATA_WIDGET_INFO_CURRENT_ROW |
+-                                                            GNOME_DB_DATA_WIDGET_INFO_ROW_MODIF_BUTTONS |
++                                                            GNOME_DB_DATA_WIDGET_INFO_ROW_MODIFY_BUTTONS |
+                                                             GNOME_DB_DATA_WIDGET_INFO_CHUNCK_CHANGE_BUTTONS);
+       gtk_box_pack_start (GTK_BOX (hbox), formgrid->priv->info, TRUE, TRUE, 0);
+       gtk_widget_show (formgrid->priv->info);
+@@ -198,7 +198,7 @@
+               g_object_set (G_OBJECT (formgrid->priv->info),
+                             "data-widget", formgrid->priv->raw_form,
+                             "flags", GNOME_DB_DATA_WIDGET_INFO_CURRENT_ROW |
+-                            GNOME_DB_DATA_WIDGET_INFO_ROW_MODIF_BUTTONS |
++                            GNOME_DB_DATA_WIDGET_INFO_ROW_MODIFY_BUTTONS |
+                             GNOME_DB_DATA_WIDGET_INFO_ROW_MOVE_BUTTONS, NULL);
+               gtk_button_set_image (GTK_BUTTON (button), 
+                                     gtk_image_new_from_file (MERGEANT_PIXMAPDIR "/mg-extra-form.png"));
+@@ -208,7 +208,7 @@
+               g_object_set (G_OBJECT (formgrid->priv->info),
+                             "data-widget", formgrid->priv->raw_grid,
+                             "flags", GNOME_DB_DATA_WIDGET_INFO_CURRENT_ROW |
+-                            GNOME_DB_DATA_WIDGET_INFO_ROW_MODIF_BUTTONS |
++                            GNOME_DB_DATA_WIDGET_INFO_ROW_MODIFY_BUTTONS |
+                             GNOME_DB_DATA_WIDGET_INFO_CHUNCK_CHANGE_BUTTONS, NULL);
+               gtk_button_set_image (GTK_BUTTON (button), 
+                                     gtk_image_new_from_file (MERGEANT_PIXMAPDIR "/mg-extra-grid.png"));
+diff -NurdB mergeant-0.65/src/query-druid.c mergeant-0.65-patched/src/query-druid.c
 --- mergeant-0.65/src/query-druid.c    2006-10-27 10:02:09.000000000 -0500
-+++ mergeant-0.65-patched/src/query-druid.c    2007-01-29 16:55:56.000000000 -0500
-@@ -19,6 +19,7 @@
++++ mergeant-0.65-patched/src/query-druid.c    2007-02-13 14:25:53.000000000 -0500
+@@ -19,6 +19,9 @@
   */
  
  #include "query-druid.h"
++#include <libgnomedb-extra/gnome-db-editor.h>
++#include <libgnomedb-extra/gnome-db-selector.h>
 +#include <libgnomedb-graph/libgnomedb-graph.h>
  #include <libgnomedb/libgnomedb.h>
  #include <libgda/libgda.h>
  #include "workspace-page.h"
-diff -NurdpB mergeant-0.65/src/query-editor.c mergeant-0.65-patched/src/query-editor.c
+diff -NurdB mergeant-0.65/src/query-editor.c mergeant-0.65-patched/src/query-editor.c
 --- mergeant-0.65/src/query-editor.c   2006-12-22 05:06:35.000000000 -0500
-+++ mergeant-0.65-patched/src/query-editor.c   2007-01-29 16:54:56.000000000 -0500
-@@ -22,6 +22,7 @@
++++ mergeant-0.65-patched/src/query-editor.c   2007-02-13 06:08:16.000000000 -0500
+@@ -21,7 +21,8 @@
+ #include "query-editor.h"
  #include "query-fields-editor.h"
  #include "query-params-editor.h"
- #include <libgnomedb/gnome-db-editor.h>
+-#include <libgnomedb/gnome-db-editor.h>
++#include <libgnomedb-extra/gnome-db-editor.h>
 +#include <libgnomedb-graph/libgnomedb-graph.h>
  
  static void query_editor_class_init (QueryEditorClass * class);
  static void query_editor_init (QueryEditor * wid);
-@@ -488,8 +489,8 @@ query_changed_cb (GdaQuery *query, Query
+@@ -488,8 +489,8 @@
                gtk_entry_set_text (GTK_ENTRY (qedit->priv->q_descr), "");
  
        /* SQL version */
@@ -42,7 +81,7 @@ diff -NurdpB mergeant-0.65/src/query-editor.c mergeant-0.65-patched/src/query-ed
        if (sql) {
                gnome_db_editor_set_text (GNOME_DB_EDITOR (qedit->priv->sql_editor), sql, -1);
                g_free (sql);
-@@ -503,8 +504,8 @@ query_changed_cb (GdaQuery *query, Query
+@@ -503,8 +504,8 @@
                sql = NULL;
  
                if (cond) 
@@ -53,10 +92,19 @@ diff -NurdpB mergeant-0.65/src/query-editor.c mergeant-0.65-patched/src/query-ed
                if (sql) {
                        gnome_db_editor_set_text (GNOME_DB_EDITOR (qedit->priv->select_where), sql, -1);
                        g_free (sql);
-diff -NurdpB mergeant-0.65/src/query-fields-editor.c mergeant-0.65-patched/src/query-fields-editor.c
+diff -NurdB mergeant-0.65/src/query-fields-editor.c mergeant-0.65-patched/src/query-fields-editor.c
 --- mergeant-0.65/src/query-fields-editor.c    2006-10-27 10:02:09.000000000 -0500
-+++ mergeant-0.65-patched/src/query-fields-editor.c    2007-01-29 16:39:33.000000000 -0500
-@@ -476,7 +476,7 @@ renderer_field_filter_edited_cb (GtkCell
++++ mergeant-0.65-patched/src/query-fields-editor.c    2007-02-13 16:45:43.000000000 -0500
+@@ -431,7 +431,7 @@
+               g_object_get (G_OBJECT (field), "gda-type", &gtype, NULL);
+               dh = gda_dict_get_default_handler (gda_object_get_dict ((GdaObject *) field), gtype);
+               value = gda_data_handler_get_value_from_sql (dh, new_text, 
+-                                                           gda_query_field_value_get_g_type (GDA_QUERY_FIELD_VALUE (field)));
++                                                           gda_entity_field_get_g_type (GDA_ENTITY_FIELD (field)));
+               if (value) {
+                       gda_query_field_value_set_value (GDA_QUERY_FIELD_VALUE (field), value);
+                       gda_value_free (value);
+@@ -476,7 +476,7 @@
                newcond = gda_query_condition_new_from_sql (fedit->priv->query, new_text, NULL, &error);
                if (!newcond) {
                        gchar *sql;
@@ -65,7 +113,7 @@ diff -NurdpB mergeant-0.65/src/query-fields-editor.c mergeant-0.65-patched/src/q
                        if (sql) {
                                gchar *text = g_strdup_printf ("%s %s", sql, new_text);
                                g_free (sql);
-@@ -700,7 +700,7 @@ query_changed_cb (GdaQuery *query, Query
+@@ -700,7 +700,7 @@
                }
                
                /* modify the model at iter */
@@ -74,7 +122,7 @@ diff -NurdpB mergeant-0.65/src/query-fields-editor.c mergeant-0.65-patched/src/q
                order = gda_query_get_order_by_field (fedit->priv->query, field, &asc);
                if (order >= 0) {
                        order_str = g_strdup_printf ("%d", order + 1);
-@@ -709,8 +709,8 @@ query_changed_cb (GdaQuery *query, Query
+@@ -709,8 +709,8 @@
                cond = g_object_get_data (G_OBJECT (field), "qf_filter_cond");
                g_object_set_data (G_OBJECT (field), "qf_filter_cond", NULL);
                if (cond) 
@@ -85,20 +133,104 @@ diff -NurdpB mergeant-0.65/src/query-fields-editor.c mergeant-0.65-patched/src/q
                                                                    NULL);
                gtk_list_store_set (GTK_LIST_STORE (model), &iter,
                                    COLUMN_FIELD_PTR, field,
-diff -NurdpB mergeant-0.65/src/ws-dbrels.c mergeant-0.65-patched/src/ws-dbrels.c
+diff -NurdB mergeant-0.65/src/query-params-editor.c mergeant-0.65-patched/src/query-params-editor.c
+--- mergeant-0.65/src/query-params-editor.c    2006-11-18 10:28:55.000000000 -0500
++++ mergeant-0.65-patched/src/query-params-editor.c    2007-02-13 16:49:37.000000000 -0500
+@@ -436,7 +436,7 @@
+                       GdaDataHandler *dh;
+                       GdaDictType *dtype;
+ 
+-                      dtype = gda_query_field_value_get_dict_type (GDA_QUERY_FIELD_VALUE (field));
++                      dtype = gda_entity_field_get_dict_type (GDA_ENTITY_FIELD (field));
+                       if (dtype)
+                               vtype = gda_dict_type_get_g_type (dtype);
+                       else
+@@ -444,7 +444,7 @@
+ 
+                       dh = gda_dict_get_default_handler (gda_object_get_dict (GDA_OBJECT (field)), vtype);
+                       value = gda_data_handler_get_value_from_sql (dh, new_text, 
+-                                                                  gda_query_field_value_get_g_type (GDA_QUERY_FIELD_VALUE (field)));
++                                                                  gda_entity_field_get_g_type (GDA_ENTITY_FIELD (field)));
+                       if (value) {
+                               gda_query_field_value_set_value (GDA_QUERY_FIELD_VALUE (field), value);
+                               gda_value_free (value);
+@@ -494,7 +494,7 @@
+                       field = (GdaQueryField *) (list->data);
+                       
+                       if (GDA_IS_QUERY_FIELD_VALUE (field)) 
+-                              gda_query_field_value_set_dict_type (GDA_QUERY_FIELD_VALUE (field), dtype);
++                              gda_entity_field_set_dict_type (GDA_ENTITY_FIELD (field), dtype);
+                       
+                       list = g_slist_next (list);
+               }
+@@ -656,7 +656,7 @@
+ 
+               list = fields;
+               while (list) {
+-                      if (GDA_IS_QUERY_FIELD_VALUE (list->data) && !gda_query_field_value_is_parameter (GDA_QUERY_FIELD_VALUE (list->data))) {
++                      if (GDA_IS_QUERY_FIELD_VALUE (list->data) && !gda_query_field_value_get_is_parameter (GDA_QUERY_FIELD_VALUE (list->data))) {
+                               GdaQueryFieldValue *qfield = GDA_QUERY_FIELD_VALUE (list->data);
+                               gchar *valstr;
+                               const gchar *typestr;
+@@ -685,7 +685,7 @@
+                               else
+                                       valstr = g_strdup ("");
+                               
+-                              typestr = gda_dict_type_get_sqlname (gda_query_field_value_get_dict_type (qfield));
++                              typestr = gda_dict_type_get_sqlname (gda_entity_field_get_dict_type (GDA_ENTITY_FIELD (qfield)));
+                               gtk_list_store_set (GTK_LIST_STORE (model), &iter,
+                                                   COLUMN_PARAM_PTR, NULL,
+                                                   COLUMN_QFVALUE_PTR, qfield,
+diff -NurdB mergeant-0.65/src/workspace-window.c mergeant-0.65-patched/src/workspace-window.c
+--- mergeant-0.65/src/workspace-window.c       2006-12-05 09:50:15.000000000 -0500
++++ mergeant-0.65-patched/src/workspace-window.c       2007-02-13 06:17:25.000000000 -0500
+@@ -31,7 +31,7 @@
+ #include <libgnomeui/gnome-about.h>
+ #include <libgnomedb/libgnomedb.h>
+ #include <libgnomedb/gnome-db-login-dialog.h>
+-#include <libgnomedb/gnome-db-dbms-update-viewer.h>
++#include <libgnomedb-extra/gnome-db-dbms-update-viewer.h>
+ #include "workspace.h"
+ #include "workspace-window.h"
+ #include <libgda/gda-threader.h>
+diff -NurdB mergeant-0.65/src/workspace.c mergeant-0.65-patched/src/workspace.c
+--- mergeant-0.65/src/workspace.c      2006-12-20 09:32:34.000000000 -0500
++++ mergeant-0.65-patched/src/workspace.c      2007-02-13 16:51:01.000000000 -0500
+@@ -29,6 +29,7 @@
+ #include <gtk/gtktable.h>
+ #include <gtk/gtkvpaned.h>
+ #include <libgnomedb/libgnomedb.h>
++#include <libgnomedb-extra/gnome-db-gray-bar.h>
+ #include "workspace.h"
+ #include <string.h>
+ #include "query-druid.h"
+diff -NurdB mergeant-0.65/src/ws-datatypes.c mergeant-0.65-patched/src/ws-datatypes.c
+--- mergeant-0.65/src/ws-datatypes.c   2006-10-27 10:02:10.000000000 -0500
++++ mergeant-0.65-patched/src/ws-datatypes.c   2007-02-13 12:25:56.000000000 -0500
+@@ -24,6 +24,7 @@
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+ #include <libgnomedb/libgnomedb.h>
++#include <libgnomedb-extra/gnome-db-selector.h>
+ #include <glib/gi18n-lib.h>
+ 
+ /* 
+diff -NurdB mergeant-0.65/src/ws-dbrels.c mergeant-0.65-patched/src/ws-dbrels.c
 --- mergeant-0.65/src/ws-dbrels.c      2006-10-27 10:02:10.000000000 -0500
-+++ mergeant-0.65-patched/src/ws-dbrels.c      2007-01-29 16:45:50.000000000 -0500
-@@ -23,7 +23,6 @@
++++ mergeant-0.65-patched/src/ws-dbrels.c      2007-02-13 12:41:12.000000000 -0500
+@@ -23,8 +23,8 @@
  #include <string.h>
  #include <glib-object.h>
  #include <gtk/gtk.h>
 -#include <libgnomedb/libgnomedb.h>
  #include <glib/gi18n-lib.h>
++#include <libgnomedb-extra/gnome-db-selector.h>
  
  /* 
-diff -NurdpB mergeant-0.65/src/ws-dbrels.h mergeant-0.65-patched/src/ws-dbrels.h
+  * Main static functions 
+diff -NurdB mergeant-0.65/src/ws-dbrels.h mergeant-0.65-patched/src/ws-dbrels.h
 --- mergeant-0.65/src/ws-dbrels.h      2006-10-27 10:02:10.000000000 -0500
-+++ mergeant-0.65-patched/src/ws-dbrels.h      2007-01-29 16:46:05.000000000 -0500
++++ mergeant-0.65-patched/src/ws-dbrels.h      2007-02-13 04:33:56.000000000 -0500
 @@ -24,6 +24,7 @@
  
  #include <libgda/libgda.h>
@@ -107,10 +239,19 @@ diff -NurdpB mergeant-0.65/src/ws-dbrels.h mergeant-0.65-patched/src/ws-dbrels.h
  
  
  G_BEGIN_DECLS
-diff -NurdpB mergeant-0.65/src/ws-queries.c mergeant-0.65-patched/src/ws-queries.c
+diff -NurdB mergeant-0.65/src/ws-queries.c mergeant-0.65-patched/src/ws-queries.c
 --- mergeant-0.65/src/ws-queries.c     2006-10-27 10:02:10.000000000 -0500
-+++ mergeant-0.65-patched/src/ws-queries.c     2007-01-29 16:18:51.000000000 -0500
-@@ -613,7 +613,7 @@ utility_query_execute_modif (GdaQuery *q
++++ mergeant-0.65-patched/src/ws-queries.c     2007-02-13 16:52:08.000000000 -0500
+@@ -24,6 +24,8 @@
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+ #include <libgnomedb/libgnomedb.h>
++#include <libgnomedb-extra/gnome-db-editor.h>
++#include <libgnomedb-extra/gnome-db-selector.h>
+ #include "query-druid.h"
+ #include "query-editor.h"
+ #include "query-params-editor.h"
+@@ -613,7 +615,7 @@
        while (parent_window && !GTK_IS_WINDOW (parent_window)) 
                parent_window = gtk_widget_get_parent (parent_window);
  
@@ -119,7 +260,16 @@ diff -NurdpB mergeant-0.65/src/ws-queries.c mergeant-0.65-patched/src/ws-queries
        qtype = gda_query_get_query_type (query);
  
        switch (qtype) {
-@@ -843,7 +843,7 @@ action_query_exec_cb (GtkAction *action,
+@@ -740,7 +742,7 @@
+       qei->query = gda_query_new_copy (query, NULL);
+       query = qei->query;
+ 
+-      if (gda_query_is_modif_query (query)) {
++      if (gda_query_is_modify_query (query)) {
+               /* modification query */
+               context = gda_query_get_parameter_list (query);
+               if (fill_context_in_dialog (ws, context) == GTK_RESPONSE_ACCEPT) 
+@@ -843,7 +845,7 @@
                                gchar *msg;
                                const gchar *sql;
                                
@@ -128,7 +278,7 @@ diff -NurdpB mergeant-0.65/src/ws-queries.c mergeant-0.65-patched/src/ws-queries
                                                                  GDA_RENDERER_EXTRA_PRETTY_SQL, NULL);
                                query_exec_instance_free (qei);
                                msg = g_strdup_printf (_("<b><big>Execute the following query ?</big></b>\n"
-@@ -957,7 +957,7 @@ query_info_display_update (GdaQuery *que
+@@ -957,7 +959,7 @@
        if (query) {
                gchar *sql;
                GError *error = NULL;
@@ -137,3 +287,14 @@ diff -NurdpB mergeant-0.65/src/ws-queries.c mergeant-0.65-patched/src/ws-queries
                                                  GDA_RENDERER_EXTRA_PRETTY_SQL, &error);
                if (sql) {
                        gnome_db_editor_set_text (GNOME_DB_EDITOR (ws->priv->sql_editor), sql, -1);
+diff -NurdB mergeant-0.65/src/ws-tables.c mergeant-0.65-patched/src/ws-tables.c
+--- mergeant-0.65/src/ws-tables.c      2006-12-20 04:53:26.000000000 -0500
++++ mergeant-0.65-patched/src/ws-tables.c      2007-02-13 13:30:25.000000000 -0500
+@@ -24,6 +24,7 @@
+ #include <glib-object.h>
+ #include <gtk/gtk.h>
+ #include <libgnomedb/libgnomedb.h>
++#include <libgnomedb-extra/gnome-db-selector.h>
+ #include <libgda/gda-enums.h>
+ #include <glib/gi18n.h>
+ #include "utils.h"

diff --git a/dev-db/mergeant/mergeant-0.65.ebuild b/dev-db/mergeant/mergeant-0.65-r1.ebuild
similarity index 88%
rename from dev-db/mergeant/mergeant-0.65.ebuild
rename to dev-db/mergeant/mergeant-0.65-r1.ebuild
index 64d09965035f93d6e57f8d48c08bcce4231f4b84..e8c28680cec80e28590a5ad71a057a2dcbf41f7b 100644 (file)
--- a/dev-db/mergeant/mergeant-0.65.ebuild
+++ b/dev-db/mergeant/mergeant-0.65-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.65.ebuild,v 1.1 2007/01/29 22:58:09 leonardop Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/mergeant/mergeant-0.65-r1.ebuild,v 1.1 2007/02/13 22:27:55 leonardop Exp $
 
 WANT_AUTOCONF="2.5"
 WANT_AUTOMAKE="1.9"
@@ -15,8 +15,8 @@ KEYWORDS="~x86"
 
 IUSE="debug doc"
 
-RDEPEND=">=gnome-extra/libgnomedb-2.99.2
-       >=gnome-extra/libgda-2.99.2
+RDEPEND=">=gnome-extra/libgnomedb-2.99.5
+       >=gnome-extra/libgda-2.99.5
        >=gnome-base/gconf-2
        >=x11-libs/gtk+-2.6
        >=dev-libs/libxml2-2