rpms/evolution/devel evolution-2.5.5.1-commit-enter-on-calendar.patch, NONE, 1.1 evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch, NONE, 1.1 .cvsignore, 1.41, 1.42 evolution-2.5.4-fix-missing-declarations.patch, 1.2, 1.3 evolution-2.5.4-port-to-new-libnotify-api.patch, 1.2, 1.3 evolution.spec, 1.117, 1.118 sources, 1.41, 1.42
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Fri Jan 27 23:58:22 UTC 2006
Author: dmalcolm
Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19256
Modified Files:
.cvsignore evolution-2.5.4-fix-missing-declarations.patch
evolution-2.5.4-port-to-new-libnotify-api.patch evolution.spec
sources
Added Files:
evolution-2.5.5.1-commit-enter-on-calendar.patch
evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
Log Message:
* Wed Jan 25 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.5.1-1
- 2.5.5.1
- update patch 106 to track upstream, renaming from
evolution-2.2.2-commit-enter-on-calendar.patch to
evolution-2.5.5.1-commit-enter-on-calendar.patch
- update patch 805 to track upstream
- added patch to fix some newly missing declarations (patch 808)
- replace evolution-2.5.4-port-to-new-libnotify-api.patch with
evolution-2.5.5.1-notification-cleanups.patch, since much of this was
duplicated by another patch that landed upstream; removing the actions code
as it was crashing deep inside DBus (patch 806, #177666)
- explicitly list various files to reduce reliance on globbing; organized the
files into logical groups; comment them
- added -Wno-sign-compare to CFLAGS
- enabled parallel make
- introduced require_function_declarations macro to make
-Werror-implicit-function-declaration flag optional; turn it off for now
- include the new CalDAV and mail-attachments-import plugins in the file list;
add an XML UI file for the mail-to-task plugin.
- use "sed -i -e" rather than "sed -ie" to avoid getting severe bonobo files
evolution-2.5.5.1-commit-enter-on-calendar.patch:
e-day-view.c | 106 ++++++++++++++++++++++++++++++++++++++--------------------
e-week-view.c | 71 +++++++++++++++++++++++++++-----------
2 files changed, 122 insertions(+), 55 deletions(-)
--- NEW FILE evolution-2.5.5.1-commit-enter-on-calendar.patch ---
--- evolution-2.5.5.1/calendar/gui/e-day-view.c.commit-enter-on-calendar 2006-01-16 09:42:17.000000000 -0500
+++ evolution-2.5.5.1/calendar/gui/e-day-view.c 2006-01-25 23:48:24.000000000 -0500
@@ -334,6 +334,10 @@
gint event_num,
gchar *initial_text);
static void e_day_view_stop_editing_event (EDayView *day_view);
+static gboolean e_day_view_text_keypress (GnomeCanvasItem *item,
+ guint keyval,
+ guint state,
+ EDayView *day_view);
static gboolean e_day_view_on_text_item_event (GnomeCanvasItem *item,
GdkEvent *event,
EDayView *day_view);
@@ -4484,6 +4488,8 @@
G_CALLBACK (e_day_view_on_text_item_event), day_view);
g_signal_emit_by_name (G_OBJECT(day_view),
"event_added", event);
+ g_signal_connect (event->canvas_item, "keypress",
+ G_CALLBACK (e_day_view_text_keypress), day_view);
e_day_view_update_long_event_label (day_view, event_num);
}
@@ -4667,6 +4673,8 @@
G_CALLBACK (e_day_view_on_text_item_event), day_view);
g_signal_emit_by_name (G_OBJECT(day_view),
"event_added", event);
+ g_signal_connect (event->canvas_item, "keypress",
+ G_CALLBACK (e_day_view_text_keypress), day_view);
e_day_view_update_event_label (day_view, day, event_num);
}
@@ -5824,46 +5832,74 @@
}
static gboolean
+e_day_view_text_keypress (GnomeCanvasItem *item,
+ guint keyval,
+ guint state,
+ EDayView *day_view)
+{
+ gboolean retval = FALSE;
+
+ tooltip_destroy (day_view, item);
+
+ if (keyval == GDK_Return) {
+ EText *text = E_TEXT (item);
+ gint new_pos = 0;
+
+ /*
+ * HACK: last character which should be \n needs to be deleted
+ * here so that GDK_Return was already processed on EText
+ * before E_TEXT_KEYPRESS event is emitted.
+ */
+ if (text->selection_end >= 1)
+ new_pos = text->selection_end - 1;
+
+ text->selection_end = e_text_model_validate_position (text->model, new_pos);
+ e_text_delete_selection (text);
+
+ day_view->resize_event_num = -1;
+
+ /* We set the keyboard focus to the EDayView, so the
+ EText item loses it and stops the edit. */
+ gtk_widget_grab_focus (GTK_WIDGET (day_view));
+
+ /* Stop the signal last or we will also stop any
+ other events getting to the EText item. */
+ gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
+ "event");
+
+ retval = TRUE;
+ } else if (keyval == GDK_Escape) {
+ cancel_editing (day_view);
+ gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+ /* focus should go to day view when stop editing */
+ gtk_widget_grab_focus (GTK_WIDGET (day_view));
+
+ retval = TRUE;
+ } else if ((keyval == GDK_Up)
+ && (state & GDK_SHIFT_MASK)
+ && (state & GDK_CONTROL_MASK)
+ && !(state & GDK_MOD1_MASK)) {
+ e_day_view_change_event_end_time_up (day_view);
+
+ retval = TRUE;
+ } else if ((keyval == GDK_Down)
+ && (state & GDK_SHIFT_MASK)
+ && (state & GDK_CONTROL_MASK)
+ && !(state & GDK_MOD1_MASK)) {
+ e_day_view_change_event_end_time_down (day_view);
+
+ retval = TRUE;
+ }
+
+ return retval;
+}
+
+static gboolean
e_day_view_on_text_item_event (GnomeCanvasItem *item,
GdkEvent *event,
EDayView *day_view)
{
switch (event->type) {
- case GDK_KEY_PRESS:
- tooltip_destroy (day_view, item);
- if (event && event->key.keyval == GDK_Return) {
- day_view->resize_event_num = -1;
- day_view->resize_event_num = -1;
-
- /* We set the keyboard focus to the EDayView, so the
- EText item loses it and stops the edit. */
- gtk_widget_grab_focus (GTK_WIDGET (day_view));
-
- /* Stop the signal last or we will also stop any
- other events getting to the EText item. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
- return TRUE;
- } else if (event->key.keyval == GDK_Escape) {
- cancel_editing (day_view);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
- /* focus should go to day view when stop editing */
- gtk_widget_grab_focus (GTK_WIDGET (day_view));
- return TRUE;
- } else if ((event->key.keyval == GDK_Up)
- && (event->key.state & GDK_SHIFT_MASK)
- && (event->key.state & GDK_CONTROL_MASK)
- && !(event->key.state & GDK_MOD1_MASK)) {
- e_day_view_change_event_end_time_up (day_view);
- return TRUE;
- } else if ((event->key.keyval == GDK_Down)
- && (event->key.state & GDK_SHIFT_MASK)
- && (event->key.state & GDK_CONTROL_MASK)
- && !(event->key.state & GDK_MOD1_MASK)) {
- e_day_view_change_event_end_time_down (day_view);
- return TRUE;
- }
- break;
case GDK_2BUTTON_PRESS:
#if 0
g_print ("Item got double-click\n");
--- evolution-2.5.5.1/calendar/gui/e-week-view.c.commit-enter-on-calendar 2006-01-16 09:42:17.000000000 -0500
+++ evolution-2.5.5.1/calendar/gui/e-week-view.c 2006-01-25 23:46:43.000000000 -0500
@@ -175,6 +175,10 @@
const gchar *uid,
EWeekViewForeachEventCallback callback,
gpointer data);
+static gboolean e_week_view_text_keypress (GnomeCanvasItem *item,
+ guint keyval,
+ guint state,
+ EWeekView *week_view);
static gboolean e_week_view_on_text_item_event (GnomeCanvasItem *item,
GdkEvent *event,
EWeekView *week_view);
@@ -2771,6 +2775,8 @@
week_view);
g_signal_emit_by_name (G_OBJECT(week_view),
"event_added", event);
+ g_signal_connect (span->text_item, "keypress",
+ G_CALLBACK (e_week_view_text_keypress), week_view);
}
@@ -3028,6 +3034,51 @@
}
static gboolean
+e_week_view_text_keypress (GnomeCanvasItem *item,
+ guint keyval,
+ guint state,
+ EWeekView *week_view)
+{
+ gboolean retval = FALSE;
+
+ tooltip_destroy (week_view, item);
+
+ if (keyval == GDK_Return) {
+ EText *text = E_TEXT (item);
+ gint new_pos = 0;
+
+ /*
+ * HACK: last charater which should be \n needs to be deleted
+ * here so that GDK_Return was already processed on EText
+ * before E_TEXT_KEYPRESS event is emitted.
+ */
+ if (text->selection_end >= 1)
+ new_pos = text->selection_end - 1;
+
+ text->selection_end = e_text_model_validate_position (text->model, new_pos);
+ e_text_delete_selection (text);
+
+ /* We set the keyboard focus to the EDayView, so the
+ EText item loses it and stops the edit. */
+ gtk_widget_grab_focus (GTK_WIDGET (week_view));
+
+ /* Stop the signal last or we will also stop any
+ other events getting to the EText item. */
+ gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
+ "event");
+ retval = TRUE;
+ } else if (keyval == GDK_Escape) {
+ cancel_editing (week_view);
+ gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
+ /* focus should go to week view when stop editing */
+ gtk_widget_grab_focus (GTK_WIDGET (week_view));
+ retval = TRUE;
+ }
+
+ return retval;
+}
+
+static gboolean
e_week_view_on_text_item_event (GnomeCanvasItem *item,
GdkEvent *gdkevent,
EWeekView *week_view)
@@ -3044,26 +3095,6 @@
#endif
switch (gdkevent->type) {
- case GDK_KEY_PRESS:
- tooltip_destroy (week_view, item);
- if (gdkevent && gdkevent->key.keyval == GDK_Return) {
- /* We set the keyboard focus to the EDayView, so the
- EText item loses it and stops the edit. */
- gtk_widget_grab_focus (GTK_WIDGET (week_view));
-
- /* Stop the signal last or we will also stop any
- other events getting to the EText item. */
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item),
- "event");
- return TRUE;
- } else if (gdkevent->key.keyval == GDK_Escape) {
- cancel_editing (week_view);
- gtk_signal_emit_stop_by_name (GTK_OBJECT (item), "event");
- /* focus should go to week view when stop editing */
- gtk_widget_grab_focus (GTK_WIDGET (week_view));
- return TRUE;
- }
- break;
case GDK_2BUTTON_PRESS:
if (!e_week_view_find_event_from_item (week_view, item,
&event_num, &span_num))
evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch:
a11y/calendar/ea-gnome-calendar.c | 1 +
calendar/gui/dialogs/alarm-dialog.c | 3 ++-
calendar/gui/dialogs/comp-editor-page.h | 4 ++++
calendar/gui/e-calendar-view.c | 1 +
mail/message-list.h | 2 ++
plugins/import-ics-attachments/icsimporter.c | 2 ++
widgets/table/e-tree-table-adapter.h | 3 ++-
widgets/table/e-tree.h | 2 ++
8 files changed, 16 insertions(+), 2 deletions(-)
--- NEW FILE evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch ---
--- evolution-2.5.5.1/calendar/gui/dialogs/comp-editor-page.h.fix-missing-declarations-2.5.5.1 2006-01-26 08:47:44.000000000 -0500
+++ evolution-2.5.5.1/calendar/gui/dialogs/comp-editor-page.h 2006-01-26 08:48:00.000000000 -0500
@@ -107,6 +107,10 @@
ECal *client);
void comp_editor_page_set_summary (CompEditorPage *page,
const char *summary);
+void comp_editor_page_unset_focused_widget (CompEditorPage *page,
+ GtkWidget *widget);
+void comp_editor_page_set_focused_widget (CompEditorPage *page,
+ GtkWidget *widget);
void comp_editor_page_set_dates (CompEditorPage *page,
CompEditorPageDates *dates);
void comp_editor_page_notify_changed (CompEditorPage *page);
--- evolution-2.5.5.1/calendar/gui/dialogs/alarm-dialog.c.fix-missing-declarations-2.5.5.1 2006-01-26 08:37:02.000000000 -0500
+++ evolution-2.5.5.1/calendar/gui/dialogs/alarm-dialog.c 2006-01-26 08:39:20.000000000 -0500
@@ -41,6 +41,7 @@
#include <gtk/gtktextview.h>
#include <gtk/gtktogglebutton.h>
#include <libgnome/gnome-i18n.h>
+#include <libgnomeui/gnome-file-entry.h>
#include <bonobo/bonobo-control.h>
#include <bonobo/bonobo-exception.h>
#include <bonobo/bonobo-widget.h>
@@ -855,7 +856,7 @@
case E_CAL_COMPONENT_ALARM_AUDIO:
dir = calendar_config_get_dir_path ();
if ( dir && *dir )
- gnome_file_entry_set_default_path (dialog->aalarm_file_entry, dir);
+ gnome_file_entry_set_default_path ( GNOME_FILE_ENTRY(dialog->aalarm_file_entry), dir);
check_custom_sound (dialog);
break;
--- evolution-2.5.5.1/calendar/gui/e-calendar-view.c.fix-missing-declarations-2.5.5.1 2006-01-26 08:49:54.000000000 -0500
+++ evolution-2.5.5.1/calendar/gui/e-calendar-view.c 2006-01-26 08:53:47.000000000 -0500
@@ -40,6 +40,7 @@
#include <libgnome/gnome-i18n.h>
#include <libedataserver/e-time-utils.h>
#include <e-util/e-dialog-utils.h>
+#include <e-util/e-error.h>
#include <e-util/e-icon-factory.h>
#include "e-calendar-marshal.h"
#include <libecal/e-cal-time-util.h>
--- evolution-2.5.5.1/plugins/import-ics-attachments/icsimporter.c.fix-missing-declarations-2.5.5.1 2006-01-26 09:08:09.000000000 -0500
+++ evolution-2.5.5.1/plugins/import-ics-attachments/icsimporter.c 2006-01-26 09:13:50.000000000 -0500
@@ -34,6 +34,7 @@
#include <mail/mail-mt.h>
#include <mail/em-folder-view.h>
#include <mail/em-format-html-display.h>
+#include <mail/em-utils.h>
#include "e-attachment-bar.h"
#include <camel/camel-vee-folder.h>
#include "e-util/e-error.h"
@@ -45,6 +46,7 @@
#include <libedataserverui/e-source-selector.h>
#include <libecal/e-cal.h>
#include <libical/icalvcal.h>
+#include "calendar/common/authentication.h"
typedef struct {
ECal *client;
--- evolution-2.5.5.1/mail/message-list.h.fix-missing-declarations-2.5.5.1 2006-01-26 08:56:50.000000000 -0500
+++ evolution-2.5.5.1/mail/message-list.h 2006-01-26 08:58:05.000000000 -0500
@@ -182,6 +182,8 @@
GPtrArray *message_list_get_selected(MessageList *ml);
void message_list_set_selected(MessageList *ml, GPtrArray *uids);
void message_list_free_uids(MessageList *ml, GPtrArray *uids);
+void message_list_set_threaded_expand_all (MessageList *ml);
+void message_list_set_threaded_collapse_all (MessageList *ml);
/* select next/prev message helpers */
gboolean message_list_select (MessageList *message_list,
--- evolution-2.5.5.1/a11y/calendar/ea-gnome-calendar.c.fix-missing-declarations-2.5.5.1 2006-01-26 08:22:16.000000000 -0500
+++ evolution-2.5.5.1/a11y/calendar/ea-gnome-calendar.c 2006-01-26 08:24:29.000000000 -0500
@@ -29,6 +29,7 @@
#include <gtk/gtknotebook.h>
#include <libecal/e-cal-time-util.h>
#include <libgnome/gnome-i18n.h>
+#include <libedataserver/e-data-server-util.h>
static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
--- evolution-2.5.5.1/widgets/table/e-tree.h.fix-missing-declarations-2.5.5.1 2006-01-26 09:02:36.000000000 -0500
+++ evolution-2.5.5.1/widgets/table/e-tree.h 2006-01-26 09:04:08.000000000 -0500
@@ -287,6 +287,8 @@
char *filename);
void e_tree_load_expanded_state (ETree *et,
char *filename);
+void e_tree_load_all_expanded_state (ETree *et,
+ gboolean state);
int e_tree_row_count (ETree *et);
GtkWidget *e_tree_get_tooltip (ETree *et);
--- evolution-2.5.5.1/widgets/table/e-tree-table-adapter.h.fix-missing-declarations-2.5.5.1 2006-01-26 08:27:35.000000000 -0500
+++ evolution-2.5.5.1/widgets/table/e-tree-table-adapter.h 2006-01-26 08:27:37.000000000 -0500
@@ -86,7 +86,8 @@
const char *filename);
void e_tree_table_adapter_load_expanded_state (ETreeTableAdapter *etta,
const char *filename);
-
+void e_tree_table_adapter_load_all_expanded_state (ETreeTableAdapter *etta,
+ gboolean state);
void e_tree_table_adapter_set_sort_info (ETreeTableAdapter *etta,
ETableSortInfo *sort_info);
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- .cvsignore 4 Jan 2006 06:07:52 -0000 1.41
+++ .cvsignore 27 Jan 2006 23:58:18 -0000 1.42
@@ -1 +1 @@
-evolution-2.5.4.tar.bz2
+evolution-2.5.5.1.tar.bz2
evolution-2.5.4-fix-missing-declarations.patch:
calendar/gui/e-meeting-list-view.c | 1 +
plugins/publish-calendar/publish-format-fb.c | 1 +
shell/e-shell.h | 1 +
3 files changed, 3 insertions(+)
Index: evolution-2.5.4-fix-missing-declarations.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-fix-missing-declarations.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.5.4-fix-missing-declarations.patch 4 Jan 2006 19:49:28 -0000 1.2
+++ evolution-2.5.4-fix-missing-declarations.patch 27 Jan 2006 23:58:18 -0000 1.3
@@ -28,14 +28,3 @@
#ifdef __cplusplus
}
---- evolution-2.5.4/mail/mail-tools.c.fix-missing-declarations-2-5-4 2006-01-02 06:38:59.000000000 -0500
-+++ evolution-2.5.4/mail/mail-tools.c 2006-01-04 14:40:40.000000000 -0500
-@@ -100,7 +100,7 @@
- return trash;
- }
-
--#if 0
-+#if 1
- /* Not used */
-
- static char *
evolution-2.5.4-port-to-new-libnotify-api.patch:
alarm-queue.c | 47 +++++++++++++++++++++--------------------------
1 files changed, 21 insertions(+), 26 deletions(-)
Index: evolution-2.5.4-port-to-new-libnotify-api.patch
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution-2.5.4-port-to-new-libnotify-api.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- evolution-2.5.4-port-to-new-libnotify-api.patch 12 Jan 2006 23:34:45 -0000 1.2
+++ evolution-2.5.4-port-to-new-libnotify-api.patch 27 Jan 2006 23:58:18 -0000 1.3
@@ -1,27 +1,6 @@
--- evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c.port-to-new-libnotify-api 2006-01-02 06:38:57.000000000 -0500
-+++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c 2006-01-12 18:31:17.000000000 -0500
-@@ -1448,31 +1448,42 @@
- }
-
- #ifdef HAVE_LIBNOTIFY
-+static void
-+notify_cb_open_component (NotifyNotification *notification, gchar *user_data)
-+{
-+ ECal *cal = E_CAL (g_object_get_data( G_OBJECT(notification), "cal"));
-+ ECalComponent *comp = E_CAL_COMPONENT (g_object_get_data( G_OBJECT(notification), "comp"));
-+
-+ edit_component (cal, comp);
-+
-+ notify_notification_close (notification, NULL);
-+}
-+
- static void
- popup_notification (time_t trigger, CompQueuedAlarms *cqa,
- gpointer alarm_id, gboolean use_description)
- {
- QueuedAlarm *qa;
-+ ECal *cal;
- ECalComponent *comp;
++++ evolution-2.5.4/calendar/gui/alarm-notify/alarm-queue.c 2006-01-13 19:09:29.000000000 -0500
+@@ -1457,22 +1457,21 @@
const char *summary, *location;
GtkTooltips *tooltips;
ECalComponentText text;
@@ -33,13 +12,14 @@
- char *filename;
+ GdkPixbuf *icon;
char *body;
+-
+ NotifyNotification *notification;
-
-+ cal = cqa->parent_client->client;
++
comp = cqa->alarms->comp;
qa = lookup_queued_alarm (cqa, alarm_id);
if (!qa)
return;
++
if (!notify_is_initted ())
notify_init("Evolution Alarm Notify");
- filename = e_icon_factory_get_icon_filename ("stock_appointment-reminder", E_ICON_SIZE_DIALOG);
@@ -49,7 +29,7 @@
/* get a sensible description for the event */
e_cal_component_get_summary (comp, &text);
-@@ -1495,9 +1506,6 @@
+@@ -1495,9 +1494,6 @@
end_str = timet_to_str_with_zone (qa->instance->occur_end, current_zone);
time_str = calculate_time (qa->instance->occur_start, qa->instance->occur_end);
@@ -59,7 +39,7 @@
if (organiser.cn) {
if (location)
body = g_strdup_printf ("<b>%s</b>\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str);
-@@ -1508,28 +1516,45 @@
+@@ -1508,28 +1504,27 @@
if (location)
body = g_strdup_printf ("%s %s\n%s %s", _("Location:"), location, start_str, time_str);
else
@@ -67,8 +47,6 @@
-}
+ body = g_strdup_printf ("%s %s", start_str, time_str);
+ }
-+
-+ notification = notify_notification_new (summary, body, "", tray_event_box);
- if (!notify_send_notification (
- NULL, "device", NOTIFY_URGENCY_NORMAL,
@@ -80,6 +58,9 @@
- NULL, /* no user_data */
- 0)) /* no actions */
- g_warning ("Could not send notification to daemon\n");
++ notification = notify_notification_new (summary, body, "", tray_event_box);
+
+- /* create the private structure */
+ if (icon) {
+ notify_notification_set_icon_data_from_pixbuf (notification, icon);
+ g_object_unref (G_OBJECT(icon));
@@ -88,25 +69,6 @@
+ /* Notifications don't timeout, require explicit user action: */
+ notify_notification_set_timeout (notification, NOTIFY_TIMEOUT_NEVER);
+
-+
-+ g_object_ref (G_OBJECT(comp));
-+ g_object_set_data_full ( G_OBJECT(notification),
-+ "comp",
-+ comp,
-+ g_object_unref);
-+
-+ g_object_ref (G_OBJECT(cal));
-+ g_object_set_data_full ( G_OBJECT(notification),
-+ "cal",
-+ cal,
-+ g_object_unref);
-
-- /* create the private structure */
-+ notify_notification_add_action (notification,
-+ "open",
-+ _("Open"),
-+ notify_cb_open_component);
-+
+ if (!notify_notification_show_and_forget (notification, NULL))
+ g_warning ("Error showing notification\n");
+
Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- evolution.spec 19 Jan 2006 13:24:04 -0000 1.117
+++ evolution.spec 27 Jan 2006 23:58:18 -0000 1.118
@@ -27,13 +27,18 @@
%define nm_support 1
%define libnotify_support 1
+# Upstream tarballs often contain instances of undeclared functions; these tend
+# to work on i386 but fail on 64-bit architectures. Leave this on to trap the
+# warnings as errors (and ideally get the flag into the upstream build):
+%define require_function_declarations 0
+
%define redhat_menus_version 5.0.4
%define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins
Name: evolution
-Version: 2.5.4
-Release: 10
+Version: 2.5.5.1
+Release: 1
License: GPL
BuildRoot: %{_tmppath}/%{name}-%{version}-root
URL: http://www.ximian.com/
@@ -56,7 +61,7 @@
#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch
# Fix for RH bug #154360:
-Patch106: evolution-2.2.2-commit-enter-on-calendar.patch
+Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch
# Move autosave file
Patch107: evolution-2.5.4-move-autosave-file.patch
@@ -92,8 +97,9 @@
Patch804: evolution-2.4.1-fix-missing-declarations.patch
Patch805: evolution-2.5.4-fix-missing-declarations.patch
-Patch806: evolution-2.5.4-port-to-new-libnotify-api.patch
+Patch806: evolution-2.5.5.1-notification-cleanups.patch
Patch807: evolution-2.5.4-fix-nm-multiple-init.patch
+Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
Summary: GNOME's next-generation groupware suite
Group: Applications/Productivity
@@ -234,8 +240,9 @@
%patch803 -p1 -b .no-gnome-common
%patch804 -p1 -b .fix-missing-declarations
%patch805 -p1 -b .fix-missing-declarations-2-5-4
-%patch806 -p1 -b .port-to-new-libnotify-api
+%patch806 -p1 -b .notification-cleanups
%patch807 -p1 -b .fix-nm-multiple-init
+%patch808 -p1 -b .fix-missing-declarations-2.5.5.1
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -287,7 +294,7 @@
%endif
CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS
-CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et"; export CFLAGS
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS
%if ! %{use_mozilla_nss}
if pkg-config openssl ; then
CFLAGS="$CFLAGS `pkg-config --cflags openssl`"
@@ -303,6 +310,7 @@
intltoolize --force
autoconf
+# Configuration:
%configure \
--enable-gtk-doc=yes \
--enable-ipv6 \
@@ -313,7 +321,13 @@
%ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \
--enable-plugins=all
export tagname=CC
-make LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+
+# Do the make, with various flags:
+%if %{require_function_declarations}
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
+%else
+make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS"
+%endif
#cat /dev/null > default_user/local/Inbox/mbox
@@ -350,7 +364,7 @@
ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution
for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do
- sed -ie 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
+ sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile
done
%find_lang %name-%{evo_major}
@@ -373,39 +387,108 @@
%files -f %{name}-%{evo_major}.lang
%defattr(-, root, root)
%doc AUTHORS COPYING ChangeLog INSTALL NEWS README
+
+# GConf schemas:
%{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas
%{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas
%{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas
%{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas
%{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas
-%{_bindir}/*
+
+# The main executable and a symlink:
+%{_bindir}/evolution-%{evo_major}
+%{_bindir}/evolution
+
+# Desktop files:
%{_datadir}/applications/redhat-evolution-mail.desktop
%{_datadir}/applications/redhat-evolution-calendar.desktop
%{_datadir}/applications/redhat-evolution-contacts.desktop
%{_datadir}/applications/redhat-evolution-tasks.desktop
+
+# Online help:
%{_datadir}/gnome/help/evolution-%{evo_major}
+%{_datadir}/omf/evolution
+
+# IDL files (should this be in devel subpackage?)
%{_datadir}/idl/evolution-%{evo_major}
-%{_datadir}/mime-info/*
+
+# mime-info data:
+%{_datadir}/mime-info/evolution-%{evo_major}.keys
+%{_datadir}/mime-info/evolution-%{evo_major}.mime
+
+# The main data directory
+# (have not attempted to split this up into an explicit list)
%dir %{_datadir}/evolution
%{_datadir}/evolution/%{evo_major}
-%{_datadir}/omf/evolution
-%{_datadir}/pixmaps/*
-%{_libdir}/bonobo/servers/*
+
+%{_datadir}/pixmaps/evolution-%{evo_major}.png
+
+# Bonobo components:
+%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Mail_%{evo_major}.server
+%{_libdir}/bonobo/servers/GNOME_Evolution_Shell_%{evo_major}.server
%dir %{_libdir}/evolution
%dir %{_libdir}/evolution/%{evo_major}
%dir %{_libdir}/evolution/%{evo_major}/components
-%dir %{_libdir}/evolution/%{evo_major}/components/*.so
-%dir %{evo_plugin_dir}
-%{_libdir}/evolution/%{evo_major}/*.so.*
+%{_libdir}/evolution/%{evo_major}/components/libevolution-addressbook.so
+%{_libdir}/evolution/%{evo_major}/components/libevolution-calendar.so
+%{_libdir}/evolution/%{evo_major}/components/libevolution-mail.so
+
+# Shared libraries:
+%{_libdir}/evolution/%{evo_major}/libeabutil.so.*
+%{_libdir}/evolution/%{evo_major}/libeconduit.so.*
+%{_libdir}/evolution/%{evo_major}/libecontacteditor.so.*
+%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.*
+%{_libdir}/evolution/%{evo_major}/libefilterbar.so.*
+%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so.*
+%{_libdir}/evolution/%{evo_major}/libeshell.so.*
+%{_libdir}/evolution/%{evo_major}/libessmime.so.*
+%{_libdir}/evolution/%{evo_major}/libetable.so.*
+%{_libdir}/evolution/%{evo_major}/libetext.so.*
+%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so.*
+%{_libdir}/evolution/%{evo_major}/libeutil.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-smime.so.*
+%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.*
+%{_libdir}/evolution/%{evo_major}/libfilter.so.*
+%{_libdir}/evolution/%{evo_major}/libmenus.so.*
+
+# Various libexec programs:
%dir %{_libexecdir}/evolution
-%{_libexecdir}/evolution/%{evo_major}
+%dir %{_libexecdir}/evolution/%{evo_major}
+%{_libexecdir}/evolution/%{evo_major}/csv2vcard
+%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean
+%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export
+%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify
+%{_libexecdir}/evolution/%{evo_major}/killev
+# Various conduits for gnome-pilot:
%if %{pilot_support}
%dir %{_libdir}/evolution/%{evo_major}/conduits
-%{_libdir}/evolution/%{evo_major}/conduits/*.so
-%{_libdir}/gnome-pilot/conduits/*.conduit
+
+%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-address-%{evo_major}.conduit
+
+%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-calendar-%{evo_major}.conduit
+
+%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-memo-%{evo_major}.conduit
+
+%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so
+%{_libdir}/gnome-pilot/conduits/e-todo-%{evo_major}.conduit
%endif
+# The plugin directory:
+%dir %{evo_plugin_dir}
+
# The various plugins follow; they are all part of the main package:
# (note that there are various resources such as glade and pixmap files that
# are built as part of specific plugins but which are currently packaged using
@@ -468,6 +551,7 @@
%{evo_plugin_dir}/org-gnome-mail-to-task.eplug
%{evo_plugin_dir}/liborg-gnome-mail-to-task.so
+%{evo_plugin_dir}/org-gnome-mail-to-task.xml
%{evo_plugin_dir}/org-gnome-mark-all-read.eplug
%{evo_plugin_dir}/liborg-gnome-mark-all-read.so
@@ -506,14 +590,62 @@
%{evo_plugin_dir}/org-gnome-publish-calendar.xml
%{evo_plugin_dir}/publish-calendar.glade
+%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so
+
+%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so
%files devel
%defattr(-, root, root)
%{_includedir}/evolution-%{evo_major}
-%{_libdir}/pkgconfig/*.pc
-%{_libdir}/evolution/%{evo_major}/*.so
+%{_libdir}/pkgconfig/evolution-plugin-%{evo_major}.pc
+%{_libdir}/pkgconfig/evolution-shell-%{evo_major}.pc
+%{_libdir}/evolution/%{evo_major}/libeabutil.so
+%{_libdir}/evolution/%{evo_major}/libeconduit.so
+%{_libdir}/evolution/%{evo_major}/libecontacteditor.so
+%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so
+%{_libdir}/evolution/%{evo_major}/libefilterbar.so
+%{_libdir}/evolution/%{evo_major}/libemiscwidgets.so
+%{_libdir}/evolution/%{evo_major}/libeshell.so
+%{_libdir}/evolution/%{evo_major}/libessmime.so
+%{_libdir}/evolution/%{evo_major}/libetable.so
+%{_libdir}/evolution/%{evo_major}/libetext.so
+%{_libdir}/evolution/%{evo_major}/libetimezonedialog.so
+%{_libdir}/evolution/%{evo_major}/libeutil.so
+%{_libdir}/evolution/%{evo_major}/libevolution-a11y.so
+%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-a11y.so
+%{_libdir}/evolution/%{evo_major}/libevolution-addressbook-importers.so
+%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so
+%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so
+%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so
+%{_libdir}/evolution/%{evo_major}/libevolution-smime.so
+%{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so
+%{_libdir}/evolution/%{evo_major}/libfilter.so
+%{_libdir}/evolution/%{evo_major}/libmenus.so
%changelog
+* Wed Jan 25 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.5.1-1
+- 2.5.5.1
+- update patch 106 to track upstream, renaming from
+ evolution-2.2.2-commit-enter-on-calendar.patch to
+ evolution-2.5.5.1-commit-enter-on-calendar.patch
+- update patch 805 to track upstream
+- added patch to fix some newly missing declarations (patch 808)
+- replace evolution-2.5.4-port-to-new-libnotify-api.patch with
+ evolution-2.5.5.1-notification-cleanups.patch, since much of this was
+ duplicated by another patch that landed upstream; removing the actions code
+ as it was crashing deep inside DBus (patch 806, #177666)
+- explicitly list various files to reduce reliance on globbing; organized the
+ files into logical groups; comment them
+- added -Wno-sign-compare to CFLAGS
+- enabled parallel make
+- introduced require_function_declarations macro to make
+ -Werror-implicit-function-declaration flag optional; turn it off for now
+- include the new CalDAV and mail-attachments-import plugins in the file list;
+ add an XML UI file for the mail-to-task plugin.
+- use "sed -i -e" rather than "sed -ie" to avoid getting severe bonobo files
+
* Wed Jan 18 2006 Ray Strode <rstrode at redhat.com> - 2.5.4-10
- fix fix for multilib issue with shlib bonobo components (bug 156982)
@@ -522,7 +654,7 @@
* Thu Jan 12 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-8
- avoid multiple initialization of NetworkManager connections (patch 807,
- gnome bug #326875)
+ gnome bug #326785)
* Thu Jan 12 2006 David Malcolm <dmalcolm at redhat.com> - 2.5.4-7
- updated alarm notification patch(patch 806, #177546, #177666, #177667,
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- sources 4 Jan 2006 06:07:52 -0000 1.41
+++ sources 27 Jan 2006 23:58:18 -0000 1.42
@@ -1 +1 @@
-1ffd40da2b98f727e18b4c3a22318ed1 evolution-2.5.4.tar.bz2
+307c20ef482dafe90c7f55843e473cda evolution-2.5.5.1.tar.bz2
More information about the fedora-cvs-commits
mailing list