diff options
author | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-07-06 06:38:18 +0800 |
---|---|---|
committer | marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059> | 2004-07-06 06:38:18 +0800 |
commit | 91b59d4800efb0e396931468d875e9a8e8bcd6a8 (patch) | |
tree | 07c2021db695a551226d8016f3b8366e2b52d463 /mail/evolution/files | |
parent | 04db861b40c9fdb10620a14691aee1680d077c95 (diff) | |
download | marcuscom-ports-91b59d4800efb0e396931468d875e9a8e8bcd6a8.tar marcuscom-ports-91b59d4800efb0e396931468d875e9a8e8bcd6a8.tar.gz marcuscom-ports-91b59d4800efb0e396931468d875e9a8e8bcd6a8.tar.bz2 marcuscom-ports-91b59d4800efb0e396931468d875e9a8e8bcd6a8.tar.lz marcuscom-ports-91b59d4800efb0e396931468d875e9a8e8bcd6a8.tar.xz marcuscom-ports-91b59d4800efb0e396931468d875e9a8e8bcd6a8.tar.zst marcuscom-ports-91b59d4800efb0e396931468d875e9a8e8bcd6a8.zip |
Update to 1.5.90.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@2442 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'mail/evolution/files')
3 files changed, 31 insertions, 44 deletions
diff --git a/mail/evolution/files/patch-addressbook_gui_contact-list-editor_e-contact-list-editor.c b/mail/evolution/files/patch-addressbook_gui_contact-list-editor_e-contact-list-editor.c new file mode 100644 index 000000000..285494765 --- /dev/null +++ b/mail/evolution/files/patch-addressbook_gui_contact-list-editor_e-contact-list-editor.c @@ -0,0 +1,20 @@ +--- addressbook/gui/contact-list-editor/e-contact-list-editor.c.orig Mon Jul 5 18:18:22 2004 ++++ addressbook/gui/contact-list-editor/e-contact-list-editor.c Mon Jul 5 18:18:59 2004 +@@ -666,11 +666,15 @@ + + EContactListEditor *ce; + ++ Bonobo_Control corba_control; ++ ++ GtkWidget *control_widget; ++ + ce = E_CONTACT_LIST_EDITOR (data); + +- Bonobo_Control corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection ++ corba_control = GNOME_Evolution_Addressbook_SelectNames_getEntryBySection + (ce->corba_select_names, "Members", ev); +- GtkWidget *control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL); ++ control_widget = bonobo_widget_new_control_from_objref (corba_control, CORBA_OBJECT_NIL); + + bonobo_widget_get_property (BONOBO_WIDGET (control_widget), "destinations", + TC_CORBA_string, &string, NULL); diff --git a/mail/evolution/files/patch-calendar_gui_e-tasks.c b/mail/evolution/files/patch-calendar_gui_e-tasks.c deleted file mode 100644 index 8125925cb..000000000 --- a/mail/evolution/files/patch-calendar_gui_e-tasks.c +++ /dev/null @@ -1,32 +0,0 @@ -=================================================================== -RCS file: /cvs/gnome/evolution/calendar/gui/e-tasks.c,v -retrieving revision 1.95 -retrieving revision 1.96 -diff -u -r1.95 -r1.96 ---- calendar/gui/e-tasks.c 2004/06/02 09:33:36 1.95 -+++ calendar/gui/e-tasks.c 2004/06/03 17:54:24 1.96 -@@ -679,15 +679,18 @@ - { - ETasksPrivate *priv; - va_list args; -- char sz[2048]; -- -- va_start (args, message); -- vsnprintf (sz, sizeof sz, message, args); -- va_end (args); -+ char sz[2048], *msg_string = NULL; -+ -+ if (message) { -+ va_start (args, message); -+ vsnprintf (sz, sizeof sz, message, args); -+ va_end (args); -+ msg_string = sz; -+ } - - priv = tasks->priv; - -- e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->tasks_view), sz); -+ e_calendar_table_set_status_message (E_CALENDAR_TABLE (priv->tasks_view), msg_string); - } - - /* Callback from the calendar client when an error occurs in the backend */ diff --git a/mail/evolution/files/patch-ltmain.sh b/mail/evolution/files/patch-ltmain.sh index 8c8acdd88..eba422a4f 100644 --- a/mail/evolution/files/patch-ltmain.sh +++ b/mail/evolution/files/patch-ltmain.sh @@ -1,14 +1,5 @@ --- ltmain.sh.orig Fri Mar 5 10:05:44 2004 -+++ ltmain.sh Sat Mar 6 04:33:50 2004 -@@ -1349,7 +1349,7 @@ - esac - elif test "X$arg" = "X-lc_r"; then - case $host in -- *-*-openbsd* | *-*-freebsd*) -+ *-*-openbsd* | *-*-freebsd4*) - # Do not include libc_r directly, use -pthread flag. - continue - ;; ++++ ltmain.sh Mon Jul 5 17:36:23 2004 @@ -1364,8 +1364,16 @@ continue ;; @@ -26,7 +17,15 @@ continue ;; -@@ -3059,6 +3067,9 @@ +@@ -1849,6 +1857,7 @@ + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" ++ test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs" + fi + continue + ;; +@@ -3059,6 +3068,9 @@ # problems, so we reset it completely verstring= ;; @@ -36,7 +35,7 @@ *) verstring="0.0" ;; -@@ -5531,10 +5542,12 @@ +@@ -5531,10 +5543,12 @@ fi # Install the pseudo-library for information purposes. |