Tue Sep 5 11:48:59 UTC 2006

Author: mbarnes

Update of /cvs/dist/rpms/evolution/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv27202

Modified Files:
	.cvsignore evolution.spec sources 
Added Files:
	evolution-2.8.0-fix-missing-declarations.patch 
Removed Files:
	evolution-2.4.1-fix-missing-declarations.patch 
	evolution-2.5.4-fix-missing-declarations.patch 
	evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch 
	evolution-2.7.91-default-mailer.patch 
	evolution-2.7.91-fix-duplicate-alarm.patch 
	evolution-2.7.91-fix-missing-declarations.patch 
	evolution-2.7.91-mail-account-disable.patch 
	evolution-2.7.91-provide-camel-exception.patch 
	evolution-2.7.92-fix-edit-copy.patch 
	evolution-2.7.92-uninitialized-gerror.patch 
Log Message:

* Mon Sep  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.0-1.fc6
- Update to 2.8.0
- Remove patch for RH bug #197868 (fixed upstream).
- Remove patch for RH bug #201541 (fixed upstream).
- Remove patch for RH bug #201831 (fixed upstream).
- Remove patch for RH bug #202383 (fixed upstream).
- Remove patch for RH bug #203036 (fixed upstream).
- Remove patch for Gnome.org bug #352248 (fixed upstream).
- Remove patch for Gnome.org bug #352423 (fixed upstream).
- Update patch for Gnome.org bug #351332 (partially fixed upstream).


evolution-2.8.0-fix-missing-declarations.patch:
 a11y/calendar/ea-gnome-calendar.c        |    1 +
 addressbook/gui/widgets/e-minicard.c     |    1 +
 calendar/gui/alarm-notify/alarm-notify.c |    1 +
 calendar/gui/cal-search-bar.c            |    1 +
 calendar/gui/dialogs/memo-page.h         |    2 ++
 calendar/gui/e-cal-model-tasks.h         |    1 +
 calendar/gui/e-calendar-view.h           |   12 ++++++++++++
 calendar/gui/gnome-cal.h                 |    2 ++
 composer/e-msg-composer.c                |    1 +
 e-util/e-util.h                          |    3 +++
 mail/em-folder-view.c                    |    2 ++
 mail/em-format-html-display.c            |   22 +---------------------
 shell/e-shell-window.c                   |    7 +++++++
 widgets/misc/e-attachment-bar.h          |    1 +
 14 files changed, 36 insertions(+), 21 deletions(-)

--- NEW FILE evolution-2.8.0-fix-missing-declarations.patch ---
--- evolution-2.8.0/mail/em-folder-view.c.fix-missing-declarations	2006-09-02 02:43:04.000000000 -0400
+++ evolution-2.8.0/mail/em-folder-view.c	2006-09-05 06:48:18.000000000 -0400
@@ -69,6 +69,8 @@
 #include <gtkhtml/gtkhtml.h>
 #include <gtkhtml/gtkhtml-stream.h>
 
+#include <libedataserver/e-data-server-util.h>
+
 #include "menus/gal-view-etable.h"
 #include "menus/gal-view-factory-etable.h"
 #include "menus/gal-view-instance.h"
--- evolution-2.8.0/mail/em-format-html-display.c.fix-missing-declarations	2006-09-02 02:43:04.000000000 -0400
+++ evolution-2.8.0/mail/em-format-html-display.c	2006-09-05 06:48:18.000000000 -0400
@@ -29,6 +29,7 @@
 #include <glib.h>
 #include <glib/gstdio.h>
 #include <gdk/gdkkeysyms.h>
+#include <gtk/gtk.h>
 
 #ifdef G_OS_WIN32
 /* Work around 'DATADIR' and 'interface' lossage in <windows.h> */
@@ -42,27 +43,6 @@
 #include <gtkhtml/gtkhtml-embedded.h>
 #include <gtkhtml/gtkhtml-search.h>
 
-#include <gtk/gtkeventbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkbutton.h>
-#include <gtk/gtkstock.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkarrow.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkscrolledwindow.h>
-#include <gtk/gtktextview.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkmenu.h>
-#include <gtk/gtkmenuitem.h>
-#include <gtk/gtkmain.h>
-#include <gtk/gtkdnd.h>
-#include <gtk/gtktoolbutton.h>
-#include <gtk/gtkframe.h>
-#include <gtk/gtkcheckbutton.h>
-
 #include <glade/glade.h>
 
 #include <libgnomevfs/gnome-vfs-mime-handlers.h>
--- evolution-2.8.0/a11y/calendar/ea-gnome-calendar.c.fix-missing-declarations	2004-10-29 05:56:35.000000000 -0400
+++ evolution-2.8.0/a11y/calendar/ea-gnome-calendar.c	2006-09-05 06:47:11.000000000 -0400
@@ -28,6 +28,7 @@
 #include <string.h>
 #include <gtk/gtknotebook.h>
 #include <libecal/e-cal-time-util.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libgnome/gnome-i18n.h>
 
 static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass);
--- evolution-2.8.0/widgets/misc/e-attachment-bar.h.fix-missing-declarations	2006-05-31 23:30:06.000000000 -0400
+++ evolution-2.8.0/widgets/misc/e-attachment-bar.h	2006-09-05 06:48:18.000000000 -0400
@@ -82,6 +82,7 @@
 GSList *e_attachment_bar_get_selected (EAttachmentBar *bar);
 void e_attachment_bar_set_width(EAttachmentBar *bar, int bar_width);
 GSList * e_attachment_bar_get_all_attachments (EAttachmentBar *bar);
+void e_attachment_bar_create_attachment_cache (EAttachment *attachment);
 
 #ifdef __cplusplus
 }
--- evolution-2.8.0/e-util/e-util.h.fix-missing-declarations	2006-09-02 02:42:18.000000000 -0400
+++ evolution-2.8.0/e-util/e-util.h	2006-09-05 06:47:11.000000000 -0400
@@ -27,6 +27,7 @@
 #include <sys/types.h>
 #include <glib-object.h>
 #include <limits.h>
+#include <cairo/cairo.h>
 #include <gconf/gconf-client.h>
 #include <cairo.h>
 
@@ -217,6 +218,8 @@
 									    ...);
 cairo_font_options_t * get_font_options ();
 
+cairo_font_options_t * get_font_options ();
+
 #ifdef __cplusplus
 }
 #endif /* __cplusplus */
--- evolution-2.8.0/addressbook/gui/widgets/e-minicard.c.fix-missing-declarations	2006-07-22 07:14:49.000000000 -0400
+++ evolution-2.8.0/addressbook/gui/widgets/e-minicard.c	2006-09-05 06:48:18.000000000 -0400
@@ -39,6 +39,7 @@
 #include "e-minicard-label.h"
 #include "e-minicard-view.h"
 #include "e-contact-editor.h"
+#include <e-util/e-html-utils.h>
 #include <e-util/e-icon-factory.h>
 #include <libebook/e-destination.h>
 #include "a11y/addressbook/ea-addressbook.h"
--- evolution-2.8.0/composer/e-msg-composer.c.fix-missing-declarations	2006-09-05 00:11:45.000000000 -0400
+++ evolution-2.8.0/composer/e-msg-composer.c	2006-09-05 06:48:18.000000000 -0400
@@ -61,6 +61,7 @@
 #include <gconf/gconf.h>
 #include <gconf/gconf-client.h>
 
+#include <libgnome/libgnome.h>
 #include <libgnome/gnome-exec.h>
 #include <libgnome/gnome-i18n.h>
 #include <libgnomeui/gnome-uidefs.h>
--- evolution-2.8.0/shell/e-shell-window.c.fix-missing-declarations	2006-09-05 00:11:45.000000000 -0400
+++ evolution-2.8.0/shell/e-shell-window.c	2006-09-05 06:48:18.000000000 -0400
@@ -58,6 +58,13 @@
 
 #include <string.h>
 
+#ifdef NM_SUPPORT_GLIB
+void e_shell_nm_glib_initialise (EShellWindow *window);
+void e_shell_nm_glib_dispose (EShellWindow *window);
+#elif NM_SUPPORT
+void e_shell_dbus_initialise (EShellWindow *window);
+void e_shell_dbus_dispose (EShellWindow *window);
+#endif
 
 /* A view for each component.  These are all created when EShellWindow is
    instantiated, but with the widget pointers to NULL and the page number set
--- evolution-2.8.0/calendar/gui/alarm-notify/alarm-notify.c.fix-missing-declarations	2006-09-02 02:41:31.000000000 -0400
+++ evolution-2.8.0/calendar/gui/alarm-notify/alarm-notify.c	2006-09-05 06:48:18.000000000 -0400
@@ -25,6 +25,7 @@
 
 #include <string.h>
 #include <bonobo/bonobo-main.h>
+#include <libedataserver/e-data-server-util.h>
 #include <libedataserver/e-url.h>
 #include <libedataserver/e-data-server-util.h>
 #include <libedataserverui/e-passwords.h>
--- evolution-2.8.0/calendar/gui/e-calendar-view.h.fix-missing-declarations	2006-08-07 00:47:42.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-calendar-view.h	2006-09-05 06:48:18.000000000 -0400
@@ -166,6 +166,18 @@
 					       gboolean new);
 
 gboolean	e_calendar_view_get_tooltips (ECalendarViewEventData *data);
+
+void           e_calendar_view_move_tip (GtkWidget *widget, int x, int y);
+
+#ifdef ENABLE_CAIRO
+void           draw_curved_rectangle (cairo_t *cr,
+                                      double x0,
+                                      double y0,
+                                      double rect_width,
+                                      double rect_height,
+                                      double radius);
+#endif
+
 G_END_DECLS
 
 #endif
--- evolution-2.8.0/calendar/gui/gnome-cal.h.fix-missing-declarations	2006-07-22 07:14:51.000000000 -0400
+++ evolution-2.8.0/calendar/gui/gnome-cal.h	2006-09-05 06:48:18.000000000 -0400
@@ -198,6 +198,8 @@
 						 const char* comp_uid,
 						 const char* comp_rid);
 
+GtkWidget * gnome_calendar_get_tag (GnomeCalendar *gcal);
+
 G_END_DECLS
 
 #endif
--- evolution-2.8.0/calendar/gui/dialogs/memo-page.h.fix-missing-declarations	2006-07-22 07:14:51.000000000 -0400
+++ evolution-2.8.0/calendar/gui/dialogs/memo-page.h	2006-09-05 06:48:18.000000000 -0400
@@ -53,6 +53,8 @@
 GtkType   memo_page_get_type  (void);
 MemoPage *memo_page_construct (MemoPage *epage);
 MemoPage *memo_page_new       (BonoboUIComponent *uic, CompEditorPageFlags flags);
+void      memo_page_set_classification (MemoPage *page, ECalComponentClassification class);
+void      memo_page_set_show_categories (MemoPage *page, gboolean state);
 
 G_END_DECLS
 
--- evolution-2.8.0/calendar/gui/cal-search-bar.c.fix-missing-declarations	2006-08-21 02:32:06.000000000 -0400
+++ evolution-2.8.0/calendar/gui/cal-search-bar.c	2006-09-05 06:53:57.000000000 -0400
@@ -31,6 +31,7 @@
 #include <gtk/gtksignal.h>
 #include <libgnome/gnome-i18n.h>
 #include <e-util/e-icon-factory.h>
+#include <libedataserver/e-categories.h>
 #include "cal-search-bar.h"
 
 typedef struct CALSearchBarItem {
--- evolution-2.8.0/calendar/gui/e-cal-model-tasks.h.fix-missing-declarations	2005-10-03 02:16:51.000000000 -0400
+++ evolution-2.8.0/calendar/gui/e-cal-model-tasks.h	2006-09-05 06:48:18.000000000 -0400
@@ -62,6 +62,7 @@
 ECalModelTasks *e_cal_model_tasks_new (void);
 
 void            e_cal_model_tasks_mark_task_complete (ECalModelTasks *model, gint model_row);
+void            e_cal_model_tasks_mark_task_incomplete (ECalModelTasks *model, gint model_row);
 void e_cal_model_tasks_update_due_tasks (ECalModelTasks *model);
 
 G_END_DECLS


Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/.cvsignore,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- .cvsignore	21 Aug 2006 18:35:50 -0000	1.56
+++ .cvsignore	5 Sep 2006 11:48:57 -0000	1.57
@@ -1 +1 @@
-evolution-2.7.92.tar.bz2
+evolution-2.8.0.tar.bz2


Index: evolution.spec
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/evolution.spec,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- evolution.spec	29 Aug 2006 21:57:17 -0000	1.188
+++ evolution.spec	5 Sep 2006 11:48:57 -0000	1.189
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 2.7.92
-Release: 7%{?dist}
+Version: 2.8.0
+Release: 1%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -84,62 +84,39 @@
 # We do not ship gnome-common (or at least we're not supposed to).
 Patch17: evolution-2.7.1-no-gnome-common.patch
 
-# XXX Make sure these are still needed and push them upstream.
-#Patch18: evolution-2.4.1-fix-missing-declarations.patch
-#Patch19: evolution-2.5.4-fix-missing-declarations.patch
-#Patch20: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch
-
-Patch21: evolution-2.7.1-notification-cleanups.patch
-Patch22: evolution-2.6.0-prototypes.patch
+#Patch18: evolution-2.7.1-notification-cleanups.patch
+Patch19: evolution-2.6.0-prototypes.patch
 
 # Gnome.org #343331
-Patch23: evolution-2.7.2.1-quit-resize-crash.patch
+Patch20: evolution-2.7.2.1-quit-resize-crash.patch
 
 # RH bug #157400 / Gnome.org bug #303877
-Patch24: evolution-2.7.4-candidate-window-position-task.patch
+Patch21: evolution-2.7.4-candidate-window-position-task.patch
 
 # RH bug #157505 / Gnome.org bug #303878
-Patch25: evolution-2.7.4-candidate-window-position-calendar.patch
+Patch22: evolution-2.7.4-candidate-window-position-calendar.patch
 
 # RH bug #190359 / Gnome.org bug #211058
-Patch26: evolution-2.7.3-filter-datespec.patch
+Patch23: evolution-2.7.3-filter-datespec.patch
 
 # RH bug #166231 / Gnome.org bug #264485
-Patch27: evolution-2.7.3-replicated-cjk-input.patch
+Patch24: evolution-2.7.3-replicated-cjk-input.patch
 
 # RH bug #178295 / Gnome.org bug #348638
-Patch28: evolution-2.7.4-deleting-preedit-buffer.patch
-
-# RH bug #197868 / Gnome.org bug #350823
-Patch29: evolution-2.7.91-default-mailer.patch
-
-# Gnome.org bug #351332
-Patch30: evolution-2.7.91-fix-missing-declarations.patch
-
-# RH bug #202383 / Gnome.org bug #351263
-Patch31: evolution-2.7.91-fix-duplicate-alarm.patch
-
-# RH bug #201831 / Gnome.org bug #350901
-Patch32: evolution-2.7.91-mail-account-disable.patch
-
-# Gnome.org bug #352248
-Patch33: evolution-2.7.91-provide-camel-exception.patch
-
-# Gnome.org bug #352423
-Patch34: evolution-2.7.92-uninitialized-gerror.patch
+Patch25: evolution-2.7.4-deleting-preedit-buffer.patch
 
 # Gnome.org bug #352450 (2 patches)
-Patch35: evolution-2.7.92-deprecated-glib.patch
-Patch36: evolution-2.7.92-deprecated-gdk.patch
-
-# RH bug #201541 / Gnome.org bug #336983
-Patch37: evolution-2.7.92-fix-edit-copy.patch
+Patch26: evolution-2.7.92-deprecated-glib.patch
+Patch27: evolution-2.7.92-deprecated-gdk.patch
 
 # RH bug #202289
-Patch38: evolution-2.7.92-fix-prgname.patch
+Patch28: evolution-2.7.92-fix-prgname.patch
 
 # Gnome.org bug #353472
-Patch39: evolution-2.7.92-chain-finalize.patch
+Patch29: evolution-2.7.92-chain-finalize.patch
+
+# Gnome.org bug #351332
+Patch30: evolution-2.8.0-fix-missing-declarations.patch
 
 ### Dependencies ###
 
@@ -260,28 +237,19 @@
 #patch15 -p1 -b .fix-conduits  # leave commented
 %patch16 -p1 -b .fix-conduit-dir
 %patch17 -p1 -b .no-gnome-common
-#patch18 -p1 -b .fix-missing-declarations
-#patch19 -p1 -b .fix-missing-declarations-2-5-4
-#patch20 -p1 -b .fix-missing-declarations-2.5.5.1
-%patch21 -p1 -b .notification-cleanups
-%patch22 -p1 -b .prototypes
-%patch23 -p1 -b .quit-resize-crash
-%patch24 -p1 -b .candidate-window-position-task
-%patch25 -p1 -b .candidate-window-position-calendar
-%patch26 -p1 -b .filter-datespec
-%patch27 -p1 -b .replicated-cjk-input
-%patch28 -p1 -b .deleting-preedit-buffer
-%patch29 -p1 -b .default-mailer
+#patch18 -p1 -b .notification-cleanups
+%patch19 -p1 -b .prototypes
+%patch20 -p1 -b .quit-resize-crash
+%patch21 -p1 -b .candidate-window-position-task
+%patch22 -p1 -b .candidate-window-position-calendar
+%patch23 -p1 -b .filter-datespec
+%patch24 -p1 -b .replicated-cjk-input
+%patch25 -p1 -b .deleting-preedit-buffer
+%patch26 -p1 -b .deprecated-glib
+%patch27 -p1 -b .deprecated-gdk
+%patch28 -p1 -b .fix-prgname
+%patch29 -p1 -b .chain-finalize
 %patch30 -p1 -b .fix-missing-declarations
-%patch31 -p1 -b .fix-duplicate-alarm
-%patch32 -p1 -b .mail-account-disable
-%patch33 -p1 -b .provide-camel-exception
-%patch34 -p1 -b .uninitialized-gerror
-%patch35 -p1 -b .deprecated-glib
-%patch36 -p1 -b .deprecated-gdk
-%patch37 -p1 -b .fix-edit-copy
-%patch38 -p1 -b .fix-prgname
-%patch39 -p1 -b .chain-finalize
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -672,6 +640,21 @@
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Mon Sep  4 2006 Matthew Barnes <mbarnes at redhat.com> - 2.8.0-1.fc6
+- Update to 2.8.0
+- Remove patch for RH bug #197868 (fixed upstream).
+- Remove patch for RH bug #201541 (fixed upstream).
+- Remove patch for RH bug #201831 (fixed upstream).
+- Remove patch for RH bug #202383 (fixed upstream).
+- Remove patch for RH bug #203036 (fixed upstream).
+- Remove patch for Gnome.org bug #352248 (fixed upstream).
+- Remove patch for Gnome.org bug #352423 (fixed upstream).
+- Update patch for Gnome.org bug #351332 (partially fixed upstream).
+
+* Thu Aug 31 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-8.fc6
+- Add patch for RH bug #203036.
+- Disable notification-cleanups patch.
+
 * Tue Aug 29 2006 Matthew Barnes <mbarnes at redhat.com> - 2.7.92-7.fc6
 - Add patch for Gnome.org bug #353472.
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/evolution/devel/sources,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- sources	21 Aug 2006 18:35:50 -0000	1.56
+++ sources	5 Sep 2006 11:48:57 -0000	1.57
@@ -1 +1 @@
-2c8e3e26b8861365e61e7a93713a204b  evolution-2.7.92.tar.bz2
+fdcdaa4f6c11cb3b42078262838967d7  evolution-2.8.0.tar.bz2


--- evolution-2.4.1-fix-missing-declarations.patch DELETED ---


--- evolution-2.5.4-fix-missing-declarations.patch DELETED ---


--- evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch DELETED ---


--- evolution-2.7.91-default-mailer.patch DELETED ---


--- evolution-2.7.91-fix-duplicate-alarm.patch DELETED ---


--- evolution-2.7.91-fix-missing-declarations.patch DELETED ---


--- evolution-2.7.91-mail-account-disable.patch DELETED ---


--- evolution-2.7.91-provide-camel-exception.patch DELETED ---


--- evolution-2.7.92-fix-edit-copy.patch DELETED ---


--- evolution-2.7.92-uninitialized-gerror.patch DELETED ---


