diff --git a/.cvsignore b/.cvsignore index 58445a1..972d3f7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.11.4.tar.bz2 +evolution-2.11.5.tar.bz2 diff --git a/evolution-2.11.5-implicit-function-declarations.patch b/evolution-2.11.5-implicit-function-declarations.patch new file mode 100644 index 0000000..e9c74a6 --- /dev/null +++ b/evolution-2.11.5-implicit-function-declarations.patch @@ -0,0 +1,38 @@ +--- evolution-2.11.5/plugins/exchange-operations/exchange-delegates-user.c.implicit-function-declarations 2007-07-09 07:25:51.000000000 -0400 ++++ evolution-2.11.5/plugins/exchange-operations/exchange-delegates-user.c 2007-07-12 15:39:37.000000000 -0400 +@@ -23,10 +23,15 @@ + #include + #endif + ++#include "exchange-delegates.h" ++#include "exchange-delegates-user.h" ++ + #include + #include ++#include + #include +-#include "exchange-delegates-user.h" ++#include ++#include + #include + #include + #include +@@ -167,7 +172,7 @@ parent_window_destroyed (gpointer dialog + + /* Maps the role_nam parameter to their corresponding Full role name + */ +-const char * ++static const char * + map_to_full_role_name (E2kPermissionsRole role_nam) + { + const char *role_name; +--- evolution-2.11.5/shell/es-event.h.implicit-function-declarations 2007-07-12 16:10:10.000000000 -0400 ++++ evolution-2.11.5/shell/es-event.h 2007-07-12 16:11:01.000000000 -0400 +@@ -91,6 +91,7 @@ GType es_event_get_type(void); + ESEvent *es_event_peek(void); + + ESEventTargetState *es_event_target_new_state(ESEvent *emp, int state); ++ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, EShell *shell); + ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision); + + /* ********************************************************************** */ diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index e4cfa52..bab59c2 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -5065,7 +5065,7 @@ - extern EMsgPort *mail_gui_port2; - - e_msgport_put(mail_gui_port2, (EMsg *)m); -+ mail_msg_main_loop_push(m); ++ mail_msg_main_loop_push(mail_msg_ref (m)); } if (cancel) { diff --git a/evolution.spec b/evolution.spec index 1ec856c..dde5d9a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.11.4 +Version: 2.11.5 Release: 2%{?dist} License: GPL Group: Applications/Productivity @@ -131,6 +131,9 @@ Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch +# More implicit function declarations... +Patch35: evolution-2.11.5-implicit-function-declarations.patch + ## Dependencies ### Requires(post): GConf2 @@ -270,6 +273,7 @@ Development files needed for building things which link against evolution. %patch32 -p1 -b .view-message-source %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box +%patch35 -p1 -b .implicit-function-declarations mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -426,6 +430,7 @@ export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder-2.12.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null @@ -445,6 +450,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog NEWS README # GConf schemas: +%{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder-2.12.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas @@ -564,6 +570,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-addressbook-file.eplug %{evo_plugin_dir}/liborg-gnome-addressbook-file.so +%{evo_plugin_dir}/attachment-reminder.glade +%{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so + %if %{inline_audio_support} %{evo_plugin_dir}/org-gnome-audio-inline.eplug %{evo_plugin_dir}/liborg-gnome-audio-inline.so @@ -703,8 +713,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Jul 13 2007 Matthew Barnes - 2.11.5-1.fc8 +- Update to 2.11.5 +- Revise patch for GNOME bug #362638 to fix RH bug #245695. + * Wed Jun 27 2007 Matthew Barnes - 2.11.4-2.fc8 -- Revise patch for GNOME bug #363695 to fix RH bug #245289 (frequent hangs). +- Revise patch for GNOME bug #363638 to fix RH bug #245289 (frequent hangs). * Mon Jun 18 2007 Matthew Barnes - 2.11.4-1.fc8 - Update to 2.11.4 diff --git a/sources b/sources index d669b62..4e51510 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -003da7ba7f744d13e1c6f4d4c884b2ac evolution-2.11.4.tar.bz2 +132ac3a9847a6588c46bd4db2743d96b evolution-2.11.5.tar.bz2