summaryrefslogtreecommitdiffstats
path: root/databases/mergeant/files
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2005-03-12 10:39:38 +0000
committermarcus <marcus@FreeBSD.org>2005-03-12 10:39:38 +0000
commit0b42143dea1a55d0f1f6d09704bbc131e1b633ed (patch)
treebc54902eb18f738e45a91362b2b0faf1ec6d04fa /databases/mergeant/files
parent773c9ca4ac44ac67652d01f1e985e4df8dab5301 (diff)
downloadFreeBSD-ports-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.zip
FreeBSD-ports-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.tar.gz
Presenting GNOME 2.10 for FreeBSD!
The release notes can be found at http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a good idea of what has gone into this release overall. However, a lot of FreeBSD specific additions and fixes have been made. For example, this release offers fixed ACPI support as well as new CPU freqeuncy monitoring support. See the FreeBSD GNOME 2.10 upgrade page at http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well as a list of known issues and upgrade instructions. GNOME 2.10, as well as all of our releases, would not be possible without the great team that goes into porting and testign each and every component. Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all their work. We would also like to thank our adventurous users that chose to ride the walrus. We'd especially like to thank the following users that provided patches for GNOME 2.10: ade Yasuda Keisuke Franz Klammer Khairil Yusof Radek Kozlowsk And anyone else I may have accidentally omitted. As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen courtesy of Franz Klammer. However, unlike GNOME 2.8, we've included all of the FreeBSD GNOME splashscreen entries with gnomesession. You can use the deskutils/splashsetter port to choose the one you like best. As always, GNOME users should _not_ use portupgrade alone to upgrade to 2.10. Instead, get the gnome_upgrade.sh script from http://www.FreeBSD.org/gnome/gnome_upgrade.sh. Enjoy!
Diffstat (limited to 'databases/mergeant/files')
-rw-r--r--databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in11
-rw-r--r--databases/mergeant/files/patch-lib_Makefile.in11
-rw-r--r--databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c17
-rw-r--r--databases/mergeant/files/patch-libmergeant_mg-form.c19
-rw-r--r--databases/mergeant/files/patch-libmergeant_mg-parameter.c13
-rw-r--r--databases/mergeant/files/patch-libmergeant_mg-query.c25
-rw-r--r--databases/mergeant/files/patch-libmergeant_mg-work-grid.c14
-rw-r--r--databases/mergeant/files/patch-src_Makefile.in11
-rw-r--r--databases/mergeant/files/patch-src_interface_cb.c10
-rw-r--r--databases/mergeant/files/patch-src_plugins_netaddr_makefile.in11
-rw-r--r--databases/mergeant/files/patch-src_plugins_picts_Makefile.in11
-rw-r--r--databases/mergeant/files/patch-src_plugins_sample_Makefile.in11
12 files changed, 99 insertions, 65 deletions
diff --git a/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in
new file mode 100644
index 0000000..52e6297
--- /dev/null
+++ b/databases/mergeant/files/patch-doc_libmergeant_C_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/libmergeant/C/Makefile.in.orig Sat Aug 14 04:12:49 2004
++++ doc/libmergeant/C/Makefile.in Sat Aug 14 04:13:07 2004
+@@ -214,7 +214,7 @@
+
+ # The name of the module.
+ DOC_MODULE = libmergeant
+-HTML_DIR = $(datadir)/gtk-doc/html
++HTML_DIR = $(prefix)/share/doc
+
+ # The top-level SGML file.
+ DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/databases/mergeant/files/patch-lib_Makefile.in b/databases/mergeant/files/patch-lib_Makefile.in
deleted file mode 100644
index f65ceca..0000000
--- a/databases/mergeant/files/patch-lib_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- lib/Makefile.in.orig Sat Sep 14 18:40:05 2002
-+++ lib/Makefile.in Sat Sep 14 18:40:22 2002
-@@ -120,7 +120,7 @@
-
- noinst_LTLIBRARIES = libgdbshared.la
-
--INCLUDES = $(MERGEANT_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_LOCALEDIR=\""$(prefix)/share/locale"\"
-+INCLUDES = $(MERGEANT_CFLAGS) -DGNOMEDB_PIXMAPDIR=\""$(datadir)/pixmaps/libgnomedb"\" -DGNOMEDB_DATADIR=\""$(datadir)"\" -DGNOMEDB_LOCALEDIR=\""$(datadir)/locale"\"
-
-
- libgdbshared_headers = gnome-db-shortcut.h
diff --git a/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c
new file mode 100644
index 0000000..1500500
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_graph_mg-canvas-field.c
@@ -0,0 +1,17 @@
+--- libmergeant/graph/mg-canvas-field.c.orig Sat Aug 14 04:04:07 2004
++++ libmergeant/graph/mg-canvas-field.c Sat Aug 14 04:04:40 2004
+@@ -146,13 +146,13 @@
+ 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/files/patch-libmergeant_mg-form.c b/databases/mergeant/files/patch-libmergeant_mg-form.c
new file mode 100644
index 0000000..168e15c
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-form.c
@@ -0,0 +1,19 @@
+--- libmergeant/mg-form.c.orig Thu Aug 12 22:24:32 2004
++++ libmergeant/mg-form.c Thu Aug 12 22:24:48 2004
+@@ -586,6 +586,7 @@
+ {
+ PangoAttrList *attrs = NULL;
+ PangoAttribute *att;
++ GSList *list;
+
+ if (show_mark) {
+ attrs = pango_attr_list_new ();
+@@ -595,7 +596,7 @@
+ 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/files/patch-libmergeant_mg-parameter.c b/databases/mergeant/files/patch-libmergeant_mg-parameter.c
new file mode 100644
index 0000000..60bfe9b
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-parameter.c
@@ -0,0 +1,13 @@
+--- libmergeant/mg-parameter.c.orig Thu Aug 12 22:25:38 2004
++++ libmergeant/mg-parameter.c Thu Aug 12 22:25:53 2004
+@@ -608,9 +608,9 @@
+ 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;
+
diff --git a/databases/mergeant/files/patch-libmergeant_mg-query.c b/databases/mergeant/files/patch-libmergeant_mg-query.c
new file mode 100644
index 0000000..41bf5bf
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-query.c
@@ -0,0 +1,25 @@
+--- libmergeant/mg-query.c.orig Sun Aug 8 11:20:06 2004
++++ libmergeant/mg-query.c Wed Jan 5 02:07:47 2005
+@@ -44,7 +44,7 @@
+ #include "mg-server-aggregate.h"
+ #include "mg-data-handler.h"
+
+-#include <libgda/sql/sql_parser.h>
++#include <libgda-1.2/sql/sql_parser.h>
+ #include "mg-qf-func.h"
+
+ /*
+@@ -5117,9 +5117,11 @@
+ if (!cond)
+ has_error = TRUE;
+ else {
++ MgQfield *field_left;
++ MgQfield *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/files/patch-libmergeant_mg-work-grid.c b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c
new file mode 100644
index 0000000..b9a36b2
--- /dev/null
+++ b/databases/mergeant/files/patch-libmergeant_mg-work-grid.c
@@ -0,0 +1,14 @@
+--- libmergeant/mg-work-grid.c.orig Sat Aug 14 03:59:47 2004
++++ libmergeant/mg-work-grid.c Sat Aug 14 04:00:02 2004
+@@ -2299,10 +2299,10 @@
+ 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/files/patch-src_Makefile.in b/databases/mergeant/files/patch-src_Makefile.in
deleted file mode 100644
index 1e4f748..0000000
--- a/databases/mergeant/files/patch-src_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.orig Thu Jul 29 09:01:30 2004
-+++ src/Makefile.in Thu Jul 29 09:01:40 2004
-@@ -141,7 +141,7 @@
- mergeant_LDADD = $(MERGEANT_LIBS) $(top_builddir)/lib/libmergeant.la query-fields/libqueryfields.a
-
-
--mergeant_LDFLAGS = -export-dynamic -dlopen
-+mergeant_LDFLAGS = -export-dynamic
- mergeant_DEPENDENCIES = query-fields/libqueryfields.a
-
- DTD_FILES = mergeant.dtd
diff --git a/databases/mergeant/files/patch-src_interface_cb.c b/databases/mergeant/files/patch-src_interface_cb.c
deleted file mode 100644
index 6cbd2d2..0000000
--- a/databases/mergeant/files/patch-src_interface_cb.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/interface_cb.c.orig Mon Aug 2 13:38:56 2004
-+++ src/interface_cb.c Mon Aug 2 13:39:10 2004
-@@ -2209,6 +2209,6 @@
- gnome_db_error_dialog_show_errors (GNOME_DB_ERROR_DIALOG (conf->error_dlg),
- gda_connection_get_errors (cnc));
- break;
-- default :
-+ default :;
- }
- }
diff --git a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in b/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in
deleted file mode 100644
index 65ae9e7..0000000
--- a/databases/mergeant/files/patch-src_plugins_netaddr_makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/netaddr/Makefile.in.orig Sat Sep 14 18:56:12 2002
-+++ src/plugins/netaddr/Makefile.in Sat Sep 14 18:57:13 2002
-@@ -125,7 +125,7 @@
- lib_LTLIBRARIES_PLUGIN = libPnetaddr.la
- libPnetaddr_la_SOURCES = netaddr.c baseplugin.h
- libPnetaddr_la_LIBADD =
--libPnetaddr_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPnetaddr_la_LDFLAGS = -module -avoid-version -export-dynamic
-
- # Build a libtool library, for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN)
diff --git a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in b/databases/mergeant/files/patch-src_plugins_picts_Makefile.in
deleted file mode 100644
index 3c54fdc..0000000
--- a/databases/mergeant/files/patch-src_plugins_picts_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/picts/Makefile.in.orig Sat Sep 14 18:57:58 2002
-+++ src/plugins/picts/Makefile.in Sat Sep 14 18:58:15 2002
-@@ -127,7 +127,7 @@
- libPpicts_la_SOURCES = picts_plugin.c baseplugin.h
- libPpicts_la_LIBADD =
-
--libPpicts_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPpicts_la_LDFLAGS = -module -export-dynamic -avoid-version
-
- # Build a libtool library, libggnomedb.la for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN)
diff --git a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in b/databases/mergeant/files/patch-src_plugins_sample_Makefile.in
deleted file mode 100644
index ae8b115..0000000
--- a/databases/mergeant/files/patch-src_plugins_sample_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/plugins/sample/Makefile.in.orig Sat Sep 14 18:58:54 2002
-+++ src/plugins/sample/Makefile.in Sat Sep 14 18:59:04 2002
-@@ -127,7 +127,7 @@
- libPsample_la_SOURCES = sample_plugin.c baseplugin.h
- libPsample_la_LIBADD =
-
--libPsample_la_LDFLAGS = -module -export-dynamic -version-info 0:0:0
-+libPsample_la_LDFLAGS = -module -export-dynamic -avoid-version
-
- # Build a libtool library, libggnomedb.la for installation in libdir.
- lib_LTLIBRARIES = $(lib_LTLIBRARIES_PLUGIN)
OpenPOWER on IntegriCloud