From 9c47c62bf3d1c3ce66e0f2e1bca38ac728ed1844 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 28 Feb 2006 18:13:23 +0000 Subject: [PATCH 001/844] - 2.5.92 --- .cvsignore | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 34682a7..0d17f42 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.5.91.tar.bz2 +evolution-2.5.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index b403532..6a5ad27 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define gtkhtml_version 3.9.2 %define soup_version 2.2.2 -%define eds_version 1.5.91 +%define eds_version 1.5.92 %define use_mozilla_nss 1 %define evo_major 2.6 %define libbonoboui_version 2.4.2 @@ -38,7 +38,7 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.5.91 +Version: 2.5.92 Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -219,7 +219,7 @@ Development files needed for building things which link against evolution. %patch98 -p1 -b .ldaphack # patches sent upstream -%patch100 -p0 -b .addressbook-print-with-pango +#%patch100 -p0 -b .addressbook-print-with-pango %patch101 -p1 -b .calendar-print-with-pango %patch106 -p1 -b .commit-enter-on-calendar @@ -634,6 +634,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Feb 27 2006 Ray Strode - 2.5.92-1 +- 2.5.92 + * Tue Feb 14 2006 David Malcolm - 2.5.91-1 - 2.5.91 - updated patch 101 to track upstream changes to calendar printing code diff --git a/sources b/sources index 6121080..964a8a0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cea13421ea95707e89c0311100714573 evolution-2.5.91.tar.bz2 +1dd17db843eeb66740b40ebb9024261f evolution-2.5.92.tar.bz2 From fd2437295d9bde28a711f1832abf874e7b8b4c56 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 13 Mar 2006 17:45:46 +0000 Subject: [PATCH 002/844] - 2.6.0 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0d17f42..345364b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.5.92.tar.bz2 +evolution-2.6.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 6a5ad27..2fc3f40 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,7 +38,7 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.5.92 +Version: 2.6.0 Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -634,6 +634,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Mar 13 2006 Ray Strode - 2.6.0-1 +- 2.6.0 + * Mon Feb 27 2006 Ray Strode - 2.5.92-1 - 2.5.92 diff --git a/sources b/sources index 964a8a0..4c3a0ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1dd17db843eeb66740b40ebb9024261f evolution-2.5.92.tar.bz2 +5c98650b2ccf3581e7cf5af3927b95d1 evolution-2.6.0.tar.bz2 From 25c4e76d3af75cb9c7622bd02ee4c20901293f6d Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 13 Mar 2006 17:57:56 +0000 Subject: [PATCH 003/844] - 2.6.0 - turn on the "error on missing prototypes" check thing --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 2fc3f40..4ce45f6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ # 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 require_function_declarations 1 %define redhat_menus_version 5.0.4 @@ -636,6 +636,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Mar 13 2006 Ray Strode - 2.6.0-1 - 2.6.0 +- turn on the "error on missing prototypes" check thing * Mon Feb 27 2006 Ray Strode - 2.5.92-1 - 2.5.92 From 2a3735c2de5fe926023bcb6596e85ec8a77e8f9b Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 13 Mar 2006 19:16:49 +0000 Subject: [PATCH 004/844] - 2.6.0 - turn on the "error on missing prototypes" check thing --- evolution-2.6.0-prototypes.patch | 10 ++++++++++ evolution.spec | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 evolution-2.6.0-prototypes.patch diff --git a/evolution-2.6.0-prototypes.patch b/evolution-2.6.0-prototypes.patch new file mode 100644 index 0000000..9c616a7 --- /dev/null +++ b/evolution-2.6.0-prototypes.patch @@ -0,0 +1,10 @@ +--- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500 ++++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500 +@@ -32,6 +32,7 @@ + #include "../calendar-config.h" + #include "cal-prefs-dialog.h" + #include ++#include + #include + #include + #include diff --git a/evolution.spec b/evolution.spec index 4ce45f6..b229354 100644 --- a/evolution.spec +++ b/evolution.spec @@ -100,6 +100,7 @@ Patch804: evolution-2.4.1-fix-missing-declarations.patch Patch805: evolution-2.5.4-fix-missing-declarations.patch Patch806: evolution-2.5.5.1-notification-cleanups.patch Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch +Patch809: evolution-2.6.0-prototypes.patch Summary: GNOME's next-generation groupware suite Group: Applications/Productivity @@ -244,6 +245,7 @@ cd ../.. %patch805 -p1 -b .fix-missing-declarations-2-5-4 %patch806 -p1 -b .notification-cleanups %patch808 -p1 -b .fix-missing-declarations-2.5.5.1 +%patch809 -p1 -b .prototypes mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From ca49f10ee375eb3a7c3322848aba762036290f50 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Mon, 13 Mar 2006 19:32:46 +0000 Subject: [PATCH 005/844] add more prototypes --- evolution-2.6.0-prototypes.patch | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/evolution-2.6.0-prototypes.patch b/evolution-2.6.0-prototypes.patch index 9c616a7..ab89fa7 100644 --- a/evolution-2.6.0-prototypes.patch +++ b/evolution-2.6.0-prototypes.patch @@ -1,3 +1,13 @@ +--- evolution-2.6.0/calendar/gui/dialogs/alarm-dialog.c.prototypes 2006-03-13 14:29:57.000000000 -0500 ++++ evolution-2.6.0/calendar/gui/dialogs/alarm-dialog.c 2006-03-13 14:30:56.000000000 -0500 +@@ -41,6 +41,7 @@ + #include + #include + #include ++#include + #include + #include + #include --- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500 +++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500 @@ -32,6 +32,7 @@ From bb35f4cd6004c04712100e0fe61ae234749b09be Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 14 Mar 2006 05:42:48 +0000 Subject: [PATCH 006/844] - enable file entry widget --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b229354..1dfa1cc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -327,9 +327,9 @@ export tagname=CC # Do the make, with various flags: %if %{require_function_declarations} -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration" +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration -UGNOME_DISABLE_DEPRECATED" %else -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS" +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" %endif #cat /dev/null > default_user/local/Inbox/mbox From 53cca7a998ecc8761c8cdb9ba6af163933deee01 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 14 Mar 2006 06:01:38 +0000 Subject: [PATCH 007/844] add another explicit prototype --- evolution-2.6.0-prototypes.patch | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/evolution-2.6.0-prototypes.patch b/evolution-2.6.0-prototypes.patch index ab89fa7..16fe7ab 100644 --- a/evolution-2.6.0-prototypes.patch +++ b/evolution-2.6.0-prototypes.patch @@ -1,13 +1,14 @@ ---- evolution-2.6.0/calendar/gui/dialogs/alarm-dialog.c.prototypes 2006-03-13 14:29:57.000000000 -0500 -+++ evolution-2.6.0/calendar/gui/dialogs/alarm-dialog.c 2006-03-13 14:30:56.000000000 -0500 -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include - #include - #include +--- evolution-2.6.0/calendar/gui/dialogs/event-page.c.prototypes 2006-03-14 01:00:04.000000000 -0500 ++++ evolution-2.6.0/calendar/gui/dialogs/event-page.c 2006-03-14 01:00:21.000000000 -0500 +@@ -59,6 +59,8 @@ + #include "event-page.h" + #include "e-send-options-utils.h" + ++GtkWidget *alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store); ++ + + + /* Private part of the EventPage structure */ --- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500 +++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500 @@ -32,6 +32,7 @@ From 690878ccc1538a177e9fdd90b9d495a0b65cbb2a Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 14 Mar 2006 06:03:41 +0000 Subject: [PATCH 008/844] turn back off the implicit decls check --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1dfa1cc..7b655d8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ # 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 1 +%define require_function_declarations 0 %define redhat_menus_version 5.0.4 From d196f2228896559666c21e3a0aa2a4702e55f463 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 14 Mar 2006 06:38:32 +0000 Subject: [PATCH 009/844] remove legacy mime support files from the file list --- evolution.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7b655d8..84e732d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -421,10 +421,6 @@ rm -rf $RPM_BUILD_ROOT # IDL files (should this be in devel subpackage?) %{_datadir}/idl/evolution-%{evo_major} -# 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 From 3d6af6b085b348006e86aa7a88b2c8808b9028bc Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Tue, 14 Mar 2006 06:57:34 +0000 Subject: [PATCH 010/844] more mime cruft removal, and remove a desktop file that got renamed but we don't ship --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 84e732d..fd439c4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -367,7 +367,10 @@ ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop $RPM_BUILD_ROOT ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ # remove upstream desktop file; use the symlinks from above (#103826) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop + +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime # evolution link ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution From da86a3cea2d53c9af3fc4e0f1e67a56ac0b7ef96 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Thu, 30 Mar 2006 14:26:37 +0000 Subject: [PATCH 011/844] rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index fd439c4..0e31b99 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.6.0 -Release: 1 +Release: 2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -635,6 +635,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 +- rebuild against stable pilot-link + * Mon Mar 13 2006 Ray Strode - 2.6.0-1 - 2.6.0 - turn on the "error on missing prototypes" check thing From d00f5d9148fab9aef77e372287fde23feba1e236 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Thu, 30 Mar 2006 14:46:36 +0000 Subject: [PATCH 012/844] nontrivial --- evolution.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0e31b99..fd439c4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.6.0 -Release: 2 +Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -635,9 +635,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 -- rebuild against stable pilot-link - * Mon Mar 13 2006 Ray Strode - 2.6.0-1 - 2.6.0 - turn on the "error on missing prototypes" check thing From 0ed5b954c222bf0d7695eabb5c3a27615e1f6e36 Mon Sep 17 00:00:00 2001 From: Caolan McNamara Date: Thu, 30 Mar 2006 15:23:37 +0000 Subject: [PATCH 013/844] it'll work --- evolution.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index fd439c4..f131e20 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,7 +11,7 @@ %define gnomevfs2_version 2.4 %define last_libgal2_version 2:2.5.3-2 -%define pilot_link_version 0.12.0 +%define pilot_link_version 2:0.11.8 %define gnome_pilot_version 2.0.13 %define ldap_support 1 @@ -39,7 +39,7 @@ Name: evolution Version: 2.6.0 -Release: 1 +Release: 2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -88,7 +88,7 @@ Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch #Patch700: evolution-1.5.9.1-filechooser.patch # Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams): -Patch800: evolution-2.5.4-fix-conduits.patch +# Patch800: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) Patch802: evolution-2.5.4-fix-conduit-dir.patch @@ -238,7 +238,7 @@ cd ../.. #patch700 -p1 -b .filechooser -%patch800 -p1 -b .fix-conduits +# %patch800 -p1 -b .fix-conduits %patch802 -p1 -b .fix-conduit-dir %patch803 -p1 -b .no-gnome-common %patch804 -p1 -b .fix-missing-declarations @@ -635,6 +635,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 +- rebuild against reverted pilot-link +- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8 + * Mon Mar 13 2006 Ray Strode - 2.6.0-1 - 2.6.0 - turn on the "error on missing prototypes" check thing From 3a9b63f94df648581d528910de10e5f35500b884 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 11 Apr 2006 02:52:49 +0000 Subject: [PATCH 014/844] 2.6.1 --- .cvsignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 345364b..4a2aee3 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ evolution-2.6.0.tar.bz2 +evolution-2.6.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index f131e20..d94fe14 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,7 +38,7 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.6.0 +Version: 2.6.1 Release: 2 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root @@ -635,6 +635,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Apr 10 2006 Matthias Clasen - 2.6.1-2 +- Update to 2.6.1 + * Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 - rebuild against reverted pilot-link - disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8 diff --git a/sources b/sources index 4c3a0ee..1f470a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c98650b2ccf3581e7cf5af3927b95d1 evolution-2.6.0.tar.bz2 +6ca70a86e6d8e8b3824e58f28a362065 evolution-2.6.1.tar.bz2 From 87e18eced2bb43744a614db6ec1a816159fcc1b9 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 3 May 2006 17:29:24 +0000 Subject: [PATCH 015/844] - rebuilt --- evolution.spec | 1683 ------------------------------------------------ 1 file changed, 1683 deletions(-) diff --git a/evolution.spec b/evolution.spec index d94fe14..416994c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,1684 +1 @@ -%define gtkhtml_version 3.9.2 -%define soup_version 2.2.2 -%define eds_version 1.5.92 -%define use_mozilla_nss 1 -%define evo_major 2.6 -%define libbonoboui_version 2.4.2 -%define orbit2_version 2.9.8 -%define gnome_icon_theme_version 1.3.6 -%define libgnomeprint22_version 2.8.0 -%define dbus_version 0.31 -%define gnomevfs2_version 2.4 -%define last_libgal2_version 2:2.5.3-2 - -%define pilot_link_version 2:0.11.8 -%define gnome_pilot_version 2.0.13 - -%define ldap_support 1 -%define krb5_support 1 -%ifarch s390 s390x -%define pilot_support 0 -%else -%define pilot_support 1 -%endif -# note that nntp is non-functional in evo 1.3.x -%define nntp_support 1 -%define exchange_support 1 -%define nm_support 1 -%define libnotify_support 1 -%define inline_audio_support 0 - -# 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.6.1 -Release: 2 -License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root -URL: http://www.ximian.com/ -Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.1/%{name}-%{version}.tar.bz2 - -# patches pulled from upstream CVS - -# Red Hat Linux specific patches -#Patch11: evolution-1.3.2-redhatify.patch - -# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/ -#Patch99: db3-dont-use-pthread.patch -# bad hack -Patch98: evolution-1.4.4-ldap-x86_64-hack.patch - -# patches sent upstream -Patch100: evo-addressbook-print-with-pango-2.patch -Patch101: evo-calendar-print-with-pango-7.patch - -#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch - -# Fix for RH bug #154360: -Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch - -# Move autosave file -Patch107: evolution-2.5.4-move-autosave-file.patch - -# Fix for RH bug 150458: -Patch108: evolution-2.3.5.1-fix-150458.patch - -# Fix for RH bug 164957 (was for 145552): -Patch109: evolution-2.0.2-fix-145552.patch - -# Part of RH bug 170799: -Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch - -# not accepted, but proposed on a few occasions. fixes problems with -# some cyrus servers -#Patch200: evolution-1.4.5-imap-command-length.patch - -# this was rejected due to adding a dependency on DISPLAY for -# evolution-wombat but it does work to fix the problem -#Patch500: evolution-wombat-sm.patch - -# This was added upstream in 1.5.93, with configure-time detection -#Patch700: evolution-1.5.9.1-filechooser.patch - -# Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams): -# Patch800: evolution-2.5.4-fix-conduits.patch - -# Move .conduit files from share to lib (for the sake of multilib) -Patch802: evolution-2.5.4-fix-conduit-dir.patch - -# Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools): -Patch803: evolution-2.5.2-no-gnome-common.patch - -Patch804: evolution-2.4.1-fix-missing-declarations.patch -Patch805: evolution-2.5.4-fix-missing-declarations.patch -Patch806: evolution-2.5.5.1-notification-cleanups.patch -Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch -Patch809: evolution-2.6.0-prototypes.patch - -Summary: GNOME's next-generation groupware suite -Group: Applications/Productivity - -Requires: scrollkeeper >= 0.1.4 -Requires: ORBit2 >= 2.7.5 -Requires: libsoup >= %{soup_version} -Requires: evolution-data-server >= %{eds_version} -Requires: gnome-spell >= 1.0.2 -Requires: gtk2 >= 2.4.0 -Requires: libbonoboui >= %{libbonoboui_version} -Requires: ORBit2 >= %{orbit2_version} -Requires: spamassassin -Requires: gnome-icon-theme >= %{gnome_icon_theme_version} -Requires: redhat-menus >= %{redhat_menus_version} -Requires: gnutls -Requires: dbus >= %{dbus_version} -Requires: libgnomeprint22 >= %{libgnomeprint22_version} -Requires: gnome-vfs2 >= %{gnomevfs2_version} - -%if %{libnotify_support} -Requires: libnotify -%endif - -Obsoletes: libgal2 <= %{last_libgal2_version} - -BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} -BuildRequires: libsoup-devel >= %{soup_version} -BuildRequires: evolution-data-server-devel >= %{eds_version} -BuildRequires: libbonobo-devel >= 2.0 -BuildRequires: libbonoboui-devel >= %{libbonoboui_version} -BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} -BuildRequires: libgnomeui-devel >= 2.0 -BuildRequires: libgnomecanvas-devel >= 2.0 -BuildRequires: libxml2-devel -BuildRequires: GConf2-devel -BuildRequires: intltool -BuildRequires: ORBit2-devel >= %{orbit2_version} -BuildRequires: atk-devel -# kind of silly... -BuildRequires: flex bison byacc libtool gettext -BuildRequires: gnutls-devel -BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: gtk-doc - -%if %{use_mozilla_nss} -BuildRequires: nspr-devel -BuildRequires: nss-devel -%else -BuildRequires: openssl-devel -%endif - -BuildRequires: pkgconfig -BuildRequires: desktop-file-utils -BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version} - -%if %{inline_audio_support} -# audio-inline plugin requires gstreamer to build: -BuildRequires: gstreamer08-devel -%endif - -%if %{ldap_support} -BuildRequires: openldap-devel >= 2.0.11 -%endif - -%if %{pilot_support} -BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} -# bleah, gnome-pilot really sucks this in, but then I have to have an explicit -# versioning for gnome-pilot when it changes less than pilot-link itself -BuildRequires: pilot-link-devel >= %{pilot_link_version} -Requires: gnome-pilot >= %{gnome_pilot_version} -%endif - -%if %{krb5_support} -BuildRequires: krb5-devel -# tweak for krb5 1.2 vs 1.3 -%define krb5dir /usr/kerberos -#define krb5dir `pwd`/krb5-fakeprefix -%endif - -%if %{nm_support} -BuildRequires: NetworkManager-glib-devel -%endif - -%if %{libnotify_support} -BuildRequires: libnotify-devel -%endif - -%description -Evolution is the GNOME mailer, calendar, contact manager and -communications tool. The tools which make up Evolution will -be tightly integrated with one another and act as a seamless -personal information-management tool. - -%package devel -Summary: Development files for building against evolution -Group: Development/Libraries -Requires: %{name} = %{version} -Requires: gtkhtml3-devel >= %{gtkhtml_version} -Requires: libsoup-devel >= %{soup_version} -Obsoletes: libgal2-devel <= %{last_libgal2_version} - -%description devel -Development files needed for building things which link against evolution. - -%prep -%setup -q -# these are in CVS already on the 1-4-branch - -# these are in CVS already on the gnome-2-8 branch - -# Red Hat specific patches -#patch11 -p1 -b .rhatify - -#patch99 -p1 -b .db3pthread - -%patch98 -p1 -b .ldaphack - -# patches sent upstream -#%patch100 -p0 -b .addressbook-print-with-pango -%patch101 -p1 -b .calendar-print-with-pango - -%patch106 -p1 -b .commit-enter-on-calendar -%patch107 -p1 -b .move-autosave-file -cd widgets/table -%patch108 -p3 -b .fix-150458 -cd ../.. -%patch109 -p1 -b .fix-164957 - -%patch110 -p1 -b .hide-switcher-buttons-by-default - -#patch200 -p1 -b .commandlength - -#patch500 -p0 -b .wombatsm - -#patch700 -p1 -b .filechooser - -# %patch800 -p1 -b .fix-conduits -%patch802 -p1 -b .fix-conduit-dir -%patch803 -p1 -b .no-gnome-common -%patch804 -p1 -b .fix-missing-declarations -%patch805 -p1 -b .fix-missing-declarations-2-5-4 -%patch806 -p1 -b .notification-cleanups -%patch808 -p1 -b .fix-missing-declarations-2.5.5.1 -%patch809 -p1 -b .prototypes - -mkdir -p krb5-fakeprefix/include -mkdir -p krb5-fakeprefix/lib -mkdir -p krb5-fakeprefix/%{_lib} - -%build -# define all of our flags, this is kind of ugly :( -%if %{ldap_support} -%define ldap_flags --with-openldap=yes -%else -%define ldap_flags --without-openldap -%endif - -%if %{pilot_support} -%define pilot_flags --enable-pilot-conduits=yes -%else -%define pilot_flags --enable-pilot-conduits=no -%endif - -%if %{krb5_support} -%define krb5_flags --with-krb5=%{krb5dir} -%else -%define krb5_flags --without-krb5 -%endif - -%if %{nntp_support} -%define nntp_flags --enable-nntp=yes -%else -%define nntp_flags --enable-nntp=no -%endif - -%if %{use_mozilla_nss} -%define ssl_flags --enable-nss=yes --enable-smime=yes -%else -%define ssl_flags --enable-openssl=yes -%endif - -%if %{use_mozilla_nss} -if ! pkg-config --exists nss; then - echo "Unable to find suitable version of mozilla nss to use!" - exit 1 -fi -%endif - -%if %{exchange_support} -%define exchange_flags --enable-exchange=yes -%else -%define exchange_flags --enable-exchange=no -%endif - -CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS -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`" - LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" -fi -%endif - -# Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths): -aclocal -autoheader -automake -libtoolize -intltoolize --force -autoconf - -# Configuration: -%configure \ - --enable-gtk-doc=yes \ - --enable-ipv6 \ - --enable-file-locking=fcntl --enable-dot-locking=no \ - --with-sub-version=" (%{version}-%{release})" \ - --with-kde-applnk-path=no \ - --enable-file-chooser=yes \ - %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ - --enable-plugins=all -export tagname=CC - -# Do the make, with various flags: -%if %{require_function_declarations} -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration -UGNOME_DISABLE_DEPRECATED" -%else -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" -%endif - -#cat /dev/null > default_user/local/Inbox/mbox - -%install -rm -rf $RPM_BUILD_ROOT -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -export tagname=CC -make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - -# remove libtool archives for importers and the like -find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; - -# remove statically built libraries: -find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; - -# pilot conduits static and libtool bits should go away too -rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.a -rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la - -# remove additional things we don't want -%if ! %{inline_audio_support} -%{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \ - $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so -%endif - -# scrollkeeper gets handled in %post -rm -rf $RPM_BUILD_ROOT/var/scrollkeeper - -# evolution is the preferred email app -ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ - -# remove upstream desktop file; use the symlinks from above (#103826) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop - -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime - -# evolution link -ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution - -for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile -done -%find_lang %name-%{evo_major} - -%post -/sbin/ldconfig -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas" -for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null -done -scrollkeeper-update - -%postun -/sbin/ldconfig -scrollkeeper-update - -%clean -rm -rf $RPM_BUILD_ROOT - -%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 - -# 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} - -# The main data directory -# (have not attempted to split this up into an explicit list) -%dir %{_datadir}/evolution -%{_datadir}/evolution/%{evo_major} - -%{_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 -%{_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 -%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/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 -# globs above; the purpose of the separation below is to be more explicit about -# which plugins we ship) -%{evo_plugin_dir}/org-gnome-mail-account-disable.eplug -%{evo_plugin_dir}/libmail-account-disable.so - -%{evo_plugin_dir}/org-gnome-addressbook-file.eplug -%{evo_plugin_dir}/liborg-gnome-addressbook-file.so - -%if %{inline_audio_support} -%{evo_plugin_dir}/org-gnome-audio-inline.eplug -%{evo_plugin_dir}/liborg-gnome-audio-inline.so -%endif - -%{evo_plugin_dir}/org-gnome-calendar-file.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-file.so - -%{evo_plugin_dir}/org-gnome-calendar-http.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-http.so - -%{evo_plugin_dir}/org-gnome-calendar-weather.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-weather.so - -%{evo_plugin_dir}/org-gnome-copy-tool.eplug -%{evo_plugin_dir}/liborg-gnome-copy-tool.so - -%{evo_plugin_dir}/org-gnome-default-mailer.eplug -%{evo_plugin_dir}/liborg-gnome-default-mailer.so - -%{evo_plugin_dir}/org-gnome-default-source.eplug -%{evo_plugin_dir}/liborg-gnome-default-source.so - -%{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so - -%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so - -%{evo_plugin_dir}/org-gnome-exchange-operations.eplug -%{evo_plugin_dir}/liborg-gnome-exchange-operations.so -%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml -%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml -%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml -%{evo_plugin_dir}/org-gnome-folder-permissions.xml -%{evo_plugin_dir}/org-gnome-folder-subscription.xml - -%{evo_plugin_dir}/org-gnome-groupwise-features.eplug -%{evo_plugin_dir}/liborg-gnome-groupwise-features.so -%{evo_plugin_dir}/org-gnome-compose-send-options.xml - -%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug -%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so - -%{evo_plugin_dir}/org-gnome-itip-formatter.eplug -%{evo_plugin_dir}/liborg-gnome-itip-formatter.so - -%{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug -%{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so -%{evo_plugin_dir}/org-gnome-mailing-list-actions.xml - -%{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 - -%{evo_plugin_dir}/org-gnome-mark-calendar-offline.eplug -%{evo_plugin_dir}/liborg-gnome-mark-calendar-offline.so - -%{evo_plugin_dir}/org-gnome-new-mail-notify.eplug -%{evo_plugin_dir}/liborg-gnome-new-mail-notify.so - -%{evo_plugin_dir}/org-gnome-plugin-manager.eplug -%{evo_plugin_dir}/liborg-gnome-plugin-manager.so -%{evo_plugin_dir}/org-gnome-plugin-manager.xml - -%{evo_plugin_dir}/org-gnome-print-message.eplug -%{evo_plugin_dir}/liborg-gnome-print-message.so -%{evo_plugin_dir}/org-gnome-print-message.xml - -%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug -%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so - -%{evo_plugin_dir}/org-gnome-save-calendar.eplug -%{evo_plugin_dir}/liborg-gnome-save-calendar.so - -%{evo_plugin_dir}/org-gnome-select-one-source.eplug -%{evo_plugin_dir}/liborg-gnome-select-one-source.so - -%{evo_plugin_dir}/org-gnome-subject-thread.eplug -%{evo_plugin_dir}/liborg-gnome-subject-thread.so - -%{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so - -%{evo_plugin_dir}/org-gnome-publish-calendar.eplug -%{evo_plugin_dir}/liborg-gnome-publish-calendar.so -%{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/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 -* Mon Apr 10 2006 Matthias Clasen - 2.6.1-2 -- Update to 2.6.1 - -* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 -- rebuild against reverted pilot-link -- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8 - -* Mon Mar 13 2006 Ray Strode - 2.6.0-1 -- 2.6.0 -- turn on the "error on missing prototypes" check thing - -* Mon Feb 27 2006 Ray Strode - 2.5.92-1 -- 2.5.92 - -* Tue Feb 14 2006 David Malcolm - 2.5.91-1 -- 2.5.91 -- updated patch 101 to track upstream changes to calendar printing code -- remove uptreamed patch 807 (NM multiple initialization assertion) -- readded the mail-to-task plugin XML UI file -- bump e-d-s req to 1.5.91 - -* Fri Feb 10 2006 Jesse Keating - 2.5.90-2.1 -- bump again for double-long bug on ppc(64) - -* Thu Feb 9 2006 Christopher Aillon - 2.5.90-2 -- Disable the inline audio plugin for now since it uses gstreamer08 - -* Tue Feb 07 2006 Jesse Keating - 2.5.90-1.1 -- rebuilt for new gcc4.1 snapshot and glibc changes - -* Mon Jan 30 2006 David Malcolm - 2.5.90-1 -- 2.5.90 -- trimmed patches 805 and 808, as parts of these got merged upstream -- trimmed and regenerated patch 806 to track upstream -- removed the mail-to-task plugin XML UI file - -* Sat Jan 28 2006 David Malcolm - 2.5.5.1-2 -- added missing patch - -* Wed Jan 25 2006 David Malcolm - 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 - 2.5.4-10 -- fix fix for multilib issue with shlib bonobo components (bug 156982) - -* Wed Jan 18 2006 Ray Strode - 2.5.4-9 -- fix multilib issue with shlib bonobo components (bug 156982) - -* Thu Jan 12 2006 David Malcolm - 2.5.4-8 -- avoid multiple initialization of NetworkManager connections (patch 807, - gnome bug #326785) - -* Thu Jan 12 2006 David Malcolm - 2.5.4-7 -- updated alarm notification patch(patch 806, #177546, #177666, #177667, - #177670) - -* Thu Jan 12 2006 Christopher Aillon - 2.5.4-6 -- Remove unneeded Requires: notify-daemon - -* Thu Jan 12 2006 Christopher Aillon - 2.5.4-5 -- Update BR to libnotify-devel - -* Wed Jan 11 2006 David Malcolm - 2.5.4-4 -- ported alarm notification code to the new libnotify API (patch 806, #177546) -- added libnotify_support macro -- added explicit notify-daemon requirement as a workaround for bug #177535 - -* Tue Jan 10 2006 David Malcolm - 2.5.4-3 -- updated patch 800 to include patch for memo conduit (untested at this stage); - renaming from evolution-2.5.2-fix-conduits.patch to - evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo - conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to - evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160) -- switch the build-time dep for the audio-inline plugin from gstreamer-devel to - gstreamer08-devel to better reflect the test in the tarball's configure.in - -* Wed Jan 4 2006 David Malcolm - 2.5.4-2 -- added optional build-time requirement on NetworkManager-glib-devel -- update patch 805 to cover a missing declaration in Network Manager support - -* Tue Jan 3 2006 David Malcolm - 2.5.4-1 -- 2.5.4 -- update patch 107 to track underlying code changes; rename from - evolution-2.2.2-move-autosave-file.patch to - evolution-2.5.4-move-autosave-file.patch -- added patch to fix more missing declarations (patch 805) -- added files for publish-calendar plugin - -* Mon Dec 19 2005 David Malcolm - 2.5.3-1 -- 2.5.3 -- Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it - still applies cleanly - -* Thu Dec 15 2005 Christopher Aillon 2.5.2-2 -- Require nspr and nss instead of mozilla-nspr and mozilla-nss -- Update no-gnome-common patch to work with standalone nss package - -* Fri Dec 09 2005 Jesse Keating - rebuilt - -* Wed Dec 7 2005 David Malcolm - 2.5.2-1 -- 2.5.2 -- bump gtkhtml requirement from 3.7.6 to 3.9.2 -- bump eds requirement from 1.4.1.1 to 1.5.2 -- bump evo_major from 2.4 to 2.6 -- updated patch 107 -- updated patch 108 -- updated patch 800, replacing - rh-161817-attach-116019-conduit_pilot_link_updates.diff with - evolution-2.5.2-fix-conduits.patch. Not yet complete. -- disable pilot support for now (see #175160) -- added hula plugin to list of packaged plugins -- generalize gconf schema packaging to support changing evo_major - -* Fri Dec 2 2005 David Malcolm - 2.4.2-2 -- force regeneration of the intltool files to prevent a problem where the - tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the - latest shipped copy of intltool, which resulted in a broken intltool-merge - script when the tree was reautotooled. (appears that the tarball was built - with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to - @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that - change) - -* Tue Nov 29 2005 David Malcolm - 2.4.2-1 -- 2.4.2 -- explicitly list the plugins that are packaged (#166234) -- added build-time requirement on gstreamer-devel to cope with audio-inline - plugin - -* Tue Nov 29 2005 David Malcolm - 2.4.1-8 -- add -DLDAP_DEPRECATED to CFLAGS (#172999) - -* Wed Oct 26 2005 David Malcolm - 2.4.1-7 -- Added a patch (110) to hide the component switcher buttons by default on new - windows (#170799) by patching the GConf schema. -- Made list of installed schemas explicit. -- Own the plugins subdirectory - -* Tue Oct 25 2005 David Malcolm - 2.4.1-6 -- use 4 separate .desktop files from the redhat-menus package, rather than the - current single one; bump the redhat-menus requirement accordingly (from 1.13 - to 5.0.4); introduce a macro for this requirement. - -* Mon Oct 24 2005 David Malcolm - 2.4.1-5 -- fix removal of upstream .desktop file (broke on upgrade to Evolution 2.2, and - continued to be broken with 2.3/2.4) (#103826, again) - -* Tue Oct 18 2005 David Malcolm - 2.4.1-4 -- updated patch 804 to declare e_calendar_table_process_completed_tasks - -* Tue Oct 18 2005 David Malcolm - 2.4.1-3 -- added patch (804: evolution-2.4.1-fix-missing-declarations.patch) to fix - missing declaration (thanks to Peter Robinson) - -* Mon Oct 17 2005 David Malcolm - 2.4.1-2 -- bump e-d-s requirement to 1.4.1.1 - -* Tue Oct 4 2005 David Malcolm - 2.4.1-1 -- 2.4.1 -- regenerate patch 101 to handle conflict in - calendar/gui.print.c: print_week_day_event introduced by fix to upstream bug - 244981 (end date added while printing in the week view); bump patch name from - version 5 to version 6 -- removed patch 804 (conduits-multi-day-crash); this is now in upstream tarball - -* Wed Sep 14 2005 Jeremy Katz - 2.4.0-2 -- rebuild for mozilla on ppc64 - -* Wed Sep 7 2005 David Malcolm - 2.4.0-1 -- 2.4.0 -- Removed patch to fix implicit function declarations (patch 110, added in - 2.3.8-1) as this is now upstream. - -* Thu Sep 1 2005 David Malcolm - 2.3.8-4 -- Enable exchange support when configuring, so that the exchange-operations - plugin gets built. - -* Fri Aug 26 2005 David Malcolm - 2.3.8-3 -- Added patch for #157074 (patch 804) - -* Fri Aug 26 2005 David Malcolm - 2.3.8-2 -- Move -Werror-implicit-function-declaration from configuration to the make - stage, to avoid breaking configuration tests. - -* Tue Aug 23 2005 David Malcolm - 2.3.8-1 -- 2.3.8 -- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the - problems arising (patch 110) - -* Tue Aug 16 2005 David Malcolm - 2.3.7-3 -- Introduce macro for gnome-pilot dependency, bumping from 2.0.6 to 2.0.13 -- Add obsoletion of libgal2/libgal2-devel (dependency was removed in 2.3.6-1); - based on the last EVR of the libgal2 package in CVS, 2:2.5.3-2 - -* Mon Aug 15 2005 David Malcolm - 2.3.7-2 -- rebuild - -* Tue Aug 9 2005 David Malcolm - 2.3.7-1 -- 2.3.7 -- Bump evolution-data-server requirement from 1.3.6 to 1.3.7 -- Bump gtkhtml3 requirement from 3.6.2 to 3.7.6 - -* Mon Aug 8 2005 Tomas Mraz - 2.3.6.1-5 -- rebuild with new gnutls - -* Tue Aug 2 2005 David Malcolm - 2.3.6.1-4 -- Added patch to show correct mimetype for OpenOffice.org files when guessing - type for attachments with mimetype "application/octet-stream" (#164957) - -* Mon Aug 1 2005 David Malcolm - 2.3.6.1-3 -- Improved version of evolution-2.3.5.1-fix-150458.patch (#150458) - -* Sat Jul 30 2005 David Malcolm 2.3.6.1-2 -- Fixed version numbers in GConf schema files (#164622); added - apps-evolution-mail-prompts-checkdefault-2.4.schemas - -* Fri Jul 29 2005 David Malcolm - 2.3.6.1-1 -- 2.3.6.1 - -* Thu Jul 28 2005 David Malcolm - 2.3.6-1 -- 2.3.6 -- Bump evolution-data-server requirement to 1.3.6 (needed for - CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING) -- Removed libgal2[-devel] dependencies; the code has been moved into the - evolution tarball - -* Thu Jul 28 2005 David Malcolm - 2.3.5.1-2 -- added experimental patch to port ETable printing to use Pango (#150458) - -* Mon Jul 25 2005 David Malcolm - 2.3.5.1-1 -- 2.3.5.1 -- Update evo_major from 2.2 to 2.4 -- Updated evo-calendar-print-with-pango- patch from version 4 to 5 -- Removed Patch105: evolution-2.2.2-fix-new-mail-notify.patch as configure.in - in this branch tests for existance for dbus-glib-1, rather than max-version. -- Removed Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch as - this is now in upstream tarball. -- Removed evolution-calendar-importers and evolution-addressbook-importers - directories. -- Updated evolution-2.2.2-no-gnome-common.patch to include a patch to rename - mozilla-nspr to nspr - -* Tue Jun 28 2005 David Malcolm - 2.2.2-11.fc5 -- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803) - -* Tue Jun 28 2005 David Malcolm - 2.2.2-10.fc5 -- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802) - -* Mon Jun 27 2005 David Malcolm - 2.2.2-9.fc5 -- Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817) -- Added Mark G Adams's memory leak fix (patch 801) - -* Mon Jun 6 2005 David Malcolm - 2.2.2-8 -- Added Ivan Gyurdiev's patch to move autosave files inside the .evolution - directory - -* Thu May 26 2005 David Malcolm - 2.2.2-7 -- Added Akira Tagoh's patch for calendar keypress handling (#154360) - -* Mon May 23 2005 David Malcolm - 2.2.2-6 -- Remove static versions of libraries - -* Thu May 5 2005 David Malcolm - 2.2.2-5 -- added evolution-2.2.2-fix-new-mail-notify.patch to CVS - -* Thu May 5 2005 David Malcolm - 2.2.2-4 -- Removed explicit mozilla_build_version; instead use pkg-config to determine -the path to the NSS/NSPR headers. -- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12; -patches depend on this) -- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus -versions is in the upstream tarball; but configure.in disables the plugin for -dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions, -and run autoconf at the start of the build) (#156328) - -* Sat Apr 30 2005 David Malcolm - 2.2.2-3 -- updated mozilla_build_version to 1.7.7 - -* Sat Apr 30 2005 David Malcolm - 2.2.2-2 -- Finished porting conduits to pilot-link-0.12 API; re-enabled pilot support (#152172) - -* Mon Apr 11 2005 David Malcolm - 2.2.2-1 -- 2.2.2 -- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item -- removed patch for XB73912; now in upstream tarball -- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream -- removed patch for XB73844; now in upstream tarball -- Update requirements: - - gtkhtml3 from 3.6.1 to 3.6.2 - - libgal2 from 2.4.1 to 2.4.2 - - eds from 1.2.1 to 1.2.2 - -* Wed Mar 23 2005 David Malcolm - 2.2.1.1-2 -- Add patch for upstream bug XB73844 (should now be able to accept meeting requests) - -* Fri Mar 18 2005 David Malcolm - 2.2.1.1-1 -- 2.1.1.1 - -* Thu Mar 17 2005 David Malcolm - 2.2.1-1 -- 2.2.1 -- Updated requirements: - * gtkhtml3 from 3.6.0 to 3.6.1 - * libgal2 from 2.4.0 to 2.4.1 - * eds from 1.2.0 to 1.2.1 -- Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4 -- The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change) - -* Mon Mar 14 2005 David Malcolm - 2.2.0-10 -- disabled pilot-link support for now so that we have an evolution package; more patching is needed to get this to work with pilot-link-0.12 - -* Mon Mar 14 2005 David Malcolm - 2.2.0-9 -- another attempt at porting to pilot-link 0.12 - -* Mon Mar 14 2005 David Malcolm - 2.2.0-8 -- Added patch to deal with changes to pilot-link from 0.11->0.12 - -* Mon Mar 14 2005 David Malcolm - 2.2.0-7 -- use 0.31 rather than 0.31.0 for DBus version - -* Mon Mar 14 2005 David Malcolm - 2.2.0-6 -- rebuilt against pilot-link-0.12 -- added versioning to the requirement on dbus (>=0.31) - -* Thu Mar 10 2005 David Malcolm - 2.2.0-5 -- Added patch for changes to DBus API in version 0.31 (#150671) -- Removed explicit run-time spec-file requirement on mozilla. - The Mozilla NSS API/ABI stabilised by version 1.7.3 - The libraries are always located in the libdir - However, the headers are in /usr/include/mozilla-%{mozilla_build_version} - and so they move each time the mozilla version changes. - So we no longer have an explicit mozilla run-time requirement in the specfile; - a requirement on the appropriate NSS and NSPR .so files is automagically generated on build. - We have an explicit, exact build-time version, so that we can find the headers (without - invoking an RPM query from the spec file; to do so is considered bad practice) -- Introduced mozilla_build_version, to replace mozilla_version - -* Wed Mar 9 2005 Christopher Aillon - 2.2.0-4 -- Depend on mozilla 1.7.6 - -* Wed Mar 9 2005 David Malcolm - 2.2.0-3 -- added patch from upstream for bug XB-73192, fixing missing "Mark as Read/Unread" context menu items - -* Tue Mar 8 2005 David Malcolm - 2.2.0-2 -- actually add source tarball this time - -* Tue Mar 8 2005 David Malcolm - 2.2.0-1 -- 2.2.0 -- Removed patch for GCC 4 fix as this is now in upstream tarball -- Updated requirements: - * gtkhtml3 from 3.5.7 to 3.6.0 - * libgal2 from 2.3.5 to 2.4.0 - * eds from 1.1.6 to 1.2.0 - -* Tue Mar 8 2005 David Malcolm - 2.1.6-3 -- rebuild (to use latest DBus library) - -* Tue Mar 1 2005 David Malcolm - 2.1.6-2 -- added patch to fix build with GCC4 - -* Tue Mar 1 2005 David Malcolm - 2.1.6-1 -- Update from upstream unstable 2.1.6 to 2.1.6 -- Added patches to fix calendar and addressbook printing for non-Roman scripts (#138075) -- Added explicit requirement on libgnomeprint22 >= 2.8.0 -- Added BuildRequires: gtk-doc -- Updated requirements: - * gtkhtml3 from 3.5.6 to 3.5.7 - * libgal2 from 2.3.4 to 2.3.5 - * eds from 1.1.5 to 1.1.6 - -* Wed Feb 9 2005 David Malcolm - 2.1.5-1 -- Update from upstream unstable 2.1.4 to 2.1.5 -- Updated requirements: - * gtkhtml3 from 3.5.4 to 3.5.6 - * libgal2 from 2.3.3 to 2.3.4 - * eds from 1.1.4.1 to 1.1.5 -- Removed explicit packaging of weather icons as these are now below DATADIR/evolution/2.2 rather than DATADIR/evolution-2.2 - -* Wed Jan 26 2005 David Malcolm - 2.1.4-1 -- Update from upstream stable 2.0.3 to unstable 2.1.4 -- Updated evo_major from 2.0 to 2.2 -- Removed camel packaging as this has been moved to evolution-data-server for Evolution 2.2 -- Added plugins to the packaged files -- Added weather icons to the packaged files -- Updated requirements: - * gtkhtml3 from 3.3.2 to 3.5.4 - * libgal2 from 2.2.4 to 2.3.3 - * eds from 1.0.3 to 1.1.4.1 - * libsoup from 2.2.0 to 2.2.2 -- Added built-time requirement on atk-devel -- Enable all plugins for now -- Added requirement on dbus (for the new-mail-notify plugin) -- Enable gtk-doc -- Updated GConf schema name suffixes from 2.0 to 2.2 - -* Sun Dec 19 2004 Christopher Aillon 2.0.3-2 -- Rebuild against mozilla 1.7.5 - -* Wed Dec 15 2004 David Malcolm - 2.0.3-1 -- Update from upstream 2.0.2 to 2.0.3 with these bug fixes: - * Addressbook - XB67656 - almost the same email address are considrered identical (Siva) - XB69079 - Data repeated after save with bad date format (Siva) - XB66854 - Some strings are missed to translation (Rodney) - - * Calendar - XB47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney) - XB68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP) - XB67403 - wrong alarm time displayed (Rodrigo) - XB68077 - appointment dialog re-size (Rodrigo) - - leak fixes (Chen) - - sensitize menu items in list view properly (JP) - - redraw display when 24hr time setting changes (JP) - - * Mail - XB69533 - Unable to subscribe to the alt hierarchy (Michael) - XB69776 - Signed Mail with attachments displays everything with multipart/boundaries stuff (Michael) - XB69615 - delete certificate after viewing smime message (Michael) - XB69109 - EHLO or HELO with ip addresses does not conform rfc 821 (Michael) - XB69982 - During Newsgroup list refresh, it crashes (Michael) - XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur) - XB68556 - NNTP with SSL won't work, even with stunnel (Michael) - XB69145 - toplevel message/rfc822 parts are broken for IMAP (Michael) - XB69241 - base64 attachement holding PGP block (Jeff) - XB67895 - nntp support not asking for password (Michael) - XB67898 - Use of symbolic port-names is not guaranteed to work everywhere (Michael) - XB69851 - remember password check doesn't stick (Michael) - XB69623 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek) - XB69339 - postscript and some other attachments not visable (Michael) - XB69579 - vFoldersXBUNMATCHED generates errors (Michael) - XB68958 - current message forgotten in vfolders (Michael) - XB68974 - Wizard doesn't store smtp auth settings (Michael) - XB67496 - html email not rendered in preview pane (Michael) - XB67014 - Checking supported auth types doesn't work with new SSL certificate (Michael) - XB68006 - Evo crashed after viewing previously-sent email and copying URL from it (Michael) - XB68787 - Crash when migrating 1.4 data to 2.0.2 (Michael) - XB67622 - SMTP auth usernames containing % character fail (Jeff) - - fix pthread_key_delete args (Julio M. Merino Vidal) -- Removed patch for "Unmatched" vfolder properties dialog (#141458) as this is now in upstream tarball (XB69579 above) -- Update dependency on e-d-s from 1.0.2 to 1.0.3 -- Update dependency on libgal2 from 2.2.3 to 2.2.4 - -* Wed Dec 1 2004 David Malcolm - 2.0.2-6 -- Fix broken properties dialog for "Unmatched" vfolder (#141458) - -* Wed Oct 27 2004 Christopher Aillon - 2.0.2-4 -- Re-enable s390(x) - -* Fri Oct 22 2004 David Malcolm - 2.0.2-3 -- added requirement on gnutls/gnutls-devel - -* Fri Oct 22 2004 David Malcolm - 2.0.2-2 -- Fix for #132050 (no entry for Evolution in the menus): use the new redhat-evolution.desktop file provided by redhat-menus-1.13 - -* Tue Oct 12 2004 David Malcolm - 2.0.2-1 -- Update from 2.0.1 to 2.0.2 -- Updated dependency on e-d-s from 1.0.1 to 1.0.2 -- Updated dependency on libgal2 from 2.2.2 to 2.2.3 -- Updated dependency on gtkhtml3 from 3.3.0 to 3.3.2 -- ppc's mozilla dependency is now in line with the other architectures at 1.7.3 - -* Sat Oct 9 2004 David Malcolm -- disable s390/s390x for now - -* Fri Oct 8 2004 David Malcolm - 2.0.1-3 -- Fix for #135135, updating the fix for #103826 that removes the evolution.desktop file in "Office"; the file to delete had been renamed to evolution-2.0.desktop -- Added requirement on redhat-menus, since this supplies the target of our .desktop symlink - -* Tue Sep 28 2004 David Malcolm - 2.0.1-2 -- update mozilla dependency from 1.7.2 to 1.7.3, apart from on ppc (and on s390 and s390x, which remain at 1.6, and on ppc64 where it isn't available at all) - -* Tue Sep 28 2004 David Malcolm - 2.0.1-1 -- Update from 2.0.0 to 2.0.1 -- Updated dependency on e-d-s from 1.0.0 to 1.0.1 -- Updated dependency on libgal2 from 2.2.0 to 2.2.2 - -* Mon Sep 20 2004 David Malcolm - 2.0.0-2 -- rebuilt - -* Tue Sep 14 2004 David Malcolm - 2.0.0-1 -- Update from 1.5.94.1 to 2.0.0 -- Change source FTP location from 1.5 to 2.0 -- Updated dependency on e-d-s from 0.0.99 to 1.0.0 -- Documentation has now moved from 1.5 to 2.0 - -* Tue Aug 31 2004 David Malcolm - 1.5.94.1-1 -- updated tarball from 1.5.93 to 1.5.94.1 -- the BASE_VERSION in the configure.in script has finally been updated from 1.5 to 2.0 (affects OAFIIDs, install dirs, binary names etc); updated evo_major and various other parts of the spec-file to reflect this; however documentation is still 1.5 in upstream tarball -- updated dependency on libgal2 from 2:2.1.14 to 2:2.2.0 -- updated dependency on libsoup from 2.1.13 to 2.2.0 -- updated dependency on e-d-s from 0.0.98 to 0.0.99 - -* Tue Aug 17 2004 David Malcolm - 1.5.93-2 -- updated gnome-icon-theme requirement from 1.2.0 to 1.3.6 to fix problem with missing stock icons (bz #130142) - -* Mon Aug 16 2004 David Malcolm - 1.5.93-1 -- updated tarball from 1.5.92.2 to 1.5.93 -- removed filechooser patch - this is now in the upstream tarball, with a test at configuration time; it was autodetected and enabled in my test build; I've explicitly enabled it to be certain. -- updated dependency on libgal2 from 2:2.1.13 to 2:2.1.14 -- updated dependency on libsoup from 2.1.12 to 2.1.13 -- updated dependency on e-d-s from 0.0.97 to 0.0.98 - -* Wed Aug 11 2004 David Malcolm - 1.5.92.2-2 -- Increased mozilla_version from 1.7 to 1.7.2 so that the NSS test looks in the correct place - -* Wed Aug 11 2004 David Malcolm - 1.5.92.2-1 -- updated tarball from 1.5.92.1 to 1.5.92.2 - -* Wed Aug 4 2004 David Malcolm - 1.5.92.1-1 -- updated tarball from 1.5.91 to 1.5.92.1 -- added a dependency on gnome-icon-theme -- updated dependency on libgal2 from 2:2.1.11 to 2:2.1.13 -- updated dependency on gtkhtml3 from 3.1.17 to 3.3.0 -- updated dependency on libsoup from 2.1.11 to 2.1.12 -- updated dependency on e-d-s from 0.0.95 to 0.0.97 - -* Mon Jul 26 2004 David Malcolm - 1.5.91-1 -- 1.5.91 - -* Thu Jul 8 2004 Jeremy Katz - 1.5.90-5 -- use mozilla 1.7 on platforms where it's available -- check to make sure the appropriate mozilla headers exist if using - mozilla nss for ssl or fail the build - -* Thu Jul 8 2004 David Malcolm -- rebuilt - -* Wed Jul 7 2004 David Malcolm -- rebuilt - -* Tue Jul 6 2004 David Malcolm - 1.5.90-2 -- Fixed sources file - -* Tue Jul 6 2004 David Malcolm - 1.5.90-1 -- 1.5.90; updated requirements on gtkhtml3, libgal2, and e-d-s - -* Thu Jun 17 2004 David Malcolm - 1.5.9.2-1 -- 1.5.9.2 - -* Tue Jun 15 2004 Elliot Lee -- rebuilt - -* Tue Jun 8 2004 David Malcolm - 1.5.9.1-3 -- Replaced /usr/lib with %%{_libdir} in mozills_nss ssl_flags - -* Mon Jun 7 2004 David Malcolm - 1.5.9.1-2 -- updated filechooser patch again - -* Mon Jun 7 2004 David Malcolm - 1.5.9.1-1 -- 1.5.9.1; updated filechooser patch - -* Wed May 26 2004 David Malcolm - 1.5.8-3 -- added ORBit2 and spamassassin requirements - -* Mon May 24 2004 David Malcolm - 1.5.8-2 -- Fixed up filechooser patch and re-enabled it - -* Fri May 21 2004 David Malcolm - 1.5.8-1 -- 1.5.8; added explicit libbonoboui requirement; disabled filechooser patch for now - -* Tue May 4 2004 David Malcolm - 1.5.7-3 -- Added GtkFileChooser patch based on work by Carlos Garnacho Parro (http://lists.ximian.com/archives/public/evolution-patches/2004-March/004867.html); added requirement for GTK 2.4 - -* Thu Apr 22 2004 David Malcolm - 1.5.7-2 -- added emfv signal fix patch and fix for defaults in switch statements on gcc3.4 - -* Wed Apr 21 2004 David Malcolm - 1.5.7-1 -- 1.5.7 - -* Wed Mar 10 2004 Jeremy Katz - 1.5.5-1 -- 1.5.5 - -* Tue Mar 02 2004 Elliot Lee -- rebuilt - -* Wed Feb 18 2004 Jeremy Katz - 1.5.4-1 -- 1.5.4 - -* Tue Feb 17 2004 Jeremy Katz -- buildrequire e-d-s-devel instead of e-d-s (#114712) -- enable nntp support (#114802) - -* Fri Feb 13 2004 Elliot Lee -- rebuilt - -* Tue Jan 27 2004 Jeremy Katz 1.5.3-1 -- 1.5.3 - -* Wed Jan 21 2004 Jeremy Katz 1.5.2-2 -- size_t/int mismatch compile fix for 64bit platforms - -* Wed Jan 14 2004 Jeremy Katz 1.5.2-0 -- 1.5.2 -- add patch to fix gconf warning with schema - -* Sun Jan 4 2004 Jeremy Katz 1.5.1-0 -- 1.5.1 -- temporarily disable redhatify patch -- use mozilla-nss for SSL -- fix schema names - -* Thu Nov 6 2003 Jeremy Katz 1.4.5-8 -- fall back to HELO for ESMTP (#108753) - -* Tue Oct 28 2003 Jeremy Katz 1.4.5-7 -- fix title on composer save dialog (#108159) - -* Mon Oct 27 2003 Jeremy Katz 1.4.5-6 -- Make imap command length shorter to avoid choking some imap servers - (notably cyrus-imap). -- Make wombat session managed so that we don't hit weird bonobo activation - things. This adds a dependency on $DISPLAY for wombat. (#106826) - -* Sun Oct 19 2003 Jeremy Katz 1.4.5-5 -- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without - IPv6 support -- add patch from upstream with reply-to-list shortcut (Ctrl-l) - -* Wed Oct 15 2003 Jeremy Katz 1.4.5-4 -- really, really remove duplicate menu entry (#103826) - -* Tue Oct 14 2003 Jeremy Katz 1.4.5-3 -- Pull in some patches from upstream CVS - * Avoid division by zero with POP (X#41610) - * Don't mangle headers (X#33545) - * Prefix IPV6 numeric hosts properly (X#46006, #105028) - * Use proper function for IPV6 reverse lookups (X#46006) - * Allow timezone offset to be up to 14 hours (X#49357) - -* Mon Oct 13 2003 Jeremy Katz -- add patch from upstream CVS to fix SMTP syntax problems (#106630) -- really remove duplicate menu entry (#103826) - -* Mon Oct 6 2003 Jeremy Katz -- make redhat-email.desktop symlink relative (#104391) - -* Wed Sep 24 2003 Jeremy Katz -- add ipv6 support per dwmw2's request - -* Tue Sep 23 2003 Jeremy Katz 1.4.5-2 -- 1.4.5 - -* Wed Sep 17 2003 Jeremy Katz -- move static libs into -devel (#104399) - -* Tue Sep 16 2003 Jeremy Katz 1.4.4-7 -- filter types are gtypes, not ints (#103934) - -* Wed Sep 10 2003 Jeremy Katz 1.4.4-6 -- fix from upstream (will be in 1.4.5) to fix menu merging in the - composer with new libbonobo - -* Fri Sep 5 2003 Jeremy Katz -- remove the desktop file in Office (#103826) - -* Tue Sep 2 2003 Jeremy Katz 1.4.4-5 -- patch from upstream to fix display of some mails in - different charsets (#102899) -- add requires on newer version of ORBit2 (#103386) -- add patch from upstream (extracted by George Karabin) to use gnome-vfs - mime icon lookup where available (#102553) - -* Fri Aug 22 2003 Jeremy Katz 1.4.4-4 -- include static libs (#102834) - -* Wed Aug 6 2003 Jeremy Katz 1.4.4-3 -- add a -devel subpackage (#99376) - -* Mon Aug 4 2003 Jeremy Katz 1.4.4-1 -- 1.4.4 - -* Wed Jul 30 2003 Jeremy Katz -- buildrequires fixup from Ville Skytta (#101325) - -* Thu Jul 24 2003 Jeremy Katz 1.4.3-6 -- include tagoh's patch for printing cjk contacts (committed upstream, #99374) - -* Tue Jul 22 2003 Nalin Dahyabhai 1.4.3-5 -- rebuild - -* Tue Jul 15 2003 Jeremy Katz 1.4.3-4 -- build on all arches again - -* Mon Jul 14 2003 Jeremy Katz 1.4.3-3 -- rebuild - -* Thu Jul 10 2003 Jeremy Katz 1.4.3-1 -- 1.4.3 - -* Thu Jun 19 2003 Jeremy Katz -- make gal version dep more explicit - -* Fri Jun 13 2003 Jeremy Katz -- fix desktop file (#97162) - -* Tue Jun 10 2003 Jeremy Katz 1.4.0-2 -- rebuild -- excludearch ppc64 for now - -* Mon Jun 9 2003 Jeremy Katz 1.4.0-1 -- 1.4.0 - -* Wed Jun 5 2003 Elliot Lee -- rebuilt - -* Thu Jun 5 2003 Jeremy Katz 1.3.92-2 -- rebuild - -* Wed Jun 4 2003 Jeremy Katz -- buildrequires gettext (#92276) - -* Sun May 25 2003 Jeremy Katz 1.3.92-1 -- 1.3.92 - -* Wed May 7 2003 Jeremy Katz 1.3.3-2 -- fix default for /schemas/apps/evolution/mail/display/mime_types - -* Tue May 6 2003 Jeremy Katz 1.3.3-1 -- 1.3.3 - -* Sun May 4 2003 Jeremy Katz 1.3.2-2 -- enable pilot support -- add redhatify patch back - -* Tue Apr 22 2003 Jeremy Katz -- add a /usr/bin/evolution symlink - -* Mon Apr 21 2003 Jeremy Katz -- fix gnome-spell version requirement - -* Wed Apr 16 2003 Jeremy Katz 1.3.2-1 -- add trivial fix for evolution-mail schema key (ximian #41419) - -* Tue Apr 15 2003 Jeremy Katz -- update to 1.3 -- don't build with pilot support for now -- don't redhat-ify the summary prefs for now - -* Sun Apr 6 2003 Jeremy Katz 1.2.4-2 -- fix krb5 libdir for lib64 systems - -* Sun Apr 6 2003 Jeremy Katz 1.2.4-1 -- update to 1.2.4 - -* Thu Apr 3 2003 Jeremy Katz 1.2.2-7 -- oops, fix a tyop - -* Thu Apr 3 2003 Jeremy Katz 1.2.2-6 -- add a few cleanups for 64bit cleanliness (#86347) - -* Sun Mar 30 2003 Jeremy Katz -- add some buildrequires (#87612) - -* Mon Mar 24 2003 Jeremy Katz 1.2.3-1 -- update to 1.2.3 - -* Wed Mar 19 2003 Jeremy Katz 1.2.2-5 -- security patches from upstream - - sanity check UUEncoding header before decoding (CAN-2003-0128) - - don't decode doubly UUEncoded content (CAN-2003-0129) - - don't use a bonobo component to display things without registered - handlers (CAN-2003-0130) - -* Mon Feb 24 2003 Elliot Lee 1.2.2-4 -- debuginfo rebuild - -* Thu Feb 20 2003 Jeremy Katz 1.2.2-3 -- memleak patch had some bits that weren't supposed to be there. update - to newer from upstream. -- fix directory checking in proxy patch - -* Thu Feb 20 2003 Jeremy Katz 1.2.2-2 -- add missing build dep (#84388) -- add patch from upstream for evolution-mail memleak -- add patch from upstream to use the gnome2 proxy settings by default - -* Fri Feb 7 2003 Jeremy Katz 1.2.2-1 -- 1.2.2 -- build on x86_64 - -* Wed Jan 22 2003 Tim Powers -- rebuilt - -* Tue Jan 7 2003 Nalin Dahyabhai 1.2.1-4 -- rebuild - -* Fri Jan 3 2003 Nalin Dahyabhai -- if building with OpenSSL, attempt to get cflags and ldflags from pkgconfig - -* Thu Jan 2 2003 Jeremy Katz 1.2.1-3 -- we don't want to use native POSIX threads for mutexes in db3, override them - -* Mon Dec 16 2002 Tim Powers 1.2.1-2 -- rebuild - -* Fri Dec 13 2002 Jeremy Katz 1.2.1-1 -- update to 1.2.1 - -* Thu Dec 12 2002 Jeremy Katz 1.2.0-6 -- require a newer soup, the old one Has Bugs (tm) -- excludearch x86_64; getting a R_X86_64_32S relocation in libical - although everything appears to be built with -fPIC correctly - -* Tue Dec 10 2002 Jeremy Katz 1.2.0-5 -- patch for multilib krb5 - -* Mon Dec 2 2002 Jeremy Katz 1.2.0-4 -- add upstream patch to handle LDAPv3 better -- add upstream patch to fix shell memory leaks -- add upstream patch to fix ldap scope selection -- build with openssl instead of mozilla-nss since it's available on - more platforms -- build on all arches - -* Fri Nov 22 2002 Jeremy Katz -- require bonobo-conf, not -devel (#78398) - -* Wed Nov 20 2002 Florian La Roche 1.2.0-3 -- disable pilot support for mainframe - -* Mon Nov 18 2002 Jeremy Katz 1.2.0-2 -- macro-ify the mozilla version to make it easier to build against - newer mozillas with headers in new locations -- buildrequire pilot-link-devel (#78077) -- drop uneeded ldapv3 patch (toshok says 1.2 already handles this) -- drop unneeded patch for ordering of the libdb checks -- add fejj's patch to always subscribe to the inbox from evolution-patches - -* Tue Nov 12 2002 Jeremy Katz 1.2.0-1 -- 1.2.0 - -* Sat Nov 2 2002 Jeremy Katz 1.1.90-2 -- reenable pilot support -- redhatify - -* Fri Nov 1 2002 Jeremy Katz 1.1.90-1 -- update to 1.1.90 - -* Thu Oct 31 2002 Jeremy Katz -- include mozilla epochs in requires (#74577) -- add build requires on newer oaf (#76801) - -* Thu Oct 24 2002 Jeremy Katz 1.1.2-1 -- update to 1.1.2 -- remove unpackaged files from the buildrooot -- disable pilot support for now - -* Tue Sep 3 2002 Jeremy Katz 1.0.8-10 -- add freetype-devel to build requires (#73319) - -* Mon Sep 2 2002 Owen Taylor -- Fix a problem where evolution-mail right click items corrupted the stack - (#67992) - -* Thu Aug 29 2002 Jeremy Katz 1.0.8-9 -- don't install two desktop files (#72871) - -* Wed Aug 28 2002 Preston Brown 1.0.8-8 -- absolute symlink .desktop file (#72913) - -* Thu Aug 22 2002 han Ngo 1.0.8-7 -- rebuild against new pilot-link - -* Sat Aug 10 2002 Florian La Roche -- bzip2 source - -* Tue Aug 6 2002 Than Ngo 1.0.8-5 -- rebuild against new pilot-link-0.11.2 - -* Thu Jul 18 2002 Jeremy Katz 1.0.8-4 -- rebuild against new gnome-pilot - -* Tue Jul 9 2002 Jeremy Katz 1.0.8-3 -- remove static and libtool archives for importers and camel-providers (#68222) -- do desktop-file-install magic -- remove dead sites from summary list (#64522) -- support openldap protocol version 3 based off of Nalin's autofs changes - -* Mon Jul 8 2002 Jeremy Katz 1.0.8-2 -- fix openldap-devel buildrequire - -* Mon Jul 1 2002 Jeremy Katz 1.0.8-1 -- 1.0.8 - -* Thu Jun 27 2002 Jeremy Katz 1.0.7-2 -- include patch to omf files from otaylor@redhat.com to fix - scrollkeeper validation errors - -* Sun Jun 23 2002 Jeremy Katz 1.0.7-1 -- update to 1.0.7 -- excludearch alpha while mozilla isn't being built there - -* Sun May 26 2002 Tim Powers 1.0.5-2 -- automated rebuild - -* Mon May 13 2002 Jeremy Katz 1.0.5-1 -- update to 1.0.5 - -* Fri May 3 2002 Jeremy Katz 1.0.3-6 -- add patch to fix spool unread counts (#64198) -- build with the fix for the crasher mail sent to - evolution-list (ximian #24140) - -* Mon Apr 15 2002 Jeremy Katz 1.0.3-4 -- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl - since it's been committed to the branch and fixes the problem for me -- include patch from tagoh(at)redhat.com to change the default charset - for Japanese to ISO-2022-JP (#63214) - -* Wed Apr 10 2002 Jeremy Katz 1.0.3-3 -- minor tweaks to the redhatify patch -- make accepting appointments sent to mailing lists work -- use the RFC specified LDAP attribs for freebusy and calendarURI - in addressbook -- fix a crash in the startup wizard - -* Sun Mar 31 2002 Jeremy Katz 1.0.3-2 -- move desktop file to /etc/X11/applnk (#62399) - -* Sun Mar 24 2002 Jeremy Katz 1.0.3-1 -- update to evolution 1.0.3 -- change summary view to show a recent errata list by default - -* Thu Mar 14 2002 Jeremy Katz -- put correct path to nspr includes on configure command line - -* Mon Mar 11 2002 Jeremy Katz 1.0.2-3 -- mozilla 0.9.9 has nspr and nss subpackages, hooray! rip out the static - libnss linkage and just link against what is provided dynamically -- kill the -devel subpackage since it's of questionable use -- explicitly require mozilla-nss and mozilla-nspr packages to make it easier - to resolve the requirements - -* Thu Feb 21 2002 Jeremy Katz 1.0.2-2 -- rebuild in new environment -- temporarily exclude on ia64 again - -* Thu Jan 31 2002 Jeremy Katz 1.0.2-1 -- update to 1.0.2 - -* Mon Jan 28 2002 Jeremy Katz 1.0.1-4 -- build on ia64 now that mozilla exists for ia64 - -* Sun Jan 27 2002 Jeremy Katz 1.0.1-3 -- rebuild in new environment -- add pilot support - -* Sun Jan 13 2002 Jeremy Katz 1.0.1-2 -- rebuild without mozilla-psm in the buildroot so libnss is linked - statically as intended - -* Sat Jan 12 2002 Jeremy Katz 1.0.1-1 -- update to 1.0.1 -- patch for autoconf 2.52 accepted upstream -- include man page -- use --with-sub-version=" (%%{version}-%%{release})" - -* Tue Dec 18 2001 Jeremy Katz 1.0-2 -- really disable news -- add patch from Jens Petersen to hopefully get - builds working with autoconf 2.52 -- conditionalize static libnss stuff so that it can go away when we - have a mozilla with shared libnss - -* Thu Dec 6 2001 Jeremy Katz 1.0-1.7.2 -- add patches off of branch for: - * do not show up as Preview Release in version string - * have next/previous work with multiple selected messages -- build without pilot support - -* Mon Dec 3 2001 Jeremy Katz 1.0-1 -- and bump to 1.0 - -* Sun Dec 2 2001 Jeremy Katz -- let's build with an included copy of libnss now since OpenSSL is support - is disabled on the 1.0 branch -- build with --enable-dot-locking=no -- excludearch ia64 again now that we need libnspr - -* Mon Nov 26 2001 Jeremy Katz -- build with gnome-pilot and krb5 support -- conditionalize ldap, pilot and krb5 support -- clean up buildrequires some - -* Sat Nov 17 2001 Jeremy Katz -- we can build on ia64 since we're using openssl instead of nspr -- disable non-functional nntp support -- 0.99.2 (rc2) - -* Fri Nov 9 2001 Jeremy Katz -- add explicit requires on current bonobo, oaf, and GConf to help people - help themselves -- s/Copyright/License/ - -* Thu Nov 8 2001 Jeremy Katz -- add a patch to revert changes to camel-tcp-stream-openssl; appears to - fix the SSL hangs - -* Wed Nov 7 2001 Jeremy Katz -- fix filelist to include libical zoneinfo -- add devel subpackage with includes and static libs - -* Mon Nov 5 2001 Jeremy Katz -- updated to 0.99.0 aka 1.0 RC1 - -* Tue Oct 23 2001 Havoc Pennington -- 0.16 snagged from Ximian GNOME - -* Fri Oct 5 2001 Havoc Pennington -- initial build based on David Sainty's specfile - -* Thu Oct 04 2001 David Sainty -- Updated to 0.15.99, 20011004 from cvs. - -* Wed Sep 05 2001 David Sainty -- Updated to 0.13.99, 20010905 from cvs. - -* Mon Sep 03 2001 David Sainty -- Updated to 0.13.99, 20010903 from cvs. -- Fixed Requires + BuildRequires - -* Mon Aug 06 2001 David Sainty -- Updated to 0.12.99, 20010806 from cvs. - -* Mon Aug 06 2001 David Sainty -- Relocated libical* from /usr/lib due to kdepim, -2 - -* Mon Aug 06 2001 David Sainty -- First spec file for evolution. - From 6e154befcdc709c17fd12e4b8ab2bb9830efb8e3 Mon Sep 17 00:00:00 2001 From: Ray Strode Date: Wed, 3 May 2006 17:41:36 +0000 Subject: [PATCH 016/844] - readd spec file after screw up --- evolution.spec | 1686 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 1686 insertions(+) diff --git a/evolution.spec b/evolution.spec index 416994c..e0f4ed2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1 +1,1687 @@ +%define gtkhtml_version 3.9.2 +%define soup_version 2.2.2 +%define eds_version 1.5.92 +%define use_mozilla_nss 1 +%define evo_major 2.6 +%define libbonoboui_version 2.4.2 +%define orbit2_version 2.9.8 +%define gnome_icon_theme_version 1.3.6 +%define libgnomeprint22_version 2.8.0 +%define dbus_version 0.31 +%define gnomevfs2_version 2.4 +%define last_libgal2_version 2:2.5.3-2 + +%define pilot_link_version 2:0.11.8 +%define gnome_pilot_version 2.0.13 + +%define ldap_support 1 +%define krb5_support 1 +%ifarch s390 s390x +%define pilot_support 0 +%else +%define pilot_support 1 +%endif +# note that nntp is non-functional in evo 1.3.x +%define nntp_support 1 +%define exchange_support 1 +%define nm_support 1 +%define libnotify_support 1 +%define inline_audio_support 0 + +# 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.6.1 +Release: 3 +License: GPL +BuildRoot: %{_tmppath}/%{name}-%{version}-root +URL: http://www.ximian.com/ +Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.1/%{name}-%{version}.tar.bz2 + +# patches pulled from upstream CVS + +# Red Hat Linux specific patches +#Patch11: evolution-1.3.2-redhatify.patch + +# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/ +#Patch99: db3-dont-use-pthread.patch +# bad hack +Patch98: evolution-1.4.4-ldap-x86_64-hack.patch + +# patches sent upstream +Patch100: evo-addressbook-print-with-pango-2.patch +Patch101: evo-calendar-print-with-pango-7.patch + +#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch + +# Fix for RH bug #154360: +Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch + +# Move autosave file +Patch107: evolution-2.5.4-move-autosave-file.patch + +# Fix for RH bug 150458: +Patch108: evolution-2.3.5.1-fix-150458.patch + +# Fix for RH bug 164957 (was for 145552): +Patch109: evolution-2.0.2-fix-145552.patch + +# Part of RH bug 170799: +Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch + +# not accepted, but proposed on a few occasions. fixes problems with +# some cyrus servers +#Patch200: evolution-1.4.5-imap-command-length.patch + +# this was rejected due to adding a dependency on DISPLAY for +# evolution-wombat but it does work to fix the problem +#Patch500: evolution-wombat-sm.patch + +# This was added upstream in 1.5.93, with configure-time detection +#Patch700: evolution-1.5.9.1-filechooser.patch + +# Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams): +# Patch800: evolution-2.5.4-fix-conduits.patch + +# Move .conduit files from share to lib (for the sake of multilib) +Patch802: evolution-2.5.4-fix-conduit-dir.patch + +# Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools): +Patch803: evolution-2.5.2-no-gnome-common.patch + +Patch804: evolution-2.4.1-fix-missing-declarations.patch +Patch805: evolution-2.5.4-fix-missing-declarations.patch +Patch806: evolution-2.5.5.1-notification-cleanups.patch +Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch +Patch809: evolution-2.6.0-prototypes.patch + +Summary: GNOME's next-generation groupware suite +Group: Applications/Productivity + +Requires: scrollkeeper >= 0.1.4 +Requires: ORBit2 >= 2.7.5 +Requires: libsoup >= %{soup_version} +Requires: evolution-data-server >= %{eds_version} +Requires: gnome-spell >= 1.0.2 +Requires: gtk2 >= 2.4.0 +Requires: libbonoboui >= %{libbonoboui_version} +Requires: ORBit2 >= %{orbit2_version} +Requires: spamassassin +Requires: gnome-icon-theme >= %{gnome_icon_theme_version} +Requires: redhat-menus >= %{redhat_menus_version} +Requires: gnutls +Requires: dbus >= %{dbus_version} +Requires: libgnomeprint22 >= %{libgnomeprint22_version} +Requires: gnome-vfs2 >= %{gnomevfs2_version} + +%if %{libnotify_support} +Requires: libnotify +%endif + +Obsoletes: libgal2 <= %{last_libgal2_version} + +BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +BuildRequires: libsoup-devel >= %{soup_version} +BuildRequires: evolution-data-server-devel >= %{eds_version} +BuildRequires: libbonobo-devel >= 2.0 +BuildRequires: libbonoboui-devel >= %{libbonoboui_version} +BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} +BuildRequires: libgnomeui-devel >= 2.0 +BuildRequires: libgnomecanvas-devel >= 2.0 +BuildRequires: libxml2-devel +BuildRequires: GConf2-devel +BuildRequires: intltool +BuildRequires: ORBit2-devel >= %{orbit2_version} +BuildRequires: atk-devel +# kind of silly... +BuildRequires: flex bison byacc libtool gettext +BuildRequires: gnutls-devel +BuildRequires: dbus-devel >= %{dbus_version} +BuildRequires: gtk-doc + +%if %{use_mozilla_nss} +BuildRequires: nspr-devel +BuildRequires: nss-devel +%else +BuildRequires: openssl-devel +%endif + +BuildRequires: pkgconfig +BuildRequires: desktop-file-utils +BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version} + +%if %{inline_audio_support} +# audio-inline plugin requires gstreamer to build: +BuildRequires: gstreamer08-devel +%endif + +%if %{ldap_support} +BuildRequires: openldap-devel >= 2.0.11 +%endif + +%if %{pilot_support} +BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} +# bleah, gnome-pilot really sucks this in, but then I have to have an explicit +# versioning for gnome-pilot when it changes less than pilot-link itself +BuildRequires: pilot-link-devel >= %{pilot_link_version} +Requires: gnome-pilot >= %{gnome_pilot_version} +%endif + +%if %{krb5_support} +BuildRequires: krb5-devel +# tweak for krb5 1.2 vs 1.3 +%define krb5dir /usr/kerberos +#define krb5dir `pwd`/krb5-fakeprefix +%endif + +%if %{nm_support} +BuildRequires: NetworkManager-glib-devel +%endif + +%if %{libnotify_support} +BuildRequires: libnotify-devel +%endif + +%description +Evolution is the GNOME mailer, calendar, contact manager and +communications tool. The tools which make up Evolution will +be tightly integrated with one another and act as a seamless +personal information-management tool. + +%package devel +Summary: Development files for building against evolution +Group: Development/Libraries +Requires: %{name} = %{version} +Requires: gtkhtml3-devel >= %{gtkhtml_version} +Requires: libsoup-devel >= %{soup_version} +Obsoletes: libgal2-devel <= %{last_libgal2_version} + +%description devel +Development files needed for building things which link against evolution. + +%prep +%setup -q +# these are in CVS already on the 1-4-branch + +# these are in CVS already on the gnome-2-8 branch + +# Red Hat specific patches +#patch11 -p1 -b .rhatify + +#patch99 -p1 -b .db3pthread + +%patch98 -p1 -b .ldaphack + +# patches sent upstream +#%patch100 -p0 -b .addressbook-print-with-pango +%patch101 -p1 -b .calendar-print-with-pango + +%patch106 -p1 -b .commit-enter-on-calendar +%patch107 -p1 -b .move-autosave-file +cd widgets/table +%patch108 -p3 -b .fix-150458 +cd ../.. +%patch109 -p1 -b .fix-164957 + +%patch110 -p1 -b .hide-switcher-buttons-by-default + +#patch200 -p1 -b .commandlength + +#patch500 -p0 -b .wombatsm + +#patch700 -p1 -b .filechooser + +# %patch800 -p1 -b .fix-conduits +%patch802 -p1 -b .fix-conduit-dir +%patch803 -p1 -b .no-gnome-common +%patch804 -p1 -b .fix-missing-declarations +%patch805 -p1 -b .fix-missing-declarations-2-5-4 +%patch806 -p1 -b .notification-cleanups +%patch808 -p1 -b .fix-missing-declarations-2.5.5.1 +%patch809 -p1 -b .prototypes + +mkdir -p krb5-fakeprefix/include +mkdir -p krb5-fakeprefix/lib +mkdir -p krb5-fakeprefix/%{_lib} + +%build +# define all of our flags, this is kind of ugly :( +%if %{ldap_support} +%define ldap_flags --with-openldap=yes +%else +%define ldap_flags --without-openldap +%endif + +%if %{pilot_support} +%define pilot_flags --enable-pilot-conduits=yes +%else +%define pilot_flags --enable-pilot-conduits=no +%endif + +%if %{krb5_support} +%define krb5_flags --with-krb5=%{krb5dir} +%else +%define krb5_flags --without-krb5 +%endif + +%if %{nntp_support} +%define nntp_flags --enable-nntp=yes +%else +%define nntp_flags --enable-nntp=no +%endif + +%if %{use_mozilla_nss} +%define ssl_flags --enable-nss=yes --enable-smime=yes +%else +%define ssl_flags --enable-openssl=yes +%endif + +%if %{use_mozilla_nss} +if ! pkg-config --exists nss; then + echo "Unable to find suitable version of mozilla nss to use!" + exit 1 +fi +%endif + +%if %{exchange_support} +%define exchange_flags --enable-exchange=yes +%else +%define exchange_flags --enable-exchange=no +%endif + +CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS +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`" + LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" +fi +%endif + +# Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths): +aclocal +autoheader +automake +libtoolize +intltoolize --force +autoconf + +# Configuration: +%configure \ + --enable-gtk-doc=yes \ + --enable-ipv6 \ + --enable-file-locking=fcntl --enable-dot-locking=no \ + --with-sub-version=" (%{version}-%{release})" \ + --with-kde-applnk-path=no \ + --enable-file-chooser=yes \ + %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ + --enable-plugins=all +export tagname=CC + +# Do the make, with various flags: +%if %{require_function_declarations} +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration -UGNOME_DISABLE_DEPRECATED" +%else +make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" +%endif + +#cat /dev/null > default_user/local/Inbox/mbox + +%install +rm -rf $RPM_BUILD_ROOT +export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 +export tagname=CC +make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install +unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL + +# remove libtool archives for importers and the like +find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; + +# remove statically built libraries: +find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; + +# pilot conduits static and libtool bits should go away too +rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.a +rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la + +# remove additional things we don't want +%if ! %{inline_audio_support} +%{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \ + $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so +%endif + +# scrollkeeper gets handled in %post +rm -rf $RPM_BUILD_ROOT/var/scrollkeeper + +# evolution is the preferred email app +ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ +ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ +ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ +ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ + +# remove upstream desktop file; use the symlinks from above (#103826) +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop + +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime + +# evolution link +ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution + +for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do + sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile +done +%find_lang %name-%{evo_major} + +%post +/sbin/ldconfig +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas" +for S in $SCHEMAS; do + gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null +done +scrollkeeper-update + +%postun +/sbin/ldconfig +scrollkeeper-update + +%clean +rm -rf $RPM_BUILD_ROOT + +%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 + +# 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} + +# The main data directory +# (have not attempted to split this up into an explicit list) +%dir %{_datadir}/evolution +%{_datadir}/evolution/%{evo_major} + +%{_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 +%{_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 +%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/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 +# globs above; the purpose of the separation below is to be more explicit about +# which plugins we ship) +%{evo_plugin_dir}/org-gnome-mail-account-disable.eplug +%{evo_plugin_dir}/libmail-account-disable.so + +%{evo_plugin_dir}/org-gnome-addressbook-file.eplug +%{evo_plugin_dir}/liborg-gnome-addressbook-file.so + +%if %{inline_audio_support} +%{evo_plugin_dir}/org-gnome-audio-inline.eplug +%{evo_plugin_dir}/liborg-gnome-audio-inline.so +%endif + +%{evo_plugin_dir}/org-gnome-calendar-file.eplug +%{evo_plugin_dir}/liborg-gnome-calendar-file.so + +%{evo_plugin_dir}/org-gnome-calendar-http.eplug +%{evo_plugin_dir}/liborg-gnome-calendar-http.so + +%{evo_plugin_dir}/org-gnome-calendar-weather.eplug +%{evo_plugin_dir}/liborg-gnome-calendar-weather.so + +%{evo_plugin_dir}/org-gnome-copy-tool.eplug +%{evo_plugin_dir}/liborg-gnome-copy-tool.so + +%{evo_plugin_dir}/org-gnome-default-mailer.eplug +%{evo_plugin_dir}/liborg-gnome-default-mailer.so + +%{evo_plugin_dir}/org-gnome-default-source.eplug +%{evo_plugin_dir}/liborg-gnome-default-source.so + +%{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so + +%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so + +%{evo_plugin_dir}/org-gnome-exchange-operations.eplug +%{evo_plugin_dir}/liborg-gnome-exchange-operations.so +%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml +%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml +%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml +%{evo_plugin_dir}/org-gnome-folder-permissions.xml +%{evo_plugin_dir}/org-gnome-folder-subscription.xml + +%{evo_plugin_dir}/org-gnome-groupwise-features.eplug +%{evo_plugin_dir}/liborg-gnome-groupwise-features.so +%{evo_plugin_dir}/org-gnome-compose-send-options.xml + +%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug +%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so + +%{evo_plugin_dir}/org-gnome-itip-formatter.eplug +%{evo_plugin_dir}/liborg-gnome-itip-formatter.so + +%{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug +%{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so +%{evo_plugin_dir}/org-gnome-mailing-list-actions.xml + +%{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 + +%{evo_plugin_dir}/org-gnome-mark-calendar-offline.eplug +%{evo_plugin_dir}/liborg-gnome-mark-calendar-offline.so + +%{evo_plugin_dir}/org-gnome-new-mail-notify.eplug +%{evo_plugin_dir}/liborg-gnome-new-mail-notify.so + +%{evo_plugin_dir}/org-gnome-plugin-manager.eplug +%{evo_plugin_dir}/liborg-gnome-plugin-manager.so +%{evo_plugin_dir}/org-gnome-plugin-manager.xml + +%{evo_plugin_dir}/org-gnome-print-message.eplug +%{evo_plugin_dir}/liborg-gnome-print-message.so +%{evo_plugin_dir}/org-gnome-print-message.xml + +%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug +%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so + +%{evo_plugin_dir}/org-gnome-save-calendar.eplug +%{evo_plugin_dir}/liborg-gnome-save-calendar.so + +%{evo_plugin_dir}/org-gnome-select-one-source.eplug +%{evo_plugin_dir}/liborg-gnome-select-one-source.so + +%{evo_plugin_dir}/org-gnome-subject-thread.eplug +%{evo_plugin_dir}/liborg-gnome-subject-thread.so + +%{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so + +%{evo_plugin_dir}/org-gnome-publish-calendar.eplug +%{evo_plugin_dir}/liborg-gnome-publish-calendar.so +%{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/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 May 3 2006 Matthew Barnes - 2.6.1-3 - rebuilt + +* Mon Apr 10 2006 Matthias Clasen - 2.6.1-2 +- Update to 2.6.1 + +* Thu Mar 30 2006 Caolan McNamara - 2.6.0-2 +- rebuild against reverted pilot-link +- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8 + +* Mon Mar 13 2006 Ray Strode - 2.6.0-1 +- 2.6.0 +- turn on the "error on missing prototypes" check thing + +* Mon Feb 27 2006 Ray Strode - 2.5.92-1 +- 2.5.92 + +* Tue Feb 14 2006 David Malcolm - 2.5.91-1 +- 2.5.91 +- updated patch 101 to track upstream changes to calendar printing code +- remove uptreamed patch 807 (NM multiple initialization assertion) +- readded the mail-to-task plugin XML UI file +- bump e-d-s req to 1.5.91 + +* Fri Feb 10 2006 Jesse Keating - 2.5.90-2.1 +- bump again for double-long bug on ppc(64) + +* Thu Feb 9 2006 Christopher Aillon - 2.5.90-2 +- Disable the inline audio plugin for now since it uses gstreamer08 + +* Tue Feb 07 2006 Jesse Keating - 2.5.90-1.1 +- rebuilt for new gcc4.1 snapshot and glibc changes + +* Mon Jan 30 2006 David Malcolm - 2.5.90-1 +- 2.5.90 +- trimmed patches 805 and 808, as parts of these got merged upstream +- trimmed and regenerated patch 806 to track upstream +- removed the mail-to-task plugin XML UI file + +* Sat Jan 28 2006 David Malcolm - 2.5.5.1-2 +- added missing patch + +* Wed Jan 25 2006 David Malcolm - 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 - 2.5.4-10 +- fix fix for multilib issue with shlib bonobo components (bug 156982) + +* Wed Jan 18 2006 Ray Strode - 2.5.4-9 +- fix multilib issue with shlib bonobo components (bug 156982) + +* Thu Jan 12 2006 David Malcolm - 2.5.4-8 +- avoid multiple initialization of NetworkManager connections (patch 807, + gnome bug #326785) + +* Thu Jan 12 2006 David Malcolm - 2.5.4-7 +- updated alarm notification patch(patch 806, #177546, #177666, #177667, + #177670) + +* Thu Jan 12 2006 Christopher Aillon - 2.5.4-6 +- Remove unneeded Requires: notify-daemon + +* Thu Jan 12 2006 Christopher Aillon - 2.5.4-5 +- Update BR to libnotify-devel + +* Wed Jan 11 2006 David Malcolm - 2.5.4-4 +- ported alarm notification code to the new libnotify API (patch 806, #177546) +- added libnotify_support macro +- added explicit notify-daemon requirement as a workaround for bug #177535 + +* Tue Jan 10 2006 David Malcolm - 2.5.4-3 +- updated patch 800 to include patch for memo conduit (untested at this stage); + renaming from evolution-2.5.2-fix-conduits.patch to + evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo + conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to + evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160) +- switch the build-time dep for the audio-inline plugin from gstreamer-devel to + gstreamer08-devel to better reflect the test in the tarball's configure.in + +* Wed Jan 4 2006 David Malcolm - 2.5.4-2 +- added optional build-time requirement on NetworkManager-glib-devel +- update patch 805 to cover a missing declaration in Network Manager support + +* Tue Jan 3 2006 David Malcolm - 2.5.4-1 +- 2.5.4 +- update patch 107 to track underlying code changes; rename from + evolution-2.2.2-move-autosave-file.patch to + evolution-2.5.4-move-autosave-file.patch +- added patch to fix more missing declarations (patch 805) +- added files for publish-calendar plugin + +* Mon Dec 19 2005 David Malcolm - 2.5.3-1 +- 2.5.3 +- Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it + still applies cleanly + +* Thu Dec 15 2005 Christopher Aillon 2.5.2-2 +- Require nspr and nss instead of mozilla-nspr and mozilla-nss +- Update no-gnome-common patch to work with standalone nss package + +* Fri Dec 09 2005 Jesse Keating +- rebuilt + +* Wed Dec 7 2005 David Malcolm - 2.5.2-1 +- 2.5.2 +- bump gtkhtml requirement from 3.7.6 to 3.9.2 +- bump eds requirement from 1.4.1.1 to 1.5.2 +- bump evo_major from 2.4 to 2.6 +- updated patch 107 +- updated patch 108 +- updated patch 800, replacing + rh-161817-attach-116019-conduit_pilot_link_updates.diff with + evolution-2.5.2-fix-conduits.patch. Not yet complete. +- disable pilot support for now (see #175160) +- added hula plugin to list of packaged plugins +- generalize gconf schema packaging to support changing evo_major + +* Fri Dec 2 2005 David Malcolm - 2.4.2-2 +- force regeneration of the intltool files to prevent a problem where the + tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the + latest shipped copy of intltool, which resulted in a broken intltool-merge + script when the tree was reautotooled. (appears that the tarball was built + with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to + @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that + change) + +* Tue Nov 29 2005 David Malcolm - 2.4.2-1 +- 2.4.2 +- explicitly list the plugins that are packaged (#166234) +- added build-time requirement on gstreamer-devel to cope with audio-inline + plugin + +* Tue Nov 29 2005 David Malcolm - 2.4.1-8 +- add -DLDAP_DEPRECATED to CFLAGS (#172999) + +* Wed Oct 26 2005 David Malcolm - 2.4.1-7 +- Added a patch (110) to hide the component switcher buttons by default on new + windows (#170799) by patching the GConf schema. +- Made list of installed schemas explicit. +- Own the plugins subdirectory + +* Tue Oct 25 2005 David Malcolm - 2.4.1-6 +- use 4 separate .desktop files from the redhat-menus package, rather than the + current single one; bump the redhat-menus requirement accordingly (from 1.13 + to 5.0.4); introduce a macro for this requirement. + +* Mon Oct 24 2005 David Malcolm - 2.4.1-5 +- fix removal of upstream .desktop file (broke on upgrade to Evolution 2.2, and + continued to be broken with 2.3/2.4) (#103826, again) + +* Tue Oct 18 2005 David Malcolm - 2.4.1-4 +- updated patch 804 to declare e_calendar_table_process_completed_tasks + +* Tue Oct 18 2005 David Malcolm - 2.4.1-3 +- added patch (804: evolution-2.4.1-fix-missing-declarations.patch) to fix + missing declaration (thanks to Peter Robinson) + +* Mon Oct 17 2005 David Malcolm - 2.4.1-2 +- bump e-d-s requirement to 1.4.1.1 + +* Tue Oct 4 2005 David Malcolm - 2.4.1-1 +- 2.4.1 +- regenerate patch 101 to handle conflict in + calendar/gui.print.c: print_week_day_event introduced by fix to upstream bug + 244981 (end date added while printing in the week view); bump patch name from + version 5 to version 6 +- removed patch 804 (conduits-multi-day-crash); this is now in upstream tarball + +* Wed Sep 14 2005 Jeremy Katz - 2.4.0-2 +- rebuild for mozilla on ppc64 + +* Wed Sep 7 2005 David Malcolm - 2.4.0-1 +- 2.4.0 +- Removed patch to fix implicit function declarations (patch 110, added in + 2.3.8-1) as this is now upstream. + +* Thu Sep 1 2005 David Malcolm - 2.3.8-4 +- Enable exchange support when configuring, so that the exchange-operations + plugin gets built. + +* Fri Aug 26 2005 David Malcolm - 2.3.8-3 +- Added patch for #157074 (patch 804) + +* Fri Aug 26 2005 David Malcolm - 2.3.8-2 +- Move -Werror-implicit-function-declaration from configuration to the make + stage, to avoid breaking configuration tests. + +* Tue Aug 23 2005 David Malcolm - 2.3.8-1 +- 2.3.8 +- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the + problems arising (patch 110) + +* Tue Aug 16 2005 David Malcolm - 2.3.7-3 +- Introduce macro for gnome-pilot dependency, bumping from 2.0.6 to 2.0.13 +- Add obsoletion of libgal2/libgal2-devel (dependency was removed in 2.3.6-1); + based on the last EVR of the libgal2 package in CVS, 2:2.5.3-2 + +* Mon Aug 15 2005 David Malcolm - 2.3.7-2 +- rebuild + +* Tue Aug 9 2005 David Malcolm - 2.3.7-1 +- 2.3.7 +- Bump evolution-data-server requirement from 1.3.6 to 1.3.7 +- Bump gtkhtml3 requirement from 3.6.2 to 3.7.6 + +* Mon Aug 8 2005 Tomas Mraz - 2.3.6.1-5 +- rebuild with new gnutls + +* Tue Aug 2 2005 David Malcolm - 2.3.6.1-4 +- Added patch to show correct mimetype for OpenOffice.org files when guessing + type for attachments with mimetype "application/octet-stream" (#164957) + +* Mon Aug 1 2005 David Malcolm - 2.3.6.1-3 +- Improved version of evolution-2.3.5.1-fix-150458.patch (#150458) + +* Sat Jul 30 2005 David Malcolm 2.3.6.1-2 +- Fixed version numbers in GConf schema files (#164622); added + apps-evolution-mail-prompts-checkdefault-2.4.schemas + +* Fri Jul 29 2005 David Malcolm - 2.3.6.1-1 +- 2.3.6.1 + +* Thu Jul 28 2005 David Malcolm - 2.3.6-1 +- 2.3.6 +- Bump evolution-data-server requirement to 1.3.6 (needed for + CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING) +- Removed libgal2[-devel] dependencies; the code has been moved into the + evolution tarball + +* Thu Jul 28 2005 David Malcolm - 2.3.5.1-2 +- added experimental patch to port ETable printing to use Pango (#150458) + +* Mon Jul 25 2005 David Malcolm - 2.3.5.1-1 +- 2.3.5.1 +- Update evo_major from 2.2 to 2.4 +- Updated evo-calendar-print-with-pango- patch from version 4 to 5 +- Removed Patch105: evolution-2.2.2-fix-new-mail-notify.patch as configure.in + in this branch tests for existance for dbus-glib-1, rather than max-version. +- Removed Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch as + this is now in upstream tarball. +- Removed evolution-calendar-importers and evolution-addressbook-importers + directories. +- Updated evolution-2.2.2-no-gnome-common.patch to include a patch to rename + mozilla-nspr to nspr + +* Tue Jun 28 2005 David Malcolm - 2.2.2-11.fc5 +- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803) + +* Tue Jun 28 2005 David Malcolm - 2.2.2-10.fc5 +- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802) + +* Mon Jun 27 2005 David Malcolm - 2.2.2-9.fc5 +- Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817) +- Added Mark G Adams's memory leak fix (patch 801) + +* Mon Jun 6 2005 David Malcolm - 2.2.2-8 +- Added Ivan Gyurdiev's patch to move autosave files inside the .evolution + directory + +* Thu May 26 2005 David Malcolm - 2.2.2-7 +- Added Akira Tagoh's patch for calendar keypress handling (#154360) + +* Mon May 23 2005 David Malcolm - 2.2.2-6 +- Remove static versions of libraries + +* Thu May 5 2005 David Malcolm - 2.2.2-5 +- added evolution-2.2.2-fix-new-mail-notify.patch to CVS + +* Thu May 5 2005 David Malcolm - 2.2.2-4 +- Removed explicit mozilla_build_version; instead use pkg-config to determine +the path to the NSS/NSPR headers. +- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12; +patches depend on this) +- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus +versions is in the upstream tarball; but configure.in disables the plugin for +dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions, +and run autoconf at the start of the build) (#156328) + +* Sat Apr 30 2005 David Malcolm - 2.2.2-3 +- updated mozilla_build_version to 1.7.7 + +* Sat Apr 30 2005 David Malcolm - 2.2.2-2 +- Finished porting conduits to pilot-link-0.12 API; re-enabled pilot support (#152172) + +* Mon Apr 11 2005 David Malcolm - 2.2.2-1 +- 2.2.2 +- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item +- removed patch for XB73912; now in upstream tarball +- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream +- removed patch for XB73844; now in upstream tarball +- Update requirements: + - gtkhtml3 from 3.6.1 to 3.6.2 + - libgal2 from 2.4.1 to 2.4.2 + - eds from 1.2.1 to 1.2.2 + +* Wed Mar 23 2005 David Malcolm - 2.2.1.1-2 +- Add patch for upstream bug XB73844 (should now be able to accept meeting requests) + +* Fri Mar 18 2005 David Malcolm - 2.2.1.1-1 +- 2.1.1.1 + +* Thu Mar 17 2005 David Malcolm - 2.2.1-1 +- 2.2.1 +- Updated requirements: + * gtkhtml3 from 3.6.0 to 3.6.1 + * libgal2 from 2.4.0 to 2.4.1 + * eds from 1.2.0 to 1.2.1 +- Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4 +- The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change) + +* Mon Mar 14 2005 David Malcolm - 2.2.0-10 +- disabled pilot-link support for now so that we have an evolution package; more patching is needed to get this to work with pilot-link-0.12 + +* Mon Mar 14 2005 David Malcolm - 2.2.0-9 +- another attempt at porting to pilot-link 0.12 + +* Mon Mar 14 2005 David Malcolm - 2.2.0-8 +- Added patch to deal with changes to pilot-link from 0.11->0.12 + +* Mon Mar 14 2005 David Malcolm - 2.2.0-7 +- use 0.31 rather than 0.31.0 for DBus version + +* Mon Mar 14 2005 David Malcolm - 2.2.0-6 +- rebuilt against pilot-link-0.12 +- added versioning to the requirement on dbus (>=0.31) + +* Thu Mar 10 2005 David Malcolm - 2.2.0-5 +- Added patch for changes to DBus API in version 0.31 (#150671) +- Removed explicit run-time spec-file requirement on mozilla. + The Mozilla NSS API/ABI stabilised by version 1.7.3 + The libraries are always located in the libdir + However, the headers are in /usr/include/mozilla-%{mozilla_build_version} + and so they move each time the mozilla version changes. + So we no longer have an explicit mozilla run-time requirement in the specfile; + a requirement on the appropriate NSS and NSPR .so files is automagically generated on build. + We have an explicit, exact build-time version, so that we can find the headers (without + invoking an RPM query from the spec file; to do so is considered bad practice) +- Introduced mozilla_build_version, to replace mozilla_version + +* Wed Mar 9 2005 Christopher Aillon - 2.2.0-4 +- Depend on mozilla 1.7.6 + +* Wed Mar 9 2005 David Malcolm - 2.2.0-3 +- added patch from upstream for bug XB-73192, fixing missing "Mark as Read/Unread" context menu items + +* Tue Mar 8 2005 David Malcolm - 2.2.0-2 +- actually add source tarball this time + +* Tue Mar 8 2005 David Malcolm - 2.2.0-1 +- 2.2.0 +- Removed patch for GCC 4 fix as this is now in upstream tarball +- Updated requirements: + * gtkhtml3 from 3.5.7 to 3.6.0 + * libgal2 from 2.3.5 to 2.4.0 + * eds from 1.1.6 to 1.2.0 + +* Tue Mar 8 2005 David Malcolm - 2.1.6-3 +- rebuild (to use latest DBus library) + +* Tue Mar 1 2005 David Malcolm - 2.1.6-2 +- added patch to fix build with GCC4 + +* Tue Mar 1 2005 David Malcolm - 2.1.6-1 +- Update from upstream unstable 2.1.6 to 2.1.6 +- Added patches to fix calendar and addressbook printing for non-Roman scripts (#138075) +- Added explicit requirement on libgnomeprint22 >= 2.8.0 +- Added BuildRequires: gtk-doc +- Updated requirements: + * gtkhtml3 from 3.5.6 to 3.5.7 + * libgal2 from 2.3.4 to 2.3.5 + * eds from 1.1.5 to 1.1.6 + +* Wed Feb 9 2005 David Malcolm - 2.1.5-1 +- Update from upstream unstable 2.1.4 to 2.1.5 +- Updated requirements: + * gtkhtml3 from 3.5.4 to 3.5.6 + * libgal2 from 2.3.3 to 2.3.4 + * eds from 1.1.4.1 to 1.1.5 +- Removed explicit packaging of weather icons as these are now below DATADIR/evolution/2.2 rather than DATADIR/evolution-2.2 + +* Wed Jan 26 2005 David Malcolm - 2.1.4-1 +- Update from upstream stable 2.0.3 to unstable 2.1.4 +- Updated evo_major from 2.0 to 2.2 +- Removed camel packaging as this has been moved to evolution-data-server for Evolution 2.2 +- Added plugins to the packaged files +- Added weather icons to the packaged files +- Updated requirements: + * gtkhtml3 from 3.3.2 to 3.5.4 + * libgal2 from 2.2.4 to 2.3.3 + * eds from 1.0.3 to 1.1.4.1 + * libsoup from 2.2.0 to 2.2.2 +- Added built-time requirement on atk-devel +- Enable all plugins for now +- Added requirement on dbus (for the new-mail-notify plugin) +- Enable gtk-doc +- Updated GConf schema name suffixes from 2.0 to 2.2 + +* Sun Dec 19 2004 Christopher Aillon 2.0.3-2 +- Rebuild against mozilla 1.7.5 + +* Wed Dec 15 2004 David Malcolm - 2.0.3-1 +- Update from upstream 2.0.2 to 2.0.3 with these bug fixes: + * Addressbook + XB67656 - almost the same email address are considrered identical (Siva) + XB69079 - Data repeated after save with bad date format (Siva) + XB66854 - Some strings are missed to translation (Rodney) + + * Calendar + XB47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney) + XB68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP) + XB67403 - wrong alarm time displayed (Rodrigo) + XB68077 - appointment dialog re-size (Rodrigo) + - leak fixes (Chen) + - sensitize menu items in list view properly (JP) + - redraw display when 24hr time setting changes (JP) + + * Mail + XB69533 - Unable to subscribe to the alt hierarchy (Michael) + XB69776 - Signed Mail with attachments displays everything with multipart/boundaries stuff (Michael) + XB69615 - delete certificate after viewing smime message (Michael) + XB69109 - EHLO or HELO with ip addresses does not conform rfc 821 (Michael) + XB69982 - During Newsgroup list refresh, it crashes (Michael) + XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur) + XB68556 - NNTP with SSL won't work, even with stunnel (Michael) + XB69145 - toplevel message/rfc822 parts are broken for IMAP (Michael) + XB69241 - base64 attachement holding PGP block (Jeff) + XB67895 - nntp support not asking for password (Michael) + XB67898 - Use of symbolic port-names is not guaranteed to work everywhere (Michael) + XB69851 - remember password check doesn't stick (Michael) + XB69623 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek) + XB69339 - postscript and some other attachments not visable (Michael) + XB69579 - vFoldersXBUNMATCHED generates errors (Michael) + XB68958 - current message forgotten in vfolders (Michael) + XB68974 - Wizard doesn't store smtp auth settings (Michael) + XB67496 - html email not rendered in preview pane (Michael) + XB67014 - Checking supported auth types doesn't work with new SSL certificate (Michael) + XB68006 - Evo crashed after viewing previously-sent email and copying URL from it (Michael) + XB68787 - Crash when migrating 1.4 data to 2.0.2 (Michael) + XB67622 - SMTP auth usernames containing % character fail (Jeff) + - fix pthread_key_delete args (Julio M. Merino Vidal) +- Removed patch for "Unmatched" vfolder properties dialog (#141458) as this is now in upstream tarball (XB69579 above) +- Update dependency on e-d-s from 1.0.2 to 1.0.3 +- Update dependency on libgal2 from 2.2.3 to 2.2.4 + +* Wed Dec 1 2004 David Malcolm - 2.0.2-6 +- Fix broken properties dialog for "Unmatched" vfolder (#141458) + +* Wed Oct 27 2004 Christopher Aillon - 2.0.2-4 +- Re-enable s390(x) + +* Fri Oct 22 2004 David Malcolm - 2.0.2-3 +- added requirement on gnutls/gnutls-devel + +* Fri Oct 22 2004 David Malcolm - 2.0.2-2 +- Fix for #132050 (no entry for Evolution in the menus): use the new redhat-evolution.desktop file provided by redhat-menus-1.13 + +* Tue Oct 12 2004 David Malcolm - 2.0.2-1 +- Update from 2.0.1 to 2.0.2 +- Updated dependency on e-d-s from 1.0.1 to 1.0.2 +- Updated dependency on libgal2 from 2.2.2 to 2.2.3 +- Updated dependency on gtkhtml3 from 3.3.0 to 3.3.2 +- ppc's mozilla dependency is now in line with the other architectures at 1.7.3 + +* Sat Oct 9 2004 David Malcolm +- disable s390/s390x for now + +* Fri Oct 8 2004 David Malcolm - 2.0.1-3 +- Fix for #135135, updating the fix for #103826 that removes the evolution.desktop file in "Office"; the file to delete had been renamed to evolution-2.0.desktop +- Added requirement on redhat-menus, since this supplies the target of our .desktop symlink + +* Tue Sep 28 2004 David Malcolm - 2.0.1-2 +- update mozilla dependency from 1.7.2 to 1.7.3, apart from on ppc (and on s390 and s390x, which remain at 1.6, and on ppc64 where it isn't available at all) + +* Tue Sep 28 2004 David Malcolm - 2.0.1-1 +- Update from 2.0.0 to 2.0.1 +- Updated dependency on e-d-s from 1.0.0 to 1.0.1 +- Updated dependency on libgal2 from 2.2.0 to 2.2.2 + +* Mon Sep 20 2004 David Malcolm - 2.0.0-2 +- rebuilt + +* Tue Sep 14 2004 David Malcolm - 2.0.0-1 +- Update from 1.5.94.1 to 2.0.0 +- Change source FTP location from 1.5 to 2.0 +- Updated dependency on e-d-s from 0.0.99 to 1.0.0 +- Documentation has now moved from 1.5 to 2.0 + +* Tue Aug 31 2004 David Malcolm - 1.5.94.1-1 +- updated tarball from 1.5.93 to 1.5.94.1 +- the BASE_VERSION in the configure.in script has finally been updated from 1.5 to 2.0 (affects OAFIIDs, install dirs, binary names etc); updated evo_major and various other parts of the spec-file to reflect this; however documentation is still 1.5 in upstream tarball +- updated dependency on libgal2 from 2:2.1.14 to 2:2.2.0 +- updated dependency on libsoup from 2.1.13 to 2.2.0 +- updated dependency on e-d-s from 0.0.98 to 0.0.99 + +* Tue Aug 17 2004 David Malcolm - 1.5.93-2 +- updated gnome-icon-theme requirement from 1.2.0 to 1.3.6 to fix problem with missing stock icons (bz #130142) + +* Mon Aug 16 2004 David Malcolm - 1.5.93-1 +- updated tarball from 1.5.92.2 to 1.5.93 +- removed filechooser patch - this is now in the upstream tarball, with a test at configuration time; it was autodetected and enabled in my test build; I've explicitly enabled it to be certain. +- updated dependency on libgal2 from 2:2.1.13 to 2:2.1.14 +- updated dependency on libsoup from 2.1.12 to 2.1.13 +- updated dependency on e-d-s from 0.0.97 to 0.0.98 + +* Wed Aug 11 2004 David Malcolm - 1.5.92.2-2 +- Increased mozilla_version from 1.7 to 1.7.2 so that the NSS test looks in the correct place + +* Wed Aug 11 2004 David Malcolm - 1.5.92.2-1 +- updated tarball from 1.5.92.1 to 1.5.92.2 + +* Wed Aug 4 2004 David Malcolm - 1.5.92.1-1 +- updated tarball from 1.5.91 to 1.5.92.1 +- added a dependency on gnome-icon-theme +- updated dependency on libgal2 from 2:2.1.11 to 2:2.1.13 +- updated dependency on gtkhtml3 from 3.1.17 to 3.3.0 +- updated dependency on libsoup from 2.1.11 to 2.1.12 +- updated dependency on e-d-s from 0.0.95 to 0.0.97 + +* Mon Jul 26 2004 David Malcolm - 1.5.91-1 +- 1.5.91 + +* Thu Jul 8 2004 Jeremy Katz - 1.5.90-5 +- use mozilla 1.7 on platforms where it's available +- check to make sure the appropriate mozilla headers exist if using + mozilla nss for ssl or fail the build + +* Thu Jul 8 2004 David Malcolm +- rebuilt + +* Wed Jul 7 2004 David Malcolm +- rebuilt + +* Tue Jul 6 2004 David Malcolm - 1.5.90-2 +- Fixed sources file + +* Tue Jul 6 2004 David Malcolm - 1.5.90-1 +- 1.5.90; updated requirements on gtkhtml3, libgal2, and e-d-s + +* Thu Jun 17 2004 David Malcolm - 1.5.9.2-1 +- 1.5.9.2 + +* Tue Jun 15 2004 Elliot Lee +- rebuilt + +* Tue Jun 8 2004 David Malcolm - 1.5.9.1-3 +- Replaced /usr/lib with %%{_libdir} in mozills_nss ssl_flags + +* Mon Jun 7 2004 David Malcolm - 1.5.9.1-2 +- updated filechooser patch again + +* Mon Jun 7 2004 David Malcolm - 1.5.9.1-1 +- 1.5.9.1; updated filechooser patch + +* Wed May 26 2004 David Malcolm - 1.5.8-3 +- added ORBit2 and spamassassin requirements + +* Mon May 24 2004 David Malcolm - 1.5.8-2 +- Fixed up filechooser patch and re-enabled it + +* Fri May 21 2004 David Malcolm - 1.5.8-1 +- 1.5.8; added explicit libbonoboui requirement; disabled filechooser patch for now + +* Tue May 4 2004 David Malcolm - 1.5.7-3 +- Added GtkFileChooser patch based on work by Carlos Garnacho Parro (http://lists.ximian.com/archives/public/evolution-patches/2004-March/004867.html); added requirement for GTK 2.4 + +* Thu Apr 22 2004 David Malcolm - 1.5.7-2 +- added emfv signal fix patch and fix for defaults in switch statements on gcc3.4 + +* Wed Apr 21 2004 David Malcolm - 1.5.7-1 +- 1.5.7 + +* Wed Mar 10 2004 Jeremy Katz - 1.5.5-1 +- 1.5.5 + +* Tue Mar 02 2004 Elliot Lee +- rebuilt + +* Wed Feb 18 2004 Jeremy Katz - 1.5.4-1 +- 1.5.4 + +* Tue Feb 17 2004 Jeremy Katz +- buildrequire e-d-s-devel instead of e-d-s (#114712) +- enable nntp support (#114802) + +* Fri Feb 13 2004 Elliot Lee +- rebuilt + +* Tue Jan 27 2004 Jeremy Katz 1.5.3-1 +- 1.5.3 + +* Wed Jan 21 2004 Jeremy Katz 1.5.2-2 +- size_t/int mismatch compile fix for 64bit platforms + +* Wed Jan 14 2004 Jeremy Katz 1.5.2-0 +- 1.5.2 +- add patch to fix gconf warning with schema + +* Sun Jan 4 2004 Jeremy Katz 1.5.1-0 +- 1.5.1 +- temporarily disable redhatify patch +- use mozilla-nss for SSL +- fix schema names + +* Thu Nov 6 2003 Jeremy Katz 1.4.5-8 +- fall back to HELO for ESMTP (#108753) + +* Tue Oct 28 2003 Jeremy Katz 1.4.5-7 +- fix title on composer save dialog (#108159) + +* Mon Oct 27 2003 Jeremy Katz 1.4.5-6 +- Make imap command length shorter to avoid choking some imap servers + (notably cyrus-imap). +- Make wombat session managed so that we don't hit weird bonobo activation + things. This adds a dependency on $DISPLAY for wombat. (#106826) + +* Sun Oct 19 2003 Jeremy Katz 1.4.5-5 +- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without + IPv6 support +- add patch from upstream with reply-to-list shortcut (Ctrl-l) + +* Wed Oct 15 2003 Jeremy Katz 1.4.5-4 +- really, really remove duplicate menu entry (#103826) + +* Tue Oct 14 2003 Jeremy Katz 1.4.5-3 +- Pull in some patches from upstream CVS + * Avoid division by zero with POP (X#41610) + * Don't mangle headers (X#33545) + * Prefix IPV6 numeric hosts properly (X#46006, #105028) + * Use proper function for IPV6 reverse lookups (X#46006) + * Allow timezone offset to be up to 14 hours (X#49357) + +* Mon Oct 13 2003 Jeremy Katz +- add patch from upstream CVS to fix SMTP syntax problems (#106630) +- really remove duplicate menu entry (#103826) + +* Mon Oct 6 2003 Jeremy Katz +- make redhat-email.desktop symlink relative (#104391) + +* Wed Sep 24 2003 Jeremy Katz +- add ipv6 support per dwmw2's request + +* Tue Sep 23 2003 Jeremy Katz 1.4.5-2 +- 1.4.5 + +* Wed Sep 17 2003 Jeremy Katz +- move static libs into -devel (#104399) + +* Tue Sep 16 2003 Jeremy Katz 1.4.4-7 +- filter types are gtypes, not ints (#103934) + +* Wed Sep 10 2003 Jeremy Katz 1.4.4-6 +- fix from upstream (will be in 1.4.5) to fix menu merging in the + composer with new libbonobo + +* Fri Sep 5 2003 Jeremy Katz +- remove the desktop file in Office (#103826) + +* Tue Sep 2 2003 Jeremy Katz 1.4.4-5 +- patch from upstream to fix display of some mails in + different charsets (#102899) +- add requires on newer version of ORBit2 (#103386) +- add patch from upstream (extracted by George Karabin) to use gnome-vfs + mime icon lookup where available (#102553) + +* Fri Aug 22 2003 Jeremy Katz 1.4.4-4 +- include static libs (#102834) + +* Wed Aug 6 2003 Jeremy Katz 1.4.4-3 +- add a -devel subpackage (#99376) + +* Mon Aug 4 2003 Jeremy Katz 1.4.4-1 +- 1.4.4 + +* Wed Jul 30 2003 Jeremy Katz +- buildrequires fixup from Ville Skytta (#101325) + +* Thu Jul 24 2003 Jeremy Katz 1.4.3-6 +- include tagoh's patch for printing cjk contacts (committed upstream, #99374) + +* Tue Jul 22 2003 Nalin Dahyabhai 1.4.3-5 +- rebuild + +* Tue Jul 15 2003 Jeremy Katz 1.4.3-4 +- build on all arches again + +* Mon Jul 14 2003 Jeremy Katz 1.4.3-3 +- rebuild + +* Thu Jul 10 2003 Jeremy Katz 1.4.3-1 +- 1.4.3 + +* Thu Jun 19 2003 Jeremy Katz +- make gal version dep more explicit + +* Fri Jun 13 2003 Jeremy Katz +- fix desktop file (#97162) + +* Tue Jun 10 2003 Jeremy Katz 1.4.0-2 +- rebuild +- excludearch ppc64 for now + +* Mon Jun 9 2003 Jeremy Katz 1.4.0-1 +- 1.4.0 + +* Wed Jun 5 2003 Elliot Lee +- rebuilt + +* Thu Jun 5 2003 Jeremy Katz 1.3.92-2 +- rebuild + +* Wed Jun 4 2003 Jeremy Katz +- buildrequires gettext (#92276) + +* Sun May 25 2003 Jeremy Katz 1.3.92-1 +- 1.3.92 + +* Wed May 7 2003 Jeremy Katz 1.3.3-2 +- fix default for /schemas/apps/evolution/mail/display/mime_types + +* Tue May 6 2003 Jeremy Katz 1.3.3-1 +- 1.3.3 + +* Sun May 4 2003 Jeremy Katz 1.3.2-2 +- enable pilot support +- add redhatify patch back + +* Tue Apr 22 2003 Jeremy Katz +- add a /usr/bin/evolution symlink + +* Mon Apr 21 2003 Jeremy Katz +- fix gnome-spell version requirement + +* Wed Apr 16 2003 Jeremy Katz 1.3.2-1 +- add trivial fix for evolution-mail schema key (ximian #41419) + +* Tue Apr 15 2003 Jeremy Katz +- update to 1.3 +- don't build with pilot support for now +- don't redhat-ify the summary prefs for now + +* Sun Apr 6 2003 Jeremy Katz 1.2.4-2 +- fix krb5 libdir for lib64 systems + +* Sun Apr 6 2003 Jeremy Katz 1.2.4-1 +- update to 1.2.4 + +* Thu Apr 3 2003 Jeremy Katz 1.2.2-7 +- oops, fix a tyop + +* Thu Apr 3 2003 Jeremy Katz 1.2.2-6 +- add a few cleanups for 64bit cleanliness (#86347) + +* Sun Mar 30 2003 Jeremy Katz +- add some buildrequires (#87612) + +* Mon Mar 24 2003 Jeremy Katz 1.2.3-1 +- update to 1.2.3 + +* Wed Mar 19 2003 Jeremy Katz 1.2.2-5 +- security patches from upstream + - sanity check UUEncoding header before decoding (CAN-2003-0128) + - don't decode doubly UUEncoded content (CAN-2003-0129) + - don't use a bonobo component to display things without registered + handlers (CAN-2003-0130) + +* Mon Feb 24 2003 Elliot Lee 1.2.2-4 +- debuginfo rebuild + +* Thu Feb 20 2003 Jeremy Katz 1.2.2-3 +- memleak patch had some bits that weren't supposed to be there. update + to newer from upstream. +- fix directory checking in proxy patch + +* Thu Feb 20 2003 Jeremy Katz 1.2.2-2 +- add missing build dep (#84388) +- add patch from upstream for evolution-mail memleak +- add patch from upstream to use the gnome2 proxy settings by default + +* Fri Feb 7 2003 Jeremy Katz 1.2.2-1 +- 1.2.2 +- build on x86_64 + +* Wed Jan 22 2003 Tim Powers +- rebuilt + +* Tue Jan 7 2003 Nalin Dahyabhai 1.2.1-4 +- rebuild + +* Fri Jan 3 2003 Nalin Dahyabhai +- if building with OpenSSL, attempt to get cflags and ldflags from pkgconfig + +* Thu Jan 2 2003 Jeremy Katz 1.2.1-3 +- we don't want to use native POSIX threads for mutexes in db3, override them + +* Mon Dec 16 2002 Tim Powers 1.2.1-2 +- rebuild + +* Fri Dec 13 2002 Jeremy Katz 1.2.1-1 +- update to 1.2.1 + +* Thu Dec 12 2002 Jeremy Katz 1.2.0-6 +- require a newer soup, the old one Has Bugs (tm) +- excludearch x86_64; getting a R_X86_64_32S relocation in libical + although everything appears to be built with -fPIC correctly + +* Tue Dec 10 2002 Jeremy Katz 1.2.0-5 +- patch for multilib krb5 + +* Mon Dec 2 2002 Jeremy Katz 1.2.0-4 +- add upstream patch to handle LDAPv3 better +- add upstream patch to fix shell memory leaks +- add upstream patch to fix ldap scope selection +- build with openssl instead of mozilla-nss since it's available on + more platforms +- build on all arches + +* Fri Nov 22 2002 Jeremy Katz +- require bonobo-conf, not -devel (#78398) + +* Wed Nov 20 2002 Florian La Roche 1.2.0-3 +- disable pilot support for mainframe + +* Mon Nov 18 2002 Jeremy Katz 1.2.0-2 +- macro-ify the mozilla version to make it easier to build against + newer mozillas with headers in new locations +- buildrequire pilot-link-devel (#78077) +- drop uneeded ldapv3 patch (toshok says 1.2 already handles this) +- drop unneeded patch for ordering of the libdb checks +- add fejj's patch to always subscribe to the inbox from evolution-patches + +* Tue Nov 12 2002 Jeremy Katz 1.2.0-1 +- 1.2.0 + +* Sat Nov 2 2002 Jeremy Katz 1.1.90-2 +- reenable pilot support +- redhatify + +* Fri Nov 1 2002 Jeremy Katz 1.1.90-1 +- update to 1.1.90 + +* Thu Oct 31 2002 Jeremy Katz +- include mozilla epochs in requires (#74577) +- add build requires on newer oaf (#76801) + +* Thu Oct 24 2002 Jeremy Katz 1.1.2-1 +- update to 1.1.2 +- remove unpackaged files from the buildrooot +- disable pilot support for now + +* Tue Sep 3 2002 Jeremy Katz 1.0.8-10 +- add freetype-devel to build requires (#73319) + +* Mon Sep 2 2002 Owen Taylor +- Fix a problem where evolution-mail right click items corrupted the stack + (#67992) + +* Thu Aug 29 2002 Jeremy Katz 1.0.8-9 +- don't install two desktop files (#72871) + +* Wed Aug 28 2002 Preston Brown 1.0.8-8 +- absolute symlink .desktop file (#72913) + +* Thu Aug 22 2002 han Ngo 1.0.8-7 +- rebuild against new pilot-link + +* Sat Aug 10 2002 Florian La Roche +- bzip2 source + +* Tue Aug 6 2002 Than Ngo 1.0.8-5 +- rebuild against new pilot-link-0.11.2 + +* Thu Jul 18 2002 Jeremy Katz 1.0.8-4 +- rebuild against new gnome-pilot + +* Tue Jul 9 2002 Jeremy Katz 1.0.8-3 +- remove static and libtool archives for importers and camel-providers (#68222) +- do desktop-file-install magic +- remove dead sites from summary list (#64522) +- support openldap protocol version 3 based off of Nalin's autofs changes + +* Mon Jul 8 2002 Jeremy Katz 1.0.8-2 +- fix openldap-devel buildrequire + +* Mon Jul 1 2002 Jeremy Katz 1.0.8-1 +- 1.0.8 + +* Thu Jun 27 2002 Jeremy Katz 1.0.7-2 +- include patch to omf files from otaylor@redhat.com to fix + scrollkeeper validation errors + +* Sun Jun 23 2002 Jeremy Katz 1.0.7-1 +- update to 1.0.7 +- excludearch alpha while mozilla isn't being built there + +* Sun May 26 2002 Tim Powers 1.0.5-2 +- automated rebuild + +* Mon May 13 2002 Jeremy Katz 1.0.5-1 +- update to 1.0.5 + +* Fri May 3 2002 Jeremy Katz 1.0.3-6 +- add patch to fix spool unread counts (#64198) +- build with the fix for the crasher mail sent to + evolution-list (ximian #24140) + +* Mon Apr 15 2002 Jeremy Katz 1.0.3-4 +- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl + since it's been committed to the branch and fixes the problem for me +- include patch from tagoh(at)redhat.com to change the default charset + for Japanese to ISO-2022-JP (#63214) + +* Wed Apr 10 2002 Jeremy Katz 1.0.3-3 +- minor tweaks to the redhatify patch +- make accepting appointments sent to mailing lists work +- use the RFC specified LDAP attribs for freebusy and calendarURI + in addressbook +- fix a crash in the startup wizard + +* Sun Mar 31 2002 Jeremy Katz 1.0.3-2 +- move desktop file to /etc/X11/applnk (#62399) + +* Sun Mar 24 2002 Jeremy Katz 1.0.3-1 +- update to evolution 1.0.3 +- change summary view to show a recent errata list by default + +* Thu Mar 14 2002 Jeremy Katz +- put correct path to nspr includes on configure command line + +* Mon Mar 11 2002 Jeremy Katz 1.0.2-3 +- mozilla 0.9.9 has nspr and nss subpackages, hooray! rip out the static + libnss linkage and just link against what is provided dynamically +- kill the -devel subpackage since it's of questionable use +- explicitly require mozilla-nss and mozilla-nspr packages to make it easier + to resolve the requirements + +* Thu Feb 21 2002 Jeremy Katz 1.0.2-2 +- rebuild in new environment +- temporarily exclude on ia64 again + +* Thu Jan 31 2002 Jeremy Katz 1.0.2-1 +- update to 1.0.2 + +* Mon Jan 28 2002 Jeremy Katz 1.0.1-4 +- build on ia64 now that mozilla exists for ia64 + +* Sun Jan 27 2002 Jeremy Katz 1.0.1-3 +- rebuild in new environment +- add pilot support + +* Sun Jan 13 2002 Jeremy Katz 1.0.1-2 +- rebuild without mozilla-psm in the buildroot so libnss is linked + statically as intended + +* Sat Jan 12 2002 Jeremy Katz 1.0.1-1 +- update to 1.0.1 +- patch for autoconf 2.52 accepted upstream +- include man page +- use --with-sub-version=" (%%{version}-%%{release})" + +* Tue Dec 18 2001 Jeremy Katz 1.0-2 +- really disable news +- add patch from Jens Petersen to hopefully get + builds working with autoconf 2.52 +- conditionalize static libnss stuff so that it can go away when we + have a mozilla with shared libnss + +* Thu Dec 6 2001 Jeremy Katz 1.0-1.7.2 +- add patches off of branch for: + * do not show up as Preview Release in version string + * have next/previous work with multiple selected messages +- build without pilot support + +* Mon Dec 3 2001 Jeremy Katz 1.0-1 +- and bump to 1.0 + +* Sun Dec 2 2001 Jeremy Katz +- let's build with an included copy of libnss now since OpenSSL is support + is disabled on the 1.0 branch +- build with --enable-dot-locking=no +- excludearch ia64 again now that we need libnspr + +* Mon Nov 26 2001 Jeremy Katz +- build with gnome-pilot and krb5 support +- conditionalize ldap, pilot and krb5 support +- clean up buildrequires some + +* Sat Nov 17 2001 Jeremy Katz +- we can build on ia64 since we're using openssl instead of nspr +- disable non-functional nntp support +- 0.99.2 (rc2) + +* Fri Nov 9 2001 Jeremy Katz +- add explicit requires on current bonobo, oaf, and GConf to help people + help themselves +- s/Copyright/License/ + +* Thu Nov 8 2001 Jeremy Katz +- add a patch to revert changes to camel-tcp-stream-openssl; appears to + fix the SSL hangs + +* Wed Nov 7 2001 Jeremy Katz +- fix filelist to include libical zoneinfo +- add devel subpackage with includes and static libs + +* Mon Nov 5 2001 Jeremy Katz +- updated to 0.99.0 aka 1.0 RC1 + +* Tue Oct 23 2001 Havoc Pennington +- 0.16 snagged from Ximian GNOME + +* Fri Oct 5 2001 Havoc Pennington +- initial build based on David Sainty's specfile + +* Thu Oct 04 2001 David Sainty +- Updated to 0.15.99, 20011004 from cvs. + +* Wed Sep 05 2001 David Sainty +- Updated to 0.13.99, 20010905 from cvs. + +* Mon Sep 03 2001 David Sainty +- Updated to 0.13.99, 20010903 from cvs. +- Fixed Requires + BuildRequires + +* Mon Aug 06 2001 David Sainty +- Updated to 0.12.99, 20010806 from cvs. + +* Mon Aug 06 2001 David Sainty +- Relocated libical* from /usr/lib due to kdepim, -2 + +* Mon Aug 06 2001 David Sainty +- First spec file for evolution. + From 59a721b51534d587ad6a0762d1bf43a3132ced25 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 12 May 2006 22:37:04 +0000 Subject: [PATCH 017/844] - Update to 2.7.1 - Bump evo_major from 2.6 to 2.8 - Upstream evolution.desktop renamed evolution-%{evo_major}.desktop. - Upstream evolution.keys renamed evolution-%{evo_major}.keys. - Upstream evolution.mime renamed evolution-%{evo_major}.mime. - Update line numbers in evolution-2.5.2-no-gnome-common.patch and evolution-2.5.5.1-notification-cleanups.patch and rename them to version 2.7.1. --- .cvsignore | 3 +- evolution-2.7.1-no-gnome-common.patch | 41 +++++++++++++++++ evolution-2.7.1-notification-cleanups.patch | 49 +++++++++++++++++++++ evolution.spec | 26 +++++++---- sources | 2 +- 5 files changed, 110 insertions(+), 11 deletions(-) create mode 100644 evolution-2.7.1-no-gnome-common.patch create mode 100644 evolution-2.7.1-notification-cleanups.patch diff --git a/.cvsignore b/.cvsignore index 4a2aee3..3371a50 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1 @@ -evolution-2.6.0.tar.bz2 -evolution-2.6.1.tar.bz2 +evolution-2.7.1.tar.bz2 diff --git a/evolution-2.7.1-no-gnome-common.patch b/evolution-2.7.1-no-gnome-common.patch new file mode 100644 index 0000000..c6cd574 --- /dev/null +++ b/evolution-2.7.1-no-gnome-common.patch @@ -0,0 +1,41 @@ +--- evolution-2.7.1/configure.in.no-gnome-common 2006-04-24 07:17:07.000000000 -0400 ++++ evolution-2.7.1/configure.in 2006-05-12 14:46:29.000000000 -0400 +@@ -747,16 +747,24 @@ + check_manually="no" + fi + +- if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla-nss`; then +- PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes") ++ if test "x${check_manually}" = "xno"; then ++ if `$PKG_CONFIG --exists mozilla-nss`; then ++ PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes") ++ mozilla_nspr="mozilla-nspr" ++ mozilla_nss="mozilla-nss" ++ else ++ if `$PKG_CONFIG --exists nss`; then ++ PKG_CHECK_MODULES(NSS, nss, have_nss="yes") ++ mozilla_nspr="nspr" ++ mozilla_nss="nss" ++ fi ++ fi + if test "x${have_nss}" = "xyes"; then + msg_ssl="yes (Mozilla NSS)" + if test "x$enable_smime" = "xyes"; then + AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) + msg_smime="yes (Mozilla NSS)" + fi +- mozilla_nspr="nspr" +- mozilla_nss="mozilla-nss" + AC_DEFINE(HAVE_NSS,1,[Define if you have NSS]) + AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library]) + AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir mozilla-nss`",[Define to the full path of mozilla nss library]) +@@ -1072,9 +1080,6 @@ + dnl ************************* + dnl CFLAGS and LIBS and stuff + dnl ************************* +- +-GNOME_COMPILE_WARNINGS(yes) +-CFLAGS="$CFLAGS $WARN_CFLAGS" + case $CFLAGS in + *-Wall*) + # Turn off the annoying "comparison between signed and unsigned" diff --git a/evolution-2.7.1-notification-cleanups.patch b/evolution-2.7.1-notification-cleanups.patch new file mode 100644 index 0000000..adad881 --- /dev/null +++ b/evolution-2.7.1-notification-cleanups.patch @@ -0,0 +1,49 @@ +--- evolution-2.7.1/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups 2006-04-22 00:39:20.000000000 -0400 ++++ evolution-2.7.1/calendar/gui/alarm-notify/alarm-queue.c 2006-05-12 14:52:43.000000000 -0400 +@@ -1566,10 +1566,11 @@ + const char *summary, *location; + GtkTooltips *tooltips; + ECalComponentText text; +- char *str, *start_str, *end_str, *alarm_str, *time_str; ++ char *start_str, *end_str, *alarm_str, *time_str; + icaltimezone *current_zone; + ECalComponentOrganizer organiser; + char *body; ++ NotifyNotification *n; + + d(printf("%s:%d (popup_notification)\n",__FILE__, __LINE__)); + +@@ -1601,9 +1602,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); + +- str = g_strdup_printf ("%s %s", +- start_str, time_str); +- + if (organiser.cn) { + if (location) + body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); +@@ -1617,16 +1615,19 @@ + body = g_strdup_printf ("%s %s", start_str, time_str); + } + +- NotifyNotification *n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); +- if (!notify_notification_show(n, NULL)) ++ n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); ++ ++ /* Notifications don't timeout: require explicit user action: */ ++ notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER); ++ ++ if (!notify_notification_show_and_forget (n, NULL)) + g_warning ("Could not send notification to daemon\n"); + +- /* create the private structure */ ++ g_free (body); + g_free (start_str); + g_free (end_str); + g_free (alarm_str); + g_free (time_str); +- g_free (str); + + + } diff --git a/evolution.spec b/evolution.spec index e0f4ed2..77b2bf7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -2,7 +2,7 @@ %define soup_version 2.2.2 %define eds_version 1.5.92 %define use_mozilla_nss 1 -%define evo_major 2.6 +%define evo_major 2.8 %define libbonoboui_version 2.4.2 %define orbit2_version 2.9.8 %define gnome_icon_theme_version 1.3.6 @@ -38,8 +38,8 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.6.1 -Release: 3 +Version: 2.7.1 +Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root URL: http://www.ximian.com/ @@ -94,11 +94,11 @@ Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch Patch802: evolution-2.5.4-fix-conduit-dir.patch # Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools): -Patch803: evolution-2.5.2-no-gnome-common.patch +Patch803: evolution-2.7.1-no-gnome-common.patch Patch804: evolution-2.4.1-fix-missing-declarations.patch Patch805: evolution-2.5.4-fix-missing-declarations.patch -Patch806: evolution-2.5.5.1-notification-cleanups.patch +Patch806: evolution-2.7.1-notification-cleanups.patch Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch Patch809: evolution-2.6.0-prototypes.patch @@ -367,10 +367,10 @@ ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop $RPM_BUILD_ROOT ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ # remove upstream desktop file; use the symlinks from above (#103826) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution-%{evo_major}.keys +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution-%{evo_major}.mime # evolution link ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution @@ -635,6 +635,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri May 12 2006 Matthew Barnes - 2.7.1-1 +- Update to 2.7.1 +- Bump evo_major from 2.6 to 2.8 +- Upstream evolution.desktop renamed evolution-%{evo_major}.desktop. +- Upstream evolution.keys renamed evolution-%{evo_major}.keys. +- Upstream evolution.mime renamed evolution-%{evo_major}.mime. +- Update line numbers in evolution-2.5.2-no-gnome-common.patch and + evolution-2.5.5.1-notification-cleanups.patch and rename them to + version 2.7.1. + * Wed May 3 2006 Matthew Barnes - 2.6.1-3 - rebuilt diff --git a/sources b/sources index 1f470a8..1453bea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6ca70a86e6d8e8b3824e58f28a362065 evolution-2.6.1.tar.bz2 +66ab9e288d916607594a2049006f178c evolution-2.7.1.tar.bz2 From 36b2a675efee872ce85aacc85f0a9543c52519f1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 17 May 2006 17:21:50 +0000 Subject: [PATCH 018/844] - Update to 2.7.2.1 - Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch (fixed upstream). --- .cvsignore | 2 +- evolution-2.7.1-no-gnome-common.patch | 29 --------------------------- evolution.spec | 11 +++++++--- sources | 2 +- 4 files changed, 10 insertions(+), 34 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3371a50..b265e10 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.1.tar.bz2 +evolution-2.7.2.1.tar.bz2 diff --git a/evolution-2.7.1-no-gnome-common.patch b/evolution-2.7.1-no-gnome-common.patch index c6cd574..9fc3599 100644 --- a/evolution-2.7.1-no-gnome-common.patch +++ b/evolution-2.7.1-no-gnome-common.patch @@ -1,34 +1,5 @@ --- evolution-2.7.1/configure.in.no-gnome-common 2006-04-24 07:17:07.000000000 -0400 +++ evolution-2.7.1/configure.in 2006-05-12 14:46:29.000000000 -0400 -@@ -747,16 +747,24 @@ - check_manually="no" - fi - -- if test "x${check_manually}" = "xno" && `$PKG_CONFIG --exists mozilla-nss`; then -- PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes") -+ if test "x${check_manually}" = "xno"; then -+ if `$PKG_CONFIG --exists mozilla-nss`; then -+ PKG_CHECK_MODULES(NSS, mozilla-nss, have_nss="yes") -+ mozilla_nspr="mozilla-nspr" -+ mozilla_nss="mozilla-nss" -+ else -+ if `$PKG_CONFIG --exists nss`; then -+ PKG_CHECK_MODULES(NSS, nss, have_nss="yes") -+ mozilla_nspr="nspr" -+ mozilla_nss="nss" -+ fi -+ fi - if test "x${have_nss}" = "xyes"; then - msg_ssl="yes (Mozilla NSS)" - if test "x$enable_smime" = "xyes"; then - AC_DEFINE(ENABLE_SMIME,1,[Define if SMIME should be enabled]) - msg_smime="yes (Mozilla NSS)" - fi -- mozilla_nspr="nspr" -- mozilla_nss="mozilla-nss" - AC_DEFINE(HAVE_NSS,1,[Define if you have NSS]) - AC_DEFINE(HAVE_SSL,1,[Define if you have a supported SSL library]) - AC_DEFINE_UNQUOTED(MOZILLA_NSS_LIB_DIR,"`$PKG_CONFIG --variable=libdir mozilla-nss`",[Define to the full path of mozilla nss library]) @@ -1072,9 +1080,6 @@ dnl ************************* dnl CFLAGS and LIBS and stuff diff --git a/evolution.spec b/evolution.spec index 77b2bf7..44b645d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,12 +38,12 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins Name: evolution -Version: 2.7.1 +Version: 2.7.2.1 Release: 1 License: GPL BuildRoot: %{_tmppath}/%{name}-%{version}-root -URL: http://www.ximian.com/ -Source0: ftp://ftp.gnome.org/pub/gnome/stable/sources/evolution/2.1/%{name}-%{version}.tar.bz2 +URL: http://www.gnome.org/projects/evolution/ +Source: %{name}-%{version}.tar.bz2 # patches pulled from upstream CVS @@ -635,6 +635,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed May 17 2006 Matthew Barnes - 2.7.2.1-1 +- Update to 2.7.2.1 +- Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch + (fixed upstream). + * Fri May 12 2006 Matthew Barnes - 2.7.1-1 - Update to 2.7.1 - Bump evo_major from 2.6 to 2.8 diff --git a/sources b/sources index 1453bea..a24fcf8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -66ab9e288d916607594a2049006f178c evolution-2.7.1.tar.bz2 +9a239d549094daf2ad6892f10d152d4f evolution-2.7.2.1.tar.bz2 From 645f42f9df1066a2bcef6bae7bf67d1a2279b531 Mon Sep 17 00:00:00 2001 From: majain Date: Mon, 22 May 2006 09:10:57 +0000 Subject: [PATCH 019/844] Added patch for preedit replication problem --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index 44b645d..ea7dd8d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -102,6 +102,9 @@ Patch806: evolution-2.7.1-notification-cleanups.patch Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch Patch809: evolution-2.6.0-prototypes.patch +# Patch to remove preedit buffer replication problem +Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch + Summary: GNOME's next-generation groupware suite Group: Applications/Productivity From 2ec93646ebddbf897ef62721776cee22a5408155 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 23 May 2006 17:42:15 +0000 Subject: [PATCH 020/844] - Require specific versions of GNU Autotools packages for building. - Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain). - Various spec file cleanups. - Pick up new libnotify. --- evolution.spec | 53 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 16 deletions(-) diff --git a/evolution.spec b/evolution.spec index ea7dd8d..a9d42d4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -37,15 +37,19 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins +### Description ### + Name: evolution Version: 2.7.2.1 -Release: 1 +Release: 2 License: GPL -BuildRoot: %{_tmppath}/%{name}-%{version}-root +Group: Applications/Productivity +Summary: GNOME's next-generation groupware suite URL: http://www.gnome.org/projects/evolution/ +BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: %{name}-%{version}.tar.bz2 -# patches pulled from upstream CVS +### Patches ### # Red Hat Linux specific patches #Patch11: evolution-1.3.2-redhatify.patch @@ -93,7 +97,8 @@ Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch # Move .conduit files from share to lib (for the sake of multilib) Patch802: evolution-2.5.4-fix-conduit-dir.patch -# Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools): +# Remove gnome-common macros from configure.in. +# We do not ship gnome-common (or at least we're not supposed to). Patch803: evolution-2.7.1-no-gnome-common.patch Patch804: evolution-2.4.1-fix-missing-declarations.patch @@ -105,8 +110,7 @@ Patch809: evolution-2.6.0-prototypes.patch # Patch to remove preedit buffer replication problem Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch -Summary: GNOME's next-generation groupware suite -Group: Applications/Productivity +### Dependencies ### Requires: scrollkeeper >= 0.1.4 Requires: ORBit2 >= 2.7.5 @@ -130,6 +134,15 @@ Requires: libnotify Obsoletes: libgal2 <= %{last_libgal2_version} +### Build Dependencies ### + +# Require specific versions of GNU Autotools packages, +# since we rerun them during the build phase. +BuildRequires: autoconf >= 2.59 +BuildRequires: automake >= 1.9 +BuildRequires: intltool >= 0.35 +BuildRequires: libtool >= 1.5 + BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: evolution-data-server-devel >= %{eds_version} @@ -199,8 +212,8 @@ be tightly integrated with one another and act as a seamless personal information-management tool. %package devel -Summary: Development files for building against evolution Group: Development/Libraries +Summary: Development files for building against evolution Requires: %{name} = %{version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libsoup-devel >= %{soup_version} @@ -249,6 +262,7 @@ cd ../.. %patch806 -p1 -b .notification-cleanups %patch808 -p1 -b .fix-missing-declarations-2.5.5.1 %patch809 -p1 -b .prototypes +%patch810 -p1 -b .preedit-gnome.bz-264485 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -308,7 +322,7 @@ if pkg-config openssl ; then fi %endif -# Rerun autotools since we patched configure.in (patch for new-mail-notify plugin) and some Makefile.am files (conduit paths): +# Rerun the GNU Autotools since we patched some of the input files. aclocal autoheader automake @@ -316,9 +330,8 @@ libtoolize intltoolize --force autoconf -# Configuration: %configure \ - --enable-gtk-doc=yes \ + --enable-gtk-doc \ --enable-ipv6 \ --enable-file-locking=fcntl --enable-dot-locking=no \ --with-sub-version=" (%{version}-%{release})" \ @@ -335,8 +348,6 @@ make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" %endif -#cat /dev/null > default_user/local/Inbox/mbox - %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 @@ -364,10 +375,14 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la rm -rf $RPM_BUILD_ROOT/var/scrollkeeper # evolution is the preferred email app -ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop $RPM_BUILD_ROOT/%{_datadir}/applications/ +ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/ +ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/ +ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/ +ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/ # remove upstream desktop file; use the symlinks from above (#103826) rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop @@ -638,6 +653,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri May 19 2006 Matthew Barnes - 2.7.2.1-2 +- Require specific versions of GNU Autotools packages for building. +- Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain). +- Various spec file cleanups. +- Pick up new libnotify. + * Wed May 17 2006 Matthew Barnes - 2.7.2.1-1 - Update to 2.7.2.1 - Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch From dc78f8e17d58bbc5019da761e20970cbf44f47e3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 23 May 2006 21:03:42 +0000 Subject: [PATCH 021/844] - Port evolution-2.7.1-notification-cleanups.patch to new libnotify API. - Require libnotify >= 0.4. --- evolution-2.7.1-notification-cleanups.patch | 12 +++++++----- evolution.spec | 6 +++++- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/evolution-2.7.1-notification-cleanups.patch b/evolution-2.7.1-notification-cleanups.patch index adad881..1fb6841 100644 --- a/evolution-2.7.1-notification-cleanups.patch +++ b/evolution-2.7.1-notification-cleanups.patch @@ -1,5 +1,5 @@ ---- evolution-2.7.1/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups 2006-04-22 00:39:20.000000000 -0400 -+++ evolution-2.7.1/calendar/gui/alarm-notify/alarm-queue.c 2006-05-12 14:52:43.000000000 -0400 +--- evolution-2.7.2.1/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups 2006-04-22 00:39:20.000000000 -0400 ++++ evolution-2.7.2.1/calendar/gui/alarm-notify/alarm-queue.c 2006-05-23 16:04:23.000000000 -0400 @@ -1566,10 +1566,11 @@ const char *summary, *location; GtkTooltips *tooltips; @@ -23,7 +23,7 @@ if (organiser.cn) { if (location) body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); -@@ -1617,16 +1615,19 @@ +@@ -1617,16 +1615,21 @@ body = g_strdup_printf ("%s %s", start_str, time_str); } @@ -32,12 +32,14 @@ + n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); + + /* Notifications don't timeout: require explicit user action: */ -+ notify_notification_set_timeout (n, NOTIFY_TIMEOUT_NEVER); ++ notify_notification_set_timeout (n, NOTIFY_EXPIRES_NEVER); + -+ if (!notify_notification_show_and_forget (n, NULL)) ++ if (!notify_notification_show (n, NULL)) g_warning ("Could not send notification to daemon\n"); - /* create the private structure */ ++ g_object_unref (n); ++ + g_free (body); g_free (start_str); g_free (end_str); diff --git a/evolution.spec b/evolution.spec index a9d42d4..61b3827 100644 --- a/evolution.spec +++ b/evolution.spec @@ -129,7 +129,7 @@ Requires: libgnomeprint22 >= %{libgnomeprint22_version} Requires: gnome-vfs2 >= %{gnomevfs2_version} %if %{libnotify_support} -Requires: libnotify +Requires: libnotify >= 0.4 %endif Obsoletes: libgal2 <= %{last_libgal2_version} @@ -653,6 +653,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue May 23 2006 Matthew Barnes 2.7.2.1-3 +- Port evolution-2.7.1-notification-cleanups.patch to new libnotify API. +- Require libnotify >= 0.4. + * Fri May 19 2006 Matthew Barnes - 2.7.2.1-2 - Require specific versions of GNU Autotools packages for building. - Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain). From 795b5d68617fcb184215bce4bf64d001042c11de Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 23 May 2006 21:13:03 +0000 Subject: [PATCH 022/844] Forgot to bump release. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 61b3827..81aff2c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -41,7 +41,7 @@ Name: evolution Version: 2.7.2.1 -Release: 2 +Release: 3 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite From 823a28c1d10cca63ae0ebee1f03430a7b4e5a95f Mon Sep 17 00:00:00 2001 From: majain Date: Thu, 25 May 2006 06:12:24 +0000 Subject: [PATCH 023/844] Commented out an unconfirmed patch - patch 810 --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 81aff2c..5550deb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -107,8 +107,8 @@ Patch806: evolution-2.7.1-notification-cleanups.patch Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch Patch809: evolution-2.6.0-prototypes.patch -# Patch to remove preedit buffer replication problem -Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch +# Patch to remove preedit buffer replication problem -- removed after as it was added without being confirmed. +# Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch ### Dependencies ### From c25932b4ec058e3356d5c447eedf654728ff8e8a Mon Sep 17 00:00:00 2001 From: majain Date: Thu, 25 May 2006 06:14:51 +0000 Subject: [PATCH 024/844] Commented patch 810 --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 5550deb..8839775 100644 --- a/evolution.spec +++ b/evolution.spec @@ -262,7 +262,7 @@ cd ../.. %patch806 -p1 -b .notification-cleanups %patch808 -p1 -b .fix-missing-declarations-2.5.5.1 %patch809 -p1 -b .prototypes -%patch810 -p1 -b .preedit-gnome.bz-264485 +# %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain@redhat.com mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From eb681d4efe5849ea28be0325695275c4794af1c1 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Mon, 29 May 2006 23:38:46 +0000 Subject: [PATCH 025/844] - Don't crash on quit when trying to save window size (Gnome.org #343331) --- evolution.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 8839775..25abae3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -41,7 +41,7 @@ Name: evolution Version: 2.7.2.1 -Release: 3 +Release: 4 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -110,6 +110,9 @@ Patch809: evolution-2.6.0-prototypes.patch # Patch to remove preedit buffer replication problem -- removed after as it was added without being confirmed. # Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch +# Gnome.org #343331 +Patch900: evolution-2.7.2.1-quit-resize-crash.patch + ### Dependencies ### Requires: scrollkeeper >= 0.1.4 @@ -264,6 +267,8 @@ cd ../.. %patch809 -p1 -b .prototypes # %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain@redhat.com +%patch900 -p1 -b .quit-resize-crash + mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/%{_lib} @@ -653,6 +658,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon May 29 2006 Dan Williams - 2.7.2.1-4 +- Don't crash on quit when trying to save window size (Gnome.org #343331) + * Tue May 23 2006 Matthew Barnes 2.7.2.1-3 - Port evolution-2.7.1-notification-cleanups.patch to new libnotify API. - Require libnotify >= 0.4. From e690382e444b25f55f64caadacf038c155efa217 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 13 Jun 2006 20:11:29 +0000 Subject: [PATCH 026/844] 2.7.3 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b265e10..c2c65c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.2.1.tar.bz2 +evolution-2.7.3.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 25abae3..852cd9c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,8 +40,8 @@ ### Description ### Name: evolution -Version: 2.7.2.1 -Release: 4 +Version: 2.7.3 +Release: 1 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -658,6 +658,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Jun 13 2006 Matthias Clasen - 2.7.3-1 +- Update to 2.7.3 + * Mon May 29 2006 Dan Williams - 2.7.2.1-4 - Don't crash on quit when trying to save window size (Gnome.org #343331) diff --git a/sources b/sources index a24fcf8..ed9ff1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9a239d549094daf2ad6892f10d152d4f evolution-2.7.2.1.tar.bz2 +e6f155e9c5d5a11ff61ef364752af6a9 evolution-2.7.3.tar.bz2 From d39b9098760a2df2ba221761cf10b8059ec6860d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 14 Jun 2006 02:37:45 +0000 Subject: [PATCH 027/844] drop an upstreamed patch --- evolution.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index 852cd9c..2448c00 100644 --- a/evolution.spec +++ b/evolution.spec @@ -71,9 +71,6 @@ Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch # Move autosave file Patch107: evolution-2.5.4-move-autosave-file.patch -# Fix for RH bug 150458: -Patch108: evolution-2.3.5.1-fix-150458.patch - # Fix for RH bug 164957 (was for 145552): Patch109: evolution-2.0.2-fix-145552.patch @@ -244,9 +241,6 @@ Development files needed for building things which link against evolution. %patch106 -p1 -b .commit-enter-on-calendar %patch107 -p1 -b .move-autosave-file -cd widgets/table -%patch108 -p3 -b .fix-150458 -cd ../.. %patch109 -p1 -b .fix-164957 %patch110 -p1 -b .hide-switcher-buttons-by-default From a2b2ed4e42a91b0cb1be8d17acf8d842a10147b9 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 14 Jun 2006 12:24:23 +0000 Subject: [PATCH 028/844] dont use nm on s390 --- evolution.spec | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/evolution.spec b/evolution.spec index 2448c00..eeaf621 100644 --- a/evolution.spec +++ b/evolution.spec @@ -24,7 +24,13 @@ # note that nntp is non-functional in evo 1.3.x %define nntp_support 1 %define exchange_support 1 + +%ifnarch s390 s390x %define nm_support 1 +%else +%define nm_support 0 +%endif + %define libnotify_support 1 %define inline_audio_support 0 From 74b33433a206e2f36a921bf01a32fb2bf4265a35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Mr=C3=A1z?= Date: Wed, 14 Jun 2006 23:45:06 +0000 Subject: [PATCH 029/844] - rebuilt with new gnutls --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index eeaf621..f670a3a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 1 +Release: 2 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -658,6 +658,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jun 14 2006 Tomas Mraz - 2.7.3-2 +- rebuilt with new gnutls + * Tue Jun 13 2006 Matthias Clasen - 2.7.3-1 - Update to 2.7.3 From fe0204778597f4d82fd967744921b5895d8b769e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 22 Jun 2006 17:40:54 +0000 Subject: [PATCH 030/844] - Fix bad type in schema file (Gnome.org #345677). --- evolution.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index f670a3a..05aed19 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,11 +43,11 @@ %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins -### Description ### +### Abstract ### Name: evolution Version: 2.7.3 -Release: 2 +Release: 3 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -116,6 +116,9 @@ Patch809: evolution-2.6.0-prototypes.patch # Gnome.org #343331 Patch900: evolution-2.7.2.1-quit-resize-crash.patch +# Gnome.org #345677 +Patch901: evolution-2.7.3-no-boolean-in-schemas.patch + ### Dependencies ### Requires: scrollkeeper >= 0.1.4 @@ -268,6 +271,7 @@ Development files needed for building things which link against evolution. # %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain@redhat.com %patch900 -p1 -b .quit-resize-crash +%patch901 -p1 -b .no-boolean-in-schemas mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -658,6 +662,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Jun 22 2006 Matthew Barnes - 2.7.3-3 +- Fix bad type in schema file (Gnome.org #345677). + * Wed Jun 14 2006 Tomas Mraz - 2.7.3-2 - rebuilt with new gnutls From ae09cddd49630dd04fa69fe4238dd0ccb69ec7f1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Jun 2006 15:14:52 +0000 Subject: [PATCH 031/844] - Add patch for RH bug #157505 for QE testing. --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 05aed19..e56569f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 3 +Release: 4 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -119,6 +119,9 @@ Patch900: evolution-2.7.2.1-quit-resize-crash.patch # Gnome.org #345677 Patch901: evolution-2.7.3-no-boolean-in-schemas.patch +# RH bug #157505 +Patch902: evolution-2.7.3-candidate-window-position.patch + ### Dependencies ### Requires: scrollkeeper >= 0.1.4 @@ -272,6 +275,7 @@ Development files needed for building things which link against evolution. %patch900 -p1 -b .quit-resize-crash %patch901 -p1 -b .no-boolean-in-schemas +%patch902 -p1 -b .candidate-window-position mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -662,6 +666,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Jun 26 2006 Matthew Barnes - 2.7.3-4 +- Add patch for RH bug #157505 for QE testing. + * Thu Jun 22 2006 Matthew Barnes - 2.7.3-3 - Fix bad type in schema file (Gnome.org #345677). From 5929c80844e41fd45744c08a42a14eff23ec3437 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 27 Jun 2006 20:44:47 +0000 Subject: [PATCH 032/844] - Add patch for Gnome.org bug #211058 for Trever Adams to test. --- evolution-2.7.3-filter-datespec.patch | 16 ++++++++++++++++ evolution.spec | 11 +++++++++-- 2 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 evolution-2.7.3-filter-datespec.patch diff --git a/evolution-2.7.3-filter-datespec.patch b/evolution-2.7.3-filter-datespec.patch new file mode 100644 index 0000000..20084de --- /dev/null +++ b/evolution-2.7.3-filter-datespec.patch @@ -0,0 +1,16 @@ +--- evolution-2.7.3/filter/filter-datespec.c.filter-datespec 2005-08-09 19:29:27.000000000 -0400 ++++ evolution-2.7.3/filter/filter-datespec.c 2006-06-27 15:56:18.000000000 -0400 +@@ -82,6 +82,13 @@ + { 604800, ngettext("1 week ago", "%d weeks ago"), 52.0 }, + { 2419200, ngettext("1 month ago", "%d months ago"), 12.0 }, + { 31557600, ngettext("1 year ago", "%d years ago"), 1000.0 }, ++ { -1, ngettext("1 second in the future", "%d seconds in the future"), 59.0 }, ++ { -60, ngettext("1 minute in the future", "%d minutes in the future"), 59.0 }, ++ { -3600, ngettext("1 hour in the future", "%d hours in the future"), 23.0 }, ++ { -86400, ngettext("1 day in the future", "%d days in the future"), 31.0 }, ++ { -604800, ngettext("1 week in the future", "%d weeks in the future"), 52.0 }, ++ { -2419200, ngettext("1 month in the future", "%d months in the future"), 12.0 }, ++ { -31557600, ngettext("1 year in the future", "%d years in the future"), 1000.0 }, + }; + + /* now we let the compiler see the real function call */ diff --git a/evolution.spec b/evolution.spec index e56569f..1aa0533 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 4 +Release: 5 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -116,12 +116,15 @@ Patch809: evolution-2.6.0-prototypes.patch # Gnome.org #343331 Patch900: evolution-2.7.2.1-quit-resize-crash.patch -# Gnome.org #345677 +# Gnome.org #345677 - fixed upstream Patch901: evolution-2.7.3-no-boolean-in-schemas.patch # RH bug #157505 Patch902: evolution-2.7.3-candidate-window-position.patch +# Gnome.org #211058 - for Trever Adams to test +Patch903: evolution-2.7.3-filter-datespec.patch + ### Dependencies ### Requires: scrollkeeper >= 0.1.4 @@ -276,6 +279,7 @@ Development files needed for building things which link against evolution. %patch900 -p1 -b .quit-resize-crash %patch901 -p1 -b .no-boolean-in-schemas %patch902 -p1 -b .candidate-window-position +%patch903 -p1 -b .filter-datespec mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -666,6 +670,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Jun 27 2006 Matthew Barnes - 2.7.3-5 +- Add patch for Gnome.org bug #211058 for Trever Adams to test. + * Mon Jun 26 2006 Matthew Barnes - 2.7.3-4 - Add patch for RH bug #157505 for QE testing. From d541d9fe959a95ed7bfb394ae4d67fc900449eca Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 29 Jun 2006 23:22:08 +0000 Subject: [PATCH 033/844] - Properly capitalize "Message->Mailing List" menu items (RH #175596). --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1aa0533..b8cebe7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 5 +Release: 6 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -125,6 +125,9 @@ Patch902: evolution-2.7.3-candidate-window-position.patch # Gnome.org #211058 - for Trever Adams to test Patch903: evolution-2.7.3-filter-datespec.patch +# RH bug #175596 / Gnome.org bug #323952 +Patch904: evolution-2.7.3-mailing-list-menu.patch + ### Dependencies ### Requires: scrollkeeper >= 0.1.4 @@ -280,6 +283,7 @@ Development files needed for building things which link against evolution. %patch901 -p1 -b .no-boolean-in-schemas %patch902 -p1 -b .candidate-window-position %patch903 -p1 -b .filter-datespec +%patch904 -p1 -b .mailing-list-menu mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -670,6 +674,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Jun 29 2006 Matthew Barnes - 2.7.3-6 +- Properly capitalize "Message->Mailing List" menu items (RH #175596). + * Tue Jun 27 2006 Matthew Barnes - 2.7.3-5 - Add patch for Gnome.org bug #211058 for Trever Adams to test. From 50411f8d4347e4c3de417280c417a38b43765922 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 30 Jun 2006 14:59:13 +0000 Subject: [PATCH 034/844] - Add patch for RH bug #157400, reorder some patch #'s. --- evolution.spec | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/evolution.spec b/evolution.spec index b8cebe7..90dc75c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 6 +Release: 7 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -119,14 +119,17 @@ Patch900: evolution-2.7.2.1-quit-resize-crash.patch # Gnome.org #345677 - fixed upstream Patch901: evolution-2.7.3-no-boolean-in-schemas.patch -# RH bug #157505 -Patch902: evolution-2.7.3-candidate-window-position.patch +# RH bug #157400 / Gnome.org bug #303877 +Patch902: evolution-2.7.3-candidate-window-position-task.patch + +# RH bug #157505 / Gnome.org bug #303878 +Patch903: evolution-2.7.3-candidate-window-position-calendar.patch # Gnome.org #211058 - for Trever Adams to test -Patch903: evolution-2.7.3-filter-datespec.patch +Patch904: evolution-2.7.3-filter-datespec.patch # RH bug #175596 / Gnome.org bug #323952 -Patch904: evolution-2.7.3-mailing-list-menu.patch +Patch905: evolution-2.7.3-mailing-list-menu.patch ### Dependencies ### @@ -281,9 +284,10 @@ Development files needed for building things which link against evolution. %patch900 -p1 -b .quit-resize-crash %patch901 -p1 -b .no-boolean-in-schemas -%patch902 -p1 -b .candidate-window-position -%patch903 -p1 -b .filter-datespec -%patch904 -p1 -b .mailing-list-menu +%patch902 -p1 -b .candidate-window-position-task +%patch903 -p1 -b .candidate-window-position-calendar +%patch904 -p1 -b .filter-datespec +%patch905 -p1 -b .mailing-list-menu mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -674,6 +678,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Jun 29 2006 Matthew Barnes - 2.7.3-7 +- Add patch for RH bug #157400, reorder some patch #'s. + * Thu Jun 29 2006 Matthew Barnes - 2.7.3-6 - Properly capitalize "Message->Mailing List" menu items (RH #175596). From f49bd56843031ad55eed1c0ae8423e11cbd22b53 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 6 Jul 2006 16:01:59 +0000 Subject: [PATCH 035/844] - Add patch for RH bug #166231 (also addresses #131227 and #157391). --- evolution-2.7.3-replicated-cjk-input.patch | 22 ++++++++++++++++++++++ evolution.spec | 7 +++++++ 2 files changed, 29 insertions(+) create mode 100644 evolution-2.7.3-replicated-cjk-input.patch diff --git a/evolution-2.7.3-replicated-cjk-input.patch b/evolution-2.7.3-replicated-cjk-input.patch new file mode 100644 index 0000000..5501bae --- /dev/null +++ b/evolution-2.7.3-replicated-cjk-input.patch @@ -0,0 +1,22 @@ +--- evolution-2.7.3/widgets/text/e-text.c.replicated_cjk_input 2006-07-06 09:57:22.000000000 -0400 ++++ evolution-2.7.3/widgets/text/e-text.c 2006-07-06 09:58:27.000000000 -0400 +@@ -1498,7 +1498,8 @@ + } + + +- insert_preedit_text (text); ++ if (text->im_context_signals_registered) ++ insert_preedit_text (text); + + if (!pango_layout_get_text (text->layout)) + return; +@@ -2212,7 +2213,8 @@ + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, + NULL, save_text); +- save_text->im_context_signals_registered = FALSE; ++ save_text->im_context_signals_registered = FALSE; ++ reset_layout (save_text); + } + + if (text->im_context) { diff --git a/evolution.spec b/evolution.spec index 90dc75c..41f0c1d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -131,6 +131,9 @@ Patch904: evolution-2.7.3-filter-datespec.patch # RH bug #175596 / Gnome.org bug #323952 Patch905: evolution-2.7.3-mailing-list-menu.patch +# RH bug #166231 / Gnome.org bug #264485 +Patch906: evolution-2.7.3-replicated-cjk-input.patch + ### Dependencies ### Requires: scrollkeeper >= 0.1.4 @@ -288,6 +291,7 @@ Development files needed for building things which link against evolution. %patch903 -p1 -b .candidate-window-position-calendar %patch904 -p1 -b .filter-datespec %patch905 -p1 -b .mailing-list-menu +%patch906 -p1 -b .replicated-cjk-input mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -678,6 +682,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Jul 6 2006 Matthew Barnes - 2.7.3-8 +- Add patch for RH bug #166231 (also addresses #131227 and #157391). + * Fri Jun 29 2006 Matthew Barnes - 2.7.3-7 - Add patch for RH bug #157400, reorder some patch #'s. From 023ce0d1bb1c3d3757f954e8bc6f4831a6042dcc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 6 Jul 2006 16:06:41 +0000 Subject: [PATCH 036/844] Forgot to bump the release number. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 41f0c1d..363765f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 7 +Release: 8 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite From 8fd70334e3f24ec7b10878868df797cd2a6a106e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 7 Jul 2006 15:25:51 +0000 Subject: [PATCH 037/844] - Make "Submit Bug Report" menu item work again (RH #197384). --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 363765f..644f31b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 8 +Release: 9 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -134,6 +134,9 @@ Patch905: evolution-2.7.3-mailing-list-menu.patch # RH bug #166231 / Gnome.org bug #264485 Patch906: evolution-2.7.3-replicated-cjk-input.patch +# RH bug #197834 / Gnome.org bug #346797 +Patch907: evolution-2.7.3-submit-bug-report.patch + ### Dependencies ### Requires: scrollkeeper >= 0.1.4 @@ -292,6 +295,7 @@ Development files needed for building things which link against evolution. %patch904 -p1 -b .filter-datespec %patch905 -p1 -b .mailing-list-menu %patch906 -p1 -b .replicated-cjk-input +%patch907 -p1 -b .submit-bug-report mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -682,6 +686,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Jul 7 2006 Matthew Barnes - 2.7.3-9 +- Make "Submit Bug Report" menu item work again (RH #197384). + * Thu Jul 6 2006 Matthew Barnes - 2.7.3-8 - Add patch for RH bug #166231 (also addresses #131227 and #157391). From c29619be79e342dc19f845e46e5692558a08c98c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 11 Jul 2006 15:12:03 +0000 Subject: [PATCH 038/844] - Update patch for RH bug #190359. --- evolution-2.7.3-filter-datespec.patch | 438 +++++++++++++++++++++++++- evolution.spec | 7 +- 2 files changed, 430 insertions(+), 15 deletions(-) diff --git a/evolution-2.7.3-filter-datespec.patch b/evolution-2.7.3-filter-datespec.patch index 20084de..a5c7bdf 100644 --- a/evolution-2.7.3-filter-datespec.patch +++ b/evolution-2.7.3-filter-datespec.patch @@ -1,16 +1,428 @@ ---- evolution-2.7.3/filter/filter-datespec.c.filter-datespec 2005-08-09 19:29:27.000000000 -0400 -+++ evolution-2.7.3/filter/filter-datespec.c 2006-06-27 15:56:18.000000000 -0400 -@@ -82,6 +82,13 @@ - { 604800, ngettext("1 week ago", "%d weeks ago"), 52.0 }, - { 2419200, ngettext("1 month ago", "%d months ago"), 12.0 }, - { 31557600, ngettext("1 year ago", "%d years ago"), 1000.0 }, -+ { -1, ngettext("1 second in the future", "%d seconds in the future"), 59.0 }, -+ { -60, ngettext("1 minute in the future", "%d minutes in the future"), 59.0 }, -+ { -3600, ngettext("1 hour in the future", "%d hours in the future"), 23.0 }, -+ { -86400, ngettext("1 day in the future", "%d days in the future"), 31.0 }, -+ { -604800, ngettext("1 week in the future", "%d weeks in the future"), 52.0 }, -+ { -2419200, ngettext("1 month in the future", "%d months in the future"), 12.0 }, -+ { -31557600, ngettext("1 year in the future", "%d years in the future"), 1000.0 }, +diff -ur evolution-2.7.3/filter/filter-datespec.c my-evolution-2.7.3/filter/filter-datespec.c +--- evolution-2.7.3/filter/filter-datespec.c 2005-08-09 17:29:27.000000000 -0600 ++++ my-evolution-2.7.3/filter/filter-datespec.c 2006-06-28 20:51:01.000000000 -0600 +@@ -61,8 +61,10 @@ + + typedef struct _timespan { + guint32 seconds; +- const char *singular; +- const char *plural; ++ const char *past_singular; ++ const char *past_plural; ++ const char *future_singular; ++ const char *future_plural; + float max; + } timespan; + +@@ -75,13 +77,13 @@ + #define ngettext(a, b) a, b + + static const timespan timespans[] = { +- { 1, ngettext("1 second ago", "%d seconds ago"), 59.0 }, +- { 60, ngettext("1 minute ago", "%d minutes ago"), 59.0 }, +- { 3600, ngettext("1 hour ago", "%d hours ago"), 23.0 }, +- { 86400, ngettext("1 day ago", "%d days ago"), 31.0 }, +- { 604800, ngettext("1 week ago", "%d weeks ago"), 52.0 }, +- { 2419200, ngettext("1 month ago", "%d months ago"), 12.0 }, +- { 31557600, ngettext("1 year ago", "%d years ago"), 1000.0 }, ++ { 1, ngettext("1 second ago", "%d seconds ago"), ngettext("1 second in the future", "%d seconds in the future"), 59.0 }, ++ { 60, ngettext("1 minute ago", "%d minutes ago"), ngettext("1 minute in the future", "%d minutes in the future"), 59.0 }, ++ { 3600, ngettext("1 hour ago", "%d hours ago"), ngettext("1 hour in the future", "%d hours in the future"), 23.0 }, ++ { 86400, ngettext("1 day ago", "%d days ago"), ngettext("1 day in the future", "%d days in the future"), 31.0 }, ++ { 604800, ngettext("1 week ago", "%d weeks ago"), ngettext("1 week in the future", "%d weeks in the future"), 52.0 }, ++ { 2419200, ngettext("1 month ago", "%d months ago"), ngettext("1 month in the future", "%d months in the future"), 12.0 }, ++ { 31557600, ngettext("1 year ago", "%d years ago"), ngettext("1 year in the future", "%d years in the future"), 1000.0 }, }; /* now we let the compiler see the real function call */ +@@ -92,7 +94,7 @@ + + struct _FilterDatespecPrivate { + GtkWidget *label_button; +- GtkWidget *notebook_type, *option_type, *calendar_specify, *spin_relative, *option_relative; ++ GtkWidget *notebook_type, *option_type, *calendar_specify, *spin_relative, *option_relative, *option_past_future; + FilterDatespec_type type; + int span; + }; +@@ -264,7 +266,7 @@ + get_best_span (time_t val) + { + int i; +- ++ + for (i=N_TIMESPANS-1;i>=0;i--) { + if (val % timespans[i].seconds == 0) + return i; +@@ -302,8 +304,18 @@ + + span = get_best_span(fds->value); + count = fds->value / timespans[span].seconds; ++ sprintf(buf, ngettext(timespans[span].past_singular, timespans[span].past_plural, count), count); ++ } ++ break; ++ case FDST_X_FUTURE: ++ if (fds->value == 0) ++ label = _("now"); ++ else { ++ int span, count; + +- sprintf(buf, ngettext(timespans[span].singular, timespans[span].plural, count), count); ++ span = get_best_span(fds->value); ++ count = fds->value / timespans[span].seconds; ++ sprintf(buf, ngettext(timespans[span].future_singular, timespans[span].future_plural, count), count); + } + break; + } +@@ -329,6 +341,7 @@ + fds->value = mktime(&tm); + /* what about timezone? */ + break; } ++ case FDST_X_FUTURE: + case FDST_X_AGO: { + int val; + +@@ -349,6 +362,8 @@ + struct _FilterDatespecPrivate *p = PRIV(fds); + + p->type = fds->type==FDST_UNKNOWN ? FDST_NOW : fds->type; ++ ++ int note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc. + + switch (p->type) { + case FDST_NOW: +@@ -368,11 +383,18 @@ + p->span = get_best_span(fds->value); + gtk_spin_button_set_value((GtkSpinButton*)p->spin_relative, fds->value/timespans[p->span].seconds); + gtk_option_menu_set_history((GtkOptionMenu*)p->option_relative, p->span); ++ gtk_option_menu_set_history((GtkOptionMenu*)p->option_past_future, 0); ++ break; ++ case FDST_X_FUTURE: ++ p->span = get_best_span(fds->value); ++ gtk_spin_button_set_value((GtkSpinButton*)p->spin_relative, fds->value/timespans[p->span].seconds); ++ gtk_option_menu_set_history((GtkOptionMenu*)p->option_relative, p->span); ++ gtk_option_menu_set_history((GtkOptionMenu*)p->option_past_future, 1); + break; + } + +- gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, p->type); +- gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, p->type); ++ gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, note_type); ++ gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, note_type); + } + + +@@ -397,6 +419,18 @@ + } + + static void ++set_option_past_future (GtkMenu *menu, FilterDatespec *fds) ++{ ++ GtkWidget *w; ++ ++ w = gtk_menu_get_active (menu); ++ if(g_list_index (GTK_MENU_SHELL (menu)->children, w) == 0) ++ fds->type = fds->priv->type = FDST_X_AGO; ++ else ++ fds->type = fds->priv->type = FDST_X_FUTURE; ++} ++ ++static void + button_clicked (GtkButton *button, FilterDatespec *fds) + { + struct _FilterDatespecPrivate *p = PRIV(fds); +@@ -424,6 +458,7 @@ + p->calendar_specify = glade_xml_get_widget (gui, "calendar_specify"); + p->spin_relative = glade_xml_get_widget (gui, "spin_relative"); + p->option_relative = glade_xml_get_widget (gui, "option_relative"); ++ p->option_past_future = glade_xml_get_widget (gui, "option_past_future"); + + set_values (fds); + +@@ -431,6 +466,8 @@ + G_CALLBACK (set_option_type), fds); + g_signal_connect (GTK_OPTION_MENU (p->option_relative)->menu, "deactivate", + G_CALLBACK (set_option_relative), fds); ++ g_signal_connect (GTK_OPTION_MENU (p->option_past_future)->menu, "deactivate", ++ G_CALLBACK (set_option_past_future), fds); + + gtk_box_pack_start ((GtkBox *) dialog->vbox, toplevel, TRUE, TRUE, 3); + +@@ -486,5 +523,8 @@ + case FDST_X_AGO: + g_string_append_printf (out, "(- (get-current-date) %d)", (int) fds->value); + break; ++ case FDST_X_FUTURE: ++ g_string_append_printf (out, "(+ (get-current-date) %d)", (int) fds->value); ++ break; + } + } +diff -ur evolution-2.7.3/filter/filter-datespec.h my-evolution-2.7.3/filter/filter-datespec.h +--- evolution-2.7.3/filter/filter-datespec.h 2002-11-01 16:22:57.000000000 -0700 ++++ my-evolution-2.7.3/filter/filter-datespec.h 2006-06-28 17:25:55.000000000 -0600 +@@ -42,6 +42,7 @@ + FDST_NOW, + FDST_SPECIFIED, + FDST_X_AGO, ++ FDST_X_FUTURE, + } FilterDatespec_type; + + struct _FilterDatespec { +@@ -52,7 +53,7 @@ + + /* either a timespan, an absolute time, or 0 + * depending on type -- the above mapping to +- * (X_AGO, SPECIFIED, NOW) ++ * (X_FUTURE, X_AGO, SPECIFIED, NOW) + */ + + time_t value; +diff -ur evolution-2.7.3/filter/filter.glade my-evolution-2.7.3/filter/filter.glade +--- evolution-2.7.3/filter/filter.glade 2005-12-20 11:21:51.000000000 -0700 ++++ my-evolution-2.7.3/filter/filter.glade 2006-06-28 17:26:00.000000000 -0600 +@@ -12,6 +12,13 @@ + False + True + False ++ True ++ False ++ False ++ GDK_WINDOW_TYPE_HINT_NORMAL ++ GDK_GRAVITY_NORTH_WEST ++ True ++ False + + + +@@ -21,7 +28,7 @@ + 6 + + +- ++ + True + Show filters for mail: + False +@@ -33,6 +40,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -86,6 +97,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -113,6 +128,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -162,6 +181,7 @@ + gtk-add + True + GTK_RELIEF_NORMAL ++ True + + + +@@ -173,6 +193,7 @@ + _Edit + True + GTK_RELIEF_NORMAL ++ True + + + +@@ -184,6 +205,7 @@ + gtk-remove + True + GTK_RELIEF_NORMAL ++ True + + + +@@ -195,6 +217,7 @@ + gtk-goto-top + True + GTK_RELIEF_NORMAL ++ True + + + +@@ -206,6 +229,7 @@ + gtk-go-up + True + GTK_RELIEF_NORMAL ++ True + + + +@@ -217,6 +241,7 @@ + gtk-go-down + True + GTK_RELIEF_NORMAL ++ True + + + +@@ -228,6 +253,7 @@ + gtk-goto-bottom + True + GTK_RELIEF_NORMAL ++ True + + + +@@ -278,6 +304,13 @@ + False + True + False ++ True ++ False ++ False ++ GDK_WINDOW_TYPE_HINT_NORMAL ++ GDK_GRAVITY_NORTH_WEST ++ True ++ False + + + +@@ -305,6 +338,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -403,6 +440,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -430,6 +471,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + tab +@@ -456,6 +501,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -496,6 +545,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + tab +@@ -522,6 +575,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + 0 +@@ -631,18 +688,32 @@ + + + +- ++ + True +- ago +- False +- False +- GTK_JUSTIFY_CENTER +- False +- False +- 7.45058e-09 +- 0.5 +- 0 +- 0 ++ True ++ 0 ++ ++ ++ ++ True ++ ++ ++ ++ True ++ ago ++ True ++ ++ ++ ++ ++ ++ True ++ in the future ++ True ++ ++ ++ ++ + + + 0 +@@ -677,6 +748,10 @@ + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + + tab diff --git a/evolution.spec b/evolution.spec index 644f31b..a10f94f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 9 +Release: 10 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -125,7 +125,7 @@ Patch902: evolution-2.7.3-candidate-window-position-task.patch # RH bug #157505 / Gnome.org bug #303878 Patch903: evolution-2.7.3-candidate-window-position-calendar.patch -# Gnome.org #211058 - for Trever Adams to test +# RH bug #190359 / Gnome.org bug #211058 Patch904: evolution-2.7.3-filter-datespec.patch # RH bug #175596 / Gnome.org bug #323952 @@ -686,6 +686,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Jul 11 2006 Matthew Barnes - 2.7.3-10 +- Update patch for RH bug #190359. + * Fri Jul 7 2006 Matthew Barnes - 2.7.3-9 - Make "Submit Bug Report" menu item work again (RH #197384). From 55ff395ac0d83e9557ea57e792d9b03c71c4e7c3 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 12 Jul 2006 05:46:29 +0000 Subject: [PATCH 039/844] bumped for rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index a10f94f..7058dc3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.3 -Release: 10 +Release: 10.1 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -686,6 +686,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jul 12 2006 Jesse Keating - 2.7.3-10.1 +- rebuild + * Tue Jul 11 2006 Matthew Barnes - 2.7.3-10 - Update patch for RH bug #190359. From fcc44a1635756916412e5b3511782085d88854e2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Jul 2006 22:10:15 +0000 Subject: [PATCH 040/844] - Update to 2.7.4 - Remove evo-calendar-print-with-pango-7.patch (fixed upstream). - Remove patch for Gnome.org bug #345677 (fixed upstream). - Remove patch for RH bug #175596 (fixed upstream). --- .cvsignore | 2 +- evolution.spec | 41 +++++++++++++++++++---------------------- sources | 2 +- 3 files changed, 21 insertions(+), 24 deletions(-) diff --git a/.cvsignore b/.cvsignore index c2c65c4..d42406a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.3.tar.bz2 +evolution-2.7.4.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 7058dc3..38eefa7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,8 +46,8 @@ ### Abstract ### Name: evolution -Version: 2.7.3 -Release: 10.1 +Version: 2.7.4 +Release: 1 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -67,7 +67,6 @@ Patch98: evolution-1.4.4-ldap-x86_64-hack.patch # patches sent upstream Patch100: evo-addressbook-print-with-pango-2.patch -Patch101: evo-calendar-print-with-pango-7.patch #Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch @@ -116,26 +115,20 @@ Patch809: evolution-2.6.0-prototypes.patch # Gnome.org #343331 Patch900: evolution-2.7.2.1-quit-resize-crash.patch -# Gnome.org #345677 - fixed upstream -Patch901: evolution-2.7.3-no-boolean-in-schemas.patch - # RH bug #157400 / Gnome.org bug #303877 -Patch902: evolution-2.7.3-candidate-window-position-task.patch +Patch901: evolution-2.7.3-candidate-window-position-task.patch # RH bug #157505 / Gnome.org bug #303878 -Patch903: evolution-2.7.3-candidate-window-position-calendar.patch +Patch902: evolution-2.7.3-candidate-window-position-calendar.patch # RH bug #190359 / Gnome.org bug #211058 -Patch904: evolution-2.7.3-filter-datespec.patch - -# RH bug #175596 / Gnome.org bug #323952 -Patch905: evolution-2.7.3-mailing-list-menu.patch +Patch903: evolution-2.7.3-filter-datespec.patch # RH bug #166231 / Gnome.org bug #264485 -Patch906: evolution-2.7.3-replicated-cjk-input.patch +Patch904: evolution-2.7.3-replicated-cjk-input.patch # RH bug #197834 / Gnome.org bug #346797 -Patch907: evolution-2.7.3-submit-bug-report.patch +Patch905: evolution-2.7.3-submit-bug-report.patch ### Dependencies ### @@ -264,7 +257,7 @@ Development files needed for building things which link against evolution. # patches sent upstream #%patch100 -p0 -b .addressbook-print-with-pango -%patch101 -p1 -b .calendar-print-with-pango +#%patch101 -p1 -b .calendar-print-with-pango %patch106 -p1 -b .commit-enter-on-calendar %patch107 -p1 -b .move-autosave-file @@ -289,13 +282,11 @@ Development files needed for building things which link against evolution. # %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain@redhat.com %patch900 -p1 -b .quit-resize-crash -%patch901 -p1 -b .no-boolean-in-schemas -%patch902 -p1 -b .candidate-window-position-task -%patch903 -p1 -b .candidate-window-position-calendar -%patch904 -p1 -b .filter-datespec -%patch905 -p1 -b .mailing-list-menu -%patch906 -p1 -b .replicated-cjk-input -%patch907 -p1 -b .submit-bug-report +%patch901 -p1 -b .candidate-window-position-task +%patch902 -p1 -b .candidate-window-position-calendar +%patch903 -p1 -b .filter-datespec +%patch904 -p1 -b .replicated-cjk-input +%patch905 -p1 -b .submit-bug-report mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -686,6 +677,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jul 12 2006 Matthew Barnes - 2.7.4-1 +- Update to 2.7.4 +- Remove evo-calendar-print-with-pango-7.patch (fixed upstream). +- Remove patch for Gnome.org bug #345677 (fixed upstream). +- Remove patch for RH bug #175596 (fixed upstream). + * Wed Jul 12 2006 Jesse Keating - 2.7.3-10.1 - rebuild diff --git a/sources b/sources index ed9ff1f..30619cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e6f155e9c5d5a11ff61ef364752af6a9 evolution-2.7.3.tar.bz2 +5d9770b3d86953e8edcd36ec9f9b8852 evolution-2.7.4.tar.bz2 From e1b66c3780700eff559e43dec5b961f37b7da8a7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 13 Jul 2006 16:08:52 +0000 Subject: [PATCH 041/844] - Update patch for RH bug #157400. - Update patch for RH bug #157505. --- ...4-candidate-window-position-calendar.patch | 112 ++++++++++++++++++ ...2.7.4-candidate-window-position-task.patch | 110 +++++++++++++++++ evolution.spec | 10 +- 3 files changed, 229 insertions(+), 3 deletions(-) create mode 100644 evolution-2.7.4-candidate-window-position-calendar.patch create mode 100644 evolution-2.7.4-candidate-window-position-task.patch diff --git a/evolution-2.7.4-candidate-window-position-calendar.patch b/evolution-2.7.4-candidate-window-position-calendar.patch new file mode 100644 index 0000000..f8f4e59 --- /dev/null +++ b/evolution-2.7.4-candidate-window-position-calendar.patch @@ -0,0 +1,112 @@ +--- evolution-2.7.4/widgets/text/e-text.h.cal 2006-07-13 10:15:56.000000000 -0400 ++++ evolution-2.7.4/widgets/text/e-text.h 2006-07-13 10:18:20.000000000 -0400 +@@ -109,6 +109,7 @@ + + const gchar *text; /* Text to display --- from the ETextModel */ + gint preedit_len; /* preedit length to display */ ++ gint preedit_pos; /* preedit cursor position */ + PangoLayout *layout; + int num_lines; /* Number of lines of text */ + +--- evolution-2.7.4/widgets/text/e-text.c.cal 2006-07-13 10:15:51.000000000 -0400 ++++ evolution-2.7.4/widgets/text/e-text.c 2006-07-13 10:18:20.000000000 -0400 +@@ -132,6 +132,7 @@ + + static void reset_layout_attrs (EText *text); + ++static void update_im_cursor_position (EText *text); + #if 0 + /* GtkEditable Methods */ + static void e_text_editable_do_insert_text (GtkEditable *editable, +@@ -325,6 +326,8 @@ + pango_layout_set_attributes (text->layout, attrs); + pango_attr_list_unref (attrs); + } ++ ++ update_im_cursor_position (text); + } + + if (preedit_string) +@@ -3723,6 +3726,7 @@ + text->model = e_text_model_new (); + text->text = e_text_model_get_text (text->model); + text->preedit_len = 0; ++ text->preedit_pos = 0; + text->layout = NULL; + + text->revert = NULL; +@@ -3840,17 +3844,71 @@ + } + } + ++/* ++ * Fetch cursor location into Strong or Weak positions so as to ++ * display the preedit candidate selection window in the right place ++ */ ++static void ++e_text_get_cursor_locations (EText *text, ++ GdkRectangle *strong_pos, ++ GdkRectangle *weak_pos) ++{ ++ double x1, y1; ++ PangoRectangle pango_strong_pos; ++ PangoRectangle pango_weak_pos; ++ int cx, cy; ++ gint index; ++ ++ gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, NULL, NULL); ++ ++ gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (text)->canvas), &cx, &cy); ++ ++ index = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; ++ ++ pango_layout_get_cursor_pos (text->layout, index + text->preedit_pos, ++ strong_pos ? &pango_strong_pos : NULL, ++ weak_pos ? &pango_weak_pos : NULL); ++ ++ if (strong_pos) { ++ strong_pos->x = x1 - cx - text->xofs_edit + pango_strong_pos.x / PANGO_SCALE; ++ strong_pos->y = y1 - cy - text->yofs_edit + pango_strong_pos.y / PANGO_SCALE; ++ strong_pos->width = 0; ++ strong_pos->height = pango_strong_pos.height / PANGO_SCALE; ++ } ++ ++ if (weak_pos) { ++ weak_pos->x = x1 - cx - text->xofs_edit + pango_weak_pos.x / PANGO_SCALE; ++ weak_pos->y = y1 - cy - text->yofs_edit + pango_weak_pos.y / PANGO_SCALE; ++ weak_pos->width = 0; ++ weak_pos->height = pango_weak_pos.height / PANGO_SCALE; ++ } ++} ++ ++/* Update IM's cursor position to display candidate selection window */ ++static void ++update_im_cursor_position (EText *text) ++{ ++ GdkRectangle area; ++ ++ e_text_get_cursor_locations (text, &area, NULL); ++ ++ gtk_im_context_set_cursor_location (text->im_context, &area); ++} ++ + static void + e_text_preedit_changed_cb (GtkIMContext *context, +- EText *etext) ++ EText *etext) + { + gchar *preedit_string = NULL; ++ gint cursor_pos; + + gtk_im_context_get_preedit_string (context, &preedit_string, +- NULL, NULL); ++ NULL, &cursor_pos); + ++ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); + etext->preedit_len = strlen (preedit_string); +- g_free (preedit_string); ++ etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; ++ g_free (preedit_string); + + g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0); + } diff --git a/evolution-2.7.4-candidate-window-position-task.patch b/evolution-2.7.4-candidate-window-position-task.patch new file mode 100644 index 0000000..4ccaa5f --- /dev/null +++ b/evolution-2.7.4-candidate-window-position-task.patch @@ -0,0 +1,110 @@ +--- evolution-2.7.4/widgets/table/e-cell-text.c.task 2006-07-13 10:56:19.000000000 -0400 ++++ evolution-2.7.4/widgets/table/e-cell-text.c 2006-07-13 10:56:27.000000000 -0400 +@@ -199,6 +199,7 @@ + gboolean im_context_signals_registered; + + guint16 preedit_length; /* length of preedit string, in bytes */ ++ gint preedit_pos; /* position of preedit cursor */ + + ECellActions actions; + }; +@@ -222,6 +223,7 @@ + static void _insert (ECellTextView *text_view, char *string, int value); + static void _delete_selection (ECellTextView *text_view); + static PangoAttrList* build_attr_list (ECellTextView *text_view, int row, int text_length); ++static void update_im_cursor_location (ECellTextView *tv); + + static ECellClass *parent_class; + +@@ -560,6 +562,9 @@ + if (preedit_attrs) + pango_attr_list_unref (preedit_attrs); + pango_attr_list_unref (attrs); ++ ++ update_im_cursor_location (text_view); ++ + return layout; + } + +@@ -1863,6 +1868,66 @@ + /* IM Context Callbacks */ + + static void ++e_cell_text_get_cursor_locations (ECellTextView *tv, ++ GdkRectangle *strong_pos, ++ GdkRectangle *weak_pos) ++{ ++ GdkRectangle area; ++ CellEdit *edit=tv->edit; ++ ECellView *cell_view = (ECellView *)tv; ++ ETableItem *item = E_TABLE_ITEM ((cell_view)->e_table_item_view); ++ GnomeCanvasItem *parent_item = GNOME_CANVAS_ITEM (item)->parent; ++ PangoRectangle pango_strong_pos; ++ PangoRectangle pango_weak_pos; ++ gint x, y, col, row; ++ gdouble x1,y1; ++ gint cx, cy; ++ gint index; ++ ++ row = edit->row; ++ col = edit->view_col; ++ ++ e_table_item_get_cell_geometry (item, &row, &col, ++ &x, &y, NULL, &area.height); ++ ++ gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (parent_item), &x1, &y1, NULL, NULL); ++ ++ gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (parent_item)->canvas), &cx, &cy); ++ ++ index = edit->selection_end + edit->preedit_pos; ++ ++ pango_layout_get_cursor_pos (edit->layout, ++ index, ++ strong_pos ? &pango_strong_pos : NULL, ++ weak_pos ? &pango_weak_pos : NULL); ++ ++ if (strong_pos) { ++ strong_pos->x = x + x1 - cx - edit->xofs_edit + pango_strong_pos.x / PANGO_SCALE; ++ strong_pos->y = y + y1 - cy - edit->yofs_edit + pango_strong_pos.y / PANGO_SCALE; ++ strong_pos->width = 0; ++ strong_pos->height = pango_strong_pos.height / PANGO_SCALE; ++ } ++ ++ if (weak_pos) { ++ weak_pos->x = x + x1 - cx - edit->xofs_edit + pango_weak_pos.x / PANGO_SCALE; ++ weak_pos->y = y + y1 - cy - edit->yofs_edit + pango_weak_pos.y / PANGO_SCALE; ++ weak_pos->width = 0; ++ weak_pos->height = pango_weak_pos.height / PANGO_SCALE; ++ } ++} ++ ++static void ++update_im_cursor_location (ECellTextView *tv) ++{ ++ CellEdit *edit=tv->edit; ++ GdkRectangle area; ++ ++ e_cell_text_get_cursor_locations (tv, &area, NULL); ++ ++ gtk_im_context_set_cursor_location (edit->im_context, &area); ++} ++ ++static void + e_cell_text_preedit_changed_cb (GtkIMContext *context, + ECellTextView *tv) + { +@@ -1871,10 +1936,12 @@ + CellEdit *edit=tv->edit; + gtk_im_context_get_preedit_string (edit->im_context, &preedit_string, + NULL, &cursor_pos); +- ++ + edit->preedit_length = strlen (preedit_string); +- cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); ++ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); ++ edit->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; + g_free (preedit_string); ++ + ect_queue_redraw (tv, edit->view_col, edit->row); + } + diff --git a/evolution.spec b/evolution.spec index 38eefa7..8d01ee8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.7.4 -Release: 1 +Release: 2 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -116,10 +116,10 @@ Patch809: evolution-2.6.0-prototypes.patch Patch900: evolution-2.7.2.1-quit-resize-crash.patch # RH bug #157400 / Gnome.org bug #303877 -Patch901: evolution-2.7.3-candidate-window-position-task.patch +Patch901: evolution-2.7.4-candidate-window-position-task.patch # RH bug #157505 / Gnome.org bug #303878 -Patch902: evolution-2.7.3-candidate-window-position-calendar.patch +Patch902: evolution-2.7.4-candidate-window-position-calendar.patch # RH bug #190359 / Gnome.org bug #211058 Patch903: evolution-2.7.3-filter-datespec.patch @@ -677,6 +677,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Jul 13 2006 Matthew Barnes - 2.7.4-2 +- Update patch for RH bug #157400. +- Update patch for RH bug #157505. + * Wed Jul 12 2006 Matthew Barnes - 2.7.4-1 - Update to 2.7.4 - Remove evo-calendar-print-with-pango-7.patch (fixed upstream). From ace8928930a12a8fd477c929e3036dafc22a0e60 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 19 Jul 2006 15:28:55 +0000 Subject: [PATCH 042/844] - Clean up spec file, renumber patches. - Add BuildRequires for dbus-glib-devel. - Rebuild to pick up new D-Bus. --- evolution.spec | 202 ++++++++++++++++++++----------------------------- 1 file changed, 80 insertions(+), 122 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8d01ee8..6dbd5af 100644 --- a/evolution.spec +++ b/evolution.spec @@ -7,7 +7,8 @@ %define orbit2_version 2.9.8 %define gnome_icon_theme_version 1.3.6 %define libgnomeprint22_version 2.8.0 -%define dbus_version 0.31 +%define dbus_version 0.90 +%define dbus_glib_version 0.70 %define gnomevfs2_version 2.4 %define last_libgal2_version 2:2.5.3-2 @@ -47,7 +48,7 @@ Name: evolution Version: 2.7.4 -Release: 2 +Release: 3 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -57,96 +58,74 @@ Source: %{name}-%{version}.tar.bz2 ### Patches ### -# Red Hat Linux specific patches -#Patch11: evolution-1.3.2-redhatify.patch - -# db3 starts using POSIX/thread/library for mutexes with nptl otherwise :/ -#Patch99: db3-dont-use-pthread.patch # bad hack -Patch98: evolution-1.4.4-ldap-x86_64-hack.patch - -# patches sent upstream -Patch100: evo-addressbook-print-with-pango-2.patch - -#Patch104: evolution-2.2.0-port-to-pilot-link-0.12.patch +Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # Fix for RH bug #154360: -Patch106: evolution-2.5.5.1-commit-enter-on-calendar.patch +Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch # Move autosave file -Patch107: evolution-2.5.4-move-autosave-file.patch +Patch12: evolution-2.5.4-move-autosave-file.patch # Fix for RH bug 164957 (was for 145552): -Patch109: evolution-2.0.2-fix-145552.patch +Patch13: evolution-2.0.2-fix-145552.patch # Part of RH bug 170799: -Patch110: evolution-2.4.1-hide-switcher-buttons-by-default.patch +Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch -# not accepted, but proposed on a few occasions. fixes problems with -# some cyrus servers -#Patch200: evolution-1.4.5-imap-command-length.patch - -# this was rejected due to adding a dependency on DISPLAY for -# evolution-wombat but it does work to fix the problem -#Patch500: evolution-wombat-sm.patch - -# This was added upstream in 1.5.93, with configure-time detection -#Patch700: evolution-1.5.9.1-filechooser.patch - -# Patches for conduits, based upon rh-161817-attach-116019-conduit_pilot_link_updates.diff (the latter patch was originally by Mark G. Adams): -# Patch800: evolution-2.5.4-fix-conduits.patch +# Patches for conduits, based upon +# rh-161817-attach-116019-conduit_pilot_link_updates.diff +# (the latter patch was originally by Mark G. Adams): +# Patch15: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) -Patch802: evolution-2.5.4-fix-conduit-dir.patch +Patch16: evolution-2.5.4-fix-conduit-dir.patch # Remove gnome-common macros from configure.in. # We do not ship gnome-common (or at least we're not supposed to). -Patch803: evolution-2.7.1-no-gnome-common.patch +Patch17: evolution-2.7.1-no-gnome-common.patch -Patch804: evolution-2.4.1-fix-missing-declarations.patch -Patch805: evolution-2.5.4-fix-missing-declarations.patch -Patch806: evolution-2.7.1-notification-cleanups.patch -Patch808: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch -Patch809: evolution-2.6.0-prototypes.patch - -# Patch to remove preedit buffer replication problem -- removed after as it was added without being confirmed. -# Patch810: evolution-2.7.2-preedit-gnome.bz-264485.patch +Patch18: evolution-2.4.1-fix-missing-declarations.patch +Patch19: evolution-2.5.4-fix-missing-declarations.patch +Patch20: evolution-2.7.1-notification-cleanups.patch +Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch +Patch22: evolution-2.6.0-prototypes.patch # Gnome.org #343331 -Patch900: evolution-2.7.2.1-quit-resize-crash.patch +Patch23: evolution-2.7.2.1-quit-resize-crash.patch # RH bug #157400 / Gnome.org bug #303877 -Patch901: evolution-2.7.4-candidate-window-position-task.patch +Patch24: evolution-2.7.4-candidate-window-position-task.patch # RH bug #157505 / Gnome.org bug #303878 -Patch902: evolution-2.7.4-candidate-window-position-calendar.patch +Patch25: evolution-2.7.4-candidate-window-position-calendar.patch # RH bug #190359 / Gnome.org bug #211058 -Patch903: evolution-2.7.3-filter-datespec.patch +Patch26: evolution-2.7.3-filter-datespec.patch # RH bug #166231 / Gnome.org bug #264485 -Patch904: evolution-2.7.3-replicated-cjk-input.patch +Patch27: evolution-2.7.3-replicated-cjk-input.patch # RH bug #197834 / Gnome.org bug #346797 -Patch905: evolution-2.7.3-submit-bug-report.patch +Patch28: evolution-2.7.3-submit-bug-report.patch ### Dependencies ### -Requires: scrollkeeper >= 0.1.4 +Requires: ORBit2 >= %{orbit2_version} Requires: ORBit2 >= 2.7.5 -Requires: libsoup >= %{soup_version} +Requires: dbus >= %{dbus_version} Requires: evolution-data-server >= %{eds_version} +Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-spell >= 1.0.2 +Requires: gnome-vfs2 >= %{gnomevfs2_version} +Requires: gnutls Requires: gtk2 >= 2.4.0 Requires: libbonoboui >= %{libbonoboui_version} -Requires: ORBit2 >= %{orbit2_version} -Requires: spamassassin -Requires: gnome-icon-theme >= %{gnome_icon_theme_version} -Requires: redhat-menus >= %{redhat_menus_version} -Requires: gnutls -Requires: dbus >= %{dbus_version} Requires: libgnomeprint22 >= %{libgnomeprint22_version} -Requires: gnome-vfs2 >= %{gnomevfs2_version} +Requires: libsoup >= %{soup_version} +Requires: redhat-menus >= %{redhat_menus_version} +Requires: scrollkeeper >= 0.1.4 +Requires: spamassassin %if %{libnotify_support} Requires: libnotify >= 0.4 @@ -156,31 +135,33 @@ Obsoletes: libgal2 <= %{last_libgal2_version} ### Build Dependencies ### -# Require specific versions of GNU Autotools packages, -# since we rerun them during the build phase. -BuildRequires: autoconf >= 2.59 -BuildRequires: automake >= 1.9 -BuildRequires: intltool >= 0.35 -BuildRequires: libtool >= 1.5 - -BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} -BuildRequires: libsoup-devel >= %{soup_version} -BuildRequires: evolution-data-server-devel >= %{eds_version} -BuildRequires: libbonobo-devel >= 2.0 -BuildRequires: libbonoboui-devel >= %{libbonoboui_version} -BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} -BuildRequires: libgnomeui-devel >= 2.0 -BuildRequires: libgnomecanvas-devel >= 2.0 -BuildRequires: libxml2-devel BuildRequires: GConf2-devel -BuildRequires: intltool BuildRequires: ORBit2-devel >= %{orbit2_version} BuildRequires: atk-devel -# kind of silly... -BuildRequires: flex bison byacc libtool gettext -BuildRequires: gnutls-devel +BuildRequires: autoconf >= 2.59 +BuildRequires: automake >= 1.9 +BuildRequires: bison +BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} +BuildRequires: dbus-glib-devel >= %{dbus_glib_version} +BuildRequires: desktop-file-utils +BuildRequires: evolution-data-server-devel >= %{eds_version} +BuildRequires: flex +BuildRequires: gettext +BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} +BuildRequires: gnutls-devel BuildRequires: gtk-doc +BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +BuildRequires: intltool >= 0.35 +BuildRequires: libbonobo-devel >= 2.0 +BuildRequires: libbonoboui-devel >= %{libbonoboui_version} +BuildRequires: libgnomecanvas-devel >= 2.0 +BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version} +BuildRequires: libgnomeui-devel >= 2.0 +BuildRequires: libsoup-devel >= %{soup_version} +BuildRequires: libtool >= 1.5 +BuildRequires: libxml2-devel +BuildRequires: pkgconfig %if %{use_mozilla_nss} BuildRequires: nspr-devel @@ -189,10 +170,6 @@ BuildRequires: nss-devel BuildRequires: openssl-devel %endif -BuildRequires: pkgconfig -BuildRequires: desktop-file-utils -BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version} - %if %{inline_audio_support} # audio-inline plugin requires gstreamer to build: BuildRequires: gstreamer08-devel @@ -244,49 +221,25 @@ Development files needed for building things which link against evolution. %prep %setup -q -# these are in CVS already on the 1-4-branch - -# these are in CVS already on the gnome-2-8 branch - -# Red Hat specific patches -#patch11 -p1 -b .rhatify - -#patch99 -p1 -b .db3pthread - -%patch98 -p1 -b .ldaphack - -# patches sent upstream -#%patch100 -p0 -b .addressbook-print-with-pango -#%patch101 -p1 -b .calendar-print-with-pango - -%patch106 -p1 -b .commit-enter-on-calendar -%patch107 -p1 -b .move-autosave-file -%patch109 -p1 -b .fix-164957 - -%patch110 -p1 -b .hide-switcher-buttons-by-default - -#patch200 -p1 -b .commandlength - -#patch500 -p0 -b .wombatsm - -#patch700 -p1 -b .filechooser - -# %patch800 -p1 -b .fix-conduits -%patch802 -p1 -b .fix-conduit-dir -%patch803 -p1 -b .no-gnome-common -%patch804 -p1 -b .fix-missing-declarations -%patch805 -p1 -b .fix-missing-declarations-2-5-4 -%patch806 -p1 -b .notification-cleanups -%patch808 -p1 -b .fix-missing-declarations-2.5.5.1 -%patch809 -p1 -b .prototypes -# %patch810 -p1 -b .preedit-gnome.bz-264485 -- commented as patch 810 was unconfirmed -- majain@redhat.com - -%patch900 -p1 -b .quit-resize-crash -%patch901 -p1 -b .candidate-window-position-task -%patch902 -p1 -b .candidate-window-position-calendar -%patch903 -p1 -b .filter-datespec -%patch904 -p1 -b .replicated-cjk-input -%patch905 -p1 -b .submit-bug-report +%patch10 -p1 -b .ldaphack +%patch11 -p1 -b .commit-enter-on-calendar +%patch12 -p1 -b .move-autosave-file +%patch13 -p1 -b .fix-164957 +%patch14 -p1 -b .hide-switcher-buttons-by-default +#patch15 -p1 -b .fix-conduits +%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 .notification-cleanups +%patch21 -p1 -b .fix-missing-declarations-2.5.5.1 +%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 .submit-bug-report mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -677,6 +630,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Jul 18 2006 Matthew Barnes - 2.7.4-3 +- Clean up spec file, renumber patches. +- Add BuildRequires for dbus-glib-devel. +- Rebuild to pick up new D-Bus. + * Thu Jul 13 2006 Matthew Barnes - 2.7.4-2 - Update patch for RH bug #157400. - Update patch for RH bug #157505. From 7d988d4e9f014ee12052ca3bf8d06d58d21b5c71 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 26 Jul 2006 11:20:17 +0000 Subject: [PATCH 043/844] - Update to 2.7.90 --- .cvsignore | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index d42406a..1ba3ac5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.4.tar.bz2 +evolution-2.7.90.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 6dbd5af..b3a05b9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,8 +47,8 @@ ### Abstract ### Name: evolution -Version: 2.7.4 -Release: 3 +Version: 2.7.90 +Release: 1 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -91,7 +91,7 @@ Patch20: evolution-2.7.1-notification-cleanups.patch Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch Patch22: evolution-2.6.0-prototypes.patch -# Gnome.org #343331 +# Gnome.org bug #343331 Patch23: evolution-2.7.2.1-quit-resize-crash.patch # RH bug #157400 / Gnome.org bug #303877 @@ -630,6 +630,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jul 26 2006 Matthew Barnes - 2.7.90-1 +- Update to 2.7.90 + * Tue Jul 18 2006 Matthew Barnes - 2.7.4-3 - Clean up spec file, renumber patches. - Add BuildRequires for dbus-glib-devel. diff --git a/sources b/sources index 30619cb..ef87e32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d9770b3d86953e8edcd36ec9f9b8852 evolution-2.7.4.tar.bz2 +aae1aac8c521aef1aa9dbb1aed9a9f6e evolution-2.7.90.tar.bz2 From 475c4ad6d9b7cecb2c337297578b2c8512bdddb7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 26 Jul 2006 15:56:25 +0000 Subject: [PATCH 044/844] - Add patch for RH bug #178295. --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index b3a05b9..afc8ef4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -48,7 +48,7 @@ Name: evolution Version: 2.7.90 -Release: 1 +Release: 2 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -109,6 +109,9 @@ Patch27: evolution-2.7.3-replicated-cjk-input.patch # RH bug #197834 / Gnome.org bug #346797 Patch28: evolution-2.7.3-submit-bug-report.patch +# RH bug #178295 / Gnome.org bug #348638 +Patch29: evolution-2.7.90-deleting-preedit-buffer.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -240,6 +243,7 @@ Development files needed for building things which link against evolution. %patch26 -p1 -b .filter-datespec %patch27 -p1 -b .replicated-cjk-input %patch28 -p1 -b .submit-bug-report +%patch29 -p1 -b .deleting-preedit-buffer mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -630,6 +634,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jul 26 2006 Matthew Barnes - 2.7.90-2 +- Add patch for RH bug #178295. + * Wed Jul 26 2006 Matthew Barnes - 2.7.90-1 - Update to 2.7.90 From 48b5089c718136de403739262e7dc72892654392 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 27 Jul 2006 21:35:17 +0000 Subject: [PATCH 045/844] - Add Requires for evolution-data-server >= 1.7.90 - Add BuildRequires for evolution-data-server-devel >= 1.7.90 --- evolution.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index afc8ef4..1cc248a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define gtkhtml_version 3.9.2 %define soup_version 2.2.2 -%define eds_version 1.5.92 +%define eds_version 1.7.90 %define use_mozilla_nss 1 %define evo_major 2.8 %define libbonoboui_version 2.4.2 @@ -48,7 +48,7 @@ Name: evolution Version: 2.7.90 -Release: 2 +Release: 3 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -634,6 +634,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Jul 27 2006 Matthew Barnes - 2.7.90-3 +- Add Requires for evolution-data-server >= 1.7.90 +- Add BuildRequires for evolution-data-server-devel >= 1.7.90 + * Wed Jul 26 2006 Matthew Barnes - 2.7.90-2 - Add patch for RH bug #178295. From 62c5ab5dc11cc0cdd2335612e8c074ab3c53ea7d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 29 Jul 2006 07:13:40 +0000 Subject: [PATCH 046/844] - Add patch for RH bug #167157. --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1cc248a..c01fce4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -48,7 +48,7 @@ Name: evolution Version: 2.7.90 -Release: 3 +Release: 4 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -112,6 +112,9 @@ Patch28: evolution-2.7.3-submit-bug-report.patch # RH bug #178295 / Gnome.org bug #348638 Patch29: evolution-2.7.90-deleting-preedit-buffer.patch +# RH bug #167157 / Gnome.org bug #334464 +Patch30: evolution-2.7.90-fix-crash-on-paste.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -244,6 +247,7 @@ Development files needed for building things which link against evolution. %patch27 -p1 -b .replicated-cjk-input %patch28 -p1 -b .submit-bug-report %patch29 -p1 -b .deleting-preedit-buffer +%patch30 -p1 -b .fix-crash-on-paste mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -634,6 +638,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sat Jul 29 2006 Matthew Barnes - 2.7.90-4 +- Add patch for RH bug #167157. + * Thu Jul 27 2006 Matthew Barnes - 2.7.90-3 - Add Requires for evolution-data-server >= 1.7.90 - Add BuildRequires for evolution-data-server-devel >= 1.7.90 From 0396cc9146721489d313e4b1ddb6d3fd961363aa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 31 Jul 2006 19:06:03 +0000 Subject: [PATCH 047/844] - Add patch for RH bug #178295. - Add patch for RH bug #167157. --- .cvsignore | 2 +- evolution-2.7.4-deleting-preedit-buffer.patch | 110 ++++++++++++++++++ evolution.spec | 23 ++-- sources | 2 +- 4 files changed, 119 insertions(+), 18 deletions(-) create mode 100644 evolution-2.7.4-deleting-preedit-buffer.patch diff --git a/.cvsignore b/.cvsignore index 1ba3ac5..d42406a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.90.tar.bz2 +evolution-2.7.4.tar.bz2 diff --git a/evolution-2.7.4-deleting-preedit-buffer.patch b/evolution-2.7.4-deleting-preedit-buffer.patch new file mode 100644 index 0000000..17e1945 --- /dev/null +++ b/evolution-2.7.4-deleting-preedit-buffer.patch @@ -0,0 +1,110 @@ +--- evolution-2.7.90/widgets/text/e-text.c.deleting-preedit-buffer 2006-07-26 10:16:02.000000000 -0400 ++++ evolution-2.7.90/widgets/text/e-text.c 2006-07-26 10:25:29.000000000 -0400 +@@ -284,7 +284,7 @@ + PangoAttrList *preedit_attrs = NULL; + gchar *preedit_string = NULL; + GString *tmp_string = g_string_new (NULL); +- gint length = 0, cpos = 0, preedit_length = 0; ++ gint length = 0, cpos = 0; + gboolean new_attrs = FALSE; + + if (text->layout == NULL || !GTK_IS_IM_CONTEXT (text->im_context)) +@@ -295,19 +295,15 @@ + + g_string_prepend_len (tmp_string, text->text,length); + +- if (text->preedit_len) +- gtk_im_context_get_preedit_string (text->im_context, +- &preedit_string, &preedit_attrs, +- NULL); ++ /* we came into this function only when text->preedit_len was not 0 ++ so we can saftely fetch the preedit string */ ++ gtk_im_context_get_preedit_string (text->im_context, &preedit_string, &preedit_attrs, NULL); + + if (preedit_string && g_utf8_validate (preedit_string, -1, NULL)) +- text->preedit_len = preedit_length = strlen (preedit_string); +- else +- text->preedit_len = preedit_length = 0; +- +- cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; ++ { ++ text->preedit_len = strlen (preedit_string); ++ cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; + +- if (preedit_length) { + g_string_insert (tmp_string, cpos, preedit_string); + + reset_layout_attrs (text); +@@ -320,15 +316,17 @@ + + pango_layout_set_text (text->layout, tmp_string->str, tmp_string->len); + +- pango_attr_list_splice (attrs, preedit_attrs, cpos, preedit_length); ++ pango_attr_list_splice (attrs, preedit_attrs, cpos, text->preedit_len); + + if (new_attrs) { + pango_layout_set_attributes (text->layout, attrs); + pango_attr_list_unref (attrs); +- } ++ } + + update_im_cursor_position (text); + } ++ else ++ text->preedit_len = 0; + + if (preedit_string) + g_free (preedit_string); +@@ -385,9 +383,12 @@ + pango_attr_list_insert_before (attrs, attr); + } + } ++ + pango_layout_set_attributes (text->layout, attrs); ++ + if (attrs) + pango_attr_list_unref (attrs); ++ + calc_height (text); + } + +@@ -1510,9 +1511,14 @@ + } + } + +- +- if (text->im_context_signals_registered) +- insert_preedit_text (text); ++ /* Insert preedit text only when im_context signals are connected & text->preedit_len is not zero */ ++ if (text->im_context_signals_registered && text->preedit_len) ++ insert_preedit_text (text); ++ ++ /* Need to reset the layout to cleanly clear the preedit buffer ++ * when typing in CJK & using backspace on the preedit */ ++ if(!text->preedit_len) ++ reset_layout (text); + + if (!pango_layout_get_text (text->layout)) + return; +@@ -2220,11 +2226,12 @@ + */ + + if (save_text && save_text->im_context) { ++ gtk_im_context_focus_out(save_text->im_context); + g_signal_handlers_disconnect_matched (save_text->im_context, + G_SIGNAL_MATCH_DATA, + 0, 0, NULL, + NULL, save_text); +- save_text->im_context_signals_registered = FALSE; ++ save_text->im_context_signals_registered = FALSE; + reset_layout (save_text); + } + +@@ -2240,6 +2247,7 @@ + G_CALLBACK (e_text_delete_surrounding_cb), text); + text->im_context_signals_registered = TRUE; + } ++ gtk_im_context_focus_in(text->im_context); + } + start_editing (text); + text->show_cursor = FALSE; /* so we'll redraw and the cursor will be shown */ diff --git a/evolution.spec b/evolution.spec index c01fce4..8e33ba8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define gtkhtml_version 3.9.2 %define soup_version 2.2.2 -%define eds_version 1.7.90 +%define eds_version 1.5.92 %define use_mozilla_nss 1 %define evo_major 2.8 %define libbonoboui_version 2.4.2 @@ -47,7 +47,7 @@ ### Abstract ### Name: evolution -Version: 2.7.90 +Version: 2.7.4 Release: 4 License: GPL Group: Applications/Productivity @@ -91,7 +91,7 @@ Patch20: evolution-2.7.1-notification-cleanups.patch Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.patch Patch22: evolution-2.6.0-prototypes.patch -# Gnome.org bug #343331 +# Gnome.org #343331 Patch23: evolution-2.7.2.1-quit-resize-crash.patch # RH bug #157400 / Gnome.org bug #303877 @@ -110,10 +110,10 @@ Patch27: evolution-2.7.3-replicated-cjk-input.patch Patch28: evolution-2.7.3-submit-bug-report.patch # RH bug #178295 / Gnome.org bug #348638 -Patch29: evolution-2.7.90-deleting-preedit-buffer.patch +Patch29: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #167157 / Gnome.org bug #334464 -Patch30: evolution-2.7.90-fix-crash-on-paste.patch +Patch30: evolution-2.7.4-fix-crash-on-paste.patch ### Dependencies ### @@ -638,18 +638,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Sat Jul 29 2006 Matthew Barnes - 2.7.90-4 -- Add patch for RH bug #167157. - -* Thu Jul 27 2006 Matthew Barnes - 2.7.90-3 -- Add Requires for evolution-data-server >= 1.7.90 -- Add BuildRequires for evolution-data-server-devel >= 1.7.90 - -* Wed Jul 26 2006 Matthew Barnes - 2.7.90-2 +* Mon Jul 31 2006 Matthew Barnes - 2.7.4-4 - Add patch for RH bug #178295. - -* Wed Jul 26 2006 Matthew Barnes - 2.7.90-1 -- Update to 2.7.90 +- Add patch for RH bug #167157. * Tue Jul 18 2006 Matthew Barnes - 2.7.4-3 - Clean up spec file, renumber patches. diff --git a/sources b/sources index ef87e32..30619cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aae1aac8c521aef1aa9dbb1aed9a9f6e evolution-2.7.90.tar.bz2 +5d9770b3d86953e8edcd36ec9f9b8852 evolution-2.7.4.tar.bz2 From 4c0e75ffb634b1ac27e7025ef1ba1798fc271c4b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 3 Aug 2006 18:12:42 +0000 Subject: [PATCH 048/844] - Remove patch for RH bug #167157, as it fixed it the wrong way. - The real fix for #167157 is in evolution-data-server-1.7.4-5. - No longer packaging unused patches. --- evolution.spec | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8e33ba8..92c2f13 100644 --- a/evolution.spec +++ b/evolution.spec @@ -48,7 +48,7 @@ Name: evolution Version: 2.7.4 -Release: 4 +Release: 5 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -79,16 +79,20 @@ Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch # Patch15: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) +# This patch effects other parts of evolution.spec and so is necessary +# for a successful build. Patch16: evolution-2.5.4-fix-conduit-dir.patch # Remove gnome-common macros from configure.in. # 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.7.1-notification-cleanups.patch -Patch21: evolution-2.5.5.1-fix-missing-declarations-2.5.5.1.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 # Gnome.org #343331 @@ -112,13 +116,9 @@ Patch28: evolution-2.7.3-submit-bug-report.patch # RH bug #178295 / Gnome.org bug #348638 Patch29: evolution-2.7.4-deleting-preedit-buffer.patch -# RH bug #167157 / Gnome.org bug #334464 -Patch30: evolution-2.7.4-fix-crash-on-paste.patch - ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} -Requires: ORBit2 >= 2.7.5 Requires: dbus >= %{dbus_version} Requires: evolution-data-server >= %{eds_version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -232,13 +232,13 @@ Development files needed for building things which link against evolution. %patch12 -p1 -b .move-autosave-file %patch13 -p1 -b .fix-164957 %patch14 -p1 -b .hide-switcher-buttons-by-default -#patch15 -p1 -b .fix-conduits +#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 .notification-cleanups -%patch21 -p1 -b .fix-missing-declarations-2.5.5.1 +%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 @@ -247,7 +247,6 @@ Development files needed for building things which link against evolution. %patch27 -p1 -b .replicated-cjk-input %patch28 -p1 -b .submit-bug-report %patch29 -p1 -b .deleting-preedit-buffer -%patch30 -p1 -b .fix-crash-on-paste mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -638,6 +637,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Aug 2 2006 Matthew Barnes - 2.7.4-5 +- Remove patch for RH bug #167157, as it fixed it the wrong way. +- The real fix for #167157 is in evolution-data-server-1.7.4-5. +- No longer packaging unused patches. + * Mon Jul 31 2006 Matthew Barnes - 2.7.4-4 - Add patch for RH bug #178295. - Add patch for RH bug #167157. From 3e0c365cae3efb830248ea7ef26eaad041c9d195 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Aug 2006 00:05:14 +0000 Subject: [PATCH 049/844] - Update to 2.7.90 - Require evolution-data-server-1.7.90.1. --- .cvsignore | 2 +- evolution.spec | 62 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.cvsignore b/.cvsignore index d42406a..1ba3ac5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.4.tar.bz2 +evolution-2.7.90.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 92c2f13..dad2303 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,54 +1,50 @@ -%define gtkhtml_version 3.9.2 -%define soup_version 2.2.2 -%define eds_version 1.5.92 -%define use_mozilla_nss 1 -%define evo_major 2.8 -%define libbonoboui_version 2.4.2 -%define orbit2_version 2.9.8 -%define gnome_icon_theme_version 1.3.6 -%define libgnomeprint22_version 2.8.0 -%define dbus_version 0.90 %define dbus_glib_version 0.70 -%define gnomevfs2_version 2.4 -%define last_libgal2_version 2:2.5.3-2 - -%define pilot_link_version 2:0.11.8 +%define dbus_version 0.90 +%define eds_version 1.7.90.1 +%define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 +%define gnomevfs2_version 2.4 +%define gtkhtml_version 3.9.2 +%define last_libgal2_version 2:2.5.3-2 +%define libbonoboui_version 2.4.2 +%define libgnomeprint22_version 2.8.0 +%define orbit2_version 2.9.8 +%define pilot_link_version 2:0.11.8 +%define redhat_menus_version 5.0.4 +%define soup_version 2.2.2 + +%define evo_major 2.8 -%define ldap_support 1 -%define krb5_support 1 -%ifarch s390 s390x -%define pilot_support 0 -%else -%define pilot_support 1 -%endif -# note that nntp is non-functional in evo 1.3.x -%define nntp_support 1 %define exchange_support 1 - +%define inline_audio_support 0 +%define ldap_support 1 +%define libnotify_support 1 +%define krb5_support 1 +%define nntp_support 1 %ifnarch s390 s390x %define nm_support 1 %else %define nm_support 0 %endif - -%define libnotify_support 1 -%define inline_audio_support 0 +%ifarch s390 s390x +%define pilot_support 0 +%else +%define pilot_support 1 +%endif +%define use_mozilla_nss 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 ### Abstract ### Name: evolution -Version: 2.7.4 -Release: 5 +Version: 2.7.90 +Release: 1 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -637,6 +633,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Aug 4 2006 Matthew Barnes - 2.7.90-1 +- Update to 2.7.90 +- Require evolution-data-server-1.7.90.1. + * Wed Aug 2 2006 Matthew Barnes - 2.7.4-5 - Remove patch for RH bug #167157, as it fixed it the wrong way. - The real fix for #167157 is in evolution-data-server-1.7.4-5. diff --git a/sources b/sources index 30619cb..ef87e32 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5d9770b3d86953e8edcd36ec9f9b8852 evolution-2.7.4.tar.bz2 +aae1aac8c521aef1aa9dbb1aed9a9f6e evolution-2.7.90.tar.bz2 From e068c75e93c1d91e173a9ed94191735f300920df Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Aug 2006 00:07:02 +0000 Subject: [PATCH 050/844] - Bump the release. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index dad2303..6c90bca 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.7.90 -Release: 1 +Release: 2 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -633,7 +633,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Fri Aug 4 2006 Matthew Barnes - 2.7.90-1 +* Fri Aug 4 2006 Matthew Barnes - 2.7.90-2 - Update to 2.7.90 - Require evolution-data-server-1.7.90.1. From 4b27d2970d99825c442983c051b890244ff189c0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Aug 2006 00:08:09 +0000 Subject: [PATCH 051/844] - Try it again. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6c90bca..883ebb7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.7.90 -Release: 2 +Release: 5 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -633,7 +633,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Fri Aug 4 2006 Matthew Barnes - 2.7.90-2 +* Fri Aug 4 2006 Matthew Barnes - 2.7.90-5 - Update to 2.7.90 - Require evolution-data-server-1.7.90.1. From 9fa72a4ad167f793653f4eb642ec41dbd2271ee7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 5 Aug 2006 16:38:17 +0000 Subject: [PATCH 052/844] - Try it again. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 883ebb7..480b4cd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.7.90 -Release: 5 +Release: 6 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -633,7 +633,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Fri Aug 4 2006 Matthew Barnes - 2.7.90-5 +* Fri Aug 4 2006 Matthew Barnes - 2.7.90-6 - Update to 2.7.90 - Require evolution-data-server-1.7.90.1. From bbbbb8533d3738aec9a591f814254ae1cb3e2310 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 7 Aug 2006 20:37:08 +0000 Subject: [PATCH 053/844] - Update to 2.7.91 - Update patch for RH bug #197834 for use with bug-buddy 2.15.90. - Require bug-buddy >= 2.15.90. --- .cvsignore | 2 +- evolution.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1ba3ac5..566931d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.90.tar.bz2 +evolution-2.7.91.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 480b4cd..1e77040 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,3 +1,4 @@ +%define bug_buddy_version 2.15.90 %define dbus_glib_version 0.70 %define dbus_version 0.90 %define eds_version 1.7.90.1 @@ -43,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.7.90 -Release: 6 +Version: 2.7.91 +Release: 1 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -115,6 +116,7 @@ Patch29: evolution-2.7.4-deleting-preedit-buffer.patch ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} +Requires: bug-buddy >= %{bug_buddy_version} Requires: dbus >= %{dbus_version} Requires: evolution-data-server >= %{eds_version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -633,6 +635,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 7 2006 Matthew Barnes - 2.7.91-1 +- Update to 2.7.91 +- Update patch for RH bug #197834 for use with bug-buddy 2.15.90. +- Require bug-buddy >= 2.15.90. + * Fri Aug 4 2006 Matthew Barnes - 2.7.90-6 - Update to 2.7.90 - Require evolution-data-server-1.7.90.1. diff --git a/sources b/sources index ef87e32..3d5f16e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aae1aac8c521aef1aa9dbb1aed9a9f6e evolution-2.7.90.tar.bz2 +c7aa347eb188d53b22941129d9300fb4 evolution-2.7.91.tar.bz2 From 94eedf24e5c034e3f23871493641e6bb54460dee Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 11 Aug 2006 15:06:04 +0000 Subject: [PATCH 054/844] - Add patch for RH bug #197868. --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1e77040..342477b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.91 -Release: 1 +Release: 2 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -113,6 +113,9 @@ Patch28: evolution-2.7.3-submit-bug-report.patch # RH bug #178295 / Gnome.org bug #348638 Patch29: evolution-2.7.4-deleting-preedit-buffer.patch +# RH bug #197868 / Gnome.org bug #350823 +Patch30: evolution-2.7.91-default-mailer.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -245,6 +248,7 @@ Development files needed for building things which link against evolution. %patch27 -p1 -b .replicated-cjk-input %patch28 -p1 -b .submit-bug-report %patch29 -p1 -b .deleting-preedit-buffer +%patch30 -p1 -b .default-mailer mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -635,6 +639,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Aug 11 2006 Matthew Barnes - 2.7.91-2 +- Add patch for RH bug #197868. + * Mon Aug 7 2006 Matthew Barnes - 2.7.91-1 - Update to 2.7.91 - Update patch for RH bug #197834 for use with bug-buddy 2.15.90. From 7fabf7556636744f93ab48dd4e6a74077dfed229 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 Aug 2006 18:59:55 +0000 Subject: [PATCH 055/844] - Consolidate "missing declarations" patches. - Add patch for RH bug #202383. --- evolution.spec | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) diff --git a/evolution.spec b/evolution.spec index 342477b..19f606e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -37,7 +37,7 @@ # 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 require_function_declarations 1 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.91 -Release: 2 +Release: 3 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -85,9 +85,9 @@ Patch16: evolution-2.5.4-fix-conduit-dir.patch 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 +#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 @@ -116,6 +116,11 @@ Patch29: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #197868 / Gnome.org bug #350823 Patch30: evolution-2.7.91-default-mailer.patch +Patch31: evolution-2.7.91-fix-missing-declarations.patch + +# RH bug #202383 +Patch32: evolution-2.7.91-fix-duplicate-alarm.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -236,9 +241,9 @@ Development files needed for building things which link against evolution. #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 +#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 @@ -249,6 +254,8 @@ Development files needed for building things which link against evolution. %patch28 -p1 -b .submit-bug-report %patch29 -p1 -b .deleting-preedit-buffer %patch30 -p1 -b .default-mailer +%patch31 -p1 -b .fix-missing-declarations +%patch32 -p1 -b .fix-duplicate-alarm mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -639,6 +646,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 14 2006 Matthew Barnes - 2.7.91-3 +- Consolidate "missing declarations" patches. +- Add patch for RH bug #202383. + * Fri Aug 11 2006 Matthew Barnes - 2.7.91-2 - Add patch for RH bug #197868. From e56daecf85141f8c7e6d9f2ba1f4ed3aeb98462d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 15 Aug 2006 00:49:04 +0000 Subject: [PATCH 056/844] - Add patch for RH bug #201831. --- evolution.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 19f606e..b5f93a8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.91 -Release: 3 +Release: 4 License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -116,11 +116,15 @@ Patch29: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #197868 / Gnome.org bug #350823 Patch30: evolution-2.7.91-default-mailer.patch +# Gnome.org bug #351332 Patch31: evolution-2.7.91-fix-missing-declarations.patch -# RH bug #202383 +# RH bug #202383 / Gnome.org bug #351263 Patch32: evolution-2.7.91-fix-duplicate-alarm.patch +# RH bug #201831 / Gnome.org bug #350901 +Patch33: evolution-2.7.91-mail-account-disable.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -256,6 +260,7 @@ Development files needed for building things which link against evolution. %patch30 -p1 -b .default-mailer %patch31 -p1 -b .fix-missing-declarations %patch32 -p1 -b .fix-duplicate-alarm +%patch33 -p1 -b .mail-account-disable mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -646,6 +651,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 14 2006 Matthew Barnes - 2.7.91-4 +- Add patch for RH bug #201831. + * Mon Aug 14 2006 Matthew Barnes - 2.7.91-3 - Consolidate "missing declarations" patches. - Add patch for RH bug #202383. From a7f7ae00dc974b2043e7f7b91c74a70199638a78 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 15 Aug 2006 14:55:51 +0000 Subject: [PATCH 057/844] - Drop the bug-buddy dependency since it's not required for Evolution to run. --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b5f93a8..8621b5d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.91 -Release: 4 +Release: 5%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -128,7 +128,6 @@ Patch33: evolution-2.7.91-mail-account-disable.patch ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} -Requires: bug-buddy >= %{bug_buddy_version} Requires: dbus >= %{dbus_version} Requires: evolution-data-server >= %{eds_version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -651,6 +650,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Aug 15 2006 Matthew Barnes - 2.7.91-5.fc6 +- Drop the bug-buddy dependency since it's not required for Evolution to run. + * Mon Aug 14 2006 Matthew Barnes - 2.7.91-4 - Add patch for RH bug #201831. From 97773d33fad92b90cc1777a24e8a3417496fb737 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 21 Aug 2006 18:35:50 +0000 Subject: [PATCH 058/844] - Update to 2.7.92 - Remove patch for RH bug #197834 (fixed upstream). - Update patch for Gnome.org bug #351332 (partially fixed upstream). --- .cvsignore | 2 +- evolution.spec | 37 +++++++++++++++++++++---------------- sources | 2 +- 3 files changed, 23 insertions(+), 18 deletions(-) diff --git a/.cvsignore b/.cvsignore index 566931d..252164e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.91.tar.bz2 +evolution-2.7.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 8621b5d..1c708fa 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.7.91 -Release: 5%{?dist} +Version: 2.7.92 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -107,23 +107,23 @@ Patch26: evolution-2.7.3-filter-datespec.patch # RH bug #166231 / Gnome.org bug #264485 Patch27: evolution-2.7.3-replicated-cjk-input.patch -# RH bug #197834 / Gnome.org bug #346797 -Patch28: evolution-2.7.3-submit-bug-report.patch - # RH bug #178295 / Gnome.org bug #348638 -Patch29: evolution-2.7.4-deleting-preedit-buffer.patch +Patch28: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #197868 / Gnome.org bug #350823 -Patch30: evolution-2.7.91-default-mailer.patch +Patch29: evolution-2.7.91-default-mailer.patch # Gnome.org bug #351332 -Patch31: evolution-2.7.91-fix-missing-declarations.patch +Patch30: evolution-2.7.91-fix-missing-declarations.patch # RH bug #202383 / Gnome.org bug #351263 -Patch32: evolution-2.7.91-fix-duplicate-alarm.patch +Patch31: evolution-2.7.91-fix-duplicate-alarm.patch # RH bug #201831 / Gnome.org bug #350901 -Patch33: evolution-2.7.91-mail-account-disable.patch +Patch32: evolution-2.7.91-mail-account-disable.patch + +# Gnome.org bug #352248 +Patch33: evolution-2.7.91-provide-camel-exception.patch ### Dependencies ### @@ -254,12 +254,12 @@ Development files needed for building things which link against evolution. %patch25 -p1 -b .candidate-window-position-calendar %patch26 -p1 -b .filter-datespec %patch27 -p1 -b .replicated-cjk-input -%patch28 -p1 -b .submit-bug-report -%patch29 -p1 -b .deleting-preedit-buffer -%patch30 -p1 -b .default-mailer -%patch31 -p1 -b .fix-missing-declarations -%patch32 -p1 -b .fix-duplicate-alarm -%patch33 -p1 -b .mail-account-disable +%patch28 -p1 -b .deleting-preedit-buffer +%patch29 -p1 -b .default-mailer +%patch30 -p1 -b .fix-missing-declarations +%patch31 -p1 -b .fix-duplicate-alarm +%patch32 -p1 -b .mail-account-disable +%patch33 -p1 -b .provide-camel-exception mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -650,6 +650,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 21 2006 Matthew Barnes - 2.7.92-1.fc6 +- Update to 2.7.92 +- Remove patch for RH bug #197834 (fixed upstream). +- Update patch for Gnome.org bug #351332 (partially fixed upstream). + * Tue Aug 15 2006 Matthew Barnes - 2.7.91-5.fc6 - Drop the bug-buddy dependency since it's not required for Evolution to run. diff --git a/sources b/sources index 3d5f16e..de453fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c7aa347eb188d53b22941129d9300fb4 evolution-2.7.91.tar.bz2 +2c8e3e26b8861365e61e7a93713a204b evolution-2.7.92.tar.bz2 From 77674f8327cf00eff5c9c42bbf65da13b5deab45 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 21 Aug 2006 18:46:19 +0000 Subject: [PATCH 059/844] - Add patch for Gnome.org bug #352248 (and remember to commit it). --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1c708fa..62d66f2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -650,6 +650,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 21 2006 Matthew Barnes - 2.7.92-2.fc6 +- Add patch for Gnome.org bug #352248 (and remember to commit it). + * Mon Aug 21 2006 Matthew Barnes - 2.7.92-1.fc6 - Update to 2.7.92 - Remove patch for RH bug #197834 (fixed upstream). From 9a2777ea2823a1bf5f6eb3a2b72574718b05a8e2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Aug 2006 20:11:25 +0000 Subject: [PATCH 060/844] - Replace my patch for RH bug #202383 with a better one from upstream. - Add patch for Gnome.org bug #352423. --- evolution.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 62d66f2..9359309 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.92 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -125,6 +125,9 @@ 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 + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -260,6 +263,7 @@ Development files needed for building things which link against evolution. %patch31 -p1 -b .fix-duplicate-alarm %patch32 -p1 -b .mail-account-disable %patch33 -p1 -b .provide-camel-exception +%patch34 -p1 -b .uninitialized-gerror mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -650,6 +654,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Aug 22 2006 Matthew Barnes - 2.7.92-3.fc6 +- Replace my patch for RH bug #202383 with a better one from upstream. +- Add patch for Gnome.org bug #352423. + * Mon Aug 21 2006 Matthew Barnes - 2.7.92-2.fc6 - Add patch for Gnome.org bug #352248 (and remember to commit it). From f8fb78e16919c3353db739c6808c77c3026a2d98 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 23 Aug 2006 18:22:04 +0000 Subject: [PATCH 061/844] - Add patches for Gnome.org bug #352450. --- evolution.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 9359309..a2a01c6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.92 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -128,6 +128,10 @@ Patch33: evolution-2.7.91-provide-camel-exception.patch # Gnome.org bug #352423 Patch34: evolution-2.7.92-uninitialized-gerror.patch +# Gnome.org bug #352450 (2 patches) +Patch35: evolution-2.7.92-deprecated-glib.patch +Patch36: evolution-2.7.92-deprecated-gdk.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -264,6 +268,8 @@ Development files needed for building things which link against evolution. %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 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -654,6 +660,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Aug 23 2006 Matthew Barnes - 2.7.92-4.fc6 +- Add patches for Gnome.org bug #352450. + * Tue Aug 22 2006 Matthew Barnes - 2.7.92-3.fc6 - Replace my patch for RH bug #202383 with a better one from upstream. - Add patch for Gnome.org bug #352423. From 5a837f73f004634853499363c40adb975708a483 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 28 Aug 2006 11:46:25 +0000 Subject: [PATCH 062/844] - Add patch for RH bug #201541. --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index a2a01c6..7083e38 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.92 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -132,6 +132,9 @@ Patch34: evolution-2.7.92-uninitialized-gerror.patch 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 + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -270,6 +273,7 @@ Development files needed for building things which link against evolution. %patch34 -p1 -b .uninitialized-gerror %patch35 -p1 -b .deprecated-glib %patch36 -p1 -b .deprecated-gdk +%patch37 -p1 -b .fix-edit-copy mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -660,6 +664,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 28 2006 Matthew Barnes - 2.7.92-5.fc6 +- Add patch for RH bug #201541. + * Wed Aug 23 2006 Matthew Barnes - 2.7.92-4.fc6 - Add patches for Gnome.org bug #352450. From 1bc562910803c185287ebbf731f4bd5f918e1fae Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 28 Aug 2006 17:23:31 +0000 Subject: [PATCH 063/844] - Add another hunk to the patch for RH bug #201541. - Add patch for RH bug #202289. --- evolution-2.7.92-fix-prgname.patch | 11 +++++++++++ evolution.spec | 10 +++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 evolution-2.7.92-fix-prgname.patch diff --git a/evolution-2.7.92-fix-prgname.patch b/evolution-2.7.92-fix-prgname.patch new file mode 100644 index 0000000..98689f4 --- /dev/null +++ b/evolution-2.7.92-fix-prgname.patch @@ -0,0 +1,11 @@ +--- evolution-2.7.92/shell/main.c.fix-prgname 2006-08-28 11:04:44.000000000 -0400 ++++ evolution-2.7.92/shell/main.c 2006-08-28 11:04:56.000000000 -0400 +@@ -516,7 +516,7 @@ + + g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); + +- program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, ++ program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, + GNOME_PROGRAM_STANDARD_PROPERTIES, + GNOME_PARAM_GOPTION_CONTEXT, context, + GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"), diff --git a/evolution.spec b/evolution.spec index 7083e38..a4d791f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.92 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -135,6 +135,9 @@ Patch36: evolution-2.7.92-deprecated-gdk.patch # RH bug #201541 / Gnome.org bug #336983 Patch37: evolution-2.7.92-fix-edit-copy.patch +# RH bug #202289 +Patch38: evolution-2.7.92-fix-prgname.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -274,6 +277,7 @@ Development files needed for building things which link against evolution. %patch35 -p1 -b .deprecated-glib %patch36 -p1 -b .deprecated-gdk %patch37 -p1 -b .fix-edit-copy +%patch38 -p1 -b .fix-prgname mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -664,6 +668,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 28 2006 Matthew Barnes - 2.7.92-6.fc6 +- Add another hunk to the patch for RH bug #201541. +- Add patch for RH bug #202289. + * Mon Aug 28 2006 Matthew Barnes - 2.7.92-5.fc6 - Add patch for RH bug #201541. From f3c32bc0930b9c92ee4e8bfdcc600cf0bf940c1f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 29 Aug 2006 21:57:17 +0000 Subject: [PATCH 064/844] - Add patch for Gnome.org bug #353472. --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index a4d791f..963fd65 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.7.92 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -138,6 +138,9 @@ Patch37: evolution-2.7.92-fix-edit-copy.patch # RH bug #202289 Patch38: evolution-2.7.92-fix-prgname.patch +# Gnome.org bug #353472 +Patch39: evolution-2.7.92-chain-finalize.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -278,6 +281,7 @@ Development files needed for building things which link against evolution. %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 @@ -668,6 +672,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Aug 29 2006 Matthew Barnes - 2.7.92-7.fc6 +- Add patch for Gnome.org bug #353472. + * Mon Aug 28 2006 Matthew Barnes - 2.7.92-6.fc6 - Add another hunk to the patch for RH bug #201541. - Add patch for RH bug #202289. From 570e585f7b98a393c75cd0f56e3347731918e39b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 5 Sep 2006 11:48:57 +0000 Subject: [PATCH 065/844] - 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). --- .cvsignore | 2 +- evolution.spec | 105 +++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 46 insertions(+), 63 deletions(-) diff --git a/.cvsignore b/.cvsignore index 252164e..b2067f5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.7.92.tar.bz2 +evolution-2.8.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 963fd65..6af4650 100644 --- a/evolution.spec +++ b/evolution.spec @@ -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 @@ Patch16: evolution-2.5.4-fix-conduit-dir.patch # 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 @@ Development files needed for building things which link against evolution. #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 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Sep 4 2006 Matthew Barnes - 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 - 2.7.92-8.fc6 +- Add patch for RH bug #203036. +- Disable notification-cleanups patch. + * Tue Aug 29 2006 Matthew Barnes - 2.7.92-7.fc6 - Add patch for Gnome.org bug #353472. diff --git a/sources b/sources index de453fa..2e05537 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c8e3e26b8861365e61e7a93713a204b evolution-2.7.92.tar.bz2 +fdcdaa4f6c11cb3b42078262838967d7 evolution-2.8.0.tar.bz2 From af848a0cf840958a5e5d2bf08a4a65481200dd31 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 13 Sep 2006 16:16:43 +0000 Subject: [PATCH 066/844] - Add patch for RH bug #201307. --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 6af4650..27d11cf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.8.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -118,6 +118,9 @@ Patch29: evolution-2.7.92-chain-finalize.patch # Gnome.org bug #351332 Patch30: evolution-2.8.0-fix-missing-declarations.patch +# RH bug #201307 / Gnome.org bug #350565 +Patch31: evolution-2.8.0-search-on-folder-change.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -250,6 +253,7 @@ Development files needed for building things which link against evolution. %patch28 -p1 -b .fix-prgname %patch29 -p1 -b .chain-finalize %patch30 -p1 -b .fix-missing-declarations +%patch31 -p1 -b .search-on-folder-change mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -640,6 +644,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Sep 13 2006 Matthew Barnes - 2.8.0-2.fc6 +- Add patch for RH bug #201307. + * Mon Sep 4 2006 Matthew Barnes - 2.8.0-1.fc6 - Update to 2.8.0 - Remove patch for RH bug #197868 (fixed upstream). From 13b7ded0c937cb26dbf2ef62b604efbd14c6d3bb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 13 Sep 2006 20:01:20 +0000 Subject: [PATCH 067/844] - Add patch for RH bug #161885. --- evolution-2.8.0-indic-cursor-movement.patch | 117 ++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 125 insertions(+), 1 deletion(-) create mode 100644 evolution-2.8.0-indic-cursor-movement.patch diff --git a/evolution-2.8.0-indic-cursor-movement.patch b/evolution-2.8.0-indic-cursor-movement.patch new file mode 100644 index 0000000..6e5a95f --- /dev/null +++ b/evolution-2.8.0-indic-cursor-movement.patch @@ -0,0 +1,117 @@ +--- evolution-2.8.0/widgets/text/e-text.c.indic-cursor-movement 2006-09-13 14:53:39.000000000 -0400 ++++ evolution-2.8.0/widgets/text/e-text.c 2006-09-13 14:53:48.000000000 -0400 +@@ -2876,6 +2876,76 @@ + } + } + ++ ++ ++/* direction = TRUE (move forward), FALSE (move backward) ++ Any error shall return length(text->text) or 0 or text->selection_end (as deemed fit) */ ++static int ++_get_updated_position (EText *text, gboolean direction) ++{ ++ PangoLogAttr *log_attrs = NULL; ++ gint n_attrs; ++ char *p = NULL; ++ gint new_pos = 0; ++ gint length = 0; ++ ++ /* Basic sanity test, return whatever position we are currently at. */ ++ g_return_val_if_fail (text->layout != NULL, text->selection_end); ++ ++ length = g_utf8_strlen (text->text, -1); ++ ++ /* length checks to make sure we are not wandering off into nonexistant memory... */ ++ if((text->selection_end >= length) && (TRUE == direction)) /* forward */ ++ return length; ++ /* checking for -ve value wont hurt! */ ++ if((text->selection_end <= 0) && (FALSE == direction)) /* backward */ ++ return 0; ++ ++ /* check for validness of full text->text */ ++ if(!g_utf8_validate(text->text, -1, NULL)) ++ return text->selection_end; ++ ++ /* get layout's PangoLogAttr to facilitate moving when moving across grapheme cluster as in indic langs */ ++ pango_layout_get_log_attrs (text->layout, &log_attrs, &n_attrs); ++ ++ /* Fetch the current char index in the line & keep moving ++ forward until we can display cursor */ ++ p = g_utf8_offset_to_pointer (text->text, text->selection_end); ++ ++ new_pos = text->selection_end; ++ while(1) ++ { ++ /* check before moving forward/backwards if we have more chars to move or not */ ++ if(TRUE == direction) ++ p = g_utf8_next_char (p); ++ else ++ p = g_utf8_prev_char (p); ++ ++ /* validate the new string & return with original position if check fails */ ++ if(!g_utf8_validate (p, -1, NULL)) ++ break; /* will return old value of new_pos */ ++ ++ new_pos = g_utf8_pointer_to_offset (text->text, p); ++ ++ /* if is_cursor_position is set, cursor can appear in front of character. ++ i.e. this is a grapheme boundary AND make some sanity checks */ ++ if((new_pos >=0) && (new_pos < n_attrs) && (log_attrs[new_pos].is_cursor_position)) ++ break; ++ else if((new_pos < 0) || (new_pos >= n_attrs)) ++ { ++ new_pos = text->selection_end; ++ break; ++ } ++ } ++ ++ if(log_attrs) ++ g_free(log_attrs); ++ ++ return new_pos; ++} ++ ++ ++ + static int + _get_position(EText *text, ETextEventProcessorCommand *command) + { +@@ -2951,15 +3021,14 @@ + if (text->selection_end >= length) + new_pos = length; + else +- new_pos = text->selection_end + 1; +- ++ new_pos = _get_updated_position(text, TRUE); /* get updated position to display cursor */ ++ + break; + + case E_TEP_BACKWARD_CHARACTER: + new_pos = 0; +- if (text->selection_end >= 1) { +- new_pos = text->selection_end - 1; +- } ++ if (text->selection_end >= 1) ++ new_pos = _get_updated_position(text, FALSE); /* get updated position to display cursor */ + + break; + +@@ -3341,6 +3410,7 @@ + if (!text->layout) + create_layout (text); + ++ /* We move cursor only if scroll is TRUE */ + if (scroll && !text->button_down) { + /* XXX do we really need the @trailing logic here? if + we don't we can scrap the loop and just use +@@ -3349,7 +3419,9 @@ + int selection_index; + PangoLayoutIter *iter = pango_layout_get_iter (text->layout); + ++ /* check if we are using selection_start or selection_end for moving? */ + selection_index = use_start ? text->selection_start : text->selection_end; ++ + /* convert to a byte index */ + selection_index = g_utf8_offset_to_pointer (text->text, selection_index) - text->text; + diff --git a/evolution.spec b/evolution.spec index 27d11cf..133e771 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.8.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -121,6 +121,9 @@ Patch30: evolution-2.8.0-fix-missing-declarations.patch # RH bug #201307 / Gnome.org bug #350565 Patch31: evolution-2.8.0-search-on-folder-change.patch +# RH bug #161885 / Gnome.org bug #309166 +Patch32: evolution-2.8.0-indic-cursor-movement.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -254,6 +257,7 @@ Development files needed for building things which link against evolution. %patch29 -p1 -b .chain-finalize %patch30 -p1 -b .fix-missing-declarations %patch31 -p1 -b .search-on-folder-change +%patch32 -p1 -b .indic-cursor-movement mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -644,6 +648,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Sep 13 2006 Matthew Barnes - 2.8.0-3.fc6 +- Add patch for RH bug #161885. + * Wed Sep 13 2006 Matthew Barnes - 2.8.0-2.fc6 - Add patch for RH bug #201307. From f0fae97b3e6641127fd14e07358dc36e5a1a6131 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 19 Sep 2006 19:34:29 +0000 Subject: [PATCH 068/844] - Bump eds_version to 1.8.0. --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 133e771..a4c55dd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,7 +1,7 @@ %define bug_buddy_version 2.15.90 %define dbus_glib_version 0.70 %define dbus_version 0.90 -%define eds_version 1.7.90.1 +%define eds_version 1.8.0 %define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 %define gnomevfs2_version 2.4 @@ -45,7 +45,7 @@ Name: evolution Version: 2.8.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -648,6 +648,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Sep 19 2006 Matthew Barnes - 2.8.0-4.fc6 +- Bump eds_version to 1.8.0. + * Wed Sep 13 2006 Matthew Barnes - 2.8.0-3.fc6 - Add patch for RH bug #161885. From 7cd9caac761fc627d88e6eff9abf24b348646980 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 20 Sep 2006 16:22:02 +0000 Subject: [PATCH 069/844] - Add patch for Gnome.org bug #356811 (lingering file on uninstall). --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index a4c55dd..76f7a1d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.8.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -124,6 +124,9 @@ Patch31: evolution-2.8.0-search-on-folder-change.patch # RH bug #161885 / Gnome.org bug #309166 Patch32: evolution-2.8.0-indic-cursor-movement.patch +# Gnome.org bug #356811 +Patch33: evolution-2.8.0-uninstall.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -258,6 +261,7 @@ Development files needed for building things which link against evolution. %patch30 -p1 -b .fix-missing-declarations %patch31 -p1 -b .search-on-folder-change %patch32 -p1 -b .indic-cursor-movement +%patch33 -p1 -b .uninstall mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -648,6 +652,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Sep 20 2006 Matthew Barnes - 2.8.0-5.fc6 +- Add patch for Gnome.org bug #356811 (lingering file on uninstall). + * Tue Sep 19 2006 Matthew Barnes - 2.8.0-4.fc6 - Bump eds_version to 1.8.0. From 00f77cf2e250ff468fd56c0eff7acf5d9aec4084 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 21 Sep 2006 21:33:21 +0000 Subject: [PATCH 070/844] - Add patch for RH bug #205576 (message deletion in thread view). --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 76f7a1d..09b64cc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.8.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -127,6 +127,9 @@ Patch32: evolution-2.8.0-indic-cursor-movement.patch # Gnome.org bug #356811 Patch33: evolution-2.8.0-uninstall.patch +# RH bug #205576 / Gnome.org bug #352982 +Patch34: evolution-2.8.0-fix-message-deletion.patch + ### Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -262,6 +265,7 @@ Development files needed for building things which link against evolution. %patch31 -p1 -b .search-on-folder-change %patch32 -p1 -b .indic-cursor-movement %patch33 -p1 -b .uninstall +%patch34 -p1 -b .fix-message-deletion mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -652,6 +656,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Sep 21 2006 Matthew Barnes - 2.8.0-6.fc6 +- Add patch for RH bug #205576 (message deletion in thread view). + * Wed Sep 20 2006 Matthew Barnes - 2.8.0-5.fc6 - Add patch for Gnome.org bug #356811 (lingering file on uninstall). From 599d12e3001fc555f14da0e8197ba61429b0ce8b Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Sun, 1 Oct 2006 21:16:18 +0000 Subject: [PATCH 071/844] bump for gcc bug --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 09b64cc..bbf1cd5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.8.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -656,6 +656,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sun Oct 01 2006 Jesse Keating - 2.8.0-7.fc6 +- rebuilt for unwind info generation, broken in gcc-4.1.1-21 + * Thu Sep 21 2006 Matthew Barnes - 2.8.0-6.fc6 - Add patch for RH bug #205576 (message deletion in thread view). From 829392f14fef25df23fba73f0509485f37e6f1cf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 Oct 2006 19:21:38 +0000 Subject: [PATCH 072/844] - Update to 2.8.1 - Use stricter build settings. - Make .desktop symlinks absolute (RH bug #209322). - Add patch for RH bug #202751 (printing of indic languages). - Add patch for Gnome.org bug #357970 (deprecated GLib / GDK symbols). - Add patch for Gnome.org bug #359236 (search state crash). - Add patch for Gnome.org bug #360240 ("unused variable" warnings). - Add patch for Gnome.org bug #360619 ("incompatible pointer type" warnings). - Add patch for Gnome.org bug #360946 (improved "about" dialog). - Add patch for Gnome.org bug #362638 (deprecate EThread). - Update patch for RH bug #211058 (partially fixed upstream). - Remove patch for RH bug #201307 (fixed upstream). - Remove patch for RH bug #205576 (fixed upstream). - Remove patch for Gnome.org bug #351332 (fixed upstream). - Remove patch for Gnome.org bug #352450 (fixed upstream). - Remove patch for Gnome.org bug #353472 (fixed upstream). - Remove patch for Gnome.org bug #356811 (fixed upstream). --- .cvsignore | 2 +- evolution-2.7.3-filter-datespec.patch | 250 ----------------------- evolution-2.8.0-fix-indic-printing.patch | 82 ++++++++ evolution.spec | 125 +++++++----- sources | 2 +- 5 files changed, 160 insertions(+), 301 deletions(-) create mode 100644 evolution-2.8.0-fix-indic-printing.patch diff --git a/.cvsignore b/.cvsignore index b2067f5..8bd48e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.8.0.tar.bz2 +evolution-2.8.1.tar.bz2 diff --git a/evolution-2.7.3-filter-datespec.patch b/evolution-2.7.3-filter-datespec.patch index a5c7bdf..000adb1 100644 --- a/evolution-2.7.3-filter-datespec.patch +++ b/evolution-2.7.3-filter-datespec.patch @@ -176,253 +176,3 @@ diff -ur evolution-2.7.3/filter/filter-datespec.h my-evolution-2.7.3/filter/filt */ time_t value; -diff -ur evolution-2.7.3/filter/filter.glade my-evolution-2.7.3/filter/filter.glade ---- evolution-2.7.3/filter/filter.glade 2005-12-20 11:21:51.000000000 -0700 -+++ my-evolution-2.7.3/filter/filter.glade 2006-06-28 17:26:00.000000000 -0600 -@@ -12,6 +12,13 @@ - False - True - False -+ True -+ False -+ False -+ GDK_WINDOW_TYPE_HINT_NORMAL -+ GDK_GRAVITY_NORTH_WEST -+ True -+ False - - - -@@ -21,7 +28,7 @@ - 6 - - -- -+ - True - Show filters for mail: - False -@@ -33,6 +40,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - 0 -@@ -86,6 +97,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - 0 -@@ -113,6 +128,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - 0 -@@ -162,6 +181,7 @@ - gtk-add - True - GTK_RELIEF_NORMAL -+ True - - - -@@ -173,6 +193,7 @@ - _Edit - True - GTK_RELIEF_NORMAL -+ True - - - -@@ -184,6 +205,7 @@ - gtk-remove - True - GTK_RELIEF_NORMAL -+ True - - - -@@ -195,6 +217,7 @@ - gtk-goto-top - True - GTK_RELIEF_NORMAL -+ True - - - -@@ -206,6 +229,7 @@ - gtk-go-up - True - GTK_RELIEF_NORMAL -+ True - - - -@@ -217,6 +241,7 @@ - gtk-go-down - True - GTK_RELIEF_NORMAL -+ True - - - -@@ -228,6 +253,7 @@ - gtk-goto-bottom - True - GTK_RELIEF_NORMAL -+ True - - - -@@ -278,6 +304,13 @@ - False - True - False -+ True -+ False -+ False -+ GDK_WINDOW_TYPE_HINT_NORMAL -+ GDK_GRAVITY_NORTH_WEST -+ True -+ False - - - -@@ -305,6 +338,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - 0 -@@ -403,6 +440,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - 0 -@@ -430,6 +471,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - tab -@@ -456,6 +501,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - 0 -@@ -496,6 +545,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - tab -@@ -522,6 +575,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - 0 -@@ -631,18 +688,32 @@ - - - -- -+ - True -- ago -- False -- False -- GTK_JUSTIFY_CENTER -- False -- False -- 7.45058e-09 -- 0.5 -- 0 -- 0 -+ True -+ 0 -+ -+ -+ -+ True -+ -+ -+ -+ True -+ ago -+ True -+ -+ -+ -+ -+ -+ True -+ in the future -+ True -+ -+ -+ -+ - - - 0 -@@ -677,6 +748,10 @@ - 0.5 - 0 - 0 -+ PANGO_ELLIPSIZE_NONE -+ -1 -+ False -+ 0 - - - tab diff --git a/evolution-2.8.0-fix-indic-printing.patch b/evolution-2.8.0-fix-indic-printing.patch new file mode 100644 index 0000000..ed42520 --- /dev/null +++ b/evolution-2.8.0-fix-indic-printing.patch @@ -0,0 +1,82 @@ +--- evolution-2.8.1/plugins/print-message/print-message.c.fix-indic-printing 2005-08-23 23:14:10.000000000 -0400 ++++ evolution-2.8.1/plugins/print-message/print-message.c 2006-10-10 10:35:17.000000000 -0400 +@@ -83,7 +83,8 @@ + data->config = e_print_load_config (); + data->preview = 0; + +- data->msg = e_msg_composer_get_message (composer, 1); ++ data->msg = e_msg_composer_get_message_print (composer, TRUE); ++ + dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config); + gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT); + e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer); +@@ -104,7 +105,7 @@ + data->config = e_print_load_config (); + data->preview = 0; + +- data->msg = e_msg_composer_get_message (composer, 1); ++ data->msg = e_msg_composer_get_message_print (composer, TRUE); + + print_response(NULL, GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, data); + } +--- evolution-2.8.1/composer/e-msg-composer.h.fix-indic-printing 2005-12-07 03:29:51.000000000 -0500 ++++ evolution-2.8.1/composer/e-msg-composer.h 2006-10-10 10:35:17.000000000 -0400 +@@ -94,6 +94,8 @@ + const char *filename); + void e_msg_composer_add_inline_image_from_mime_part (EMsgComposer *composer, + CamelMimePart *part); ++CamelMimeMessage *e_msg_composer_get_message_print (EMsgComposer *composer, ++ gboolean save_html_object_data); + CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer, + gboolean save_html_object_data); + CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer); +--- evolution-2.8.1/composer/e-msg-composer.c.fix-indic-printing 2006-10-10 10:34:38.000000000 -0400 ++++ evolution-2.8.1/composer/e-msg-composer.c 2006-10-10 10:35:17.000000000 -0400 +@@ -5162,6 +5162,38 @@ + } + } + ++/* Stub for helping in printing of mails */ ++CamelMimeMessage * ++e_msg_composer_get_message_print (EMsgComposer *composer, gboolean save_html_object_data) ++{ ++ CamelMimeMessage *msg; ++ gboolean old_flags[4]; ++ gboolean old_send_html; ++ EMsgComposerPrivate *p = composer->priv; ++ ++ /* create printable mail as HTML */ ++ old_send_html = p->send_html; ++ p->send_html = TRUE; ++ old_flags[0] = p->pgp_sign; ++ p->pgp_sign = FALSE; ++ old_flags[1] = p->pgp_encrypt; ++ p->pgp_encrypt = FALSE; ++ old_flags[2] = p->smime_sign; ++ p->smime_sign = FALSE; ++ old_flags[3] = p->smime_encrypt; ++ p->smime_encrypt = FALSE; ++ ++ msg = build_message (composer, save_html_object_data); ++ ++ /* Revert back message's original settings */ ++ p->send_html = old_send_html; ++ p->pgp_sign = old_flags[0]; ++ p->pgp_encrypt = old_flags[1]; ++ p->smime_sign = old_flags[2]; ++ p->smime_encrypt = old_flags[3]; ++ ++ return msg; ++} + + /** + * e_msg_composer_get_message: +@@ -5183,7 +5215,7 @@ + } + } + +- return build_message (composer, save_html_object_data); ++ return e_msg_composer_get_message_print (composer, save_html_object_data); + } + + CamelMimeMessage * diff --git a/evolution.spec b/evolution.spec index bbf1cd5..3cd9972 100644 --- a/evolution.spec +++ b/evolution.spec @@ -34,18 +34,16 @@ %endif %define use_mozilla_nss 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 1 +# Use stricter build settings than required by upstream. +%define strict_build_settings 1 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins ### Abstract ### Name: evolution -Version: 2.8.0 -Release: 7%{?dist} +Version: 2.8.1 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -105,32 +103,37 @@ Patch24: evolution-2.7.3-replicated-cjk-input.patch # RH bug #178295 / Gnome.org bug #348638 Patch25: evolution-2.7.4-deleting-preedit-buffer.patch -# Gnome.org bug #352450 (2 patches) -Patch26: evolution-2.7.92-deprecated-glib.patch -Patch27: evolution-2.7.92-deprecated-gdk.patch - # RH bug #202289 -Patch28: evolution-2.7.92-fix-prgname.patch - -# Gnome.org bug #353472 -Patch29: evolution-2.7.92-chain-finalize.patch - -# Gnome.org bug #351332 -Patch30: evolution-2.8.0-fix-missing-declarations.patch - -# RH bug #201307 / Gnome.org bug #350565 -Patch31: evolution-2.8.0-search-on-folder-change.patch +Patch26: evolution-2.7.92-fix-prgname.patch # RH bug #161885 / Gnome.org bug #309166 -Patch32: evolution-2.8.0-indic-cursor-movement.patch +Patch27: evolution-2.8.0-indic-cursor-movement.patch -# Gnome.org bug #356811 -Patch33: evolution-2.8.0-uninstall.patch +# Gnome.org bug #357216 +Patch28: evolution-2.8.0-deprecated-gdk-font.patch -# RH bug #205576 / Gnome.org bug #352982 -Patch34: evolution-2.8.0-fix-message-deletion.patch +# Gnome.org bug #357970 +Patch29: evolution-2.8.0-more-deprecated.patch -### Dependencies ### +# RH bug #202751 / Gnome.org bug #355766 +Patch30: evolution-2.8.0-fix-indic-printing.patch + +# Gnome.org bug #359236 +Patch31: evolution-2.8.1-fix-search-state-crash.patch + +# Gnome.org bug #360240 +Patch32: evolution-2.8.1-warn-unused-variable.patch + +# Gnome.org bug #360619 +Patch33: evolution-2.8.1-warn-incompatible-pointer-type.patch + +# Gnome.org bug #360946 +Patch34: evolution-2.8.1-about-dialog.patch + +# Gnome.org bug #362638 +Patch35: evolution-2.8.1-ethread.patch + +## Dependencies ### Requires: ORBit2 >= %{orbit2_version} Requires: dbus >= %{dbus_version} @@ -257,15 +260,16 @@ Development files needed for building things which link against evolution. %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 .search-on-folder-change -%patch32 -p1 -b .indic-cursor-movement -%patch33 -p1 -b .uninstall -%patch34 -p1 -b .fix-message-deletion +%patch26 -p1 -b .fix-prgname +%patch27 -p1 -b .indic-cursor-movement +%patch28 -p1 -b .deprecated-gdk-font +%patch29 -p1 -b .more-deprecated +%patch30 -p1 -b .fix-indic-printing +%patch31 -p1 -b .fix-search-state-crash +%patch32 -p1 -b .warn-unused-variable +%patch33 -p1 -b .warn-incompatible-pointer-type +%patch34 -p1 -b .about-dialog +%patch35 -p1 -b .ethread mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -325,6 +329,21 @@ if pkg-config openssl ; then fi %endif +# Add stricter build settings here as the source code gets cleaned up. +# We want to make sure things like compiler warnings and avoiding deprecated +# functions in the GNOME/GTK+ libraries stay fixed. +# +# Please file a bug report at bugzilla.gnome.org if these settings break +# compilation, and encourage the upstream developers to use them. + +%if %{strict_build_settings} +CFLAGS="$CFLAGS \ + -DG_DISABLE_DEPRECATED=1 \ + -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ + -DGDK_DISABLE_DEPRECATED=1 \ + -Werror-implicit-function-declaration" +%endif + # Rerun the GNU Autotools since we patched some of the input files. aclocal autoheader @@ -343,13 +362,7 @@ autoconf %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ --enable-plugins=all export tagname=CC - -# Do the make, with various flags: -%if %{require_function_declarations} -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -Werror-implicit-function-declaration -UGNOME_DISABLE_DEPRECATED" -%else make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" -%endif %install rm -rf $RPM_BUILD_ROOT @@ -378,14 +391,9 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la rm -rf $RPM_BUILD_ROOT/var/scrollkeeper # evolution is the preferred email app -ln -sf ../desktop-menu-patches/redhat-evolution-mail.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-calendar.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-contacts.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/ -ln -sf ../desktop-menu-patches/redhat-evolution-tasks.desktop \ - $RPM_BUILD_ROOT/%{_datadir}/applications/ +for desktopfile in %{_datadir}/desktop-menu-patches/*-evolution-*.desktop; do + ln -sf $desktopfile $RPM_BUILD_ROOT/%{_datadir}/applications/ +done # remove upstream desktop file; use the symlinks from above (#103826) rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop @@ -656,6 +664,25 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Oct 4 2006 Matthew Barnes - 2.8.1-1.fc7 +- Update to 2.8.1 +- Use stricter build settings. +- Make .desktop symlinks absolute (RH bug #209322). +- Add patch for RH bug #202751 (printing of indic languages). +- Add patch for Gnome.org bug #357970 (deprecated GLib / GDK symbols). +- Add patch for Gnome.org bug #359236 (search state crash). +- Add patch for Gnome.org bug #360240 ("unused variable" warnings). +- Add patch for Gnome.org bug #360619 ("incompatible pointer type" warnings). +- Add patch for Gnome.org bug #360946 (improved "about" dialog). +- Add patch for Gnome.org bug #362638 (deprecate EThread). +- Update patch for RH bug #211058 (partially fixed upstream). +- Remove patch for RH bug #201307 (fixed upstream). +- Remove patch for RH bug #205576 (fixed upstream). +- Remove patch for Gnome.org bug #351332 (fixed upstream). +- Remove patch for Gnome.org bug #352450 (fixed upstream). +- Remove patch for Gnome.org bug #353472 (fixed upstream). +- Remove patch for Gnome.org bug #356811 (fixed upstream). + * Sun Oct 01 2006 Jesse Keating - 2.8.0-7.fc6 - rebuilt for unwind info generation, broken in gcc-4.1.1-21 diff --git a/sources b/sources index 2e05537..fd19c09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fdcdaa4f6c11cb3b42078262838967d7 evolution-2.8.0.tar.bz2 +6a08d1121bc126c4ed7035ab94a09871 evolution-2.8.1.tar.bz2 From 858b611e578988c6b74963a5f8f9c64c03e1f7fa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 Oct 2006 19:26:33 +0000 Subject: [PATCH 073/844] - Forgot to check-in one of the patches. --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 3cd9972..6c7fb54 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.8.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -664,6 +664,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Oct 4 2006 Matthew Barnes - 2.8.1-2.fc7 +- Forgot to check-in one of the patches. + * Mon Oct 4 2006 Matthew Barnes - 2.8.1-1.fc7 - Update to 2.8.1 - Use stricter build settings. From dde02912ea3042082247f45f57df17170c1c0759 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 Oct 2006 20:20:46 +0000 Subject: [PATCH 074/844] - Fix a typo in setting up .desktop symlinks. --- evolution.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6c7fb54..7844caa 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.8.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -391,7 +391,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la rm -rf $RPM_BUILD_ROOT/var/scrollkeeper # evolution is the preferred email app -for desktopfile in %{_datadir}/desktop-menu-patches/*-evolution-*.desktop; do +for desktopfile in $RPM_BUILD_ROOT/%{_datadir}/desktop-menu-patches/*-evolution-*.desktop; do ln -sf $desktopfile $RPM_BUILD_ROOT/%{_datadir}/applications/ done @@ -664,10 +664,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Mon Oct 4 2006 Matthew Barnes - 2.8.1-2.fc7 +* Mon Oct 16 2006 Matthew Barnes - 2.8.1-3.fc7 +- Fix a typo in setting up .desktop symlinks. + +* Mon Oct 16 2006 Matthew Barnes - 2.8.1-2.fc7 - Forgot to check-in one of the patches. -* Mon Oct 4 2006 Matthew Barnes - 2.8.1-1.fc7 +* Mon Oct 16 2006 Matthew Barnes - 2.8.1-1.fc7 - Update to 2.8.1 - Use stricter build settings. - Make .desktop symlinks absolute (RH bug #209322). From 00d15aa2068a9360cd5e423eaaf2d73441434cdd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 Oct 2006 20:57:35 +0000 Subject: [PATCH 075/844] - Another typo. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7844caa..2297597 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.8.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -391,8 +391,8 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la rm -rf $RPM_BUILD_ROOT/var/scrollkeeper # evolution is the preferred email app -for desktopfile in $RPM_BUILD_ROOT/%{_datadir}/desktop-menu-patches/*-evolution-*.desktop; do - ln -sf $desktopfile $RPM_BUILD_ROOT/%{_datadir}/applications/ +for desktopfile in $RPM_BUILD_ROOT%{_datadir}/desktop-menu-patches/*-evolution-*.desktop; do + ln -sf $desktopfile $RPM_BUILD_ROOT%{_datadir}/applications/ done # remove upstream desktop file; use the symlinks from above (#103826) @@ -664,6 +664,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Oct 16 2006 Matthew Barnes - 2.8.1-4.fc7 +- Another typo. + * Mon Oct 16 2006 Matthew Barnes - 2.8.1-3.fc7 - Fix a typo in setting up .desktop symlinks. From 4501bb6f683b93bfaaaf05087547e58954880c08 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 17 Oct 2006 02:35:05 +0000 Subject: [PATCH 076/844] - Update to 2.9.1 - Bump eds_version to 1.9.1, evo_major to 2.10. - Remove patch for Gnome.org bug #359236 (fixed upstream). --- .cvsignore | 2 +- evolution.spec | 30 ++++++++++++++++++------------ sources | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8bd48e1..23cc717 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.8.1.tar.bz2 +evolution-2.9.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 2297597..92a31bf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,7 +1,7 @@ %define bug_buddy_version 2.15.90 %define dbus_glib_version 0.70 %define dbus_version 0.90 -%define eds_version 1.8.0 +%define eds_version 1.9.1 %define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 %define gnomevfs2_version 2.4 @@ -14,7 +14,7 @@ %define redhat_menus_version 5.0.4 %define soup_version 2.2.2 -%define evo_major 2.8 +%define evo_major 2.10 %define exchange_support 1 %define inline_audio_support 0 @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.8.1 -Release: 4%{?dist} +Version: 2.9.1 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -118,9 +118,6 @@ Patch29: evolution-2.8.0-more-deprecated.patch # RH bug #202751 / Gnome.org bug #355766 Patch30: evolution-2.8.0-fix-indic-printing.patch -# Gnome.org bug #359236 -Patch31: evolution-2.8.1-fix-search-state-crash.patch - # Gnome.org bug #360240 Patch32: evolution-2.8.1-warn-unused-variable.patch @@ -265,7 +262,6 @@ Development files needed for building things which link against evolution. %patch28 -p1 -b .deprecated-gdk-font %patch29 -p1 -b .more-deprecated %patch30 -p1 -b .fix-indic-printing -%patch31 -p1 -b .fix-search-state-crash %patch32 -p1 -b .warn-unused-variable %patch33 -p1 -b .warn-incompatible-pointer-type %patch34 -p1 -b .about-dialog @@ -390,10 +386,15 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la # scrollkeeper gets handled in %post rm -rf $RPM_BUILD_ROOT/var/scrollkeeper -# evolution is the preferred email app -for desktopfile in $RPM_BUILD_ROOT%{_datadir}/desktop-menu-patches/*-evolution-*.desktop; do - ln -sf $desktopfile $RPM_BUILD_ROOT%{_datadir}/applications/ -done +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications +ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-mail.desktop +ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-calendar.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-calendar.desktop +ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-contacts.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-contacts.desktop +ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \ + $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop # remove upstream desktop file; use the symlinks from above (#103826) rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop @@ -664,6 +665,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Oct 16 2006 Matthew Barnes - 2.9.1-1.fc7 +- Update to 2.9.1 +- Bump eds_version to 1.9.1, evo_major to 2.10. +- Remove patch for Gnome.org bug #359236 (fixed upstream). + * Mon Oct 16 2006 Matthew Barnes - 2.8.1-4.fc7 - Another typo. diff --git a/sources b/sources index fd19c09..b27a08e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a08d1121bc126c4ed7035ab94a09871 evolution-2.8.1.tar.bz2 +e7e6492d80a7405bd34568fc78074cbe evolution-2.9.1.tar.bz2 From ad2b69c948f532f41e5e4ff67f11a53d11ae0be9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 27 Oct 2006 22:27:55 +0000 Subject: [PATCH 077/844] - Add patch for Gnome.org bug #356177 (deprecate EMutex). - Add patch for Gnome.org bug #363695 (deprecate EStrv/EPoolv). - Disable patch for RH bug #202751 (unwanted side-effects). --- evolution-2.8.1-kill-ethread.patch | 2003 ++++++++++++++++++++++++++++ evolution-2.9.1-kill-ememory.patch | 299 +++++ evolution.spec | 33 +- 3 files changed, 2325 insertions(+), 10 deletions(-) create mode 100644 evolution-2.8.1-kill-ethread.patch create mode 100644 evolution-2.9.1-kill-ememory.patch diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch new file mode 100644 index 0000000..e91d3b1 --- /dev/null +++ b/evolution-2.8.1-kill-ethread.patch @@ -0,0 +1,2003 @@ +--- evolution-2.9.1/mail/mail-send-recv.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 ++++ evolution-2.9.1/mail/mail-send-recv.c 2006-10-26 14:24:55.000000000 -0400 +@@ -817,7 +817,7 @@ + m->folders = folders; + m->info = sinfo; + +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } else { + receive_done ("", data); + } +--- evolution-2.9.1/mail/mail-component.c.kill-ethread 2006-09-04 06:36:49.000000000 -0400 ++++ evolution-2.9.1/mail/mail-component.c 2006-10-26 14:24:55.000000000 -0400 +@@ -964,7 +964,7 @@ + if (camel_url_get_param(url, "uid") != NULL) { + char *curi = em_uri_to_camel(uri); + +- mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); ++ mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); + g_free(curi); + } else { + g_warning("email uri's must include a uid parameter"); +--- evolution-2.9.1/mail/mail-ops.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 ++++ evolution-2.9.1/mail/mail-ops.c 2006-10-26 14:24:55.000000000 -0400 +@@ -221,7 +221,7 @@ + camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); + } + +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + /* convenience functions for it */ +@@ -426,7 +426,7 @@ + if (status) + camel_filter_driver_set_status_func (fm->driver, status, status_data); + +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + /* ********************************************************************** */ +@@ -839,7 +839,7 @@ + m->driver = camel_session_get_filter_driver (session, type, NULL); + camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); + +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + /* ** APPEND MESSAGE TO FOLDER ******************************************** */ +@@ -921,7 +921,7 @@ + m->done = done; + m->data = data; + +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + /* ** TRANSFER MESSAGES **************************************************** */ +@@ -1036,7 +1036,7 @@ + m->done = done; + m->data = data; + +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + } + + /* ** SCAN SUBFOLDERS ***************************************************** */ +@@ -1124,7 +1124,7 @@ + m->data = data; + id = m->msg.seq; + +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + + return id; + } +@@ -1250,7 +1250,7 @@ + int + mail_get_folder (const char *uri, guint32 flags, + void (*done)(char *uri, CamelFolder *folder, void *data), +- void *data, EThread *thread) ++ void *data, MailMsgDispatchFunc dispatch) + { + struct _get_folder_msg *m; + int id; +@@ -1262,7 +1262,7 @@ + m->done = done; + + id = m->msg.seq; +- e_thread_put(thread, (EMsg *)m); ++ dispatch ((mail_msg_t *) m); + return id; + } + +@@ -1340,7 +1340,7 @@ + m->done = done; + + id = m->msg.seq; +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + return id; + } + +@@ -1437,7 +1437,7 @@ + m->data = data; + m->done = done; + +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + /* ** SYNC FOLDER ********************************************************* */ +@@ -1498,7 +1498,7 @@ + m->data = data; + m->done = done; + +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + } + + /* ** SYNC STORE ********************************************************* */ +@@ -1568,7 +1568,7 @@ + m->data = data; + m->done = done; + +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + } + + /* ******************************************************************************** */ +@@ -1604,7 +1604,7 @@ + m->data = data; + m->done = done; + +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + } + + /* ******************************************************************************** */ +@@ -1640,7 +1640,7 @@ + m->data = data; + m->done = done; + +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + } + + /* ******************************************************************************** */ +@@ -1723,7 +1723,7 @@ + m->data = data; + m->done = done; + +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + } + + /* ** GET MESSAGE(s) ***************************************************** */ +@@ -1783,7 +1783,7 @@ + void + mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, + CamelMimeMessage *msg, void *data), +- void *data, EThread *thread) ++ void *data, MailMsgDispatchFunc dispatch) + { + struct _get_message_msg *m; + +@@ -1795,7 +1795,7 @@ + m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; + m->cancel = camel_operation_new(NULL, NULL); + +- e_thread_put(thread, (EMsg *)m); ++ dispatch ((mail_msg_t *) m); + } + + typedef void (*get_done)(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *); +@@ -1821,7 +1821,7 @@ + mail_get_message; it adds an exception argument to the callback */ + void + mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), +- void *data, EThread *thread) ++ void *data, MailMsgDispatchFunc dispatch) + { + struct _get_message_msg *m; + +@@ -1833,7 +1833,7 @@ + m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; + m->cancel = camel_operation_new(NULL, NULL); + +- e_thread_put(thread, (EMsg *)m); ++ dispatch ((mail_msg_t *) m); + } + + /* ********************************************************************** */ +@@ -1920,7 +1920,7 @@ + m->data = data; + m->done = done; + +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + /* ** SAVE MESSAGES ******************************************************* */ +@@ -2063,7 +2063,7 @@ + m->done = done; + + id = m->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + + return id; + } +@@ -2156,7 +2156,7 @@ + m->readonly = readonly; + + id = m->msg.seq; +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + + return id; + } +@@ -2240,7 +2240,7 @@ + m->data = data; + m->done = done; + +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + } + + /* ** GO OFFLINE ***************************************************** */ +@@ -2345,7 +2345,7 @@ + m->done = done; + + id = m->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + + return id; + } +@@ -2433,7 +2433,7 @@ + m->data = data; + + id = m->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + + return id; + } +--- evolution-2.9.1/mail/em-folder-utils.c.kill-ethread 2006-02-08 06:51:32.000000000 -0500 ++++ evolution-2.9.1/mail/em-folder-utils.c 2006-10-26 14:24:55.000000000 -0400 +@@ -260,7 +260,7 @@ + m->delete = delete; + seq = m->msg.seq; + +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + + return seq; + } +@@ -652,7 +652,7 @@ + g_free (namebuf); + + id = m->msg.seq; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + + return id; + } +--- evolution-2.9.1/mail/importers/elm-importer.c.kill-ethread 2005-12-17 13:35:37.000000000 -0500 ++++ evolution-2.9.1/mail/importers/elm-importer.c 2006-10-26 14:24:55.000000000 -0400 +@@ -312,7 +312,7 @@ + + id = m->msg.seq; + +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push ((mail_msg_t *) m); + + return id; + } +--- evolution-2.9.1/mail/importers/mail-importer.c.kill-ethread 2006-02-08 06:51:32.000000000 -0500 ++++ evolution-2.9.1/mail/importers/mail-importer.c 2006-10-26 14:24:55.000000000 -0400 +@@ -329,7 +329,7 @@ + } + + id = m->msg.seq; +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push ((mail_msg_t *) m); + + return id; + } +--- evolution-2.9.1/mail/importers/pine-importer.c.kill-ethread 2006-02-05 18:46:26.000000000 -0500 ++++ evolution-2.9.1/mail/importers/pine-importer.c 2006-10-26 14:24:56.000000000 -0400 +@@ -350,7 +350,7 @@ + + id = m->msg.seq; + +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push ((mail_msg_t *) m); + + return id; + } +--- evolution-2.9.1/mail/mail-vfolder.c.kill-ethread 2006-06-30 05:46:26.000000000 -0400 ++++ evolution-2.9.1/mail/mail-vfolder.c 2006-10-26 14:24:55.000000000 -0400 +@@ -188,7 +188,7 @@ + m->sources_folder = sources_folder; + + id = m->msg.seq; +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + + return id; + } +@@ -323,7 +323,7 @@ + m->remove = remove; + + id = m->msg.seq; +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + + return id; + } +@@ -447,7 +447,7 @@ + return; + } + +- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); ++ g_assert(mail_in_main_thread()); + + is_ignore = uri_is_ignore(store, curi); + +@@ -540,7 +540,7 @@ + + d(printf ("Deleting uri to check: %s\n", uri)); + +- g_assert (pthread_equal(pthread_self(), mail_gui_thread)); ++ g_assert (mail_in_main_thread()); + + changed = g_string_new (""); + +@@ -615,7 +615,7 @@ + if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) + return; + +- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); ++ g_assert(mail_in_main_thread()); + + from = em_uri_from_camel(cfrom); + to = em_uri_from_camel(cto); +--- evolution-2.9.1/mail/em-format-html.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 ++++ evolution-2.9.1/mail/em-format-html.c 2006-10-26 14:24:55.000000000 -0400 +@@ -1374,7 +1374,7 @@ + } + + efh->priv->format_id = m->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + efh->priv->format_timeout_id = 0; +--- evolution-2.9.1/mail/em-folder-properties.c.kill-ethread 2006-02-23 08:26:41.000000000 -0500 ++++ evolution-2.9.1/mail/em-folder-properties.c 2006-10-26 14:24:55.000000000 -0400 +@@ -379,7 +379,7 @@ + } + + if (folder == NULL) +- mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); ++ mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); + else + emfp_dialog_got_folder((char *)uri, folder, NULL); + } +--- evolution-2.9.1/mail/em-folder-tree.c.kill-ethread 2006-08-07 14:55:02.000000000 -0400 ++++ evolution-2.9.1/mail/em-folder-tree.c 2006-10-26 14:24:55.000000000 -0400 +@@ -966,7 +966,7 @@ + tree_drag_data_action(struct _DragDataReceivedAsync *m) + { + m->move = m->action == GDK_ACTION_MOVE; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + static void +@@ -1891,7 +1891,7 @@ + m->top = full_name; + m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; + +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + static gboolean +--- evolution-2.9.1/mail/em-folder-browser.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 ++++ evolution-2.9.1/mail/em-folder-browser.c 2006-10-26 14:24:55.000000000 -0400 +@@ -950,7 +950,7 @@ + m->sources_folder = sources_folder; + + id = m->msg.seq; +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + + return id; + } +--- evolution-2.9.1/mail/message-list.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 ++++ evolution-2.9.1/mail/message-list.c 2006-10-26 14:24:55.000000000 -0400 +@@ -1855,7 +1855,7 @@ + ml_drop_action(struct _drop_msg *m) + { + m->move = m->action == GDK_ACTION_MOVE; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } + + static void +@@ -3875,7 +3875,7 @@ + + m->ml->regen = g_list_prepend(m->ml->regen, m); + /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ +- e_thread_put (mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push ((mail_msg_t *) m); + + m->ml->regen_timeout_msg = NULL; + m->ml->regen_timeout_id = 0; +--- evolution-2.9.1/mail/em-format-html-print.c.kill-ethread 2005-05-19 02:46:23.000000000 -0400 ++++ evolution-2.9.1/mail/em-format-html-print.c 2006-10-26 14:24:55.000000000 -0400 +@@ -228,7 +228,7 @@ + g_object_ref(source); + g_object_ref(efhp); + +- mail_get_message(folder, uid, emfhp_got_message, efhp, mail_thread_new); ++ mail_get_message(folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); + + return 0; /* damn async ... */ + } +--- evolution-2.9.1/mail/em-sync-stream.c.kill-ethread 2005-12-21 09:10:25.000000000 -0500 ++++ evolution-2.9.1/mail/em-sync-stream.c 2006-10-26 14:24:55.000000000 -0400 +@@ -267,7 +267,7 @@ + if (emss->cancel) + return -1; + +- if (pthread_equal(pthread_self(), mail_gui_thread)) { ++ if (mail_in_main_thread ()) { + EMSS_CLASS(emss)->sync_write(stream, buffer, n); + #ifdef LOG_STREAM + if (p->logfd) +@@ -297,7 +297,7 @@ + if (emss->cancel) + return -1; + +- if (pthread_equal(pthread_self(), mail_gui_thread)) ++ if (mail_in_main_thread ()) + return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); + else + sync_op(emss, EMSS_FLUSH, NULL, 0); +@@ -315,7 +315,7 @@ + + d(printf("%p: closing stream\n", stream)); + +- if (pthread_equal(pthread_self(), mail_gui_thread)) { ++ if (mail_in_main_thread ()) { + #ifdef LOG_STREAM + if (emss->priv->logfd) { + fclose(emss->priv->logfd); +--- evolution-2.9.1/mail/em-subscribe-editor.c.kill-ethread 2006-07-24 05:01:30.000000000 -0400 ++++ evolution-2.9.1/mail/em-subscribe-editor.c 2006-10-26 14:24:55.000000000 -0400 +@@ -229,7 +229,7 @@ + next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); + if (next) { + next->sub->subscribe_id = next->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)next); ++ mail_msg_unordered_push ((mail_msg_t *) next); + } else { + /* should it go off the model instead? */ + sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); +@@ -270,7 +270,7 @@ + if (sub->subscribe_id == -1) { + sub->subscribe_id = id; + d(printf("running subscribe folder '%s'\n", spath)); +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + } else { + d(printf("queueing subscribe folder '%s'\n", spath)); + e_dlist_addtail(&sub->subscribe, (EDListNode *)m); +@@ -420,7 +420,7 @@ + + id = m->msg.seq; + +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + return id; + } + +--- evolution-2.9.1/mail/mail-mt.h.kill-ethread 2006-10-16 10:37:09.000000000 -0400 ++++ evolution-2.9.1/mail/mail-mt.h 2006-10-26 14:24:55.000000000 -0400 +@@ -33,6 +33,7 @@ + EMsg msg; /* parent type */ + struct _mail_msg_op *ops; /* operation functions */ + unsigned int seq; /* seq number for synchronisation */ ++ gint priority; /* priority (default = 0) */ + CamelOperation *cancel; /* a cancellation/status handle */ + CamelException ex; /* an initialised camel exception, upto the caller to use this */ + struct _mail_msg_priv *priv; /* private for internal use */ +@@ -51,6 +52,8 @@ + void mail_msg_init(void); + void mail_msg_cleanup (void); + ++gboolean mail_in_main_thread (void); ++ + /* allocate a new message */ + void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size); + void mail_msg_free(void *msg); +@@ -60,6 +63,14 @@ + void mail_msg_wait_all(void); + int mail_msg_active(unsigned int msgid); + ++/* dispatch a message */ ++void mail_msg_main_loop_push (mail_msg_t *msg); ++void mail_msg_unordered_push (mail_msg_t *msg); ++void mail_msg_fast_ordered_push (mail_msg_t *msg); ++void mail_msg_slow_ordered_push (mail_msg_t *msg); ++ ++typedef void (*MailMsgDispatchFunc) (mail_msg_t *msg); ++ + /* To implement the stop button */ + void *mail_cancel_hook_add(GDestroyNotify func, void *data); + void mail_cancel_hook_remove(void *handle); +@@ -112,24 +123,6 @@ + void mail_enable_stop(void); + void mail_disable_stop(void); + +-/* a message port that receives messages in the gui thread, used for sending port */ +-extern EMsgPort *mail_gui_port; +-/* a message port that receives messages in the gui thread, used for the reply port */ +-extern EMsgPort *mail_gui_reply_port; +- +-/* some globally available threads */ +-#ifndef G_OS_WIN32 +-extern EThread *mail_thread_queued; /* for operations that can (or should) be queued */ +-#else +-EThread *mail_win32_get_mail_thread_queued (void); +-#define mail_thread_queued mail_win32_get_mail_thread_queued () +-#endif +-extern EThread *mail_thread_new; /* for operations that should run in a new thread each time */ +-extern EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */ +- +-/* The main thread. */ +-extern pthread_t mail_gui_thread; +- + /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ + /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ + extern MailAsyncEvent *mail_async_event; +--- evolution-2.9.1/mail/mail-ops.h.kill-ethread 2006-02-20 11:01:01.000000000 -0500 ++++ evolution-2.9.1/mail/mail-ops.h 2006-10-26 14:24:55.000000000 -0400 +@@ -30,6 +30,8 @@ + #pragma } + #endif /* __cplusplus */ + ++#include "mail-mt.h" ++ + #include "camel/camel-store.h" + #include "camel/camel-folder.h" + #include "camel/camel-filter-driver.h" +@@ -55,12 +57,12 @@ + void mail_get_message (CamelFolder *folder, const char *uid, + void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), + void *data, +- EThread *thread); ++ MailMsgDispatchFunc dispatch); + + void + mail_get_messagex(CamelFolder *folder, const char *uid, + void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), +- void *data, EThread *thread); ++ void *data, MailMsgDispatchFunc dispatch); + + /* get several messages */ + void mail_get_messages (CamelFolder *folder, GPtrArray *uids, +@@ -70,7 +72,7 @@ + /* same for a folder */ + int mail_get_folder (const char *uri, guint32 flags, + void (*done) (char *uri, CamelFolder *folder, void *data), void *data, +- EThread *thread); ++ MailMsgDispatchFunc dispatch); + + /* and for a store */ + int mail_get_store (const char *uri, CamelOperation *op, +--- evolution-2.9.1/mail/em-composer-utils.c.kill-ethread 2006-04-18 16:56:36.000000000 -0400 ++++ evolution-2.9.1/mail/em-composer-utils.c 2006-10-26 14:24:55.000000000 -0400 +@@ -534,7 +534,7 @@ + strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { + int id; + +- id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); ++ id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); + mail_msg_wait (id); + + if (!folder || !account->enabled) { +@@ -1085,7 +1085,7 @@ + g_return_if_fail (CAMEL_IS_FOLDER (folder)); + g_return_if_fail (uid != NULL); + +- mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); ++ mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); + } + + static void +@@ -1116,7 +1116,7 @@ + } + + if (msg == NULL) { +- mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); ++ mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); + camel_message_info_free(info); + return; + } +@@ -1916,7 +1916,7 @@ + rd->source = source; + if (rd->source) + g_object_ref(rd->source); +- mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); ++ mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); + + return; + } +@@ -2088,5 +2088,5 @@ + g_return_if_fail (CAMEL_IS_FOLDER (folder)); + g_return_if_fail (uid != NULL); + +- mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); ++ mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); + } +--- evolution-2.9.1/mail/mail-folder-cache.c.kill-ethread 2006-07-26 09:19:18.000000000 -0400 ++++ evolution-2.9.1/mail/mail-folder-cache.c 2006-10-26 14:24:55.000000000 -0400 +@@ -907,7 +907,7 @@ + m->store = store; + camel_object_ref (store); + +- e_thread_put (mail_thread_queued_slow, (EMsg *) m); ++ mail_msg_slow_ordered_push ((mail_msg_t *) m); + } + + static gboolean +@@ -952,7 +952,7 @@ + int hook = 0; + + g_assert(CAMEL_IS_STORE(store)); +- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); ++ g_assert(mail_in_main_thread()); + + LOCK(info_lock); + +--- evolution-2.9.1/mail/em-folder-view.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 ++++ evolution-2.9.1/mail/em-folder-view.c 2006-10-26 14:24:55.000000000 -0400 +@@ -693,7 +693,7 @@ + static void + emfv_set_folder_uri(EMFolderView *emfv, const char *uri) + { +- mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_thread_queued); ++ mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_msg_fast_ordered_push); + } + + static void +@@ -1588,7 +1588,7 @@ + data->type = type; + data->source = source; + +- mail_get_message (folder, uid, filter_type_got_message, data, mail_thread_new); ++ mail_get_message (folder, uid, filter_type_got_message, data, mail_msg_unordered_push); + } + + static void +@@ -1686,7 +1686,7 @@ + data->type = type; + data->uri = g_strdup (uri); + +- mail_get_message (folder, uid, vfolder_type_got_message, data, mail_thread_new); ++ mail_get_message (folder, uid, vfolder_type_got_message, data, mail_msg_unordered_push); + } + + static void +@@ -2335,7 +2335,7 @@ + g_object_ref (emfv); + /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ + e_profile_event_emit("goto.load", emfv->displayed_uid, 0); +- mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued); ++ mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push); + } else { + e_profile_event_emit("goto.empty", "", 0); + g_free(emfv->priv->selected_uid); +--- evolution-2.9.1/mail/mail-session.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 ++++ evolution-2.9.1/mail/mail-session.c 2006-10-26 14:24:55.000000000 -0400 +@@ -374,7 +374,7 @@ + if (cancel) + user_message_reply = e_msgport_new (); + m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); +- m->ismain = pthread_equal(pthread_self(), mail_gui_thread); ++ m->ismain = mail_in_main_thread(); + m->type = type; + m->prompt = g_strdup(prompt); + m->allow_cancel = cancel; +@@ -382,9 +382,7 @@ + if (m->ismain) + do_user_message((struct _mail_msg *)m); + else { +- extern EMsgPort *mail_gui_port2; +- +- e_msgport_put(mail_gui_port2, (EMsg *)m); ++ mail_msg_main_loop_push((mail_msg_t *) m); + } + + if (cancel) { +--- evolution-2.9.1/mail/mail-mt.c.kill-ethread 2006-10-16 10:37:09.000000000 -0400 ++++ evolution-2.9.1/mail/mail-mt.c 2006-10-26 14:24:55.000000000 -0400 +@@ -82,12 +82,8 @@ + static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; + static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; + +-pthread_t mail_gui_thread; +- + MailAsyncEvent *mail_async_event; + +-static void mail_msg_destroy(EThread *e, EMsg *msg, void *data); +- + void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size) + { + struct _mail_msg *msg; +@@ -112,7 +108,6 @@ + fprintf(log, "Logging async operations\n"); + + if (log_locks) { +- fprintf(log, "Logging lock operations, mail_gui_thread = %" G_GINT64_MODIFIER "x\n\n", e_util_pthread_id(mail_gui_thread)); + fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); + } + } else { +@@ -308,9 +303,8 @@ + void mail_msg_wait(unsigned int msgid) + { + struct _mail_msg *m; +- int ismain = pthread_equal(pthread_self(), mail_gui_thread); + +- if (ismain) { ++ if (mail_in_main_thread ()) { + MAIL_MT_LOCK(mail_msg_lock); + m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); + while (m) { +@@ -347,9 +341,7 @@ + + void mail_msg_wait_all(void) + { +- int ismain = pthread_equal(pthread_self(), mail_gui_thread); +- +- if (ismain) { ++ if (mail_in_main_thread ()) { + MAIL_MT_LOCK(mail_msg_lock); + while (g_hash_table_size(mail_msg_active_table) > 0) { + MAIL_MT_UNLOCK(mail_msg_lock); +@@ -420,241 +412,187 @@ + MAIL_MT_UNLOCK(mail_msg_lock); + } + +-EMsgPort *mail_gui_port; +-static GIOChannel *mail_gui_channel; +-static guint mail_gui_watch; +- +-/* TODO: Merge these, gui_port2 doesn't do any mail_msg processing on the request (replies, forwards, frees) */ +-EMsgPort *mail_gui_port2; +-static GIOChannel *mail_gui_channel2; +-static guint mail_gui_watch2; +- +-EMsgPort *mail_gui_reply_port; +-static GIOChannel *mail_gui_reply_channel; +- +-/* a couple of global threads available */ +-#ifdef G_OS_WIN32 +-#undef mail_thread_queued +-static +-#endif +-EThread *mail_thread_queued; /* for operations that can (or should) be queued */ +-EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */ +-EThread *mail_thread_new; /* for operations that should run in a new thread each time */ +- +-#ifdef G_OS_WIN32 +-EThread * +-mail_win32_get_mail_thread_queued (void) ++#define PERIODIC_RATE_HZ 10 ++static guint periodic_source_id = 0; ++static GAsyncQueue *main_loop_queue = NULL; ++static GAsyncQueue *msg_reply_queue = NULL; ++static GThread *main_thread = NULL; ++ ++static void ++periodic_cleanup (void) + { +- return mail_thread_queued; ++ periodic_source_id = 0; ++ ++ g_assert (main_loop_queue != NULL); ++ g_async_queue_unref (main_loop_queue); ++ main_loop_queue = NULL; ++ ++ g_assert (msg_reply_queue != NULL); ++ g_async_queue_unref (msg_reply_queue); ++ msg_reply_queue = NULL; + } +-#endif + + static gboolean +-mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) ++periodic_processing (void) + { +- EMsgPort *port = (EMsgPort *)d; +- mail_msg_t *m; ++ mail_msg_t *msg; + +- while (( m = (mail_msg_t *)e_msgport_get(port))) { ++ g_assert (main_loop_queue != NULL); ++ g_assert (msg_reply_queue != NULL); + +-#ifdef MALLOC_CHECK +- checkmem(m); +- checkmem(m->cancel); +- checkmem(m->priv); +-#endif +- +-#ifdef LOG_OPS +- if (log_ops) +- fprintf(log, "%p: Replied to GUI thread (exception `%s'\n", m, +- camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); +-#endif ++ /* check the main loop queue */ ++ while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { ++ if (msg->ops->receive_msg != NULL) ++ msg->ops->receive_msg (msg); ++ if (msg->msg.reply_port != NULL) ++ e_msgport_reply ((EMsg *) msg); ++ else { ++ if (msg->ops->reply_msg != NULL) ++ msg->ops->reply_msg (msg); ++ mail_msg_free (msg); ++ } ++ } + +- if (m->ops->reply_msg) +- m->ops->reply_msg(m); +- mail_msg_check_error(m); +- mail_msg_free(m); ++ /* check the reply queue */ ++ while ((msg = g_async_queue_try_pop (msg_reply_queue)) != NULL) { ++ if (msg->ops->reply_msg != NULL) ++ msg->ops->reply_msg (msg); ++ mail_msg_check_error (msg); ++ mail_msg_free (msg); + } + + return TRUE; + } + +-static gboolean +-mail_msgport_received(GIOChannel *source, GIOCondition cond, void *d) ++static void ++mail_msg_proxy (mail_msg_t *msg) + { +- EMsgPort *port = (EMsgPort *)d; +- mail_msg_t *m; ++ if (msg->ops->describe_msg != NULL) { ++ gchar *text = msg->ops->describe_msg (msg, FALSE); ++ camel_operation_register (msg->cancel); ++ camel_operation_start (msg->cancel, "%s", text); ++ g_free (text); ++ } ++ ++ if (msg->ops->receive_msg != NULL) { ++ mail_enable_stop (); ++ msg->ops->receive_msg (msg); ++ mail_disable_stop (); ++ } ++ ++ if (msg->ops->describe_msg != NULL) { ++ camel_operation_end (msg->cancel); ++ camel_operation_unregister (msg->cancel); ++ MAIL_MT_LOCK (mail_msg_lock); ++ camel_operation_unref (msg->cancel); ++ msg->cancel = NULL; ++ MAIL_MT_UNLOCK (mail_msg_lock); ++ } + +- while (( m = (mail_msg_t *)e_msgport_get(port))) { +-#ifdef MALLOC_CHECK +- checkmem(m); +- checkmem(m->cancel); +- checkmem(m->priv); +-#endif ++ g_async_queue_push (msg_reply_queue, msg); ++} + +-#ifdef LOG_OPS +- if (log_ops) +- fprintf(log, "%p: Received at GUI thread\n", m); +-#endif ++void ++mail_msg_cleanup (void) ++{ ++ GSource *source; + +- if (m->ops->receive_msg) +- m->ops->receive_msg(m); +- if (m->msg.reply_port) +- e_msgport_reply((EMsg *)m); +- else { +- if (m->ops->reply_msg) +- m->ops->reply_msg(m); +- mail_msg_free(m); +- } +- } ++ mail_msg_wait_all(); + +- return TRUE; ++ /* stop periodic processing */ ++ source = g_main_context_find_source_by_id ( ++ g_main_context_default (), periodic_source_id); ++ g_assert (source != NULL); ++ g_source_destroy (source); + } + +-/* Test code, lighterwight, more configurable calls */ +-static gboolean +-mail_msgport_received2(GIOChannel *source, GIOCondition cond, void *d) ++void ++mail_msg_init (void) + { +- EMsgPort *port = (EMsgPort *)d; +- mail_msg_t *m; ++ main_loop_queue = g_async_queue_new (); ++ msg_reply_queue = g_async_queue_new (); + +- while (( m = (mail_msg_t *)e_msgport_get(port))) { +-#ifdef LOG_OPS +- if (log_ops) +- fprintf(log, "%p: Received at GUI2 thread\n", m); +-#endif ++ /* start periodic processing */ ++ periodic_source_id = g_timeout_add_full ( ++ G_PRIORITY_DEFAULT, ++ 1000 / PERIODIC_RATE_HZ, ++ (GSourceFunc) periodic_processing, NULL, ++ (GDestroyNotify) periodic_cleanup); + +- if (m->ops->receive_msg) +- m->ops->receive_msg(m); +- else +- mail_msg_free(m); +- } ++ mail_msg_active_table = g_hash_table_new (NULL, NULL); ++ main_thread = g_thread_self (); + +- return TRUE; ++ mail_async_event = mail_async_event_new (); + } + +- +-static void +-mail_msg_destroy(EThread *e, EMsg *msg, void *data) ++static gint ++mail_msg_compare (const mail_msg_t *msg1, const mail_msg_t *msg2) + { +- mail_msg_t *m = (mail_msg_t *)msg; ++ gint priority1 = msg1->priority; ++ gint priority2 = msg2->priority; + +-#ifdef MALLOC_CHECK +- checkmem(m); +- checkmem(m->cancel); +- checkmem(m->priv); +-#endif ++ if (priority1 == priority2) ++ return 0; + +- mail_msg_free(m); ++ return (priority1 < priority2) ? 1 : -1; + } + +-static void +-mail_msg_received(EThread *e, EMsg *msg, void *data) ++static gpointer ++create_thread_pool (gpointer data) + { +- mail_msg_t *m = (mail_msg_t *)msg; ++ GThreadPool *thread_pool; ++ gint max_threads = GPOINTER_TO_INT (data); + +-#ifdef MALLOC_CHECK +- checkmem(m); +- checkmem(m->cancel); +- checkmem(m->priv); +-#endif ++ /* once created, run forever */ ++ thread_pool = g_thread_pool_new ( ++ (GFunc) mail_msg_proxy, NULL, max_threads, FALSE, NULL); ++ g_thread_pool_set_sort_function ( ++ thread_pool, (GCompareDataFunc) mail_msg_compare, NULL); + +- if (m->ops->describe_msg) { +- char *text = m->ops->describe_msg(m, FALSE); ++ return thread_pool; ++} + +-#ifdef LOG_OPS +- if (log_ops) +- fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x: '%s'\n", m, e_util_pthread_id(pthread_self()), text); +-#endif ++void ++mail_msg_main_loop_push (mail_msg_t *msg) ++{ ++ g_async_queue_push_sorted (main_loop_queue, msg, ++ (GCompareDataFunc) mail_msg_compare, NULL); ++} + +- d(printf("message received at thread\n")); +- camel_operation_register(m->cancel); +- camel_operation_start(m->cancel, "%s", text); +- g_free(text); +- } +-#ifdef LOG_OPS +- else +- if (log_ops) +- fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x\n", m, e_util_pthread_id(pthread_self())); +-#endif ++void ++mail_msg_unordered_push (mail_msg_t *msg) ++{ ++ static GOnce once = G_ONCE_INIT; + +- if (m->ops->receive_msg) { +- mail_enable_stop(); +- m->ops->receive_msg(m); +- mail_disable_stop(); +- } ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); + +- if (m->ops->describe_msg) { +- camel_operation_end(m->cancel); +- camel_operation_unregister(m->cancel); +- MAIL_MT_LOCK(mail_msg_lock); +- camel_operation_unref(m->cancel); +- m->cancel = NULL; +- MAIL_MT_UNLOCK(mail_msg_lock); +- } ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); + } + +-void mail_msg_cleanup(void) ++void ++mail_msg_fast_ordered_push (mail_msg_t *msg) + { +- mail_msg_wait_all(); ++ static GOnce once = G_ONCE_INIT; + +- e_thread_destroy(mail_thread_queued_slow); +- e_thread_destroy(mail_thread_queued); +- e_thread_destroy(mail_thread_new); ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); + +- g_io_channel_unref(mail_gui_channel); +- g_io_channel_unref(mail_gui_reply_channel); +- +- e_msgport_destroy(mail_gui_port); +- e_msgport_destroy(mail_gui_reply_port); ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); + } + +-static guint +-em_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) ++void ++mail_msg_slow_ordered_push (mail_msg_t *msg) + { +- GSource *source; +- guint id; ++ static GOnce once = G_ONCE_INIT; + +- *port = e_msgport_new(); +-#ifndef G_OS_WIN32 +- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); +-#else +- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); +-#endif +- source = g_io_create_watch(*channel, G_IO_IN); +- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); +- g_source_set_can_recurse(source, FALSE); +- id = g_source_attach(source, NULL); +- g_source_unref(source); ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); + +- return id; ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); + } + +-void mail_msg_init(void) ++gboolean ++mail_in_main_thread (void) + { +- em_channel_setup(&mail_gui_reply_port, &mail_gui_reply_channel, mail_msgport_replied); +- mail_gui_watch = em_channel_setup(&mail_gui_port, &mail_gui_channel, mail_msgport_received); +- mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2); +- +- mail_thread_queued = e_thread_new(E_THREAD_QUEUE); +- e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, 0); +- e_thread_set_msg_received(mail_thread_queued, mail_msg_received, 0); +- e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port); +- +- mail_thread_queued_slow = e_thread_new(E_THREAD_QUEUE); +- e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, 0); +- e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, 0); +- e_thread_set_reply_port(mail_thread_queued_slow, mail_gui_reply_port); +- +- mail_thread_new = e_thread_new(E_THREAD_NEW); +- e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, 0); +- e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0); +- e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); +- e_thread_set_queue_limit(mail_thread_new, 10); +- +- mail_msg_active_table = g_hash_table_new(NULL, NULL); +- mail_gui_thread = pthread_self(); +- +- mail_async_event = mail_async_event_new(); ++ return (g_thread_self () == main_thread); + } + + /* ********************************************************************** */ +@@ -723,7 +661,6 @@ + { + struct _proxy_msg *m; + int id; +- int ismain = pthread_equal(pthread_self(), mail_gui_thread); + + /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ + m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); +@@ -743,12 +680,12 @@ + /* We use an idle function instead of our own message port only because the + gui message ports's notification buffer might overflow and deadlock us */ + if (type == MAIL_ASYNC_GUI) { +- if (ismain) ++ if (mail_in_main_thread ()) + g_idle_add(idle_async_event, m); + else +- e_msgport_put(mail_gui_port, (EMsg *)m); ++ mail_msg_main_loop_push((mail_msg_t *) m); + } else +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push ((mail_msg_t *) m); + + return id; + } +@@ -857,11 +794,10 @@ + void *ret; + va_list ap; + EMsgPort *reply = NULL; +- int ismain = pthread_equal(pthread_self(), mail_gui_thread); + + va_start(ap, func); + +- if (!ismain) ++ if (!mail_in_main_thread ()) + reply = e_msgport_new(); + + m = mail_msg_new(&mail_call_op, reply, sizeof(*m)); +@@ -869,8 +805,8 @@ + m->func = func; + G_VA_COPY(m->ap, ap); + +- if (!ismain) { +- e_msgport_put(mail_gui_port, (EMsg *)m); ++ if (reply != NULL) { ++ mail_msg_main_loop_push((mail_msg_t *) m); + e_msgport_wait(reply); + e_msgport_destroy(reply); + } else { +@@ -909,7 +845,7 @@ + busy_state++; + if (busy_state == 1) { + m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); +- e_msgport_put(mail_gui_port, (EMsg *)m); ++ mail_msg_main_loop_push((mail_msg_t *) m); + } + MAIL_MT_UNLOCK(status_lock); + } +@@ -922,7 +858,7 @@ + busy_state--; + if (busy_state == 0) { + m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); +- e_msgport_put(mail_gui_port, (EMsg *)m); ++ mail_msg_main_loop_push((mail_msg_t *) m); + } + MAIL_MT_UNLOCK(status_lock); + } +@@ -947,7 +883,7 @@ + char *out, *p, *o, c; + int pc; + +- g_assert (pthread_equal(mail_gui_thread, pthread_self ())); ++ g_assert (mail_in_main_thread ()); + + MAIL_MT_LOCK (mail_msg_lock); + +@@ -1055,7 +991,7 @@ + } + m->pc = pc; + m->data = data; +- e_msgport_put(mail_gui_port, (EMsg *)m); ++ mail_msg_main_loop_push((mail_msg_t *) m); + } + + /* ******************** */ +--- evolution-2.9.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2004-10-22 15:32:26.000000000 -0400 ++++ evolution-2.9.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2006-10-26 14:24:56.000000000 -0400 +@@ -108,5 +108,5 @@ + unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); + unsub->uri = g_strdup (target->uri); + +- e_thread_put (mail_thread_new, (EMsg *) unsub); ++ mail_msg_unordered_push ((mail_msg_t *) unsub); + } +--- evolution-2.9.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2005-05-19 13:32:41.000000000 -0400 ++++ evolution-2.9.1/plugins/mark-all-read/mark-all-read.c 2006-10-26 14:24:56.000000000 -0400 +@@ -44,7 +44,7 @@ + return; + } + +- mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); ++ mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); + } + + static void +--- evolution-2.9.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2006-06-13 06:15:40.000000000 -0400 ++++ evolution-2.9.1/plugins/exchange-operations/exchange-folder.c 2006-10-26 14:24:56.000000000 -0400 +@@ -134,7 +134,7 @@ + inbox_physical_uri = e_folder_get_physical_uri (inbox); + + /* To get the CamelStore/Folder */ +- mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); ++ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); + + + } +--- evolution-2.9.1/plugins/save-attachments/save-attachments.c.kill-ethread 2006-07-07 19:48:24.000000000 -0400 ++++ evolution-2.9.1/plugins/save-attachments/save-attachments.c 2006-10-26 14:24:56.000000000 -0400 +@@ -407,5 +407,5 @@ + camel_object_ref(data->folder); + data->uid = g_strdup(target->uids->pdata[0]); + +- mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); ++ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); + } +--- evolution-2.9.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2006-08-23 04:38:52.000000000 -0400 ++++ evolution-2.9.1/plugins/mailing-list-actions/mailing-list-actions.c 2006-10-26 14:24:56.000000000 -0400 +@@ -89,7 +89,7 @@ + data->uri = strdup (sel->uri); + + mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), +- emla_list_action_do, data, mail_thread_new); ++ emla_list_action_do, data, mail_msg_unordered_push); + } + + void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) +--- evolution-2.9.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2006-02-08 06:08:24.000000000 -0500 ++++ evolution-2.9.1/plugins/groupwise-features/share-folder-common.c 2006-10-26 14:24:56.000000000 -0400 +@@ -239,7 +239,7 @@ + m->done = done; + g_free (namebuf); + id = m->msg.seq; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push ((mail_msg_t *) m); + + return id; + } +--- evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2006-04-21 15:38:16.000000000 -0400 ++++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.h 2006-10-26 14:24:53.000000000 -0400 +@@ -39,19 +39,6 @@ + + typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; + +-typedef struct _AlarmMsg AlarmMsg; +-typedef struct _AlarmMsgPrivate AlarmMsgPrivate; +- +-struct _AlarmMsg { +- EMsg msg; +- +- void (*receive_msg)(EThread *e, struct _AlarmMsg *msg, void *data); /* message received */ +- void *data; +- +- /* Private Usage */ +- struct _AlarmMsgPrivate *priv; +-}; +- + struct _AlarmNotify { + BonoboObject object; + +--- evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2006-08-24 09:53:20.000000000 -0400 ++++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.c 2006-10-26 14:24:53.000000000 -0400 +@@ -45,10 +45,6 @@ + GMutex *mutex; + }; + +-EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ +-EMsgPort *alarm_reply_port; +-static GIOChannel *alarm_reply_channel; +- + #define d(x) x + + +@@ -284,72 +280,12 @@ + g_mutex_free (priv->mutex); + g_free (priv); + +- e_thread_destroy(alarm_operation_thread); +- g_io_channel_unref(alarm_reply_channel); +- e_msgport_destroy(alarm_reply_port); + if (G_OBJECT_CLASS (parent_class)->finalize) + (* G_OBJECT_CLASS (parent_class)->finalize) (object); + } + + + +-static guint +-alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) +-{ +- GSource *source; +- guint id; +- +- d (printf("%s:%d (alarm_channel_setup) - Channel Setup\n ", __FILE__, __LINE__)); +- *port = e_msgport_new(); +-#ifndef G_OS_WIN32 +- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); +-#else +- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); +-#endif +- source = g_io_create_watch(*channel, G_IO_IN); +- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); +- g_source_set_can_recurse(source, FALSE); +- id = g_source_attach(source, NULL); +- g_source_unref(source); +- +- return id; +-} +- +-static void +-alarm_msg_destroy(EThread *e, EMsg *msg, void *data) +-{ +- AlarmMsg *m = (AlarmMsg *)msg; +- +- /* Free the private */ +- g_free (m->data); /* Mostly it is a structure allocated as a carrier*/ +- g_free (m); +-} +- +-static gboolean +-alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) +-{ +- EMsgPort *port = (EMsgPort *)d; +- EMsg *m; +- +- while (( m = e_msgport_get(port))) { +- d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m)); +- alarm_msg_destroy(NULL, m, NULL); +- } +- +- return TRUE; +-} +- +-static void +-alarm_msg_received(EThread *e, EMsg *msg, void *data) +-{ +- AlarmMsg *m = (AlarmMsg *)msg; +- +- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); +- if (m->receive_msg) { +- m->receive_msg (e, m, data); +- } +-} +- + /** + * alarm_notify_new: + * +@@ -361,23 +297,10 @@ + AlarmNotify * + alarm_notify_new (void) + { +- AlarmNotify *an; +- +- d (printf("%s:%d (alarm_notify_new) - Alarm Notify New \n ", __FILE__, __LINE__)); +- +- /* Create a thread for alarm queue operation*/ +- alarm_channel_setup(&alarm_reply_port, &alarm_reply_channel, alarm_msgport_replied); +- +- alarm_operation_thread = e_thread_new(E_THREAD_QUEUE); +- e_thread_set_msg_destroy(alarm_operation_thread, alarm_msg_destroy, 0); +- e_thread_set_msg_received(alarm_operation_thread, alarm_msg_received, 0); +- e_thread_set_reply_port(alarm_operation_thread, alarm_reply_port); +- +- an = g_object_new (TYPE_ALARM_NOTIFY, +- "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL), +- NULL); +- +- return an; ++ return g_object_new (TYPE_ALARM_NOTIFY, ++ "poa", bonobo_poa_get_threaded ( ++ ORBIT_THREAD_HINT_PER_REQUEST, NULL), ++ NULL); + } + + static void +--- evolution-2.9.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2006-08-30 10:36:04.000000000 -0400 ++++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-queue.c 2006-10-26 14:24:53.000000000 -0400 +@@ -115,9 +115,6 @@ + static int tray_blink_state = FALSE; + static AlarmNotify *an; + +-/* Main Tasks thread for dealing with the global structures */ +-extern EThread *alarm_operation_thread; +- + /* Structure that stores a client we are monitoring */ + typedef struct { + /* Monitored client */ +@@ -199,6 +196,40 @@ + static void load_alarms_for_today (ClientAlarms *ca); + static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); + ++/* Simple asynchronous message dispatcher */ ++ ++typedef struct _Message Message; ++typedef void (*MessageFunc) (Message *msg); ++ ++struct _Message { ++ MessageFunc func; ++}; ++ ++static void ++message_proxy (Message *msg) ++{ ++ g_return_if_fail (msg->func != NULL); ++ ++ msg->func (msg); ++} ++ ++static gpointer ++create_thread_pool (void) ++{ ++ /* once created, run forever */ ++ return g_thread_pool_new ((GFunc) message_proxy, NULL, 1, FALSE, NULL); ++} ++ ++static void ++message_push (Message *msg) ++{ ++ static GOnce once = G_ONCE_INIT; ++ ++ g_once (&once, (GThreadFunc) create_thread_pool, NULL); ++ ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); ++} ++ + /* Queues an alarm trigger for midnight so that we can load the next day's worth + * of alarms. + */ +@@ -237,47 +268,41 @@ + } + + struct _midnight_refresh_msg { ++ Message header; + gboolean remove; + }; + + /* Loads the alarms for the new day every midnight */ + static void +-midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) ++midnight_refresh_async (struct _midnight_refresh_msg *msg) + { +- struct _midnight_refresh_msg *list = msg->data; +- + d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); + + /* Re-load the alarms for all clients */ + g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); + + /* Re-schedule the midnight update */ +- if (list->remove && midnight_refresh_id != NULL) { ++ if (msg->remove && midnight_refresh_id != NULL) { + d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); + alarm_remove (midnight_refresh_id); + midnight_refresh_id = NULL; + } + + queue_midnight_refresh (); ++ ++ g_slice_free (struct _midnight_refresh_msg, msg); + } + + static void + midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) + { +- AlarmMsg *msg; +- struct _midnight_refresh_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = midnight_refresh_async; +- +- list = malloc (sizeof (struct _midnight_refresh_msg)); ++ struct _midnight_refresh_msg *msg; + +- list->remove = TRUE; +- msg->data = list; ++ msg = g_slice_new (struct _midnight_refresh_msg); ++ msg->header.func = (MessageFunc) midnight_refresh_async; ++ msg->remove = TRUE; + +- d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Looks up a client in the client alarms hash table */ +@@ -636,6 +661,7 @@ + * alarms. + */ + struct _query_msg { ++ Message header; + ECal *client; + GList *objects; + gpointer data; +@@ -669,7 +695,7 @@ + } + + static void +-query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) ++query_objects_changed_async (struct _query_msg *msg) + { + ClientAlarms *ca; + time_t from, day_end; +@@ -678,13 +704,12 @@ + icaltimezone *zone; + CompQueuedAlarms *cqa; + GList *l; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + +- client = list->client; +- ca = list->data; +- objects = list->objects; ++ client = msg->client; ++ ca = msg->data; ++ objects = msg->objects; + + from = config_data_get_last_notification_time (); + if (from == -1) +@@ -773,43 +798,38 @@ + comp = NULL; + } + g_list_free (objects); ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + query_objects_changed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; ++ struct _query_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = query_objects_changed_async; +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = duplicate_ical (objects); +- list->data = data; +- msg->data = list; +- +- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) query_objects_changed_async; ++ msg->client = client; ++ msg->objects = duplicate_ical (objects); ++ msg->data = data; + ++ message_push ((Message *) msg); + } + + /* Called when a calendar component is removed; we must delete its corresponding + * alarms. + */ + static void +-query_objects_removed_async (EThread *e, AlarmMsg *msg, void *data) ++query_objects_removed_async (struct _query_msg *msg) + { + ClientAlarms *ca; + GList *l; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + +- client = list->client; +- ca = list->data; +- objects = list->objects; ++ client = msg->client; ++ ca = msg->data; ++ objects = msg->objects; + + d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); + +@@ -822,27 +842,22 @@ + } + + g_list_free (objects); ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + query_objects_removed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = query_objects_removed_async; +- +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = duplicate_ecal (objects); +- list->data = data; +- msg->data = list; ++ struct _query_msg *msg; + +- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) query_objects_removed_async; ++ msg->client = client; ++ msg->objects = duplicate_ecal (objects); ++ msg->data = data; + ++ message_push ((Message *) msg); + } + + +@@ -989,20 +1004,19 @@ + } + + static void +-on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) ++on_dialog_objs_removed_async (struct _query_msg *msg) + { + const char *our_uid; + GList *l; + TrayIconData *tray_data; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + + d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); + +- client = list->client; +- tray_data = list->data; +- objects = list->objects; ++ client = msg->client; ++ tray_data = msg->data; ++ objects = msg->objects; + + e_cal_component_get_uid (tray_data->comp, &our_uid); + g_return_if_fail (our_uid && *our_uid); +@@ -1020,37 +1034,33 @@ + tray_data = NULL; + } + } ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; ++ struct _query_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = on_dialog_objs_removed_async; +- +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = objects; +- list->data = data; +- msg->data = list; ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) on_dialog_objs_removed_async; ++ msg->client = client; ++ msg->objects = objects; ++ msg->data = data; + +- d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + struct _tray_cqa_msg { ++ Message header; + CompQueuedAlarms *cqa; + }; + + static void +-tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) + { +- struct _tray_cqa_msg *tmsg = msg->data; +- CompQueuedAlarms *cqa = tmsg->cqa; ++ CompQueuedAlarms *cqa = msg->cqa; + GList *list = tray_icons_list; + + d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); +@@ -1087,28 +1097,25 @@ + gtk_tree_selection_select_iter (sel, &iter); + } + } ++ ++ g_slice_free (struct _tray_cqa_msg, msg); + } + + static void + tray_list_remove_cqa (CompQueuedAlarms *cqa) + { +- AlarmMsg *msg; +- struct _tray_cqa_msg *list; +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_cqa_async; +- +- list = malloc (sizeof (struct _tray_cqa_msg)); +- list->cqa = cqa; +- msg->data = list; ++ struct _tray_cqa_msg *msg; ++ ++ msg = g_slice_new (struct _tray_cqa_msg); ++ msg->header.func = (MessageFunc) tray_list_remove_cqa_async; ++ msg->cqa = cqa; + +- d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Callback used from the alarm notify dialog */ + static void +-tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_async (Message *msg) + { + GList *list = tray_icons_list; + +@@ -1138,55 +1145,50 @@ + } else + list = list->next; + } ++ ++ g_slice_free (Message, msg); + } + + static void +-tray_list_remove_icons () ++tray_list_remove_icons (void) + { +- AlarmMsg *msg; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_async; ++ Message *msg; + +- msg->data = NULL; ++ msg = g_slice_new (Message); ++ msg->func = tray_list_remove_async; + +- d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push (msg); + } + + struct _tray_msg { ++ Message header; + TrayIconData *data; + }; + + static void +-tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_data_async (struct _tray_msg *msg) + { +- struct _tray_msg *tmsg = msg->data; +- TrayIconData *tray_data = tmsg->data; ++ TrayIconData *tray_data = msg->data; + + d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); + + tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); + free_tray_icon_data (tray_data); + tray_data = NULL; ++ ++ g_slice_free (struct _tray_msg, msg); + } + + static void + tray_list_remove_data (TrayIconData *data) + { +- AlarmMsg *msg; +- struct _tray_msg *list; +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_data_async; +- +- list = malloc (sizeof (struct _tray_msg)); +- list->data = data; +- msg->data = list; ++ struct _tray_msg *msg; ++ ++ msg = g_slice_new (struct _tray_msg); ++ msg->header.func = (MessageFunc) tray_list_remove_data_async; ++ msg->data = data; + +- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + static void +@@ -1394,29 +1396,24 @@ + /* Add a new data to tray list */ + + static void +-tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) ++tray_list_add_async (struct _tray_msg *msg) + { +- struct _tray_msg *list = msg->data; +- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); +- tray_icons_list = g_list_prepend (tray_icons_list, list->data); ++ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); ++ tray_icons_list = g_list_prepend (tray_icons_list, msg->data); ++ ++ g_slice_free (struct _tray_msg, msg); + } + + static void + tray_list_add_new (TrayIconData *data) + { +- AlarmMsg *msg; +- struct _tray_msg *list; ++ struct _tray_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_add_async; +- +- list = malloc (sizeof (struct _tray_msg)); +- list->data = data; +- msg->data = list; +- +- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _tray_msg); ++ msg->header.func = (MessageFunc) tray_list_add_async; ++ msg->data = data; ++ ++ message_push ((Message *) msg); + } + + /* Performs notification of a display alarm */ +@@ -1836,21 +1833,13 @@ + new_midnight = time_day_end_with_zone (time (NULL), zone); + + if (new_midnight > midnight) { +- AlarmMsg *msg; +- struct _midnight_refresh_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = midnight_refresh_async; +- +- list = malloc (sizeof (struct _midnight_refresh_msg)); ++ struct _midnight_refresh_msg *msg; + +- list->remove = FALSE; +- /* We dont need it. So set it to NULL */ +- msg->data = list; ++ msg = g_slice_new (struct _midnight_refresh_msg); ++ msg->header.func = (MessageFunc) midnight_refresh_async; ++ msg->remove = FALSE; + +- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + return TRUE; +@@ -1981,14 +1970,15 @@ + } + + struct _alarm_client_msg { ++ Message header; + ECal *client; + }; + +-static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) ++static void ++alarm_queue_add_async (struct _alarm_client_msg *msg) + { + ClientAlarms *ca; +- struct _alarm_client_msg *list = msg->data; +- ECal *client = list->client; ++ ECal *client = msg->client; + + g_return_if_fail (alarm_queue_inited); + g_return_if_fail (client != NULL); +@@ -2019,6 +2009,8 @@ + G_CALLBACK (cal_opened_cb), + ca); + } ++ ++ g_slice_free (struct _alarm_client_msg, msg); + } + + /** +@@ -2038,20 +2030,13 @@ + void + alarm_queue_add_client (ECal *client) + { +- AlarmMsg *msg; +- struct _alarm_client_msg *list; ++ struct _alarm_client_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = alarm_queue_add_async; +- +- list = malloc (sizeof (struct _alarm_client_msg)); +- list->client = client; +- g_object_ref (client); +- msg->data = list; ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_add_async; ++ msg->client = g_object_ref (client); + +- d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Removes a component an its alarms */ +@@ -2103,11 +2088,10 @@ + * Removes a calendar client from the alarm queueing system. + **/ + static void +-alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data) ++alarm_queue_remove_async (struct _alarm_client_msg *msg) + { + ClientAlarms *ca; +- struct _alarm_client_msg *list = msg->data; +- ECal *client = list->client; ++ ECal *client = msg->client; + + g_return_if_fail (alarm_queue_inited); + g_return_if_fail (client != NULL); +@@ -2144,24 +2128,20 @@ + g_free (ca); + + g_hash_table_remove (client_alarms_hash, client); ++ ++ g_slice_free (struct _alarm_client_msg, msg); + } + + void + alarm_queue_remove_client (ECal *client) + { +- AlarmMsg *msg; +- struct _alarm_client_msg *list; ++ struct _alarm_client_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = alarm_queue_remove_async; +- +- list = malloc (sizeof (struct _alarm_client_msg)); +- list->client = client; +- msg->data = list; ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_remove_async; ++ msg->client = client; + +- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch new file mode 100644 index 0000000..de2da1d --- /dev/null +++ b/evolution-2.9.1-kill-ememory.patch @@ -0,0 +1,299 @@ +--- evolution-2.9.1/mail/message-list.c.ememory 2006-10-25 11:11:34.000000000 -0400 ++++ evolution-2.9.1/mail/message-list.c 2006-10-25 11:15:12.000000000 -0400 +@@ -412,70 +412,28 @@ + return info; + } + +-static const char * +-get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int col) ++static const gchar * ++get_normalised_string (MessageList *message_list, const gchar *string) + { +- const char *string, *str; +- char *normalised; +- EPoolv *poolv; +- int index; +- +- switch (col) { +- case COL_SUBJECT_NORM: +- string = camel_message_info_subject (info); +- index = NORMALISED_SUBJECT; +- break; +- case COL_FROM_NORM: +- string = camel_message_info_from (info); +- index = NORMALISED_FROM; +- break; +- case COL_TO_NORM: +- string = camel_message_info_to (info); +- index = NORMALISED_TO; +- break; +- default: +- string = NULL; +- index = NORMALISED_LAST; +- g_assert_not_reached (); +- } +- +- /* slight optimisation */ +- if (string == NULL || string[0] == '\0') ++ GHashTable *hash_table = message_list->normalised_hash; ++ GStringChunk *string_chunk = message_list->string_chunk; ++ gchar *collation_key, *temp; ++ ++ if (string == NULL || *string == '\0') + return ""; +- +- poolv = g_hash_table_lookup (message_list->normalised_hash, camel_message_info_uid (info)); +- if (poolv == NULL) { +- poolv = e_poolv_new (NORMALISED_LAST); +- g_hash_table_insert (message_list->normalised_hash, (char *) camel_message_info_uid (info), poolv); +- } else { +- str = e_poolv_get (poolv, index); +- if (*str) +- return str; +- } +- +- if (col == COL_SUBJECT_NORM) { +- const unsigned char *subject; +- +- subject = (const unsigned char *) string; +- while (!g_ascii_strncasecmp (subject, "Re:", 3)) { +- subject += 3; +- +- /* jump over any spaces */ +- while (*subject && isspace ((int) *subject)) +- subject++; +- } +- +- /* jump over any spaces */ +- while (*subject && isspace ((int) *subject)) +- subject++; +- +- string = (const char *) subject; +- } +- +- normalised = g_utf8_collate_key (string, -1); +- e_poolv_set (poolv, index, normalised, TRUE); +- +- return e_poolv_get (poolv, index); ++ ++ collation_key = g_hash_table_lookup (hash_table, string); ++ if (collation_key != NULL) ++ return collation_key; ++ ++ temp = g_utf8_collate_key (string, -1); ++ collation_key = g_string_chunk_insert_const (string_chunk, temp); ++ g_free (temp); ++ ++ temp = g_string_chunk_insert_const (string_chunk, string); ++ g_hash_table_insert (hash_table, temp, collation_key); ++ ++ return collation_key; + } + + static void +@@ -1283,12 +1241,23 @@ + str = camel_message_info_from (msg_info); + return (void *)(str ? str : ""); + case COL_FROM_NORM: +- return (void *) get_normalised_string (message_list, msg_info, col); ++ str = camel_message_info_from (msg_info); ++ return (void *) get_normalised_string (message_list, str); + case COL_SUBJECT: + str = camel_message_info_subject (msg_info); + return (void *)(str ? str : ""); + case COL_SUBJECT_NORM: +- return (void *) get_normalised_string (message_list, msg_info, col); ++ str = camel_message_info_subject (msg_info); ++ while (str != NULL && *str != '\0') { ++ /* skip over spaces and reply prefixes */ ++ if (g_ascii_strncasecmp (str, "Re:", 3) == 0) ++ str += 3; ++ else if (g_ascii_isspace (*str)) ++ str++; ++ else ++ break; ++ } ++ return (void *) get_normalised_string (message_list, str); + case COL_SENT: { + ETreePath child; + +@@ -1312,7 +1281,8 @@ + str = camel_message_info_to (msg_info); + return (void *)(str ? str : ""); + case COL_TO_NORM: +- return (void *) get_normalised_string (message_list, msg_info, col); ++ str = camel_message_info_to (str); ++ return (void *) get_normalised_string (message_list, str); + case COL_SIZE: + return GINT_TO_POINTER (camel_message_info_size(msg_info)); + case COL_DELETED: +@@ -2023,9 +1993,10 @@ + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); + + message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal); ++ message_list->string_chunk = g_string_chunk_new (1024); + + message_list->hidden = NULL; +- message_list->hidden_pool = NULL; ++ message_list->hidden_string_chunk = NULL; + message_list->hide_before = ML_HIDE_NONE_START; + message_list->hide_after = ML_HIDE_NONE_END; + +@@ -2054,14 +2025,6 @@ + g_signal_connect (((GtkScrolledWindow *) message_list)->vscrollbar, "value-changed", G_CALLBACK (ml_scrolled), message_list); + } + +-static gboolean +-normalised_free (gpointer key, gpointer value, gpointer user_data) +-{ +- e_poolv_destroy (value); +- +- return TRUE; +-} +- + static void + message_list_destroy(GtkObject *object) + { +@@ -2127,17 +2090,17 @@ + MessageList *message_list = MESSAGE_LIST (object); + struct _MessageListPrivate *p = message_list->priv; + +- g_hash_table_foreach (message_list->normalised_hash, (GHFunc) normalised_free, NULL); + g_hash_table_destroy (message_list->normalised_hash); ++ g_string_chunk_free (message_list->string_chunk); + + if (message_list->thread_tree) + camel_folder_thread_messages_unref(message_list->thread_tree); + + if (message_list->hidden) { + g_hash_table_destroy(message_list->hidden); +- e_mempool_destroy(message_list->hidden_pool); ++ g_string_chunk_free(message_list->hidden_string_chunk); + message_list->hidden = NULL; +- message_list->hidden_pool = NULL; ++ message_list->hidden_string_chunk = NULL; + } + + g_free(message_list->search); +@@ -2940,17 +2903,6 @@ + d(printf("changed = %d added = %d removed = %d\n", + changes->uid_changed->len, changes->uid_added->len, changes->uid_removed->len)); + +- for (i = 0; i < changes->uid_removed->len; i++) { +- /* uncache the normalised strings for these uids */ +- EPoolv *poolv; +- +- poolv = g_hash_table_lookup (ml->normalised_hash, changes->uid_removed->pdata[i]); +- if (poolv != NULL) { +- g_hash_table_remove (ml->normalised_hash, changes->uid_removed->pdata[i]); +- e_poolv_destroy (poolv); +- } +- } +- + /* check if the hidden state has changed, if so modify accordingly, then regenerate */ + if (ml->hidejunk || ml->hidedeleted) + mail_folder_hide_by_flag (folder, ml, &changes, (ml->hidejunk ? CAMEL_MESSAGE_JUNK : 0) | (ml->hidedeleted ? CAMEL_MESSAGE_DELETED : 0)); +@@ -3028,7 +2980,11 @@ + } + + /* reset the normalised sort performance hack */ +- g_hash_table_foreach_remove (message_list->normalised_hash, normalised_free, NULL); ++ /* XXX GLib 2.12 added g_hash_table_remove_all() */ ++ g_hash_table_destroy (message_list->normalised_hash); ++ message_list->normalised_hash = g_hash_table_new (g_str_hash, g_str_equal); ++ g_string_chunk_free (message_list->string_chunk); ++ message_list->string_chunk = g_string_chunk_new (1024); + + mail_regen_cancel(message_list); + +@@ -3479,14 +3435,14 @@ + MESSAGE_LIST_LOCK (ml, hide_lock); + if (ml->hidden == NULL) { + ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); +- ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE); ++ ml->hidden_string_chunk = g_string_chunk_new (512); + } + +- uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); ++ uid = g_string_chunk_insert (ml->hidden_string_chunk, uids->pdata[i]); + g_hash_table_insert (ml->hidden, uid, uid); + for ( ; i < uids->len; i++) { + if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) { +- uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); ++ uid = g_string_chunk_insert (ml->hidden_string_chunk, uids->pdata[i]); + g_hash_table_insert (ml->hidden, uid, uid); + } + } +@@ -3507,9 +3463,9 @@ + MESSAGE_LIST_LOCK (ml, hide_lock); + if (ml->hidden) { + g_hash_table_destroy (ml->hidden); +- e_mempool_destroy (ml->hidden_pool); ++ g_string_chunk_free (ml->hidden_string_chunk); + ml->hidden = NULL; +- ml->hidden_pool = NULL; ++ ml->hidden_string_chunk = NULL; + } + ml->hide_before = ML_HIDE_NONE_START; + ml->hide_after = ML_HIDE_NONE_END; +@@ -3545,9 +3501,9 @@ + MESSAGE_LIST_LOCK(ml, hide_lock); + if (ml->hidden) { + g_hash_table_destroy (ml->hidden); +- e_mempool_destroy (ml->hidden_pool); ++ g_string_chunk_free (ml->hidden_string_chunk); + ml->hidden = NULL; +- ml->hidden_pool = NULL; ++ ml->hidden_string_chunk = NULL; + } + ml->hide_before = ML_HIDE_NONE_START; + ml->hide_after = ML_HIDE_NONE_END; +@@ -3558,7 +3514,7 @@ + camel_file_util_decode_fixed_int32 (in, &version); + if (version == HIDE_STATE_VERSION) { + ml->hidden = g_hash_table_new(g_str_hash, g_str_equal); +- ml->hidden_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE); ++ ml->hidden_string_chunk = g_string_chunk_new(512); + camel_file_util_decode_fixed_int32 (in, &lower); + ml->hide_before = lower; + camel_file_util_decode_fixed_int32 (in, &upper); +@@ -3567,7 +3523,7 @@ + char *olduid, *uid; + + if (camel_file_util_decode_string (in, &olduid) != -1) { +- uid = e_mempool_strdup(ml->hidden_pool, olduid); ++ uid = g_string_chunk_insert(ml->hidden_string_chunk, olduid); + g_free (olduid); + g_hash_table_insert(ml->hidden, uid, uid); + } +@@ -3717,12 +3673,12 @@ + + if (m->ml->hidden == NULL) { + m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); +- m->ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE); ++ m->ml->hidden_string_chunk = g_string_chunk_new (512); + } + + for (i = 0; i < uidnew->len; i++) { + if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == 0) { +- char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]); ++ char *uid = g_string_chunk_insert (m->ml->hidden_string_chunk, uidnew->pdata[i]); + g_hash_table_insert (m->ml->hidden, uid, uid); + } + } +--- evolution-2.9.1/mail/message-list.h.ememory 2006-09-28 04:56:51.000000000 -0400 ++++ evolution-2.9.1/mail/message-list.h 2006-10-25 11:15:12.000000000 -0400 +@@ -102,11 +102,12 @@ + GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ + + GHashTable *normalised_hash; ++ GStringChunk *string_chunk; + + /* UID's to hide. Keys in the mempool */ + /* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */ + GHashTable *hidden; +- struct _EMemPool *hidden_pool; ++ GStringChunk *hidden_string_chunk; + int hide_unhidden; /* total length, before hiding */ + int hide_before, hide_after; /* hide ranges of messages */ + diff --git a/evolution.spec b/evolution.spec index 92a31bf..34aa806 100644 --- a/evolution.spec +++ b/evolution.spec @@ -35,7 +35,7 @@ %define use_mozilla_nss 1 # Use stricter build settings than required by upstream. -%define strict_build_settings 1 +%define strict_build_settings 0 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins @@ -43,7 +43,7 @@ Name: evolution Version: 2.9.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -109,14 +109,17 @@ Patch26: evolution-2.7.92-fix-prgname.patch # RH bug #161885 / Gnome.org bug #309166 Patch27: evolution-2.8.0-indic-cursor-movement.patch +# Gnome.org bug #356177 +Patch28: evolution-2.8.0-kill-emutex.patch + # Gnome.org bug #357216 -Patch28: evolution-2.8.0-deprecated-gdk-font.patch +Patch29: evolution-2.8.0-deprecated-gdk-font.patch # Gnome.org bug #357970 -Patch29: evolution-2.8.0-more-deprecated.patch +Patch30: evolution-2.8.0-more-deprecated.patch # RH bug #202751 / Gnome.org bug #355766 -Patch30: evolution-2.8.0-fix-indic-printing.patch +#Patch31: evolution-2.8.0-fix-indic-printing.patch # Gnome.org bug #360240 Patch32: evolution-2.8.1-warn-unused-variable.patch @@ -128,7 +131,10 @@ Patch33: evolution-2.8.1-warn-incompatible-pointer-type.patch Patch34: evolution-2.8.1-about-dialog.patch # Gnome.org bug #362638 -Patch35: evolution-2.8.1-ethread.patch +Patch35: evolution-2.8.1-kill-ethread.patch + +# Gnome.org bug #363695 +Patch36: evolution-2.9.1-kill-ememory.patch ## Dependencies ### @@ -259,13 +265,15 @@ Development files needed for building things which link against evolution. %patch25 -p1 -b .deleting-preedit-buffer %patch26 -p1 -b .fix-prgname %patch27 -p1 -b .indic-cursor-movement -%patch28 -p1 -b .deprecated-gdk-font -%patch29 -p1 -b .more-deprecated -%patch30 -p1 -b .fix-indic-printing +%patch28 -p1 -b .kill-emutex +%patch29 -p1 -b .deprecated-gdk-font +%patch30 -p1 -b .more-deprecated +#%patch31 -p1 -b .fix-indic-printing %patch32 -p1 -b .warn-unused-variable %patch33 -p1 -b .warn-incompatible-pointer-type %patch34 -p1 -b .about-dialog -%patch35 -p1 -b .ethread +%patch35 -p1 -b .kill-ethread +%patch36 -p1 -b .kill-ememory mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -665,6 +673,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Oct 20 2006 Matthew Barnes - 2.9.1-2.fc7 +- Add patch for Gnome.org bug #356177 (deprecate EMutex). +- Add patch for Gnome.org bug #363695 (deprecate EStrv/EPoolv). +- Disable patch for RH bug #202751 (unwanted side-effects). + * Mon Oct 16 2006 Matthew Barnes - 2.9.1-1.fc7 - Update to 2.9.1 - Bump eds_version to 1.9.1, evo_major to 2.10. From 5bd7f4419dd95969d937bb23f26a140124c8beef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 6 Nov 2006 19:23:25 +0000 Subject: [PATCH 078/844] - Add patch for RH bug #176400 (reset calendar IM context). - Add patch for RH bug #182247 (calendar input glitch). --- evolution-2.9.1-first-ascii.patch | 91 ++++++++++++++++++++++++++ evolution-2.9.1-im-context-reset.patch | 12 ++++ evolution.spec | 14 +++- 3 files changed, 116 insertions(+), 1 deletion(-) create mode 100644 evolution-2.9.1-first-ascii.patch create mode 100644 evolution-2.9.1-im-context-reset.patch diff --git a/evolution-2.9.1-first-ascii.patch b/evolution-2.9.1-first-ascii.patch new file mode 100644 index 0000000..7fffebe --- /dev/null +++ b/evolution-2.9.1-first-ascii.patch @@ -0,0 +1,91 @@ +--- evolution-2.9.1/calendar/gui/e-day-view.c.first-ascii 2006-11-06 11:25:23.000000000 -0500 ++++ evolution-2.9.1/calendar/gui/e-day-view.c 2006-11-06 11:34:32.000000000 -0500 +@@ -333,7 +333,7 @@ + static void e_day_view_start_editing_event (EDayView *day_view, + gint day, + gint event_num, +- gchar *initial_text); ++ GdkEventKey *key_event); + static void e_day_view_stop_editing_event (EDayView *day_view); + static gboolean e_day_view_text_keypress (GnomeCanvasItem *item, + guint keyval, +@@ -6012,7 +6012,6 @@ + ECalModel *model; + ECalComponent *comp; + gint day, event_num; +- gchar *initial_text; + guint keyval; + gboolean stop_emission; + time_t dtstart, dtend; +@@ -6153,15 +6152,12 @@ + + /* We only want to start an edit with a return key or a simple + character. */ +- if (keyval == GDK_Return) { +- initial_text = NULL; +- } else if (((keyval >= 0x20) && (keyval <= 0xFF) +- && (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) +- || (event->length == 0) +- || (keyval == GDK_Tab)) { ++ if ((keyval != GDK_Return) && ++ (((keyval >= 0x20) && (keyval <= 0xFF) ++ && (event->state & (GDK_CONTROL_MASK | GDK_MOD1_MASK))) ++ || (event->length == 0) ++ || (keyval == GDK_Tab))) + return FALSE; +- } else +- initial_text = e_utf8_from_gtk_event_key (widget, event->keyval, event->string); + + /* Add a new event covering the selected range */ + icalcomp = e_cal_model_create_component_with_defaults (model); +@@ -6207,15 +6203,11 @@ + gtk_widget_queue_draw (day_view->main_canvas); + + if (e_day_view_find_event_from_uid (day_view, ecal, uid, NULL, &day, &event_num)) { +- e_day_view_start_editing_event (day_view, day, event_num, +- initial_text); ++ e_day_view_start_editing_event (day_view, day, event_num, event); + } else { + g_warning ("Couldn't find event to start editing.\n"); + } + +- if (initial_text) +- g_free (initial_text); +- + g_object_unref (comp); + + return TRUE; +@@ -6897,7 +6889,7 @@ + e_day_view_start_editing_event (EDayView *day_view, + gint day, + gint event_num, +- gchar *initial_text) ++ GdkEventKey *key_event) + { + EDayViewEvent *event; + ETextEventProcessor *event_processor = NULL; +@@ -6937,10 +6929,20 @@ + rid of the start and end times. */ + e_canvas_item_grab_focus (event->canvas_item, TRUE); + +- if (initial_text) { +- gnome_canvas_item_set (event->canvas_item, +- "text", initial_text, +- NULL); ++ if (key_event) { ++ if (gtk_im_context_filter_keypress (((EText *)(event->canvas_item))->im_context, key_event)) { ++ ((EText *)(event->canvas_item))->need_im_reset = TRUE; ++ } ++ else { ++ char *initial_text; ++ ++ initial_text = e_utf8_from_gtk_event_key (GTK_WIDGET (day_view), key_event->keyval, key_event->string); ++ gnome_canvas_item_set (event->canvas_item, ++ "text", initial_text, ++ NULL); ++ if (initial_text) ++ g_free (initial_text); ++ } + } + + /* Try to move the cursor to the end of the text. */ diff --git a/evolution-2.9.1-im-context-reset.patch b/evolution-2.9.1-im-context-reset.patch new file mode 100644 index 0000000..76e9d98 --- /dev/null +++ b/evolution-2.9.1-im-context-reset.patch @@ -0,0 +1,12 @@ +--- evolution-2.9.1/calendar/gui/e-day-view.c.im-context-reset 2006-11-06 10:14:26.000000000 -0500 ++++ evolution-2.9.1/calendar/gui/e-day-view.c 2006-11-06 10:15:39.000000000 -0500 +@@ -6928,6 +6928,9 @@ + if (!event->canvas_item) + return; + ++ /* Reset IM context. */ ++ gtk_im_context_reset (E_TEXT (event->canvas_item)->im_context); ++ + /* We must grab the focus before setting the initial text, since + grabbing the focus will result in a call to + e_day_view_on_editing_started(), which will reset the text to get diff --git a/evolution.spec b/evolution.spec index 34aa806..d231a0e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.9.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -136,6 +136,12 @@ Patch35: evolution-2.8.1-kill-ethread.patch # Gnome.org bug #363695 Patch36: evolution-2.9.1-kill-ememory.patch +# RH bug #176400 +Patch37: evolution-2.9.1-im-context-reset.patch + +# RH bug #182247 +Patch38: evolution-2.9.1-first-ascii.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -274,6 +280,8 @@ Development files needed for building things which link against evolution. %patch34 -p1 -b .about-dialog %patch35 -p1 -b .kill-ethread %patch36 -p1 -b .kill-ememory +%patch37 -p1 -b .im-context-reset +%patch38 -p1 -b .first-ascii mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -673,6 +681,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Nov 06 2006 Matthew Barnes - 2.9.1-3.fc7 +- Add patch for RH bug #176400 (reset calendar IM context). +- Add patch for RH bug #182247 (calendar input glitch). + * Fri Oct 20 2006 Matthew Barnes - 2.9.1-2.fc7 - Add patch for Gnome.org bug #356177 (deprecate EMutex). - Add patch for Gnome.org bug #363695 (deprecate EStrv/EPoolv). From 09e24157f82c1c551da92f34d407ab1944e74832 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 7 Nov 2006 11:46:54 +0000 Subject: [PATCH 079/844] - Update to 2.9.2 - Remove patch for Gnome.org bug #360240 (fixed upstream). - Remove patch for Gnome.org bug #360619 (fixed upstream). --- .cvsignore | 2 +- evolution.spec | 22 +++++++++++----------- sources | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 23cc717..a8e20c4 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.9.1.tar.bz2 +evolution-2.9.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index d231a0e..f68793f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -35,15 +35,15 @@ %define use_mozilla_nss 1 # Use stricter build settings than required by upstream. -%define strict_build_settings 0 +%define strict_build_settings 1 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins ### Abstract ### Name: evolution -Version: 2.9.1 -Release: 3%{?dist} +Version: 2.9.2 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -121,12 +121,6 @@ Patch30: evolution-2.8.0-more-deprecated.patch # RH bug #202751 / Gnome.org bug #355766 #Patch31: evolution-2.8.0-fix-indic-printing.patch -# Gnome.org bug #360240 -Patch32: evolution-2.8.1-warn-unused-variable.patch - -# Gnome.org bug #360619 -Patch33: evolution-2.8.1-warn-incompatible-pointer-type.patch - # Gnome.org bug #360946 Patch34: evolution-2.8.1-about-dialog.patch @@ -275,8 +269,6 @@ Development files needed for building things which link against evolution. %patch29 -p1 -b .deprecated-gdk-font %patch30 -p1 -b .more-deprecated #%patch31 -p1 -b .fix-indic-printing -%patch32 -p1 -b .warn-unused-variable -%patch33 -p1 -b .warn-incompatible-pointer-type %patch34 -p1 -b .about-dialog %patch35 -p1 -b .kill-ethread %patch36 -p1 -b .kill-ememory @@ -622,6 +614,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-plugin-manager.so %{evo_plugin_dir}/org-gnome-plugin-manager.xml +%{evo_plugin_dir}/org-gnome-prefer-plain.eplug +%{evo_plugin_dir}/liborg-gnome-prefer-plain.so + %{evo_plugin_dir}/org-gnome-print-message.eplug %{evo_plugin_dir}/liborg-gnome-print-message.so %{evo_plugin_dir}/org-gnome-print-message.xml @@ -681,6 +676,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Nov 06 2006 Matthew Barnes - 2.9.2-1.fc7 +- Update to 2.9.2 +- Remove patch for Gnome.org bug #360240 (fixed upstream). +- Remove patch for Gnome.org bug #360619 (fixed upstream). + * Mon Nov 06 2006 Matthew Barnes - 2.9.1-3.fc7 - Add patch for RH bug #176400 (reset calendar IM context). - Add patch for RH bug #182247 (calendar input glitch). diff --git a/sources b/sources index b27a08e..b4475f9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e7e6492d80a7405bd34568fc78074cbe evolution-2.9.1.tar.bz2 +d6e24a907faed31cc809455e5b0eef47 evolution-2.9.2.tar.bz2 From 69653950e5aec3e270fb428ff4fc520b40e18c9d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 7 Nov 2006 19:28:19 +0000 Subject: [PATCH 080/844] - Revise patch for RH bug #202751 and re-enable it. --- evolution-2.8.0-fix-indic-printing.patch | 129 ++++++++++++----------- evolution.spec | 9 +- 2 files changed, 75 insertions(+), 63 deletions(-) diff --git a/evolution-2.8.0-fix-indic-printing.patch b/evolution-2.8.0-fix-indic-printing.patch index ed42520..eab8a5d 100644 --- a/evolution-2.8.0-fix-indic-printing.patch +++ b/evolution-2.8.0-fix-indic-printing.patch @@ -1,82 +1,91 @@ ---- evolution-2.8.1/plugins/print-message/print-message.c.fix-indic-printing 2005-08-23 23:14:10.000000000 -0400 -+++ evolution-2.8.1/plugins/print-message/print-message.c 2006-10-10 10:35:17.000000000 -0400 -@@ -83,7 +83,8 @@ +--- evolution-2.9.2/plugins/print-message/print-message.c.fix-indic-printing 2005-08-23 23:14:10.000000000 -0400 ++++ evolution-2.9.2/plugins/print-message/print-message.c 2006-11-07 13:47:35.000000000 -0500 +@@ -83,7 +83,7 @@ data->config = e_print_load_config (); data->preview = 0; - data->msg = e_msg_composer_get_message (composer, 1); -+ data->msg = e_msg_composer_get_message_print (composer, TRUE); -+ ++ data->msg = e_msg_composer_get_message_print (composer, 1); dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config); gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT); e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer); -@@ -104,7 +105,7 @@ +@@ -104,7 +104,7 @@ data->config = e_print_load_config (); data->preview = 0; - data->msg = e_msg_composer_get_message (composer, 1); -+ data->msg = e_msg_composer_get_message_print (composer, TRUE); ++ data->msg = e_msg_composer_get_message_print (composer, 1); print_response(NULL, GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, data); } ---- evolution-2.8.1/composer/e-msg-composer.h.fix-indic-printing 2005-12-07 03:29:51.000000000 -0500 -+++ evolution-2.8.1/composer/e-msg-composer.h 2006-10-10 10:35:17.000000000 -0400 -@@ -94,6 +94,8 @@ - const char *filename); - void e_msg_composer_add_inline_image_from_mime_part (EMsgComposer *composer, +--- evolution-2.9.2/composer/e-msg-composer.h.fix-indic-printing 2005-12-07 03:29:51.000000000 -0500 ++++ evolution-2.9.2/composer/e-msg-composer.h 2006-11-07 13:47:35.000000000 -0500 +@@ -96,6 +96,8 @@ CamelMimePart *part); -+CamelMimeMessage *e_msg_composer_get_message_print (EMsgComposer *composer, -+ gboolean save_html_object_data); CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer, gboolean save_html_object_data); ++CamelMimeMessage *e_msg_composer_get_message_print (EMsgComposer *composer, ++ gboolean save_html_object_data); CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer); ---- evolution-2.8.1/composer/e-msg-composer.c.fix-indic-printing 2006-10-10 10:34:38.000000000 -0400 -+++ evolution-2.8.1/composer/e-msg-composer.c 2006-10-10 10:35:17.000000000 -0400 -@@ -5162,6 +5162,38 @@ - } - } - -+/* Stub for helping in printing of mails */ -+CamelMimeMessage * -+e_msg_composer_get_message_print (EMsgComposer *composer, gboolean save_html_object_data) -+{ -+ CamelMimeMessage *msg; -+ gboolean old_flags[4]; -+ gboolean old_send_html; -+ EMsgComposerPrivate *p = composer->priv; -+ -+ /* create printable mail as HTML */ -+ old_send_html = p->send_html; -+ p->send_html = TRUE; -+ old_flags[0] = p->pgp_sign; -+ p->pgp_sign = FALSE; -+ old_flags[1] = p->pgp_encrypt; -+ p->pgp_encrypt = FALSE; -+ old_flags[2] = p->smime_sign; -+ p->smime_sign = FALSE; -+ old_flags[3] = p->smime_encrypt; -+ p->smime_encrypt = FALSE; -+ -+ msg = build_message (composer, save_html_object_data); -+ -+ /* Revert back message's original settings */ -+ p->send_html = old_send_html; -+ p->pgp_sign = old_flags[0]; -+ p->pgp_encrypt = old_flags[1]; -+ p->smime_sign = old_flags[2]; -+ p->smime_encrypt = old_flags[3]; -+ -+ return msg; -+} - - /** - * e_msg_composer_get_message: -@@ -5183,7 +5215,7 @@ - } - } + void e_msg_composer_show_sig_file (EMsgComposer *composer); + gboolean e_msg_composer_get_send_html (EMsgComposer *composer); +--- evolution-2.9.2/composer/e-msg-composer.c.fix-indic-printing 2006-11-07 13:47:35.000000000 -0500 ++++ evolution-2.9.2/composer/e-msg-composer.c 2006-11-07 14:02:39.000000000 -0500 +@@ -615,6 +615,7 @@ + camel_object_unref (stream); -- return build_message (composer, save_html_object_data); -+ return e_msg_composer_get_message_print (composer, save_html_object_data); + camel_data_wrapper_set_mime_type_field (plain, type); ++ camel_data_wrapper_set_mime_type (plain, "text/plain; charset=utf-8"); + camel_content_type_unref (type); + + if (p->send_html) { +@@ -5189,6 +5190,49 @@ } CamelMimeMessage * ++e_msg_composer_get_message_print (EMsgComposer *composer, gboolean save_html_object_data) ++{ ++ EMsgComposer *temp_composer; ++ CamelMimeMessage *msg; ++ GString *flags; ++ ++ msg = build_message (composer, save_html_object_data); ++ temp_composer = e_msg_composer_new_with_message (msg); ++ camel_object_unref (msg); ++ ++ /* build flags string */ ++ flags = g_string_sized_new (128); ++ if (temp_composer->priv->send_html) ++ g_string_append (flags, "text/html"); ++ else ++ g_string_append (flags, "text/plain"); ++ if (temp_composer->priv->pgp_sign) ++ g_string_append (flags, ", pgp-sign"); ++ if (temp_composer->priv->pgp_encrypt) ++ g_string_append (flags, ", pgp-encrypt"); ++ if (temp_composer->priv->smime_sign) ++ g_string_append (flags, ", smime-sign"); ++ if (temp_composer->priv->smime_encrypt) ++ g_string_append (flags, ", smime-encrypt"); ++ ++ /* override composer flags */ ++ temp_composer->priv->send_html = TRUE; ++ temp_composer->priv->pgp_sign = FALSE; ++ temp_composer->priv->pgp_encrypt = FALSE; ++ temp_composer->priv->smime_sign = FALSE; ++ temp_composer->priv->smime_encrypt = FALSE; ++ ++ msg = build_message (temp_composer, save_html_object_data); ++ camel_medium_set_header (CAMEL_MEDIUM (msg), ++ "X-Evolution-Format", flags->str); ++ ++ e_msg_composer_delete (temp_composer); ++ g_string_free (flags, TRUE); ++ ++ return msg; ++} ++ ++CamelMimeMessage * + e_msg_composer_get_message_draft (EMsgComposer *composer) + { + CamelMimeMessage *msg; diff --git a/evolution.spec b/evolution.spec index f68793f..9eed40d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.9.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -119,7 +119,7 @@ Patch29: evolution-2.8.0-deprecated-gdk-font.patch Patch30: evolution-2.8.0-more-deprecated.patch # RH bug #202751 / Gnome.org bug #355766 -#Patch31: evolution-2.8.0-fix-indic-printing.patch +Patch31: evolution-2.8.0-fix-indic-printing.patch # Gnome.org bug #360946 Patch34: evolution-2.8.1-about-dialog.patch @@ -268,7 +268,7 @@ Development files needed for building things which link against evolution. %patch28 -p1 -b .kill-emutex %patch29 -p1 -b .deprecated-gdk-font %patch30 -p1 -b .more-deprecated -#%patch31 -p1 -b .fix-indic-printing +%patch31 -p1 -b .fix-indic-printing %patch34 -p1 -b .about-dialog %patch35 -p1 -b .kill-ethread %patch36 -p1 -b .kill-ememory @@ -676,6 +676,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Nov 07 2006 Matthew Barnes - 2.9.2-2.fc7 +- Revise patch for RH bug #202751 and re-enable it. + * Mon Nov 06 2006 Matthew Barnes - 2.9.2-1.fc7 - Update to 2.9.2 - Remove patch for Gnome.org bug #360240 (fixed upstream). From 16ce3c18da39f4eead6966b8b4264756e22bedba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Nov 2006 19:08:00 +0000 Subject: [PATCH 081/844] - Add patch to port evolution conduits to pilot-link 0.12. --- evolution.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 9eed40d..c2fa013 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.9.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -136,6 +136,10 @@ Patch37: evolution-2.9.1-im-context-reset.patch # RH bug #182247 Patch38: evolution-2.9.1-first-ascii.patch +# Port evolution conduits to pilot-link 0.12 +# http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html +Patch39: evolution-2.9.2-pilot-link-0.12.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -274,6 +278,7 @@ Development files needed for building things which link against evolution. %patch36 -p1 -b .kill-ememory %patch37 -p1 -b .im-context-reset %patch38 -p1 -b .first-ascii +%patch39 -p1 -b .pilot-link-0.12 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -676,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Nov 28 2006 Matthew Barnes - 2.9.2-3.fc7 +- Add patch to port evolution conduits to pilot-link 0.12. + * Tue Nov 07 2006 Matthew Barnes - 2.9.2-2.fc7 - Revise patch for RH bug #202751 and re-enable it. From 39e25a5f962d148d260a5244601dd75bd9bfec0d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Nov 2006 21:35:13 +0000 Subject: [PATCH 082/844] - Add patch to port evolution conduits to pilot-link 0.12. - Add patch for RH bug #215466 (optional meeting participants). - Add patch for GNOME bug #373837 (use GtkFontButton). - Remove patch for GNOME bug #343331 (fixed upstream). --- evolution-2.9.2-gtk-font-button.patch | 199 ++++++++++++++++++++++++++ evolution.spec | 111 +++++++------- 2 files changed, 258 insertions(+), 52 deletions(-) create mode 100644 evolution-2.9.2-gtk-font-button.patch diff --git a/evolution-2.9.2-gtk-font-button.patch b/evolution-2.9.2-gtk-font-button.patch new file mode 100644 index 0000000..f3d4476 --- /dev/null +++ b/evolution-2.9.2-gtk-font-button.patch @@ -0,0 +1,199 @@ +--- evolution-2.9.2/mail/em-mailer-prefs.c.gtk-font-button 2006-08-09 04:43:27.000000000 -0400 ++++ evolution-2.9.2/mail/em-mailer-prefs.c 2006-11-11 08:31:53.000000000 -0500 +@@ -36,8 +36,8 @@ + #include + + #include +-#include + #include ++#include + + #include + +@@ -535,12 +535,14 @@ + } + + static void +-font_changed (GnomeFontPicker *fontpicker, const char *arg1, EMMailerPrefs *prefs) ++font_changed (GtkFontButton *font_button, EMMailerPrefs *prefs) + { +- const char *key; ++ const gchar *key; ++ const gchar *font_name; + +- key = g_object_get_data ((GObject *) fontpicker, "key"); +- gconf_client_set_string (prefs->gconf, key, gnome_font_picker_get_font_name (fontpicker), NULL); ++ key = g_object_get_data (G_OBJECT (font_button), "key"); ++ font_name = gtk_font_button_get_font_name (font_button); ++ gconf_client_set_string (prefs->gconf, key, font_name, NULL); + } + + static void +@@ -841,8 +843,8 @@ + + /* Mail Fonts */ + font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL); +- prefs->font_fixed = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontFixed")); +- gnome_font_picker_set_font_name (prefs->font_fixed, font); ++ prefs->font_fixed = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontFixed")); ++ gtk_font_button_set_font_name (prefs->font_fixed, font); + g_free (font); + g_object_set_data ((GObject *) prefs->font_fixed, "key", "/apps/evolution/mail/display/fonts/monospace"); + g_signal_connect (prefs->font_fixed, "font-set", G_CALLBACK (font_changed), prefs); +@@ -850,8 +852,8 @@ + gtk_widget_set_sensitive ((GtkWidget *) prefs->font_fixed, FALSE); + + font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL); +- prefs->font_variable = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontVariable")); +- gnome_font_picker_set_font_name (prefs->font_variable, font); ++ prefs->font_variable = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontVariable")); ++ gtk_font_button_set_font_name (prefs->font_variable, font); + g_free (font); + g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable"); + g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs); +--- evolution-2.9.2/mail/em-mailer-prefs.h.gtk-font-button 2006-05-25 00:59:47.000000000 -0400 ++++ evolution-2.9.2/mail/em-mailer-prefs.h 2006-11-11 08:31:53.000000000 -0500 +@@ -39,7 +39,7 @@ + struct _GladeXML; + struct _GnomeColorPicker; + struct _GtkFileChooserbutton; +-struct _GnomeFontPicker; ++struct _GtkFontButton; + struct _GConfClient; + struct _GtkButton; + struct _GtkTreeView; +@@ -92,8 +92,8 @@ + struct _GtkFileChooserButton *notify_sound_file; + + /* HTML Mail tab */ +- struct _GnomeFontPicker *font_variable; +- struct _GnomeFontPicker *font_fixed; ++ struct _GtkFontButton *font_variable; ++ struct _GtkFontButton *font_fixed; + struct _GtkToggleButton *font_share; + + /* Loading Images */ +--- evolution-2.9.2/mail/mail-config.glade.gtk-font-button 2006-07-19 11:26:27.000000000 -0400 ++++ evolution-2.9.2/mail/mail-config.glade 2006-11-11 08:31:53.000000000 -0500 +@@ -3342,7 +3342,7 @@ + + + True +- S_end message receipts: ++ S_end message receipts: + True + False + GTK_JUSTIFY_LEFT +@@ -3352,8 +3352,8 @@ + 0.5 + 0 + 0 +- PANGO_ELLIPSIZE_NONE + receipt_policy_dropdown ++ PANGO_ELLIPSIZE_NONE + -1 + False + 0 +@@ -4700,14 +4700,14 @@ + + + +- ++ + True + True + Select HTML fixed width font +- GNOME_FONT_PICKER_MODE_FONT_INFO ++ True + True +- False +- 14 ++ False ++ False + True + + +@@ -4722,14 +4722,14 @@ + + + +- ++ + True + True + Select HTML variable width font +- GNOME_FONT_PICKER_MODE_FONT_INFO ++ True + True +- False +- 14 ++ False ++ False + True + + +@@ -6572,7 +6572,7 @@ + + + True +- ++ + False + False + GTK_JUSTIFY_LEFT +@@ -6675,7 +6675,7 @@ + + + True +- ++ + False + False + GTK_JUSTIFY_LEFT +@@ -6731,7 +6731,7 @@ + + + True +- ++ + False + False + GTK_JUSTIFY_LEFT +@@ -8484,14 +8484,14 @@ + + + +- ++ + True + True + Select HTML fixed width font for printing +- GNOME_FONT_PICKER_MODE_FONT_INFO ++ True + True +- False +- 14 ++ False ++ False + True + + +@@ -8506,14 +8506,14 @@ + + + +- ++ + True + True + Select HTML variable width font for printing +- GNOME_FONT_PICKER_MODE_FONT_INFO ++ True + True +- False +- 14 ++ False ++ False + True + + diff --git a/evolution.spec b/evolution.spec index c2fa013..6bab434 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,7 +10,7 @@ %define libbonoboui_version 2.4.2 %define libgnomeprint22_version 2.8.0 %define orbit2_version 2.9.8 -%define pilot_link_version 2:0.11.8 +%define pilot_link_version 2:0.12.1 %define redhat_menus_version 5.0.4 %define soup_version 2.2.2 @@ -85,60 +85,63 @@ Patch17: evolution-2.7.1-no-gnome-common.patch #Patch18: evolution-2.7.1-notification-cleanups.patch Patch19: evolution-2.6.0-prototypes.patch -# Gnome.org #343331 -Patch20: evolution-2.7.2.1-quit-resize-crash.patch +# RH bug #157400 / GNOME bug #303877 +Patch20: evolution-2.7.4-candidate-window-position-task.patch -# RH bug #157400 / Gnome.org bug #303877 -Patch21: evolution-2.7.4-candidate-window-position-task.patch +# RH bug #157505 / GNOME bug #303878 +Patch21: evolution-2.7.4-candidate-window-position-calendar.patch -# RH bug #157505 / Gnome.org bug #303878 -Patch22: evolution-2.7.4-candidate-window-position-calendar.patch +# RH bug #190359 / GNOME bug #211058 +Patch22: evolution-2.7.3-filter-datespec.patch -# RH bug #190359 / Gnome.org bug #211058 -Patch23: evolution-2.7.3-filter-datespec.patch +# RH bug #166231 / GNOME bug #264485 +Patch23: evolution-2.7.3-replicated-cjk-input.patch -# RH bug #166231 / Gnome.org bug #264485 -Patch24: evolution-2.7.3-replicated-cjk-input.patch - -# RH bug #178295 / Gnome.org bug #348638 -Patch25: evolution-2.7.4-deleting-preedit-buffer.patch +# RH bug #178295 / GNOME bug #348638 +Patch24: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #202289 -Patch26: evolution-2.7.92-fix-prgname.patch +Patch25: evolution-2.7.92-fix-prgname.patch -# RH bug #161885 / Gnome.org bug #309166 -Patch27: evolution-2.8.0-indic-cursor-movement.patch +# RH bug #161885 / GNOME bug #309166 +Patch26: evolution-2.8.0-indic-cursor-movement.patch -# Gnome.org bug #356177 -Patch28: evolution-2.8.0-kill-emutex.patch +# GNOME bug #356177 +Patch27: evolution-2.8.0-kill-emutex.patch -# Gnome.org bug #357216 -Patch29: evolution-2.8.0-deprecated-gdk-font.patch +# GNOME bug #357216 +Patch28: evolution-2.8.0-deprecated-gdk-font.patch -# Gnome.org bug #357970 -Patch30: evolution-2.8.0-more-deprecated.patch +# GNOME bug #357970 +Patch29: evolution-2.8.0-more-deprecated.patch -# RH bug #202751 / Gnome.org bug #355766 -Patch31: evolution-2.8.0-fix-indic-printing.patch +# RH bug #202751 / GNOME bug #355766 +Patch30: evolution-2.8.0-fix-indic-printing.patch -# Gnome.org bug #360946 -Patch34: evolution-2.8.1-about-dialog.patch +# GNOME bug #360946 +Patch31: evolution-2.8.1-about-dialog.patch -# Gnome.org bug #362638 -Patch35: evolution-2.8.1-kill-ethread.patch +# GNOME bug #362638 +Patch32: evolution-2.8.1-kill-ethread.patch -# Gnome.org bug #363695 -Patch36: evolution-2.9.1-kill-ememory.patch +# GNOME bug #363695 +Patch33: evolution-2.9.1-kill-ememory.patch # RH bug #176400 -Patch37: evolution-2.9.1-im-context-reset.patch +Patch34: evolution-2.9.1-im-context-reset.patch # RH bug #182247 -Patch38: evolution-2.9.1-first-ascii.patch +Patch35: evolution-2.9.1-first-ascii.patch + +# GNOME bug #373837 +Patch36: evolution-2.9.2-gtk-font-button.patch # Port evolution conduits to pilot-link 0.12 # http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html -Patch39: evolution-2.9.2-pilot-link-0.12.patch +Patch37: evolution-2.9.2-pilot-link-0.12.patch + +# RH bug #215466 / GNOME bug #377511 +Patch38: evolution-2.9.2-optional-participant.patch ## Dependencies ### @@ -261,24 +264,25 @@ Development files needed for building things which link against evolution. %patch17 -p1 -b .no-gnome-common #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 .fix-prgname -%patch27 -p1 -b .indic-cursor-movement -%patch28 -p1 -b .kill-emutex -%patch29 -p1 -b .deprecated-gdk-font -%patch30 -p1 -b .more-deprecated -%patch31 -p1 -b .fix-indic-printing -%patch34 -p1 -b .about-dialog -%patch35 -p1 -b .kill-ethread -%patch36 -p1 -b .kill-ememory -%patch37 -p1 -b .im-context-reset -%patch38 -p1 -b .first-ascii -%patch39 -p1 -b .pilot-link-0.12 +%patch20 -p1 -b .candidate-window-position-task +%patch21 -p1 -b .candidate-window-position-calendar +%patch22 -p1 -b .filter-datespec +%patch23 -p1 -b .replicated-cjk-input +%patch24 -p1 -b .deleting-preedit-buffer +%patch25 -p1 -b .fix-prgname +%patch26 -p1 -b .indic-cursor-movement +%patch27 -p1 -b .kill-emutex +%patch28 -p1 -b .deprecated-gdk-font +%patch29 -p1 -b .more-deprecated +%patch30 -p1 -b .fix-indic-printing +%patch31 -p1 -b .about-dialog +%patch32 -p1 -b .kill-ethread +%patch33 -p1 -b .kill-ememory +%patch34 -p1 -b .im-context-reset +%patch35 -p1 -b .first-ascii +%patch36 -p1 -b .gtk-font-button +%patch37 -p1 -b .pilot-link-0.12 +%patch38 -p1 -b .optional-participant mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -683,6 +687,9 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Nov 28 2006 Matthew Barnes - 2.9.2-3.fc7 - Add patch to port evolution conduits to pilot-link 0.12. +- Add patch for RH bug #215466 (optional meeting participants). +- Add patch for GNOME bug #373837 (use GtkFontButton). +- Remove patch for GNOME bug #343331 (fixed upstream). * Tue Nov 07 2006 Matthew Barnes - 2.9.2-2.fc7 - Revise patch for RH bug #202751 and re-enable it. From 293861cfede81013d319eaf183ce7a942b3fc1cc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 5 Dec 2006 12:36:29 +0000 Subject: [PATCH 083/844] - Update to 2.9.3 - Add patch for GNOME bug #382431 (implicit function declaration). - Remove patch for GNOME bug #357970 (fixed upstream). --- .cvsignore | 2 +- evolution-2.9.2-gtk-font-button.patch | 46 ------------------- evolution.spec | 63 +++++++++++++++------------ sources | 2 +- 4 files changed, 36 insertions(+), 77 deletions(-) diff --git a/.cvsignore b/.cvsignore index a8e20c4..f49f19c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.9.2.tar.bz2 +evolution-2.9.3.tar.bz2 diff --git a/evolution-2.9.2-gtk-font-button.patch b/evolution-2.9.2-gtk-font-button.patch index f3d4476..a218e05 100644 --- a/evolution-2.9.2-gtk-font-button.patch +++ b/evolution-2.9.2-gtk-font-button.patch @@ -75,25 +75,6 @@ /* Loading Images */ --- evolution-2.9.2/mail/mail-config.glade.gtk-font-button 2006-07-19 11:26:27.000000000 -0400 +++ evolution-2.9.2/mail/mail-config.glade 2006-11-11 08:31:53.000000000 -0500 -@@ -3342,7 +3342,7 @@ - - - True -- S_end message receipts: -+ S_end message receipts: - True - False - GTK_JUSTIFY_LEFT -@@ -3352,8 +3352,8 @@ - 0.5 - 0 - 0 -- PANGO_ELLIPSIZE_NONE - receipt_policy_dropdown -+ PANGO_ELLIPSIZE_NONE - -1 - False - 0 @@ -4700,14 +4700,14 @@ @@ -132,33 +113,6 @@ True -@@ -6572,7 +6572,7 @@ - - - True -- -+ - False - False - GTK_JUSTIFY_LEFT -@@ -6675,7 +6675,7 @@ - - - True -- -+ - False - False - GTK_JUSTIFY_LEFT -@@ -6731,7 +6731,7 @@ - - - True -- -+ - False - False - GTK_JUSTIFY_LEFT @@ -8484,14 +8484,14 @@ diff --git a/evolution.spec b/evolution.spec index 6bab434..c44df76 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.9.2 -Release: 3%{?dist} +Version: 2.9.3 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -112,36 +112,36 @@ Patch27: evolution-2.8.0-kill-emutex.patch # GNOME bug #357216 Patch28: evolution-2.8.0-deprecated-gdk-font.patch -# GNOME bug #357970 -Patch29: evolution-2.8.0-more-deprecated.patch - # RH bug #202751 / GNOME bug #355766 -Patch30: evolution-2.8.0-fix-indic-printing.patch +Patch29: evolution-2.8.0-fix-indic-printing.patch # GNOME bug #360946 -Patch31: evolution-2.8.1-about-dialog.patch +Patch30: evolution-2.8.1-about-dialog.patch # GNOME bug #362638 -Patch32: evolution-2.8.1-kill-ethread.patch +Patch31: evolution-2.8.1-kill-ethread.patch # GNOME bug #363695 -Patch33: evolution-2.9.1-kill-ememory.patch +Patch32: evolution-2.9.1-kill-ememory.patch # RH bug #176400 -Patch34: evolution-2.9.1-im-context-reset.patch +Patch33: evolution-2.9.1-im-context-reset.patch # RH bug #182247 -Patch35: evolution-2.9.1-first-ascii.patch +Patch34: evolution-2.9.1-first-ascii.patch # GNOME bug #373837 -Patch36: evolution-2.9.2-gtk-font-button.patch +Patch35: evolution-2.9.2-gtk-font-button.patch # Port evolution conduits to pilot-link 0.12 # http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html -Patch37: evolution-2.9.2-pilot-link-0.12.patch +Patch36: evolution-2.9.2-pilot-link-0.12.patch # RH bug #215466 / GNOME bug #377511 -Patch38: evolution-2.9.2-optional-participant.patch +Patch37: evolution-2.9.2-optional-participant.patch + +# GNOME bug #382431 +Patch38: evolution-2.9.3-implicit-function-declaration.patch ## Dependencies ### @@ -273,16 +273,16 @@ Development files needed for building things which link against evolution. %patch26 -p1 -b .indic-cursor-movement %patch27 -p1 -b .kill-emutex %patch28 -p1 -b .deprecated-gdk-font -%patch29 -p1 -b .more-deprecated -%patch30 -p1 -b .fix-indic-printing -%patch31 -p1 -b .about-dialog -%patch32 -p1 -b .kill-ethread -%patch33 -p1 -b .kill-ememory -%patch34 -p1 -b .im-context-reset -%patch35 -p1 -b .first-ascii -%patch36 -p1 -b .gtk-font-button -%patch37 -p1 -b .pilot-link-0.12 -%patch38 -p1 -b .optional-participant +%patch29 -p1 -b .fix-indic-printing +%patch30 -p1 -b .about-dialog +%patch31 -p1 -b .kill-ethread +%patch32 -p1 -b .kill-ememory +%patch33 -p1 -b .im-context-reset +%patch34 -p1 -b .first-ascii +%patch35 -p1 -b .gtk-font-button +%patch36 -p1 -b .pilot-link-0.12 +%patch37 -p1 -b .optional-participant +%patch38 -p1 -b .implicit-function-declaration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -401,7 +401,7 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la %endif # scrollkeeper gets handled in %post -rm -rf $RPM_BUILD_ROOT/var/scrollkeeper +rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-mail.desktop \ @@ -414,10 +414,10 @@ ln -sf %{_datadir}/desktop-menu-patches/redhat-evolution-tasks.desktop \ $RPM_BUILD_ROOT/%{_datadir}/applications/redhat-evolution-tasks.desktop # remove upstream desktop file; use the symlinks from above (#103826) -rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution-%{evo_major}.desktop +rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution-%{evo_major}.keys -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution-%{evo_major}.mime +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys +rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime # evolution link ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution @@ -465,7 +465,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/redhat-evolution-tasks.desktop # Online help: -%{_datadir}/gnome/help/evolution-%{evo_major} +%{_datadir}/gnome/help/evolution %{_datadir}/omf/evolution # IDL files (should this be in devel subpackage?) @@ -685,6 +685,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Dec 04 2006 Matthew Barnes - 2.9.3-1.fc7 +- Update to 2.9.3 +- Add patch for GNOME bug #382431 (implicit function declaration). +- Remove patch for GNOME bug #357970 (fixed upstream). + * Tue Nov 28 2006 Matthew Barnes - 2.9.2-3.fc7 - Add patch to port evolution conduits to pilot-link 0.12. - Add patch for RH bug #215466 (optional meeting participants). diff --git a/sources b/sources index b4475f9..c4635e7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d6e24a907faed31cc809455e5b0eef47 evolution-2.9.2.tar.bz2 +03c29ef09dbd1b04623f736cbd8e14a7 evolution-2.9.3.tar.bz2 From 78a6160ab1b969f67b3a26d0572142541ee2ec83 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 8 Dec 2006 00:53:17 +0000 Subject: [PATCH 084/844] - Update to 2.9.3 - Configure with scrollkeeper disabled. - Ship our own icons from gnome-icon-theme. - Add patch for RH bug #215695 (crashes w/o mail accounts). - Add patch for RH bug #216537 (viewing attachments). - Add patch for GNOME bug #350253 (ship our own icons). - Add patch for GNOME bug #382431 (implicit function declaration). - Revise patch for GNOME bug #360946 (improved "about" dialog). - Remove patch for GNOME bug #357970 (fixed upstream). --- .cvsignore | 5 +++++ evolution.spec | 49 ++++++++++++++++++++++++++++++++++++++++++++----- sources | 5 +++++ 3 files changed, 54 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f49f19c..44e9f8d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,6 @@ evolution-2.9.3.tar.bz2 +evolution16.png +evolution22.png +evolution24.png +evolution32.png +evolution.svg diff --git a/evolution.spec b/evolution.spec index c44df76..16d1489 100644 --- a/evolution.spec +++ b/evolution.spec @@ -50,6 +50,11 @@ Summary: GNOME's next-generation groupware suite URL: http://www.gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: %{name}-%{version}.tar.bz2 +Source1: evolution16.png +Source2: evolution22.png +Source3: evolution24.png +Source4: evolution32.png +Source5: evolution.svg ### Patches ### @@ -143,6 +148,15 @@ Patch37: evolution-2.9.2-optional-participant.patch # GNOME bug #382431 Patch38: evolution-2.9.3-implicit-function-declaration.patch +# RH bug #215695 / GNOME bug #383027 +Patch39: evolution-2.9.3-dont-assume-default-account.patch + +# RH bug #216537 / GNOME bug #383047 +Patch40: evolution-2.9.3-view-attachment-uri.patch + +# GNOME bug #350253 +Patch41: evolution-2.9.3-adopt-icons.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -283,11 +297,24 @@ Development files needed for building things which link against evolution. %patch36 -p1 -b .pilot-link-0.12 %patch37 -p1 -b .optional-participant %patch38 -p1 -b .implicit-function-declaration +%patch39 -p1 -b .dont-assume-default-account +%patch40 -p1 -b .view-attachment-uri +%patch41 -p1 -b .adopt-icons mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/%{_lib} +# GNOME bug #350253 +cd art +mkdir 16x16; cp %{SOURCE1} 16x16/evolution.png +mkdir 22x22; cp %{SOURCE2} 22x22/evolution.png +mkdir 24x24; cp %{SOURCE3} 24x24/evolution.png +mkdir 32x32; cp %{SOURCE4} 32x32/evolution.png +mkdir scalable; cp %{SOURCE5} scalable/evolution.svg +rm about-box.png bcg.png evolution.png monkey-16.png +cd - + %build # define all of our flags, this is kind of ugly :( %if %{ldap_support} @@ -366,6 +393,7 @@ intltoolize --force autoconf %configure \ + --disable-scrollkeeper \ --enable-gtk-doc \ --enable-ipv6 \ --enable-file-locking=fcntl --enable-dot-locking=no \ @@ -434,11 +462,11 @@ SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evol for S in $SCHEMAS; do gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null done -scrollkeeper-update +scrollkeeper-update -q %postun /sbin/ldconfig -scrollkeeper-update +scrollkeeper-update -q %clean rm -rf $RPM_BUILD_ROOT @@ -468,6 +496,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gnome/help/evolution %{_datadir}/omf/evolution +# Icons: +%{_datadir}/icons/hicolor/16x16/apps/evolution.png +%{_datadir}/icons/hicolor/22x22/apps/evolution.png +%{_datadir}/icons/hicolor/24x24/apps/evolution.png +%{_datadir}/icons/hicolor/32x32/apps/evolution.png +%{_datadir}/icons/hicolor/scalable/apps/evolution.svg + # IDL files (should this be in devel subpackage?) %{_datadir}/idl/evolution-%{evo_major} @@ -476,8 +511,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/evolution %{_datadir}/evolution/%{evo_major} -%{_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 @@ -685,9 +718,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Mon Dec 04 2006 Matthew Barnes - 2.9.3-1.fc7 +* Thu Dec 07 2006 Matthew Barnes - 2.9.3-1.fc7 - Update to 2.9.3 +- Configure with scrollkeeper disabled. +- Ship our own icons from gnome-icon-theme. +- Add patch for RH bug #215695 (crashes w/o mail accounts). +- Add patch for RH bug #216537 (viewing attachments). +- Add patch for GNOME bug #350253 (ship our own icons). - Add patch for GNOME bug #382431 (implicit function declaration). +- Revise patch for GNOME bug #360946 (improved "about" dialog). - Remove patch for GNOME bug #357970 (fixed upstream). * Tue Nov 28 2006 Matthew Barnes - 2.9.2-3.fc7 diff --git a/sources b/sources index c4635e7..ba8849a 100644 --- a/sources +++ b/sources @@ -1 +1,6 @@ 03c29ef09dbd1b04623f736cbd8e14a7 evolution-2.9.3.tar.bz2 +4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png +de663fa442d61f53dc058dd20c77da8e evolution22.png +d33896d33b5db2201e051664e96b1100 evolution24.png +2fa4ce12c94153aca9af465e1a1819c8 evolution32.png +e85874e8d480a9c82bc155da396a54e4 evolution.svg From f3fdffe29ffe809becef1d2333d939ce55273dea Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 8 Dec 2006 01:04:09 +0000 Subject: [PATCH 085/844] - Forgot to check-in evolution-2.9.3-view-attachment-uri.patch. --- evolution-2.9.3-view-attachment-uri.patch | 46 +++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 evolution-2.9.3-view-attachment-uri.patch diff --git a/evolution-2.9.3-view-attachment-uri.patch b/evolution-2.9.3-view-attachment-uri.patch new file mode 100644 index 0000000..a506488 --- /dev/null +++ b/evolution-2.9.3-view-attachment-uri.patch @@ -0,0 +1,46 @@ +--- evolution-2.9.3/mail/mail-ops.c.view-attachment-uri 2006-12-06 10:26:24.000000000 -0500 ++++ evolution-2.9.3/mail/mail-ops.c 2006-12-06 11:16:46.000000000 -0500 +@@ -2089,21 +2089,23 @@ + save_part_save (struct _mail_msg *mm) + { + struct _save_part_msg *m = (struct _save_part_msg *)mm; ++ mode_t mode = S_IRUSR | S_IRGRP | S_IROTH; ++ int flags = O_WRONLY | O_CREAT | O_TRUNC; + CamelDataWrapper *content; + CamelStream *stream; +- +- if(!m->readonly){ +- if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { +- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, +- _("Cannot create output file: %s:\n %s"), +- m->path, g_strerror (errno)); +- return; +- } +- } else if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0444))) { ++ gchar *uri; ++ ++ uri = g_filename_to_uri (m->path, NULL, NULL); ++ ++ if (!m->readonly) ++ mode |= S_IWUSR; ++ ++ stream = camel_stream_vfs_new_with_uri (uri, flags, mode); ++ if (stream == NULL) { + camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, + _("Cannot create output file: %s:\n %s"), + m->path, g_strerror (errno)); +- return; ++ goto exit; + } + + content = camel_medium_get_content_object (CAMEL_MEDIUM (m->part)); +@@ -2115,6 +2117,9 @@ + g_strerror (errno)); + + camel_object_unref (stream); ++ ++exit: ++ g_free (uri); + } + + static void From 02b5af48ae9e9607df1b0da98cb4ebba2858b704 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 10 Dec 2006 00:48:58 +0000 Subject: [PATCH 086/844] - Update to 2.9.3 - Configure with scrollkeeper disabled. - Ship our own icons from gnome-icon-theme. - Explicitly turn off automake portability checking. - Add patch for RH bug #215478 (Maildir and MH accounts). - Add patch for RH bug #215695 (crashes w/o mail accounts). - Add patch for RH bug #216537 (viewing attachments). - Add patch for RH bug #218801 (count unread messages first). - Add patch for GNOME bug #350253 (ship our own icons). - Add patch for GNOME bug #382431 (implicit function declaration). - Revise patch for GNOME bug #360946 (improved "about" dialog). - Remove patch for GNOME bug #357970 (fixed upstream). --- evolution-2.9.3-source-path-entry.patch | 19 ++++++++ evolution-2.9.3-unread-messages.patch | 63 +++++++++++++++++++++++++ evolution.spec | 22 ++++++--- 3 files changed, 97 insertions(+), 7 deletions(-) create mode 100644 evolution-2.9.3-source-path-entry.patch create mode 100644 evolution-2.9.3-unread-messages.patch diff --git a/evolution-2.9.3-source-path-entry.patch b/evolution-2.9.3-source-path-entry.patch new file mode 100644 index 0000000..2a6337a --- /dev/null +++ b/evolution-2.9.3-source-path-entry.patch @@ -0,0 +1,19 @@ +--- evolution-2.9.3/mail/mail-config.glade.source-path-entry 2006-12-08 20:15:16.000000000 -0500 ++++ evolution-2.9.3/mail/mail-config.glade 2006-12-08 20:16:13.000000000 -0500 +@@ -1343,7 +1343,7 @@ + + True + Mailbox location +- GTK_FILE_CHOOSER_ACTION_OPEN ++ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER + True + False + False +@@ -1354,7 +1354,6 @@ + 2 + 2 + 3 +- fill + + + diff --git a/evolution-2.9.3-unread-messages.patch b/evolution-2.9.3-unread-messages.patch new file mode 100644 index 0000000..9eb3b97 --- /dev/null +++ b/evolution-2.9.3-unread-messages.patch @@ -0,0 +1,63 @@ +--- evolution-2.9.3/mail/em-folder-properties.c.unread-messages 2006-12-09 09:00:08.000000000 -0500 ++++ evolution-2.9.3/mail/em-folder-properties.c 2006-12-09 09:00:09.000000000 -0500 +@@ -145,27 +145,27 @@ + gtk_widget_show (table); + gtk_box_pack_start ((GtkBox *) parent, table, TRUE, TRUE, 0); + +- /* TODO: can this be done in a loop? */ + /* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */ +- label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total)); ++ label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread)); + gtk_widget_show (label); + gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); + gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); + +- sprintf(countstr, "%d", prop_data->total); ++ sprintf(countstr, "%d", prop_data->unread); + label = gtk_label_new (countstr); + gtk_widget_show (label); + gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5); + gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 0, 0); + row++; + ++ /* TODO: can this be done in a loop? */ + /* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */ +- label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread)); ++ label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total)); + gtk_widget_show (label); + gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); + gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); + +- sprintf(countstr, "%d", prop_data->unread); ++ sprintf(countstr, "%d", prop_data->total); + label = gtk_label_new (countstr); + gtk_widget_show (label); + gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5); +--- evolution-2.9.3/mail/mail-component.c.unread-messages 2006-12-09 09:00:08.000000000 -0500 ++++ evolution-2.9.3/mail/mail-component.c 2006-12-09 09:00:09.000000000 -0500 +@@ -544,6 +544,9 @@ + || g_ascii_strcasecmp(emfv->folder->full_name, ".") == 0) + bits |= 8; + ++ if (selected->len > 1) ++ g_string_append_printf(tmp, ngettext ("%d selected, ", "%d selected, ", selected->len), selected->len); ++ + if (bits == 1) + g_string_append_printf(tmp, ngettext ("%d draft", "%d drafts", visible), visible); + else if (bits == 2) +@@ -553,13 +556,11 @@ + else { + if (!emfv->hide_deleted) + visible += deleted; ++ if (unread && selected->len <= 1) ++ g_string_append_printf(tmp, ngettext ("%d unread, ", "%d unread, ", unread), unread); + g_string_append_printf(tmp, ngettext ("%d total", "%d total", visible), visible); +- if (unread && selected->len <=1) +- g_string_append_printf(tmp, ngettext (", %d unread", ", %d unread", unread), unread); + } + +- if (selected->len > 1) +- g_string_append_printf(tmp, ngettext (", %d selected", ", %d selected", selected->len), selected->len); + message_list_free_uids(emfv->list, selected); + } + diff --git a/evolution.spec b/evolution.spec index 16d1489..670b597 100644 --- a/evolution.spec +++ b/evolution.spec @@ -157,6 +157,12 @@ Patch40: evolution-2.9.3-view-attachment-uri.patch # GNOME bug #350253 Patch41: evolution-2.9.3-adopt-icons.patch +# RH bug #215478 / GNOME bug #383842 +Patch42: evolution-2.9.3-source-path-entry.patch + +# RH bug #218801 / GNOME bug #383953 +Patch43: evolution-2.9.3-unread-messages.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -300,6 +306,8 @@ Development files needed for building things which link against evolution. %patch39 -p1 -b .dont-assume-default-account %patch40 -p1 -b .view-attachment-uri %patch41 -p1 -b .adopt-icons +%patch42 -p1 -b .source-path-entry +%patch43 -p1 -b .unread-messages mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -385,12 +393,9 @@ CFLAGS="$CFLAGS \ %endif # Rerun the GNU Autotools since we patched some of the input files. -aclocal -autoheader -automake -libtoolize -intltoolize --force -autoconf +# Note: Automake 1.10 enables portability checking by default, which +# breaks compilation. So we have to explicitly disable it. +autoreconf --warnings=no-portability %configure \ --disable-scrollkeeper \ @@ -718,12 +723,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Thu Dec 07 2006 Matthew Barnes - 2.9.3-1.fc7 +* Thu Dec 09 2006 Matthew Barnes - 2.9.3-1.fc7 - Update to 2.9.3 - Configure with scrollkeeper disabled. - Ship our own icons from gnome-icon-theme. +- Explicitly turn off automake portability checking. +- Add patch for RH bug #215478 (Maildir and MH accounts). - Add patch for RH bug #215695 (crashes w/o mail accounts). - Add patch for RH bug #216537 (viewing attachments). +- Add patch for RH bug #218801 (count unread messages first). - Add patch for GNOME bug #350253 (ship our own icons). - Add patch for GNOME bug #382431 (implicit function declaration). - Revise patch for GNOME bug #360946 (improved "about" dialog). From a3313eef284ce8415306466b2883290e5f8e7b61 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 10 Dec 2006 01:28:30 +0000 Subject: [PATCH 087/844] - Fix a problem with the autoreconf line. --- evolution.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 670b597..7272ca5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -393,9 +393,8 @@ CFLAGS="$CFLAGS \ %endif # Rerun the GNU Autotools since we patched some of the input files. -# Note: Automake 1.10 enables portability checking by default, which -# breaks compilation. So we have to explicitly disable it. -autoreconf --warnings=no-portability +# Disable portability checking to keep automake 1.10 quiet. +ACLOCAL="aclocal -I ." autoreconf --warnings=no-portability %configure \ --disable-scrollkeeper \ @@ -726,8 +725,8 @@ rm -rf $RPM_BUILD_ROOT * Thu Dec 09 2006 Matthew Barnes - 2.9.3-1.fc7 - Update to 2.9.3 - Configure with scrollkeeper disabled. +- Disable automake portability checking. - Ship our own icons from gnome-icon-theme. -- Explicitly turn off automake portability checking. - Add patch for RH bug #215478 (Maildir and MH accounts). - Add patch for RH bug #215695 (crashes w/o mail accounts). - Add patch for RH bug #216537 (viewing attachments). From 80c3042b98a48cad49a0f940bdc82106133e6629 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 10 Dec 2006 01:37:46 +0000 Subject: [PATCH 088/844] - Try again. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 7272ca5..be17d14 100644 --- a/evolution.spec +++ b/evolution.spec @@ -394,7 +394,7 @@ CFLAGS="$CFLAGS \ # Rerun the GNU Autotools since we patched some of the input files. # Disable portability checking to keep automake 1.10 quiet. -ACLOCAL="aclocal -I ." autoreconf --warnings=no-portability +autoreconf --include=. --warnings=no-portability %configure \ --disable-scrollkeeper \ From 5157232202942451aa67fa457f25cb33fc8ec752 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 10 Dec 2006 02:02:48 +0000 Subject: [PATCH 089/844] - And again. --- evolution.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index be17d14..98737bd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -394,7 +394,9 @@ CFLAGS="$CFLAGS \ # Rerun the GNU Autotools since we patched some of the input files. # Disable portability checking to keep automake 1.10 quiet. -autoreconf --include=. --warnings=no-portability +# See GNOME bug #355521 for why ACLOCAL_FLAGS is needed. +export ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS" +autoreconf --warnings=no-portability %configure \ --disable-scrollkeeper \ From c033adbde7ae6840f6cbbf03e38a95a78e0b7861 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 10 Dec 2006 02:22:24 +0000 Subject: [PATCH 090/844] - Think I got it this time. --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 98737bd..df17cc8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -163,6 +163,9 @@ Patch42: evolution-2.9.3-source-path-entry.patch # RH bug #218801 / GNOME bug #383953 Patch43: evolution-2.9.3-unread-messages.patch +# Look for m4 files in local directory. +Patch44: evolution-2.9.3-aclocal-flags.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -308,6 +311,7 @@ Development files needed for building things which link against evolution. %patch41 -p1 -b .adopt-icons %patch42 -p1 -b .source-path-entry %patch43 -p1 -b .unread-messages +%patch44 -p1 -b .aclocal-flags mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -394,8 +398,6 @@ CFLAGS="$CFLAGS \ # Rerun the GNU Autotools since we patched some of the input files. # Disable portability checking to keep automake 1.10 quiet. -# See GNOME bug #355521 for why ACLOCAL_FLAGS is needed. -export ACLOCAL_FLAGS="-I . $ACLOCAL_FLAGS" autoreconf --warnings=no-portability %configure \ From 8f9807bdd707132e0c49847686d9ab54dbd52bd9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 10 Dec 2006 02:41:06 +0000 Subject: [PATCH 091/844] - Dammit. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index df17cc8..4384285 100644 --- a/evolution.spec +++ b/evolution.spec @@ -398,7 +398,7 @@ CFLAGS="$CFLAGS \ # Rerun the GNU Autotools since we patched some of the input files. # Disable portability checking to keep automake 1.10 quiet. -autoreconf --warnings=no-portability +autoreconf --force --warnings=no-portability %configure \ --disable-scrollkeeper \ From 77a33185ccabd7175271c1c0b54cd0492aaac78d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 10 Dec 2006 03:13:13 +0000 Subject: [PATCH 092/844] - BuildRequires: gnome-doc-utils --- evolution.spec | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 4384285..33fc8cc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -2,6 +2,7 @@ %define dbus_glib_version 0.70 %define dbus_version 0.90 %define eds_version 1.9.1 +%define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 %define gnomevfs2_version 2.4 @@ -163,9 +164,6 @@ Patch42: evolution-2.9.3-source-path-entry.patch # RH bug #218801 / GNOME bug #383953 Patch43: evolution-2.9.3-unread-messages.patch -# Look for m4 files in local directory. -Patch44: evolution-2.9.3-aclocal-flags.patch - ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -204,6 +202,7 @@ BuildRequires: desktop-file-utils BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: flex BuildRequires: gettext +BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} BuildRequires: gnutls-devel BuildRequires: gtk-doc @@ -311,7 +310,6 @@ Development files needed for building things which link against evolution. %patch41 -p1 -b .adopt-icons %patch42 -p1 -b .source-path-entry %patch43 -p1 -b .unread-messages -%patch44 -p1 -b .aclocal-flags mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -731,6 +729,7 @@ rm -rf $RPM_BUILD_ROOT - Configure with scrollkeeper disabled. - Disable automake portability checking. - Ship our own icons from gnome-icon-theme. +- BuildRequires: gnome-doc-utils >= 0.8.0 - Add patch for RH bug #215478 (Maildir and MH accounts). - Add patch for RH bug #215695 (crashes w/o mail accounts). - Add patch for RH bug #216537 (viewing attachments). From 73c9897eb9dfe7bd613cf72df8be2de1bc0497cd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 12 Dec 2006 12:08:23 +0000 Subject: [PATCH 093/844] - Add patch for RH bug #215467 (missing meeting participants). --- evolution-2.9.3-meeting-list-view.patch | 86 +++++++++++++++++++++++++ evolution.spec | 9 ++- 2 files changed, 94 insertions(+), 1 deletion(-) create mode 100644 evolution-2.9.3-meeting-list-view.patch diff --git a/evolution-2.9.3-meeting-list-view.patch b/evolution-2.9.3-meeting-list-view.patch new file mode 100644 index 0000000..9b87a14 --- /dev/null +++ b/evolution-2.9.3-meeting-list-view.patch @@ -0,0 +1,86 @@ +--- evolution-2.9.3/calendar/gui/e-meeting-list-view.c.meeting-list-view 2006-12-11 23:13:47.000000000 -0500 ++++ evolution-2.9.3/calendar/gui/e-meeting-list-view.c 2006-12-11 23:14:17.000000000 -0500 +@@ -623,18 +623,45 @@ + + } + ++void ++attendee_added_cb (EMeetingStore *store, GtkTreePath *path, ++ GtkTreeIter *iter, EMeetingListView *view) ++{ ++ EMeetingAttendee *attendee; ++ gint row; ++ ++ /* Add the new attendee to the name selector. */ ++ row = gtk_tree_path_get_indices (path) [0]; ++ attendee = e_meeting_store_find_attendee_at_row (store, row); ++ e_meeting_list_view_add_attendee_to_name_selector (view, attendee); ++} ++ ++void ++attendee_deleted_cb (EMeetingStore *store, GtkTreePath *path, ++ EMeetingListView *view) ++{ ++ EMeetingAttendee *attendee; ++ gint row; ++ ++ /* Remove the old attendee from the name selector. */ ++ row = gtk_tree_path_get_indices (path) [0]; ++ attendee = e_meeting_store_find_attendee_at_row (store, row); ++ e_meeting_list_view_remove_attendee_from_name_selector (view, attendee); ++} + + EMeetingListView * + e_meeting_list_view_new (EMeetingStore *store) + { +- EMeetingListView *view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL); ++ EMeetingListView *view; + GtkTreeSelection *selection; + +- if (view) { +- view->priv->store = store; +- gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store)); +- build_table (view); +- } ++ view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL); ++ view->priv->store = store; ++ gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store)); ++ build_table (view); ++ ++ g_signal_connect (store, "row-inserted", G_CALLBACK (attendee_added_cb), view); ++ g_signal_connect (store, "row-deleted", G_CALLBACK (attendee_deleted_cb), view); + + selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view)); + g_signal_connect (selection, "changed", G_CALLBACK (row_activated_cb), view); +--- evolution-2.9.3/calendar/gui/e-meeting-store.c.meeting-list-view 2006-12-04 10:44:42.000000000 -0500 ++++ evolution-2.9.3/calendar/gui/e-meeting-store.c 2006-12-11 23:14:17.000000000 -0500 +@@ -794,14 +794,13 @@ + } + + if (row != -1) { +- +- g_ptr_array_remove_index (store->priv->attendees, row); +- g_object_unref (attendee); +- + path = gtk_tree_path_new (); + gtk_tree_path_append_index (path, row); + gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path); + gtk_tree_path_free (path); ++ ++ g_ptr_array_remove_index (store->priv->attendees, row); ++ g_object_unref (attendee); + } + } + +@@ -815,10 +814,10 @@ + + for (i = 0; i < store->priv->attendees->len; i++) { + EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, i); +- g_object_unref (attendee); + + gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path); + gtk_tree_path_next (path); ++ g_object_unref (attendee); + } + + g_ptr_array_set_size (store->priv->attendees, 0); diff --git a/evolution.spec b/evolution.spec index 33fc8cc..04ade1f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -164,6 +164,9 @@ Patch42: evolution-2.9.3-source-path-entry.patch # RH bug #218801 / GNOME bug #383953 Patch43: evolution-2.9.3-unread-messages.patch +# RH bug #215467 / GNOME bug #380644 +Patch44: evolution-2.9.3-meeting-list-view.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -310,6 +313,7 @@ Development files needed for building things which link against evolution. %patch41 -p1 -b .adopt-icons %patch42 -p1 -b .source-path-entry %patch43 -p1 -b .unread-messages +%patch44 -p1 -b .meeting-list-view mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -724,6 +728,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Dec 11 2006 Matthew Barnes - 2.9.3-2.fc7 +- Add patch for RH bug #215467 (missing meeting participants). + * Thu Dec 09 2006 Matthew Barnes - 2.9.3-1.fc7 - Update to 2.9.3 - Configure with scrollkeeper disabled. From 5d65739a2d35188b3b6dc9e281c747e873a0a66c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 13 Dec 2006 03:46:24 +0000 Subject: [PATCH 094/844] - Revise patch for RH bug #215466 to also fix RH bug #218589. --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 04ade1f..ea61b10 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -143,7 +143,7 @@ Patch35: evolution-2.9.2-gtk-font-button.patch # http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html Patch36: evolution-2.9.2-pilot-link-0.12.patch -# RH bug #215466 / GNOME bug #377511 +# RH bug #215466 / RH bug #218589 / GNOME bug #377511 Patch37: evolution-2.9.2-optional-participant.patch # GNOME bug #382431 @@ -728,6 +728,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Dec 12 2006 Matthew Barnes - 2.9.3-3.fc7 +- Revise patch for RH bug #215466 to also fix RH bug #218589. + * Mon Dec 11 2006 Matthew Barnes - 2.9.3-2.fc7 - Add patch for RH bug #215467 (missing meeting participants). From 32137158e19ec5c8cbf1fa27c687a78e99c69445 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 15 Dec 2006 17:18:03 +0000 Subject: [PATCH 095/844] - Disable patch for RH bug #216537, which caused RH bug #219228. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index ea61b10..2be0e84 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -153,7 +153,7 @@ Patch38: evolution-2.9.3-implicit-function-declaration.patch Patch39: evolution-2.9.3-dont-assume-default-account.patch # RH bug #216537 / GNOME bug #383047 -Patch40: evolution-2.9.3-view-attachment-uri.patch +#Patch40: evolution-2.9.3-view-attachment-uri.patch # GNOME bug #350253 Patch41: evolution-2.9.3-adopt-icons.patch @@ -309,7 +309,7 @@ Development files needed for building things which link against evolution. %patch37 -p1 -b .optional-participant %patch38 -p1 -b .implicit-function-declaration %patch39 -p1 -b .dont-assume-default-account -%patch40 -p1 -b .view-attachment-uri +#%patch40 -p1 -b .view-attachment-uri %patch41 -p1 -b .adopt-icons %patch42 -p1 -b .source-path-entry %patch43 -p1 -b .unread-messages @@ -728,6 +728,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Dec 15 2006 Matthew Barnes - 2.9.3-4.fc7 +- Disable patch for RH bug #216537, which caused RH bug #219228. + * Tue Dec 12 2006 Matthew Barnes - 2.9.3-3.fc7 - Revise patch for RH bug #215466 to also fix RH bug #218589. From 63c04d7f8effcfe830ec14309ebf22c32d454683 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 19 Dec 2006 22:24:50 +0000 Subject: [PATCH 096/844] - Update to 2.9.4 - Bump eds_version to 1.9.4 due to soname changes. - Remove patch for GNOME bug #382431 (fixed upstream). --- .cvsignore | 2 +- evolution-2.9.3-gtk-color-button.patch | 1214 ++++++++++++++++++++++++ evolution.spec | 23 +- sources | 2 +- 4 files changed, 1232 insertions(+), 9 deletions(-) create mode 100644 evolution-2.9.3-gtk-color-button.patch diff --git a/.cvsignore b/.cvsignore index 44e9f8d..608895c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,4 +1,4 @@ -evolution-2.9.3.tar.bz2 +evolution-2.9.4.tar.bz2 evolution16.png evolution22.png evolution24.png diff --git a/evolution-2.9.3-gtk-color-button.patch b/evolution-2.9.3-gtk-color-button.patch new file mode 100644 index 0000000..4414672 --- /dev/null +++ b/evolution-2.9.3-gtk-color-button.patch @@ -0,0 +1,1214 @@ +--- evolution-2.9.4/mail/em-composer-prefs.c.gtk-color-button 2006-07-11 12:47:09.000000000 -0400 ++++ evolution-2.9.4/mail/em-composer-prefs.c 2006-12-19 16:07:37.000000000 -0500 +@@ -56,9 +56,8 @@ + #include + #include + #include +- ++#include + #include +-#include + + #include + +@@ -545,7 +544,7 @@ + GtkTreeIter iter; + GError *err = NULL; + char **strv = NULL; +- guint r, g, b; ++ GdkColor color; + gboolean go; + char *lang; + int i; +@@ -580,21 +579,33 @@ + if (strv != NULL) + g_strfreev (strv); + +- r = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_red", NULL); +- g = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_green", NULL); +- b = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", NULL); +- +- gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (prefs->colour), r, g, b, 0xffff); ++ color.red = gconf_client_get_int (prefs->gconf, ++ GNOME_SPELL_GCONF_DIR "/spell_error_color_red", NULL); ++ color.green = gconf_client_get_int (prefs->gconf, ++ GNOME_SPELL_GCONF_DIR "/spell_error_color_green", NULL); ++ color.blue = gconf_client_get_int (prefs->gconf, ++ GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", NULL); ++ gtk_color_button_set_color (GTK_COLOR_BUTTON (prefs->color), &color); + + prefs->spell_active = TRUE; + } + + static void +-spell_color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, EMComposerPrefs *prefs) ++spell_color_set (GtkColorButton *color_button, EMComposerPrefs *prefs) + { +- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_red", r, NULL); +- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_green", g, NULL); +- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", b, NULL); ++ GdkColor color; ++ ++ gtk_color_button_get_color (GTK_COLOR_BUTTON (color_button), &color); ++ ++ gconf_client_set_int (prefs->gconf, ++ GNOME_SPELL_GCONF_DIR "/spell_error_color_red", ++ color.red, NULL); ++ gconf_client_set_int (prefs->gconf, ++ GNOME_SPELL_GCONF_DIR "/spell_error_color_green", ++ color.green, NULL); ++ gconf_client_set_int (prefs->gconf, ++ GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", ++ color.blue, NULL); + } + + static char * +@@ -676,7 +687,7 @@ + + spell_set_ui (prefs); + +- widget = glade_xml_get_widget (prefs->gui, "colorpickerSpellCheckColor"); ++ widget = glade_xml_get_widget (prefs->gui, "colorButtonSpellCheckColor"); + g_signal_connect (widget, "color_set", G_CALLBACK (spell_color_set), prefs); + } + +@@ -922,7 +933,7 @@ + g_free (buf); + + /* Spell Checking: GNOME Spell part */ +- prefs->colour = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerSpellCheckColor")); ++ prefs->color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, "colorButtonSpellCheckColor")); + prefs->language = GTK_TREE_VIEW (glade_xml_get_widget (gui, "listSpellCheckLanguage")); + model = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER); + gtk_tree_view_set_model (prefs->language, (GtkTreeModel *) model); +@@ -942,7 +953,7 @@ + info_pixmap = glade_xml_get_widget (gui, "pixmapSpellInfo"); + gtk_image_set_from_stock (GTK_IMAGE (info_pixmap), GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON); + if (!spell_setup_check_options (prefs)) { +- gtk_widget_hide (GTK_WIDGET (prefs->colour)); ++ gtk_widget_hide (GTK_WIDGET (prefs->color)); + gtk_widget_hide (GTK_WIDGET (prefs->language)); + } + +--- evolution-2.9.4/mail/mail-config.glade.gtk-color-button 2006-12-19 16:06:48.000000000 -0500 ++++ evolution-2.9.4/mail/mail-config.glade 2006-12-19 16:07:37.000000000 -0500 +@@ -5138,10 +5138,9 @@ + + + +- ++ + True + True +- True + False + Pick a color + True +@@ -6079,10 +6078,9 @@ + 6 + + +- ++ + True + True +- True + False + Pick a color + True +@@ -6098,10 +6096,9 @@ + + + +- ++ + True + True +- True + False + Pick a color + True +@@ -6117,10 +6114,9 @@ + + + +- ++ + True + True +- True + False + Pick a color + True +@@ -6136,10 +6132,9 @@ + + + +- ++ + True + True +- True + False + Pick a color + True +@@ -6155,10 +6150,9 @@ + + + +- ++ + True + True +- True + False + Pick a color + True +@@ -8315,7 +8309,7 @@ + 0.5 + 0 + 0 +- colorpickerSpellCheckColor ++ colorButtonSpellCheckColor + PANGO_ELLIPSIZE_NONE + -1 + False +@@ -8329,10 +8323,9 @@ + + + +- ++ + True + True +- True + False + Pick a color + True +--- evolution-2.9.4/mail/em-mailer-prefs.h.gtk-color-button 2006-12-19 16:06:48.000000000 -0500 ++++ evolution-2.9.4/mail/em-mailer-prefs.h 2006-12-19 16:07:37.000000000 -0500 +@@ -37,7 +37,6 @@ + struct _GdkPixbuf; + struct _GtkWidget; + struct _GladeXML; +-struct _GnomeColorPicker; + struct _GtkFileChooserbutton; + struct _GtkFontButton; + struct _GConfClient; +@@ -80,7 +79,7 @@ + struct _GtkSpinButton *mlimit_count; + struct _GtkOptionMenu *charset; + struct _GtkToggleButton *citation_highlight; +- struct _GnomeColorPicker *citation_color; ++ struct _GtkColorButton *citation_color; + + /* Deleting Mail */ + struct _GtkToggleButton *empty_trash; +@@ -110,7 +109,7 @@ + /* Labels and Colours tab */ + struct { + struct _GtkEntry *name; +- struct _GnomeColorPicker *color; ++ struct _GtkColorButton *color; + } labels[5]; + struct _GtkButton *restore_labels; + +--- evolution-2.9.4/mail/em-composer-prefs.h.gtk-color-button 2005-01-24 16:11:07.000000000 -0500 ++++ evolution-2.9.4/mail/em-composer-prefs.h 2006-12-19 16:07:37.000000000 -0500 +@@ -48,7 +48,6 @@ + struct _GdkPixbuf; + struct _GtkWidget; + struct _GladeXML; +-struct _GnomeColorPicker; + struct _GConfClient; + struct _GtkButton; + struct _GtkTreeView; +@@ -71,7 +70,7 @@ + struct _GtkOptionMenu *charset; + + struct _GtkToggleButton *spell_check; +- struct _GnomeColorPicker *colour; ++ struct _GtkColorButton *color; + struct _GtkTreeView *language; + CORBA_sequence_GNOME_Spell_Language *language_seq; + gboolean spell_active; +--- evolution-2.9.4/mail/em-mailer-prefs.c.gtk-color-button 2006-12-19 16:06:48.000000000 -0500 ++++ evolution-2.9.4/mail/em-mailer-prefs.c 2006-12-19 16:08:24.000000000 -0500 +@@ -35,7 +35,7 @@ + #include "misc/e-charset-picker.h" + #include + +-#include ++#include + #include + #include + +@@ -157,49 +157,27 @@ + + + static void +-colorpicker_set_color (GnomeColorPicker *color, const char *str) ++color_button_set_color (GtkColorButton *color_button, const gchar *spec) + { +- GdkColor colour; +- guint32 rgb; +- +- gdk_color_parse (str, &colour); +- rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8); +- +- gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff); +-} ++ GdkColor color; + +-static guint32 +-colorpicker_get_color (GnomeColorPicker *color) +-{ +- guint8 r, g, b, a; +- guint32 rgb = 0; +- +- gnome_color_picker_get_i8 (color, &r, &g, &b, &a); +- +- rgb = r; +- rgb <<= 8; +- rgb |= g; +- rgb <<= 8; +- rgb |= b; +- +- return rgb; ++ if (gdk_color_parse (spec, &color)) ++ gtk_color_button_set_color (color_button, &color); + } + + static void +-citation_color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, EMMailerPrefs *prefs) ++citation_color_set (GtkColorButton *color_button, EMMailerPrefs *prefs) + { +- guint32 rgb = 0; +- char buf[20]; +- +- rgb = r & 0xff; +- rgb <<= 8; +- rgb |= g & 0xff; +- rgb <<= 8; +- rgb |= b & 0xff; +- +- sprintf (buf, "#%06x", rgb & 0xffffff); +- +- gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", buf, NULL); ++ GdkColor color; ++ gchar spec[16]; ++ ++ gtk_color_button_get_color (color_button, &color); ++ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", ++ color.red, color.green, color.blue); ++ ++ gconf_client_set_string (prefs->gconf, ++ "/apps/evolution/mail/display/citation_colour", ++ spec, NULL); + } + + static void +@@ -212,9 +190,12 @@ + int i; + + for (i = 4; i >= 0; i--) { ++ GdkColor color; ++ + cstring = gtk_entry_get_text (prefs->labels[i].name); +- rgb = colorpicker_get_color (prefs->labels[i].color); +- string = g_strdup_printf ("%s:#%06x", cstring, rgb & 0xffffff); ++ gtk_color_button_get_color (prefs->labels[i].color, &color); ++ string = g_strdup_printf ("%s:#%04x%04x%04x", cstring, ++ color.red, color.green, color.blue); + list = g_slist_prepend (list, string); + } + +@@ -249,7 +230,7 @@ + + for (i = 0; i < 5; i++) { + gtk_entry_set_text (prefs->labels[i].name, _(label_defaults[i].name)); +- colorpicker_set_color (prefs->labels[i].color, label_defaults[i].colour); ++ color_button_set_color (prefs->labels[i].color, label_defaults[i].colour); + atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), _(label_defaults[i].name)); + } + } +@@ -812,9 +793,9 @@ + "/apps/evolution/mail/display/mark_citations", + G_CALLBACK (toggle_button_toggled)); + +- prefs->citation_color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerHighlightCitations")); ++ prefs->citation_color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, "colorButtonHighlightCitations")); + buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL); +- colorpicker_set_color (prefs->citation_color, buf ? buf : "#737373"); ++ color_button_set_color (prefs->citation_color, buf ? buf : "#737373"); + g_signal_connect (prefs->citation_color, "color-set", G_CALLBACK (citation_color_set), prefs); + if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL)) + gtk_widget_set_sensitive ((GtkWidget *) prefs->citation_color, FALSE); +@@ -935,14 +916,14 @@ + g_free (widget_name); + + widget_name = g_strdup_printf ("colorLabel%d", i); +- prefs->labels[i].color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, widget_name)); ++ prefs->labels[i].color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, widget_name)); + gtk_widget_set_sensitive ((GtkWidget *) prefs->labels[i].color, !locked); + g_free (widget_name); + + gtk_entry_set_text (prefs->labels[i].name, label->name); + g_signal_connect (prefs->labels[i].name, "changed", G_CALLBACK (label_entry_changed), prefs); + +- colorpicker_set_color (prefs->labels[i].color, label->colour); ++ color_button_set_color (prefs->labels[i].color, label->colour); + g_signal_connect (prefs->labels[i].color, "color-set", G_CALLBACK (label_color_set), prefs); + + atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), label->name); +--- evolution-2.9.4/filter/filter-colour.h.gtk-color-button 2002-11-01 17:07:46.000000000 -0500 ++++ evolution-2.9.4/filter/filter-colour.h 2006-12-19 16:07:37.000000000 -0500 +@@ -39,7 +39,7 @@ + struct _FilterColour { + FilterElement parent_object; + +- guint16 r, g, b, a; ++ GdkColor color; + }; + + struct _FilterColourClass { +--- evolution-2.9.4/filter/filter-colour.c.gtk-color-button 2004-12-02 22:41:39.000000000 -0500 ++++ evolution-2.9.4/filter/filter-colour.c 2006-12-19 16:07:37.000000000 -0500 +@@ -26,7 +26,7 @@ + #endif + + #include +-#include ++#include + + #include "libedataserver/e-sexp.h" + #include "filter-colour.h" +@@ -120,13 +120,11 @@ + static int + colour_eq (FilterElement *fe, FilterElement *cm) + { +- FilterColour *fc = (FilterColour *)fe, *cc = (FilterColour *)cm; +- +- return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm) +- && fc->r == cc->r +- && fc->g == cc->g +- && fc->b == cc->b +- && fc->a == cc->a; ++ FilterColour *fc = (FilterColour *) fe; ++ FilterColour *cc = (FilterColour *) cm; ++ ++ return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm) ++ && gdk_color_equal (&fc->color, &cc->color); + } + + static void +@@ -139,76 +137,70 @@ + static xmlNodePtr + xml_encode (FilterElement *fe) + { +- xmlNodePtr value; + FilterColour *fc = (FilterColour *)fe; +- char hex[16]; +- +- d(printf("Encoding colour as xml\n")); ++ xmlNodePtr value; ++ gchar spec[16]; ++ ++ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", ++ fc->color.red, fc->color.green, fc->color.blue); ++ + value = xmlNewNode(NULL, "value"); + xmlSetProp(value, "name", fe->name); + xmlSetProp(value, "type", "colour"); +- +- sprintf(hex, "%04x", fc->r); +- xmlSetProp(value, "red", hex); +- sprintf(hex, "%04x", fc->g); +- xmlSetProp(value, "green", hex); +- sprintf(hex, "%04x", fc->b); +- xmlSetProp(value, "blue", hex); +- sprintf(hex, "%04x", fc->a); +- xmlSetProp(value, "alpha", hex); +- +- return value; +-} ++ xmlSetProp(value, "spec", spec); + +-static guint16 +-get_value (xmlNodePtr node, char *name) +-{ +- unsigned int ret; +- char *value; +- +- value = xmlGetProp(node, name); +- sscanf(value, "%04x", &ret); +- xmlFree(value); +- return ret; ++ return value; + } + +- + static int + xml_decode (FilterElement *fe, xmlNodePtr node) + { + FilterColour *fc = (FilterColour *)fe; +- ++ xmlChar *prop; ++ + xmlFree (fe->name); + fe->name = xmlGetProp(node, "name"); +- fc->r = get_value(node, "red"); +- fc->g = get_value(node, "green"); +- fc->b = get_value(node, "blue"); +- fc->a = get_value(node, "alpha"); +- ++ ++ prop = xmlGetProp(node, "spec"); ++ if (prop != NULL) { ++ gdk_color_parse(prop, &fc->color); ++ xmlFree (prop); ++ } else { ++ /* try reading the old RGB properties */ ++ prop = xmlGetProp(node, "red"); ++ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.red); ++ xmlFree (prop); ++ prop = xmlGetProp(node, "green"); ++ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.green); ++ xmlFree (prop); ++ prop = xmlGetProp(node, "blue"); ++ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue); ++ xmlFree (prop); ++ } ++ + return 0; + } + + static void +-set_colour (GnomeColorPicker *cp, guint r, guint g, guint b, guint a, FilterColour *fc) ++set_color (GtkColorButton *color_button, FilterColour *fc) + { +- fc->r = r; +- fc->g = g; +- fc->b = b; +- fc->a = a; ++ gtk_color_button_get_color (color_button, &fc->color); + } + + static GtkWidget * + get_widget (FilterElement *fe) + { + FilterColour *fc = (FilterColour *) fe; +- GnomeColorPicker *cp; +- +- cp = (GnomeColorPicker *) gnome_color_picker_new (); +- gnome_color_picker_set_i16 (cp, fc->r, fc->g, fc->b, fc->a); +- gtk_widget_show ((GtkWidget *) cp); +- g_signal_connect (cp, "color_set", G_CALLBACK (set_colour), fe); ++ GtkWidget *color_button; ++ ++ color_button = gtk_color_button_new_with_color (&fc->color); ++ gtk_widget_show (color_button); ++ ++ g_signal_connect ( ++ G_OBJECT (color_button), "color_set", ++ G_CALLBACK (set_color), fe); + +- return (GtkWidget *) cp; ++ return color_button; + } + + static void +@@ -221,9 +213,9 @@ + format_sexp (FilterElement *fe, GString *out) + { + FilterColour *fc = (FilterColour *)fe; +- char *str; +- +- str = g_strdup_printf ("#%02x%02x%02x", (fc->r >> 8) & 0xff, (fc->g >> 8) & 0xff, (fc->b >> 8) & 0xff); +- e_sexp_encode_string (out, str); +- g_free (str); ++ gchar spec[16]; ++ ++ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", ++ fc->color.red, fc->color.green, fc->color.blue); ++ e_sexp_encode_string (out, spec); + } +--- evolution-2.9.4/filter/filter-element.c.gtk-color-button 2006-02-08 06:44:27.000000000 -0500 ++++ evolution-2.9.4/filter/filter-element.c 2006-12-19 16:07:37.000000000 -0500 +@@ -293,12 +293,10 @@ + } + } else if (IS_FILTER_COLOUR(se)) { + if (IS_FILTER_COLOUR(de)) { +- FilterColour *s = (FilterColour *)se, *d = (FilterColour *)de; ++ FilterColour *s = (FilterColour *)se; ++ FilterColour *d = (FilterColour *)de; + +- d->r = s->r; +- d->g = s->g; +- d->b = s->b; +- d->a = s->a; ++ d->color = s->color; + } + } else if (IS_FILTER_DATESPEC(se)) { + if (IS_FILTER_DATESPEC(de)) { +--- evolution-2.9.4/plugins/groupwise-account-setup/camel-gw-listener.c.gtk-color-button 2006-12-04 08:14:34.000000000 -0500 ++++ evolution-2.9.4/plugins/groupwise-account-setup/camel-gw-listener.c 2006-12-19 16:07:37.000000000 -0500 +@@ -213,10 +213,10 @@ + e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); + if (parent_id_name) { + e_source_set_property (source, "parent_id_name", parent_id_name); +- e_source_set_color (source, 0xFF00FF); ++ e_source_set_color_spec (source, "#FF00FF"); + } + else +- e_source_set_color (source, 0xEEBC60); ++ e_source_set_color_spec (source, "#EEBC60"); + e_source_group_add_source (group, source, -1); + e_source_list_sync (source_list, NULL); + +--- evolution-2.9.4/calendar/gui/tasks-component.c.gtk-color-button 2006-12-04 08:14:30.000000000 -0500 ++++ evolution-2.9.4/calendar/gui/tasks-component.c 2006-12-19 16:07:37.000000000 -0500 +@@ -209,7 +209,7 @@ + calendar_config_set_tasks_selected (&selected); + } + +- e_source_set_color (source, 0xBECEDD); ++ e_source_set_color_spec (source, "#BECEDD"); + personal_source = source; + } + +--- evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.c.gtk-color-button 2006-12-19 16:06:48.000000000 -0500 ++++ evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.c 2006-12-19 16:07:37.000000000 -0500 +@@ -96,21 +96,6 @@ + return glade_xml_get_widget (prefs->gui, item->label); + } + +-/* Returns a pointer to a static string with an X color spec for the current +- * value of a color picker. +- */ +-static const char * +-spec_from_picker (GtkWidget *picker) +-{ +- static char spec[8]; +- guint8 r, g, b; +- +- gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &r, &g, &b, NULL); +- g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b); +- +- return spec; +-} +- + static void + working_days_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) + { +@@ -277,15 +262,21 @@ + } + + static void +-tasks_due_today_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) ++tasks_due_today_set_color (GtkColorButton *color_button, CalendarPrefsDialog *prefs) + { +- calendar_config_set_tasks_due_today_color (spec_from_picker (prefs->tasks_due_today_color)); ++ GdkColor color; ++ ++ gtk_color_button_get_color (color_button, &color); ++ calendar_config_set_tasks_due_today_color (&color); + } + + static void +-tasks_overdue_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) ++tasks_overdue_set_color (GtkColorButton *color_button, CalendarPrefsDialog *prefs) + { +- calendar_config_set_tasks_overdue_color (spec_from_picker (prefs->tasks_overdue_color)); ++ GdkColor color; ++ ++ gtk_color_button_get_color (color_button, &color); ++ calendar_config_set_tasks_overdue_color (&color); + } + + static void +@@ -417,22 +408,6 @@ + g_signal_connect (G_OBJECT (prefs->template_url), "changed", G_CALLBACK (template_url_changed), prefs); + } + +-/* Sets the color in a color picker from an X color spec */ +-static void +-set_color_picker (GtkWidget *picker, const char *spec) +-{ +- GdkColor color; +- +- if (!spec || !gdk_color_parse (spec, &color)) +- color.red = color.green = color.blue = 0; +- +- gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker), +- color.red, +- color.green, +- color.blue, +- 65535); +-} +- + /* Shows the current Free/Busy settings in the dialog */ + static void + show_fb_config (CalendarPrefsDialog *prefs) +@@ -449,11 +424,18 @@ + static void + show_task_list_config (CalendarPrefsDialog *prefs) + { ++ GtkColorButton *color_button; ++ GdkColor color; + CalUnits units; + gboolean hide_completed_tasks = FALSE; + +- set_color_picker (prefs->tasks_due_today_color, calendar_config_get_tasks_due_today_color ()); +- set_color_picker (prefs->tasks_overdue_color, calendar_config_get_tasks_overdue_color ()); ++ color_button = GTK_COLOR_BUTTON (prefs->tasks_due_today_color); ++ calendar_config_get_tasks_due_today_color (&color); ++ gtk_color_button_set_color (color_button, &color); ++ ++ color_button = GTK_COLOR_BUTTON (prefs->tasks_overdue_color); ++ calendar_config_get_tasks_overdue_color (&color); ++ gtk_color_button_set_color (color_button, &color); + + /* Hide Completed Tasks. */ + e_dialog_toggle_set (prefs->tasks_hide_completed, calendar_config_get_hide_completed_tasks ()); +--- evolution-2.9.4/calendar/gui/dialogs/calendar-setup.c.gtk-color-button 2006-07-19 09:04:45.000000000 -0400 ++++ evolution-2.9.4/calendar/gui/dialogs/calendar-setup.c 2006-12-19 16:07:37.000000000 -0500 +@@ -73,44 +73,22 @@ + } + + static void +-colorpicker_set_color (GnomeColorPicker *color, guint32 rgb) +-{ +- gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff); +-} +- +-static guint32 +-colorpicker_get_color (GnomeColorPicker *color) +-{ +- guint8 r, g, b, a; +- guint32 rgb = 0; +- +- gnome_color_picker_get_i8 (color, &r, &g, &b, &a); +- +- rgb = r; +- rgb <<= 8; +- rgb |= g; +- rgb <<= 8; +- rgb |= b; +- +- return rgb; +-} +- +-static void + eccp_commit (EConfig *ec, GSList *items, void *data) + { + CalendarSourceDialog *sdialog = data; + xmlNodePtr xml; + + if (sdialog->original_source) { +- guint32 color; ++ const gchar *color_spec; + + xml = xmlNewNode (NULL, "dummy"); + e_source_dump_to_xml_node (sdialog->source, xml); + e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL); + xmlFreeNode (xml); + +- if (e_source_get_color (sdialog->source, &color)) +- e_source_set_color (sdialog->original_source, color); ++ color_spec = e_source_peek_color_spec (sdialog->source); ++ if (color_spec != NULL) ++ e_source_set_color_spec (sdialog->original_source, color_spec); + } else { + e_source_group_add_source (sdialog->source_group, sdialog->source, -1); + e_source_list_sync (sdialog->source_list, NULL); +@@ -304,63 +282,80 @@ + } + + static void +-color_changed (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, ECalConfigTargetSource *t) ++color_changed (GtkColorButton *color_button, ECalConfigTargetSource *target) + { +- ESource *source = t->source; +- e_source_set_color (source, colorpicker_get_color (picker)); ++ ESource *source = target->source; ++ gchar color_spec[16]; ++ GdkColor color; ++ ++ gtk_color_button_get_color (color_button, &color); ++ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", ++ color.red, color.green, color.blue); ++ e_source_set_color_spec (source, color_spec); ++} ++ ++static const gchar * ++choose_initial_color (void) ++{ ++ static const gchar *colors[] = { ++ "#BECEDD", /* 190 206 221 Blue */ ++ "#E2F0EF", /* 226 240 239 Light Blue */ ++ "#C6E2B7", /* 198 226 183 Green */ ++ "#E2F0D3", /* 226 240 211 Light Green */ ++ "#E2D4B7", /* 226 212 183 Khaki */ ++ "#EAEAC1", /* 234 234 193 Light Khaki */ ++ "#F0B8B7", /* 240 184 183 Pink */ ++ "#FED4D3", /* 254 212 211 Light Pink */ ++ "#E2C6E1", /* 226 198 225 Purple */ ++ "#F0E2EF" /* 240 226 239 Light Purple */ ++ }; ++ ++ return colors[g_random_int_range (0, G_N_ELEMENTS (colors))]; + } + + static GtkWidget * + eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) + { + CalendarSourceDialog *sdialog = data; +- static GtkWidget *label, *picker; +- int row; +- ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target; +- static guint32 assigned_colors[] = { +- 0xBECEDD, /* 190 206 221 Blue */ +- 0xE2F0EF, /* 226 240 239 Light Blue */ +- 0xC6E2B7, /* 198 226 183 Green */ +- 0xE2F0D3, /* 226 240 211 Light Green */ +- 0xE2D4B7, /* 226 212 183 Khaki */ +- 0xEAEAC1, /* 234 234 193 Light Khaki */ +- 0xF0B8B7, /* 240 184 183 Pink */ +- 0xFED4D3, /* 254 212 211 Light Pink */ +- 0xE2C6E1, /* 226 198 225 Purple */ +- 0xF0E2EF /* 240 226 239 Light Purple */ +- }; +- GRand *rand = g_rand_new (); +- guint32 color; ++ static GtkWidget *label, *color_button; ++ guint row = GTK_TABLE (parent)->nrows; ++ const gchar *color_spec = NULL; ++ GdkColor color; + + if (old) + gtk_widget_destroy (label); + +- row = ((GtkTable*)parent)->nrows; ++ if (sdialog->original_source) ++ color_spec = e_source_peek_color_spec (sdialog->original_source); ++ ++ if (color_spec == NULL) { ++ color_spec = choose_initial_color (); ++ e_source_set_color_spec (sdialog->source, color_spec); ++ } + +- color = assigned_colors[g_rand_int_range (rand, 0, 9)]; +- g_rand_free (rand); ++ if (!gdk_color_parse (color_spec, &color)) ++ g_warning ("Unknown color \"%s\" in calendar \"%s\"", ++ color_spec, e_source_peek_name (sdialog->source)); + + label = gtk_label_new_with_mnemonic (_("C_olor:")); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); ++ gtk_table_attach ( ++ GTK_TABLE (parent), label, ++ 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); + gtk_widget_show (label); +- gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); +- +- picker = gnome_color_picker_new (); +- gtk_widget_show (picker); +- gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker); +- gtk_table_attach (GTK_TABLE (parent), picker, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); +- g_signal_connect (G_OBJECT (picker), "color-set", G_CALLBACK (color_changed), t); +- +- if (sdialog->original_source) +- e_source_get_color (sdialog->original_source, &color); +- else +- /* since we don't have an original source here, we want to set +- * the initial color */ +- e_source_set_color (sdialog->source, color); + +- colorpicker_set_color (GNOME_COLOR_PICKER (picker), color); ++ color_button = gtk_color_button_new_with_color (&color); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (label), color_button); ++ gtk_table_attach ( ++ GTK_TABLE (parent), color_button, ++ 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ gtk_widget_show (color_button); ++ ++ g_signal_connect ( ++ G_OBJECT (color_button), "color-set", ++ G_CALLBACK (color_changed), ec->target); + +- return picker; ++ return color_button; + } + + static ECalConfigItem eccp_items[] = { +@@ -414,7 +409,7 @@ + ECalConfigTargetSource *target; + + if (source) { +- guint32 color; ++ const gchar *color_spec; + + sdialog->original_source = source; + g_object_ref (source); +@@ -423,8 +418,9 @@ + sdialog->source = e_source_new_from_standalone_xml (xml); + g_free (xml); + +- if (e_source_get_color (source, &color)) +- e_source_set_color (sdialog->source, color); ++ color_spec = e_source_peek_color_spec (source); ++ if (color_spec != NULL) ++ e_source_set_color_spec (sdialog->source, color_spec); + } else { + GConfClient *gconf; + GSList *l, *ptr, *temp = NULL; +@@ -504,7 +500,7 @@ + ECalConfigTargetSource *target; + + if (source) { +- guint32 color; ++ const gchar *color_spec; + + sdialog->original_source = source; + g_object_ref (source); +@@ -513,8 +509,8 @@ + sdialog->source = e_source_new_from_standalone_xml (xml); + g_free (xml); + +- e_source_get_color (source, &color); +- e_source_set_color (sdialog->source, color); ++ color_spec = e_source_peek_color_spec (source); ++ e_source_set_color_spec (sdialog->source, color_spec); + } else { + GConfClient *gconf; + GSList *l, *ptr, *temp = NULL; +@@ -589,7 +585,7 @@ + ECalConfigTargetSource *target; + + if (source) { +- guint32 color; ++ const gchar *color_spec; + + sdialog->original_source = source; + g_object_ref (source); +@@ -598,8 +594,8 @@ + sdialog->source = e_source_new_from_standalone_xml (xml); + g_free (xml); + +- e_source_get_color (source, &color); +- e_source_set_color (sdialog->source, color); ++ color_spec = e_source_peek_color_spec (source); ++ e_source_set_color_spec (sdialog->source, color_spec); + } else { + GConfClient *gconf; + GSList *l; +--- evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.glade.gtk-color-button 2006-07-10 06:42:58.000000000 -0400 ++++ evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.glade 2006-12-19 16:07:37.000000000 -0500 +@@ -1231,10 +1231,9 @@ + + + +- ++ + True + True +- True + False + Pick a color + True +@@ -1250,10 +1249,9 @@ + + + +- ++ + True + True +- True + False + Pick a color + True +--- evolution-2.9.4/calendar/gui/e-cal-model-tasks.c.gtk-color-button 2006-10-16 14:13:48.000000000 -0400 ++++ evolution-2.9.4/calendar/gui/e-cal-model-tasks.c 2006-12-19 16:07:37.000000000 -0500 +@@ -1025,14 +1025,28 @@ + static const char * + ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) + { ++ static gchar color_spec[16]; ++ GdkColor color; ++ + g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), NULL); + g_return_val_if_fail (comp_data != NULL, NULL); + ++ /* XXX ECalModel's get_color_for_component() method should really ++ * get a GdkColor instead of a color specification string. */ ++ + switch (get_due_status ((ECalModelTasks *) model, comp_data)) { + case E_CAL_MODEL_TASKS_DUE_TODAY: +- return calendar_config_get_tasks_due_today_color (); ++ /* XXX ugly hack */ ++ calendar_config_get_tasks_due_today_color (&color); ++ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", ++ color.red, color.green, color.blue); ++ return color_spec; + case E_CAL_MODEL_TASKS_DUE_OVERDUE: +- return calendar_config_get_tasks_overdue_color (); ++ /* XXX ugly hack */ ++ calendar_config_get_tasks_overdue_color (&color); ++ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", ++ color.red, color.green, color.blue); ++ return color_spec; + case E_CAL_MODEL_TASKS_DUE_NEVER: + case E_CAL_MODEL_TASKS_DUE_FUTURE: + case E_CAL_MODEL_TASKS_DUE_COMPLETE: +--- evolution-2.9.4/calendar/gui/memos-component.c.gtk-color-button 2006-10-16 14:13:51.000000000 -0400 ++++ evolution-2.9.4/calendar/gui/memos-component.c 2006-12-19 16:07:37.000000000 -0500 +@@ -213,7 +213,7 @@ + calendar_config_set_memos_selected (&selected); + } + +- e_source_set_color (source, 0xBECEDD); ++ e_source_set_color_spec (source, "#BECEDD"); + personal_source = source; + } + +--- evolution-2.9.4/calendar/gui/calendar-component.c.gtk-color-button 2006-09-21 01:41:00.000000000 -0400 ++++ evolution-2.9.4/calendar/gui/calendar-component.c 2006-12-19 16:07:37.000000000 -0500 +@@ -252,7 +252,7 @@ + } + + g_free (primary_calendar); +- e_source_set_color (personal_source, 0xBECEDD); ++ e_source_set_color_spec (personal_source, "#BECEDD"); + } + + if (!on_the_web) { +--- evolution-2.9.4/calendar/gui/e-cal-model.c.gtk-color-button 2006-11-20 09:16:34.000000000 -0500 ++++ evolution-2.9.4/calendar/gui/e-cal-model.c 2006-12-19 16:07:37.000000000 -0500 +@@ -947,7 +947,7 @@ + ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) + { + ESource *source; +- guint32 source_color; ++ const gchar *color_spec; + gint i, first_empty = 0; + static AssignedColorData assigned_colors[] = { + { "#BECEDD", NULL }, /* 190 206 221 Blue */ +@@ -965,9 +965,10 @@ + g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL); + + source = e_cal_get_source (comp_data->client); +- if (e_source_get_color (source, &source_color)) { ++ color_spec = e_source_peek_color_spec (source); ++ if (color_spec != NULL) { + g_free (comp_data->color); +- comp_data->color = g_strdup_printf ("#%06x", source_color & 0xffffff); ++ comp_data->color = g_strdup (color_spec); + return comp_data->color; + } + +--- evolution-2.9.4/calendar/gui/calendar-config.h.gtk-color-button 2006-07-17 02:01:28.000000000 -0400 ++++ evolution-2.9.4/calendar/gui/calendar-config.h 2006-12-19 16:07:37.000000000 -0500 +@@ -31,6 +31,7 @@ + #define _CALENDAR_CONFIG_H_ + + #include ++#include + #include + #include + +@@ -201,11 +202,11 @@ + guint calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data); + + /* Colors for the task list */ +-const char *calendar_config_get_tasks_due_today_color (void); +-void calendar_config_set_tasks_due_today_color (const char *color); ++void calendar_config_get_tasks_due_today_color (GdkColor *color); ++void calendar_config_set_tasks_due_today_color (GdkColor *color); + +-const char *calendar_config_get_tasks_overdue_color (void); +-void calendar_config_set_tasks_overdue_color (const char *color); ++void calendar_config_get_tasks_overdue_color (GdkColor *color); ++void calendar_config_set_tasks_overdue_color (GdkColor *color); + + /* Settings to hide completed tasks. */ + gboolean calendar_config_get_hide_completed_tasks (void); +--- evolution-2.9.4/calendar/gui/migration.c.gtk-color-button 2006-10-16 14:13:51.000000000 -0400 ++++ evolution-2.9.4/calendar/gui/migration.c 2006-12-19 16:07:37.000000000 -0500 +@@ -406,7 +406,7 @@ + e_source_group_add_source (group, source, -1); + g_object_unref (source); + +- e_source_set_color (source, 0xFED4D3); ++ e_source_set_color_spec (source, "#FED4D3"); + e_source_group_set_readonly (group, TRUE); + + return group; +@@ -497,7 +497,7 @@ + } + + g_free (primary_calendar); +- e_source_set_color (source, 0xBECEDD); ++ e_source_set_color_spec (source, "#BECEDD"); + *personal_source = source; + } + +@@ -590,7 +590,7 @@ + calendar_config_set_tasks_selected (&selected); + } + +- e_source_set_color (source, 0xBECEDD); ++ e_source_set_color_spec (source, "#BECEDD"); + *personal_source = source; + } + +@@ -1098,7 +1098,7 @@ + calendar_config_set_memos_selected (&selected); + } + +- e_source_set_color (source, 0xBECEDD); ++ e_source_set_color_spec (source, "#BECEDD"); + *personal_source = source; + } + +@@ -1161,7 +1161,7 @@ + e_source_set_property (source, "use_ssl", use_ssl); + e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); + +- e_source_set_color (source, 0xEEBC60); ++ e_source_set_color_spec (source, "#EEBC60"); + e_source_group_add_source (group, source, -1); + + ids = gconf_client_get_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, NULL); +--- evolution-2.9.4/calendar/gui/calendar-config.c.gtk-color-button 2006-12-04 08:14:29.000000000 -0500 ++++ evolution-2.9.4/calendar/gui/calendar-config.c 2006-12-19 16:07:37.000000000 -0500 +@@ -1219,68 +1219,104 @@ + + /** + * calendar_config_get_tasks_due_today_color: ++ * @color: the location to store the color + * + * Queries the color to be used to display tasks that are due today. +- * +- * Return value: An X color specification. + **/ +-const char * +-calendar_config_get_tasks_due_today_color (void) ++void ++calendar_config_get_tasks_due_today_color (GdkColor *color) + { +- static char *color = NULL; ++ const gchar *key = CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR; ++ GError *error = NULL; ++ gchar *color_spec; + +- if (color) +- g_free (color); ++ g_return_if_fail (color != NULL); + +- color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, NULL); +- return color; ++ color_spec = gconf_client_get_string (config, key, &error); ++ ++ if (color_spec != NULL && !gdk_color_parse (color_spec, color)) ++ g_warning ("Unknown color \"%s\"", color_spec); ++ else if (error != NULL) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } ++ ++ g_free (color_spec); + } + + /** + * calendar_config_set_tasks_due_today_color: +- * @color: X color specification ++ * @color: a #GdkColor + * + * Sets the color to be used to display tasks that are due today. + **/ + void +-calendar_config_set_tasks_due_today_color (const char *color) ++calendar_config_set_tasks_due_today_color (GdkColor *color) + { ++ const gchar *key = CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR; ++ GError *error = NULL; ++ gchar color_spec[16]; ++ + g_return_if_fail (color != NULL); + +- gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, color, NULL); ++ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", ++ color->red, color->green, color->blue); ++ ++ if (!gconf_client_set_string (config, key, color_spec, &error)) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } + } + + /** + * calendar_config_get_tasks_overdue_color: ++ * @color: the location to store the color + * + * Queries the color to be used to display overdue tasks. +- * +- * Return value: An X color specification. + **/ +-const char * +-calendar_config_get_tasks_overdue_color (void) ++void ++calendar_config_get_tasks_overdue_color (GdkColor *color) + { +- static char *color = NULL; ++ const gchar *key = CALENDAR_CONFIG_TASKS_OVERDUE_COLOR; ++ GError *error = NULL; ++ gchar *color_spec; + +- if (color) +- g_free (color); ++ g_return_if_fail (color != NULL); + +- color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, NULL); +- return color; ++ color_spec = gconf_client_get_string (config, key, &error); ++ ++ if (color_spec != NULL && !gdk_color_parse (color_spec, color)) ++ g_warning ("Unknown color \"%s\"", color_spec); ++ else if (error != NULL) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } ++ ++ g_free (color_spec); + } + + /** + * calendar_config_set_tasks_overdue_color: +- * @color: X color specification ++ * @color: a #GdkColor + * + * Sets the color to be used to display overdue tasks. + **/ + void +-calendar_config_set_tasks_overdue_color (const char *color) ++calendar_config_set_tasks_overdue_color (GdkColor *color) + { ++ const gchar *key = CALENDAR_CONFIG_TASKS_OVERDUE_COLOR; ++ GError *error = NULL; ++ gchar color_spec[16]; ++ + g_return_if_fail (color != NULL); + +- gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, color, NULL); ++ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", ++ color->red, color->green, color->blue); ++ ++ if (!gconf_client_set_string (config, key, color_spec, &error)) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } + } + + /** diff --git a/evolution.spec b/evolution.spec index 2be0e84..08f2910 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,7 +1,7 @@ %define bug_buddy_version 2.15.90 %define dbus_glib_version 0.70 %define dbus_version 0.90 -%define eds_version 1.9.1 +%define eds_version 1.9.4 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 2.9.3 -Release: 4%{?dist} +Version: 2.9.4 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -146,9 +146,6 @@ Patch36: evolution-2.9.2-pilot-link-0.12.patch # RH bug #215466 / RH bug #218589 / GNOME bug #377511 Patch37: evolution-2.9.2-optional-participant.patch -# GNOME bug #382431 -Patch38: evolution-2.9.3-implicit-function-declaration.patch - # RH bug #215695 / GNOME bug #383027 Patch39: evolution-2.9.3-dont-assume-default-account.patch @@ -167,6 +164,9 @@ Patch43: evolution-2.9.3-unread-messages.patch # RH bug #215467 / GNOME bug #380644 Patch44: evolution-2.9.3-meeting-list-view.patch +# GNOME bug #373116 +Patch45: evolution-2.9.3-gtk-color-button.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -307,13 +307,13 @@ Development files needed for building things which link against evolution. %patch35 -p1 -b .gtk-font-button %patch36 -p1 -b .pilot-link-0.12 %patch37 -p1 -b .optional-participant -%patch38 -p1 -b .implicit-function-declaration %patch39 -p1 -b .dont-assume-default-account #%patch40 -p1 -b .view-attachment-uri %patch41 -p1 -b .adopt-icons %patch42 -p1 -b .source-path-entry %patch43 -p1 -b .unread-messages %patch44 -p1 -b .meeting-list-view +%patch45 -p1 -b .gtk-color-button mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -395,6 +395,7 @@ CFLAGS="$CFLAGS \ -DG_DISABLE_DEPRECATED=1 \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \ + -DEDS_DISABLE_DEPRECATED=1 \ -Werror-implicit-function-declaration" %endif @@ -728,6 +729,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Dec 19 2006 Matthew Barnes - 2.9.4-1.fc7 +- Update to 2.9.4 +- Bump eds_version to 1.9.4 due to soname changes. +- Remove patch for GNOME bug #382431 (fixed upstream). + +* Fri Dec 15 2006 Matthew Barnes - 2.9.3-5.fc7 +- Add patch for GNOME bug #373116 (use GtkColorButton). + * Fri Dec 15 2006 Matthew Barnes - 2.9.3-4.fc7 - Disable patch for RH bug #216537, which caused RH bug #219228. diff --git a/sources b/sources index ba8849a..0b1ade0 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -03c29ef09dbd1b04623f736cbd8e14a7 evolution-2.9.3.tar.bz2 +8915ed5f5b4c0351f05a428111b46216 evolution-2.9.4.tar.bz2 4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png de663fa442d61f53dc058dd20c77da8e evolution22.png d33896d33b5db2201e051664e96b1100 evolution24.png From 01aeae47629e9b5ccbca9456a4d87b96d901d149 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 20 Dec 2006 16:28:16 +0000 Subject: [PATCH 097/844] - Revise patch for RH bug #202751 (printing of indic languages). --- evolution-2.8.0-fix-indic-printing.patch | 22 +++++++--------------- evolution.spec | 5 ++++- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/evolution-2.8.0-fix-indic-printing.patch b/evolution-2.8.0-fix-indic-printing.patch index eab8a5d..4c53199 100644 --- a/evolution-2.8.0-fix-indic-printing.patch +++ b/evolution-2.8.0-fix-indic-printing.patch @@ -1,5 +1,5 @@ ---- evolution-2.9.2/plugins/print-message/print-message.c.fix-indic-printing 2005-08-23 23:14:10.000000000 -0400 -+++ evolution-2.9.2/plugins/print-message/print-message.c 2006-11-07 13:47:35.000000000 -0500 +--- evolution-2.9.4/plugins/print-message/print-message.c.fix-indic-printing 2005-08-23 23:14:10.000000000 -0400 ++++ evolution-2.9.4/plugins/print-message/print-message.c 2006-12-19 16:58:21.000000000 -0500 @@ -83,7 +83,7 @@ data->config = e_print_load_config (); data->preview = 0; @@ -18,8 +18,8 @@ print_response(NULL, GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, data); } ---- evolution-2.9.2/composer/e-msg-composer.h.fix-indic-printing 2005-12-07 03:29:51.000000000 -0500 -+++ evolution-2.9.2/composer/e-msg-composer.h 2006-11-07 13:47:35.000000000 -0500 +--- evolution-2.9.4/composer/e-msg-composer.h.fix-indic-printing 2005-12-07 03:29:51.000000000 -0500 ++++ evolution-2.9.4/composer/e-msg-composer.h 2006-12-19 16:58:21.000000000 -0500 @@ -96,6 +96,8 @@ CamelMimePart *part); CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer, @@ -29,17 +29,9 @@ CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer); void e_msg_composer_show_sig_file (EMsgComposer *composer); gboolean e_msg_composer_get_send_html (EMsgComposer *composer); ---- evolution-2.9.2/composer/e-msg-composer.c.fix-indic-printing 2006-11-07 13:47:35.000000000 -0500 -+++ evolution-2.9.2/composer/e-msg-composer.c 2006-11-07 14:02:39.000000000 -0500 -@@ -615,6 +615,7 @@ - camel_object_unref (stream); - - camel_data_wrapper_set_mime_type_field (plain, type); -+ camel_data_wrapper_set_mime_type (plain, "text/plain; charset=utf-8"); - camel_content_type_unref (type); - - if (p->send_html) { -@@ -5189,6 +5190,49 @@ +--- evolution-2.9.4/composer/e-msg-composer.c.fix-indic-printing 2006-12-19 16:58:21.000000000 -0500 ++++ evolution-2.9.4/composer/e-msg-composer.c 2006-12-20 10:44:45.000000000 -0500 +@@ -5189,6 +5189,49 @@ } CamelMimeMessage * diff --git a/evolution.spec b/evolution.spec index 08f2910..07de53a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -729,6 +729,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Dec 20 2006 Matthew Barnes - 2.9.4-2.fc7 +- Revise patch for RH bug #202751 (printing of indic languages). + * Tue Dec 19 2006 Matthew Barnes - 2.9.4-1.fc7 - Update to 2.9.4 - Bump eds_version to 1.9.4 due to soname changes. From 17ba262749d455265491e8e6e7cf5e63febb04f4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 21 Dec 2006 16:09:47 +0000 Subject: [PATCH 098/844] - Add patch for RH bug #218898 (viewing message source). --- evolution-2.9.4-view-message-source.patch | 11 +++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 evolution-2.9.4-view-message-source.patch diff --git a/evolution-2.9.4-view-message-source.patch b/evolution-2.9.4-view-message-source.patch new file mode 100644 index 0000000..bd0ed6d --- /dev/null +++ b/evolution-2.9.4-view-message-source.patch @@ -0,0 +1,11 @@ +--- evolution-2.9.4/mail/em-format-html.c.view-message-source 2006-12-20 10:51:00.000000000 -0500 ++++ evolution-2.9.4/mail/em-format-html.c 2006-12-21 10:08:02.000000000 -0500 +@@ -1872,7 +1872,7 @@ + filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream); + html_filter = camel_mime_filter_tohtml_new (CAMEL_MIME_FILTER_TOHTML_CONVERT_NL + | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES +- | CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT, 0); ++ | CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0); + camel_stream_filter_add(filtered_stream, html_filter); + camel_object_unref(html_filter); + diff --git a/evolution.spec b/evolution.spec index 07de53a..4f164f0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.4 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -167,6 +167,9 @@ Patch44: evolution-2.9.3-meeting-list-view.patch # GNOME bug #373116 Patch45: evolution-2.9.3-gtk-color-button.patch +# GNOME bug #218898 +Patch46: evolution-2.9.4-view-message-source.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -314,6 +317,7 @@ Development files needed for building things which link against evolution. %patch43 -p1 -b .unread-messages %patch44 -p1 -b .meeting-list-view %patch45 -p1 -b .gtk-color-button +%patch46 -p1 -b .view-message-source mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -729,6 +733,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Dec 21 2006 Matthew Barnes - 2.9.4-3.fc7 +- Add patch for RH bug #218898 (viewing message source). + * Wed Dec 20 2006 Matthew Barnes - 2.9.4-2.fc7 - Revise patch for RH bug #202751 (printing of indic languages). From f8e1991cc2f4d168f7128d621d230612c4f683da Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 30 Dec 2006 15:48:36 +0000 Subject: [PATCH 099/844] - Add Requires evolution-data-server-devel to devel subpackage (RH bug #218889). --- evolution.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 4f164f0..23276ae 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.4 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -273,6 +273,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against evolution Requires: %{name} = %{version} +Requires: evolution-data-server-devel >= %{eds_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libsoup-devel >= %{soup_version} Obsoletes: libgal2-devel <= %{last_libgal2_version} @@ -733,6 +734,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sat Dec 30 2006 Matthew Barnes - 2.9.4-4.fc7 +- Add Requires evolution-data-server-devel to devel subpackage + (RH bug #218889). + * Thu Dec 21 2006 Matthew Barnes - 2.9.4-3.fc7 - Add patch for RH bug #218898 (viewing message source). From ce85418db8db136fd03255351d90028d2846416d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Jan 2007 02:53:59 +0000 Subject: [PATCH 100/844] - Update to 2.9.5 - Remove pilot-link-0.12 patch (fixed upstream). - Remove patch for RH bug #215466 and #218589 (fixed upstream). - Remove patch for RH bug #215695 (fixed upstream). --- .cvsignore | 7 +------ evolution.spec | 51 ++++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 24 insertions(+), 36 deletions(-) diff --git a/.cvsignore b/.cvsignore index 608895c..274a483 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1 @@ -evolution-2.9.4.tar.bz2 -evolution16.png -evolution22.png -evolution24.png -evolution32.png -evolution.svg +evolution-2.9.5.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 23276ae..d770c39 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 2.9.4 -Release: 4%{?dist} +Version: 2.9.5 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -139,36 +139,26 @@ Patch34: evolution-2.9.1-first-ascii.patch # GNOME bug #373837 Patch35: evolution-2.9.2-gtk-font-button.patch -# Port evolution conduits to pilot-link 0.12 -# http://mail.gnome.org/archives/evolution-patches/2006-August/msg00083.html -Patch36: evolution-2.9.2-pilot-link-0.12.patch - -# RH bug #215466 / RH bug #218589 / GNOME bug #377511 -Patch37: evolution-2.9.2-optional-participant.patch - -# RH bug #215695 / GNOME bug #383027 -Patch39: evolution-2.9.3-dont-assume-default-account.patch - # RH bug #216537 / GNOME bug #383047 -#Patch40: evolution-2.9.3-view-attachment-uri.patch +#Patch36: evolution-2.9.3-view-attachment-uri.patch # GNOME bug #350253 -Patch41: evolution-2.9.3-adopt-icons.patch +Patch37: evolution-2.9.3-adopt-icons.patch # RH bug #215478 / GNOME bug #383842 -Patch42: evolution-2.9.3-source-path-entry.patch +Patch38: evolution-2.9.3-source-path-entry.patch # RH bug #218801 / GNOME bug #383953 -Patch43: evolution-2.9.3-unread-messages.patch +Patch39: evolution-2.9.3-unread-messages.patch # RH bug #215467 / GNOME bug #380644 -Patch44: evolution-2.9.3-meeting-list-view.patch +Patch40: evolution-2.9.3-meeting-list-view.patch # GNOME bug #373116 -Patch45: evolution-2.9.3-gtk-color-button.patch +Patch41: evolution-2.9.3-gtk-color-button.patch # GNOME bug #218898 -Patch46: evolution-2.9.4-view-message-source.patch +Patch42: evolution-2.9.4-view-message-source.patch ## Dependencies ### @@ -309,16 +299,13 @@ Development files needed for building things which link against evolution. %patch33 -p1 -b .im-context-reset %patch34 -p1 -b .first-ascii %patch35 -p1 -b .gtk-font-button -%patch36 -p1 -b .pilot-link-0.12 -%patch37 -p1 -b .optional-participant -%patch39 -p1 -b .dont-assume-default-account -#%patch40 -p1 -b .view-attachment-uri -%patch41 -p1 -b .adopt-icons -%patch42 -p1 -b .source-path-entry -%patch43 -p1 -b .unread-messages -%patch44 -p1 -b .meeting-list-view -%patch45 -p1 -b .gtk-color-button -%patch46 -p1 -b .view-message-source +#%patch36 -p1 -b .view-attachment-uri +%patch37 -p1 -b .adopt-icons +%patch38 -p1 -b .source-path-entry +%patch39 -p1 -b .unread-messages +%patch40 -p1 -b .meeting-list-view +%patch41 -p1 -b .gtk-color-button +%patch42 -p1 -b .view-message-source mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -734,6 +721,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Jan 08 2008 Matthew Barnes - 2.9.5-1.fc7 +- Update to 2.9.5 +- Remove pilot-link-0.12 patch (fixed upstream). +- Remove patch for RH bug #215466 and #218589 (fixed upstream). +- Remove patch for RH bug #215695 (fixed upstream). + * Sat Dec 30 2006 Matthew Barnes - 2.9.4-4.fc7 - Add Requires evolution-data-server-devel to devel subpackage (RH bug #218889). diff --git a/sources b/sources index 0b1ade0..7a883ab 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -8915ed5f5b4c0351f05a428111b46216 evolution-2.9.4.tar.bz2 +ef0c0eaff9fc7c3372bcac947d0cb0b8 evolution-2.9.5.tar.bz2 4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png de663fa442d61f53dc058dd20c77da8e evolution22.png d33896d33b5db2201e051664e96b1100 evolution24.png From 47c723c0aea027767f9582863eb7a78f18248207 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 10 Jan 2007 17:15:05 +0000 Subject: [PATCH 101/844] - Add patch for GNOME bug #359979 (change EMsgPort semantics). --- evolution.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index d770c39..c8e10bf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -160,6 +160,9 @@ Patch41: evolution-2.9.3-gtk-color-button.patch # GNOME bug #218898 Patch42: evolution-2.9.4-view-message-source.patch +# GNOME bug #359979 +Patch43: evolution-2.9.5-change-msgport-semantics.patch + ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -306,6 +309,7 @@ Development files needed for building things which link against evolution. %patch40 -p1 -b .meeting-list-view %patch41 -p1 -b .gtk-color-button %patch42 -p1 -b .view-message-source +%patch43 -p1 -b .change-msgport-semantics mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -721,7 +725,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Mon Jan 08 2008 Matthew Barnes - 2.9.5-1.fc7 +* Wed Jan 10 2007 Matthew Barnes - 2.9.5-2.fc7 +- Add patch for GNOME bug #359979 (change EMsgPort semantics). + +* Mon Jan 08 2007 Matthew Barnes - 2.9.5-1.fc7 - Update to 2.9.5 - Remove pilot-link-0.12 patch (fixed upstream). - Remove patch for RH bug #215466 and #218589 (fixed upstream). From 93660bd6c6386ad4b8accaf529063266f6a1e141 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 22 Jan 2007 03:37:21 +0000 Subject: [PATCH 102/844] - Revise evolution-2.7.1-no-gnome-common.patch so that we no longer have to run autoconf before building. - Revise evolution-2.5.4-fix-conduit-dir.patch so that we no longer have to run automake before building. --- evolution-2.5.4-fix-conduit-dir.patch | 70 +++++++++--- evolution-2.7.1-no-gnome-common.patch | 150 +++++++++++++++++++++++++- evolution.spec | 22 ++-- 3 files changed, 218 insertions(+), 24 deletions(-) diff --git a/evolution-2.5.4-fix-conduit-dir.patch b/evolution-2.5.4-fix-conduit-dir.patch index e5def8e..cba890a 100644 --- a/evolution-2.5.4-fix-conduit-dir.patch +++ b/evolution-2.5.4-fix-conduit-dir.patch @@ -1,5 +1,5 @@ ---- evolution-2.5.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2004-12-02 22:39:53.000000000 -0500 -+++ evolution-2.5.4/addressbook/conduit/Makefile.am 2006-01-11 00:21:25.000000000 -0500 +--- evolution-2.9.5/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.9.5/addressbook/conduit/Makefile.am 2007-01-21 22:05:23.000000000 -0500 @@ -28,7 +28,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ @@ -9,19 +9,19 @@ conduit_DATA = e-address-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.5.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2005-06-26 20:43:06.000000000 -0400 -+++ evolution-2.5.4/calendar/conduits/calendar/Makefile.am 2006-01-11 00:21:25.000000000 -0500 -@@ -24,7 +24,7 @@ - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ +--- evolution-2.9.5/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-01-21 22:05:44.000000000 -0500 ++++ evolution-2.9.5/addressbook/conduit/Makefile.in 2007-01-21 22:06:04.000000000 -0500 +@@ -459,7 +459,7 @@ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar-$(BASE_VERSION).conduit - + conduit_DATA = e-address-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.5.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2005-06-26 20:43:07.000000000 -0400 -+++ evolution-2.5.4/calendar/conduits/todo/Makefile.am 2006-01-11 00:21:25.000000000 -0500 + CLEANFILES = $(BUILT_SOURCES) +--- evolution-2.9.5/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/todo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 @@ -24,7 +24,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ @@ -31,8 +31,19 @@ conduit_DATA = e-todo-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.5.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2006-01-11 00:22:26.000000000 -0500 -+++ evolution-2.5.4/calendar/conduits/memo/Makefile.am 2006-01-11 00:22:39.000000000 -0500 +--- evolution-2.9.5/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:31.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/todo/Makefile.in 2007-01-21 22:06:39.000000000 -0500 +@@ -454,7 +454,7 @@ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-todo-$(BASE_VERSION).conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) +--- evolution-2.9.5/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/memo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 @@ -24,7 +24,7 @@ -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ @@ -42,3 +53,36 @@ conduit_DATA = e-memo-$(BASE_VERSION).conduit BUILT_SOURCES = $(conduit_DATA) +--- evolution-2.9.5/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:46.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/memo/Makefile.in 2007-01-21 22:06:54.000000000 -0500 +@@ -454,7 +454,7 @@ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-memo-$(BASE_VERSION).conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) +--- evolution-2.9.5/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/calendar/Makefile.am 2007-01-21 22:05:23.000000000 -0500 +@@ -24,7 +24,7 @@ + -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ + $< > $@ + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-calendar-$(BASE_VERSION).conduit + + BUILT_SOURCES = $(conduit_DATA) +--- evolution-2.9.5/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-01-21 22:06:15.000000000 -0500 ++++ evolution-2.9.5/calendar/conduits/calendar/Makefile.in 2007-01-21 22:06:23.000000000 -0500 +@@ -456,7 +456,7 @@ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-calendar-$(BASE_VERSION).conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) diff --git a/evolution-2.7.1-no-gnome-common.patch b/evolution-2.7.1-no-gnome-common.patch index 9fc3599..513a16c 100644 --- a/evolution-2.7.1-no-gnome-common.patch +++ b/evolution-2.7.1-no-gnome-common.patch @@ -1,6 +1,150 @@ ---- evolution-2.7.1/configure.in.no-gnome-common 2006-04-24 07:17:07.000000000 -0400 -+++ evolution-2.7.1/configure.in 2006-05-12 14:46:29.000000000 -0400 -@@ -1072,9 +1080,6 @@ +--- evolution-2.9.5/configure.no-gnome-common 2007-01-21 22:00:01.000000000 -0500 ++++ evolution-2.9.5/configure 2007-01-21 22:00:53.000000000 -0500 +@@ -30764,141 +30764,6 @@ + + + +- # Check whether --enable-compile-warnings or --disable-compile-warnings was given. +-if test "${enable_compile_warnings+set}" = set; then +- enableval="$enable_compile_warnings" +- +-else +- enable_compile_warnings="yes" +-fi; +- +- warnCFLAGS= +- if test "x$GCC" != xyes; then +- enable_compile_warnings=no +- fi +- +- warning_flags= +- realsave_CFLAGS="$CFLAGS" +- +- case "$enable_compile_warnings" in +- no) +- warning_flags= +- ;; +- minimum) +- warning_flags="-Wall" +- ;; +- yes) +- warning_flags="-Wall -Wmissing-prototypes" +- ;; +- maximum|error) +- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" +- CFLAGS="$warning_flags $CFLAGS" +- for option in -Wno-sign-compare; do +- SAVE_CFLAGS="$CFLAGS" +- CFLAGS="$CFLAGS $option" +- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-int +-main () +-{ +- +- ; +- return 0; +-} +-_ACEOF +-rm -f conftest.$ac_objext +-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 +- (eval $ac_compile) 2>conftest.er1 +- ac_status=$? +- grep -v '^ *+' conftest.er1 >conftest.err +- rm -f conftest.er1 +- cat conftest.err >&5 +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && +- { ac_try='test -z "$ac_c_werror_flag" +- || test ! -s conftest.err' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; } && +- { ac_try='test -s conftest.$ac_objext' +- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 +- (eval $ac_try) 2>&5 +- ac_status=$? +- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- has_option=yes +-else +- echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-has_option=no +-fi +-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- CFLAGS="$SAVE_CFLAGS" +- echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6 +- if test $has_option = yes; then +- warning_flags="$warning_flags $option" +- fi +- unset has_option +- unset SAVE_CFLAGS +- done +- unset option +- if test "$enable_compile_warnings" = "error" ; then +- warning_flags="$warning_flags -Werror" +- fi +- ;; +- *) +- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { (exit 1); exit 1; }; } +- ;; +- esac +- CFLAGS="$realsave_CFLAGS" +- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 +- echo "$as_me:$LINENO: result: $warning_flags" >&5 +-echo "${ECHO_T}$warning_flags" >&6 +- +- # Check whether --enable-iso-c or --disable-iso-c was given. +-if test "${enable_iso_c+set}" = set; then +- enableval="$enable_iso_c" +- +-else +- enable_iso_c=no +-fi; +- +- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 +- complCFLAGS= +- if test "x$enable_iso_c" != "xno"; then +- if test "x$GCC" = "xyes"; then +- case " $CFLAGS " in +- *\ \ -ansi\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -ansi" ;; +- esac +- case " $CFLAGS " in +- *\ \ -pedantic\ \ *) ;; +- *) complCFLAGS="$complCFLAGS -pedantic" ;; +- esac +- fi +- fi +- echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-echo "${ECHO_T}$complCFLAGS" >&6 +- +- WARN_CFLAGS="$warning_flags $complCFLAGS" +- +- +-CFLAGS="$CFLAGS $WARN_CFLAGS" + case $CFLAGS in + *-Wall*) + # Turn off the annoying "comparison between signed and unsigned" +--- evolution-2.9.5/configure.in.no-gnome-common 2007-01-08 11:54:43.000000000 -0500 ++++ evolution-2.9.5/configure.in 2007-01-21 21:57:28.000000000 -0500 +@@ -1133,9 +1133,6 @@ dnl ************************* dnl CFLAGS and LIBS and stuff dnl ************************* diff --git a/evolution.spec b/evolution.spec index c8e10bf..cc95290 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,13 +44,13 @@ Name: evolution Version: 2.9.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite URL: http://www.gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: %{name}-%{version}.tar.bz2 +Source: evolution-%{version}.tar.bz2 Source1: evolution16.png Source2: evolution22.png Source3: evolution24.png @@ -275,7 +275,7 @@ Obsoletes: libgal2-devel <= %{last_libgal2_version} Development files needed for building things which link against evolution. %prep -%setup -q +%setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .commit-enter-on-calendar %patch12 -p1 -b .move-autosave-file @@ -410,13 +410,13 @@ autoreconf --force --warnings=no-portability %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ --enable-plugins=all export tagname=CC -make %{?_smp_mflags} LIBTOOL=%{_bindir}/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 export tagname=CC -make LIBTOOL=%{_bindir}/libtool DESTDIR=$RPM_BUILD_ROOT install +make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # remove libtool archives for importers and the like @@ -460,14 +460,14 @@ ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done -%find_lang %name-%{evo_major} +%find_lang evolution-%{evo_major} %post /sbin/ldconfig export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas" for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule /etc/gconf/schemas/$S > /dev/null + gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null done scrollkeeper-update -q @@ -478,7 +478,7 @@ scrollkeeper-update -q %clean rm -rf $RPM_BUILD_ROOT -%files -f %{name}-%{evo_major}.lang +%files -f evolution-%{evo_major}.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog INSTALL NEWS README @@ -725,6 +725,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sun Jan 21 2007 Matthew Barnes - 2.9.5-3.fc7 +- Revise evolution-2.7.1-no-gnome-common.patch so that we no longer + have to run autoconf before building. +- Revise evolution-2.5.4-fix-conduit-dir.patch so that we no longer + have to run automake before building. + * Wed Jan 10 2007 Matthew Barnes - 2.9.5-2.fc7 - Add patch for GNOME bug #359979 (change EMsgPort semantics). From 63af163fc01db142df11ce257738ea9f30f2e31e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 26 Jan 2007 18:54:04 +0000 Subject: [PATCH 103/844] - Compile with the -fno-strict-aliasing flag, which will hopefully improve reliability until the illegal type-punning is fixed (RH bug #224552). --- evolution.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index cc95290..77534f5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Name: evolution Version: 2.9.5 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -410,7 +410,7 @@ autoreconf --force --warnings=no-portability %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ --enable-plugins=all export tagname=CC -make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED" +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing" %install rm -rf $RPM_BUILD_ROOT @@ -725,6 +725,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Jan 26 2007 Matthew Barnes - 2.9.5-4.fc7 +- Compile with the -fno-strict-aliasing flag, which will hopefully improve + reliability until the illegal type-punning is fixed (RH bug #224552). + * Sun Jan 21 2007 Matthew Barnes - 2.9.5-3.fc7 - Revise evolution-2.7.1-no-gnome-common.patch so that we no longer have to run autoconf before building. From cb07aeca2eca9844dd625fd3c3327d698777678b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Feb 2007 19:40:06 +0000 Subject: [PATCH 104/844] - Update to 2.9.91 - Require gtkhtml3 >= 3.13.6. - Add files for new imap-features plugin. - Add flag to disable deprecated Pango symbols. - Remove patch for GNOME bug #357216 (fixed upstream). - Remove patch for GNOME bug #359979 (fixed upstream). --- .cvsignore | 2 +- evolution-2.8.0-fix-indic-printing.patch | 28 +++---- evolution-2.9.3-gtk-color-button.patch | 95 +++++++++++++----------- evolution.spec | 26 ++++--- sources | 7 +- 5 files changed, 81 insertions(+), 77 deletions(-) diff --git a/.cvsignore b/.cvsignore index 274a483..5593b86 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.9.5.tar.bz2 +evolution-2.9.91.tar.bz2 diff --git a/evolution-2.8.0-fix-indic-printing.patch b/evolution-2.8.0-fix-indic-printing.patch index 4c53199..226be93 100644 --- a/evolution-2.8.0-fix-indic-printing.patch +++ b/evolution-2.8.0-fix-indic-printing.patch @@ -1,26 +1,26 @@ ---- evolution-2.9.4/plugins/print-message/print-message.c.fix-indic-printing 2005-08-23 23:14:10.000000000 -0400 -+++ evolution-2.9.4/plugins/print-message/print-message.c 2006-12-19 16:58:21.000000000 -0500 +--- evolution-2.9.91/plugins/print-message/print-message.c.fix-indic-printing 2007-02-12 01:58:01.000000000 -0500 ++++ evolution-2.9.91/plugins/print-message/print-message.c 2007-02-12 13:30:17.000000000 -0500 @@ -83,7 +83,7 @@ - data->config = e_print_load_config (); + data->config = e_print_load_settings (); data->preview = 0; - data->msg = e_msg_composer_get_message (composer, 1); + data->msg = e_msg_composer_get_message_print (composer, 1); - dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), GNOME_PRINT_DIALOG_COPIES, data->config); - gtk_dialog_set_default_response(dialog, GNOME_PRINT_DIALOG_RESPONSE_PRINT); + dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), 0, data->config); + gtk_dialog_set_default_response(dialog, GTK_RESPONSE_OK); e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer); -@@ -104,7 +104,7 @@ - data->config = e_print_load_config (); +@@ -102,7 +102,7 @@ + data->config = e_print_load_settings (); data->preview = 0; - data->msg = e_msg_composer_get_message (composer, 1); + data->msg = e_msg_composer_get_message_print (composer, 1); - print_response(NULL, GNOME_PRINT_DIALOG_RESPONSE_PREVIEW, data); + print_response(NULL, GTK_RESPONSE_APPLY, data); } ---- evolution-2.9.4/composer/e-msg-composer.h.fix-indic-printing 2005-12-07 03:29:51.000000000 -0500 -+++ evolution-2.9.4/composer/e-msg-composer.h 2006-12-19 16:58:21.000000000 -0500 -@@ -96,6 +96,8 @@ +--- evolution-2.9.91/composer/e-msg-composer.h.fix-indic-printing 2007-01-22 10:23:06.000000000 -0500 ++++ evolution-2.9.91/composer/e-msg-composer.h 2007-02-12 13:29:24.000000000 -0500 +@@ -101,6 +101,8 @@ CamelMimePart *part); CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer, gboolean save_html_object_data); @@ -29,9 +29,9 @@ CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer); void e_msg_composer_show_sig_file (EMsgComposer *composer); gboolean e_msg_composer_get_send_html (EMsgComposer *composer); ---- evolution-2.9.4/composer/e-msg-composer.c.fix-indic-printing 2006-12-19 16:58:21.000000000 -0500 -+++ evolution-2.9.4/composer/e-msg-composer.c 2006-12-20 10:44:45.000000000 -0500 -@@ -5189,6 +5189,49 @@ +--- evolution-2.9.91/composer/e-msg-composer.c.fix-indic-printing 2007-02-12 13:29:24.000000000 -0500 ++++ evolution-2.9.91/composer/e-msg-composer.c 2007-02-12 13:29:24.000000000 -0500 +@@ -5267,6 +5267,49 @@ } CamelMimeMessage * diff --git a/evolution-2.9.3-gtk-color-button.patch b/evolution-2.9.3-gtk-color-button.patch index 4414672..665175b 100644 --- a/evolution-2.9.3-gtk-color-button.patch +++ b/evolution-2.9.3-gtk-color-button.patch @@ -1,5 +1,5 @@ ---- evolution-2.9.4/mail/em-composer-prefs.c.gtk-color-button 2006-07-11 12:47:09.000000000 -0400 -+++ evolution-2.9.4/mail/em-composer-prefs.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/mail/em-composer-prefs.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/em-composer-prefs.c 2007-02-12 13:32:03.000000000 -0500 @@ -56,9 +56,8 @@ #include #include @@ -90,8 +90,8 @@ gtk_widget_hide (GTK_WIDGET (prefs->language)); } ---- evolution-2.9.4/mail/mail-config.glade.gtk-color-button 2006-12-19 16:06:48.000000000 -0500 -+++ evolution-2.9.4/mail/mail-config.glade 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/mail/mail-config.glade.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 ++++ evolution-2.9.91/mail/mail-config.glade 2007-02-12 13:32:03.000000000 -0500 @@ -5138,10 +5138,9 @@ @@ -185,8 +185,8 @@ False Pick a color True ---- evolution-2.9.4/mail/em-mailer-prefs.h.gtk-color-button 2006-12-19 16:06:48.000000000 -0500 -+++ evolution-2.9.4/mail/em-mailer-prefs.h 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/mail/em-mailer-prefs.h.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 ++++ evolution-2.9.91/mail/em-mailer-prefs.h 2007-02-12 13:32:03.000000000 -0500 @@ -37,7 +37,6 @@ struct _GdkPixbuf; struct _GtkWidget; @@ -213,8 +213,8 @@ } labels[5]; struct _GtkButton *restore_labels; ---- evolution-2.9.4/mail/em-composer-prefs.h.gtk-color-button 2005-01-24 16:11:07.000000000 -0500 -+++ evolution-2.9.4/mail/em-composer-prefs.h 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/mail/em-composer-prefs.h.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/em-composer-prefs.h 2007-02-12 13:32:03.000000000 -0500 @@ -48,7 +48,6 @@ struct _GdkPixbuf; struct _GtkWidget; @@ -232,8 +232,8 @@ struct _GtkTreeView *language; CORBA_sequence_GNOME_Spell_Language *language_seq; gboolean spell_active; ---- evolution-2.9.4/mail/em-mailer-prefs.c.gtk-color-button 2006-12-19 16:06:48.000000000 -0500 -+++ evolution-2.9.4/mail/em-mailer-prefs.c 2006-12-19 16:08:24.000000000 -0500 +--- evolution-2.9.91/mail/em-mailer-prefs.c.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 ++++ evolution-2.9.91/mail/em-mailer-prefs.c 2007-02-12 13:32:03.000000000 -0500 @@ -35,7 +35,7 @@ #include "misc/e-charset-picker.h" #include @@ -361,8 +361,8 @@ g_signal_connect (prefs->labels[i].color, "color-set", G_CALLBACK (label_color_set), prefs); atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), label->name); ---- evolution-2.9.4/filter/filter-colour.h.gtk-color-button 2002-11-01 17:07:46.000000000 -0500 -+++ evolution-2.9.4/filter/filter-colour.h 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/filter/filter-colour.h.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/filter/filter-colour.h 2007-02-12 13:32:03.000000000 -0500 @@ -39,7 +39,7 @@ struct _FilterColour { FilterElement parent_object; @@ -372,8 +372,8 @@ }; struct _FilterColourClass { ---- evolution-2.9.4/filter/filter-colour.c.gtk-color-button 2004-12-02 22:41:39.000000000 -0500 -+++ evolution-2.9.4/filter/filter-colour.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/filter/filter-colour.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/filter/filter-colour.c 2007-02-12 13:32:03.000000000 -0500 @@ -26,7 +26,7 @@ #endif @@ -533,8 +533,8 @@ + fc->color.red, fc->color.green, fc->color.blue); + e_sexp_encode_string (out, spec); } ---- evolution-2.9.4/filter/filter-element.c.gtk-color-button 2006-02-08 06:44:27.000000000 -0500 -+++ evolution-2.9.4/filter/filter-element.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/filter/filter-element.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/filter/filter-element.c 2007-02-12 13:32:03.000000000 -0500 @@ -293,12 +293,10 @@ } } else if (IS_FILTER_COLOUR(se)) { @@ -551,23 +551,28 @@ } } else if (IS_FILTER_DATESPEC(se)) { if (IS_FILTER_DATESPEC(de)) { ---- evolution-2.9.4/plugins/groupwise-account-setup/camel-gw-listener.c.gtk-color-button 2006-12-04 08:14:34.000000000 -0500 -+++ evolution-2.9.4/plugins/groupwise-account-setup/camel-gw-listener.c 2006-12-19 16:07:37.000000000 -0500 -@@ -213,10 +213,10 @@ +--- evolution-2.9.91/plugins/groupwise-account-setup/camel-gw-listener.c.gtk-color-button 2007-02-09 15:16:33.000000000 -0500 ++++ evolution-2.9.91/plugins/groupwise-account-setup/camel-gw-listener.c 2007-02-12 13:41:50.000000000 -0500 +@@ -212,12 +212,13 @@ + e_source_set_property (source, "use_ssl", use_ssl); e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); if (parent_id_name) { +- guint32 color; ++ char *color; e_source_set_property (source, "parent_id_name", parent_id_name); -- e_source_set_color (source, 0xFF00FF); -+ e_source_set_color_spec (source, "#FF00FF"); - } - else +- color = (guint32) atoi((char *)(camel_url_get_param (url, "color"))); +- e_source_set_color (source, color); ++ color = g_strdup_printf ("#%s", camel_url_get_param (url, "color")); ++ e_source_set_color_spec (source, color); ++ g_free (color); + } else - e_source_set_color (source, 0xEEBC60); + e_source_set_color_spec (source, "#EEBC60"); e_source_group_add_source (group, source, -1); e_source_list_sync (source_list, NULL); ---- evolution-2.9.4/calendar/gui/tasks-component.c.gtk-color-button 2006-12-04 08:14:30.000000000 -0500 -+++ evolution-2.9.4/calendar/gui/tasks-component.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/tasks-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/tasks-component.c 2007-02-12 13:32:03.000000000 -0500 @@ -209,7 +209,7 @@ calendar_config_set_tasks_selected (&selected); } @@ -577,8 +582,8 @@ personal_source = source; } ---- evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.c.gtk-color-button 2006-12-19 16:06:48.000000000 -0500 -+++ evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.c.gtk-color-button 2007-02-12 13:32:02.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.c 2007-02-12 13:32:03.000000000 -0500 @@ -96,21 +96,6 @@ return glade_xml_get_widget (prefs->gui, item->label); } @@ -671,8 +676,8 @@ /* Hide Completed Tasks. */ e_dialog_toggle_set (prefs->tasks_hide_completed, calendar_config_get_hide_completed_tasks ()); ---- evolution-2.9.4/calendar/gui/dialogs/calendar-setup.c.gtk-color-button 2006-07-19 09:04:45.000000000 -0400 -+++ evolution-2.9.4/calendar/gui/dialogs/calendar-setup.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/dialogs/calendar-setup.c.gtk-color-button 2007-01-03 10:27:56.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/dialogs/calendar-setup.c 2007-02-12 13:32:03.000000000 -0500 @@ -73,44 +73,22 @@ } @@ -903,8 +908,8 @@ } else { GConfClient *gconf; GSList *l; ---- evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.glade.gtk-color-button 2006-07-10 06:42:58.000000000 -0400 -+++ evolution-2.9.4/calendar/gui/dialogs/cal-prefs-dialog.glade 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.glade.gtk-color-button 2007-01-03 10:27:56.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.glade 2007-02-12 13:32:03.000000000 -0500 @@ -1231,10 +1231,9 @@ @@ -929,8 +934,8 @@ False Pick a color True ---- evolution-2.9.4/calendar/gui/e-cal-model-tasks.c.gtk-color-button 2006-10-16 14:13:48.000000000 -0400 -+++ evolution-2.9.4/calendar/gui/e-cal-model-tasks.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/e-cal-model-tasks.c.gtk-color-button 2007-01-08 09:50:33.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/e-cal-model-tasks.c 2007-02-12 13:32:03.000000000 -0500 @@ -1025,14 +1025,28 @@ static const char * ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) @@ -962,8 +967,8 @@ case E_CAL_MODEL_TASKS_DUE_NEVER: case E_CAL_MODEL_TASKS_DUE_FUTURE: case E_CAL_MODEL_TASKS_DUE_COMPLETE: ---- evolution-2.9.4/calendar/gui/memos-component.c.gtk-color-button 2006-10-16 14:13:51.000000000 -0400 -+++ evolution-2.9.4/calendar/gui/memos-component.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/memos-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/memos-component.c 2007-02-12 13:32:03.000000000 -0500 @@ -213,7 +213,7 @@ calendar_config_set_memos_selected (&selected); } @@ -973,8 +978,8 @@ personal_source = source; } ---- evolution-2.9.4/calendar/gui/calendar-component.c.gtk-color-button 2006-09-21 01:41:00.000000000 -0400 -+++ evolution-2.9.4/calendar/gui/calendar-component.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/calendar-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/calendar-component.c 2007-02-12 13:32:03.000000000 -0500 @@ -252,7 +252,7 @@ } @@ -984,8 +989,8 @@ } if (!on_the_web) { ---- evolution-2.9.4/calendar/gui/e-cal-model.c.gtk-color-button 2006-11-20 09:16:34.000000000 -0500 -+++ evolution-2.9.4/calendar/gui/e-cal-model.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/e-cal-model.c.gtk-color-button 2007-01-08 09:50:33.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/e-cal-model.c 2007-02-12 13:32:03.000000000 -0500 @@ -947,7 +947,7 @@ ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) { @@ -1008,8 +1013,8 @@ return comp_data->color; } ---- evolution-2.9.4/calendar/gui/calendar-config.h.gtk-color-button 2006-07-17 02:01:28.000000000 -0400 -+++ evolution-2.9.4/calendar/gui/calendar-config.h 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/calendar-config.h.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/calendar-config.h 2007-02-12 13:32:03.000000000 -0500 @@ -31,6 +31,7 @@ #define _CALENDAR_CONFIG_H_ @@ -1034,8 +1039,8 @@ /* Settings to hide completed tasks. */ gboolean calendar_config_get_hide_completed_tasks (void); ---- evolution-2.9.4/calendar/gui/migration.c.gtk-color-button 2006-10-16 14:13:51.000000000 -0400 -+++ evolution-2.9.4/calendar/gui/migration.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/migration.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/migration.c 2007-02-12 13:32:03.000000000 -0500 @@ -406,7 +406,7 @@ e_source_group_add_source (group, source, -1); g_object_unref (source); @@ -1081,8 +1086,8 @@ e_source_group_add_source (group, source, -1); ids = gconf_client_get_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, NULL); ---- evolution-2.9.4/calendar/gui/calendar-config.c.gtk-color-button 2006-12-04 08:14:29.000000000 -0500 -+++ evolution-2.9.4/calendar/gui/calendar-config.c 2006-12-19 16:07:37.000000000 -0500 +--- evolution-2.9.91/calendar/gui/calendar-config.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/calendar-config.c 2007-02-12 13:32:03.000000000 -0500 @@ -1219,68 +1219,104 @@ /** diff --git a/evolution.spec b/evolution.spec index 77534f5..17df332 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 %define gnomevfs2_version 2.4 -%define gtkhtml_version 3.9.2 +%define gtkhtml_version 3.13.6 %define last_libgal2_version 2:2.5.3-2 %define libbonoboui_version 2.4.2 %define libgnomeprint22_version 2.8.0 @@ -43,8 +43,8 @@ ### Abstract ### Name: evolution -Version: 2.9.5 -Release: 4%{?dist} +Version: 2.9.91 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -115,9 +115,6 @@ Patch26: evolution-2.8.0-indic-cursor-movement.patch # GNOME bug #356177 Patch27: evolution-2.8.0-kill-emutex.patch -# GNOME bug #357216 -Patch28: evolution-2.8.0-deprecated-gdk-font.patch - # RH bug #202751 / GNOME bug #355766 Patch29: evolution-2.8.0-fix-indic-printing.patch @@ -160,9 +157,6 @@ Patch41: evolution-2.9.3-gtk-color-button.patch # GNOME bug #218898 Patch42: evolution-2.9.4-view-message-source.patch -# GNOME bug #359979 -Patch43: evolution-2.9.5-change-msgport-semantics.patch - ## Dependencies ### Requires: ORBit2 >= %{orbit2_version} @@ -294,7 +288,6 @@ Development files needed for building things which link against evolution. %patch25 -p1 -b .fix-prgname %patch26 -p1 -b .indic-cursor-movement %patch27 -p1 -b .kill-emutex -%patch28 -p1 -b .deprecated-gdk-font %patch29 -p1 -b .fix-indic-printing %patch30 -p1 -b .about-dialog %patch31 -p1 -b .kill-ethread @@ -309,7 +302,6 @@ Development files needed for building things which link against evolution. %patch40 -p1 -b .meeting-list-view %patch41 -p1 -b .gtk-color-button %patch42 -p1 -b .view-message-source -%patch43 -p1 -b .change-msgport-semantics mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -389,6 +381,7 @@ fi %if %{strict_build_settings} CFLAGS="$CFLAGS \ -DG_DISABLE_DEPRECATED=1 \ + -DPANGO_DISABLE_DEPRECATED=1 \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \ -DEDS_DISABLE_DEPRECATED=1 \ @@ -639,6 +632,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-gw-account-setup.eplug %{evo_plugin_dir}/liborg-gnome-gw-account-setup.so +%{evo_plugin_dir}/org-gnome-imap-features.eplug +%{evo_plugin_dir}/liborg-gnome-imap-features.so + %{evo_plugin_dir}/org-gnome-itip-formatter.eplug %{evo_plugin_dir}/liborg-gnome-itip-formatter.so @@ -725,6 +721,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Feb 12 2007 Matthew Barnes - 2.9.91-1.fc7 +- Update to 2.9.91 +- Require gtkhtml3 >= 3.13.6. +- Add files for new imap-features plugin. +- Add flag to disable deprecated Pango symbols. +- Remove patch for GNOME bug #357216 (fixed upstream). +- Remove patch for GNOME bug #359979 (fixed upstream). + * Fri Jan 26 2007 Matthew Barnes - 2.9.5-4.fc7 - Compile with the -fno-strict-aliasing flag, which will hopefully improve reliability until the illegal type-punning is fixed (RH bug #224552). diff --git a/sources b/sources index 7a883ab..006c944 100644 --- a/sources +++ b/sources @@ -1,6 +1 @@ -ef0c0eaff9fc7c3372bcac947d0cb0b8 evolution-2.9.5.tar.bz2 -4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png -de663fa442d61f53dc058dd20c77da8e evolution22.png -d33896d33b5db2201e051664e96b1100 evolution24.png -2fa4ce12c94153aca9af465e1a1819c8 evolution32.png -e85874e8d480a9c82bc155da396a54e4 evolution.svg +8acb0abc5620d4240217cc9293ba650b evolution-2.9.91.tar.bz2 From 402112926f3a4bfc1b11efd46a30829e0b8c6400 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Feb 2007 20:34:49 +0000 Subject: [PATCH 105/844] - Fix sources file. --- .cvsignore | 5 +++++ sources | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.cvsignore b/.cvsignore index 5593b86..bcaac42 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,6 @@ evolution-2.9.91.tar.bz2 +evolution.svg +evolution32.png +evolution24.png +evolution22.png +evolution16.png diff --git a/sources b/sources index 006c944..336b6b6 100644 --- a/sources +++ b/sources @@ -1 +1,6 @@ -8acb0abc5620d4240217cc9293ba650b evolution-2.9.91.tar.bz2 +b019ce7645491f77f9b2d4492a77ae00 evolution-2.9.91.tar.bz2 +e85874e8d480a9c82bc155da396a54e4 evolution.svg +2fa4ce12c94153aca9af465e1a1819c8 evolution32.png +d33896d33b5db2201e051664e96b1100 evolution24.png +de663fa442d61f53dc058dd20c77da8e evolution22.png +4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png From 88949d42a81d5bd4fbe876ece73b46adb80e8c33 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 13 Feb 2007 19:24:49 +0000 Subject: [PATCH 106/844] - Require GConf2 in post. - Require scrollkeeper in post and postun. --- evolution.spec | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 17df332..8404989 100644 --- a/evolution.spec +++ b/evolution.spec @@ -13,6 +13,7 @@ %define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 %define redhat_menus_version 5.0.4 +%define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 %define evo_major 2.10 @@ -44,7 +45,7 @@ Name: evolution Version: 2.9.91 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -159,6 +160,10 @@ Patch42: evolution-2.9.4-view-message-source.patch ## Dependencies ### +Requires(post): GConf2 +Requires(post): scrollkeeper >= %{scrollkeeper_version} +Requires(postun): scrollkeeper >= %{scrollkeeper_version} + Requires: ORBit2 >= %{orbit2_version} Requires: dbus >= %{dbus_version} Requires: evolution-data-server >= %{eds_version} @@ -171,7 +176,6 @@ Requires: libbonoboui >= %{libbonoboui_version} Requires: libgnomeprint22 >= %{libgnomeprint22_version} Requires: libsoup >= %{soup_version} Requires: redhat-menus >= %{redhat_menus_version} -Requires: scrollkeeper >= 0.1.4 Requires: spamassassin %if %{libnotify_support} @@ -721,6 +725,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Feb 13 2007 Matthew Barnes - 2.9.91-2.fc7 +- Require GConf2 in post. +- Require scrollkeeper in post and postun. + * Mon Feb 12 2007 Matthew Barnes - 2.9.91-1.fc7 - Update to 2.9.91 - Require gtkhtml3 >= 3.13.6. From 537d207aa852688595de5035f5cee59cd8b2c862 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 15 Feb 2007 23:35:32 +0000 Subject: [PATCH 107/844] - Revise patch for GNOME bug #362638 to fix RH bug #220714 (certificate prompt causes crash). --- evolution-2.8.1-kill-ethread.patch | 224 +++++++++++++++-------------- evolution.spec | 6 +- 2 files changed, 125 insertions(+), 105 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index e91d3b1..1a02390 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,6 +1,6 @@ ---- evolution-2.9.1/mail/mail-send-recv.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 -+++ evolution-2.9.1/mail/mail-send-recv.c 2006-10-26 14:24:55.000000000 -0400 -@@ -817,7 +817,7 @@ +--- evolution-2.9.91/mail/mail-send-recv.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/mail-send-recv.c 2007-02-15 16:04:42.000000000 -0500 +@@ -819,7 +819,7 @@ m->folders = folders; m->info = sinfo; @@ -9,9 +9,9 @@ } else { receive_done ("", data); } ---- evolution-2.9.1/mail/mail-component.c.kill-ethread 2006-09-04 06:36:49.000000000 -0400 -+++ evolution-2.9.1/mail/mail-component.c 2006-10-26 14:24:55.000000000 -0400 -@@ -964,7 +964,7 @@ +--- evolution-2.9.91/mail/mail-component.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/mail-component.c 2007-02-15 16:04:42.000000000 -0500 +@@ -965,7 +965,7 @@ if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -20,8 +20,8 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.9.1/mail/mail-ops.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 -+++ evolution-2.9.1/mail/mail-ops.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/mail-ops.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/mail-ops.c 2007-02-15 16:04:42.000000000 -0500 @@ -221,7 +221,7 @@ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } @@ -167,7 +167,7 @@ struct _get_message_msg *m; @@ -1795,7 +1795,7 @@ - m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; + m->done = done; m->cancel = camel_operation_new(NULL, NULL); - e_thread_put(thread, (EMsg *)m); @@ -185,7 +185,7 @@ struct _get_message_msg *m; @@ -1833,7 +1833,7 @@ - m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; + m->done = done; m->cancel = camel_operation_new(NULL, NULL); - e_thread_put(thread, (EMsg *)m); @@ -247,8 +247,8 @@ return id; } ---- evolution-2.9.1/mail/em-folder-utils.c.kill-ethread 2006-02-08 06:51:32.000000000 -0500 -+++ evolution-2.9.1/mail/em-folder-utils.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/em-folder-utils.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/em-folder-utils.c 2007-02-15 16:04:42.000000000 -0500 @@ -260,7 +260,7 @@ m->delete = delete; seq = m->msg.seq; @@ -267,8 +267,8 @@ return id; } ---- evolution-2.9.1/mail/importers/elm-importer.c.kill-ethread 2005-12-17 13:35:37.000000000 -0500 -+++ evolution-2.9.1/mail/importers/elm-importer.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/importers/elm-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 ++++ evolution-2.9.91/mail/importers/elm-importer.c 2007-02-15 16:04:42.000000000 -0500 @@ -312,7 +312,7 @@ id = m->msg.seq; @@ -278,8 +278,8 @@ return id; } ---- evolution-2.9.1/mail/importers/mail-importer.c.kill-ethread 2006-02-08 06:51:32.000000000 -0500 -+++ evolution-2.9.1/mail/importers/mail-importer.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/importers/mail-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 ++++ evolution-2.9.91/mail/importers/mail-importer.c 2007-02-15 16:04:42.000000000 -0500 @@ -329,7 +329,7 @@ } @@ -289,8 +289,8 @@ return id; } ---- evolution-2.9.1/mail/importers/pine-importer.c.kill-ethread 2006-02-05 18:46:26.000000000 -0500 -+++ evolution-2.9.1/mail/importers/pine-importer.c 2006-10-26 14:24:56.000000000 -0400 +--- evolution-2.9.91/mail/importers/pine-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 ++++ evolution-2.9.91/mail/importers/pine-importer.c 2007-02-15 16:04:42.000000000 -0500 @@ -350,7 +350,7 @@ id = m->msg.seq; @@ -300,8 +300,8 @@ return id; } ---- evolution-2.9.1/mail/mail-vfolder.c.kill-ethread 2006-06-30 05:46:26.000000000 -0400 -+++ evolution-2.9.1/mail/mail-vfolder.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/mail-vfolder.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/mail-vfolder.c 2007-02-15 16:04:42.000000000 -0500 @@ -188,7 +188,7 @@ m->sources_folder = sources_folder; @@ -347,8 +347,8 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.9.1/mail/em-format-html.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 -+++ evolution-2.9.1/mail/em-format-html.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/em-format-html.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/em-format-html.c 2007-02-15 16:04:42.000000000 -0500 @@ -1374,7 +1374,7 @@ } @@ -358,8 +358,8 @@ } efh->priv->format_timeout_id = 0; ---- evolution-2.9.1/mail/em-folder-properties.c.kill-ethread 2006-02-23 08:26:41.000000000 -0500 -+++ evolution-2.9.1/mail/em-folder-properties.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/em-folder-properties.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/em-folder-properties.c 2007-02-15 16:04:42.000000000 -0500 @@ -379,7 +379,7 @@ } @@ -369,8 +369,8 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.9.1/mail/em-folder-tree.c.kill-ethread 2006-08-07 14:55:02.000000000 -0400 -+++ evolution-2.9.1/mail/em-folder-tree.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/em-folder-tree.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/em-folder-tree.c 2007-02-15 16:04:42.000000000 -0500 @@ -966,7 +966,7 @@ tree_drag_data_action(struct _DragDataReceivedAsync *m) { @@ -389,9 +389,9 @@ } static gboolean ---- evolution-2.9.1/mail/em-folder-browser.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 -+++ evolution-2.9.1/mail/em-folder-browser.c 2006-10-26 14:24:55.000000000 -0400 -@@ -950,7 +950,7 @@ +--- evolution-2.9.91/mail/em-folder-browser.c.kill-ethread 2007-02-12 05:37:31.000000000 -0500 ++++ evolution-2.9.91/mail/em-folder-browser.c 2007-02-15 16:04:42.000000000 -0500 +@@ -948,7 +948,7 @@ m->sources_folder = sources_folder; id = m->msg.seq; @@ -400,9 +400,9 @@ return id; } ---- evolution-2.9.1/mail/message-list.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 -+++ evolution-2.9.1/mail/message-list.c 2006-10-26 14:24:55.000000000 -0400 -@@ -1855,7 +1855,7 @@ +--- evolution-2.9.91/mail/message-list.c.kill-ethread 2007-01-18 07:31:51.000000000 -0500 ++++ evolution-2.9.91/mail/message-list.c 2007-02-15 16:04:42.000000000 -0500 +@@ -1888,7 +1888,7 @@ ml_drop_action(struct _drop_msg *m) { m->move = m->action == GDK_ACTION_MOVE; @@ -411,7 +411,7 @@ } static void -@@ -3875,7 +3875,7 @@ +@@ -3922,7 +3922,7 @@ m->ml->regen = g_list_prepend(m->ml->regen, m); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ @@ -420,9 +420,9 @@ m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; ---- evolution-2.9.1/mail/em-format-html-print.c.kill-ethread 2005-05-19 02:46:23.000000000 -0400 -+++ evolution-2.9.1/mail/em-format-html-print.c 2006-10-26 14:24:55.000000000 -0400 -@@ -228,7 +228,7 @@ +--- evolution-2.9.91/mail/em-format-html-print.c.kill-ethread 2007-02-12 01:58:01.000000000 -0500 ++++ evolution-2.9.91/mail/em-format-html-print.c 2007-02-15 16:04:42.000000000 -0500 +@@ -262,7 +262,7 @@ g_object_ref(source); g_object_ref(efhp); @@ -431,9 +431,9 @@ return 0; /* damn async ... */ } ---- evolution-2.9.1/mail/em-sync-stream.c.kill-ethread 2005-12-21 09:10:25.000000000 -0500 -+++ evolution-2.9.1/mail/em-sync-stream.c 2006-10-26 14:24:55.000000000 -0400 -@@ -267,7 +267,7 @@ +--- evolution-2.9.91/mail/em-sync-stream.c.kill-ethread 2007-02-09 15:16:33.000000000 -0500 ++++ evolution-2.9.91/mail/em-sync-stream.c 2007-02-15 16:04:42.000000000 -0500 +@@ -268,7 +268,7 @@ if (emss->cancel) return -1; @@ -442,7 +442,7 @@ EMSS_CLASS(emss)->sync_write(stream, buffer, n); #ifdef LOG_STREAM if (p->logfd) -@@ -297,7 +297,7 @@ +@@ -298,7 +298,7 @@ if (emss->cancel) return -1; @@ -451,7 +451,7 @@ return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); else sync_op(emss, EMSS_FLUSH, NULL, 0); -@@ -315,7 +315,7 @@ +@@ -316,7 +316,7 @@ d(printf("%p: closing stream\n", stream)); @@ -460,8 +460,8 @@ #ifdef LOG_STREAM if (emss->priv->logfd) { fclose(emss->priv->logfd); ---- evolution-2.9.1/mail/em-subscribe-editor.c.kill-ethread 2006-07-24 05:01:30.000000000 -0400 -+++ evolution-2.9.1/mail/em-subscribe-editor.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/em-subscribe-editor.c.kill-ethread 2007-01-08 11:35:48.000000000 -0500 ++++ evolution-2.9.91/mail/em-subscribe-editor.c 2007-02-15 16:04:42.000000000 -0500 @@ -229,7 +229,7 @@ next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); if (next) { @@ -480,7 +480,7 @@ } else { d(printf("queueing subscribe folder '%s'\n", spath)); e_dlist_addtail(&sub->subscribe, (EDListNode *)m); -@@ -420,7 +420,7 @@ +@@ -443,7 +443,7 @@ id = m->msg.seq; @@ -489,8 +489,8 @@ return id; } ---- evolution-2.9.1/mail/mail-mt.h.kill-ethread 2006-10-16 10:37:09.000000000 -0400 -+++ evolution-2.9.1/mail/mail-mt.h 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/mail-mt.h.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/mail-mt.h 2007-02-15 16:04:42.000000000 -0500 @@ -33,6 +33,7 @@ EMsg msg; /* parent type */ struct _mail_msg_op *ops; /* operation functions */ @@ -548,8 +548,8 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.9.1/mail/mail-ops.h.kill-ethread 2006-02-20 11:01:01.000000000 -0500 -+++ evolution-2.9.1/mail/mail-ops.h 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/mail-ops.h.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/mail-ops.h 2007-02-15 16:04:42.000000000 -0500 @@ -30,6 +30,8 @@ #pragma } #endif /* __cplusplus */ @@ -583,8 +583,8 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.9.1/mail/em-composer-utils.c.kill-ethread 2006-04-18 16:56:36.000000000 -0400 -+++ evolution-2.9.1/mail/em-composer-utils.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/em-composer-utils.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/em-composer-utils.c 2007-02-15 16:04:42.000000000 -0500 @@ -534,7 +534,7 @@ strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -628,8 +628,8 @@ - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.9.1/mail/mail-folder-cache.c.kill-ethread 2006-07-26 09:19:18.000000000 -0400 -+++ evolution-2.9.1/mail/mail-folder-cache.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/mail-folder-cache.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/mail-folder-cache.c 2007-02-15 16:04:42.000000000 -0500 @@ -907,7 +907,7 @@ m->store = store; camel_object_ref (store); @@ -648,8 +648,8 @@ LOCK(info_lock); ---- evolution-2.9.1/mail/em-folder-view.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 -+++ evolution-2.9.1/mail/em-folder-view.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/em-folder-view.c.kill-ethread 2007-02-12 01:58:01.000000000 -0500 ++++ evolution-2.9.91/mail/em-folder-view.c 2007-02-15 16:04:42.000000000 -0500 @@ -693,7 +693,7 @@ static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) @@ -659,7 +659,7 @@ } static void -@@ -1588,7 +1588,7 @@ +@@ -1611,7 +1611,7 @@ data->type = type; data->source = source; @@ -668,7 +668,7 @@ } static void -@@ -1686,7 +1686,7 @@ +@@ -1709,7 +1709,7 @@ data->type = type; data->uri = g_strdup (uri); @@ -677,7 +677,7 @@ } static void -@@ -2335,7 +2335,7 @@ +@@ -2369,7 +2369,7 @@ g_object_ref (emfv); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ e_profile_event_emit("goto.load", emfv->displayed_uid, 0); @@ -686,8 +686,8 @@ } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.9.1/mail/mail-session.c.kill-ethread 2006-10-26 14:24:06.000000000 -0400 -+++ evolution-2.9.1/mail/mail-session.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/mail-session.c.kill-ethread 2007-02-15 16:04:42.000000000 -0500 ++++ evolution-2.9.91/mail/mail-session.c 2007-02-15 16:04:42.000000000 -0500 @@ -374,7 +374,7 @@ if (cancel) user_message_reply = e_msgport_new (); @@ -708,8 +708,8 @@ } if (cancel) { ---- evolution-2.9.1/mail/mail-mt.c.kill-ethread 2006-10-16 10:37:09.000000000 -0400 -+++ evolution-2.9.1/mail/mail-mt.c 2006-10-26 14:24:55.000000000 -0400 +--- evolution-2.9.91/mail/mail-mt.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 ++++ evolution-2.9.91/mail/mail-mt.c 2007-02-15 16:28:12.000000000 -0500 @@ -82,12 +82,8 @@ static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; @@ -753,7 +753,7 @@ MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -420,241 +412,187 @@ +@@ -420,241 +412,193 @@ MAIL_MT_UNLOCK(mail_msg_lock); } @@ -828,11 +828,17 @@ -#endif + /* check the main loop queue */ + while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { -+ if (msg->ops->receive_msg != NULL) ++ ++ /* If the message has a reply_port, it must also have a ++ * receive_msg() callback. The receive_msg() callback is ++ * responsible for issuing the reply, and the recipient of ++ * the reply is responsible for freeing the message. */ ++ if (msg->msg.reply_port != NULL) { ++ g_assert (msg->ops->receive_msg != NULL); + msg->ops->receive_msg (msg); -+ if (msg->msg.reply_port != NULL) -+ e_msgport_reply ((EMsg *) msg); -+ else { ++ } else { ++ if (msg->ops->receive_msg != NULL) ++ msg->ops->receive_msg (msg); + if (msg->ops->reply_msg != NULL) + msg->ops->reply_msg (msg); + mail_msg_free (msg); @@ -1052,16 +1058,16 @@ +mail_msg_fast_ordered_push (mail_msg_t *msg) { - mail_msg_wait_all(); -+ static GOnce once = G_ONCE_INIT; - +- - e_thread_destroy(mail_thread_queued_slow); - e_thread_destroy(mail_thread_queued); - e_thread_destroy(mail_thread_new); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); ++ static GOnce once = G_ONCE_INIT; - g_io_channel_unref(mail_gui_channel); - g_io_channel_unref(mail_gui_reply_channel); -- ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); + - e_msgport_destroy(mail_gui_port); - e_msgport_destroy(mail_gui_reply_port); + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); @@ -1125,7 +1131,7 @@ } /* ********************************************************************** */ -@@ -723,7 +661,6 @@ +@@ -723,7 +667,6 @@ { struct _proxy_msg *m; int id; @@ -1133,7 +1139,7 @@ /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); -@@ -743,12 +680,12 @@ +@@ -743,12 +686,12 @@ /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -1149,7 +1155,17 @@ return id; } -@@ -857,11 +794,10 @@ +@@ -842,6 +785,9 @@ + m->ret = m->func(p1, p2, i1, p3, p4, p5); + break; + } ++ ++ if (mm->msg.reply_port != NULL) ++ e_msgport_reply ((EMsg *) mm); + } + + static struct _mail_msg_op mail_call_op = { +@@ -857,11 +803,10 @@ void *ret; va_list ap; EMsgPort *reply = NULL; @@ -1162,7 +1178,7 @@ reply = e_msgport_new(); m = mail_msg_new(&mail_call_op, reply, sizeof(*m)); -@@ -869,8 +805,8 @@ +@@ -869,8 +814,8 @@ m->func = func; G_VA_COPY(m->ap, ap); @@ -1173,7 +1189,7 @@ e_msgport_wait(reply); e_msgport_destroy(reply); } else { -@@ -909,7 +845,7 @@ +@@ -909,7 +854,7 @@ busy_state++; if (busy_state == 1) { m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); @@ -1182,7 +1198,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -922,7 +858,7 @@ +@@ -922,7 +867,7 @@ busy_state--; if (busy_state == 0) { m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); @@ -1191,7 +1207,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -947,7 +883,7 @@ +@@ -947,7 +892,7 @@ char *out, *p, *o, c; int pc; @@ -1200,7 +1216,7 @@ MAIL_MT_LOCK (mail_msg_lock); -@@ -1055,7 +991,7 @@ +@@ -1055,7 +1000,7 @@ } m->pc = pc; m->data = data; @@ -1209,8 +1225,8 @@ } /* ******************** */ ---- evolution-2.9.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2004-10-22 15:32:26.000000000 -0400 -+++ evolution-2.9.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2006-10-26 14:24:56.000000000 -0400 +--- evolution-2.9.91/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-01-03 10:27:06.000000000 -0500 ++++ evolution-2.9.91/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-02-15 16:04:42.000000000 -0500 @@ -108,5 +108,5 @@ unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); unsub->uri = g_strdup (target->uri); @@ -1218,8 +1234,8 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push ((mail_msg_t *) unsub); } ---- evolution-2.9.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2005-05-19 13:32:41.000000000 -0400 -+++ evolution-2.9.1/plugins/mark-all-read/mark-all-read.c 2006-10-26 14:24:56.000000000 -0400 +--- evolution-2.9.91/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-01-03 10:27:08.000000000 -0500 ++++ evolution-2.9.91/plugins/mark-all-read/mark-all-read.c 2007-02-15 16:04:42.000000000 -0500 @@ -44,7 +44,7 @@ return; } @@ -1229,8 +1245,8 @@ } static void ---- evolution-2.9.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2006-06-13 06:15:40.000000000 -0400 -+++ evolution-2.9.1/plugins/exchange-operations/exchange-folder.c 2006-10-26 14:24:56.000000000 -0400 +--- evolution-2.9.91/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-01-03 10:27:08.000000000 -0500 ++++ evolution-2.9.91/plugins/exchange-operations/exchange-folder.c 2007-02-15 16:04:42.000000000 -0500 @@ -134,7 +134,7 @@ inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -1240,8 +1256,8 @@ } ---- evolution-2.9.1/plugins/save-attachments/save-attachments.c.kill-ethread 2006-07-07 19:48:24.000000000 -0400 -+++ evolution-2.9.1/plugins/save-attachments/save-attachments.c 2006-10-26 14:24:56.000000000 -0400 +--- evolution-2.9.91/plugins/save-attachments/save-attachments.c.kill-ethread 2007-02-09 15:16:33.000000000 -0500 ++++ evolution-2.9.91/plugins/save-attachments/save-attachments.c 2007-02-15 16:04:42.000000000 -0500 @@ -407,5 +407,5 @@ camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -1249,8 +1265,8 @@ - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.9.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2006-08-23 04:38:52.000000000 -0400 -+++ evolution-2.9.1/plugins/mailing-list-actions/mailing-list-actions.c 2006-10-26 14:24:56.000000000 -0400 +--- evolution-2.9.91/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-01-03 10:27:09.000000000 -0500 ++++ evolution-2.9.91/plugins/mailing-list-actions/mailing-list-actions.c 2007-02-15 16:04:42.000000000 -0500 @@ -89,7 +89,7 @@ data->uri = strdup (sel->uri); @@ -1260,8 +1276,8 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.9.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2006-02-08 06:08:24.000000000 -0500 -+++ evolution-2.9.1/plugins/groupwise-features/share-folder-common.c 2006-10-26 14:24:56.000000000 -0400 +--- evolution-2.9.91/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-01-03 10:27:07.000000000 -0500 ++++ evolution-2.9.91/plugins/groupwise-features/share-folder-common.c 2007-02-15 16:04:42.000000000 -0500 @@ -239,7 +239,7 @@ m->done = done; g_free (namebuf); @@ -1271,8 +1287,8 @@ return id; } ---- evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2006-04-21 15:38:16.000000000 -0400 -+++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.h 2006-10-26 14:24:53.000000000 -0400 +--- evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-01-03 10:27:57.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.h 2007-02-15 16:04:42.000000000 -0500 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -1293,8 +1309,8 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2006-08-24 09:53:20.000000000 -0400 -+++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-notify.c 2006-10-26 14:24:53.000000000 -0400 +--- evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-01-03 10:27:57.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.c 2007-02-15 16:04:42.000000000 -0500 @@ -45,10 +45,6 @@ GMutex *mutex; }; @@ -1306,7 +1322,7 @@ #define d(x) x -@@ -284,72 +280,12 @@ +@@ -286,72 +282,12 @@ g_mutex_free (priv->mutex); g_free (priv); @@ -1379,7 +1395,7 @@ /** * alarm_notify_new: * -@@ -361,23 +297,10 @@ +@@ -363,23 +299,10 @@ AlarmNotify * alarm_notify_new (void) { @@ -1407,8 +1423,8 @@ } static void ---- evolution-2.9.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2006-08-30 10:36:04.000000000 -0400 -+++ evolution-2.9.1/calendar/gui/alarm-notify/alarm-queue.c 2006-10-26 14:24:53.000000000 -0400 +--- evolution-2.9.91/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-01-03 10:27:57.000000000 -0500 ++++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-queue.c 2007-02-15 16:04:42.000000000 -0500 @@ -115,9 +115,6 @@ static int tray_blink_state = FALSE; static AlarmNotify *an; @@ -1874,7 +1890,7 @@ } /* Performs notification of a display alarm */ -@@ -1836,21 +1833,13 @@ +@@ -1840,21 +1837,13 @@ new_midnight = time_day_end_with_zone (time (NULL), zone); if (new_midnight > midnight) { @@ -1901,7 +1917,7 @@ } return TRUE; -@@ -1981,14 +1970,15 @@ +@@ -1985,14 +1974,15 @@ } struct _alarm_client_msg { @@ -1920,7 +1936,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2019,6 +2009,8 @@ +@@ -2023,6 +2013,8 @@ G_CALLBACK (cal_opened_cb), ca); } @@ -1929,7 +1945,7 @@ } /** -@@ -2038,20 +2030,13 @@ +@@ -2042,20 +2034,13 @@ void alarm_queue_add_client (ECal *client) { @@ -1955,7 +1971,7 @@ } /* Removes a component an its alarms */ -@@ -2103,11 +2088,10 @@ +@@ -2107,11 +2092,10 @@ * Removes a calendar client from the alarm queueing system. **/ static void @@ -1969,7 +1985,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2144,24 +2128,20 @@ +@@ -2148,24 +2132,20 @@ g_free (ca); g_hash_table_remove (client_alarms_hash, client); diff --git a/evolution.spec b/evolution.spec index 8404989..cce8b20 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.9.91 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -725,6 +725,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Feb 15 2007 Matthew Barnes - 2.9.91-3.fc7 +- Revise patch for GNOME bug #362638 to fix RH bug #220714 + (certificate prompt causes crash). + * Tue Feb 13 2007 Matthew Barnes - 2.9.91-2.fc7 - Require GConf2 in post. - Require scrollkeeper in post and postun. From 90663583c7188f99439000b62c9b37ddb37451e8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Feb 2007 21:28:52 +0000 Subject: [PATCH 108/844] - Update to 2.9.92. - Remove patch for GNOME bug #350253 (fixed upstream). - Remove patch for GNOME bug #356177 (fixed upstream). - Remove patch for GNOME bug #360946 (fixed upstream). - Remove evolution-2.5.4-move-autosave-file.patch (fixed upstream). - Add minimum version to intltool requirement (currently >= 0.35.5). --- .cvsignore | 7 +------ evolution.spec | 46 ++++++++++++---------------------------------- sources | 7 +------ 3 files changed, 14 insertions(+), 46 deletions(-) diff --git a/.cvsignore b/.cvsignore index bcaac42..8bf0530 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,6 +1 @@ -evolution-2.9.91.tar.bz2 -evolution.svg -evolution32.png -evolution24.png -evolution22.png -evolution16.png +evolution-2.9.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index cce8b20..3990ac0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -7,6 +7,7 @@ %define gnome_pilot_version 2.0.13 %define gnomevfs2_version 2.4 %define gtkhtml_version 3.13.6 +%define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonoboui_version 2.4.2 %define libgnomeprint22_version 2.8.0 @@ -44,19 +45,14 @@ ### Abstract ### Name: evolution -Version: 2.9.91 -Release: 3%{?dist} +Version: 2.9.92 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite URL: http://www.gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: evolution-%{version}.tar.bz2 -Source1: evolution16.png -Source2: evolution22.png -Source3: evolution24.png -Source4: evolution32.png -Source5: evolution.svg ### Patches ### @@ -66,9 +62,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # Fix for RH bug #154360: Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch -# Move autosave file -Patch12: evolution-2.5.4-move-autosave-file.patch - # Fix for RH bug 164957 (was for 145552): Patch13: evolution-2.0.2-fix-145552.patch @@ -113,15 +106,9 @@ Patch25: evolution-2.7.92-fix-prgname.patch # RH bug #161885 / GNOME bug #309166 Patch26: evolution-2.8.0-indic-cursor-movement.patch -# GNOME bug #356177 -Patch27: evolution-2.8.0-kill-emutex.patch - # RH bug #202751 / GNOME bug #355766 Patch29: evolution-2.8.0-fix-indic-printing.patch -# GNOME bug #360946 -Patch30: evolution-2.8.1-about-dialog.patch - # GNOME bug #362638 Patch31: evolution-2.8.1-kill-ethread.patch @@ -140,9 +127,6 @@ Patch35: evolution-2.9.2-gtk-font-button.patch # RH bug #216537 / GNOME bug #383047 #Patch36: evolution-2.9.3-view-attachment-uri.patch -# GNOME bug #350253 -Patch37: evolution-2.9.3-adopt-icons.patch - # RH bug #215478 / GNOME bug #383842 Patch38: evolution-2.9.3-source-path-entry.patch @@ -204,7 +188,7 @@ BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} -BuildRequires: intltool >= 0.35 +BuildRequires: intltool >= %{intltool_version} BuildRequires: libbonobo-devel >= 2.0 BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libgnomecanvas-devel >= 2.0 @@ -276,7 +260,6 @@ Development files needed for building things which link against evolution. %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .commit-enter-on-calendar -%patch12 -p1 -b .move-autosave-file %patch13 -p1 -b .fix-164957 %patch14 -p1 -b .hide-switcher-buttons-by-default #patch15 -p1 -b .fix-conduits # leave commented @@ -291,16 +274,13 @@ Development files needed for building things which link against evolution. %patch24 -p1 -b .deleting-preedit-buffer %patch25 -p1 -b .fix-prgname %patch26 -p1 -b .indic-cursor-movement -%patch27 -p1 -b .kill-emutex %patch29 -p1 -b .fix-indic-printing -%patch30 -p1 -b .about-dialog %patch31 -p1 -b .kill-ethread %patch32 -p1 -b .kill-ememory %patch33 -p1 -b .im-context-reset %patch34 -p1 -b .first-ascii %patch35 -p1 -b .gtk-font-button #%patch36 -p1 -b .view-attachment-uri -%patch37 -p1 -b .adopt-icons %patch38 -p1 -b .source-path-entry %patch39 -p1 -b .unread-messages %patch40 -p1 -b .meeting-list-view @@ -311,16 +291,6 @@ mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/%{_lib} -# GNOME bug #350253 -cd art -mkdir 16x16; cp %{SOURCE1} 16x16/evolution.png -mkdir 22x22; cp %{SOURCE2} 22x22/evolution.png -mkdir 24x24; cp %{SOURCE3} 24x24/evolution.png -mkdir 32x32; cp %{SOURCE4} 32x32/evolution.png -mkdir scalable; cp %{SOURCE5} scalable/evolution.svg -rm about-box.png bcg.png evolution.png monkey-16.png -cd - - %build # define all of our flags, this is kind of ugly :( %if %{ldap_support} @@ -725,6 +695,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Feb 26 2007 Matthew Barnes - 2.9.92-1.fc7 +- Update to 2.9.92. +- Remove patch for GNOME bug #350253 (fixed upstream). +- Remove patch for GNOME bug #356177 (fixed upstream). +- Remove patch for GNOME bug #360946 (fixed upstream). +- Remove evolution-2.5.4-move-autosave-file.patch (fixed upstream). +- Add minimum version to intltool requirement (currently >= 0.35.5). + * Thu Feb 15 2007 Matthew Barnes - 2.9.91-3.fc7 - Revise patch for GNOME bug #362638 to fix RH bug #220714 (certificate prompt causes crash). diff --git a/sources b/sources index 336b6b6..59f77a3 100644 --- a/sources +++ b/sources @@ -1,6 +1 @@ -b019ce7645491f77f9b2d4492a77ae00 evolution-2.9.91.tar.bz2 -e85874e8d480a9c82bc155da396a54e4 evolution.svg -2fa4ce12c94153aca9af465e1a1819c8 evolution32.png -d33896d33b5db2201e051664e96b1100 evolution24.png -de663fa442d61f53dc058dd20c77da8e evolution22.png -4737f9b111e5e4b2fccc9e9b464c4b01 evolution16.png +9f7af45a4f37d05a151d4573133bfd55 evolution-2.9.92.tar.bz2 From 6737cafd87379b8527456687e9e4db8d62c1ec70 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Feb 2007 21:51:24 +0000 Subject: [PATCH 109/844] - Update to 2.9.92. - Require gtkhtml3 >= 3.13.92. - Remove patch for GNOME bug #350253 (fixed upstream). - Remove patch for GNOME bug #356177 (fixed upstream). - Remove patch for GNOME bug #360946 (fixed upstream). - Remove evolution-2.5.4-move-autosave-file.patch (fixed upstream). - Add minimum version to intltool requirement (currently >= 0.35.5). --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 3990ac0..a293dc2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 %define gnomevfs2_version 2.4 -%define gtkhtml_version 3.13.6 +%define gtkhtml_version 3.13.92 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonoboui_version 2.4.2 @@ -697,6 +697,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Feb 26 2007 Matthew Barnes - 2.9.92-1.fc7 - Update to 2.9.92. +- Require gtkhtml3 >= 3.13.92. - Remove patch for GNOME bug #350253 (fixed upstream). - Remove patch for GNOME bug #356177 (fixed upstream). - Remove patch for GNOME bug #360946 (fixed upstream). From a0d2a9ed5f9558598c498c66acece6449e9bd7fc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 26 Feb 2007 22:04:04 +0000 Subject: [PATCH 110/844] Add missing libgnomeprintui22 requirements. --- evolution.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/evolution.spec b/evolution.spec index a293dc2..eb28145 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,6 +11,7 @@ %define last_libgal2_version 2:2.5.3-2 %define libbonoboui_version 2.4.2 %define libgnomeprint22_version 2.8.0 +%define libgnomeprintui22_version 2.2.1 %define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 %define redhat_menus_version 5.0.4 @@ -158,6 +159,7 @@ Requires: gnutls Requires: gtk2 >= 2.4.0 Requires: libbonoboui >= %{libbonoboui_version} Requires: libgnomeprint22 >= %{libgnomeprint22_version} +Requires: libgnomeprintui22 >= %{libgnomeprintui22_version} Requires: libsoup >= %{soup_version} Requires: redhat-menus >= %{redhat_menus_version} Requires: spamassassin @@ -193,6 +195,7 @@ BuildRequires: libbonobo-devel >= 2.0 BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version} +BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui22_version} BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 @@ -698,6 +701,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Feb 26 2007 Matthew Barnes - 2.9.92-1.fc7 - Update to 2.9.92. - Require gtkhtml3 >= 3.13.92. +- Add missing libgnomeprintui22 requirements. - Remove patch for GNOME bug #350253 (fixed upstream). - Remove patch for GNOME bug #356177 (fixed upstream). - Remove patch for GNOME bug #360946 (fixed upstream). From 03997924e4b3637a9a4fa0091f39fb64ce2fde3c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 13 Mar 2007 04:13:38 +0000 Subject: [PATCH 111/844] - Update to 2.10.0. - Add patch for GNOME bug #376991 (refactor password handling). --- .cvsignore | 2 +- evolution-2.10.0-e-passwords.patch | 31 ++++++++++++++++++++++++++++++ evolution.spec | 10 +++++++++- sources | 2 +- 4 files changed, 42 insertions(+), 3 deletions(-) create mode 100644 evolution-2.10.0-e-passwords.patch diff --git a/.cvsignore b/.cvsignore index 8bf0530..1521337 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.9.92.tar.bz2 +evolution-2.10.0.tar.bz2 diff --git a/evolution-2.10.0-e-passwords.patch b/evolution-2.10.0-e-passwords.patch new file mode 100644 index 0000000..8489dee --- /dev/null +++ b/evolution-2.10.0-e-passwords.patch @@ -0,0 +1,31 @@ +--- evolution-2.10.0/mail/mail-session.c.e-passwords 2007-03-12 23:41:06.000000000 -0400 ++++ evolution-2.10.0/mail/mail-session.c 2007-03-12 23:41:35.000000000 -0400 +@@ -679,8 +679,6 @@ + + d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); + +- e_passwords_cancel(); +- + /* flush/cancel pending user messages */ + while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { + d(printf ("Flusing message request: %s\n", um->prompt)); +--- evolution-2.10.0/shell/main.c.e-passwords 2007-03-12 23:39:38.000000000 -0400 ++++ evolution-2.10.0/shell/main.c 2007-03-12 23:39:54.000000000 -0400 +@@ -565,7 +565,6 @@ + glade_init (); + e_cursors_init (); + e_icon_factory_init (); +- e_passwords_init(); + + gtk_window_set_default_icon_name ("evolution"); + +--- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.e-passwords 2007-03-12 23:40:22.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c 2007-03-12 23:40:36.000000000 -0400 +@@ -169,7 +169,6 @@ + + alarm_done (); + +- e_passwords_shutdown (); + gnome_sound_shutdown (); + + return 0; diff --git a/evolution.spec b/evolution.spec index eb28145..1b84190 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ ### Abstract ### Name: evolution -Version: 2.9.92 +Version: 2.10.0 Release: 1%{?dist} License: GPL Group: Applications/Productivity @@ -143,6 +143,9 @@ Patch41: evolution-2.9.3-gtk-color-button.patch # GNOME bug #218898 Patch42: evolution-2.9.4-view-message-source.patch +# GNOME bug #376991 +Patch43: evolution-2.10.0-e-passwords.patch + ## Dependencies ### Requires(post): GConf2 @@ -289,6 +292,7 @@ Development files needed for building things which link against evolution. %patch40 -p1 -b .meeting-list-view %patch41 -p1 -b .gtk-color-button %patch42 -p1 -b .view-message-source +%patch43 -p1 -b .e-passwords mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -698,6 +702,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Mar 12 2007 Matthew Barnes - 2.10.0-1.fc7 +- Update to 2.10.0. +- Add patch for GNOME bug #376991 (refactor password handling). + * Mon Feb 26 2007 Matthew Barnes - 2.9.92-1.fc7 - Update to 2.9.92. - Require gtkhtml3 >= 3.13.92. diff --git a/sources b/sources index 59f77a3..502ccbe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9f7af45a4f37d05a151d4573133bfd55 evolution-2.9.92.tar.bz2 +68d32e518f235bea9d768ae55e91bffc evolution-2.10.0.tar.bz2 From 8c7c2b0697d16b1d6a35186a5481ea038aeb4c1c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 15 Mar 2007 01:47:03 +0000 Subject: [PATCH 112/844] - Add patch for GNOME bug #417999 (use ESourceComboBox). --- evolution-2.10.0-e-source-combo-box.patch | 997 ++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 1005 insertions(+), 1 deletion(-) create mode 100644 evolution-2.10.0-e-source-combo-box.patch diff --git a/evolution-2.10.0-e-source-combo-box.patch b/evolution-2.10.0-e-source-combo-box.patch new file mode 100644 index 0000000..43b5d69 --- /dev/null +++ b/evolution-2.10.0-e-source-combo-box.patch @@ -0,0 +1,997 @@ +--- evolution-2.10.0/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-pilot-settings.c 2007-03-13 16:56:41.000000000 -0400 +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + #include "e-pilot-settings.h" + + struct _EPilotSettingsPrivate +@@ -102,7 +102,7 @@ + + lbl = gtk_label_new (_("Sync with:")); + gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5); +- priv->source = e_source_option_menu_new (source_list); ++ priv->source = e_source_combo_box_new (source_list); + gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 0, 1); + gtk_table_attach_defaults (GTK_TABLE (ps), priv->source, 1, 2, 0, 1); + gtk_widget_show (lbl); +@@ -152,8 +152,9 @@ + g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE); + + priv = ps->priv; +- +- return e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source)); ++ ++ return e_source_combo_box_get_active ( ++ E_SOURCE_COMBO_BOX (priv->source)); + } + + void +@@ -166,7 +167,8 @@ + + priv = ps->priv; + +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source), source); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (priv->source), source); + } + + gboolean +--- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-02-26 04:59:58.000000000 -0500 ++++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c 2007-03-13 16:56:41.000000000 -0400 +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-01-03 10:34:04.000000000 -0500 ++++ evolution-2.10.0/plugins/itip-formatter/itip-view.c 2007-03-13 16:56:41.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -104,8 +104,8 @@ + char *description; + + GtkWidget *selector_box; +- GtkWidget *esom; +- GtkWidget *esom_header; ++ GtkWidget *escb; ++ GtkWidget *escb_header; + ESourceList *source_list; + + GtkWidget *rsvp_box; +@@ -1664,10 +1664,12 @@ + } + + static void +-source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data) ++source_changed_cb (ESourceComboBox *escb, ItipView *view) + { +- ItipView *view = data; +- ++ ESource *source; ++ ++ source = e_source_combo_box_get_active (escb); ++ + g_signal_emit (view, signals[SOURCE_SELECTED], 0, source); + } + +@@ -1684,40 +1686,42 @@ + if (priv->source_list) + g_object_unref (priv->source_list); + +- if (priv->esom) +- gtk_widget_destroy (priv->esom); ++ if (priv->escb) ++ gtk_widget_destroy (priv->escb); + + if (!source_list) { +- if (priv->esom_header) +- gtk_widget_destroy (priv->esom_header); ++ if (priv->escb_header) ++ gtk_widget_destroy (priv->escb_header); + + priv->source_list = NULL; +- priv->esom = NULL; +- priv->esom_header = NULL; ++ priv->escb = NULL; ++ priv->escb_header = NULL; + + return; + } + + priv->source_list = g_object_ref (source_list); + +- priv->esom = e_source_option_menu_new (source_list); +- gtk_widget_show (priv->esom); +- g_signal_connect (priv->esom, "source_selected", G_CALLBACK (source_selected_cb), view); ++ priv->escb = e_source_combo_box_new (source_list); ++ gtk_widget_show (priv->escb); ++ g_signal_connect ( ++ priv->escb, "changed", ++ G_CALLBACK (source_changed_cb), view); + +- if (!priv->esom_header) { ++ if (!priv->escb_header) { + if (priv->type == E_CAL_SOURCE_TYPE_EVENT) +- priv->esom_header = gtk_label_new_with_mnemonic (_("_Calendar:")); ++ priv->escb_header = gtk_label_new_with_mnemonic (_("_Calendar:")); + else if (priv->type == E_CAL_SOURCE_TYPE_TODO) +- priv->esom_header = gtk_label_new_with_mnemonic (_("_Tasks :")); ++ priv->escb_header = gtk_label_new_with_mnemonic (_("_Tasks :")); + else if (priv->type == E_CAL_SOURCE_TYPE_JOURNAL) +- priv->esom_header = gtk_label_new_with_mnemonic (_("Memos :")); ++ priv->escb_header = gtk_label_new_with_mnemonic (_("Memos :")); + +- gtk_label_set_mnemonic_widget (GTK_LABEL (priv->esom_header), priv->esom); +- gtk_widget_show (priv->esom_header); ++ gtk_label_set_mnemonic_widget (GTK_LABEL (priv->escb_header), priv->escb); ++ gtk_widget_show (priv->escb_header); + } + +- gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->esom_header, FALSE, TRUE, 6); +- gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->esom, FALSE, TRUE, 0); ++ gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->escb_header, FALSE, TRUE, 6); ++ gtk_box_pack_start (GTK_BOX (priv->selector_box), priv->escb, FALSE, TRUE, 0); + } + + ESourceList * +@@ -1743,10 +1747,11 @@ + + priv = view->priv; + +- if (!priv->esom) ++ if (!priv->escb) + return; + +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->esom), source); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (priv->escb), source); + } + + ESource * +@@ -1759,10 +1764,11 @@ + + priv = view->priv; + +- if (!priv->esom) ++ if (!priv->escb) + return NULL; + +- return e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->esom)); ++ return e_source_combo_box_get_active ( ++ E_SOURCE_COMBO_BOX (priv->escb)); + } + + void +--- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-01-03 10:34:02.000000000 -0500 ++++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c 2007-03-13 16:56:41.000000000 -0400 +@@ -44,7 +44,7 @@ + #include + + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/plugins/bbdb/bbdb.c.e-source-combo-box 2007-01-03 10:34:02.000000000 -0500 ++++ evolution-2.10.0/plugins/bbdb/bbdb.c 2007-03-13 16:56:41.000000000 -0400 +@@ -40,7 +40,7 @@ + #include + + #include +-#include ++#include + + #include + #include +@@ -341,7 +341,8 @@ + + gtk_widget_set_sensitive (stuff->option_menu, active); + if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) { +- selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->option_menu)); ++ selected_source = e_source_combo_box_get_active ( ++ E_SOURCE_COMBO_BOX (stuff->option_menu)); + gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL); + } + } +@@ -360,7 +361,8 @@ + + gtk_widget_set_sensitive (stuff->gaim_option_menu, active); + if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) { +- selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->gaim_option_menu)); ++ selected_source = e_source_combo_box_get_active ( ++ E_SOURCE_COMBO_BOX (stuff->gaim_option_menu)); + gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL); + } + } +@@ -389,31 +391,32 @@ + static GtkWidget * + create_addressbook_option_menu (struct bbdb_stuff *stuff, int type) + { +- GtkWidget *menu; ++ GtkWidget *combo_box; + ESourceList *source_list; + char *selected_source_uri; +- ESource *selected_source; + + GConfClient *gconf = stuff->target->gconf; + + source_list = e_source_list_new_for_gconf (gconf, "/apps/evolution/addressbook/sources"); +- menu = e_source_option_menu_new (source_list); ++ combo_box = e_source_combo_box_new (source_list); + + if (type == GAIM_ADDRESSBOOK) + selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL); + else + selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL); + if (selected_source_uri != NULL) { +- selected_source = e_source_new_with_absolute_uri ("", selected_source_uri); +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (menu), selected_source); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (combo_box), ++ e_source_new_with_absolute_uri ( ++ "", selected_source_uri)); + g_free (selected_source_uri); + } + +- gtk_widget_show (menu); ++ gtk_widget_show (combo_box); + + stuff->source_list = source_list; + +- return menu; ++ return combo_box; + } + + GtkWidget * +--- evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-03-13 16:56:41.000000000 -0400 +@@ -158,9 +158,9 @@ + + + +- ++ + True +- e_contact_list_editor_create_source_option_menu ++ e_contact_list_editor_create_source_combo_box + 0 + 0 + Tue, 01 Jun 2004 18:22:38 GMT +--- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-03-13 16:56:41.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + +-#include ++#include + + #include + #include +@@ -78,7 +78,7 @@ + static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor); + static void list_image_changed_cb (GtkWidget *w, EContactListEditor *editor); + static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor); +-static void source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor); ++static void source_changed_cb (ESourceComboBox *source_combo_box, EContactListEditor *editor); + static gboolean email_key_pressed (GtkWidget *w, GdkEventKey *event, EContactListEditor *editor); + static void email_match_selected (GtkWidget *w, EDestination *destination, EContactListEditor *editor); + +@@ -233,7 +233,7 @@ + editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry"); + editor->list_image = glade_xml_get_widget (gui, "list-image"); + editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton"); +- editor->source_menu = glade_xml_get_widget (gui, "source-option-menu-source"); ++ editor->source_menu = glade_xml_get_widget (gui, "source-combo-box-source"); + + editor->ok_button = glade_xml_get_widget (gui, "ok-button"); + editor->cancel_button = glade_xml_get_widget (gui, "cancel-button"); +@@ -276,7 +276,7 @@ + "changed", G_CALLBACK(list_image_changed_cb), editor); + + g_signal_connect (editor->source_menu, +- "source_selected", G_CALLBACK (source_selected), editor); ++ "changed", G_CALLBACK (source_changed_cb), editor); + + command_state_changed (editor); + +@@ -306,8 +306,9 @@ + if (status != E_BOOK_ERROR_OK || new_book == NULL) { + eab_load_error_dialog (NULL, e_book_get_source (new_book), status); + +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu), +- e_book_get_source (editor->book)); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (editor->source_menu), ++ e_book_get_source (editor->book)); + + if (new_book) + g_object_unref (new_book); +@@ -332,8 +333,12 @@ + } + + static void +-source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor) ++source_changed_cb (ESourceComboBox *source_combo_box, EContactListEditor *editor) + { ++ ESource *source; ++ ++ source = e_source_combo_box_get_active (source_combo_box); ++ + cancel_load (editor); + + if (e_source_equal (e_book_get_source (editor->book), source)) +@@ -795,28 +800,28 @@ + } + + GtkWidget * +-e_contact_list_editor_create_source_option_menu (gchar *name, +- gchar *string1, gchar *string2, +- gint int1, gint int2); ++e_contact_list_editor_create_source_combo_box (gchar *name, ++ gchar *string1, gchar *string2, ++ gint int1, gint int2); + + GtkWidget * +-e_contact_list_editor_create_source_option_menu (gchar *name, +- gchar *string1, gchar *string2, +- gint int1, gint int2) ++e_contact_list_editor_create_source_combo_box (gchar *name, ++ gchar *string1, gchar *string2, ++ gint int1, gint int2) + { + +- GtkWidget *menu; ++ GtkWidget *combo_box; + GConfClient *gconf_client; + ESourceList *source_list; + + gconf_client = gconf_client_get_default (); + source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); + +- menu = e_source_option_menu_new (source_list); ++ combo_box = e_source_combo_box_new (source_list); + g_object_unref (source_list); + +- gtk_widget_show (menu); +- return menu; ++ gtk_widget_show (combo_box); ++ return combo_box; + } + + GtkWidget * +@@ -1262,10 +1267,9 @@ + } + + if (editor->book) { +- ESource *source; +- +- source = e_book_get_source (editor->book); +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu), source); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (editor->source_menu), ++ e_book_get_source (editor->book)); + gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list); + gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list); + } +--- evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-02-26 04:59:17.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade 2007-03-13 16:56:41.000000000 -0400 +@@ -356,9 +356,9 @@ + + + +- ++ + True +- e_contact_editor_create_source_option_menu ++ e_contact_editor_create_source_combo_box + 0 + 0 + Tue, 13 Apr 2004 20:47:50 GMT +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-02-26 04:59:17.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-03-13 16:56:41.000000000 -0400 +@@ -46,7 +46,7 @@ + #include + + #include +-#include ++#include + + #include + +@@ -590,15 +590,16 @@ + fill_in_source_field (EContactEditor *editor) + { + GtkWidget *source_menu; +- ESource *source; + + if (!editor->target_book) + return; + +- source_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source"); +- source = e_book_get_source (editor->target_book); ++ source_menu = glade_xml_get_widget ( ++ editor->gui, "source-combo-box-source"); + +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_menu), source); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (source_menu), ++ e_book_get_source (editor->target_book)); + } + + static void +@@ -2525,13 +2526,15 @@ + editor->load_book = NULL; + + if (status != E_BOOK_ERROR_OK || new_book == NULL) { +- GtkWidget *source_option_menu; ++ GtkWidget *source_combo_box; + + eab_load_error_dialog (NULL, e_book_get_source (new_book), status); + +- source_option_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source"); +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_option_menu), +- e_book_get_source (editor->target_book)); ++ source_combo_box = glade_xml_get_widget ( ++ editor->gui, "source-combo-box-source"); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (source_combo_box), ++ e_book_get_source (editor->target_book)); + + if (new_book) + g_object_unref (new_book); +@@ -2555,8 +2558,12 @@ + } + + static void +-source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor *editor) ++source_changed (ESourceComboBox *source_combo_box, EContactEditor *editor) + { ++ ESource *source; ++ ++ source = e_source_combo_box_get_active (source_combo_box); ++ + cancel_load (editor); + + if (e_source_equal (e_book_get_source (editor->target_book), source)) +@@ -3330,8 +3337,8 @@ + g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor); + widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories"); + g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor); +- widget = glade_xml_get_widget (e_contact_editor->gui, "source-option-menu-source"); +- g_signal_connect (widget, "source_selected", G_CALLBACK (source_selected), e_contact_editor); ++ widget = glade_xml_get_widget (e_contact_editor->gui, "source-combo-box-source"); ++ g_signal_connect (widget, "changed", G_CALLBACK (source_changed), e_contact_editor); + label = glade_xml_get_widget (e_contact_editor->gui, "where-label"); + gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); + widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok"); +@@ -3782,25 +3789,25 @@ + } + + GtkWidget * +-e_contact_editor_create_source_option_menu (gchar *name, +- gchar *string1, gchar *string2, +- gint int1, gint int2); ++e_contact_editor_create_source_combo_box (gchar *name, ++ gchar *string1, gchar *string2, ++ gint int1, gint int2); + + GtkWidget * +-e_contact_editor_create_source_option_menu (gchar *name, +- gchar *string1, gchar *string2, +- gint int1, gint int2) ++e_contact_editor_create_source_combo_box (gchar *name, ++ gchar *string1, gchar *string2, ++ gint int1, gint int2) + { +- GtkWidget *menu; ++ GtkWidget *combo_box; + GConfClient *gconf_client; + ESourceList *source_list; + + gconf_client = gconf_client_get_default (); + source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); + +- menu = e_source_option_menu_new (source_list); ++ combo_box = e_source_combo_box_new (source_list); + g_object_unref (source_list); + +- gtk_widget_show (menu); +- return menu; ++ gtk_widget_show (combo_box); ++ return combo_box; + } +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-01-03 10:32:45.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-03-13 16:56:41.000000000 -0400 +@@ -37,7 +37,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "e-contact-editor.h" +@@ -267,8 +267,12 @@ + } + + static void +-source_selected (GtkWidget *source_option_menu, ESource *source, QuickAdd *qa) ++source_changed (ESourceComboBox *source_combo_box, QuickAdd *qa) + { ++ ESource *source; ++ ++ source = e_source_combo_box_get_active (source_combo_box); ++ + if (qa->book) { + g_object_unref (qa->book); + qa->book = NULL; +@@ -317,16 +321,20 @@ + + gconf_client = gconf_client_get_default (); + source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); +- qa->option_menu = e_source_option_menu_new (source_list); ++ qa->option_menu = e_source_combo_box_new (source_list); + book = e_book_new_default_addressbook (NULL); +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (qa->option_menu), e_book_get_source(book)); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (qa->option_menu), ++ e_book_get_source (book)); + if (qa->book) { + g_object_unref (qa->book); + qa->book = NULL; + } + qa->book = book ; +- source_selected(qa->option_menu, e_source_option_menu_peek_selected ((ESourceOptionMenu *)qa->option_menu), qa); +- g_signal_connect (qa->option_menu, "source_selected", G_CALLBACK (source_selected), qa); ++ source_changed (E_SOURCE_COMBO_BOX (qa->option_menu), qa); ++ g_signal_connect ( ++ qa->option_menu, "changed", ++ G_CALLBACK (source_changed), qa); + + g_object_unref (source_list); + +--- evolution-2.10.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/memo-page.glade 2007-03-13 16:56:41.000000000 -0400 +@@ -141,7 +141,7 @@ + + + True +- memo_page_create_source_option_menu ++ memo_page_create_source_combo_box + 0 + 0 + Tue, 13 Jan 2004 22:00:00 GMT +--- evolution-2.10.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/event-page.glade 2007-03-13 16:56:41.000000000 -0400 +@@ -774,7 +774,7 @@ + + + True +- event_page_create_source_option_menu ++ event_page_create_source_combo_box + 0 + 0 + Wed, 17 Dec 2003 18:20:26 GMT +--- evolution-2.10.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/task-page.glade 2007-03-13 16:56:41.000000000 -0400 +@@ -618,7 +618,7 @@ + + 24 + True +- task_page_create_source_option_menu ++ task_page_create_source_combo_box + 0 + 0 + Thu, 18 Dec 2003 01:58:48 GMT +--- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c 2007-03-13 16:56:41.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -339,7 +339,6 @@ + ECalComponentDateTime d; + GSList *l; + const char *categories; +- ESource *source; + + mpage = MEMO_PAGE (page); + priv = mpage->priv; +@@ -432,8 +431,9 @@ + } + + /* Source */ +- source = e_cal_get_source (page->client); +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (priv->source_selector), ++ e_cal_get_source (page->client)); + + priv->updating = FALSE; + +@@ -844,13 +844,12 @@ + } + + static void +-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) ++source_changed_cb (ESourceComboBox *source_combo_box, MemoPage *mpage) + { +- MemoPage *mpage; +- MemoPagePrivate *priv; ++ MemoPagePrivate *priv = mpage->priv; ++ ESource *source; + +- mpage = MEMO_PAGE (data); +- priv = mpage->priv; ++ source = e_source_combo_box_get_active (source_combo_box); + + if (!priv->updating) { + ECal *client; +@@ -862,8 +861,9 @@ + if (client) + g_object_unref (client); + +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), +- e_cal_get_source (COMP_EDITOR_PAGE (mpage)->client)); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (priv->source_selector), ++ e_cal_get_source (COMP_EDITOR_PAGE (mpage)->client)); + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, +@@ -973,7 +973,7 @@ + G_CALLBACK (categories_clicked_cb), mpage); + + /* Source selector */ +- g_signal_connect((priv->source_selector), "source_selected", ++ g_signal_connect((priv->source_selector), "changed", + G_CALLBACK (source_changed_cb), mpage); + + /* Connect the default signal handler to use to make sure the "changed" +@@ -1167,21 +1167,22 @@ + return dedit; + } + +-GtkWidget *memo_page_create_source_option_menu (void); ++GtkWidget *memo_page_create_source_combo_box (void); + + GtkWidget * +-memo_page_create_source_option_menu (void) ++memo_page_create_source_combo_box (void) + { +- GtkWidget *menu; ++ GtkWidget *combo_box; + GConfClient *gconf_client; + ESourceList *source_list; + + gconf_client = gconf_client_get_default (); +- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/memos/sources"); ++ source_list = e_source_list_new_for_gconf ( ++ gconf_client, "/apps/evolution/memos/sources"); + +- menu = e_source_option_menu_new (source_list); ++ combo_box = e_source_combo_box_new (source_list); + g_object_unref (source_list); + +- gtk_widget_show (menu); +- return menu; ++ gtk_widget_show (combo_box); ++ return combo_box; + } +--- evolution-2.10.0/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-03-12 23:45:00.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/event-page.c 2007-03-13 16:56:41.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include "common/authentication.h" + #include "e-util/e-categories-config.h" + #include "e-util/e-dialog-widgets.h" +@@ -967,7 +967,6 @@ + ECalComponentDateTime start_date, end_date; + const char *location, *uid = NULL; + const char *categories; +- ESource *source; + GSList *l; + gboolean validated = TRUE; + +@@ -1163,8 +1162,9 @@ + e_dialog_editable_set (priv->categories, categories); + + /* Source */ +- source = e_cal_get_source (page->client); +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (priv->source_selector), ++ e_cal_get_source (page->client)); + + e_cal_component_get_uid (comp, &uid); + if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) +@@ -2566,7 +2566,8 @@ + + if (!priv->sod) { + priv->sod = e_sendoptions_dialog_new (); +- source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector)); ++ source = e_source_combo_box_get_active ( ++ E_SOURCE_COMBO_BOX (priv->source_selector)); + e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); + priv->sod->data->initialized = TRUE; + } +@@ -2595,13 +2596,12 @@ + } + + static void +-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) ++source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) + { +- EventPage *epage; +- EventPagePrivate *priv; ++ EventPagePrivate *priv = epage->priv; ++ ESource *source; + +- epage = EVENT_PAGE (data); +- priv = epage->priv; ++ source = e_source_combo_box_get_active (source_combo_box); + + if (!priv->updating) { + ECal *client; +@@ -2620,8 +2620,9 @@ + if (client) + g_object_unref (client); + +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), +- e_cal_get_source (COMP_EDITOR_PAGE (epage)->client)); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (priv->source_selector), ++ e_cal_get_source (COMP_EDITOR_PAGE (epage)->client)); + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, +@@ -2847,7 +2848,7 @@ + G_CALLBACK (categories_clicked_cb), epage); + + /* Source selector */ +- g_signal_connect((priv->source_selector), "source_selected", ++ g_signal_connect((priv->source_selector), "changed", + G_CALLBACK (source_changed_cb), epage); + /* Alarms */ + priv->alarm_list_store = e_alarm_list_new (); +@@ -3148,23 +3149,24 @@ + return w; + } + +-GtkWidget *event_page_create_source_option_menu (void); ++GtkWidget *event_page_create_source_combo_box (void); + + GtkWidget * +-event_page_create_source_option_menu (void) ++event_page_create_source_combo_box (void) + { +- GtkWidget *menu; ++ GtkWidget *combo_box; + GConfClient *gconf_client; + ESourceList *source_list; + + gconf_client = gconf_client_get_default (); +- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources"); ++ source_list = e_source_list_new_for_gconf ( ++ gconf_client, "/apps/evolution/calendar/sources"); + +- menu = e_source_option_menu_new (source_list); ++ combo_box = e_source_combo_box_new (source_list); + g_object_unref (source_list); + +- gtk_widget_show (menu); +- return menu; ++ gtk_widget_show (combo_box); ++ return combo_box; + } + + GtkWidget *make_status_icons (void); +--- evolution-2.10.0/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/task-page.c 2007-03-13 16:56:41.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "common/authentication.h" +@@ -513,7 +513,6 @@ + icalcomponent *icalcomp; + const char *categories, *uid; + icaltimezone *zone, *default_zone; +- ESource *source; + + tpage = TASK_PAGE (page); + priv = tpage->priv; +@@ -657,8 +656,9 @@ + e_dialog_editable_set (priv->categories, categories); + + /* Source */ +- source = e_cal_get_source (page->client); +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (priv->source_selector), ++ e_cal_get_source (page->client)); + + if (priv->is_assignment) { + ECalComponentOrganizer organizer; +@@ -1617,13 +1617,12 @@ + } + + static void +-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) ++source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) + { +- TaskPage *tpage; +- TaskPagePrivate *priv; ++ TaskPagePrivate *priv = tpage->priv; ++ ESource *source; + +- tpage = TASK_PAGE (data); +- priv = tpage->priv; ++ source = e_source_combo_box_get_active (source_combo_box); + + if (!priv->updating) { + ECal *client; +@@ -1642,8 +1641,9 @@ + if (client) + g_object_unref (client); + +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), +- e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client)); ++ e_source_combo_box_set_active ( ++ E_SOURCE_COMBO_BOX (priv->source_selector), ++ e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client)); + + dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, +@@ -1655,7 +1655,7 @@ + comp_editor_notify_client_changed ( + COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), + client); +- field_changed_cb (widget, data); ++ field_changed_cb (GTK_WIDGET (source_combo_box), tpage); + if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment) + task_page_show_options (tpage); + else +@@ -1679,7 +1679,8 @@ + if (!priv->sod) { + priv->sod = e_sendoptions_dialog_new (); + priv->sod->data->initialized = TRUE; +- source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector)); ++ source = e_source_combo_box_get_active ( ++ E_SOURCE_COMBO_BOX (priv->source_selector)); + e_sendoptions_utils_set_default_data (priv->sod, source, "task"); + } + +@@ -1734,7 +1735,7 @@ + G_CALLBACK (categories_clicked_cb), tpage); + + /* Source selector */ +- g_signal_connect((priv->source_selector), "source_selected", ++ g_signal_connect((priv->source_selector), "source_changed", + G_CALLBACK (source_changed_cb), tpage); + + /* Connect the default signal handler to use to make sure the "changed" +@@ -1955,21 +1956,22 @@ + return dedit; + } + +-GtkWidget *task_page_create_source_option_menu (void); ++GtkWidget *task_page_create_source_combo_box (void); + + GtkWidget * +-task_page_create_source_option_menu (void) ++task_page_create_source_combo_box (void) + { +- GtkWidget *menu; ++ GtkWidget *combo_box; + GConfClient *gconf_client; + ESourceList *source_list; + + gconf_client = gconf_client_get_default (); +- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/tasks/sources"); ++ source_list = e_source_list_new_for_gconf ( ++ gconf_client, "/apps/evolution/tasks/sources"); + +- menu = e_source_option_menu_new (source_list); ++ combo_box = e_source_combo_box_new (source_list); + g_object_unref (source_list); + +- gtk_widget_show (menu); +- return menu; ++ gtk_widget_show (combo_box); ++ return combo_box; + } +--- evolution-2.10.0/calendar/gui/e-itip-control.c.e-source-combo-box 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-itip-control.c 2007-03-13 16:56:41.000000000 -0400 +@@ -44,7 +44,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +@@ -226,13 +226,13 @@ + } EItipControlFindData; + + static void +-source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data) ++source_changed_cb (ESourceComboBox *escb, EItipControl *itip) + { +- EItipControl *itip = data; +- EItipControlPrivate *priv; +- +- priv = itip->priv; ++ EItipControlPrivate *priv = itip->priv; ++ ESource *source; + ++ source = e_source_combo_box_get_active (escb); ++ + if (priv->ok) + gtk_widget_set_sensitive (priv->ok, FALSE); + +@@ -273,7 +273,7 @@ + cleanup: + if (fd->count == 0) { + if (fd->show_selector && !priv->current_ecal && priv->vbox) { +- GtkWidget *esom; ++ GtkWidget *escb; + char *uid; + + switch (priv->type) { +@@ -297,17 +297,17 @@ + if (!source) + source = e_source_list_peek_source_any (priv->source_lists[priv->type]); + +- esom = e_source_option_menu_new (priv->source_lists[priv->type]); +- g_signal_connect_object (esom, "source_selected", +- G_CALLBACK (source_selected_cb), +- fd->itip, 0); ++ escb = e_source_combo_box_new (priv->source_lists[priv->type]); ++ g_signal_connect_object ( ++ escb, "changed", ++ G_CALLBACK (source_changed_cb), fd->itip, 0); + +- gtk_box_pack_start (GTK_BOX (priv->vbox), esom, FALSE, TRUE, 0); +- gtk_widget_show (esom); ++ gtk_box_pack_start (GTK_BOX (priv->vbox), escb, FALSE, TRUE, 0); ++ gtk_widget_show (escb); + + /* FIXME What if there is no source? */ + if (source) +- e_source_option_menu_select (E_SOURCE_OPTION_MENU (esom), source); ++ e_source_combo_box_set_active (E_SOURCE_COMBO_BOX (escb), source); + } else { + /* FIXME Display error message to user */ + } diff --git a/evolution.spec b/evolution.spec index 1b84190..e71cc44 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -146,6 +146,9 @@ Patch42: evolution-2.9.4-view-message-source.patch # GNOME bug #376991 Patch43: evolution-2.10.0-e-passwords.patch +# GNOME bug #417999 +Patch44: evolution-2.10.0-e-source-combo-box.patch + ## Dependencies ### Requires(post): GConf2 @@ -293,6 +296,7 @@ Development files needed for building things which link against evolution. %patch41 -p1 -b .gtk-color-button %patch42 -p1 -b .view-message-source %patch43 -p1 -b .e-passwords +%patch44 -p1 -b .e-source-combo-box mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -702,6 +706,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Mar 14 2007 Matthew Barnes - 2.10.0-2.fc7 +- Add patch for GNOME bug #417999 (use ESourceComboBox). + * Mon Mar 12 2007 Matthew Barnes - 2.10.0-1.fc7 - Update to 2.10.0. - Add patch for GNOME bug #376991 (refactor password handling). From e7cd765a7cac11bfc444398354f1a3edddb2559d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 27 Mar 2007 01:59:00 +0000 Subject: [PATCH 113/844] - Run gtk-update-icon-cache in %post and %postun (RH bug #234018). --- evolution-2.10.0-drop-old-glib-support.patch | 39 + evolution-2.10.0-shell-main-cleanups.patch | 274 ++ evolution-2.10.0-use-glib-i18n.patch | 3328 ++++++++++++++++++ evolution.spec | 39 +- 4 files changed, 3674 insertions(+), 6 deletions(-) create mode 100644 evolution-2.10.0-drop-old-glib-support.patch create mode 100644 evolution-2.10.0-shell-main-cleanups.patch create mode 100644 evolution-2.10.0-use-glib-i18n.patch diff --git a/evolution-2.10.0-drop-old-glib-support.patch b/evolution-2.10.0-drop-old-glib-support.patch new file mode 100644 index 0000000..2ece0c8 --- /dev/null +++ b/evolution-2.10.0-drop-old-glib-support.patch @@ -0,0 +1,39 @@ +--- evolution-2.10.0/mail/em-utils.c.drop-old-glib-support 2007-03-18 08:17:46.000000000 -0400 ++++ evolution-2.10.0/mail/em-utils.c 2007-03-18 08:24:07.000000000 -0400 +@@ -42,10 +42,6 @@ + #undef interface + #endif + +-#if !GLIB_CHECK_VERSION (2, 8, 0) +-#define g_access access +-#endif +- + #include + #include + #include +--- evolution-2.10.0/mail/mail-config.c.drop-old-glib-support 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-config.c 2007-03-18 08:24:07.000000000 -0400 +@@ -76,10 +76,6 @@ + #include "mail-mt.h" + #include "mail-tools.h" + +-#if !GLIB_CHECK_VERSION (2, 8, 0) +-#define g_creat creat +-#endif +- + /* Note, the first element of each MailConfigLabel must NOT be translated */ + MailConfigLabel label_defaults[5] = { + { "important", N_("I_mportant"), "#ff0000" }, /* red */ +--- evolution-2.10.0/plugins/save-attachments/save-attachments.c.drop-old-glib-support 2007-03-18 08:17:29.000000000 -0400 ++++ evolution-2.10.0/plugins/save-attachments/save-attachments.c 2007-03-18 08:24:07.000000000 -0400 +@@ -32,10 +32,6 @@ + #include + #include + +-#if !GLIB_CHECK_VERSION (2, 8, 0) +-#define g_access access +-#endif +- + #include + #include + #include diff --git a/evolution-2.10.0-shell-main-cleanups.patch b/evolution-2.10.0-shell-main-cleanups.patch new file mode 100644 index 0000000..2549279 --- /dev/null +++ b/evolution-2.10.0-shell-main-cleanups.patch @@ -0,0 +1,274 @@ +--- evolution-2.10.0/shell/main.c.shell-main-cleanups 2007-03-17 22:19:29.000000000 -0400 ++++ evolution-2.10.0/shell/main.c 2007-03-17 22:21:01.000000000 -0400 +@@ -88,6 +88,9 @@ + + #include "e-util/e-plugin.h" + ++#define SKIP_WARNING_DIALOG_KEY \ ++ "/apps/evolution/shell/skip_warning_dialog" ++ + static EShell *shell = NULL; + + /* Command-line options. */ +@@ -100,7 +103,7 @@ + #endif + static gboolean disable_eplugin = FALSE; + +-static gint idle_cb (void *data); ++static gboolean idle_cb (gchar **uris); + + static char *default_component_id = NULL; + static char *evolution_debug_log = NULL; +@@ -133,6 +136,7 @@ + system (KILL_PROCESS_CMD " -9 evolution-data-server-1.2 2> /dev/null"); + system (KILL_PROCESS_CMD " -9 evolution-data-server-1.4 2> /dev/null"); + system (KILL_PROCESS_CMD " -9 evolution-data-server-1.6 2> /dev/null"); ++ system (KILL_PROCESS_CMD " -9 evolution-data-server-1.8 2> /dev/null"); + + system (KILL_PROCESS_CMD " -9 lt-evolution-alarm-notify 2> /dev/null"); + system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null"); +@@ -182,35 +186,15 @@ + + /* Warning dialog to scare people off a little bit. */ + +-static void +-warning_dialog_response_callback (GtkDialog *dialog, +- int button_number, +- void *data) +-{ +- GtkCheckButton *dont_bother_me_again_checkbox; +- GConfClient *client; +- +- dont_bother_me_again_checkbox = GTK_CHECK_BUTTON (data); +- +- client = gconf_client_get_default (); +- gconf_client_set_bool (client, "/apps/evolution/shell/skip_warning_dialog", +- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dont_bother_me_again_checkbox)), +- NULL); +- g_object_unref (client); +- +- gtk_widget_destroy (GTK_WIDGET (dialog)); +- +- idle_cb(NULL); +-} +- +-static void ++static gboolean + show_development_warning(void) + { + GtkWidget *vbox; + GtkWidget *label; + GtkWidget *warning_dialog; +- GtkWidget *dont_bother_me_again_checkbox; ++ GtkWidget *checkbox; + GtkWidget *alignment; ++ gboolean skip; + char *text; + + warning_dialog = gtk_dialog_new (); +@@ -262,59 +246,58 @@ + + gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); + +- dont_bother_me_again_checkbox = gtk_check_button_new_with_label (_("Do not tell me again")); ++ checkbox = gtk_check_button_new_with_label (_("Do not tell me again")); + + alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); + +- gtk_container_add (GTK_CONTAINER (alignment), dont_bother_me_again_checkbox); ++ gtk_container_add (GTK_CONTAINER (alignment), checkbox); + gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0); + + gtk_widget_show_all (warning_dialog); + +- g_signal_connect (warning_dialog, "response", +- G_CALLBACK (warning_dialog_response_callback), +- dont_bother_me_again_checkbox); ++ gtk_dialog_run (GTK_DIALOG (warning_dialog)); ++ ++ skip = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); ++ ++ gtk_widget_destroy (warning_dialog); ++ ++ idle_cb (NULL); ++ ++ return skip; + } + + static void +-destroy_config (void) ++destroy_config (GConfClient *client) + { +- GConfClient *gconf; +- +- gconf = gconf_client_get_default (); +- + /* Unset the source stuff */ +- gconf_client_unset (gconf, "/apps/evolution/calendar/sources", NULL); +- gconf_client_unset (gconf, "/apps/evolution/tasks/sources", NULL); +- gconf_client_unset (gconf, "/apps/evolution/addressbook/sources", NULL); +- gconf_client_unset (gconf, "/apps/evolution/addressbook/sources", NULL); ++ gconf_client_unset (client, "/apps/evolution/calendar/sources", NULL); ++ gconf_client_unset (client, "/apps/evolution/tasks/sources", NULL); ++ gconf_client_unset (client, "/apps/evolution/addressbook/sources", NULL); + + /* Reset the version */ +- gconf_client_set_string (gconf, "/apps/evolution/version", "1.4.0", NULL); ++ gconf_client_set_string (client, "/apps/evolution/version", "1.4.0", NULL); + + /* Clear the dir */ + system ("rm -Rf ~/.evolution"); +- +- g_object_unref (gconf); + } + + #endif /* DEVELOPMENT */ + + static void +-open_uris (GNOME_Evolution_Shell corba_shell, GSList *uri_list) ++open_uris (GNOME_Evolution_Shell corba_shell, gchar **uris) + { +- GSList *p; + CORBA_Environment ev; ++ guint n_uris, ii; + +- CORBA_exception_init (&ev); ++ g_assert (uris != NULL); ++ n_uris = g_strv_length (uris); + +- for (p = uri_list; p != NULL; p = p->next) { +- const char *uri; ++ CORBA_exception_init (&ev); + +- uri = (const char *) p->data; +- GNOME_Evolution_Shell_handleURI (corba_shell, uri, &ev); ++ for (ii = 0; ii < n_uris; ii++) { ++ GNOME_Evolution_Shell_handleURI (corba_shell, uris[ii], &ev); + if (ev._major != CORBA_NO_EXCEPTION) { +- g_warning ("Invalid URI: %s", uri); ++ g_warning ("Invalid URI: %s", uris[ii]); + CORBA_exception_free (&ev); + } + } +@@ -324,23 +307,22 @@ + + /* This is for doing stuff that requires the GTK+ loop to be running already. */ + +-static gint +-idle_cb (void *data) ++static gboolean ++idle_cb (gchar **uris) + { +- GSList *uri_list; + GNOME_Evolution_Shell corba_shell; + CORBA_Environment ev; + EShellConstructResult result; + EShellStartupLineMode startup_line_mode; + ++ g_assert (uris == NULL || g_strv_length (uris) > 0); ++ + #ifdef KILL_PROCESS_CMD + kill_old_dataserver (); + #endif + + CORBA_exception_init (&ev); + +- uri_list = (GSList *) data; +- + if (! start_online && ! start_offline) + startup_line_mode = E_SHELL_STARTUP_LINE_MODE_CONFIG; + else if (start_online) +@@ -378,15 +360,16 @@ + } + + if (shell != NULL) { +- if (g_slist_length (uri_list) == 0) ++ if (uris != NULL) ++ open_uris (corba_shell, uris); ++ else + e_shell_create_window (shell, default_component_id, NULL); +- open_uris (corba_shell, uri_list); + } else { + CORBA_Environment ev; + + CORBA_exception_init (&ev); +- if (uri_list != NULL) +- open_uris (corba_shell, uri_list); ++ if (uris != NULL) ++ open_uris (corba_shell, uris); + else + if (default_component_id == NULL) + GNOME_Evolution_Shell_createNewWindow (corba_shell, "", &ev); +@@ -396,8 +379,6 @@ + CORBA_exception_free (&ev); + } + +- g_slist_free (uri_list); +- + CORBA_Object_release (corba_shell, &ev); + + CORBA_exception_free (&ev); +@@ -501,7 +482,6 @@ + GConfClient *client; + gboolean skip_warning_dialog; + #endif +- GSList *uri_list; + GnomeProgram *program; + GOptionContext *context; + char *filename; +@@ -543,8 +523,10 @@ + #endif + + #if DEVELOPMENT ++ client = g_conf_client_get_default (); ++ + if (force_migrate) { +- destroy_config (); ++ destroy_config (client); + } + #endif + +@@ -571,17 +553,6 @@ + if (setup_only) + exit (0); + +- uri_list = NULL; +- +- if (remaining_args != NULL) { +- const char **p; +- +- for (p = (const char**)remaining_args; *p != NULL; p++) +- uri_list = g_slist_prepend (uri_list, (char *) *p); +- } +- uri_list = g_slist_reverse (uri_list); +- +- + gnome_sound_init ("localhost"); + + if (!disable_eplugin) { +@@ -597,15 +568,20 @@ + } + + #if DEVELOPMENT +- client = gconf_client_get_default (); +- skip_warning_dialog = gconf_client_get_bool (client, "/apps/evolution/shell/skip_warning_dialog", NULL); +- g_object_unref (client); ++ skip_warning_dialog = gconf_client_get_bool ( ++ client, SKIP_WARNING_DIALOG_KEY, NULL); + + if (!skip_warning_dialog && !getenv ("EVOLVE_ME_HARDER")) +- show_development_warning(); ++ gconf_client_set_bool ( ++ client, SKIP_WARNING_DIALOG_KEY, ++ show_development_warning (), NULL); + else ++ g_idle_add ((GSourceFunc) idle_cb, remaining_args); ++ ++ g_object_unref (client); ++#else ++ g_idle_add ((GSourceFunc) idle_cb, remaining_args); + #endif +- g_idle_add (idle_cb, uri_list); + + bonobo_main (); + diff --git a/evolution-2.10.0-use-glib-i18n.patch b/evolution-2.10.0-use-glib-i18n.patch new file mode 100644 index 0000000..e14f818 --- /dev/null +++ b/evolution-2.10.0-use-glib-i18n.patch @@ -0,0 +1,3328 @@ +--- evolution-2.10.0/mail/message-tag-followup.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/message-tag-followup.c 2007-03-18 08:26:55.000000000 -0400 +@@ -52,7 +52,7 @@ + #include + + #include +-#include ++#include + + #include "e-util/e-icon-factory.h" + #include "e-util/e-util-private.h" +--- evolution-2.10.0/mail/em-popup.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-popup.c 2007-03-18 08:26:55.000000000 -0400 +@@ -41,7 +41,7 @@ + #include + #include + #include +-#include ++#include + + #include "em-popup.h" + #include "libedataserver/e-msgport.h" +--- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/em-composer-utils.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + + #include + #include +-#include ++#include + + #include "mail-mt.h" + #include "mail-ops.h" +--- evolution-2.10.0/mail/em-account-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-account-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -64,7 +64,7 @@ + #include + #include + +-#include ++#include + #include + #include + +--- evolution-2.10.0/mail/mail-tools.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-tools.c 2007-03-18 08:26:55.000000000 -0400 +@@ -37,7 +37,7 @@ + #include + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-folder-selection-button.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-folder-selection-button.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + + #include +-#include ++#include + + #include "mail-component.h" + #include "em-folder-tree.h" +--- evolution-2.10.0/mail/em-format-hook.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-format-hook.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + + #include + +-#include ++#include + + + /* class name -> klass map for EMFormat and subclasses */ +--- evolution-2.10.0/mail/em-format-quote.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-format-quote.c 2007-03-18 08:26:55.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + + #include +-#include ++#include + + #include "em-stripsig-filter.h" + #include "em-format-quote.h" +--- evolution-2.10.0/mail/em-utils.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/em-utils.c 2007-03-18 08:26:55.000000000 -0400 +@@ -59,7 +55,7 @@ + #include + #include + #include +-#include ++#include + + #include "mail-component.h" + #include "mail-mt.h" +--- evolution-2.10.0/mail/em-filter-rule.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-filter-rule.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + + #include +-#include ++#include + + #include "em-filter-rule.h" + #include "em-filter-context.h" +--- evolution-2.10.0/mail/mail-component.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/mail-component.c 2007-03-18 08:26:55.000000000 -0400 +@@ -78,7 +78,7 @@ + + #include
+ #include
+-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/importers/mail-importer.c 2007-03-18 08:26:55.000000000 -0400 +@@ -38,7 +38,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/mail-send-recv.c 2007-03-18 08:26:55.000000000 -0400 +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + + #include "e-util/e-gtk-utils.h" + #include "libedataserver/e-account-list.h" +--- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/em-format-html.c 2007-03-18 08:26:55.000000000 -0400 +@@ -51,7 +51,7 @@ + #include + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-filter-folder-element.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-filter-folder-element.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + + #include +-#include ++#include + + #include "em-filter-folder-element.h" + #include "mail/em-folder-selection-button.h" +--- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-tree.c 2007-03-18 08:26:55.000000000 -0400 +@@ -38,7 +38,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-filter-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-filter-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #endif + + #include +-#include ++#include + + #include "e-util/e-util-private.h" + +--- evolution-2.10.0/mail/em-folder-tree-model.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-folder-tree-model.c 2007-03-18 08:26:55.000000000 -0400 +@@ -39,7 +39,7 @@ + + #include + +-#include ++#include + + #include + +--- evolution-2.10.0/mail/message-list.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/message-list.c 2007-03-18 08:26:55.000000000 -0400 +@@ -38,7 +38,7 @@ + + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-folder-properties.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-properties.c 2007-03-18 08:26:55.000000000 -0400 +@@ -44,7 +44,7 @@ + #include + #include + #include +-#include ++#include + + #include "em-folder-properties.h" + #include "em-config.h" +--- evolution-2.10.0/mail/mail-ops.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/mail-ops.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-migrate.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-migrate.c 2007-03-18 08:26:55.000000000 -0400 +@@ -54,7 +54,7 @@ + #include + #include + +-#include ++#include + + #include + #include +@@ -2645,38 +2645,33 @@ + { + GDir *dir; + const char *d; +- struct stat st; +- const GList *l; + char *local, *base; ++ const gchar * const *language_names; + + /* special-case - this means brand new install of evolution */ + /* FIXME: create default folders and stuff... */ + + d(printf("Setting up initial mail tree\n")); + +- base = g_build_filename(evolution_dir, "mail/local", NULL); ++ base = g_build_filename(evolution_dir, "mail", "local", NULL); + if (e_util_mkdir_hier(base, 0777) == -1 && errno != EEXIST) { + g_free(base); + return -1; + } + + /* e.g. try en-AU then en, etc */ +- for (l = gnome_i18n_get_language_list("LC_MESSAGES"); +- l != NULL; +- l = g_list_next(l)) { +- local = g_build_filename(EVOLUTION_PRIVDATADIR, +- "default", +- (char *)l->data, +- "mail/local", NULL); +- if (g_stat(local, &st) == 0) +- goto gotlocal; +- +- g_free(local); +- } +- +- local = g_build_filename(EVOLUTION_PRIVDATADIR, +- "default/C/mail/local", NULL); +-gotlocal: ++ language_names = g_get_language_names (); ++ while (*language_names != NULL) { ++ local = g_build_filename ( ++ EVOLUTION_PRIVDATADIR, "default", ++ *language_names++, "mail", "local", NULL); ++ if (g_file_test (local, G_FILE_TEST_EXISTS)) ++ break; ++ g_free (local); ++ } ++ ++ /* Make sure we found one. */ ++ g_assert (*language_names != NULL); + + dir = g_dir_open(local, 0, NULL); + if (dir) { +--- evolution-2.10.0/mail/mail-vfolder.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/mail-vfolder.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-folder-selector.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-folder-selector.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-subscribe-editor.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/em-subscribe-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -44,7 +44,7 @@ + #include "mail-config.h" + + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/mail-autofilter.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-autofilter.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/mail/em-format-html-display.c.use-glib-i18n 2007-02-26 04:59:59.000000000 -0500 ++++ evolution-2.10.0/mail/em-format-html-display.c 2007-03-18 08:26:55.000000000 -0400 +@@ -67,7 +67,7 @@ + #include + + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-account-prefs.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-account-prefs.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + +-#include ++#include + + #include "mail-component.h" + #include "mail-config.h" +--- evolution-2.10.0/mail/mail-folder-cache.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/mail-folder-cache.c 2007-03-18 08:26:55.000000000 -0400 +@@ -37,7 +37,7 @@ + #include + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/mail/em-format.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-format.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-vfolder-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-vfolder-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #endif + + #include +-#include ++#include + + #include "e-util/e-util-private.h" + +--- evolution-2.10.0/mail/mail-mt.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/mail-mt.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-folder-utils.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-utils.c 2007-03-18 08:26:55.000000000 -0400 +@@ -37,7 +37,7 @@ + + #include + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/mail/em-vfolder-rule.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-vfolder-rule.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + + #include + #include +-#include ++#include + + #include "camel/camel-url.h" + #include "em-vfolder-context.h" +--- evolution-2.10.0/a11y/widgets/ea-calendar-item.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 ++++ evolution-2.10.0/a11y/widgets/ea-calendar-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "ea-calendar-item.h" + #include "ea-calendar-cell.h" +--- evolution-2.10.0/a11y/addressbook/ea-minicard-view.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 ++++ evolution-2.10.0/a11y/addressbook/ea-minicard-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -20,11 +20,10 @@ + */ + + #include +-#include + #include + #include + #include +-#include ++#include + #include "ea-minicard.h" + #include "ea-minicard-view.h" + #include "eab-gui-util.h" +--- evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 ++++ evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -22,7 +22,7 @@ + + #include + +-#include ++#include + #include "ea-addressbook-view.h" + + static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible); +--- evolution-2.10.0/a11y/addressbook/ea-minicard.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 ++++ evolution-2.10.0/a11y/addressbook/ea-minicard.c 2007-03-18 08:26:55.000000000 -0400 +@@ -22,7 +22,7 @@ + + #include + #include +-#include ++#include + #include "ea-minicard.h" + #include "ea-minicard-view.h" + #include "e-minicard.h" +--- evolution-2.10.0/a11y/calendar/ea-day-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/calendar/ea-day-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include "ea-gnome-calendar.h" + #include "calendar-commands.h" + #include +-#include ++#include + + static void ea_day_view_class_init (EaDayViewClass *klass); + +--- evolution-2.10.0/a11y/calendar/ea-jump-button.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/calendar/ea-jump-button.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include "ea-week-view.h" + #include "e-week-view.h" + #include +-#include ++#include + + static void ea_jump_button_class_init (EaJumpButtonClass *klass); + +--- evolution-2.10.0/a11y/calendar/ea-cal-view-event.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/calendar/ea-cal-view-event.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include "ea-day-view.h" + #include "ea-week-view.h" + #include +-#include ++#include + + static void ea_cal_view_event_class_init (EaCalViewEventClass *klass); + static void ea_cal_view_event_init (EaCalViewEvent *a11y); +--- evolution-2.10.0/a11y/calendar/ea-week-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/calendar/ea-week-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include "ea-gnome-calendar.h" + #include "calendar-commands.h" + #include +-#include ++#include + + static void ea_week_view_class_init (EaWeekViewClass *klass); + +--- evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include "ea-week-view.h" + #include "ea-week-view-cell.h" + #include "ea-cell-table.h" +-#include ++#include + + /* EaWeekViewMainItem */ + static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass); +--- evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include "ea-day-view.h" + #include "ea-day-view-cell.h" + #include "ea-cell-table.h" +-#include ++#include + + /* EaDayViewMainItem */ + static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass); +--- evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + + static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); + +--- evolution-2.10.0/a11y/calendar/ea-cal-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/calendar/ea-cal-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include "calendar-commands.h" + #include "goto.h" + #include +-#include ++#include + + static void ea_cal_view_class_init (EaCalViewClass *klass); + +--- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + + #include "a11y/gal-a11y-util.h" + #include "table/e-cell-popup.h" +-#include "e-util/e-i18n.h" ++#include + + #include "gal-a11y-e-cell-popup.h" + #include "gal-a11y-e-cell-registry.h" +--- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c 2007-03-18 08:26:55.000000000 -0400 +@@ -15,7 +15,7 @@ + #include "a11y/gal-a11y-util.h" + #include "table/e-table.h" + #include "table/e-tree.h" +-#include "e-util/e-i18n.h" ++#include + + #include "gal-a11y-e-cell.h" + #include "gal-a11y-e-cell-vbox.h" +--- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c 2007-03-18 08:26:55.000000000 -0400 +@@ -2,7 +2,7 @@ + + #include "table/e-cell-toggle.h" + #include "table/e-table-model.h" +-#include "e-util/e-i18n.h" ++#include + + #include "gal-a11y-e-cell-toggle.h" + +--- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c 2007-03-18 08:26:55.000000000 -0400 +@@ -14,7 +14,7 @@ + + #include "a11y/gal-a11y-util.h" + #include "table/e-cell-text.h" +-#include "e-util/e-i18n.h" ++#include + + #include "gal-a11y-e-cell-text.h" + +--- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c 2007-03-18 08:26:55.000000000 -0400 +@@ -14,7 +14,7 @@ + #include "table/e-cell-tree.h" + #include "table/e-table.h" + #include "table/e-tree-table-adapter.h" +-#include "e-util/e-i18n.h" ++#include + + #include "gal-a11y-e-cell-tree.h" + #include "gal-a11y-e-cell-registry.h" +--- evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c 2007-03-18 08:26:55.000000000 -0400 +@@ -13,7 +13,7 @@ + #include "table/e-table-click-to-add.h" + #include "table/e-table-group.h" + #include "table/e-table-group-leaf.h" +-#include "e-util/e-i18n.h" ++#include + + #include "gal-a11y-e-table-click-to-add.h" + #include "gal-a11y-e-table-click-to-add-factory.h" +--- evolution-2.10.0/filter/rule-editor.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 ++++ evolution-2.10.0/filter/rule-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + +-#include ++#include + + #include "e-util/e-error.h" + #include "e-util/e-util-private.h" +--- evolution-2.10.0/filter/filter-label.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 ++++ evolution-2.10.0/filter/filter-label.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/filter/filter-part.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 ++++ evolution-2.10.0/filter/filter-part.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + + #include + #include +-#include ++#include + + #include "filter-part.h" + #include "rule-context.h" +--- evolution-2.10.0/filter/filter-datespec.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/filter/filter-datespec.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include + + #include +-#include ++#include + #include + + #include "filter-datespec.h" +--- evolution-2.10.0/filter/rule-context.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 ++++ evolution-2.10.0/filter/rule-context.c 2007-03-18 08:26:55.000000000 -0400 +@@ -34,7 +34,7 @@ + + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/filter/filter-option.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 ++++ evolution-2.10.0/filter/filter-option.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include + + #include +-#include ++#include + + #include "filter-option.h" + #include "filter-part.h" +--- evolution-2.10.0/filter/filter-file.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 ++++ evolution-2.10.0/filter/filter-file.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + + #include + +-#include ++#include + #include + + #include +--- evolution-2.10.0/filter/filter-input.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 ++++ evolution-2.10.0/filter/filter-input.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include + + #include +-#include ++#include + + #include "filter-input.h" + #include "libedataserver/e-sexp.h" +--- evolution-2.10.0/filter/filter-rule.c.use-glib-i18n 2007-02-26 05:00:00.000000000 -0500 ++++ evolution-2.10.0/filter/filter-rule.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + + #include +-#include ++#include + + #include "e-util/e-error.h" + #include "filter-rule.h" +--- evolution-2.10.0/widgets/misc/e-calendar-item.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-calendar-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -43,7 +43,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +--- evolution-2.10.0/widgets/misc/e-unicode.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-unicode.c 2007-03-18 08:26:55.000000000 -0400 +@@ -42,7 +42,7 @@ + + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-unicode.h" + + #define d(x) x +--- evolution-2.10.0/widgets/misc/e-task-widget.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-task-widget.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + #include + +-#include ++#include + + + #define SPACING 2 +--- evolution-2.10.0/widgets/misc/e-filter-bar.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-filter-bar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + #include + +-#include ++#include + + #include "e-dropdown-button.h" + #include "e-filter-bar.h" +--- evolution-2.10.0/widgets/misc/e-dateedit.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-dateedit.c 2007-03-18 08:26:55.000000000 -0400 +@@ -58,7 +58,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/widgets/misc/e-charset-picker.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-charset-picker.c 2007-03-18 08:26:55.000000000 -0400 +@@ -37,7 +37,7 @@ + #include + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/widgets/misc/e-clipped-label.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-clipped-label.c 2007-03-18 08:26:55.000000000 -0400 +@@ -40,7 +40,7 @@ + + #include + #include +-#include ++#include + + + static void e_clipped_label_class_init (EClippedLabelClass *class); +--- evolution-2.10.0/widgets/misc/e-cell-percent.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-cell-percent.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + + #include "e-cell-percent.h" + +--- evolution-2.10.0/widgets/misc/e-cell-date-edit.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-cell-date-edit.c 2007-03-18 08:26:55.000000000 -0400 +@@ -44,7 +44,7 @@ + #include
+ + #include +-#include ++#include + + #include + +--- evolution-2.10.0/widgets/misc/e-map.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-map.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + + #include "e-util/e-util-private.h" + #include "e-util/e-util.h" +--- evolution-2.10.0/widgets/misc/e-canvas-background.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-canvas-background.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "misc/e-canvas.h" + #include "misc/e-canvas-utils.h" +--- evolution-2.10.0/widgets/misc/e-selection-model.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-selection-model.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util-marshal.h" + #include "e-util/e-util.h" + +--- evolution-2.10.0/widgets/misc/e-selection-model-array.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-selection-model-array.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-selection-model-array.h" +--- evolution-2.10.0/widgets/misc/e-send-options.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-send-options.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + +--- evolution-2.10.0/widgets/misc/e-calendar.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-calendar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -43,7 +43,7 @@ + #include + #include + #include +-#include ++#include + + #define E_CALENDAR_SMALL_FONT_PTSIZE 6 + +--- evolution-2.10.0/widgets/misc/e-reflow.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-reflow.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include + + #include "text/e-text.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util-marshal.h" + #include "e-util/e-util.h" + #include "misc/e-unicode.h" +--- evolution-2.10.0/widgets/misc/e-search-bar.c.use-glib-i18n 2007-01-08 07:23:31.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-search-bar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -42,7 +42,7 @@ + #include + #include + +-#include ++#include + + #include + +--- evolution-2.10.0/widgets/misc/e-attachment-bar.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-attachment-bar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "e-attachment.h" +--- evolution-2.10.0/widgets/misc/e-attachment.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-attachment.c 2007-03-18 08:26:55.000000000 -0400 +@@ -51,7 +51,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "e-util/e-mktemp.h" +--- evolution-2.10.0/widgets/misc/e-canvas-vbox.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-canvas-vbox.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-canvas.h" +--- evolution-2.10.0/widgets/misc/e-activity-handler.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-activity-handler.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + +-#include ++#include + #include + + #include +--- evolution-2.10.0/widgets/misc/e-image-chooser.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 ++++ evolution-2.10.0/widgets/misc/e-image-chooser.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include + + #include +-#include ++#include + + #include "e-image-chooser.h" + #include "e-util/e-util-marshal.h" +--- evolution-2.10.0/widgets/menus/gal-view-new-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/menus/gal-view-new-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + + #include "table/e-table-scrolled.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "e-util/e-util-private.h" + #include "misc/e-unicode.h" +@@ -92,7 +92,7 @@ + "gal-view-new-dialog.glade", + NULL); + +- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); ++ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); + g_free (filename); + dialog->gui = gui; + +--- evolution-2.10.0/widgets/menus/gal-view-factory-etable.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/menus/gal-view-factory-etable.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "gal-view-etable.h" +--- evolution-2.10.0/widgets/menus/gal-define-views-model.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/menus/gal-define-views-model.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "gal-define-views-model.h" +--- evolution-2.10.0/widgets/menus/gal-define-views-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/menus/gal-define-views-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + + #include "table/e-table-scrolled.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "e-util/e-util-private.h" + +@@ -80,7 +80,7 @@ + } + + /* ETable creation */ +-#define SPEC "" \ ++#define SPEC "" \ + "" \ + " " \ + "" +@@ -250,7 +250,7 @@ + + dialog->collection = NULL; + +- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); ++ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); + g_free (filename); + dialog->gui = gui; + +--- evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + + #include "table/e-table-scrolled.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util-private.h" + + #include "gal-define-views-model.h" +@@ -197,7 +197,7 @@ + + dialog->instance = NULL; + +- gui = glade_xml_new_with_domain (filename , NULL, E_I18N_DOMAIN); ++ gui = glade_xml_new_with_domain (filename , NULL, GETTEXT_PACKAGE); + g_free (filename); + dialog->gui = gui; + +@@ -235,7 +235,7 @@ + + /* For use from libglade. */ + /* ETable creation */ +-#define SPEC "" \ ++#define SPEC "" \ + "" \ + " " \ + "" +--- evolution-2.10.0/widgets/menus/gal-view-instance.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/menus/gal-view-instance.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "e-util/e-xml-utils.h" + #include "misc/e-unicode.h" +--- evolution-2.10.0/widgets/menus/gal-view-collection.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/menus/gal-view-collection.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "e-util/e-xml-utils.h" + #include "misc/e-unicode.h" +--- evolution-2.10.0/widgets/menus/gal-view-menus.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/menus/gal-view-menus.c 2007-03-18 08:26:55.000000000 -0400 +@@ -20,7 +20,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/widgets/table/e-cell-pixbuf.c.use-glib-i18n 2007-03-08 01:11:20.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-cell-pixbuf.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + + #include + +-#include "e-util/e-i18n.h" ++#include + #include + #include "e-cell-pixbuf.h" + +--- evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-table-field-chooser-dialog.h" +--- evolution-2.10.0/widgets/table/e-table-sorter.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-sorter.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-table-sorter.h" +--- evolution-2.10.0/widgets/table/e-table-selection-model.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-selection-model.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-table-selection-model.h" +--- evolution-2.10.0/widgets/table/e-table-group-leaf.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-group-leaf.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "misc/e-canvas.h" + +--- evolution-2.10.0/widgets/table/e-table-field-chooser.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-field-chooser.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "e-util/e-util-private.h" + +@@ -156,7 +156,7 @@ + gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, + "e-table-field-chooser.glade", + NULL); +- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); ++ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); + g_free (filename); + etfc->gui = gui; + +--- evolution-2.10.0/widgets/table/e-table-item.c.use-glib-i18n 2007-01-23 03:23:43.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -38,7 +38,7 @@ + + #include "a11y/e-table/gal-a11y-e-table-item-factory.h" + #include "a11y/e-table/gal-a11y-e-table-item.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "misc/e-canvas.h" + #include "misc/e-canvas-utils.h" +--- evolution-2.10.0/widgets/table/e-table.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + + #include "a11y/e-table/gal-a11y-e-table.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "misc/e-canvas.h" + #include "misc/e-canvas-background.h" +--- evolution-2.10.0/widgets/table/e-table-group-container.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-group-container.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + + #include "text/e-text.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "misc/e-canvas-utils.h" + #include "misc/e-canvas.h" +--- evolution-2.10.0/widgets/table/e-cell-float.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-cell-float.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-cell-float.h" +--- evolution-2.10.0/widgets/table/e-tree-scrolled.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-tree-scrolled.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-tree-scrolled.h" +--- evolution-2.10.0/widgets/table/e-table-col.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-col.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-table-col.h" +--- evolution-2.10.0/widgets/table/e-table-scrolled.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-scrolled.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + + #include "e-table.h" + #include "e-table-scrolled.h" +--- evolution-2.10.0/widgets/table/e-table-header-item.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-header-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util-marshal.h" + #include "e-util/e-util.h" + #include "e-util/e-xml-utils.h" +@@ -1531,7 +1531,7 @@ + ((ethi->table || ethi->tree) ? 0 : 4) + + ((e_table_header_count (ethi->eth) > 1) ? 0 : 8), + ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) + +- 128, info, E_I18N_DOMAIN); ++ 128, info, GETTEXT_PACKAGE); + + menu_item = gtk_menu_item_new_with_label (_("Sort By")); + gtk_widget_show (menu_item); +@@ -1813,7 +1813,7 @@ + ((ethi->table || ethi->tree) ? 0 : 4) + + ((e_table_header_count (ethi->eth) > 1) ? 0 : 8), + ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) + +- 128, info, E_I18N_DOMAIN); ++ 128, info, GETTEXT_PACKAGE); + g_object_ref (popup); + gtk_object_sink (GTK_OBJECT (popup)); + g_signal_connect (popup, "selection-done", +--- evolution-2.10.0/widgets/table/e-table-field-chooser-item.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-field-chooser-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "e-util/e-xml-utils.h" + #include "misc/e-canvas.h" +--- evolution-2.10.0/widgets/table/e-table-config.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-config.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util-private.h" + #include "e-util/e-util.h" + #include "misc/e-unicode.h" +@@ -539,7 +539,7 @@ + } + } + +-char *spec = "" + "" + " " +@@ -1093,14 +1093,14 @@ + g_build_filename (EVOLUTION_GLADEDIR, + "e-table-config.glade", + NULL); +- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); ++ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); + g_free (filename); + } else { + gchar *filename = + g_build_filename (EVOLUTION_GLADEDIR, + "e-table-config-no-group.glade", + NULL); +- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); ++ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); + g_free (filename); + } + +--- evolution-2.10.0/widgets/table/e-cell-text.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-cell-text.c 2007-03-18 08:26:55.000000000 -0400 +@@ -50,7 +50,7 @@ + #include "a11y/e-table/gal-a11y-e-cell-registry.h" + #include "a11y/e-table/gal-a11y-e-cell-text.h" + #include "text/e-text.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-text-event-processor.h" + #include "e-util/e-text-event-processor-emacs-like.h" + #include "e-util/e-util.h" +--- evolution-2.10.0/widgets/table/e-tree.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-tree.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + + #include "a11y/e-table/gal-a11y-e-tree.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "e-util/e-util-marshal.h" + #include "misc/e-canvas.h" +--- evolution-2.10.0/widgets/table/e-cell-number.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-cell-number.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-cell-number.h" +--- evolution-2.10.0/widgets/table/e-tree-selection-model.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-tree-selection-model.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + + #include "table/e-tree-table-adapter.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + + #include "e-tree-selection-model.h" +--- evolution-2.10.0/widgets/table/e-cell-combo.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-cell-combo.c 2007-03-18 08:26:55.000000000 -0400 +@@ -59,7 +59,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "misc/e-unicode.h" + +--- evolution-2.10.0/widgets/table/e-table-click-to-add.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-table-click-to-add.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + + #include "a11y/e-table/gal-a11y-e-table-click-to-add.h" + #include "text/e-text.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util-marshal.h" + #include "e-util/e-util.h" + #include "misc/e-canvas-utils.h" +--- evolution-2.10.0/widgets/table/e-cell-date.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 ++++ evolution-2.10.0/widgets/table/e-cell-date.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "misc/e-unicode.h" + +--- evolution-2.10.0/widgets/text/e-text.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/widgets/text/e-text.c 2007-03-18 08:26:55.000000000 -0400 +@@ -52,7 +52,7 @@ + #include "misc/e-canvas.h" + #include "misc/e-canvas-utils.h" + #include "misc/e-unicode.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-text-event-processor-emacs-like.h" + #include "e-util/e-util.h" + +--- evolution-2.10.0/widgets/text/e-completion-view.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 ++++ evolution-2.10.0/widgets/text/e-completion-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + + #include "table/e-table-scrolled.h" + #include "table/e-table-simple.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util-marshal.h" + + #include "e-completion-view.h" +@@ -623,7 +623,7 @@ + /* XXX toshok - we need to add sorting to this etable, through the use + of undisplayed fields of all the sort keys we want to use */ + static char *simple_spec = +-"" ++"" + " " +--- evolution-2.10.0/widgets/text/e-entry.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 ++++ evolution-2.10.0/widgets/text/e-entry.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-util.h" + #include "misc/e-canvas.h" + #include "misc/e-canvas-utils.h" +--- evolution-2.10.0/plugins/calendar-file/calendar-file.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 ++++ evolution-2.10.0/plugins/calendar-file/calendar-file.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + + GtkWidget *e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); +--- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/publish-calendar/publish-calendar.c.use-glib-i18n 2007-01-03 10:34:05.000000000 -0500 ++++ evolution-2.10.0/plugins/publish-calendar/publish-calendar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/calendar-weather/calendar-weather.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 ++++ evolution-2.10.0/plugins/calendar-weather/calendar-weather.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 ++++ evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/backup-restore/backup-restore.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 ++++ evolution-2.10.0/plugins/backup-restore/backup-restore.c 2007-03-18 08:26:55.000000000 -0400 +@@ -2,7 +2,7 @@ + #include + #include + #include +-#include ++#include + #include "shell/es-menu.h" + + void org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target); +--- evolution-2.10.0/plugins/backup-restore/backup.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 ++++ evolution-2.10.0/plugins/backup-restore/backup.c 2007-03-18 08:26:55.000000000 -0400 +@@ -8,7 +8,7 @@ + #include + #include + +-#include ++#include + #include + + #define EVOLUTION "evolution-" BASE_VERSION +--- evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c.use-glib-i18n 2007-01-23 03:23:42.000000000 -0500 ++++ evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "e-util/e-util-private.h" +--- evolution-2.10.0/plugins/default-source/default-source.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 ++++ evolution-2.10.0/plugins/default-source/default-source.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data); + void commit_default_calendar (EPlugin *epl, EConfigTarget *target); +--- evolution-2.10.0/plugins/subject-thread/subject-thread.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 ++++ evolution-2.10.0/plugins/subject-thread/subject-thread.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/calendar-http/calendar-http.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 ++++ evolution-2.10.0/plugins/calendar-http/calendar-http.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + + GtkWidget *e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data); +--- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/itip-formatter/itip-view.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/plugins/itip-formatter/itip-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/groupwise-features/junk-settings.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 ++++ evolution-2.10.0/plugins/groupwise-features/junk-settings.c 2007-03-18 08:26:55.000000000 -0400 +@@ -37,7 +37,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/groupwise-features/install-shared.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 ++++ evolution-2.10.0/plugins/groupwise-features/install-shared.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/groupwise-features/process-meeting.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 ++++ evolution-2.10.0/plugins/groupwise-features/process-meeting.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 ++++ evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + + void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target); +--- evolution-2.10.0/plugins/groupwise-features/send-options.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 ++++ evolution-2.10.0/plugins/groupwise-features/send-options.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + #include + #include + #include "mail/em-account-editor.h" +--- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c 2007-03-18 08:26:55.000000000 -0400 +@@ -40,7 +40,7 @@ + #include + + #include +-#include ++#include + #include + + #include +--- evolution-2.10.0/plugins/bbdb/bbdb.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/plugins/bbdb/bbdb.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #endif + + #include +-#include ++#include + #include + + #include +--- evolution-2.10.0/e-util/e-categories-config.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-categories-config.c 2007-03-18 08:26:55.000000000 -0400 +@@ -10,7 +10,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/e-util/e-text-event-processor.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-text-event-processor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,8 @@ + + #include + +-#include "e-i18n.h" ++#include ++ + #include "e-util-marshal.h" + #include "e-text-event-processor.h" + #include "e-util.h" +--- evolution-2.10.0/e-util/e-util.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-util.c 2007-03-18 08:26:55.000000000 -0400 +@@ -1112,20 +1112,6 @@ + } + } + +-char * +-e_gettext (const char *msgid) +-{ +- static gboolean initialized = FALSE; +- +- if (!initialized) { +- bindtextdomain (E_I18N_DOMAIN, EVOLUTION_LOCALEDIR); +- bind_textdomain_codeset (E_I18N_DOMAIN, "UTF-8"); +- initialized = TRUE; +- } +- +- return dgettext (E_I18N_DOMAIN, msgid); +-} +- + cairo_font_options_t * + get_font_options () + { +--- evolution-2.10.0/e-util/e-popup.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-popup.c 2007-03-18 08:26:55.000000000 -0400 +@@ -42,7 +42,7 @@ + + #include + +-#include ++#include + + #define d(x) + +--- evolution-2.10.0/e-util/e-xml-utils.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-xml-utils.c 2007-03-18 08:46:40.000000000 -0400 +@@ -36,155 +36,14 @@ + #include + + #include ++#include + #include + #include + #include + +-#include "e-i18n.h" + #include "e-util.h" + #include "e-xml-utils.h" + +-/* Returns the first child with the name child_name and the "lang" +- * attribute that matches the current LC_MESSAGES, or else, the first +- * child with the name child_name and no "lang" attribute. +- */ +-xmlNode * +-e_xml_get_child_by_name_by_lang (const xmlNode *parent, +- const xmlChar *child_name, +- const gchar *lang) +-{ +-#ifdef G_OS_WIN32 +- gchar *freeme = NULL; +-#endif +- xmlNode *child; +- /* This is the default version of the string. */ +- xmlNode *C = NULL; +- +- g_return_val_if_fail (parent != NULL, NULL); +- g_return_val_if_fail (child_name != NULL, NULL); +- +- if (lang == NULL) { +-#ifndef G_OS_WIN32 +-#ifdef HAVE_LC_MESSAGES +- lang = setlocale (LC_MESSAGES, NULL); +-#else +- lang = setlocale (LC_CTYPE, NULL); +-#endif +-#else +- lang = freeme = g_win32_getlocale (); +-#endif +- } +- for (child = parent->xmlChildrenNode; child != NULL; child = child->next) { +- if (xmlStrcmp (child->name, child_name) == 0) { +- xmlChar *this_lang = xmlGetProp (child, "lang"); +- if (this_lang == NULL) { +- C = child; +- } else if (xmlStrcmp(this_lang, lang) == 0) { +-#ifdef G_OS_WIN32 +- g_free (freeme); +-#endif +- return child; +- } +- } +- } +-#ifdef G_OS_WIN32 +- g_free (freeme); +-#endif +- return C; +-} +- +-static xmlNode * +-e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, +- const gchar *name, +- const GList *lang_list, +- gint *best_lang_score) +-{ +- xmlNodePtr best_node = NULL, node; +- +- for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { +- xmlChar *lang; +- +- if (node->name == NULL || strcmp (node->name, name) != 0) { +- continue; +- } +- lang = xmlGetProp (node, "xml:lang"); +- if (lang != NULL) { +- const GList *l; +- gint i; +- +- for (l = lang_list, i = 0; +- l != NULL && i < *best_lang_score; +- l = l->next, i++) { +- if (strcmp ((gchar *) l->data, lang) == 0) { +- best_node = node; +- *best_lang_score = i; +- } +- } +- } else { +- if (best_node == NULL) { +- best_node = node; +- } +- } +- xmlFree (lang); +- if (*best_lang_score == 0) { +- return best_node; +- } +- } +- +- return best_node; +-} +- +-/* +- * e_xml_get_child_by_name_by_lang_list: +- * +- */ +-xmlNode * +-e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, +- const gchar *name, +- const GList *lang_list) +-{ +- gint best_lang_score = INT_MAX; +- +- g_return_val_if_fail (parent != NULL, NULL); +- g_return_val_if_fail (name != NULL, NULL); +- +- if (lang_list == NULL) { +- lang_list = gnome_i18n_get_language_list ("LC_MESSAGES"); +- } +- return e_xml_get_child_by_name_by_lang_list_with_score +- (parent,name, +- lang_list, +- &best_lang_score); +-} +- +-/* +- * e_xml_get_child_by_name_no_lang +- * +- */ +-xmlNode * +-e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name) +-{ +- xmlNodePtr node; +- +- g_return_val_if_fail (parent != NULL, NULL); +- g_return_val_if_fail (name != NULL, NULL); +- +- for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { +- xmlChar *lang; +- +- if (node->name == NULL || strcmp (node->name, name) != 0) { +- continue; +- } +- lang = xmlGetProp (node, "xml:lang"); +- if (lang == NULL) { +- return node; +- } +- xmlFree (lang); +- } +- +- return NULL; +-} +- + gint + e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name) + { +--- evolution-2.10.0/e-util/e-config.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-config.c 2007-03-18 08:26:55.000000000 -0400 +@@ -45,7 +45,7 @@ + + #include + +-#include ++#include + + #define d(x) + +--- evolution-2.10.0/e-util/e-dialog-utils.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-dialog-utils.c 2007-03-18 08:26:55.000000000 -0400 +@@ -46,7 +46,7 @@ + #include + + #include +-#include ++#include + #include + + #include +--- evolution-2.10.0/e-util/e-import.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-import.c 2007-03-18 08:26:55.000000000 -0400 +@@ -45,7 +45,7 @@ + + #include + +-#include ++#include + + #define d(x) + +--- evolution-2.10.0/e-util/Makefile.am.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/Makefile.am 2007-03-18 08:26:55.000000000 -0400 +@@ -108,7 +108,6 @@ + eggtrayicon.c \ + eggtrayicon.h \ + e-bit-array.c \ +- e-i18n.h \ + e-sorter.c \ + e-sorter-array.c \ + e-text-event-processor-emacs-like.c \ +--- evolution-2.10.0/e-util/e-error.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-error.c 2007-03-18 08:26:55.000000000 -0400 +@@ -37,7 +37,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include +--- evolution-2.10.0/e-util/e-event.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-event.c 2007-03-18 08:26:55.000000000 -0400 +@@ -42,7 +42,7 @@ + + #include + +-#include ++#include + #include + + #define d(x) +--- evolution-2.10.0/e-util/e-xml-utils.h.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-xml-utils.h 2007-03-18 08:26:55.000000000 -0400 +@@ -30,18 +30,6 @@ + + G_BEGIN_DECLS + +-/* lang set to NULL means use the current locale. */ +-xmlNode *e_xml_get_child_by_name_by_lang (const xmlNode *parent, +- const xmlChar *child_name, +- const gchar *lang); +-/* lang_list set to NULL means use the current locale. */ +-xmlNode *e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, +- const gchar *name, +- const GList *lang_list); +-xmlNode *e_xml_get_child_by_name_no_lang (const xmlNode *parent, +- const gchar *name); +- +- + gint e_xml_get_integer_prop_by_name (const xmlNode *parent, + const xmlChar *prop_name); + gint e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, +--- evolution-2.10.0/e-util/e-i18n.h.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-i18n.h 2007-03-18 08:26:55.000000000 -0400 +@@ -1,74 +0,0 @@ +-/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ +-/* +- * e-i18n.h +- * Copyright 2000, 2001, Ximian, Inc. +- * +- * Authors: +- * Chris Lahey +- * +- * Copied from gnome-i18nP.h, because this header is typically not installed +- * +- * This file has to be included before any file from the GNOME libraries +- * to have this override the definitions that are pulled from the gnome-i18n.h +- * +- * the difference is that gnome-i18n.h is used for applications, and this is +- * used by libraries (because libraries have to use dcgettext instead of +- * gettext and they need to provide the translation domain, unlike apps). +- * +- * So you can just put this after you include config.h +- * +- * This library is free software; you can redistribute it and/or +- * modify it under the terms of the GNU Library General Public +- * License, version 2, as published by the Free Software Foundation. +- * +- * This library is distributed in the hope that it will be useful, but +- * WITHOUT ANY WARRANTY; without even the implied warranty of +- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +- * Library General Public License for more details. +- * +- * You should have received a copy of the GNU Library General Public +- * License along with this library; if not, write to the Free Software +- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +- * 02111-1307, USA. +- */ +- +-#ifndef __E_I18N_H__ +-#define __E_I18N_H__ +- +-#include +- +-G_BEGIN_DECLS +- +-#ifdef ENABLE_NLS +- /* this function is defined in e-util.c */ +- extern char *e_gettext (const char *msgid); +-# undef _ +-# ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN +-/* No parentheses allowed here since that breaks string concatenation. */ +-# define E_I18N_DOMAIN GNOME_EXPLICIT_TRANSLATION_DOMAIN +-# else +-/* No parentheses allowed here since that breaks string concatenation. */ +-# define E_I18N_DOMAIN GETTEXT_PACKAGE +-# endif +-# define _(String) e_gettext (String) +-# ifdef gettext_noop +-# define N_(String) gettext_noop (String) +-# else +-# define N_(String) (String) +-# endif +-#else +-/* Stubs that do something close enough. */ +-# define textdomain(String) (String) +-# define gettext(String) (String) +-# define dgettext(Domain,Message) (Message) +-# define dcgettext(Domain,Message,Type) (Message) +-# define bindtextdomain(Domain,Directory) (Domain) +-# define _(String) (String) +-# define N_(String) (String) +-/* No parentheses allowed here since that breaks string concatenation. */ +-# define E_I18N_DOMAIN "" +-#endif +- +-G_END_DECLS +- +-#endif /* __E_I18N_H__ */ +--- evolution-2.10.0/e-util/e-menu.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 ++++ evolution-2.10.0/e-util/e-menu.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + + #include + +-#include ++#include + #include + + #include +--- evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c.use-glib-i18n 2007-01-03 10:32:48.000000000 -0500 ++++ evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c 2007-03-18 08:26:55.000000000 -0400 +@@ -22,7 +22,7 @@ + #include + #include "addressbook/printing/e-contact-print-envelope.h" + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/printing/e-contact-print.c.use-glib-i18n 2007-03-08 01:10:56.000000000 -0500 ++++ evolution-2.10.0/addressbook/printing/e-contact-print.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/component/addressbook-config.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/component/addressbook-config.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + + #include + +--- evolution-2.10.0/addressbook/gui/component/addressbook.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/component/addressbook.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c 2007-03-18 08:26:55.000000000 -0400 +@@ -35,7 +35,7 @@ + + #include + #include +-#include ++#include + + #include + +--- evolution-2.10.0/addressbook/gui/component/autocompletion-config.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/component/autocompletion-config.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/component/addressbook-view.c.use-glib-i18n 2007-02-26 04:59:17.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/component/addressbook-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + + #include + +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + + #include "eab-marshal.h" + #include "e-minicard-view-widget.h" +--- evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c 2007-03-18 08:26:55.000000000 -0400 +@@ -4,7 +4,7 @@ + #include + #include + +-#include ++#include + #include "eab-marshal.h" + #include "e-addressbook-reflow-adapter.h" + #include "e-addressbook-model.h" +--- evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include "e-util/e-icon-factory.h" + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c 2007-03-18 08:26:55.000000000 -0400 +@@ -13,7 +13,7 @@ + #endif + + #include +-#include ++#include + #include "gal-view-factory-minicard.h" + #include "gal-view-minicard.h" + +--- evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c.use-glib-i18n 2007-03-08 01:10:56.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + + #include + +-#include ++#include + #include + #include + #include
+--- evolution-2.10.0/addressbook/gui/widgets/e-minicard.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "a11y/addressbook/ea-addressbook.h" + +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include + + #include "eab-editor.h" + #include "addressbook/gui/widgets/eab-gui-util.h" +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-03-18 08:26:55.000000000 -0400 +@@ -22,7 +22,7 @@ + #include + #include "e-contact-editor-im.h" + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -37,7 +37,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include +--- evolution-2.10.0/composer/e-msg-composer.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/composer/e-msg-composer.c 2007-03-18 08:26:55.000000000 -0400 +@@ -63,7 +63,7 @@ + + #include + #include +-#include ++#include + #include + #include + +--- evolution-2.10.0/composer/e-msg-composer-select-file.c.use-glib-i18n 2007-01-03 10:34:14.000000000 -0500 ++++ evolution-2.10.0/composer/e-msg-composer-select-file.c 2007-03-18 08:26:55.000000000 -0400 +@@ -41,7 +41,7 @@ + #endif + + #include +-#include ++#include + + #include "e-msg-composer-select-file.h" + #include +--- evolution-2.10.0/composer/e-msg-composer-hdrs.c.use-glib-i18n 2007-01-03 10:34:14.000000000 -0500 ++++ evolution-2.10.0/composer/e-msg-composer-hdrs.c 2007-03-18 08:26:55.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/shell/e-shell-window.c.use-glib-i18n 2007-03-12 16:17:12.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell-window.c 2007-03-18 08:26:55.000000000 -0400 +@@ -51,7 +51,7 @@ + #include + #include + +-#include ++#include + #include + + #include +--- evolution-2.10.0/shell/e-shell-utils.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 ++++ evolution-2.10.0/shell/e-shell-utils.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + + #include +-#include ++#include + + #include "e-util/e-util-private.h" + +--- evolution-2.10.0/shell/e-shell.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 ++++ evolution-2.10.0/shell/e-shell.c 2007-03-18 08:26:55.000000000 -0400 +@@ -44,7 +44,7 @@ + #undef interface + #endif + +-#include ++#include + #include + + #include +--- evolution-2.10.0/shell/e-shell-folder-title-bar.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 ++++ evolution-2.10.0/shell/e-shell-folder-title-bar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include "misc/e-clipped-label.h" +--- evolution-2.10.0/shell/e-shell-settings-dialog.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 ++++ evolution-2.10.0/shell/e-shell-settings-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -148,9 +148,9 @@ + { + EShellSettingsDialogPrivate *priv; + Bonobo_ServerInfoList *control_list; ++ const gchar * const *language_names; + CORBA_Environment ev; +- const GList *l; +- GSList *language_list; ++ GSList *languages = NULL; + GList *page_list; + GList *p; + int i, j; +@@ -168,10 +168,9 @@ + + CORBA_exception_free (&ev); + +- /* Great, one uses GList the other GSList (!) */ +- l = gnome_i18n_get_language_list("LC_MESSAGES"); +- for (language_list=NULL;l;l=l->next) +- language_list = g_slist_append(language_list, l->data); ++ language_names = g_get_language_names (); ++ while (*language_names != NULL) ++ languages = g_list_append (languages, *language_names++); + + page_list = NULL; + for (i = 0; i < control_list->_length; i ++) { +@@ -189,8 +188,8 @@ + + info = & control_list->_buffer[i]; + +- title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", language_list); +- description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", language_list); ++ title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages); ++ description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages); + icon_path = bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL); + type = bonobo_server_info_prop_find (info, "evolution2:config_item:type"); + priority_string = bonobo_server_info_prop_lookup (info, "evolution2:config_item:priority", NULL); +@@ -232,7 +231,7 @@ + + CORBA_exception_free (&ev); + } +- g_slist_free(language_list); ++ g_slist_free(languages); + + page_list = sort_page_list (page_list); + for (p = page_list, i = 0; p != NULL; p = p->next, i++) { +--- evolution-2.10.0/shell/e-user-creatable-items-handler.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 ++++ evolution-2.10.0/shell/e-user-creatable-items-handler.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/shell/main.c.use-glib-i18n 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/main.c 2007-03-18 08:26:55.000000000 -0400 +@@ -55,7 +55,7 @@ + #include + #include + +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/shell/evolution-shell-component-utils.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 ++++ evolution-2.10.0/shell/evolution-shell-component-utils.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include "e-util/e-dialog-utils.h" + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/shell/e-shell-window-commands.c.use-glib-i18n 2007-03-12 08:40:01.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell-window-commands.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + #include + + #include +-#include ++#include + #include + + #include +@@ -611,10 +611,11 @@ + { + char *quickref; + GnomeVFSMimeApplication *app; +- const GList *lang_list = gnome_i18n_get_language_list ("LC_MESSAGES"); ++ const gchar * const *language_names; + +- for (; lang_list != NULL; lang_list = lang_list->next) { +- const char *lang = lang_list->data; ++ language_names = g_get_language_names (); ++ while (*language_names != NULL) { ++ const gchar *lang = *language_names++; + + /* This has to be a valid language AND a language with + * no encoding postfix. The language will come up without +--- evolution-2.10.0/shell/e-component-registry.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 ++++ evolution-2.10.0/shell/e-component-registry.c 2007-03-18 08:26:55.000000000 -0400 +@@ -28,7 +28,7 @@ + + #include + +-#include ++#include + + #include + #include +@@ -146,8 +146,9 @@ + query_components (EComponentRegistry *registry) + { + Bonobo_ServerInfoList *info_list; ++ const gchar * const *language_names; + CORBA_Environment ev; +- GSList *language_list; ++ GSList *languages = NULL; + const GList *l; + char *query; + int i; +@@ -170,9 +171,9 @@ + return; + } + +- l = gnome_i18n_get_language_list("LC_MESSAGES"); +- for (language_list=NULL;l;l=l->next) +- language_list = g_slist_append(language_list, l->data); ++ language_names = g_get_language_names (); ++ while (*language_names != NULL) ++ languages = g_slist_append (languages, *language_names++); + + for (i = 0; i < info_list->_length; i++) { + const char *id; +@@ -200,13 +201,13 @@ + continue; + } + +- label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", language_list); ++ label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", languages); + +- tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", language_list); ++ tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", languages); + +- menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", language_list); ++ menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", languages); + +- menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", language_list); ++ menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", languages); + + alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL); + +@@ -235,7 +236,7 @@ + g_object_unref (menuicon); + bonobo_object_release_unref(iface, NULL); + } +- g_slist_free(language_list); ++ g_slist_free(languages); + + CORBA_free (info_list); + CORBA_exception_free (&ev); +--- evolution-2.10.0/shell/e-shell-importer.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 ++++ evolution-2.10.0/shell/e-shell-importer.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + + #include + +-#include ++#include + + #include + #include +--- evolution-2.10.0/calendar/gui/print.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/print.c 2007-03-18 08:26:55.000000000 -0400 +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/calendar-view-factory.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/calendar-view-factory.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + #include "calendar-view-factory.h" + #include "calendar-view.h" + +--- evolution-2.10.0/calendar/gui/itip-utils.c.use-glib-i18n 2007-01-08 08:36:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/itip-utils.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/alarm-notify/util.c.use-glib-i18n 2007-01-03 10:34:50.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/alarm-notify/util.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + #include + #endif + +-#include ++#include + #include + #include + #include "config-data.h" +--- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c 2007-03-18 08:26:55.000000000 -0400 +@@ -43,7 +43,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c.use-glib-i18n 2007-01-03 10:34:50.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #if 0 + # include + #endif +--- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-itip-control.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-itip-control.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-day-view-top-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-day-view-top-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #endif + + #include +-#include ++#include + #include "e-util/e-categories-config.h" + #include + #include +--- evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -34,7 +34,7 @@ + + #include + #include +-#include ++#include + #include "calendar-config.h" + #include "e-meeting-time-sel-item.h" + #include "e-meeting-time-sel.h" +--- evolution-2.10.0/calendar/gui/e-meeting-list-view.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-meeting-list-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/tasks-control.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/tasks-control.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-cal-model-calendar.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-cal-model-calendar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + #include "e-cal-model-calendar.h" + #include "e-cell-date-edit-text.h" + #include "itip-utils.h" +--- evolution-2.10.0/calendar/gui/dialogs/memo-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/memo-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + + #include + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/task-page.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/task-page.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "e-util/e-dialog-widgets.h" +--- evolution-2.10.0/calendar/gui/dialogs/comp-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -34,7 +34,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c 2007-03-18 08:26:55.000000000 -0400 +@@ -39,7 +39,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/event-page.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/event-page.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "common/authentication.h" +--- evolution-2.10.0/calendar/gui/dialogs/task-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/task-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + + #include + #include +-#include ++#include + + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include "calendar-setup.h" +--- evolution-2.10.0/calendar/gui/dialogs/recur-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/recur-comp.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include + #include + #include "recur-comp.h" + +--- evolution-2.10.0/calendar/gui/dialogs/delete-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/delete-comp.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "e-util/e-error.h" + #include "../calendar-config.h" +--- evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + #endif + + #include +-#include ++#include + #include + #include + #include "comp-editor-page.h" +--- evolution-2.10.0/calendar/gui/dialogs/delete-error.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/delete-error.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include "delete-error.h" +--- evolution-2.10.0/calendar/gui/dialogs/task-details-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/task-details-page.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c 2007-03-18 08:26:55.000000000 -0400 +@@ -45,7 +45,7 @@ + #endif + + #include +-#include ++#include + + #include "cal-attachment-select-file.h" + #include +--- evolution-2.10.0/calendar/gui/dialogs/event-editor.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/event-editor.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include "e-util/e-error.h" +--- evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c 2007-03-18 08:26:55.000000000 -0400 +@@ -27,7 +27,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + + static const int week_start_day_map[] = { +--- evolution-2.10.0/calendar/gui/dialogs/schedule-page.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/schedule-page.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/dialogs/changed-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/dialogs/changed-comp.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include "changed-comp.h" +--- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c 2007-03-18 08:26:55.000000000 -0400 +@@ -33,7 +33,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-meeting-time-sel.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-meeting-time-sel.c 2007-03-18 08:26:55.000000000 -0400 +@@ -51,7 +51,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include +--- evolution-2.10.0/calendar/gui/calendar-commands.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/calendar-commands.c 2007-03-18 08:26:55.000000000 -0400 +@@ -47,7 +47,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/memos-control.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/memos-control.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/misc.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/misc.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #include + #include + #include +-#include "e-util/e-i18n.h" ++#include + + #include "misc.h" + +--- evolution-2.10.0/calendar/gui/e-cal-model-tasks.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cal-model-tasks.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "calendar-config.h" + #include "e-cal-model-tasks.h" +--- evolution-2.10.0/calendar/gui/e-calendar-view.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-calendar-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -37,7 +37,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-timezone-entry.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-timezone-entry.c 2007-03-18 08:26:55.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + #include + #include +-#include ++#include + #include "e-timezone-entry.h" + #include + +--- evolution-2.10.0/calendar/gui/e-alarm-list.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-alarm-list.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-day-view.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-day-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -46,7 +46,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-cal-model.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cal-model.c 2007-03-18 08:26:55.000000000 -0400 +@@ -24,7 +24,7 @@ + + #include + #include +-#include ++#include + #include + #include + #include "comp-util.h" +--- evolution-2.10.0/calendar/gui/weekday-picker.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/weekday-picker.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include "weekday-picker.h" +--- evolution-2.10.0/calendar/gui/e-week-view.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-week-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -41,7 +41,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-cal-model-memos.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-cal-model-memos.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #endif + + #include +-#include ++#include + #include "e-cal-model-memos.h" + #include "e-cell-date-edit-text.h" + #include "misc.h" +--- evolution-2.10.0/calendar/gui/main.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/main.c 2007-03-18 08:26:55.000000000 -0400 +@@ -25,7 +25,7 @@ + #endif + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/cal-search-bar.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/cal-search-bar.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-day-view-time-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "e-day-view-time-item.h" + #include "calendar-config.h" +--- evolution-2.10.0/calendar/gui/e-cal-popup.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-cal-popup.c 2007-03-18 08:26:55.000000000 -0400 +@@ -39,7 +39,7 @@ + #include + #include + #include "e-util/e-util.h" +-#include "e-util/e-i18n.h" ++#include + #include "e-util/e-mktemp.h" + #include "e-util/e-dialog-utils.h" + +--- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-meeting-store.c 2007-03-18 08:26:55.000000000 -0400 +@@ -26,7 +26,7 @@ + #endif + + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-week-view-main-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c 2007-03-18 08:26:55.000000000 -0400 +@@ -32,7 +32,7 @@ + + #include + #include +-#include ++#include + #include "e-week-view-main-item.h" + #include "ea-calendar.h" + +--- evolution-2.10.0/calendar/gui/gnome-cal.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/gnome-cal.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/calendar/gui/e-cal-list-view.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/e-cal-list-view.c 2007-03-18 08:26:55.000000000 -0400 +@@ -50,7 +50,7 @@ + #include
+ #include + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/smime/lib/e-cert-db.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/lib/e-cert-db.c 2007-03-18 08:26:55.000000000 -0400 +@@ -90,7 +90,7 @@ + #include "e-util/e-dialog-utils.h" + #include "e-util/e-util-private.h" + #include +-#include ++#include + #include + #include + #include +--- evolution-2.10.0/smime/lib/e-cert.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/lib/e-cert.c 2007-03-18 08:26:55.000000000 -0400 +@@ -62,7 +62,7 @@ + + #include + +-#include ++#include + #include + #include /* for e_utf8_strftime, what about e_time_format_time? */ + +--- evolution-2.10.0/smime/lib/e-pkcs12.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/lib/e-pkcs12.c 2007-03-18 08:26:55.000000000 -0400 +@@ -63,7 +63,7 @@ + #include + #include + #include +-#include ++#include + #include + + #include +--- evolution-2.10.0/smime/gui/certificate-viewer.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/gui/certificate-viewer.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + + #include + +-#include ++#include + #include + + #include "e-util/e-util-private.h" +--- evolution-2.10.0/smime/gui/certificate-manager.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/gui/certificate-manager.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + + #include + +-#include ++#include + + #include + #include "evolution-config-control.h" +--- evolution-2.10.0/smime/gui/e-cert-selector.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/gui/e-cert-selector.c 2007-03-18 08:26:55.000000000 -0400 +@@ -23,7 +23,7 @@ + #include + #endif + +-#include ++#include + + #include + #include +--- evolution-2.10.0/smime/gui/cert-trust-dialog.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/gui/cert-trust-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -36,7 +36,7 @@ + #include + #include + +-#include ++#include + #include + + #include "e-util/e-util-private.h" +--- evolution-2.10.0/smime/gui/component.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/gui/component.c 2007-03-18 08:26:55.000000000 -0400 +@@ -29,7 +29,7 @@ + + #include + +-#include ++#include + #include + + #include "ca-trust-dialog.h" +--- evolution-2.10.0/smime/gui/ca-trust-dialog.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 ++++ evolution-2.10.0/smime/gui/ca-trust-dialog.c 2007-03-18 08:26:55.000000000 -0400 +@@ -30,7 +30,7 @@ + + #include + +-#include ++#include + #include + + #include "e-util/e-util-private.h" +--- evolution-2.10.0/tools/killev.c.use-glib-i18n 2007-01-03 10:32:49.000000000 -0500 ++++ evolution-2.10.0/tools/killev.c 2007-03-18 08:26:55.000000000 -0400 +@@ -31,7 +31,7 @@ + + #include + #include +-#include ++#include + #include + + typedef struct { +@@ -39,7 +39,7 @@ + GPtrArray *names; + } KillevComponent; + +-static GSList *languages; ++static GSList *languages = NULL; + static GHashTable *components; + + static gboolean +@@ -186,7 +186,7 @@ + int + main (int argc, char **argv) + { +- const GList *l; ++ const gchar * const *language_names; + + bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); +@@ -196,9 +196,9 @@ + GNOME_PROGRAM_STANDARD_PROPERTIES, + NULL); + +- l = gnome_i18n_get_language_list("LC_MESSAGES"); +- for (languages=NULL;l;l=l->next) +- languages = g_slist_append(languages, l->data); ++ language_names = g_get_language_names (); ++ while (*language_names != NULL) ++ languages = g_slist_append (languages, *language_names++); + + components = g_hash_table_new (g_str_hash, g_str_equal); + diff --git a/evolution.spec b/evolution.spec index e71cc44..327c372 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.0 -Release: 2%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -149,6 +149,15 @@ Patch43: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch44: evolution-2.10.0-e-source-combo-box.patch +# GNOME bug #419469 +Patch45: evolution-2.10.0-shell-main-cleanups.patch + +# GNOME bug #419524 +Patch46: evolution-2.10.0-use-glib-i18n.patch + +# GNOME bug #418971 +Patch47: evolution-2.10.0-drop-old-glib-support.patch + ## Dependencies ### Requires(post): GConf2 @@ -297,6 +306,9 @@ Development files needed for building things which link against evolution. %patch42 -p1 -b .view-message-source %patch43 -p1 -b .e-passwords %patch44 -p1 -b .e-source-combo-box +%patch45 -p1 -b .shell-main-cleanups +%patch46 -p1 -b .use-glib-i18n +%patch47 -p1 -b .drop-old-glib-support mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -370,6 +382,7 @@ CFLAGS="$CFLAGS \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \ -DEDS_DISABLE_DEPRECATED=1 \ + -DCAMEL_DISABLE_DEPRECATED=1 \ -Werror-implicit-function-declaration" %endif @@ -442,16 +455,21 @@ done %post /sbin/ldconfig -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -SCHEMAS="apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas apps_evolution_addressbook-%{evo_major}.schemas apps_evolution_calendar-%{evo_major}.schemas apps_evolution_shell-%{evo_major}.schemas evolution-mail-%{evo_major}.schemas" -for S in $SCHEMAS; do - gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/$S > /dev/null -done scrollkeeper-update -q +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null %postun /sbin/ldconfig scrollkeeper-update -q +touch --no-create %{_datadir}/icons/hicolor || : +%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT @@ -706,6 +724,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Mar 26 2007 Matthew Barnes - 2.10.0-4.fc7 +- Run gtk-update-icon-cache in %post and %postun (RH bug #234018). + +* Sat Mar 17 2007 Matthew Barnes - 2.10.0-3.fc7 +- Add flag to disable deprecated Camel symbols. +- Add patch for GNOME bug #419469 (refactor shell/main.c). +- Add patch for GNOME bug #419524 (use GLib's i18n macros). +- Add patch for GNOME bug #418971 (drop support for GLib < 2.8). + * Wed Mar 14 2007 Matthew Barnes - 2.10.0-2.fc7 - Add patch for GNOME bug #417999 (use ESourceComboBox). From 7c2a3a4c67786ecfa9831b376fe1e46c3e1e98d5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 29 Mar 2007 20:53:58 +0000 Subject: [PATCH 114/844] - CVE-2007-1002 (Shared memo categories format string vulnerability) - Add -Wdeclaration-after-statement to strict build settings. --- evolution.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 327c372..f6d1db1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.0 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -158,6 +158,9 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch # GNOME bug #418971 Patch47: evolution-2.10.0-drop-old-glib-support.patch +# CVE-2007-1002 +Patch48: evolution-2.10.0-CVE-2007-1002.patch + ## Dependencies ### Requires(post): GConf2 @@ -309,6 +312,7 @@ Development files needed for building things which link against evolution. %patch45 -p1 -b .shell-main-cleanups %patch46 -p1 -b .use-glib-i18n %patch47 -p1 -b .drop-old-glib-support +%patch48 -p1 -b .CVE-2007-1002 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -383,6 +387,7 @@ CFLAGS="$CFLAGS \ -DGDK_DISABLE_DEPRECATED=1 \ -DEDS_DISABLE_DEPRECATED=1 \ -DCAMEL_DISABLE_DEPRECATED=1 \ + -Wdeclaration-after-statement \ -Werror-implicit-function-declaration" %endif @@ -724,6 +729,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Mar 29 2007 Matthew Barnes - 2.10.0-5.fc7 +- CVE-2007-1002 (Shared memo categories format string vulnerability) +- Add -Wdeclaration-after-statement to strict build settings. + * Mon Mar 26 2007 Matthew Barnes - 2.10.0-4.fc7 - Run gtk-update-icon-cache in %post and %postun (RH bug #234018). From 1b9cf366ef6d2f524e114fe0857b1766a6d4506d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 31 Mar 2007 00:50:38 +0000 Subject: [PATCH 115/844] - Revise patch for GNOME bug #362638 (deprecate EThread). --- evolution-2.8.1-kill-ethread.patch | 828 ++++++++++++++++++++++++----- evolution.spec | 5 +- 2 files changed, 711 insertions(+), 122 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 1a02390..1d49a68 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,5 +1,5 @@ ---- evolution-2.9.91/mail/mail-send-recv.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-send-recv.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/mail-send-recv.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-send-recv.c 2007-03-30 15:47:31.000000000 -0400 @@ -819,7 +819,7 @@ m->folders = folders; m->info = sinfo; @@ -9,8 +9,8 @@ } else { receive_done ("", data); } ---- evolution-2.9.91/mail/mail-component.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-component.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/mail-component.c.kill-ethread 2007-03-12 16:13:58.000000000 -0400 ++++ evolution-2.10.0/mail/mail-component.c 2007-03-30 15:47:31.000000000 -0400 @@ -965,7 +965,7 @@ if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -20,8 +20,8 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.9.91/mail/mail-ops.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-ops.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/mail-ops.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-ops.c 2007-03-30 15:47:31.000000000 -0400 @@ -221,7 +221,7 @@ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } @@ -247,8 +247,8 @@ return id; } ---- evolution-2.9.91/mail/em-folder-utils.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-utils.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/em-folder-utils.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-folder-utils.c 2007-03-30 15:47:31.000000000 -0400 @@ -260,7 +260,7 @@ m->delete = delete; seq = m->msg.seq; @@ -267,8 +267,8 @@ return id; } ---- evolution-2.9.91/mail/importers/elm-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 -+++ evolution-2.9.91/mail/importers/elm-importer.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/importers/elm-importer.c.kill-ethread 2007-01-03 10:34:11.000000000 -0500 ++++ evolution-2.10.0/mail/importers/elm-importer.c 2007-03-30 15:47:31.000000000 -0400 @@ -312,7 +312,7 @@ id = m->msg.seq; @@ -278,8 +278,8 @@ return id; } ---- evolution-2.9.91/mail/importers/mail-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 -+++ evolution-2.9.91/mail/importers/mail-importer.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/importers/mail-importer.c.kill-ethread 2007-01-03 10:34:11.000000000 -0500 ++++ evolution-2.10.0/mail/importers/mail-importer.c 2007-03-30 15:47:31.000000000 -0400 @@ -329,7 +329,7 @@ } @@ -289,8 +289,8 @@ return id; } ---- evolution-2.9.91/mail/importers/pine-importer.c.kill-ethread 2007-01-03 10:27:16.000000000 -0500 -+++ evolution-2.9.91/mail/importers/pine-importer.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/importers/pine-importer.c.kill-ethread 2007-01-03 10:34:11.000000000 -0500 ++++ evolution-2.10.0/mail/importers/pine-importer.c 2007-03-30 15:47:31.000000000 -0400 @@ -350,7 +350,7 @@ id = m->msg.seq; @@ -300,8 +300,8 @@ return id; } ---- evolution-2.9.91/mail/mail-vfolder.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-vfolder.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/mail-vfolder.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-vfolder.c 2007-03-30 15:47:31.000000000 -0400 @@ -188,7 +188,7 @@ m->sources_folder = sources_folder; @@ -347,9 +347,9 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.9.91/mail/em-format-html.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-format-html.c 2007-02-15 16:04:42.000000000 -0500 -@@ -1374,7 +1374,7 @@ +--- evolution-2.10.0/mail/em-format-html.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 ++++ evolution-2.10.0/mail/em-format-html.c 2007-03-30 15:47:31.000000000 -0400 +@@ -1375,7 +1375,7 @@ } efh->priv->format_id = m->msg.seq; @@ -358,8 +358,8 @@ } efh->priv->format_timeout_id = 0; ---- evolution-2.9.91/mail/em-folder-properties.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-properties.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/em-folder-properties.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-folder-properties.c 2007-03-30 15:47:31.000000000 -0400 @@ -379,7 +379,7 @@ } @@ -369,8 +369,8 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.9.91/mail/em-folder-tree.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-tree.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/em-folder-tree.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-folder-tree.c 2007-03-30 15:47:31.000000000 -0400 @@ -966,7 +966,7 @@ tree_drag_data_action(struct _DragDataReceivedAsync *m) { @@ -389,8 +389,8 @@ } static gboolean ---- evolution-2.9.91/mail/em-folder-browser.c.kill-ethread 2007-02-12 05:37:31.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-browser.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/em-folder-browser.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 ++++ evolution-2.10.0/mail/em-folder-browser.c 2007-03-30 15:47:31.000000000 -0400 @@ -948,7 +948,7 @@ m->sources_folder = sources_folder; @@ -400,8 +400,8 @@ return id; } ---- evolution-2.9.91/mail/message-list.c.kill-ethread 2007-01-18 07:31:51.000000000 -0500 -+++ evolution-2.9.91/mail/message-list.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/message-list.c.kill-ethread 2007-01-23 03:23:43.000000000 -0500 ++++ evolution-2.10.0/mail/message-list.c 2007-03-30 15:47:31.000000000 -0400 @@ -1888,7 +1888,7 @@ ml_drop_action(struct _drop_msg *m) { @@ -420,8 +420,86 @@ m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; ---- evolution-2.9.91/mail/em-format-html-print.c.kill-ethread 2007-02-12 01:58:01.000000000 -0500 -+++ evolution-2.9.91/mail/em-format-html-print.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/em-sync-stream.h.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-sync-stream.h 2007-03-30 15:47:31.000000000 -0400 +@@ -29,41 +29,45 @@ + #ifndef EM_SYNC_STREAM_H + #define EM_SYNC_STREAM_H + +-#ifdef __cplusplus +-extern "C" { +-#pragma } +-#endif /* __cplusplus */ +- +-#define EM_SYNC_STREAM_TYPE (em_sync_stream_get_type ()) +-#define EM_SYNC_STREAM(obj) (CAMEL_CHECK_CAST((obj), EM_SYNC_STREAM_TYPE, EMSyncStream)) +-#define EM_SYNC_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_SYNC_STREAM_TYPE, EMSyncStreamClass)) +-#define EM_IS_SYNC_STREAM(o) (CAMEL_CHECK_TYPE((o), EM_SYNC_STREAM_TYPE)) +- + #include + #include + +-typedef struct _EMSyncStream { +- CamelStream parent_stream; +- +- struct _EMSyncStreamPrivate *priv; ++#define EM_SYNC_STREAM_TYPE \ ++ (em_sync_stream_get_type ()) ++#define EM_SYNC_STREAM(obj) \ ++ (CAMEL_CHECK_CAST \ ++ ((obj), EM_SYNC_STREAM_TYPE, EMSyncStream)) ++#define EM_SYNC_STREAM_CLASS(cls) \ ++ (CAMEL_CHECK_CLASS_CAST \ ++ ((cls), EM_SYNC_STREAM_TYPE, EMSyncStreamClass)) ++#define EM_IS_SYNC_STREAM(obj) \ ++ (CAMEL_CHECK_TYPE ((obj), EM_SYNC_STREAM_TYPE)) ++ ++G_BEGIN_DECLS ++ ++typedef struct _EMSyncStream EMSyncStream; ++typedef struct _EMSyncStreamClass EMSyncStreamClass; ++ ++struct _EMSyncStream { ++ CamelStream parent; ++ GString *buffer; ++ gboolean cancel; ++}; + +- int cancel; +-} EMSyncStream; +- +-typedef struct { ++struct _EMSyncStreamClass { + CamelStreamClass parent_class; + +- ssize_t (*sync_write) (CamelStream *stream, const char *buffer, size_t n); +- int (*sync_close) (CamelStream *stream); +- int (*sync_flush) (CamelStream *stream); +- +-} EMSyncStreamClass; +- +-CamelType em_sync_stream_get_type (void); +-void em_sync_stream_set_buffer_size(EMSyncStream *, size_t size); +- +-#ifdef __cplusplus +-} +-#endif /* __cplusplus */ ++ gssize (*sync_write) (CamelStream *stream, ++ const gchar *string, ++ gsize len); ++ int (*sync_close) (CamelStream *stream); ++ int (*sync_flush) (CamelStream *stream); ++}; ++ ++CamelType em_sync_stream_get_type (void); ++void em_sync_stream_set_buffer_size (EMSyncStream *stream, ++ gsize size); ++ ++G_END_DECLS + + #endif /* EM_SYNC_STREAM_H */ +--- evolution-2.10.0/mail/em-format-html-print.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 ++++ evolution-2.10.0/mail/em-format-html-print.c 2007-03-30 15:47:31.000000000 -0400 @@ -262,7 +262,7 @@ g_object_ref(source); g_object_ref(efhp); @@ -431,37 +509,435 @@ return 0; /* damn async ... */ } ---- evolution-2.9.91/mail/em-sync-stream.c.kill-ethread 2007-02-09 15:16:33.000000000 -0500 -+++ evolution-2.9.91/mail/em-sync-stream.c 2007-02-15 16:04:42.000000000 -0500 -@@ -268,7 +268,7 @@ +--- evolution-2.10.0/mail/em-sync-stream.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 ++++ evolution-2.10.0/mail/em-sync-stream.c 2007-03-30 15:47:31.000000000 -0400 +@@ -25,42 +25,17 @@ + #include + #endif + +-#include ++#include "em-sync-stream.h" ++ + #include +-#include ++#include + #include +-#include +-#include "em-sync-stream.h" ++#include + + #include "mail-mt.h" + +-#define LOG_STREAM +- +-#define d(x) +- + #define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass)) + +-struct _EMSyncStreamPrivate { +- /* FIXME: use a single data port/gui channel for all instances */ +- /* TODO: possibly just use one of the mail-mt ports ... */ +- struct _EMsgPort *data_port, *reply_port; +- struct _GIOChannel *gui_channel; +- guint gui_watch; +- +- char *buf_data; +- int buf_used; +- int buf_size; +- +-#ifdef LOG_STREAM +- FILE *logfd; +-#endif +-}; +- +-#ifdef LOG_STREAM +-int dolog; +-#endif +- +-/* Should probably expose messages to outside world ... so subclasses can extend */ + enum _write_msg_t { + EMSS_WRITE, + EMSS_FLUSH, +@@ -68,275 +43,168 @@ + }; + + struct _write_msg { +- EMsg msg; ++ EMSyncStream *emss; ++ EFlag *processed; + + enum _write_msg_t op; + +- const char *data; +- size_t n; ++ const gchar *string; ++ gsize len; + }; + +-static void em_sync_stream_class_init (EMSyncStreamClass *klass); +-static void em_sync_stream_init (CamelObject *object); +-static void em_sync_stream_finalize (CamelObject *object); +- +-static ssize_t stream_write(CamelStream *stream, const char *buffer, size_t n); +-static int stream_close(CamelStream *stream); +-static int stream_flush(CamelStream *stream); +- + static CamelStreamClass *parent_class = NULL; + +-CamelType +-em_sync_stream_get_type (void) +-{ +- static CamelType type = CAMEL_INVALID_TYPE; +- +- if (type == CAMEL_INVALID_TYPE) { +-#ifdef LOG_STREAM +- dolog = getenv("EVOLUTION_MAIL_LOG_HTML") != NULL; +-#endif +- type = camel_type_register (CAMEL_STREAM_TYPE, +- "EMSyncStream", +- sizeof (EMSyncStream), +- sizeof (EMSyncStreamClass), +- (CamelObjectClassInitFunc) em_sync_stream_class_init, +- NULL, +- (CamelObjectInitFunc) em_sync_stream_init, +- (CamelObjectFinalizeFunc) em_sync_stream_finalize); +- } +- +- return type; +-} +- +-static void +-em_sync_stream_class_init (EMSyncStreamClass *klass) +-{ +- CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (klass); +- +- parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; +- +- /* virtual method overload */ +- stream_class->write = stream_write; +- stream_class->flush = stream_flush; +- stream_class->close = stream_close; +-} +- + static gboolean +-emcs_gui_received(GIOChannel *source, GIOCondition cond, void *data) ++emss_process_message (struct _write_msg *msg) + { +- EMSyncStream *emss = data; +- struct _EMSyncStreamPrivate *p = emss->priv; +- struct _write_msg *msg; +- +- d(printf("%p: gui sync op job waiting\n", emss)); +- +- msg = (struct _write_msg *)e_msgport_get(p->data_port); +- /* Should never happen ... */ +- if (msg == NULL) +- return TRUE; +- +- d(printf("%p: running sync op %d\n", emss, msg->op)); +- +- /* force out any pending data before doing anything else */ +- if (p->buf_used > 0) { +- EMSS_CLASS(emss)->sync_write((CamelStream *)emss, p->buf_data, p->buf_used); +-#ifdef LOG_STREAM +- if (p->logfd) +- fwrite(p->buf_data, 1, p->buf_used, p->logfd); +-#endif +- p->buf_used = 0; +- } ++ struct _EMSyncStream *emss = msg->emss; + +- /* FIXME: need to handle return values */ ++ /* Force out any pending data before doing anything else. */ ++ if (emss->buffer != NULL && emss->buffer->len > 0) { ++ EMSS_CLASS (emss)->sync_write ( ++ CAMEL_STREAM (emss), emss->buffer->str, ++ emss->buffer->len); ++ g_string_set_size (emss->buffer, 0); ++ } + + switch (msg->op) { +- case EMSS_WRITE: +- EMSS_CLASS(emss)->sync_write((CamelStream *)emss, msg->data, msg->n); +-#ifdef LOG_STREAM +- if (p->logfd) +- fwrite(msg->data, 1, msg->n, p->logfd); +-#endif +- break; +- case EMSS_FLUSH: +- EMSS_CLASS(emss)->sync_flush((CamelStream *)emss); +- break; +- case EMSS_CLOSE: +- EMSS_CLASS(emss)->sync_close((CamelStream *)emss); +-#ifdef LOG_STREAM +- if (p->logfd) { +- fclose(p->logfd); +- p->logfd = NULL; +- } +-#endif +- break; ++ case EMSS_WRITE: ++ EMSS_CLASS (emss)->sync_write ( ++ CAMEL_STREAM (emss), msg->string, msg->len); ++ break; ++ case EMSS_FLUSH: ++ EMSS_CLASS (emss)->sync_flush ( ++ CAMEL_STREAM (emss)); ++ break; ++ case EMSS_CLOSE: ++ EMSS_CLASS (emss)->sync_close ( ++ CAMEL_STREAM (emss)); ++ break; + } +- +- e_msgport_reply((EMsg *)msg); +- d(printf("%p: gui sync op jobs done\n", emss)); +- +- return TRUE; +-} +- +-static void +-em_sync_stream_init (CamelObject *object) +-{ +- EMSyncStream *emss = (EMSyncStream *)object; +- struct _EMSyncStreamPrivate *p; +- +- p = emss->priv = g_malloc0(sizeof(*p)); + +- p->data_port = e_msgport_new(); +- p->reply_port = e_msgport_new(); ++ e_flag_set (msg->processed); + +-#ifndef G_OS_WIN32 +- p->gui_channel = g_io_channel_unix_new(e_msgport_fd(p->data_port)); +-#else +- p->gui_channel = g_io_channel_win32_new_socket(e_msgport_fd(p->data_port)); +-#endif +- p->gui_watch = g_io_add_watch(p->gui_channel, G_IO_IN, emcs_gui_received, emss); +- +-#ifdef LOG_STREAM +- if (dolog) { +- char name[32]; +- static int count; +- +- sprintf(name, "sync-stream.%d.html", count++); +- printf("Saving raw data stream to '%s'\n", name); +- p->logfd = fopen(name, "w"); +- } +-#endif +- +- d(printf("%p: new emss\n", emss)); ++ return FALSE; + } + + static void +-sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) ++emss_sync_op (EMSyncStream *emss, enum _write_msg_t op, ++ const gchar *string, gsize len) + { +- struct _EMSyncStreamPrivate *p = emss->priv; + struct _write_msg msg; +- EMsg *reply_msg; +- +- d(printf("%p: launching sync op %d\n", emss, op)); + +- /* we do everything synchronous, we should never have any locks, and +- this prevents overflow from banked up data */ +- +- msg.msg.reply_port = p->reply_port; ++ msg.processed = e_flag_new (); ++ msg.emss = emss; + msg.op = op; +- msg.data = data; +- msg.n = n; +- +- e_msgport_put(p->data_port, &msg.msg); +- reply_msg = e_msgport_wait(p->reply_port); +- g_assert(reply_msg == &msg.msg); +- +- d(printf("%p: returned sync op %d\n", emss, op)); +-} +- +-static void +-em_sync_stream_finalize (CamelObject *object) +-{ +- EMSyncStream *emss = (EMSyncStream *)object; +- struct _EMSyncStreamPrivate *p = emss->priv; +- +- /* TODO: is this stuff safe to do in another thread? */ +- g_source_remove(p->gui_watch); +- g_io_channel_unref(p->gui_channel); ++ msg.string = string; ++ msg.len = len; + +- e_msgport_destroy(p->data_port); +- e_msgport_destroy(p->reply_port); ++ camel_object_ref (emss); + +- p->data_port = NULL; +- p->reply_port = NULL; ++ g_idle_add ((GSourceFunc) emss_process_message, &msg); + +- g_free(p->buf_data); ++ e_flag_wait (msg.processed); ++ e_flag_free (msg.processed); + +-#ifdef LOG_STREAM +- if (p->logfd) +- fclose(p->logfd); +-#endif +- +- g_free(p); ++ camel_object_unref (emss); + } + +-static ssize_t +-stream_write (CamelStream *stream, const char *buffer, size_t n) ++static gssize ++emss_stream_write (CamelStream *stream, const gchar *string, gsize len) + { + EMSyncStream *emss = EM_SYNC_STREAM (stream); +- struct _EMSyncStreamPrivate *p = emss->priv; + if (emss->cancel) return -1; - if (pthread_equal(pthread_self(), mail_gui_thread)) { +- EMSS_CLASS(emss)->sync_write(stream, buffer, n); +-#ifdef LOG_STREAM +- if (p->logfd) +- fwrite(buffer, 1, n, p->logfd); +-#endif +- } else if (p->buf_size > 0) { +- size_t left = p->buf_size-p->buf_used; +- +- if (n >= left) { +- sync_op(emss, EMSS_WRITE, buffer, n); +- } else { +- memcpy(p->buf_data + p->buf_used, buffer, n); +- p->buf_used += n; +- } + if (mail_in_main_thread ()) { - EMSS_CLASS(emss)->sync_write(stream, buffer, n); - #ifdef LOG_STREAM - if (p->logfd) -@@ -298,7 +298,7 @@ ++ EMSS_CLASS (emss)->sync_write (stream, string, len); ++ } else if (emss->buffer != NULL) { ++ if (len < (emss->buffer->allocated_len - emss->buffer->len)) ++ g_string_append_len (emss->buffer, string, len); ++ else ++ emss_sync_op (emss, EMSS_WRITE, string, len); + } else { +- sync_op(emss, EMSS_WRITE, buffer, n); ++ emss_sync_op(emss, EMSS_WRITE, string, len); + } + +- return (ssize_t) n; ++ return (gssize) len; + } + + static int +-stream_flush(CamelStream *stream) ++emss_stream_flush (CamelStream *stream) + { +- EMSyncStream *emss = (EMSyncStream *)stream; ++ EMSyncStream *emss = EM_SYNC_STREAM (stream); + if (emss->cancel) return -1; - if (pthread_equal(pthread_self(), mail_gui_thread)) +- return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); + if (mail_in_main_thread ()) - return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); ++ return EMSS_CLASS (emss)->sync_flush (stream); else - sync_op(emss, EMSS_FLUSH, NULL, 0); -@@ -316,7 +316,7 @@ +- sync_op(emss, EMSS_FLUSH, NULL, 0); ++ emss_sync_op (emss, EMSS_FLUSH, NULL, 0); - d(printf("%p: closing stream\n", stream)); + return 0; + } + static int +-stream_close(CamelStream *stream) ++emss_stream_close (CamelStream *stream) + { +- EMSyncStream *emss = (EMSyncStream *)stream; ++ EMSyncStream *emss = EM_SYNC_STREAM (stream); + + if (emss->cancel) + return -1; + +- d(printf("%p: closing stream\n", stream)); +- - if (pthread_equal(pthread_self(), mail_gui_thread)) { -+ if (mail_in_main_thread ()) { - #ifdef LOG_STREAM - if (emss->priv->logfd) { - fclose(emss->priv->logfd); ---- evolution-2.9.91/mail/em-subscribe-editor.c.kill-ethread 2007-01-08 11:35:48.000000000 -0500 -+++ evolution-2.9.91/mail/em-subscribe-editor.c 2007-02-15 16:04:42.000000000 -0500 +-#ifdef LOG_STREAM +- if (emss->priv->logfd) { +- fclose(emss->priv->logfd); +- emss->priv->logfd = NULL; +- } +-#endif +- return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_close(stream); +- } else +- sync_op(emss, EMSS_CLOSE, NULL, 0); ++ if (mail_in_main_thread ()) ++ return EMSS_CLASS (emss)->sync_close (stream); ++ else ++ emss_sync_op (emss, EMSS_CLOSE, NULL, 0); + + return 0; + } + +-void +-em_sync_stream_set_buffer_size(EMSyncStream *emss, size_t size) ++static void ++em_sync_stream_class_init (EMSyncStreamClass *class) ++{ ++ CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (class); ++ ++ parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; ++ ++ stream_class->write = emss_stream_write; ++ stream_class->flush = emss_stream_flush; ++ stream_class->close = emss_stream_close; ++} ++ ++static void ++em_sync_stream_finalize (EMSyncStream *emss) ++{ ++ if (emss->buffer != NULL) ++ g_string_free (emss->buffer, TRUE); ++} ++ ++CamelType ++em_sync_stream_get_type (void) + { +- struct _EMSyncStreamPrivate *p = emss->priv; ++ static CamelType type = CAMEL_INVALID_TYPE; ++ ++ if (G_UNLIKELY (type == CAMEL_INVALID_TYPE)) ++ type = camel_type_register ( ++ CAMEL_STREAM_TYPE, ++ "EMSyncStream", ++ sizeof (EMSyncStream), ++ sizeof (EMSyncStreamClass), ++ (CamelObjectClassInitFunc) em_sync_stream_class_init, ++ NULL, ++ (CamelObjectInitFunc) NULL, ++ (CamelObjectFinalizeFunc) em_sync_stream_finalize); + +- g_free(p->buf_data); +- p->buf_data = g_malloc(size); +- p->buf_size = size; +- p->buf_used = 0; ++ return type; ++} ++ ++void ++em_sync_stream_set_buffer_size (EMSyncStream *emss, gsize size) ++{ ++ if (emss->buffer != NULL) ++ g_string_free (emss->buffer, TRUE); ++ emss->buffer = g_string_sized_new (size); + } +--- evolution-2.10.0/mail/em-subscribe-editor.c.kill-ethread 2007-01-08 11:54:43.000000000 -0500 ++++ evolution-2.10.0/mail/em-subscribe-editor.c 2007-03-30 15:47:31.000000000 -0400 @@ -229,7 +229,7 @@ next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); if (next) { @@ -489,25 +965,38 @@ return id; } ---- evolution-2.9.91/mail/mail-mt.h.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-mt.h 2007-02-15 16:04:42.000000000 -0500 -@@ -33,6 +33,7 @@ - EMsg msg; /* parent type */ +--- evolution-2.10.0/mail/mail-mt.h.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-mt.h 2007-03-30 15:47:31.000000000 -0400 +@@ -25,14 +25,15 @@ + + #include + #include "camel/camel-exception.h" +-#include "libedataserver/e-msgport.h" ++#include "libedataserver/e-flag.h" + #include "camel/camel-object.h" + #include "camel/camel-operation.h" + + typedef struct _mail_msg { +- EMsg msg; /* parent type */ ++ EFlag *processed; /* optional */ struct _mail_msg_op *ops; /* operation functions */ unsigned int seq; /* seq number for synchronisation */ + gint priority; /* priority (default = 0) */ CamelOperation *cancel; /* a cancellation/status handle */ CamelException ex; /* an initialised camel exception, upto the caller to use this */ struct _mail_msg_priv *priv; /* private for internal use */ -@@ -51,6 +52,8 @@ +@@ -51,8 +52,10 @@ void mail_msg_init(void); void mail_msg_cleanup (void); +gboolean mail_in_main_thread (void); + /* allocate a new message */ - void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size); +-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size); ++void *mail_msg_new(mail_msg_op_t *ops, EFlag *processed, size_t size); void mail_msg_free(void *msg); + void mail_msg_check_error(void *msg); + void mail_msg_cancel(unsigned int msgid); @@ -60,6 +63,14 @@ void mail_msg_wait_all(void); int mail_msg_active(unsigned int msgid); @@ -548,9 +1037,9 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.9.91/mail/mail-ops.h.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-ops.h 2007-02-15 16:04:42.000000000 -0500 -@@ -30,6 +30,8 @@ +--- evolution-2.10.0/mail/mail-ops.h.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-ops.h 2007-03-30 15:47:31.000000000 -0400 +@@ -30,13 +30,14 @@ #pragma } #endif /* __cplusplus */ @@ -559,7 +1048,14 @@ #include "camel/camel-store.h" #include "camel/camel-folder.h" #include "camel/camel-filter-driver.h" -@@ -55,12 +57,12 @@ + #include "camel/camel-mime-message.h" + #include "camel/camel-operation.h" + +-#include "libedataserver/e-msgport.h" + #include "libedataserver/e-account.h" + + void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, +@@ -55,12 +56,12 @@ void mail_get_message (CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), void *data, @@ -574,7 +1070,7 @@ /* get several messages */ void mail_get_messages (CamelFolder *folder, GPtrArray *uids, -@@ -70,7 +72,7 @@ +@@ -70,7 +71,7 @@ /* same for a folder */ int mail_get_folder (const char *uri, guint32 flags, void (*done) (char *uri, CamelFolder *folder, void *data), void *data, @@ -583,8 +1079,8 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.9.91/mail/em-composer-utils.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-composer-utils.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/em-composer-utils.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/em-composer-utils.c 2007-03-30 15:47:31.000000000 -0400 @@ -534,7 +534,7 @@ strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -628,8 +1124,8 @@ - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.9.91/mail/mail-folder-cache.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-folder-cache.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/mail/mail-folder-cache.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-folder-cache.c 2007-03-30 15:47:31.000000000 -0400 @@ -907,7 +907,7 @@ m->store = store; camel_object_ref (store); @@ -648,9 +1144,17 @@ LOCK(info_lock); ---- evolution-2.9.91/mail/em-folder-view.c.kill-ethread 2007-02-12 01:58:01.000000000 -0500 -+++ evolution-2.9.91/mail/em-folder-view.c 2007-02-15 16:04:42.000000000 -0500 -@@ -693,7 +693,7 @@ +--- evolution-2.10.0/mail/em-folder-view.c.kill-ethread 2007-03-01 01:06:14.000000000 -0500 ++++ evolution-2.10.0/mail/em-folder-view.c 2007-03-30 15:47:31.000000000 -0400 +@@ -68,6 +68,7 @@ + #include + + #include ++#include + + #include "menus/gal-view-etable.h" + #include "menus/gal-view-factory-etable.h" +@@ -693,7 +694,7 @@ static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) { @@ -659,7 +1163,7 @@ } static void -@@ -1611,7 +1611,7 @@ +@@ -1613,7 +1614,7 @@ data->type = type; data->source = source; @@ -668,7 +1172,7 @@ } static void -@@ -1709,7 +1709,7 @@ +@@ -1711,7 +1712,7 @@ data->type = type; data->uri = g_strdup (uri); @@ -677,7 +1181,7 @@ } static void -@@ -2369,7 +2369,7 @@ +@@ -2370,7 +2371,7 @@ g_object_ref (emfv); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ e_profile_event_emit("goto.load", emfv->displayed_uid, 0); @@ -686,18 +1190,51 @@ } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.9.91/mail/mail-session.c.kill-ethread 2007-02-15 16:04:42.000000000 -0500 -+++ evolution-2.9.91/mail/mail-session.c 2007-02-15 16:04:42.000000000 -0500 -@@ -374,7 +374,7 @@ +--- evolution-2.10.0/mail/mail-session.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 ++++ evolution-2.10.0/mail/mail-session.c 2007-03-30 15:47:31.000000000 -0400 +@@ -35,7 +35,7 @@ + #include + + #include +-#include ++#include + + #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ + #include +@@ -283,7 +283,7 @@ + /* if !allow_cancel, then we've already replied */ + if (m->allow_cancel) { + m->result = button == GTK_RESPONSE_OK; +- e_msgport_reply((EMsg *)m); ++ e_flag_set (m->msg.processed); + } + + /* check for pendings */ +@@ -364,17 +364,18 @@ + alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) + { + MailSession *mail_session = MAIL_SESSION (session); +- struct _user_message_msg *m, *r; +- EMsgPort *user_message_reply = NULL; ++ struct _user_message_msg *m; ++ EFlag *processed = NULL; + gboolean ret; + + if (!mail_session->interactive) + return FALSE; + if (cancel) - user_message_reply = e_msgport_new (); - m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); +- user_message_reply = e_msgport_new (); +- m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); - m->ismain = pthread_equal(pthread_self(), mail_gui_thread); ++ processed = e_flag_new (); ++ ++ m = mail_msg_new (&user_message_op, processed, sizeof (*m)); + m->ismain = mail_in_main_thread(); m->type = type; m->prompt = g_strdup(prompt); m->allow_cancel = cancel; -@@ -382,9 +382,7 @@ +@@ -382,18 +383,14 @@ if (m->ismain) do_user_message((struct _mail_msg *)m); else { @@ -708,9 +1245,37 @@ } if (cancel) { ---- evolution-2.9.91/mail/mail-mt.c.kill-ethread 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/mail-mt.c 2007-02-15 16:28:12.000000000 -0500 -@@ -82,12 +82,8 @@ +- r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); +- g_assert(m == r); +- ++ e_flag_wait (processed); + ret = m->result; + mail_msg_free(m); +- e_msgport_destroy(user_message_reply); ++ e_flag_free (processed); + } else + ret = TRUE; + +@@ -686,7 +683,7 @@ + /* flush/cancel pending user messages */ + while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { + d(printf ("Flusing message request: %s\n", um->prompt)); +- e_msgport_reply((EMsg *) um); ++ e_flag_set (um->msg.processed); + } + + /* and the current */ +--- evolution-2.10.0/mail/mail-mt.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 ++++ evolution-2.10.0/mail/mail-mt.c 2007-03-30 15:47:31.000000000 -0400 +@@ -29,7 +29,6 @@ + #include + #include + +-#include + #include + + #include +@@ -82,13 +81,9 @@ static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; @@ -720,10 +1285,12 @@ -static void mail_msg_destroy(EThread *e, EMsg *msg, void *data); - - void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size) +-void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size) ++void *mail_msg_new(mail_msg_op_t *ops, EFlag *processed, size_t size) { struct _mail_msg *msg; -@@ -112,7 +108,6 @@ + +@@ -112,7 +107,6 @@ fprintf(log, "Logging async operations\n"); if (log_locks) { @@ -731,7 +1298,18 @@ fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -308,9 +303,8 @@ +@@ -123,9 +117,9 @@ + } + #endif + msg = g_malloc0(size); ++ msg->processed = processed; /* owned by caller */ + msg->ops = ops; + msg->seq = mail_msg_seq++; +- msg->msg.reply_port = reply_port; + msg->cancel = camel_operation_new(mail_operation_status, GINT_TO_POINTER(msg->seq)); + camel_exception_init(&msg->ex); + msg->priv = g_malloc0(sizeof(*msg->priv)); +@@ -308,9 +302,8 @@ void mail_msg_wait(unsigned int msgid) { struct _mail_msg *m; @@ -742,7 +1320,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +341,7 @@ +@@ -347,9 +340,7 @@ void mail_msg_wait_all(void) { @@ -753,7 +1331,7 @@ MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -420,241 +412,193 @@ +@@ -420,241 +411,193 @@ MAIL_MT_UNLOCK(mail_msg_lock); } @@ -829,11 +1407,11 @@ + /* check the main loop queue */ + while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { + -+ /* If the message has a reply_port, it must also have a -+ * receive_msg() callback. The receive_msg() callback is -+ * responsible for issuing the reply, and the recipient of -+ * the reply is responsible for freeing the message. */ -+ if (msg->msg.reply_port != NULL) { ++ /* If the message has a "processed" EFlag, it must also have ++ * a receive_msg() callback. The receive_msg() callback is ++ * responsible for setting the EFlag, and thread blocked on ++ * the EFlag is reponsible for freeing it. */ ++ if (msg->processed != NULL) { + g_assert (msg->ops->receive_msg != NULL); + msg->ops->receive_msg (msg); + } else { @@ -1131,7 +1709,7 @@ } /* ********************************************************************** */ -@@ -723,7 +667,6 @@ +@@ -723,7 +666,6 @@ { struct _proxy_msg *m; int id; @@ -1139,7 +1717,7 @@ /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); -@@ -743,12 +686,12 @@ +@@ -743,12 +685,12 @@ /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -1155,41 +1733,49 @@ return id; } -@@ -842,6 +785,9 @@ +@@ -842,6 +784,9 @@ m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } + -+ if (mm->msg.reply_port != NULL) -+ e_msgport_reply ((EMsg *) mm); ++ if (mm->processed != NULL) ++ e_flag_set (mm->processed); } static struct _mail_msg_op mail_call_op = { -@@ -857,11 +803,10 @@ +@@ -856,23 +801,22 @@ + struct _call_msg *m; void *ret; va_list ap; - EMsgPort *reply = NULL; +- EMsgPort *reply = NULL; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); ++ EFlag *processed = NULL; va_start(ap, func); - if (!ismain) +- reply = e_msgport_new(); + if (!mail_in_main_thread ()) - reply = e_msgport_new(); ++ processed = e_flag_new (); - m = mail_msg_new(&mail_call_op, reply, sizeof(*m)); -@@ -869,8 +814,8 @@ +- m = mail_msg_new(&mail_call_op, reply, sizeof(*m)); ++ m = mail_msg_new(&mail_call_op, processed, sizeof(*m)); + m->type = type; m->func = func; G_VA_COPY(m->ap, ap); - if (!ismain) { - e_msgport_put(mail_gui_port, (EMsg *)m); -+ if (reply != NULL) { +- e_msgport_wait(reply); +- e_msgport_destroy(reply); ++ if (processed != NULL) { + mail_msg_main_loop_push((mail_msg_t *) m); - e_msgport_wait(reply); - e_msgport_destroy(reply); ++ e_flag_wait (processed); ++ e_flag_free (processed); } else { -@@ -909,7 +854,7 @@ + do_call(&m->msg); + } +@@ -909,7 +853,7 @@ busy_state++; if (busy_state == 1) { m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); @@ -1198,7 +1784,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -922,7 +867,7 @@ +@@ -922,7 +866,7 @@ busy_state--; if (busy_state == 0) { m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); @@ -1207,7 +1793,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -947,7 +892,7 @@ +@@ -947,7 +891,7 @@ char *out, *p, *o, c; int pc; @@ -1216,7 +1802,7 @@ MAIL_MT_LOCK (mail_msg_lock); -@@ -1055,7 +1000,7 @@ +@@ -1055,7 +999,7 @@ } m->pc = pc; m->data = data; @@ -1225,8 +1811,8 @@ } /* ******************** */ ---- evolution-2.9.91/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-01-03 10:27:06.000000000 -0500 -+++ evolution-2.9.91/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-01-03 10:34:02.000000000 -0500 ++++ evolution-2.10.0/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-03-30 15:47:31.000000000 -0400 @@ -108,5 +108,5 @@ unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); unsub->uri = g_strdup (target->uri); @@ -1234,8 +1820,8 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push ((mail_msg_t *) unsub); } ---- evolution-2.9.91/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-01-03 10:27:08.000000000 -0500 -+++ evolution-2.9.91/plugins/mark-all-read/mark-all-read.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-01-03 10:34:03.000000000 -0500 ++++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c 2007-03-30 15:47:31.000000000 -0400 @@ -44,7 +44,7 @@ return; } @@ -1245,8 +1831,8 @@ } static void ---- evolution-2.9.91/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-01-03 10:27:08.000000000 -0500 -+++ evolution-2.9.91/plugins/exchange-operations/exchange-folder.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-01-03 10:34:03.000000000 -0500 ++++ evolution-2.10.0/plugins/exchange-operations/exchange-folder.c 2007-03-30 15:47:31.000000000 -0400 @@ -134,7 +134,7 @@ inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -1256,8 +1842,8 @@ } ---- evolution-2.9.91/plugins/save-attachments/save-attachments.c.kill-ethread 2007-02-09 15:16:33.000000000 -0500 -+++ evolution-2.9.91/plugins/save-attachments/save-attachments.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/plugins/save-attachments/save-attachments.c.kill-ethread 2007-02-26 04:59:58.000000000 -0500 ++++ evolution-2.10.0/plugins/save-attachments/save-attachments.c 2007-03-30 15:47:31.000000000 -0400 @@ -407,5 +407,5 @@ camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -1265,8 +1851,8 @@ - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.9.91/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-01-03 10:27:09.000000000 -0500 -+++ evolution-2.9.91/plugins/mailing-list-actions/mailing-list-actions.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-01-03 10:34:04.000000000 -0500 ++++ evolution-2.10.0/plugins/mailing-list-actions/mailing-list-actions.c 2007-03-30 15:47:31.000000000 -0400 @@ -89,7 +89,7 @@ data->uri = strdup (sel->uri); @@ -1276,8 +1862,8 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.9.91/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-01-03 10:27:07.000000000 -0500 -+++ evolution-2.9.91/plugins/groupwise-features/share-folder-common.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-01-03 10:34:02.000000000 -0500 ++++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c 2007-03-30 15:47:31.000000000 -0400 @@ -239,7 +239,7 @@ m->done = done; g_free (namebuf); @@ -1287,8 +1873,8 @@ return id; } ---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-01-03 10:27:57.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.h 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-01-03 10:34:50.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.h 2007-03-30 15:47:31.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -1309,8 +1895,8 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-01-03 10:27:57.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-notify.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-01-03 10:34:50.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.c 2007-03-30 15:47:31.000000000 -0400 @@ -45,10 +45,6 @@ GMutex *mutex; }; @@ -1423,8 +2009,8 @@ } static void ---- evolution-2.9.91/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-01-03 10:27:57.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/alarm-notify/alarm-queue.c 2007-02-15 16:04:42.000000000 -0500 +--- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-01-03 10:34:50.000000000 -0500 ++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c 2007-03-30 15:47:31.000000000 -0400 @@ -115,9 +115,6 @@ static int tray_blink_state = FALSE; static AlarmNotify *an; diff --git a/evolution.spec b/evolution.spec index f6d1db1..a844016 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.0 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -729,6 +729,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Mar 30 2007 Matthew Barnes - 2.10.0-6.fc7 +- Revise patch for GNOME bug #362638 (deprecate EThread). + * Thu Mar 29 2007 Matthew Barnes - 2.10.0-5.fc7 - CVE-2007-1002 (Shared memo categories format string vulnerability) - Add -Wdeclaration-after-statement to strict build settings. From 429c3b7ab93c5de8ce6e9b523c1cd31254df6009 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 Apr 2007 18:28:09 +0000 Subject: [PATCH 116/844] - Add patch for RH bug #231767 (allow mail-notification to build). --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index a844016..e40d2f3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.0 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -161,6 +161,9 @@ Patch47: evolution-2.10.0-drop-old-glib-support.patch # CVE-2007-1002 Patch48: evolution-2.10.0-CVE-2007-1002.patch +# RH bug #231767 / GNOME bug #400241 +Patch49: evolution-2.10.0-let-mail-notification-build.patch + ## Dependencies ### Requires(post): GConf2 @@ -313,6 +316,7 @@ Development files needed for building things which link against evolution. %patch46 -p1 -b .use-glib-i18n %patch47 -p1 -b .drop-old-glib-support %patch48 -p1 -b .CVE-2007-1002 +%patch49 -p1 -b .let-mail-notification-build mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -729,6 +733,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Apr 02 2007 Matthew Barnes - 2.10.0-7.fc7 +- Add patch for RH bug #231767 (allow mail-notification to build). + * Fri Mar 30 2007 Matthew Barnes - 2.10.0-6.fc7 - Revise patch for GNOME bug #362638 (deprecate EThread). From 8d51b3e7c705600c15f8fa99b6472675025e39a3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 3 Apr 2007 19:51:14 +0000 Subject: [PATCH 117/844] - Revise patch for GNOME bug #419524 to fix RH bug #235082 (crash in initial account setup wizard). --- evolution-2.10.0-use-glib-i18n.patch | 603 ++++++++++++++------------- evolution.spec | 6 +- 2 files changed, 307 insertions(+), 302 deletions(-) diff --git a/evolution-2.10.0-use-glib-i18n.patch b/evolution-2.10.0-use-glib-i18n.patch index e14f818..191cb34 100644 --- a/evolution-2.10.0-use-glib-i18n.patch +++ b/evolution-2.10.0-use-glib-i18n.patch @@ -1,5 +1,5 @@ --- evolution-2.10.0/mail/message-tag-followup.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/message-tag-followup.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/message-tag-followup.c 2007-04-03 15:07:43.000000000 -0400 @@ -52,7 +52,7 @@ #include @@ -10,7 +10,7 @@ #include "e-util/e-icon-factory.h" #include "e-util/e-util-private.h" --- evolution-2.10.0/mail/em-popup.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-popup.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-popup.c 2007-04-03 15:07:43.000000000 -0400 @@ -41,7 +41,7 @@ #include #include @@ -20,8 +20,8 @@ #include "em-popup.h" #include "libedataserver/e-msgport.h" ---- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/em-composer-utils.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/em-composer-utils.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -32,7 +32,7 @@ #include "mail-mt.h" #include "mail-ops.h" --- evolution-2.10.0/mail/em-account-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-account-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-account-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -64,7 +64,7 @@ #include #include @@ -43,7 +43,7 @@ #include --- evolution-2.10.0/mail/mail-tools.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-tools.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/mail-tools.c 2007-04-03 15:07:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -54,7 +54,7 @@ #include #include --- evolution-2.10.0/mail/em-folder-selection-button.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-selection-button.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-selection-button.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include @@ -65,7 +65,7 @@ #include "mail-component.h" #include "em-folder-tree.h" --- evolution-2.10.0/mail/em-format-hook.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-format-hook.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-format-hook.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include @@ -76,7 +76,7 @@ /* class name -> klass map for EMFormat and subclasses */ --- evolution-2.10.0/mail/em-format-quote.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-format-quote.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-format-quote.c 2007-04-03 15:07:43.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -86,9 +86,9 @@ #include "em-stripsig-filter.h" #include "em-format-quote.h" ---- evolution-2.10.0/mail/em-utils.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/em-utils.c 2007-03-18 08:26:55.000000000 -0400 -@@ -59,7 +55,7 @@ +--- evolution-2.10.0/mail/em-utils.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/em-utils.c 2007-04-03 15:07:43.000000000 -0400 +@@ -59,7 +59,7 @@ #include #include #include @@ -98,7 +98,7 @@ #include "mail-component.h" #include "mail-mt.h" --- evolution-2.10.0/mail/em-filter-rule.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-filter-rule.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-filter-rule.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -108,8 +108,8 @@ #include "em-filter-rule.h" #include "em-filter-context.h" ---- evolution-2.10.0/mail/mail-component.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/mail-component.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/mail-component.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/mail-component.c 2007-04-03 15:07:43.000000000 -0400 @@ -78,7 +78,7 @@ #include
@@ -119,8 +119,8 @@ #include #include ---- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/importers/mail-importer.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/importers/mail-importer.c 2007-04-03 15:07:43.000000000 -0400 @@ -38,7 +38,7 @@ #include @@ -130,8 +130,8 @@ #include #include #include ---- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/mail-send-recv.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/mail-send-recv.c 2007-04-03 15:07:43.000000000 -0400 @@ -39,7 +39,7 @@ #include #include @@ -141,8 +141,8 @@ #include "e-util/e-gtk-utils.h" #include "libedataserver/e-account-list.h" ---- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/em-format-html.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/em-format-html.c 2007-04-03 15:07:43.000000000 -0400 @@ -51,7 +51,7 @@ #include #include @@ -153,7 +153,7 @@ #include #include --- evolution-2.10.0/mail/em-filter-folder-element.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-filter-folder-element.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-filter-folder-element.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -163,8 +163,8 @@ #include "em-filter-folder-element.h" #include "mail/em-folder-selection-button.h" ---- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/em-folder-tree.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-tree.c 2007-04-03 15:07:43.000000000 -0400 @@ -38,7 +38,7 @@ #include #include @@ -175,7 +175,7 @@ #include #include --- evolution-2.10.0/mail/em-filter-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-filter-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-filter-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #endif @@ -186,7 +186,7 @@ #include "e-util/e-util-private.h" --- evolution-2.10.0/mail/em-folder-tree-model.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-tree-model.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-tree-model.c 2007-04-03 15:07:43.000000000 -0400 @@ -39,7 +39,7 @@ #include @@ -196,8 +196,8 @@ #include ---- evolution-2.10.0/mail/message-list.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/message-list.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/message-list.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/message-list.c 2007-04-03 15:07:43.000000000 -0400 @@ -38,7 +38,7 @@ #include @@ -207,8 +207,8 @@ #include #include ---- evolution-2.10.0/mail/em-folder-properties.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/em-folder-properties.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/em-folder-properties.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-properties.c 2007-04-03 15:07:43.000000000 -0400 @@ -44,7 +44,7 @@ #include #include @@ -218,8 +218,8 @@ #include "em-folder-properties.h" #include "em-config.h" ---- evolution-2.10.0/mail/mail-ops.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/mail-ops.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/mail-ops.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/mail-ops.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include @@ -230,7 +230,7 @@ #include #include --- evolution-2.10.0/mail/em-migrate.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-migrate.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-migrate.c 2007-04-03 15:08:31.000000000 -0400 @@ -54,7 +54,7 @@ #include #include @@ -240,7 +240,7 @@ #include #include -@@ -2645,38 +2645,33 @@ +@@ -2645,38 +2645,34 @@ { GDir *dir; const char *d; @@ -282,10 +282,11 @@ + while (*language_names != NULL) { + local = g_build_filename ( + EVOLUTION_PRIVDATADIR, "default", -+ *language_names++, "mail", "local", NULL); ++ *language_names, "mail", "local", NULL); + if (g_file_test (local, G_FILE_TEST_EXISTS)) + break; + g_free (local); ++ language_names++; + } + + /* Make sure we found one. */ @@ -293,8 +294,8 @@ dir = g_dir_open(local, 0, NULL); if (dir) { ---- evolution-2.10.0/mail/mail-vfolder.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/mail-vfolder.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/mail-vfolder.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/mail-vfolder.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -305,7 +306,7 @@ #include #include --- evolution-2.10.0/mail/em-folder-selector.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-selector.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-selector.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -315,8 +316,8 @@ #include #include ---- evolution-2.10.0/mail/em-subscribe-editor.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/em-subscribe-editor.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/em-subscribe-editor.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/em-subscribe-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -44,7 +44,7 @@ #include "mail-config.h" @@ -327,7 +328,7 @@ #include #include --- evolution-2.10.0/mail/mail-autofilter.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-autofilter.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/mail-autofilter.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include @@ -338,7 +339,7 @@ #include #include --- evolution-2.10.0/mail/em-format-html-display.c.use-glib-i18n 2007-02-26 04:59:59.000000000 -0500 -+++ evolution-2.10.0/mail/em-format-html-display.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-format-html-display.c 2007-04-03 15:07:43.000000000 -0400 @@ -67,7 +67,7 @@ #include @@ -349,7 +350,7 @@ #include #include --- evolution-2.10.0/mail/em-account-prefs.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-account-prefs.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-account-prefs.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -359,8 +360,8 @@ #include "mail-component.h" #include "mail-config.h" ---- evolution-2.10.0/mail/mail-folder-cache.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/mail-folder-cache.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/mail-folder-cache.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/mail-folder-cache.c 2007-04-03 15:07:43.000000000 -0400 @@ -37,7 +37,7 @@ #include @@ -371,7 +372,7 @@ #include #include --- evolution-2.10.0/mail/em-format.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-format.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-format.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -382,7 +383,7 @@ #include #include --- evolution-2.10.0/mail/em-vfolder-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-vfolder-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-vfolder-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #endif @@ -392,8 +393,8 @@ #include "e-util/e-util-private.h" ---- evolution-2.10.0/mail/mail-mt.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/mail-mt.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/mail/mail-mt.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/mail-mt.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -401,10 +402,10 @@ -#include +#include - #include #include ---- evolution-2.10.0/mail/em-folder-utils.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/mail/em-folder-utils.c 2007-03-18 08:26:55.000000000 -0400 + +--- evolution-2.10.0/mail/em-folder-utils.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/mail/em-folder-utils.c 2007-04-03 15:07:43.000000000 -0400 @@ -37,7 +37,7 @@ #include @@ -415,7 +416,7 @@ #include #include --- evolution-2.10.0/mail/em-vfolder-rule.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-vfolder-rule.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/mail/em-vfolder-rule.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include @@ -426,7 +427,7 @@ #include "camel/camel-url.h" #include "em-vfolder-context.h" --- evolution-2.10.0/a11y/widgets/ea-calendar-item.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 -+++ evolution-2.10.0/a11y/widgets/ea-calendar-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/widgets/ea-calendar-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -437,7 +438,7 @@ #include "ea-calendar-item.h" #include "ea-calendar-cell.h" --- evolution-2.10.0/a11y/addressbook/ea-minicard-view.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 -+++ evolution-2.10.0/a11y/addressbook/ea-minicard-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/addressbook/ea-minicard-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -20,11 +20,10 @@ */ @@ -452,7 +453,7 @@ #include "ea-minicard-view.h" #include "eab-gui-util.h" --- evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 -+++ evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -22,7 +22,7 @@ #include @@ -463,7 +464,7 @@ static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible); --- evolution-2.10.0/a11y/addressbook/ea-minicard.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 -+++ evolution-2.10.0/a11y/addressbook/ea-minicard.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/addressbook/ea-minicard.c 2007-04-03 15:07:43.000000000 -0400 @@ -22,7 +22,7 @@ #include @@ -474,7 +475,7 @@ #include "ea-minicard-view.h" #include "e-minicard.h" --- evolution-2.10.0/a11y/calendar/ea-day-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-day-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/calendar/ea-day-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include "ea-gnome-calendar.h" #include "calendar-commands.h" @@ -485,7 +486,7 @@ static void ea_day_view_class_init (EaDayViewClass *klass); --- evolution-2.10.0/a11y/calendar/ea-jump-button.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-jump-button.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/calendar/ea-jump-button.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include "ea-week-view.h" #include "e-week-view.h" @@ -496,7 +497,7 @@ static void ea_jump_button_class_init (EaJumpButtonClass *klass); --- evolution-2.10.0/a11y/calendar/ea-cal-view-event.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-cal-view-event.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/calendar/ea-cal-view-event.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include "ea-day-view.h" #include "ea-week-view.h" @@ -507,7 +508,7 @@ static void ea_cal_view_event_class_init (EaCalViewEventClass *klass); static void ea_cal_view_event_init (EaCalViewEvent *a11y); --- evolution-2.10.0/a11y/calendar/ea-week-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-week-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/calendar/ea-week-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include "ea-gnome-calendar.h" #include "calendar-commands.h" @@ -518,7 +519,7 @@ static void ea_week_view_class_init (EaWeekViewClass *klass); --- evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include "ea-week-view.h" #include "ea-week-view-cell.h" @@ -529,7 +530,7 @@ /* EaWeekViewMainItem */ static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass); --- evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include "ea-day-view.h" #include "ea-day-view-cell.h" @@ -540,7 +541,7 @@ /* EaDayViewMainItem */ static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass); --- evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -551,7 +552,7 @@ static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); --- evolution-2.10.0/a11y/calendar/ea-cal-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-cal-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/calendar/ea-cal-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include "calendar-commands.h" #include "goto.h" @@ -562,7 +563,7 @@ static void ea_cal_view_class_init (EaCalViewClass *klass); --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include "a11y/gal-a11y-util.h" @@ -573,7 +574,7 @@ #include "gal-a11y-e-cell-popup.h" #include "gal-a11y-e-cell-registry.h" --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c 2007-04-03 15:07:43.000000000 -0400 @@ -15,7 +15,7 @@ #include "a11y/gal-a11y-util.h" #include "table/e-table.h" @@ -584,7 +585,7 @@ #include "gal-a11y-e-cell.h" #include "gal-a11y-e-cell-vbox.h" --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c 2007-04-03 15:07:43.000000000 -0400 @@ -2,7 +2,7 @@ #include "table/e-cell-toggle.h" @@ -595,7 +596,7 @@ #include "gal-a11y-e-cell-toggle.h" --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c 2007-04-03 15:07:43.000000000 -0400 @@ -14,7 +14,7 @@ #include "a11y/gal-a11y-util.h" @@ -606,7 +607,7 @@ #include "gal-a11y-e-cell-text.h" --- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c 2007-04-03 15:07:43.000000000 -0400 @@ -14,7 +14,7 @@ #include "table/e-cell-tree.h" #include "table/e-table.h" @@ -617,7 +618,7 @@ #include "gal-a11y-e-cell-tree.h" #include "gal-a11y-e-cell-registry.h" --- evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c 2007-04-03 15:07:43.000000000 -0400 @@ -13,7 +13,7 @@ #include "table/e-table-click-to-add.h" #include "table/e-table-group.h" @@ -628,7 +629,7 @@ #include "gal-a11y-e-table-click-to-add.h" #include "gal-a11y-e-table-click-to-add-factory.h" --- evolution-2.10.0/filter/rule-editor.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/rule-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/filter/rule-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -639,7 +640,7 @@ #include "e-util/e-error.h" #include "e-util/e-util-private.h" --- evolution-2.10.0/filter/filter-label.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-label.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/filter/filter-label.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -650,7 +651,7 @@ #include #include --- evolution-2.10.0/filter/filter-part.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-part.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/filter/filter-part.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -660,8 +661,8 @@ #include "filter-part.h" #include "rule-context.h" ---- evolution-2.10.0/filter/filter-datespec.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/filter/filter-datespec.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/filter/filter-datespec.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/filter/filter-datespec.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -672,7 +673,7 @@ #include "filter-datespec.h" --- evolution-2.10.0/filter/rule-context.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/rule-context.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/filter/rule-context.c 2007-04-03 15:07:43.000000000 -0400 @@ -34,7 +34,7 @@ #include @@ -683,7 +684,7 @@ #include #include --- evolution-2.10.0/filter/filter-option.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-option.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/filter/filter-option.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include @@ -694,7 +695,7 @@ #include "filter-option.h" #include "filter-part.h" --- evolution-2.10.0/filter/filter-file.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-file.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/filter/filter-file.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -705,7 +706,7 @@ #include --- evolution-2.10.0/filter/filter-input.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-input.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/filter/filter-input.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -716,7 +717,7 @@ #include "filter-input.h" #include "libedataserver/e-sexp.h" --- evolution-2.10.0/filter/filter-rule.c.use-glib-i18n 2007-02-26 05:00:00.000000000 -0500 -+++ evolution-2.10.0/filter/filter-rule.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/filter/filter-rule.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -727,7 +728,7 @@ #include "e-util/e-error.h" #include "filter-rule.h" --- evolution-2.10.0/widgets/misc/e-calendar-item.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-calendar-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-calendar-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -43,7 +43,7 @@ #include #include @@ -738,7 +739,7 @@ #include --- evolution-2.10.0/widgets/misc/e-unicode.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-unicode.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-unicode.c 2007-04-03 15:07:43.000000000 -0400 @@ -42,7 +42,7 @@ #include @@ -749,7 +750,7 @@ #define d(x) x --- evolution-2.10.0/widgets/misc/e-task-widget.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-task-widget.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-task-widget.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -760,7 +761,7 @@ #define SPACING 2 --- evolution-2.10.0/widgets/misc/e-filter-bar.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-filter-bar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-filter-bar.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -771,7 +772,7 @@ #include "e-dropdown-button.h" #include "e-filter-bar.h" --- evolution-2.10.0/widgets/misc/e-dateedit.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-dateedit.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-dateedit.c 2007-04-03 15:07:43.000000000 -0400 @@ -58,7 +58,7 @@ #include #include @@ -782,7 +783,7 @@ #include #include --- evolution-2.10.0/widgets/misc/e-charset-picker.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-charset-picker.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-charset-picker.c 2007-04-03 15:07:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -793,7 +794,7 @@ #include #include --- evolution-2.10.0/widgets/misc/e-clipped-label.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-clipped-label.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-clipped-label.c 2007-04-03 15:07:43.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -804,7 +805,7 @@ static void e_clipped_label_class_init (EClippedLabelClass *class); --- evolution-2.10.0/widgets/misc/e-cell-percent.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-cell-percent.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-cell-percent.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -815,7 +816,7 @@ #include "e-cell-percent.h" --- evolution-2.10.0/widgets/misc/e-cell-date-edit.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-cell-date-edit.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-cell-date-edit.c 2007-04-03 15:07:43.000000000 -0400 @@ -44,7 +44,7 @@ #include
@@ -826,7 +827,7 @@ #include --- evolution-2.10.0/widgets/misc/e-map.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-map.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-map.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -837,7 +838,7 @@ #include "e-util/e-util-private.h" #include "e-util/e-util.h" --- evolution-2.10.0/widgets/misc/e-canvas-background.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-canvas-background.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-canvas-background.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include #include @@ -848,7 +849,7 @@ #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" --- evolution-2.10.0/widgets/misc/e-selection-model.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-selection-model.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-selection-model.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -859,7 +860,7 @@ #include "e-util/e-util.h" --- evolution-2.10.0/widgets/misc/e-selection-model-array.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-selection-model-array.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-selection-model-array.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -870,7 +871,7 @@ #include "e-selection-model-array.h" --- evolution-2.10.0/widgets/misc/e-send-options.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-send-options.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-send-options.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include #include @@ -881,7 +882,7 @@ #include --- evolution-2.10.0/widgets/misc/e-calendar.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-calendar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-calendar.c 2007-04-03 15:07:43.000000000 -0400 @@ -43,7 +43,7 @@ #include #include @@ -892,7 +893,7 @@ #define E_CALENDAR_SMALL_FONT_PTSIZE 6 --- evolution-2.10.0/widgets/misc/e-reflow.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-reflow.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-reflow.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -903,7 +904,7 @@ #include "e-util/e-util.h" #include "misc/e-unicode.h" --- evolution-2.10.0/widgets/misc/e-search-bar.c.use-glib-i18n 2007-01-08 07:23:31.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-search-bar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-search-bar.c 2007-04-03 15:07:43.000000000 -0400 @@ -42,7 +42,7 @@ #include #include @@ -914,7 +915,7 @@ #include --- evolution-2.10.0/widgets/misc/e-attachment-bar.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-attachment-bar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-attachment-bar.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -925,7 +926,7 @@ #include "e-attachment.h" --- evolution-2.10.0/widgets/misc/e-attachment.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-attachment.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-attachment.c 2007-04-03 15:07:43.000000000 -0400 @@ -51,7 +51,7 @@ #include #include @@ -936,7 +937,7 @@ #include "e-util/e-mktemp.h" --- evolution-2.10.0/widgets/misc/e-canvas-vbox.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-canvas-vbox.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-canvas-vbox.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include #include @@ -947,7 +948,7 @@ #include "e-canvas.h" --- evolution-2.10.0/widgets/misc/e-activity-handler.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-activity-handler.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-activity-handler.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -958,7 +959,7 @@ #include --- evolution-2.10.0/widgets/misc/e-image-chooser.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-image-chooser.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/misc/e-image-chooser.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -969,7 +970,7 @@ #include "e-image-chooser.h" #include "e-util/e-util-marshal.h" --- evolution-2.10.0/widgets/menus/gal-view-new-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-new-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/menus/gal-view-new-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -989,7 +990,7 @@ dialog->gui = gui; --- evolution-2.10.0/widgets/menus/gal-view-factory-etable.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-factory-etable.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/menus/gal-view-factory-etable.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #include @@ -1000,7 +1001,7 @@ #include "gal-view-etable.h" --- evolution-2.10.0/widgets/menus/gal-define-views-model.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-define-views-model.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/menus/gal-define-views-model.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1011,7 +1012,7 @@ #include "gal-define-views-model.h" --- evolution-2.10.0/widgets/menus/gal-define-views-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-define-views-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/menus/gal-define-views-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -1040,7 +1041,7 @@ dialog->gui = gui; --- evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -1069,7 +1070,7 @@ " " \ "" --- evolution-2.10.0/widgets/menus/gal-view-instance.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-instance.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/menus/gal-view-instance.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -1080,7 +1081,7 @@ #include "e-util/e-xml-utils.h" #include "misc/e-unicode.h" --- evolution-2.10.0/widgets/menus/gal-view-collection.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-collection.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/menus/gal-view-collection.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -1091,7 +1092,7 @@ #include "e-util/e-xml-utils.h" #include "misc/e-unicode.h" --- evolution-2.10.0/widgets/menus/gal-view-menus.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-menus.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/menus/gal-view-menus.c 2007-04-03 15:07:43.000000000 -0400 @@ -20,7 +20,7 @@ #include #include @@ -1102,7 +1103,7 @@ #include #include --- evolution-2.10.0/widgets/table/e-cell-pixbuf.c.use-glib-i18n 2007-03-08 01:11:20.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-pixbuf.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-cell-pixbuf.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -1113,7 +1114,7 @@ #include "e-cell-pixbuf.h" --- evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -1124,7 +1125,7 @@ #include "e-table-field-chooser-dialog.h" --- evolution-2.10.0/widgets/table/e-table-sorter.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-sorter.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-sorter.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -1135,7 +1136,7 @@ #include "e-table-sorter.h" --- evolution-2.10.0/widgets/table/e-table-selection-model.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-selection-model.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-selection-model.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -1146,7 +1147,7 @@ #include "e-table-selection-model.h" --- evolution-2.10.0/widgets/table/e-table-group-leaf.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-group-leaf.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-group-leaf.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -1157,7 +1158,7 @@ #include "misc/e-canvas.h" --- evolution-2.10.0/widgets/table/e-table-field-chooser.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-field-chooser.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-field-chooser.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -1177,7 +1178,7 @@ etfc->gui = gui; --- evolution-2.10.0/widgets/table/e-table-item.c.use-glib-i18n 2007-01-23 03:23:43.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -38,7 +38,7 @@ #include "a11y/e-table/gal-a11y-e-table-item-factory.h" @@ -1188,7 +1189,7 @@ #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" --- evolution-2.10.0/widgets/table/e-table.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include @@ -1199,7 +1200,7 @@ #include "misc/e-canvas.h" #include "misc/e-canvas-background.h" --- evolution-2.10.0/widgets/table/e-table-group-container.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-group-container.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-group-container.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -1210,7 +1211,7 @@ #include "misc/e-canvas-utils.h" #include "misc/e-canvas.h" --- evolution-2.10.0/widgets/table/e-cell-float.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-float.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-cell-float.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -1221,7 +1222,7 @@ #include "e-cell-float.h" --- evolution-2.10.0/widgets/table/e-tree-scrolled.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-tree-scrolled.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-tree-scrolled.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -1232,7 +1233,7 @@ #include "e-tree-scrolled.h" --- evolution-2.10.0/widgets/table/e-table-col.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-col.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-col.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #include @@ -1243,7 +1244,7 @@ #include "e-table-col.h" --- evolution-2.10.0/widgets/table/e-table-scrolled.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-scrolled.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-scrolled.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -1254,7 +1255,7 @@ #include "e-table.h" #include "e-table-scrolled.h" --- evolution-2.10.0/widgets/table/e-table-header-item.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-header-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-header-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -1283,7 +1284,7 @@ gtk_object_sink (GTK_OBJECT (popup)); g_signal_connect (popup, "selection-done", --- evolution-2.10.0/widgets/table/e-table-field-chooser-item.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-field-chooser-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-field-chooser-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -1294,7 +1295,7 @@ #include "e-util/e-xml-utils.h" #include "misc/e-canvas.h" --- evolution-2.10.0/widgets/table/e-table-config.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-config.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-config.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -1330,8 +1331,8 @@ g_free (filename); } ---- evolution-2.10.0/widgets/table/e-cell-text.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/widgets/table/e-cell-text.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/widgets/table/e-cell-text.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-cell-text.c 2007-04-03 15:07:43.000000000 -0400 @@ -50,7 +50,7 @@ #include "a11y/e-table/gal-a11y-e-cell-registry.h" #include "a11y/e-table/gal-a11y-e-cell-text.h" @@ -1342,7 +1343,7 @@ #include "e-util/e-text-event-processor-emacs-like.h" #include "e-util/e-util.h" --- evolution-2.10.0/widgets/table/e-tree.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-tree.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-tree.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include @@ -1353,7 +1354,7 @@ #include "e-util/e-util-marshal.h" #include "misc/e-canvas.h" --- evolution-2.10.0/widgets/table/e-cell-number.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-number.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-cell-number.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -1364,7 +1365,7 @@ #include "e-cell-number.h" --- evolution-2.10.0/widgets/table/e-tree-selection-model.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-tree-selection-model.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-tree-selection-model.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -1375,7 +1376,7 @@ #include "e-tree-selection-model.h" --- evolution-2.10.0/widgets/table/e-cell-combo.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-combo.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-cell-combo.c 2007-04-03 15:07:43.000000000 -0400 @@ -59,7 +59,7 @@ #include #include @@ -1386,7 +1387,7 @@ #include "misc/e-unicode.h" --- evolution-2.10.0/widgets/table/e-table-click-to-add.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-click-to-add.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-table-click-to-add.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include "a11y/e-table/gal-a11y-e-table-click-to-add.h" @@ -1397,7 +1398,7 @@ #include "e-util/e-util.h" #include "misc/e-canvas-utils.h" --- evolution-2.10.0/widgets/table/e-cell-date.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-date.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/table/e-cell-date.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1407,8 +1408,8 @@ #include "e-util/e-util.h" #include "misc/e-unicode.h" ---- evolution-2.10.0/widgets/text/e-text.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/widgets/text/e-text.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/widgets/text/e-text.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/widgets/text/e-text.c 2007-04-03 15:07:43.000000000 -0400 @@ -52,7 +52,7 @@ #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" @@ -1419,7 +1420,7 @@ #include "e-util/e-util.h" --- evolution-2.10.0/widgets/text/e-completion-view.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/text/e-completion-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/text/e-completion-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include "table/e-table-scrolled.h" @@ -1439,7 +1440,7 @@ " minimum_width=\"16\" resizable=\"true\" cell=\"string\" " " compare=\"string\"/> " --- evolution-2.10.0/widgets/text/e-entry.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/text/e-entry.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/widgets/text/e-entry.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -1450,7 +1451,7 @@ #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" --- evolution-2.10.0/plugins/calendar-file/calendar-file.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/calendar-file/calendar-file.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/calendar-file/calendar-file.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -1460,8 +1461,8 @@ #include GtkWidget *e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); ---- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -1472,7 +1473,7 @@ #include #include --- evolution-2.10.0/plugins/publish-calendar/publish-calendar.c.use-glib-i18n 2007-01-03 10:34:05.000000000 -0500 -+++ evolution-2.10.0/plugins/publish-calendar/publish-calendar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/publish-calendar/publish-calendar.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #include #include @@ -1483,7 +1484,7 @@ #include #include --- evolution-2.10.0/plugins/calendar-weather/calendar-weather.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/calendar-weather/calendar-weather.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/calendar-weather/calendar-weather.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1494,7 +1495,7 @@ #include #include --- evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -1505,7 +1506,7 @@ #include #include --- evolution-2.10.0/plugins/backup-restore/backup-restore.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/backup-restore/backup-restore.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/backup-restore/backup-restore.c 2007-04-03 15:07:43.000000000 -0400 @@ -2,7 +2,7 @@ #include #include @@ -1516,7 +1517,7 @@ void org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target); --- evolution-2.10.0/plugins/backup-restore/backup.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/backup-restore/backup.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/backup-restore/backup.c 2007-04-03 15:07:43.000000000 -0400 @@ -8,7 +8,7 @@ #include #include @@ -1527,7 +1528,7 @@ #define EVOLUTION "evolution-" BASE_VERSION --- evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c.use-glib-i18n 2007-01-23 03:23:42.000000000 -0500 -+++ evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include #include @@ -1538,7 +1539,7 @@ #include "e-util/e-util-private.h" --- evolution-2.10.0/plugins/default-source/default-source.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/default-source/default-source.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/default-source/default-source.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1549,7 +1550,7 @@ GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data); void commit_default_calendar (EPlugin *epl, EConfigTarget *target); --- evolution-2.10.0/plugins/subject-thread/subject-thread.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/subject-thread/subject-thread.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/subject-thread/subject-thread.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -1560,7 +1561,7 @@ #include #include --- evolution-2.10.0/plugins/calendar-http/calendar-http.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/calendar-http/calendar-http.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/calendar-http/calendar-http.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -1570,8 +1571,8 @@ #include GtkWidget *e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data); ---- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1581,8 +1582,8 @@ #include #include #include ---- evolution-2.10.0/plugins/itip-formatter/itip-view.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/plugins/itip-formatter/itip-view.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/plugins/itip-formatter/itip-view.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/plugins/itip-formatter/itip-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1592,8 +1593,8 @@ #include #include #include ---- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -1604,7 +1605,7 @@ #include #include --- evolution-2.10.0/plugins/groupwise-features/junk-settings.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/junk-settings.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/groupwise-features/junk-settings.c 2007-04-03 15:07:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -1615,7 +1616,7 @@ #include #include --- evolution-2.10.0/plugins/groupwise-features/install-shared.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/install-shared.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/groupwise-features/install-shared.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include #include @@ -1626,7 +1627,7 @@ #include #include --- evolution-2.10.0/plugins/groupwise-features/process-meeting.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/process-meeting.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/groupwise-features/process-meeting.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -1637,7 +1638,7 @@ #include #include --- evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -1648,7 +1649,7 @@ void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target); --- evolution-2.10.0/plugins/groupwise-features/send-options.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/send-options.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/plugins/groupwise-features/send-options.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -1658,8 +1659,8 @@ #include #include #include "mail/em-account-editor.h" ---- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c 2007-04-03 15:07:43.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -1669,8 +1670,8 @@ #include #include ---- evolution-2.10.0/plugins/bbdb/bbdb.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/plugins/bbdb/bbdb.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/plugins/bbdb/bbdb.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/plugins/bbdb/bbdb.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #endif @@ -1681,7 +1682,7 @@ #include --- evolution-2.10.0/e-util/e-categories-config.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-categories-config.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-categories-config.c 2007-04-03 15:07:43.000000000 -0400 @@ -10,7 +10,7 @@ #include @@ -1692,7 +1693,7 @@ #include #include --- evolution-2.10.0/e-util/e-text-event-processor.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-text-event-processor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-text-event-processor.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,8 @@ #include @@ -1704,7 +1705,7 @@ #include "e-text-event-processor.h" #include "e-util.h" --- evolution-2.10.0/e-util/e-util.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-util.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-util.c 2007-04-03 15:07:43.000000000 -0400 @@ -1112,20 +1112,6 @@ } } @@ -1727,7 +1728,7 @@ get_font_options () { --- evolution-2.10.0/e-util/e-popup.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-popup.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-popup.c 2007-04-03 15:07:43.000000000 -0400 @@ -42,7 +42,7 @@ #include @@ -1738,7 +1739,7 @@ #define d(x) --- evolution-2.10.0/e-util/e-xml-utils.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-xml-utils.c 2007-03-18 08:46:40.000000000 -0400 ++++ evolution-2.10.0/e-util/e-xml-utils.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,155 +36,14 @@ #include @@ -1897,7 +1898,7 @@ e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name) { --- evolution-2.10.0/e-util/e-config.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-config.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-config.c 2007-04-03 15:07:43.000000000 -0400 @@ -45,7 +45,7 @@ #include @@ -1908,7 +1909,7 @@ #define d(x) --- evolution-2.10.0/e-util/e-dialog-utils.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-dialog-utils.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-dialog-utils.c 2007-04-03 15:07:43.000000000 -0400 @@ -46,7 +46,7 @@ #include @@ -1919,7 +1920,7 @@ #include --- evolution-2.10.0/e-util/e-import.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-import.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-import.c 2007-04-03 15:07:43.000000000 -0400 @@ -45,7 +45,7 @@ #include @@ -1930,7 +1931,7 @@ #define d(x) --- evolution-2.10.0/e-util/Makefile.am.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/Makefile.am 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/Makefile.am 2007-04-03 15:07:43.000000000 -0400 @@ -108,7 +108,6 @@ eggtrayicon.c \ eggtrayicon.h \ @@ -1940,7 +1941,7 @@ e-sorter-array.c \ e-text-event-processor-emacs-like.c \ --- evolution-2.10.0/e-util/e-error.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-error.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-error.c 2007-04-03 15:07:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -1951,7 +1952,7 @@ #include --- evolution-2.10.0/e-util/e-event.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-event.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-event.c 2007-04-03 15:07:43.000000000 -0400 @@ -42,7 +42,7 @@ #include @@ -1962,7 +1963,7 @@ #define d(x) --- evolution-2.10.0/e-util/e-xml-utils.h.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-xml-utils.h 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-xml-utils.h 2007-04-03 15:07:43.000000000 -0400 @@ -30,18 +30,6 @@ G_BEGIN_DECLS @@ -1983,7 +1984,7 @@ const xmlChar *prop_name); gint e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, --- evolution-2.10.0/e-util/e-i18n.h.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-i18n.h 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-i18n.h 2007-04-03 15:07:43.000000000 -0400 @@ -1,74 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* @@ -2060,7 +2061,7 @@ - -#endif /* __E_I18N_H__ */ --- evolution-2.10.0/e-util/e-menu.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-menu.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/e-util/e-menu.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -2071,7 +2072,7 @@ #include --- evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c.use-glib-i18n 2007-01-03 10:32:48.000000000 -0500 -+++ evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c 2007-04-03 15:07:43.000000000 -0400 @@ -22,7 +22,7 @@ #include #include "addressbook/printing/e-contact-print-envelope.h" @@ -2082,7 +2083,7 @@ #include #include --- evolution-2.10.0/addressbook/printing/e-contact-print.c.use-glib-i18n 2007-03-08 01:10:56.000000000 -0500 -+++ evolution-2.10.0/addressbook/printing/e-contact-print.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/printing/e-contact-print.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -2093,7 +2094,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/component/addressbook-config.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/addressbook-config.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/component/addressbook-config.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include #include @@ -2104,7 +2105,7 @@ #include --- evolution-2.10.0/addressbook/gui/component/addressbook.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/addressbook.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/component/addressbook.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -2115,7 +2116,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c 2007-04-03 15:07:43.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -2126,7 +2127,7 @@ #include --- evolution-2.10.0/addressbook/gui/component/autocompletion-config.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/autocompletion-config.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/component/autocompletion-config.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include @@ -2137,7 +2138,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/component/addressbook-view.c.use-glib-i18n 2007-02-26 04:59:17.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/addressbook-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/component/addressbook-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2147,8 +2148,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -2159,7 +2160,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include #include @@ -2170,7 +2171,7 @@ #include "eab-marshal.h" #include "e-minicard-view-widget.h" --- evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c 2007-04-03 15:07:43.000000000 -0400 @@ -4,7 +4,7 @@ #include #include @@ -2181,7 +2182,7 @@ #include "e-addressbook-reflow-adapter.h" #include "e-addressbook-model.h" --- evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include "e-util/e-icon-factory.h" @@ -2192,7 +2193,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c 2007-04-03 15:07:43.000000000 -0400 @@ -13,7 +13,7 @@ #endif @@ -2203,7 +2204,7 @@ #include "gal-view-minicard.h" --- evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c.use-glib-i18n 2007-03-08 01:10:56.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2214,7 +2215,7 @@ #include #include
--- evolution-2.10.0/addressbook/gui/widgets/e-minicard.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -2225,7 +2226,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -2236,7 +2237,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2247,7 +2248,7 @@ #include "a11y/addressbook/ea-addressbook.h" --- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include #include @@ -2257,8 +2258,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -2269,7 +2270,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -2280,7 +2281,7 @@ #include #include --- evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2291,7 +2292,7 @@ #include "eab-editor.h" #include "addressbook/gui/widgets/eab-gui-util.h" --- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-04-03 15:07:43.000000000 -0400 @@ -22,7 +22,7 @@ #include #include "e-contact-editor-im.h" @@ -2301,8 +2302,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -2312,8 +2313,8 @@ #include #include ---- evolution-2.10.0/composer/e-msg-composer.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/composer/e-msg-composer.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/composer/e-msg-composer.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/composer/e-msg-composer.c 2007-04-03 15:07:43.000000000 -0400 @@ -63,7 +63,7 @@ #include @@ -2324,7 +2325,7 @@ #include --- evolution-2.10.0/composer/e-msg-composer-select-file.c.use-glib-i18n 2007-01-03 10:34:14.000000000 -0500 -+++ evolution-2.10.0/composer/e-msg-composer-select-file.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/composer/e-msg-composer-select-file.c 2007-04-03 15:07:43.000000000 -0400 @@ -41,7 +41,7 @@ #endif @@ -2335,7 +2336,7 @@ #include "e-msg-composer-select-file.h" #include --- evolution-2.10.0/composer/e-msg-composer-hdrs.c.use-glib-i18n 2007-01-03 10:34:14.000000000 -0500 -+++ evolution-2.10.0/composer/e-msg-composer-hdrs.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/composer/e-msg-composer-hdrs.c 2007-04-03 15:07:43.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -2346,7 +2347,7 @@ #include #include --- evolution-2.10.0/shell/e-shell-window.c.use-glib-i18n 2007-03-12 16:17:12.000000000 -0400 -+++ evolution-2.10.0/shell/e-shell-window.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell-window.c 2007-04-03 15:07:43.000000000 -0400 @@ -51,7 +51,7 @@ #include #include @@ -2357,7 +2358,7 @@ #include --- evolution-2.10.0/shell/e-shell-utils.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell-utils.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell-utils.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -2368,7 +2369,7 @@ #include "e-util/e-util-private.h" --- evolution-2.10.0/shell/e-shell.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell.c 2007-04-03 15:07:43.000000000 -0400 @@ -44,7 +44,7 @@ #undef interface #endif @@ -2379,7 +2380,7 @@ #include --- evolution-2.10.0/shell/e-shell-folder-title-bar.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell-folder-title-bar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell-folder-title-bar.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2390,7 +2391,7 @@ #include "misc/e-clipped-label.h" --- evolution-2.10.0/shell/e-shell-settings-dialog.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell-settings-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell-settings-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -148,9 +148,9 @@ { EShellSettingsDialogPrivate *priv; @@ -2438,7 +2439,7 @@ page_list = sort_page_list (page_list); for (p = page_list, i = 0; p != NULL; p = p->next, i++) { --- evolution-2.10.0/shell/e-user-creatable-items-handler.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-user-creatable-items-handler.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-user-creatable-items-handler.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -2448,8 +2449,8 @@ #include #include ---- evolution-2.10.0/shell/main.c.use-glib-i18n 2007-03-18 08:26:55.000000000 -0400 -+++ evolution-2.10.0/shell/main.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/shell/main.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/shell/main.c 2007-04-03 15:07:43.000000000 -0400 @@ -55,7 +55,7 @@ #include #include @@ -2460,7 +2461,7 @@ #include #include --- evolution-2.10.0/shell/evolution-shell-component-utils.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/evolution-shell-component-utils.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/evolution-shell-component-utils.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include "e-util/e-dialog-utils.h" @@ -2471,7 +2472,7 @@ #include #include --- evolution-2.10.0/shell/e-shell-window-commands.c.use-glib-i18n 2007-03-12 08:40:01.000000000 -0400 -+++ evolution-2.10.0/shell/e-shell-window-commands.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell-window-commands.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include @@ -2497,7 +2498,7 @@ /* This has to be a valid language AND a language with * no encoding postfix. The language will come up without --- evolution-2.10.0/shell/e-component-registry.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-component-registry.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-component-registry.c 2007-04-03 15:07:43.000000000 -0400 @@ -28,7 +28,7 @@ #include @@ -2559,7 +2560,7 @@ CORBA_free (info_list); CORBA_exception_free (&ev); --- evolution-2.10.0/shell/e-shell-importer.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell-importer.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/shell/e-shell-importer.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include @@ -2570,7 +2571,7 @@ #include #include --- evolution-2.10.0/calendar/gui/print.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/print.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/print.c 2007-04-03 15:07:43.000000000 -0400 @@ -34,7 +34,7 @@ #include #include @@ -2581,7 +2582,7 @@ #include #include --- evolution-2.10.0/calendar/gui/calendar-view-factory.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/calendar-view-factory.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/calendar-view-factory.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -2592,7 +2593,7 @@ #include "calendar-view.h" --- evolution-2.10.0/calendar/gui/itip-utils.c.use-glib-i18n 2007-01-08 08:36:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/itip-utils.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/itip-utils.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -2603,7 +2604,7 @@ #include #include --- evolution-2.10.0/calendar/gui/alarm-notify/util.c.use-glib-i18n 2007-01-03 10:34:50.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/alarm-notify/util.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/alarm-notify/util.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #include #endif @@ -2613,8 +2614,8 @@ #include #include #include "config-data.h" ---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c 2007-04-03 15:07:43.000000000 -0400 @@ -43,7 +43,7 @@ #include #include @@ -2625,7 +2626,7 @@ #include #include --- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c.use-glib-i18n 2007-01-03 10:34:50.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -2635,8 +2636,8 @@ #if 0 # include #endif ---- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -2646,8 +2647,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-itip-control.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-itip-control.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/e-itip-control.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-itip-control.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -2658,7 +2659,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-day-view-top-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-day-view-top-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-day-view-top-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #endif @@ -2669,7 +2670,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -34,7 +34,7 @@ #include @@ -2679,8 +2680,8 @@ #include "calendar-config.h" #include "e-meeting-time-sel-item.h" #include "e-meeting-time-sel.h" ---- evolution-2.10.0/calendar/gui/e-meeting-list-view.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-meeting-list-view.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/e-meeting-list-view.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-meeting-list-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2691,7 +2692,7 @@ #include #include --- evolution-2.10.0/calendar/gui/tasks-control.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/tasks-control.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/tasks-control.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -2702,7 +2703,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-cal-model-calendar.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cal-model-calendar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cal-model-calendar.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -2713,7 +2714,7 @@ #include "e-cell-date-edit-text.h" #include "itip-utils.h" --- evolution-2.10.0/calendar/gui/dialogs/memo-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/memo-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/memo-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -2723,8 +2724,8 @@ #include #include ---- evolution-2.10.0/calendar/gui/dialogs/task-page.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/task-page.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/dialogs/task-page.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/task-page.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -2735,7 +2736,7 @@ #include #include --- evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -2746,7 +2747,7 @@ #include #include "e-util/e-dialog-widgets.h" --- evolution-2.10.0/calendar/gui/dialogs/comp-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -34,7 +34,7 @@ #include #include @@ -2757,7 +2758,7 @@ #include #include --- evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c 2007-04-03 15:07:43.000000000 -0400 @@ -39,7 +39,7 @@ #include #include @@ -2767,8 +2768,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/event-page.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/event-page.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/dialogs/event-page.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/event-page.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2779,7 +2780,7 @@ #include #include "common/authentication.h" --- evolution-2.10.0/calendar/gui/dialogs/task-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/task-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/task-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -2789,8 +2790,8 @@ #include #include ---- evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -2801,7 +2802,7 @@ #include #include "calendar-setup.h" --- evolution-2.10.0/calendar/gui/dialogs/recur-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/recur-comp.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/recur-comp.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2812,7 +2813,7 @@ #include "recur-comp.h" --- evolution-2.10.0/calendar/gui/dialogs/delete-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/delete-comp.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/delete-comp.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -2823,7 +2824,7 @@ #include "e-util/e-error.h" #include "../calendar-config.h" --- evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -2834,7 +2835,7 @@ #include #include "comp-editor-page.h" --- evolution-2.10.0/calendar/gui/dialogs/delete-error.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/delete-error.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/delete-error.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2845,7 +2846,7 @@ #include #include "delete-error.h" --- evolution-2.10.0/calendar/gui/dialogs/task-details-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/task-details-page.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/task-details-page.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -2856,7 +2857,7 @@ #include #include --- evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c 2007-04-03 15:07:43.000000000 -0400 @@ -45,7 +45,7 @@ #endif @@ -2867,7 +2868,7 @@ #include "cal-attachment-select-file.h" #include --- evolution-2.10.0/calendar/gui/dialogs/event-editor.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/event-editor.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/event-editor.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -2878,7 +2879,7 @@ #include #include --- evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2889,7 +2890,7 @@ #include #include "e-util/e-error.h" --- evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c 2007-04-03 15:07:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -2899,8 +2900,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -2911,7 +2912,7 @@ static const int week_start_day_map[] = { --- evolution-2.10.0/calendar/gui/dialogs/schedule-page.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/schedule-page.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/schedule-page.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include #include @@ -2922,7 +2923,7 @@ #include #include --- evolution-2.10.0/calendar/gui/dialogs/changed-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/changed-comp.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/changed-comp.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2932,8 +2933,8 @@ #include #include #include "changed-comp.h" ---- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c 2007-04-03 15:07:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -2944,7 +2945,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-meeting-time-sel.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-meeting-time-sel.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-meeting-time-sel.c 2007-04-03 15:07:43.000000000 -0400 @@ -51,7 +51,7 @@ #include #include @@ -2955,7 +2956,7 @@ #include --- evolution-2.10.0/calendar/gui/calendar-commands.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/calendar-commands.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/calendar-commands.c 2007-04-03 15:07:43.000000000 -0400 @@ -47,7 +47,7 @@ #include #include @@ -2966,7 +2967,7 @@ #include #include --- evolution-2.10.0/calendar/gui/memos-control.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/memos-control.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/memos-control.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include #include @@ -2977,7 +2978,7 @@ #include #include --- evolution-2.10.0/calendar/gui/misc.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/misc.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/misc.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -2987,8 +2988,8 @@ #include "misc.h" ---- evolution-2.10.0/calendar/gui/e-cal-model-tasks.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-cal-model-tasks.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/e-cal-model-tasks.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cal-model-tasks.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -2999,7 +3000,7 @@ #include "calendar-config.h" #include "e-cal-model-tasks.h" --- evolution-2.10.0/calendar/gui/e-calendar-view.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-calendar-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-calendar-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -3010,7 +3011,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -3021,7 +3022,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-timezone-entry.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-timezone-entry.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-timezone-entry.c 2007-04-03 15:07:43.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -3032,7 +3033,7 @@ #include --- evolution-2.10.0/calendar/gui/e-alarm-list.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-alarm-list.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-alarm-list.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -3042,8 +3043,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-day-view.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-day-view.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/e-day-view.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-day-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -46,7 +46,7 @@ #include #include @@ -3053,8 +3054,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-cal-model.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-cal-model.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/e-cal-model.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cal-model.c 2007-04-03 15:07:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -3065,7 +3066,7 @@ #include #include "comp-util.h" --- evolution-2.10.0/calendar/gui/weekday-picker.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/weekday-picker.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/weekday-picker.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -3075,8 +3076,8 @@ #include #include #include "weekday-picker.h" ---- evolution-2.10.0/calendar/gui/e-week-view.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-week-view.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/e-week-view.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-week-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -41,7 +41,7 @@ #include #include @@ -3087,7 +3088,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-cal-model-memos.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cal-model-memos.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cal-model-memos.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #endif @@ -3098,7 +3099,7 @@ #include "e-cell-date-edit-text.h" #include "misc.h" --- evolution-2.10.0/calendar/gui/main.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/main.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/main.c 2007-04-03 15:07:43.000000000 -0400 @@ -25,7 +25,7 @@ #endif @@ -3109,7 +3110,7 @@ #include #include --- evolution-2.10.0/calendar/gui/cal-search-bar.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/cal-search-bar.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/cal-search-bar.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -3120,7 +3121,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-day-view-time-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -3131,7 +3132,7 @@ #include "e-day-view-time-item.h" #include "calendar-config.h" --- evolution-2.10.0/calendar/gui/e-cal-popup.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cal-popup.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cal-popup.c 2007-04-03 15:07:43.000000000 -0400 @@ -39,7 +39,7 @@ #include #include @@ -3141,8 +3142,8 @@ #include "e-util/e-mktemp.h" #include "e-util/e-dialog-utils.h" ---- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n 2007-03-18 08:26:54.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-meeting-store.c 2007-03-18 08:26:55.000000000 -0400 +--- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-meeting-store.c 2007-04-03 15:07:43.000000000 -0400 @@ -26,7 +26,7 @@ #endif @@ -3153,7 +3154,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-week-view-main-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c 2007-04-03 15:07:43.000000000 -0400 @@ -32,7 +32,7 @@ #include @@ -3164,7 +3165,7 @@ #include "ea-calendar.h" --- evolution-2.10.0/calendar/gui/gnome-cal.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/gnome-cal.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/gnome-cal.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -3175,7 +3176,7 @@ #include #include --- evolution-2.10.0/calendar/gui/e-cal-list-view.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cal-list-view.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/calendar/gui/e-cal-list-view.c 2007-04-03 15:07:43.000000000 -0400 @@ -50,7 +50,7 @@ #include
#include @@ -3186,7 +3187,7 @@ #include #include --- evolution-2.10.0/smime/lib/e-cert-db.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/lib/e-cert-db.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/lib/e-cert-db.c 2007-04-03 15:07:43.000000000 -0400 @@ -90,7 +90,7 @@ #include "e-util/e-dialog-utils.h" #include "e-util/e-util-private.h" @@ -3197,7 +3198,7 @@ #include #include --- evolution-2.10.0/smime/lib/e-cert.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/lib/e-cert.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/lib/e-cert.c 2007-04-03 15:07:43.000000000 -0400 @@ -62,7 +62,7 @@ #include @@ -3208,7 +3209,7 @@ #include /* for e_utf8_strftime, what about e_time_format_time? */ --- evolution-2.10.0/smime/lib/e-pkcs12.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/lib/e-pkcs12.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/lib/e-pkcs12.c 2007-04-03 15:07:43.000000000 -0400 @@ -63,7 +63,7 @@ #include #include @@ -3219,7 +3220,7 @@ #include --- evolution-2.10.0/smime/gui/certificate-viewer.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/certificate-viewer.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/gui/certificate-viewer.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include @@ -3230,7 +3231,7 @@ #include "e-util/e-util-private.h" --- evolution-2.10.0/smime/gui/certificate-manager.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/certificate-manager.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/gui/certificate-manager.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -3241,7 +3242,7 @@ #include #include "evolution-config-control.h" --- evolution-2.10.0/smime/gui/e-cert-selector.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/e-cert-selector.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/gui/e-cert-selector.c 2007-04-03 15:07:43.000000000 -0400 @@ -23,7 +23,7 @@ #include #endif @@ -3252,7 +3253,7 @@ #include #include --- evolution-2.10.0/smime/gui/cert-trust-dialog.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/cert-trust-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/gui/cert-trust-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -3263,7 +3264,7 @@ #include "e-util/e-util-private.h" --- evolution-2.10.0/smime/gui/component.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/component.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/gui/component.c 2007-04-03 15:07:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -3274,7 +3275,7 @@ #include "ca-trust-dialog.h" --- evolution-2.10.0/smime/gui/ca-trust-dialog.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/ca-trust-dialog.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/smime/gui/ca-trust-dialog.c 2007-04-03 15:07:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -3285,7 +3286,7 @@ #include "e-util/e-util-private.h" --- evolution-2.10.0/tools/killev.c.use-glib-i18n 2007-01-03 10:32:49.000000000 -0500 -+++ evolution-2.10.0/tools/killev.c 2007-03-18 08:26:55.000000000 -0400 ++++ evolution-2.10.0/tools/killev.c 2007-04-03 15:07:43.000000000 -0400 @@ -31,7 +31,7 @@ #include diff --git a/evolution.spec b/evolution.spec index e40d2f3..1b5e8d1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.0 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -733,6 +733,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Apr 03 2007 Matthew Barnes - 2.10.0-8.fc7 +- Revise patch for GNOME bug #419524 to fix RH bug #235082 + (crash in initial account setup wizard). + * Mon Apr 02 2007 Matthew Barnes - 2.10.0-7.fc7 - Add patch for RH bug #231767 (allow mail-notification to build). From 6a1ae614bedc26868de7b45b9c9682d8457386d9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 4 Apr 2007 04:13:05 +0000 Subject: [PATCH 118/844] - Require libxml2-devel in evolution-devel package (RH bug #235056). - Add libxml-2.0 requirement to evolution-plugin-2.10.pc. --- evolution.spec | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1b5e8d1..fa3eeef 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.0 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -164,6 +164,9 @@ Patch48: evolution-2.10.0-CVE-2007-1002.patch # RH bug #231767 / GNOME bug #400241 Patch49: evolution-2.10.0-let-mail-notification-build.patch +# RH bug #235056 +Patch50: evolution-2.10.0-plugins-require-libxml2.patch + ## Dependencies ### Requires(post): GConf2 @@ -275,6 +278,7 @@ Requires: %{name} = %{version} Requires: evolution-data-server-devel >= %{eds_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libsoup-devel >= %{soup_version} +Requires: libxml2-devel Obsoletes: libgal2-devel <= %{last_libgal2_version} %description devel @@ -317,6 +321,7 @@ Development files needed for building things which link against evolution. %patch47 -p1 -b .drop-old-glib-support %patch48 -p1 -b .CVE-2007-1002 %patch49 -p1 -b .let-mail-notification-build +%patch50 -p1 -b .plugins-require-libxml2 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -733,6 +738,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Apr 03 2007 Matthew Barnes - 2.10.0-9.fc7 +- Require libxml2-devel in evolution-devel package (RH bug #235056). +- Add libxml-2.0 requirement to evolution-plugin-2.10.pc. + * Tue Apr 03 2007 Matthew Barnes - 2.10.0-8.fc7 - Revise patch for GNOME bug #419524 to fix RH bug #235082 (crash in initial account setup wizard). From 923169d87364f1c1a1503dc6ff5aa698f16cce0b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 4 Apr 2007 18:52:54 +0000 Subject: [PATCH 119/844] - Add patch for GNOME bug #352713 (improve folder tree updates). --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index fa3eeef..20b65ac 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.0 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -167,6 +167,9 @@ Patch49: evolution-2.10.0-let-mail-notification-build.patch # RH bug #235056 Patch50: evolution-2.10.0-plugins-require-libxml2.patch +# GNOME bug #352713 +Patch51: evolution-2.10.0-bold-folders.patch + ## Dependencies ### Requires(post): GConf2 @@ -322,6 +325,7 @@ Development files needed for building things which link against evolution. %patch48 -p1 -b .CVE-2007-1002 %patch49 -p1 -b .let-mail-notification-build %patch50 -p1 -b .plugins-require-libxml2 +%patch51 -p1 -b .bold-folders mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -738,6 +742,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Apr 04 2007 Matthew Barnes - 2.10.0-10.fc7 +- Add patch for GNOME bug #352713 (improve folder tree updates). + * Tue Apr 03 2007 Matthew Barnes - 2.10.0-9.fc7 - Require libxml2-devel in evolution-devel package (RH bug #235056). - Add libxml-2.0 requirement to evolution-plugin-2.10.pc. From 55b170f410936937f758d4faa3f0f7bcd59f0b4c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 9 Apr 2007 18:09:26 +0000 Subject: [PATCH 120/844] - Update to 2.10.1 - Remove patch for CVE-2007-1002 (fixed upstream). - Remove patch for RH bug #231767 (fixed upstream). - Remove patch for RH bug #235056 (fixed upstream). - Remove patch for GNOME bug #352713 (fixed upstream). --- .cvsignore | 2 +- evolution-2.7.1-no-gnome-common.patch | 85 +++++++++++++++------------ evolution.spec | 27 +++------ sources | 2 +- 4 files changed, 60 insertions(+), 56 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1521337..8aa3781 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.10.0.tar.bz2 +evolution-2.10.1.tar.bz2 diff --git a/evolution-2.7.1-no-gnome-common.patch b/evolution-2.7.1-no-gnome-common.patch index 513a16c..06c2643 100644 --- a/evolution-2.7.1-no-gnome-common.patch +++ b/evolution-2.7.1-no-gnome-common.patch @@ -1,16 +1,16 @@ ---- evolution-2.9.5/configure.no-gnome-common 2007-01-21 22:00:01.000000000 -0500 -+++ evolution-2.9.5/configure 2007-01-21 22:00:53.000000000 -0500 -@@ -30764,141 +30764,6 @@ +--- evolution-2.10.1/configure.no-gnome-common 2007-04-09 12:32:23.000000000 -0400 ++++ evolution-2.10.1/configure 2007-04-09 12:33:02.000000000 -0400 +@@ -33161,154 +33161,6 @@ -- # Check whether --enable-compile-warnings or --disable-compile-warnings was given. +- # Check whether --enable-compile-warnings was given. -if test "${enable_compile_warnings+set}" = set; then -- enableval="$enable_compile_warnings" -- +- enableval=$enable_compile_warnings; -else - enable_compile_warnings="yes" --fi; +-fi +- - - warnCFLAGS= - if test "x$GCC" != xyes; then @@ -36,8 +36,8 @@ - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" -- echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 --echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6 +- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -54,24 +54,36 @@ -} -_ACEOF -rm -f conftest.$ac_objext --if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 -- (eval $ac_compile) 2>conftest.er1 +-if { (ac_try="$ac_compile" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && -- { ac_try='test -z "$ac_c_werror_flag" -- || test ! -s conftest.err' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 +- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' -- { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 -- (eval $ac_try) 2>&5 +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +- (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then @@ -80,12 +92,13 @@ - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - --has_option=no +- has_option=no -fi --rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +- +-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$SAVE_CFLAGS" -- echo "$as_me:$LINENO: result: $has_option" >&5 --echo "${ECHO_T}$has_option" >&6 +- { echo "$as_me:$LINENO: result: $has_option" >&5 +-echo "${ECHO_T}$has_option" >&6; } - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi @@ -104,21 +117,21 @@ - ;; - esac - CFLAGS="$realsave_CFLAGS" -- echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6 -- echo "$as_me:$LINENO: result: $warning_flags" >&5 --echo "${ECHO_T}$warning_flags" >&6 +- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } +- { echo "$as_me:$LINENO: result: $warning_flags" >&5 +-echo "${ECHO_T}$warning_flags" >&6; } - -- # Check whether --enable-iso-c or --disable-iso-c was given. +- # Check whether --enable-iso-c was given. -if test "${enable_iso_c+set}" = set; then -- enableval="$enable_iso_c" -- +- enableval=$enable_iso_c; -else - enable_iso_c=no --fi; +-fi - -- echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6 +- +- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then @@ -132,8 +145,8 @@ - esac - fi - fi -- echo "$as_me:$LINENO: result: $complCFLAGS" >&5 --echo "${ECHO_T}$complCFLAGS" >&6 +- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-echo "${ECHO_T}$complCFLAGS" >&6; } - - WARN_CFLAGS="$warning_flags $complCFLAGS" - @@ -142,9 +155,9 @@ case $CFLAGS in *-Wall*) # Turn off the annoying "comparison between signed and unsigned" ---- evolution-2.9.5/configure.in.no-gnome-common 2007-01-08 11:54:43.000000000 -0500 -+++ evolution-2.9.5/configure.in 2007-01-21 21:57:28.000000000 -0500 -@@ -1133,9 +1133,6 @@ +--- evolution-2.10.1/configure.in.no-gnome-common 2007-04-09 09:11:47.000000000 -0400 ++++ evolution-2.10.1/configure.in 2007-04-09 12:32:23.000000000 -0400 +@@ -1136,9 +1136,6 @@ dnl ************************* dnl CFLAGS and LIBS and stuff dnl ************************* diff --git a/evolution.spec b/evolution.spec index 20b65ac..f7442bc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,8 +46,8 @@ ### Abstract ### Name: evolution -Version: 2.10.0 -Release: 10%{?dist} +Version: 2.10.1 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -158,18 +158,6 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch # GNOME bug #418971 Patch47: evolution-2.10.0-drop-old-glib-support.patch -# CVE-2007-1002 -Patch48: evolution-2.10.0-CVE-2007-1002.patch - -# RH bug #231767 / GNOME bug #400241 -Patch49: evolution-2.10.0-let-mail-notification-build.patch - -# RH bug #235056 -Patch50: evolution-2.10.0-plugins-require-libxml2.patch - -# GNOME bug #352713 -Patch51: evolution-2.10.0-bold-folders.patch - ## Dependencies ### Requires(post): GConf2 @@ -322,10 +310,6 @@ Development files needed for building things which link against evolution. %patch45 -p1 -b .shell-main-cleanups %patch46 -p1 -b .use-glib-i18n %patch47 -p1 -b .drop-old-glib-support -%patch48 -p1 -b .CVE-2007-1002 -%patch49 -p1 -b .let-mail-notification-build -%patch50 -p1 -b .plugins-require-libxml2 -%patch51 -p1 -b .bold-folders mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -742,6 +726,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Apr 09 2007 Matthew Barnes - 2.10.1-1.fc7 +- Update to 2.10.1 +- Remove patch for CVE-2007-1002 (fixed upstream). +- Remove patch for RH bug #231767 (fixed upstream). +- Remove patch for RH bug #235056 (fixed upstream). +- Remove patch for GNOME bug #352713 (fixed upstream). + * Wed Apr 04 2007 Matthew Barnes - 2.10.0-10.fc7 - Add patch for GNOME bug #352713 (improve folder tree updates). diff --git a/sources b/sources index 502ccbe..5f86cfa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68d32e518f235bea9d768ae55e91bffc evolution-2.10.0.tar.bz2 +16051c6cbb617cb04665e402566e0976 evolution-2.10.1.tar.bz2 From 182a410bffb8567aa27c0a319418ee037698ff9d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 10 Apr 2007 03:16:52 +0000 Subject: [PATCH 121/844] - Update to 2.10.1 - Fix buggy gnome-doc-utils.make (GNOME bug #427939). - Remove patch for CVE-2007-1002 (fixed upstream). - Remove patch for RH bug #231767 (fixed upstream). - Remove patch for RH bug #235056 (fixed upstream). - Remove patch for GNOME bug #352713 (fixed upstream). --- evolution.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/evolution.spec b/evolution.spec index f7442bc..194f6e4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -158,6 +158,9 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch # GNOME bug #418971 Patch47: evolution-2.10.0-drop-old-glib-support.patch +# GNOME bug #427939 (gnome-doc-utils) +Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch + ## Dependencies ### Requires(post): GConf2 @@ -310,6 +313,7 @@ Development files needed for building things which link against evolution. %patch45 -p1 -b .shell-main-cleanups %patch46 -p1 -b .use-glib-i18n %patch47 -p1 -b .drop-old-glib-support +%patch48 -p1 -b .fix-gnome-doc-utils mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -728,6 +732,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Apr 09 2007 Matthew Barnes - 2.10.1-1.fc7 - Update to 2.10.1 +- Fix buggy gnome-doc-utils.make (GNOME bug #427939). - Remove patch for CVE-2007-1002 (fixed upstream). - Remove patch for RH bug #231767 (fixed upstream). - Remove patch for RH bug #235056 (fixed upstream). From 853aac777201e0ce03687608cb11a8e1b6a2c6b4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 11 Apr 2007 03:11:35 +0000 Subject: [PATCH 122/844] - Revise patch for GNOME bug #362638 to fix RH bug #235096 (crash when displaying a mail server message to user). --- evolution-2.8.1-kill-ethread.patch | 248 ++++++++++++++++++++--------- evolution.spec | 6 +- 2 files changed, 176 insertions(+), 78 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 1d49a68..00e4630 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,5 +1,5 @@ ---- evolution-2.10.0/mail/mail-send-recv.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-send-recv.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-send-recv.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-send-recv.c 2007-04-10 22:37:49.000000000 -0400 @@ -819,7 +819,7 @@ m->folders = folders; m->info = sinfo; @@ -9,8 +9,8 @@ } else { receive_done ("", data); } ---- evolution-2.10.0/mail/mail-component.c.kill-ethread 2007-03-12 16:13:58.000000000 -0400 -+++ evolution-2.10.0/mail/mail-component.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-component.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-component.c 2007-04-10 22:37:49.000000000 -0400 @@ -965,7 +965,7 @@ if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -20,8 +20,8 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.10.0/mail/mail-ops.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-ops.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-ops.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-ops.c 2007-04-10 22:37:49.000000000 -0400 @@ -221,7 +221,7 @@ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } @@ -247,8 +247,8 @@ return id; } ---- evolution-2.10.0/mail/em-folder-utils.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-utils.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-utils.c 2007-04-10 22:37:49.000000000 -0400 @@ -260,7 +260,7 @@ m->delete = delete; seq = m->msg.seq; @@ -267,8 +267,8 @@ return id; } ---- evolution-2.10.0/mail/importers/elm-importer.c.kill-ethread 2007-01-03 10:34:11.000000000 -0500 -+++ evolution-2.10.0/mail/importers/elm-importer.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/importers/elm-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 ++++ evolution-2.10.1/mail/importers/elm-importer.c 2007-04-10 22:37:49.000000000 -0400 @@ -312,7 +312,7 @@ id = m->msg.seq; @@ -278,8 +278,8 @@ return id; } ---- evolution-2.10.0/mail/importers/mail-importer.c.kill-ethread 2007-01-03 10:34:11.000000000 -0500 -+++ evolution-2.10.0/mail/importers/mail-importer.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/importers/mail-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 ++++ evolution-2.10.1/mail/importers/mail-importer.c 2007-04-10 22:37:49.000000000 -0400 @@ -329,7 +329,7 @@ } @@ -289,8 +289,8 @@ return id; } ---- evolution-2.10.0/mail/importers/pine-importer.c.kill-ethread 2007-01-03 10:34:11.000000000 -0500 -+++ evolution-2.10.0/mail/importers/pine-importer.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/importers/pine-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 ++++ evolution-2.10.1/mail/importers/pine-importer.c 2007-04-10 22:37:49.000000000 -0400 @@ -350,7 +350,7 @@ id = m->msg.seq; @@ -300,8 +300,8 @@ return id; } ---- evolution-2.10.0/mail/mail-vfolder.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-vfolder.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-vfolder.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-vfolder.c 2007-04-10 22:37:49.000000000 -0400 @@ -188,7 +188,7 @@ m->sources_folder = sources_folder; @@ -347,8 +347,8 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.10.0/mail/em-format-html.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 -+++ evolution-2.10.0/mail/em-format-html.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-format-html.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-format-html.c 2007-04-10 22:37:49.000000000 -0400 @@ -1375,7 +1375,7 @@ } @@ -358,9 +358,9 @@ } efh->priv->format_timeout_id = 0; ---- evolution-2.10.0/mail/em-folder-properties.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-properties.c 2007-03-30 15:47:31.000000000 -0400 -@@ -379,7 +379,7 @@ +--- evolution-2.10.1/mail/em-folder-properties.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-properties.c 2007-04-10 22:37:49.000000000 -0400 +@@ -386,7 +386,7 @@ } if (folder == NULL) @@ -369,9 +369,9 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.10.0/mail/em-folder-tree.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-tree.c 2007-03-30 15:47:31.000000000 -0400 -@@ -966,7 +966,7 @@ +--- evolution-2.10.1/mail/em-folder-tree.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-tree.c 2007-04-10 22:37:49.000000000 -0400 +@@ -969,7 +969,7 @@ tree_drag_data_action(struct _DragDataReceivedAsync *m) { m->move = m->action == GDK_ACTION_MOVE; @@ -380,7 +380,7 @@ } static void -@@ -1891,7 +1891,7 @@ +@@ -1915,7 +1915,7 @@ m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; @@ -389,8 +389,8 @@ } static gboolean ---- evolution-2.10.0/mail/em-folder-browser.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-browser.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-browser.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-browser.c 2007-04-10 22:37:49.000000000 -0400 @@ -948,7 +948,7 @@ m->sources_folder = sources_folder; @@ -400,9 +400,9 @@ return id; } ---- evolution-2.10.0/mail/message-list.c.kill-ethread 2007-01-23 03:23:43.000000000 -0500 -+++ evolution-2.10.0/mail/message-list.c 2007-03-30 15:47:31.000000000 -0400 -@@ -1888,7 +1888,7 @@ +--- evolution-2.10.1/mail/message-list.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/message-list.c 2007-04-10 22:37:49.000000000 -0400 +@@ -1889,7 +1889,7 @@ ml_drop_action(struct _drop_msg *m) { m->move = m->action == GDK_ACTION_MOVE; @@ -411,7 +411,7 @@ } static void -@@ -3922,7 +3922,7 @@ +@@ -3978,7 +3978,7 @@ m->ml->regen = g_list_prepend(m->ml->regen, m); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ @@ -420,8 +420,8 @@ m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; ---- evolution-2.10.0/mail/em-sync-stream.h.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-sync-stream.h 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-sync-stream.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-sync-stream.h 2007-04-10 22:37:49.000000000 -0400 @@ -29,41 +29,45 @@ #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -498,8 +498,8 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.10.0/mail/em-format-html-print.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 -+++ evolution-2.10.0/mail/em-format-html-print.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-format-html-print.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-format-html-print.c 2007-04-10 22:37:49.000000000 -0400 @@ -262,7 +262,7 @@ g_object_ref(source); g_object_ref(efhp); @@ -509,8 +509,8 @@ return 0; /* damn async ... */ } ---- evolution-2.10.0/mail/em-sync-stream.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 -+++ evolution-2.10.0/mail/em-sync-stream.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-sync-stream.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-sync-stream.c 2007-04-10 22:37:49.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -936,8 +936,8 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.10.0/mail/em-subscribe-editor.c.kill-ethread 2007-01-08 11:54:43.000000000 -0500 -+++ evolution-2.10.0/mail/em-subscribe-editor.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-subscribe-editor.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-subscribe-editor.c 2007-04-10 22:37:49.000000000 -0400 @@ -229,7 +229,7 @@ next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); if (next) { @@ -965,8 +965,8 @@ return id; } ---- evolution-2.10.0/mail/mail-mt.h.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-mt.h 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-mt.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-mt.h 2007-04-10 22:37:49.000000000 -0400 @@ -25,14 +25,15 @@ #include @@ -1037,8 +1037,8 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.10.0/mail/mail-ops.h.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-ops.h 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-ops.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-ops.h 2007-04-10 22:37:49.000000000 -0400 @@ -30,13 +30,14 @@ #pragma } #endif /* __cplusplus */ @@ -1079,8 +1079,8 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.10.0/mail/em-composer-utils.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-composer-utils.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-composer-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-composer-utils.c 2007-04-10 22:37:49.000000000 -0400 @@ -534,7 +534,7 @@ strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -1124,8 +1124,8 @@ - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.10.0/mail/mail-folder-cache.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-folder-cache.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-folder-cache.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-folder-cache.c 2007-04-10 22:37:49.000000000 -0400 @@ -907,7 +907,7 @@ m->store = store; camel_object_ref (store); @@ -1144,8 +1144,8 @@ LOCK(info_lock); ---- evolution-2.10.0/mail/em-folder-view.c.kill-ethread 2007-03-01 01:06:14.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-view.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-view.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-view.c 2007-04-10 22:37:49.000000000 -0400 @@ -68,6 +68,7 @@ #include @@ -1190,8 +1190,8 @@ } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.10.0/mail/mail-session.c.kill-ethread 2007-02-26 04:59:59.000000000 -0500 -+++ evolution-2.10.0/mail/mail-session.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-session.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-session.c 2007-04-10 22:37:49.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -1201,6 +1201,15 @@ #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include +@@ -256,7 +256,7 @@ + + /* ********************************************************************** */ + +-static GtkDialog *message_dialog; ++static gpointer message_dialog; + static EDList message_list = E_DLIST_INITIALISER(message_list); + + struct _user_message_msg { @@ -283,7 +283,7 @@ /* if !allow_cancel, then we've already replied */ if (m->allow_cancel) { @@ -1210,7 +1219,92 @@ } /* check for pendings */ -@@ -364,17 +364,18 @@ +@@ -292,22 +292,10 @@ + } + + static void +-user_message_destroy_notify (struct _user_message_msg *m, GObject *deadbeef) +-{ +- message_dialog = NULL; +-} +- +-/* This is kinda ugly/inefficient, but oh well, it works */ +-static const char *error_type[] = { +- "mail:session-message-info", "mail:session-message-warning", "mail:session-message-error", +- "mail:session-message-info-cancel", "mail:session-message-warning-cancel", "mail:session-message-error-cancel" +-}; +- +-static void + do_user_message (struct _mail_msg *mm) + { + struct _user_message_msg *m = (struct _user_message_msg *)mm; +- int type; ++ const gchar *error_type; + + if (!m->ismain && message_dialog != NULL) { + e_dlist_addtail (&message_list, (EDListNode *)m); +@@ -315,24 +303,27 @@ + } + + switch (m->type) { +- case CAMEL_SESSION_ALERT_INFO: +- type = 0; +- break; +- case CAMEL_SESSION_ALERT_WARNING: +- type = 1; +- break; +- case CAMEL_SESSION_ALERT_ERROR: +- type = 2; +- break; +- default: +- type = 0; ++ case CAMEL_SESSION_ALERT_INFO: ++ error_type = m->allow_cancel ? ++ "mail:session-message-info-cancel" : ++ "mail:session-message-info"; ++ break; ++ case CAMEL_SESSION_ALERT_WARNING: ++ error_type = m->allow_cancel ? ++ "mail:session-message-warning-cancel" : ++ "mail:session-message-warning"; ++ break; ++ case CAMEL_SESSION_ALERT_ERROR: ++ error_type = m->allow_cancel ? ++ "mail:session-message-error-cancel" : ++ "mail:session-message-error"; ++ break; ++ default: ++ g_assert_not_reached (); + } + +- if (m->allow_cancel) +- type += 3; +- +- message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL); +- g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); ++ message_dialog = e_error_new(NULL, error_type, m->prompt, NULL); ++ g_object_set (message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); + + /* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */ + if (m->allow_cancel) { +@@ -340,12 +331,13 @@ + user_message_response(message_dialog, gtk_dialog_run (message_dialog), m); + } else { + g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m); +- gtk_widget_show ((GtkWidget *) message_dialog); ++ gtk_widget_show (message_dialog); + } + } else { + g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog); +- g_object_weak_ref ((GObject *) message_dialog, (GWeakNotify) user_message_destroy_notify, m); +- gtk_widget_show ((GtkWidget *) message_dialog); ++ g_object_add_weak_pointer (message_dialog, &message_dialog); ++ gtk_widget_show (message_dialog); ++ e_flag_free (mm->processed); + mail_msg_free(m); + } + } +@@ -364,17 +356,17 @@ alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) { MailSession *mail_session = MAIL_SESSION (session); @@ -1223,18 +1317,18 @@ if (!mail_session->interactive) return FALSE; - if (cancel) +- if (cancel) - user_message_reply = e_msgport_new (); - m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); - m->ismain = pthread_equal(pthread_self(), mail_gui_thread); -+ processed = e_flag_new (); ++ processed = e_flag_new (); + + m = mail_msg_new (&user_message_op, processed, sizeof (*m)); + m->ismain = mail_in_main_thread(); m->type = type; m->prompt = g_strdup(prompt); m->allow_cancel = cancel; -@@ -382,18 +383,14 @@ +@@ -382,18 +374,14 @@ if (m->ismain) do_user_message((struct _mail_msg *)m); else { @@ -1249,14 +1343,14 @@ - g_assert(m == r); - + e_flag_wait (processed); ++ e_flag_free (processed); ret = m->result; mail_msg_free(m); - e_msgport_destroy(user_message_reply); -+ e_flag_free (processed); } else ret = TRUE; -@@ -686,7 +683,7 @@ +@@ -687,7 +675,7 @@ /* flush/cancel pending user messages */ while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { d(printf ("Flusing message request: %s\n", um->prompt)); @@ -1265,8 +1359,8 @@ } /* and the current */ ---- evolution-2.10.0/mail/mail-mt.c.kill-ethread 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-mt.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/mail/mail-mt.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-mt.c 2007-04-10 22:37:49.000000000 -0400 @@ -29,7 +29,6 @@ #include #include @@ -1811,8 +1905,8 @@ } /* ******************** */ ---- evolution-2.10.0/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-09 09:09:11.000000000 -0400 ++++ evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-04-10 22:37:49.000000000 -0400 @@ -108,5 +108,5 @@ unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); unsub->uri = g_strdup (target->uri); @@ -1820,8 +1914,8 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push ((mail_msg_t *) unsub); } ---- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-01-03 10:34:03.000000000 -0500 -+++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400 ++++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-04-10 22:37:49.000000000 -0400 @@ -44,7 +44,7 @@ return; } @@ -1831,8 +1925,8 @@ } static void ---- evolution-2.10.0/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-01-03 10:34:03.000000000 -0500 -+++ evolution-2.10.0/plugins/exchange-operations/exchange-folder.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-04-09 09:09:13.000000000 -0400 ++++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c 2007-04-10 22:37:49.000000000 -0400 @@ -134,7 +134,7 @@ inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -1842,8 +1936,8 @@ } ---- evolution-2.10.0/plugins/save-attachments/save-attachments.c.kill-ethread 2007-02-26 04:59:58.000000000 -0500 -+++ evolution-2.10.0/plugins/save-attachments/save-attachments.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-09 09:09:15.000000000 -0400 ++++ evolution-2.10.1/plugins/save-attachments/save-attachments.c 2007-04-10 22:37:49.000000000 -0400 @@ -407,5 +407,5 @@ camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -1851,8 +1945,8 @@ - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.10.0/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/mailing-list-actions/mailing-list-actions.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400 ++++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-04-10 22:37:49.000000000 -0400 @@ -89,7 +89,7 @@ data->uri = strdup (sel->uri); @@ -1862,8 +1956,8 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-09 09:09:12.000000000 -0400 ++++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-04-10 22:37:49.000000000 -0400 @@ -239,7 +239,7 @@ m->done = done; g_free (namebuf); @@ -1873,8 +1967,8 @@ return id; } ---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-01-03 10:34:50.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.h 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-09 09:10:29.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h 2007-04-10 22:37:49.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -1895,8 +1989,8 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-01-03 10:34:50.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-04-10 22:37:49.000000000 -0400 @@ -45,10 +45,6 @@ GMutex *mutex; }; @@ -2009,8 +2103,8 @@ } static void ---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-01-03 10:34:50.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c 2007-03-30 15:47:31.000000000 -0400 +--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-10 22:37:49.000000000 -0400 @@ -115,9 +115,6 @@ static int tray_blink_state = FALSE; static AlarmNotify *an; diff --git a/evolution.spec b/evolution.spec index 194f6e4..849773c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -730,6 +730,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Apr 10 2007 Matthew Barnes - 2.10.1-2.fc7 +- Revise patch for GNOME bug #362638 to fix RH bug #235096 + (crash when displaying a mail server message to user). + * Mon Apr 09 2007 Matthew Barnes - 2.10.1-1.fc7 - Update to 2.10.1 - Fix buggy gnome-doc-utils.make (GNOME bug #427939). From 83f41adf7186314584fe52a16f9dec92a5f6889d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 14 Apr 2007 03:06:01 +0000 Subject: [PATCH 123/844] - Add patch for RH bug #235878 (make Help->Contents work again). --- evolution-2.10.1-fix-help.patch | 192 ++++++++++++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 evolution-2.10.1-fix-help.patch diff --git a/evolution-2.10.1-fix-help.patch b/evolution-2.10.1-fix-help.patch new file mode 100644 index 0000000..caf4565 --- /dev/null +++ b/evolution-2.10.1-fix-help.patch @@ -0,0 +1,192 @@ +--- evolution-2.10.1/widgets/misc/e-multi-config-dialog.c.fix-help 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-multi-config-dialog.c 2007-04-13 22:26:25.000000000 -0400 +@@ -192,13 +192,12 @@ + + switch (response_id) { + case GTK_RESPONSE_HELP: +- gnome_help_display_desktop (NULL, +- "evolution-" BASE_VERSION, +- "evolution-" BASE_VERSION ".xml", +- "config-prefs", +- &error); +- if (error != NULL) ++ gnome_help_display ( ++ "evolution.xml", "config-prefs", &error); ++ if (error != NULL) { + g_warning ("%s", error->message); ++ g_error_free (error); ++ } + break; + case GTK_RESPONSE_CLOSE: + default: +--- evolution-2.10.1/widgets/misc/e-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-send-options.c 2007-04-13 22:26:25.000000000 -0400 +@@ -588,34 +588,32 @@ + + static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data) + { ++ ESendOptionsDialogPrivate *priv; ++ ESendOptionsDialog *sod; ++ GError *error = NULL; + +- ESendOptionsDialogPrivate *priv; +- ESendOptionsDialog *sod; +- GError *error = NULL; +- +- sod = func_data; +- priv = sod->priv; +- +- switch (state) { +- case GTK_RESPONSE_OK: +- e_send_options_get_widgets_data (sod); +- case GTK_RESPONSE_CANCEL: +- gtk_widget_hide (priv->main); +- gtk_widget_destroy (priv->main); +- g_object_unref (priv->xml); +- break; +- case GTK_RESPONSE_HELP: +- gnome_help_display_desktop (NULL, +- "evolution-" BASE_VERSION, +- "evolution-" BASE_VERSION ".xml", +- priv->help_section, +- &error); +- if (error != NULL) +- g_warning ("%s", error->message); +- break; +- } +- g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); ++ sod = func_data; ++ priv = sod->priv; ++ ++ switch (state) { ++ case GTK_RESPONSE_OK: ++ e_send_options_get_widgets_data (sod); ++ case GTK_RESPONSE_CANCEL: ++ gtk_widget_hide (priv->main); ++ gtk_widget_destroy (priv->main); ++ g_object_unref (priv->xml); ++ break; ++ case GTK_RESPONSE_HELP: ++ gnome_help_display ( ++ "evolution.xml", priv->help_section, &error); ++ if (error != NULL) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } ++ break; ++ } + ++ g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); + } + + gboolean +--- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400 ++++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c 2007-04-13 22:26:25.000000000 -0400 +@@ -191,21 +191,20 @@ + + switch (state) { + case GTK_RESPONSE_OK: +- exchange_send_options_get_widgets_data (sod); ++ exchange_send_options_get_widgets_data (sod); + case GTK_RESPONSE_CANCEL: +- gtk_widget_hide (priv->main); +- gtk_widget_destroy (priv->main); +- g_object_unref (priv->xml); +- break; ++ gtk_widget_hide (priv->main); ++ gtk_widget_destroy (priv->main); ++ g_object_unref (priv->xml); ++ break; + case GTK_RESPONSE_HELP: +- gnome_help_display_desktop (NULL, +- "evolution-" BASE_VERSION, +- "evolution-" BASE_VERSION ".xml", +- priv->help_section, +- &error); +- if (error != NULL) +- g_warning ("%s", error->message); +- break; ++ gnome_help_display ( ++ "evolution.xml", priv->help_section, &error); ++ if (error != NULL) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } ++ break; + } + g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); + +--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-13 22:26:02.000000000 -0400 +@@ -3235,13 +3235,12 @@ + { + GError *error = NULL; + +- gnome_help_display_desktop (NULL, +- "evolution-" BASE_VERSION, +- "evolution-" BASE_VERSION ".xml", +- "usage-contact-cards", +- &error); +- if (error != NULL) ++ gnome_help_display ( ++ "evolution.xml", "usage-contact-cards", &error); ++ if (error != NULL) { + g_warning ("%s", error->message); ++ g_error_free (error); ++ } + } + + static GList * +--- evolution-2.10.1/composer/e-msg-composer.c.fix-help 2007-04-13 22:25:21.000000000 -0400 ++++ evolution-2.10.1/composer/e-msg-composer.c 2007-04-13 22:26:25.000000000 -0400 +@@ -2886,13 +2886,12 @@ + GError *error = NULL; + EMsgComposerPrivate *p = composer->priv; + +- gnome_help_display_desktop (NULL, +- "evolution-" BASE_VERSION, +- "evolution-" BASE_VERSION ".xml", +- "usage-composer", +- &error); +- if (error != NULL) ++ gnome_help_display ( ++ "evolution.xml", "usage-composer", &error); ++ if (error != NULL) { + g_warning ("%s", error->message); ++ g_error_free (error); ++ } + } + + +--- evolution-2.10.1/shell/e-shell-window.c.fix-help 2007-04-13 22:25:21.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell-window.c 2007-04-13 22:26:02.000000000 -0400 +@@ -1042,7 +1042,7 @@ + bonobo_ui_util_set_ui (priv->ui_component, + PREFIX, + xmlfile, +- "evolution-" BASE_VERSION, NULL); ++ "evolution", NULL); + g_free (xmlfile); + + e_shell_window_commands_setup (window); +--- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c 2007-04-13 22:26:25.000000000 -0400 +@@ -1693,13 +1693,12 @@ + + priv = editor->priv; + +- gnome_help_display_desktop (NULL, +- "evolution-" BASE_VERSION, +- "evolution-" BASE_VERSION ".xml", +- priv->help_section, +- &error); +- if (error != NULL) ++ gnome_help_display ( ++ "evolution.xml", priv->help_section, &error); ++ if (error != NULL) { + g_warning ("%s", error->message); ++ g_error_free (error); ++ } + } + + diff --git a/evolution.spec b/evolution.spec index 849773c..7760930 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -161,6 +161,9 @@ Patch47: evolution-2.10.0-drop-old-glib-support.patch # GNOME bug #427939 (gnome-doc-utils) Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch +# RH bug 235878 / GNOME bug #386503 +Patch49: evolution-2.10.1-fix-help.patch + ## Dependencies ### Requires(post): GConf2 @@ -314,6 +317,7 @@ Development files needed for building things which link against evolution. %patch46 -p1 -b .use-glib-i18n %patch47 -p1 -b .drop-old-glib-support %patch48 -p1 -b .fix-gnome-doc-utils +%patch49 -p1 -b .fix-help mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -730,6 +734,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Apr 13 2007 Matthew Barnes - 2.10.1-3.fc7 +- Add patch for RH bug #235878 (make Help->Contents work again). + * Tue Apr 10 2007 Matthew Barnes - 2.10.1-2.fc7 - Revise patch for GNOME bug #362638 to fix RH bug #235096 (crash when displaying a mail server message to user). From 44323b73055789c8a172901e90bc5d19e756789b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 14 Apr 2007 20:46:09 +0000 Subject: [PATCH 124/844] - Add patch for RH bug #234315 (fix saving attachments). --- evolution-2.10.1-saving-attachments.patch | 218 ++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 226 insertions(+), 1 deletion(-) create mode 100644 evolution-2.10.1-saving-attachments.patch diff --git a/evolution-2.10.1-saving-attachments.patch b/evolution-2.10.1-saving-attachments.patch new file mode 100644 index 0000000..1f591f5 --- /dev/null +++ b/evolution-2.10.1-saving-attachments.patch @@ -0,0 +1,218 @@ +--- evolution-2.10.1/mail/em-utils.c.saving-attachments 2007-04-14 14:25:40.000000000 -0400 ++++ evolution-2.10.1/mail/em-utils.c 2007-04-14 15:08:50.000000000 -0400 +@@ -354,28 +354,23 @@ + + /* Saving messages... */ + +-static void +-emu_save_part_response(GtkWidget *filesel, int response, CamelMimePart *part) ++static const gchar * ++emu_save_get_filename_for_part (CamelMimePart *part) + { +- char *uri; +- +- if (response == GTK_RESPONSE_OK) { +- uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel)); ++ const gchar *filename; + +- if (!e_file_can_save((GtkWindow *)filesel, uri)) { +- g_free(uri); +- return; +- } +- +- e_file_update_save_path(gtk_file_chooser_get_current_folder_uri( +- GTK_FILE_CHOOSER(filesel)), TRUE); +- /* FIXME: popup error if it fails? */ +- mail_save_part(part, uri, NULL, NULL, FALSE); +- g_free(uri); ++ filename = camel_mime_part_get_filename (part); ++ if (filename == NULL) { ++ if (CAMEL_IS_MIME_MESSAGE (part)) { ++ filename = camel_mime_message_get_subject ( ++ CAMEL_MIME_MESSAGE (part)); ++ if (filename == NULL) ++ filename = _("message"); ++ } else ++ filename = _("attachment"); + } + +- gtk_widget_destroy((GtkWidget *)filesel); +- camel_object_unref(part); ++ return filename; + } + + /** +@@ -387,83 +382,78 @@ + * Saves a mime part to disk (prompting the user for filename). + **/ + void +-em_utils_save_part(GtkWidget *parent, const char *prompt, CamelMimePart *part) ++em_utils_save_part (GtkWidget *parent, const char *prompt, CamelMimePart *part) + { +- const char *name; +- GtkWidget *filesel; ++ GtkWidget *file_chooser; ++ const gchar *filename; ++ gchar *uri = NULL; + +- name = camel_mime_part_get_filename(part); +- if (name == NULL) { +- if (CAMEL_IS_MIME_MESSAGE(part)) { +- name = camel_mime_message_get_subject((CamelMimeMessage *)part); +- if (name == NULL) +- name = _("message"); +- } else { +- name = _("attachment"); +- } ++ filename = emu_save_get_filename_for_part (part); ++ ++ file_chooser = e_file_get_save_filesel ( ++ parent, prompt, filename, GTK_FILE_CHOOSER_ACTION_SAVE); ++ ++ if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK) ++ goto exit; ++ ++ uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser)); ++ ++ /* XXX Would be nice to mention _why_ we can't save. */ ++ if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) { ++ g_warning ("Unable to save %s", uri); ++ goto exit; + } + +- filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE); +- camel_object_ref(part); +- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part); +- gtk_widget_show (filesel); ++ e_file_update_save_path ( ++ gtk_file_chooser_get_current_folder_uri ( ++ GTK_FILE_CHOOSER (file_chooser)), TRUE); ++ ++ mail_save_part (part, uri, NULL, NULL, FALSE); ++ ++exit: ++ gtk_widget_destroy (file_chooser); ++ g_free (uri); + } + +-static void +-emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts) ++void ++em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts) + { +- GSList *selected; +- char *uri = NULL; +- if (response == GTK_RESPONSE_OK) { +- uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (filesel)); +- e_file_update_save_path(uri, FALSE); +- +- for ( selected = parts; selected != NULL; selected = selected->next) { +- const char *file_name; +- char *safe_name = NULL; +- char *file_path; +- CamelMimePart *part = selected->data; +- +- file_name = camel_mime_part_get_filename(part); +- if (file_name == NULL) { +- if (CAMEL_IS_MIME_MESSAGE(part)) { +- file_name = camel_mime_message_get_subject((CamelMimeMessage *)part); +- if (file_name == NULL) +- file_name = _("message"); +- } else { +- file_name = _("attachment"); +- } +- } else { +- safe_name = g_strdup(file_name); +- em_filename_make_safe(safe_name); +- file_name = safe_name; +- } +- +- file_path = g_build_filename (uri, file_name, NULL); +- if (!e_file_check_local(file_path) || !g_file_test(file_path, (G_FILE_TEST_EXISTS)) || e_error_run(NULL, E_ERROR_ASK_FILE_EXISTS_OVERWRITE, file_name, NULL) == GTK_RESPONSE_OK) +- mail_save_part(part, file_path, NULL, NULL, FALSE); +- else +- g_warning ("Could not save %s. File already exists", file_path); ++ GtkWidget *file_chooser; ++ gchar *path_uri; ++ GSList *iter; ++ ++ file_chooser = e_file_get_save_filesel ( ++ parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); ++ ++ if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK) ++ goto exit; ++ ++ path_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser)); ++ ++ e_file_update_save_path (path_uri, FALSE); + +- g_free (file_path); +- g_free (safe_name); +- } ++ for (iter = parts; iter != NULL; iter = iter->next) { ++ CamelMimePart *part = iter->data; ++ const gchar *filename; ++ gchar *uri; ++ ++ filename = emu_save_get_filename_for_part (part); ++ ++ uri = g_build_path ("/", path_uri, filename, NULL); ++ ++ /* XXX Would be nice to mention _why_ we can't save. */ ++ if (e_file_can_save (GTK_WINDOW (file_chooser), uri)) ++ mail_save_part (part, uri, NULL, NULL, FALSE); ++ else ++ g_warning ("Unable to save %s", uri); + + g_free (uri); +- } +- +- g_slist_free (parts); +- gtk_widget_destroy((GtkWidget *)filesel); +-} ++ } + +-void +-em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts) +-{ +- GtkWidget *filesel; ++ g_free (path_uri); + +- filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); +- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts); +- gtk_widget_show (filesel); ++exit: ++ gtk_widget_destroy (file_chooser); + } + + +--- evolution-2.10.1/mail/em-format-html-display.c.saving-attachments 2007-04-14 14:25:40.000000000 -0400 ++++ evolution-2.10.1/mail/em-format-html-display.c 2007-04-14 15:08:50.000000000 -0400 +@@ -2099,12 +2099,24 @@ + } + + static void +-attachments_save_all_clicked(GtkWidget *w, EMFormatHTMLDisplay *efhd) ++attachments_save_all_clicked (GtkWidget *widget, EMFormatHTMLDisplay *efhd) + { + GSList *attachment_parts; ++ guint n_attachment_parts; + +- attachment_parts = e_attachment_bar_get_parts(E_ATTACHMENT_BAR(efhd->priv->attachment_bar)); +- em_utils_save_parts(w, _("Select folder to save all attachments..."), attachment_parts); ++ attachment_parts = e_attachment_bar_get_parts ( ++ E_ATTACHMENT_BAR (efhd->priv->attachment_bar)); ++ n_attachment_parts = g_slist_length (attachment_parts); ++ g_return_if_fail (n_attachment_parts > 0); ++ ++ if (n_attachment_parts == 1) ++ em_utils_save_part ( ++ widget, _("Save attachment as"), ++ attachment_parts->data); ++ else ++ em_utils_save_parts ( ++ widget, _("Select folder to save all attachments"), ++ attachment_parts); + } + + static void diff --git a/evolution.spec b/evolution.spec index 7760930..8c4f3b2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -164,6 +164,9 @@ Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch # RH bug 235878 / GNOME bug #386503 Patch49: evolution-2.10.1-fix-help.patch +# RH bug 234315 / GNOME bug #423766 +Patch50: evolution-2.10.1-saving-attachments.patch + ## Dependencies ### Requires(post): GConf2 @@ -318,6 +321,7 @@ Development files needed for building things which link against evolution. %patch47 -p1 -b .drop-old-glib-support %patch48 -p1 -b .fix-gnome-doc-utils %patch49 -p1 -b .fix-help +%patch50 -p1 -b .saving-attachments mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -734,6 +738,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sat Apr 14 2007 Matthew Barnes - 2.10.1-4.fc7 +- Add patch for RH bug #234315 (fix saving attachments). + * Fri Apr 13 2007 Matthew Barnes - 2.10.1-3.fc7 - Add patch for RH bug #235878 (make Help->Contents work again). From 65cfeecc93481d70bfb4f3f90712612ac47b29d3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 22 Apr 2007 00:52:35 +0000 Subject: [PATCH 125/844] Don't install INSTALL --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8c4f3b2..9c749ee 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -490,7 +490,7 @@ rm -rf $RPM_BUILD_ROOT %files -f evolution-%{evo_major}.lang %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog INSTALL NEWS README +%doc AUTHORS COPYING ChangeLog NEWS README # GConf schemas: %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas @@ -738,6 +738,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sat Apr 21 2007 Matthias Clasen - 2.10.1-5 +- Don't install INSTALL + * Sat Apr 14 2007 Matthew Barnes - 2.10.1-4.fc7 - Add patch for RH bug #234315 (fix saving attachments). From a7516837087d50d071a4ebf28317e1544e3465d8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 23 Apr 2007 00:58:36 +0000 Subject: [PATCH 126/844] - Add patch for RH bug #236860 (launching from clock applet). --- evolution-2.10.1-fix-uri-handling.patch | 45 +++++++++++++++++++++++++ evolution.spec | 13 +++++-- 2 files changed, 55 insertions(+), 3 deletions(-) create mode 100644 evolution-2.10.1-fix-uri-handling.patch diff --git a/evolution-2.10.1-fix-uri-handling.patch b/evolution-2.10.1-fix-uri-handling.patch new file mode 100644 index 0000000..6df1026 --- /dev/null +++ b/evolution-2.10.1-fix-uri-handling.patch @@ -0,0 +1,45 @@ +--- evolution-2.10.1/shell/e-shell.c.fix-uri-handling 2007-04-22 20:19:39.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell.c 2007-04-22 20:20:25.000000000 -0400 +@@ -257,8 +257,8 @@ + { + EShell *shell = E_SHELL (bonobo_object_from_servant (servant)); + EComponentInfo *component_info; ++ GtkWidget *shell_window; + char *schema, *p; +- int show = FALSE; + + schema = g_alloca(strlen(uri)+1); + strcpy(schema, uri); +@@ -267,26 +267,20 @@ + *p = 0; + + component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema); +- if (component_info == NULL) { +- show = TRUE; ++ if (component_info == NULL) + component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_ALIAS, schema); +- } + + if (component_info == NULL) { + CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_UnsupportedSchema, NULL); + return; + } + +- if (show) { +- GtkWidget *shell_window; +- +- shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL); +- if (shell_window == NULL) { +- CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL); +- return; +- } ++ shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL); ++ if (shell_window == NULL) { ++ CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL); ++ return; + } +- ++ + GNOME_Evolution_Component_handleURI (component_info->iface, uri, ev); + /* not an error not to implement it */ + if (ev->_id != NULL && strcmp(ev->_id, ex_CORBA_NO_IMPLEMENT) == 0) diff --git a/evolution.spec b/evolution.spec index 9c749ee..3daaf4e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 5%{?dist} +Release: 6%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -161,12 +161,15 @@ Patch47: evolution-2.10.0-drop-old-glib-support.patch # GNOME bug #427939 (gnome-doc-utils) Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch -# RH bug 235878 / GNOME bug #386503 +# RH bug #235878 / GNOME bug #386503 Patch49: evolution-2.10.1-fix-help.patch -# RH bug 234315 / GNOME bug #423766 +# RH bug #234315 / GNOME bug #423766 Patch50: evolution-2.10.1-saving-attachments.patch +# RH bug #236860 / GNOME bug #407104 +Patch51: evolution-2.10.1-fix-uri-handling.patch + ## Dependencies ### Requires(post): GConf2 @@ -322,6 +325,7 @@ Development files needed for building things which link against evolution. %patch48 -p1 -b .fix-gnome-doc-utils %patch49 -p1 -b .fix-help %patch50 -p1 -b .saving-attachments +%patch51 -p1 -b .fix-uri-handling mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -738,6 +742,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sun Apr 22 2007 Matthew Barnes - 2.10.1-6.fc7 +- Add patch for RH bug #236860 (launching from clock applet). + * Sat Apr 21 2007 Matthias Clasen - 2.10.1-5 - Don't install INSTALL From fa084c4514665de5457c9882580fd02d6628946b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 23 Apr 2007 19:04:01 +0000 Subject: [PATCH 127/844] - Remove the welcome email from evolution@novell.com (bug #179427). --- evolution.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 3daaf4e..c537a09 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 6%{?dist} +Release: 7%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -331,6 +331,11 @@ mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/%{_lib} +# Remove the welcome email from Novell +for inbox in mail/default/*/Inbox; do + echo -n "" > $inbox +done + %build # define all of our flags, this is kind of ugly :( %if %{ldap_support} @@ -742,6 +747,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Apr 23 2007 Matthew Barnes - 2.10.1-7.fc7 +- Remove the welcome email from evolution@novell.com (bug #179427). + * Sun Apr 22 2007 Matthew Barnes - 2.10.1-6.fc7 - Add patch for RH bug #236860 (launching from clock applet). From 09003fca270c0aa375359679a4ebab05f509ac25 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 28 Apr 2007 03:52:02 +0000 Subject: [PATCH 128/844] - Add patch for RH bug #236399 (en_CA attribution format). --- evolution-2.10.1-en_CA-attribution-format.patch | 11 +++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 evolution-2.10.1-en_CA-attribution-format.patch diff --git a/evolution-2.10.1-en_CA-attribution-format.patch b/evolution-2.10.1-en_CA-attribution-format.patch new file mode 100644 index 0000000..663d243 --- /dev/null +++ b/evolution-2.10.1-en_CA-attribution-format.patch @@ -0,0 +1,11 @@ +--- evolution-2.10.1/po/en_CA.po.en_CA-attribution-format 2007-04-27 22:58:06.000000000 -0400 ++++ evolution-2.10.1/po/en_CA.po 2007-04-27 22:58:36.000000000 -0400 +@@ -10992,7 +10992,7 @@ + "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " + "${TimeZone}, ${Sender} wrote:" + msgstr "" +-"On ${AbbrevWeekdayName}, ${Year}-${Day}-${Month} at ${24Hour}:${Minute} " ++"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " + "${TimeZone}, ${Sender} wrote:" + + #: ../mail/em-filter-editor.c:155 diff --git a/evolution.spec b/evolution.spec index c537a09..068049a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 7%{?dist} +Release: 8%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -170,6 +170,9 @@ Patch50: evolution-2.10.1-saving-attachments.patch # RH bug #236860 / GNOME bug #407104 Patch51: evolution-2.10.1-fix-uri-handling.patch +# RH bug #236399 / GNOME bug #434019 +Patch52: evolution-2.10.1-en_CA-attribution-format.patch + ## Dependencies ### Requires(post): GConf2 @@ -326,6 +329,7 @@ Development files needed for building things which link against evolution. %patch49 -p1 -b .fix-help %patch50 -p1 -b .saving-attachments %patch51 -p1 -b .fix-uri-handling +%patch52 -p1 -b .en_CA-attribution-format mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -747,6 +751,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Apr 27 2007 Matthew Barnes - 2.10.1-8.fc7 +- Add patch for RH bug #236399 (en_CA attribution format). + * Mon Apr 23 2007 Matthew Barnes - 2.10.1-7.fc7 - Remove the welcome email from evolution@novell.com (bug #179427). From 9c1c3426e224549690e817ad4c107d9a0fa6257d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 30 Apr 2007 19:22:54 +0000 Subject: [PATCH 129/844] - Revise some patches so that we don't have to run autoreconf. - Remove patch for GNOME bug #427939 (use a different work-around). --- evolution-2.10.0-use-glib-i18n.patch | 1035 +++++++++++++------------- evolution.spec | 32 +- 2 files changed, 543 insertions(+), 524 deletions(-) diff --git a/evolution-2.10.0-use-glib-i18n.patch b/evolution-2.10.0-use-glib-i18n.patch index 191cb34..8e45357 100644 --- a/evolution-2.10.0-use-glib-i18n.patch +++ b/evolution-2.10.0-use-glib-i18n.patch @@ -1,5 +1,5 @@ ---- evolution-2.10.0/mail/message-tag-followup.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/message-tag-followup.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/message-tag-followup.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/message-tag-followup.c 2007-04-30 13:06:43.000000000 -0400 @@ -52,7 +52,7 @@ #include @@ -9,8 +9,8 @@ #include "e-util/e-icon-factory.h" #include "e-util/e-util-private.h" ---- evolution-2.10.0/mail/em-popup.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-popup.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-popup.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-popup.c 2007-04-30 13:06:43.000000000 -0400 @@ -41,7 +41,7 @@ #include #include @@ -20,8 +20,8 @@ #include "em-popup.h" #include "libedataserver/e-msgport.h" ---- evolution-2.10.0/mail/em-composer-utils.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/em-composer-utils.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-composer-utils.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/em-composer-utils.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -31,8 +31,8 @@ #include "mail-mt.h" #include "mail-ops.h" ---- evolution-2.10.0/mail/em-account-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-account-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-account-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-account-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -64,7 +64,7 @@ #include #include @@ -42,8 +42,8 @@ #include #include ---- evolution-2.10.0/mail/mail-tools.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-tools.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/mail-tools.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-tools.c 2007-04-30 13:06:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -53,8 +53,8 @@ #include #include ---- evolution-2.10.0/mail/em-folder-selection-button.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-selection-button.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-selection-button.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-selection-button.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include @@ -64,8 +64,8 @@ #include "mail-component.h" #include "em-folder-tree.h" ---- evolution-2.10.0/mail/em-format-hook.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-format-hook.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-format-hook.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-format-hook.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include @@ -75,8 +75,8 @@ /* class name -> klass map for EMFormat and subclasses */ ---- evolution-2.10.0/mail/em-format-quote.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-format-quote.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-format-quote.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-format-quote.c 2007-04-30 13:06:43.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -86,8 +86,8 @@ #include "em-stripsig-filter.h" #include "em-format-quote.h" ---- evolution-2.10.0/mail/em-utils.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/em-utils.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-utils.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 ++++ evolution-2.10.1/mail/em-utils.c 2007-04-30 13:06:43.000000000 -0400 @@ -59,7 +59,7 @@ #include #include @@ -97,8 +97,8 @@ #include "mail-component.h" #include "mail-mt.h" ---- evolution-2.10.0/mail/em-filter-rule.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-filter-rule.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-filter-rule.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-filter-rule.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -108,8 +108,8 @@ #include "em-filter-rule.h" #include "em-filter-context.h" ---- evolution-2.10.0/mail/mail-component.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/mail-component.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/mail-component.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/mail-component.c 2007-04-30 13:06:43.000000000 -0400 @@ -78,7 +78,7 @@ #include
@@ -119,8 +119,8 @@ #include #include ---- evolution-2.10.0/mail/importers/mail-importer.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/importers/mail-importer.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/importers/mail-importer.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/importers/mail-importer.c 2007-04-30 13:06:43.000000000 -0400 @@ -38,7 +38,7 @@ #include @@ -130,8 +130,8 @@ #include #include #include ---- evolution-2.10.0/mail/mail-send-recv.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/mail-send-recv.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/mail-send-recv.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/mail-send-recv.c 2007-04-30 13:06:43.000000000 -0400 @@ -39,7 +39,7 @@ #include #include @@ -141,8 +141,8 @@ #include "e-util/e-gtk-utils.h" #include "libedataserver/e-account-list.h" ---- evolution-2.10.0/mail/em-format-html.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/em-format-html.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-format-html.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/em-format-html.c 2007-04-30 13:06:43.000000000 -0400 @@ -51,7 +51,7 @@ #include #include @@ -152,8 +152,8 @@ #include #include ---- evolution-2.10.0/mail/em-filter-folder-element.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-filter-folder-element.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-filter-folder-element.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-filter-folder-element.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -163,8 +163,8 @@ #include "em-filter-folder-element.h" #include "mail/em-folder-selection-button.h" ---- evolution-2.10.0/mail/em-folder-tree.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/em-folder-tree.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-tree.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-tree.c 2007-04-30 13:06:43.000000000 -0400 @@ -38,7 +38,7 @@ #include #include @@ -174,8 +174,8 @@ #include #include ---- evolution-2.10.0/mail/em-filter-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-filter-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-filter-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-filter-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #endif @@ -185,8 +185,8 @@ #include "e-util/e-util-private.h" ---- evolution-2.10.0/mail/em-folder-tree-model.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-tree-model.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-tree-model.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-tree-model.c 2007-04-30 13:06:43.000000000 -0400 @@ -39,7 +39,7 @@ #include @@ -196,8 +196,8 @@ #include ---- evolution-2.10.0/mail/message-list.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/message-list.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/message-list.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/message-list.c 2007-04-30 13:06:43.000000000 -0400 @@ -38,7 +38,7 @@ #include @@ -207,8 +207,8 @@ #include #include ---- evolution-2.10.0/mail/em-folder-properties.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/em-folder-properties.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-properties.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-properties.c 2007-04-30 13:06:43.000000000 -0400 @@ -44,7 +44,7 @@ #include #include @@ -218,8 +218,8 @@ #include "em-folder-properties.h" #include "em-config.h" ---- evolution-2.10.0/mail/mail-ops.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/mail-ops.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/mail-ops.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/mail-ops.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include @@ -229,8 +229,8 @@ #include #include ---- evolution-2.10.0/mail/em-migrate.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-migrate.c 2007-04-03 15:08:31.000000000 -0400 +--- evolution-2.10.1/mail/em-migrate.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-migrate.c 2007-04-30 13:06:43.000000000 -0400 @@ -54,7 +54,7 @@ #include #include @@ -294,8 +294,8 @@ dir = g_dir_open(local, 0, NULL); if (dir) { ---- evolution-2.10.0/mail/mail-vfolder.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/mail-vfolder.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/mail-vfolder.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/mail-vfolder.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -305,8 +305,8 @@ #include #include ---- evolution-2.10.0/mail/em-folder-selector.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-folder-selector.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-selector.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-selector.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -316,8 +316,8 @@ #include #include ---- evolution-2.10.0/mail/em-subscribe-editor.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/em-subscribe-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-subscribe-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/em-subscribe-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -44,7 +44,7 @@ #include "mail-config.h" @@ -327,8 +327,8 @@ #include #include ---- evolution-2.10.0/mail/mail-autofilter.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-autofilter.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/mail-autofilter.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-autofilter.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include @@ -338,8 +338,8 @@ #include #include #include ---- evolution-2.10.0/mail/em-format-html-display.c.use-glib-i18n 2007-02-26 04:59:59.000000000 -0500 -+++ evolution-2.10.0/mail/em-format-html-display.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-format-html-display.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-format-html-display.c 2007-04-30 13:06:43.000000000 -0400 @@ -67,7 +67,7 @@ #include @@ -349,8 +349,8 @@ #include #include ---- evolution-2.10.0/mail/em-account-prefs.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-account-prefs.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-account-prefs.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-account-prefs.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -360,8 +360,8 @@ #include "mail-component.h" #include "mail-config.h" ---- evolution-2.10.0/mail/mail-folder-cache.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/mail-folder-cache.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/mail-folder-cache.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/mail-folder-cache.c 2007-04-30 13:06:43.000000000 -0400 @@ -37,7 +37,7 @@ #include @@ -371,8 +371,8 @@ #include #include #include ---- evolution-2.10.0/mail/em-format.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-format.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-format.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-format.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -382,8 +382,8 @@ #include #include ---- evolution-2.10.0/mail/em-vfolder-editor.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-vfolder-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-vfolder-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-vfolder-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #endif @@ -393,8 +393,8 @@ #include "e-util/e-util-private.h" ---- evolution-2.10.0/mail/mail-mt.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/mail-mt.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/mail-mt.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/mail-mt.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -404,8 +404,8 @@ #include ---- evolution-2.10.0/mail/em-folder-utils.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/mail/em-folder-utils.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-folder-utils.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-utils.c 2007-04-30 13:06:43.000000000 -0400 @@ -37,7 +37,7 @@ #include @@ -415,8 +415,8 @@ #include #include ---- evolution-2.10.0/mail/em-vfolder-rule.c.use-glib-i18n 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/em-vfolder-rule.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/mail/em-vfolder-rule.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/em-vfolder-rule.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include @@ -426,8 +426,8 @@ #include "camel/camel-url.h" #include "em-vfolder-context.h" ---- evolution-2.10.0/a11y/widgets/ea-calendar-item.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 -+++ evolution-2.10.0/a11y/widgets/ea-calendar-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/widgets/ea-calendar-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/widgets/ea-calendar-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -437,8 +437,8 @@ #include #include "ea-calendar-item.h" #include "ea-calendar-cell.h" ---- evolution-2.10.0/a11y/addressbook/ea-minicard-view.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 -+++ evolution-2.10.0/a11y/addressbook/ea-minicard-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/addressbook/ea-minicard-view.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 ++++ evolution-2.10.1/a11y/addressbook/ea-minicard-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -20,11 +20,10 @@ */ @@ -452,8 +452,8 @@ #include "ea-minicard.h" #include "ea-minicard-view.h" #include "eab-gui-util.h" ---- evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 -+++ evolution-2.10.0/a11y/addressbook/ea-addressbook-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/addressbook/ea-addressbook-view.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 ++++ evolution-2.10.1/a11y/addressbook/ea-addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -22,7 +22,7 @@ #include @@ -463,8 +463,8 @@ #include "ea-addressbook-view.h" static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible); ---- evolution-2.10.0/a11y/addressbook/ea-minicard.c.use-glib-i18n 2007-01-03 10:34:56.000000000 -0500 -+++ evolution-2.10.0/a11y/addressbook/ea-minicard.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/addressbook/ea-minicard.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 ++++ evolution-2.10.1/a11y/addressbook/ea-minicard.c 2007-04-30 13:06:43.000000000 -0400 @@ -22,7 +22,7 @@ #include @@ -474,8 +474,8 @@ #include "ea-minicard.h" #include "ea-minicard-view.h" #include "e-minicard.h" ---- evolution-2.10.0/a11y/calendar/ea-day-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-day-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/calendar/ea-day-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/calendar/ea-day-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include "ea-gnome-calendar.h" #include "calendar-commands.h" @@ -485,8 +485,8 @@ static void ea_day_view_class_init (EaDayViewClass *klass); ---- evolution-2.10.0/a11y/calendar/ea-jump-button.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-jump-button.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/calendar/ea-jump-button.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/calendar/ea-jump-button.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include "ea-week-view.h" #include "e-week-view.h" @@ -496,8 +496,8 @@ static void ea_jump_button_class_init (EaJumpButtonClass *klass); ---- evolution-2.10.0/a11y/calendar/ea-cal-view-event.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-cal-view-event.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/calendar/ea-cal-view-event.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/calendar/ea-cal-view-event.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include "ea-day-view.h" #include "ea-week-view.h" @@ -507,8 +507,8 @@ static void ea_cal_view_event_class_init (EaCalViewEventClass *klass); static void ea_cal_view_event_init (EaCalViewEvent *a11y); ---- evolution-2.10.0/a11y/calendar/ea-week-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-week-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/calendar/ea-week-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/calendar/ea-week-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include "ea-gnome-calendar.h" #include "calendar-commands.h" @@ -518,8 +518,8 @@ static void ea_week_view_class_init (EaWeekViewClass *klass); ---- evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-week-view-main-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/calendar/ea-week-view-main-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/calendar/ea-week-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include "ea-week-view.h" #include "ea-week-view-cell.h" @@ -529,8 +529,8 @@ /* EaWeekViewMainItem */ static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass); ---- evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-day-view-main-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/calendar/ea-day-view-main-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/calendar/ea-day-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include "ea-day-view.h" #include "ea-day-view-cell.h" @@ -540,8 +540,8 @@ /* EaDayViewMainItem */ static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass); ---- evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-gnome-calendar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/calendar/ea-gnome-calendar.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/calendar/ea-gnome-calendar.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -551,8 +551,8 @@ static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); ---- evolution-2.10.0/a11y/calendar/ea-cal-view.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/calendar/ea-cal-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/calendar/ea-cal-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 ++++ evolution-2.10.1/a11y/calendar/ea-cal-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include "calendar-commands.h" #include "goto.h" @@ -562,8 +562,8 @@ static void ea_cal_view_class_init (EaCalViewClass *klass); ---- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-popup.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-popup.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 ++++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-popup.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include "a11y/gal-a11y-util.h" @@ -573,8 +573,8 @@ #include "gal-a11y-e-cell-popup.h" #include "gal-a11y-e-cell-registry.h" ---- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 ++++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell.c 2007-04-30 13:06:43.000000000 -0400 @@ -15,7 +15,7 @@ #include "a11y/gal-a11y-util.h" #include "table/e-table.h" @@ -584,8 +584,8 @@ #include "gal-a11y-e-cell.h" #include "gal-a11y-e-cell-vbox.h" ---- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-toggle.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-toggle.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 ++++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-toggle.c 2007-04-30 13:06:43.000000000 -0400 @@ -2,7 +2,7 @@ #include "table/e-cell-toggle.h" @@ -595,8 +595,8 @@ #include "gal-a11y-e-cell-toggle.h" ---- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-text.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-text.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 ++++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-text.c 2007-04-30 13:06:43.000000000 -0400 @@ -14,7 +14,7 @@ #include "a11y/gal-a11y-util.h" @@ -606,8 +606,8 @@ #include "gal-a11y-e-cell-text.h" ---- evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-cell-tree.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-tree.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 ++++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-tree.c 2007-04-30 13:06:43.000000000 -0400 @@ -14,7 +14,7 @@ #include "table/e-cell-tree.h" #include "table/e-table.h" @@ -617,8 +617,8 @@ #include "gal-a11y-e-cell-tree.h" #include "gal-a11y-e-cell-registry.h" ---- evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c.use-glib-i18n 2007-01-03 10:34:57.000000000 -0500 -+++ evolution-2.10.0/a11y/e-table/gal-a11y-e-table-click-to-add.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/a11y/e-table/gal-a11y-e-table-click-to-add.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 ++++ evolution-2.10.1/a11y/e-table/gal-a11y-e-table-click-to-add.c 2007-04-30 13:06:43.000000000 -0400 @@ -13,7 +13,7 @@ #include "table/e-table-click-to-add.h" #include "table/e-table-group.h" @@ -628,8 +628,8 @@ #include "gal-a11y-e-table-click-to-add.h" #include "gal-a11y-e-table-click-to-add-factory.h" ---- evolution-2.10.0/filter/rule-editor.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/rule-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/rule-editor.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 ++++ evolution-2.10.1/filter/rule-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -639,8 +639,8 @@ #include "e-util/e-error.h" #include "e-util/e-util-private.h" ---- evolution-2.10.0/filter/filter-label.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-label.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/filter-label.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 ++++ evolution-2.10.1/filter/filter-label.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -650,8 +650,8 @@ #include #include #include ---- evolution-2.10.0/filter/filter-part.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-part.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/filter-part.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 ++++ evolution-2.10.1/filter/filter-part.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -661,8 +661,8 @@ #include "filter-part.h" #include "rule-context.h" ---- evolution-2.10.0/filter/filter-datespec.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/filter/filter-datespec.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/filter-datespec.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/filter/filter-datespec.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -672,8 +672,8 @@ #include #include "filter-datespec.h" ---- evolution-2.10.0/filter/rule-context.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/rule-context.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/rule-context.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 ++++ evolution-2.10.1/filter/rule-context.c 2007-04-30 13:06:43.000000000 -0400 @@ -34,7 +34,7 @@ #include @@ -683,8 +683,8 @@ #include #include ---- evolution-2.10.0/filter/filter-option.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-option.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/filter-option.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 ++++ evolution-2.10.1/filter/filter-option.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include @@ -694,8 +694,8 @@ #include "filter-option.h" #include "filter-part.h" ---- evolution-2.10.0/filter/filter-file.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-file.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/filter-file.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 ++++ evolution-2.10.1/filter/filter-file.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -705,8 +705,8 @@ #include #include ---- evolution-2.10.0/filter/filter-input.c.use-glib-i18n 2007-01-03 10:34:13.000000000 -0500 -+++ evolution-2.10.0/filter/filter-input.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/filter-input.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 ++++ evolution-2.10.1/filter/filter-input.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -716,8 +716,8 @@ #include "filter-input.h" #include "libedataserver/e-sexp.h" ---- evolution-2.10.0/filter/filter-rule.c.use-glib-i18n 2007-02-26 05:00:00.000000000 -0500 -+++ evolution-2.10.0/filter/filter-rule.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/filter/filter-rule.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 ++++ evolution-2.10.1/filter/filter-rule.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -727,8 +727,8 @@ #include "e-util/e-error.h" #include "filter-rule.h" ---- evolution-2.10.0/widgets/misc/e-calendar-item.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-calendar-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-calendar-item.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-calendar-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -43,7 +43,7 @@ #include #include @@ -738,8 +738,8 @@ #include #include ---- evolution-2.10.0/widgets/misc/e-unicode.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-unicode.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-unicode.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-unicode.c 2007-04-30 13:06:43.000000000 -0400 @@ -42,7 +42,7 @@ #include @@ -749,8 +749,8 @@ #include "e-unicode.h" #define d(x) x ---- evolution-2.10.0/widgets/misc/e-task-widget.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-task-widget.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-task-widget.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-task-widget.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -760,8 +760,8 @@ #define SPACING 2 ---- evolution-2.10.0/widgets/misc/e-filter-bar.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-filter-bar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-filter-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-filter-bar.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -771,8 +771,8 @@ #include "e-dropdown-button.h" #include "e-filter-bar.h" ---- evolution-2.10.0/widgets/misc/e-dateedit.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-dateedit.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-dateedit.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-dateedit.c 2007-04-30 13:06:43.000000000 -0400 @@ -58,7 +58,7 @@ #include #include @@ -782,8 +782,8 @@ #include #include #include ---- evolution-2.10.0/widgets/misc/e-charset-picker.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-charset-picker.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-charset-picker.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-charset-picker.c 2007-04-30 13:06:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -793,8 +793,8 @@ #include #include ---- evolution-2.10.0/widgets/misc/e-clipped-label.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-clipped-label.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-clipped-label.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-clipped-label.c 2007-04-30 13:06:43.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -804,8 +804,8 @@ static void e_clipped_label_class_init (EClippedLabelClass *class); ---- evolution-2.10.0/widgets/misc/e-cell-percent.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-cell-percent.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-cell-percent.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-cell-percent.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -815,8 +815,8 @@ #include "e-cell-percent.h" ---- evolution-2.10.0/widgets/misc/e-cell-date-edit.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-cell-date-edit.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-cell-date-edit.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-cell-date-edit.c 2007-04-30 13:06:43.000000000 -0400 @@ -44,7 +44,7 @@ #include
@@ -826,8 +826,8 @@ #include ---- evolution-2.10.0/widgets/misc/e-map.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-map.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-map.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-map.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -837,8 +837,8 @@ #include "e-util/e-util-private.h" #include "e-util/e-util.h" ---- evolution-2.10.0/widgets/misc/e-canvas-background.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-canvas-background.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-canvas-background.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-canvas-background.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include #include @@ -848,8 +848,8 @@ #include "e-util/e-util.h" #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" ---- evolution-2.10.0/widgets/misc/e-selection-model.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-selection-model.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-selection-model.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-selection-model.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -859,8 +859,8 @@ #include "e-util/e-util-marshal.h" #include "e-util/e-util.h" ---- evolution-2.10.0/widgets/misc/e-selection-model-array.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-selection-model-array.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-selection-model-array.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-selection-model-array.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -870,8 +870,8 @@ #include "e-util/e-util.h" #include "e-selection-model-array.h" ---- evolution-2.10.0/widgets/misc/e-send-options.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-send-options.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-send-options.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-send-options.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include #include @@ -881,8 +881,8 @@ #include #include ---- evolution-2.10.0/widgets/misc/e-calendar.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-calendar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-calendar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-calendar.c 2007-04-30 13:06:43.000000000 -0400 @@ -43,7 +43,7 @@ #include #include @@ -892,8 +892,8 @@ #define E_CALENDAR_SMALL_FONT_PTSIZE 6 ---- evolution-2.10.0/widgets/misc/e-reflow.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-reflow.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-reflow.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-reflow.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -903,8 +903,8 @@ #include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "misc/e-unicode.h" ---- evolution-2.10.0/widgets/misc/e-search-bar.c.use-glib-i18n 2007-01-08 07:23:31.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-search-bar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-search-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-search-bar.c 2007-04-30 13:06:43.000000000 -0400 @@ -42,7 +42,7 @@ #include #include @@ -914,8 +914,8 @@ #include ---- evolution-2.10.0/widgets/misc/e-attachment-bar.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-attachment-bar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-attachment-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-attachment-bar.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -925,8 +925,8 @@ #include #include "e-attachment.h" ---- evolution-2.10.0/widgets/misc/e-attachment.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-attachment.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-attachment.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-attachment.c 2007-04-30 13:06:43.000000000 -0400 @@ -51,7 +51,7 @@ #include #include @@ -936,8 +936,8 @@ #include #include "e-util/e-mktemp.h" ---- evolution-2.10.0/widgets/misc/e-canvas-vbox.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-canvas-vbox.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-canvas-vbox.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-canvas-vbox.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include #include @@ -947,8 +947,8 @@ #include "e-util/e-util.h" #include "e-canvas.h" ---- evolution-2.10.0/widgets/misc/e-activity-handler.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-activity-handler.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-activity-handler.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-activity-handler.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -958,8 +958,8 @@ #include #include ---- evolution-2.10.0/widgets/misc/e-image-chooser.c.use-glib-i18n 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-image-chooser.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/misc/e-image-chooser.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-image-chooser.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -969,8 +969,8 @@ #include "e-image-chooser.h" #include "e-util/e-util-marshal.h" ---- evolution-2.10.0/widgets/menus/gal-view-new-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-new-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/menus/gal-view-new-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 ++++ evolution-2.10.1/widgets/menus/gal-view-new-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -989,8 +989,8 @@ g_free (filename); dialog->gui = gui; ---- evolution-2.10.0/widgets/menus/gal-view-factory-etable.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-factory-etable.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/menus/gal-view-factory-etable.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 ++++ evolution-2.10.1/widgets/menus/gal-view-factory-etable.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #include @@ -1000,8 +1000,8 @@ #include "e-util/e-util.h" #include "gal-view-etable.h" ---- evolution-2.10.0/widgets/menus/gal-define-views-model.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-define-views-model.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/menus/gal-define-views-model.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 ++++ evolution-2.10.1/widgets/menus/gal-define-views-model.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1011,8 +1011,8 @@ #include "e-util/e-util.h" #include "gal-define-views-model.h" ---- evolution-2.10.0/widgets/menus/gal-define-views-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-define-views-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/menus/gal-define-views-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 ++++ evolution-2.10.1/widgets/menus/gal-define-views-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -1040,8 +1040,8 @@ g_free (filename); dialog->gui = gui; ---- evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-instance-save-as-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/menus/gal-view-instance-save-as-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 ++++ evolution-2.10.1/widgets/menus/gal-view-instance-save-as-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -1069,8 +1069,8 @@ "" \ " " \ "" ---- evolution-2.10.0/widgets/menus/gal-view-instance.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-instance.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/menus/gal-view-instance.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 ++++ evolution-2.10.1/widgets/menus/gal-view-instance.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -1080,8 +1080,8 @@ #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "misc/e-unicode.h" ---- evolution-2.10.0/widgets/menus/gal-view-collection.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-collection.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/menus/gal-view-collection.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 ++++ evolution-2.10.1/widgets/menus/gal-view-collection.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -1091,8 +1091,8 @@ #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "misc/e-unicode.h" ---- evolution-2.10.0/widgets/menus/gal-view-menus.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/menus/gal-view-menus.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/menus/gal-view-menus.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 ++++ evolution-2.10.1/widgets/menus/gal-view-menus.c 2007-04-30 13:06:43.000000000 -0400 @@ -20,7 +20,7 @@ #include #include @@ -1102,8 +1102,8 @@ #include #include #include ---- evolution-2.10.0/widgets/table/e-cell-pixbuf.c.use-glib-i18n 2007-03-08 01:11:20.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-pixbuf.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-cell-pixbuf.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-cell-pixbuf.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -1113,8 +1113,8 @@ #include #include "e-cell-pixbuf.h" ---- evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-field-chooser-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-field-chooser-dialog.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-field-chooser-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -1124,8 +1124,8 @@ #include "e-util/e-util.h" #include "e-table-field-chooser-dialog.h" ---- evolution-2.10.0/widgets/table/e-table-sorter.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-sorter.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-sorter.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-sorter.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -1135,8 +1135,8 @@ #include "e-util/e-util.h" #include "e-table-sorter.h" ---- evolution-2.10.0/widgets/table/e-table-selection-model.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-selection-model.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-selection-model.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-selection-model.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -1146,8 +1146,8 @@ #include "e-util/e-util.h" #include "e-table-selection-model.h" ---- evolution-2.10.0/widgets/table/e-table-group-leaf.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-group-leaf.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-group-leaf.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-group-leaf.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -1157,8 +1157,8 @@ #include "e-util/e-util.h" #include "misc/e-canvas.h" ---- evolution-2.10.0/widgets/table/e-table-field-chooser.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-field-chooser.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-field-chooser.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-field-chooser.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -1177,8 +1177,8 @@ g_free (filename); etfc->gui = gui; ---- evolution-2.10.0/widgets/table/e-table-item.c.use-glib-i18n 2007-01-23 03:23:43.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -38,7 +38,7 @@ #include "a11y/e-table/gal-a11y-e-table-item-factory.h" @@ -1188,8 +1188,8 @@ #include "e-util/e-util.h" #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" ---- evolution-2.10.0/widgets/table/e-table.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include @@ -1199,8 +1199,8 @@ #include "e-util/e-util.h" #include "misc/e-canvas.h" #include "misc/e-canvas-background.h" ---- evolution-2.10.0/widgets/table/e-table-group-container.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-group-container.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-group-container.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-group-container.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -1210,8 +1210,8 @@ #include "e-util/e-util.h" #include "misc/e-canvas-utils.h" #include "misc/e-canvas.h" ---- evolution-2.10.0/widgets/table/e-cell-float.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-float.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-cell-float.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-cell-float.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -1221,8 +1221,8 @@ #include "e-util/e-util.h" #include "e-cell-float.h" ---- evolution-2.10.0/widgets/table/e-tree-scrolled.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-tree-scrolled.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-tree-scrolled.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-tree-scrolled.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -1232,8 +1232,8 @@ #include "e-util/e-util.h" #include "e-tree-scrolled.h" ---- evolution-2.10.0/widgets/table/e-table-col.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-col.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-col.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-col.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #include @@ -1243,8 +1243,8 @@ #include "e-util/e-util.h" #include "e-table-col.h" ---- evolution-2.10.0/widgets/table/e-table-scrolled.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-scrolled.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-scrolled.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-scrolled.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -1254,8 +1254,8 @@ #include "e-table.h" #include "e-table-scrolled.h" ---- evolution-2.10.0/widgets/table/e-table-header-item.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-header-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-header-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-header-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -1283,8 +1283,8 @@ g_object_ref (popup); gtk_object_sink (GTK_OBJECT (popup)); g_signal_connect (popup, "selection-done", ---- evolution-2.10.0/widgets/table/e-table-field-chooser-item.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-field-chooser-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-field-chooser-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-field-chooser-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -1294,8 +1294,8 @@ #include "e-util/e-util.h" #include "e-util/e-xml-utils.h" #include "misc/e-canvas.h" ---- evolution-2.10.0/widgets/table/e-table-config.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-config.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-config.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-config.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -1331,8 +1331,8 @@ g_free (filename); } ---- evolution-2.10.0/widgets/table/e-cell-text.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/widgets/table/e-cell-text.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-cell-text.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-cell-text.c 2007-04-30 13:06:43.000000000 -0400 @@ -50,7 +50,7 @@ #include "a11y/e-table/gal-a11y-e-cell-registry.h" #include "a11y/e-table/gal-a11y-e-cell-text.h" @@ -1342,8 +1342,8 @@ #include "e-util/e-text-event-processor.h" #include "e-util/e-text-event-processor-emacs-like.h" #include "e-util/e-util.h" ---- evolution-2.10.0/widgets/table/e-tree.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-tree.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-tree.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-tree.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include @@ -1353,8 +1353,8 @@ #include "e-util/e-util.h" #include "e-util/e-util-marshal.h" #include "misc/e-canvas.h" ---- evolution-2.10.0/widgets/table/e-cell-number.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-number.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-cell-number.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-cell-number.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -1364,8 +1364,8 @@ #include "e-util/e-util.h" #include "e-cell-number.h" ---- evolution-2.10.0/widgets/table/e-tree-selection-model.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-tree-selection-model.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-tree-selection-model.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-tree-selection-model.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -1375,8 +1375,8 @@ #include "e-util/e-util.h" #include "e-tree-selection-model.h" ---- evolution-2.10.0/widgets/table/e-cell-combo.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-combo.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-cell-combo.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-cell-combo.c 2007-04-30 13:06:43.000000000 -0400 @@ -59,7 +59,7 @@ #include #include @@ -1386,8 +1386,8 @@ #include "e-util/e-util.h" #include "misc/e-unicode.h" ---- evolution-2.10.0/widgets/table/e-table-click-to-add.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-table-click-to-add.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-table-click-to-add.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-table-click-to-add.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include "a11y/e-table/gal-a11y-e-table-click-to-add.h" @@ -1397,8 +1397,8 @@ #include "e-util/e-util-marshal.h" #include "e-util/e-util.h" #include "misc/e-canvas-utils.h" ---- evolution-2.10.0/widgets/table/e-cell-date.c.use-glib-i18n 2007-01-03 10:34:45.000000000 -0500 -+++ evolution-2.10.0/widgets/table/e-cell-date.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/table/e-cell-date.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 ++++ evolution-2.10.1/widgets/table/e-cell-date.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1408,8 +1408,8 @@ #include "e-util/e-util.h" #include "misc/e-unicode.h" ---- evolution-2.10.0/widgets/text/e-text.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/widgets/text/e-text.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/text/e-text.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/widgets/text/e-text.c 2007-04-30 13:06:43.000000000 -0400 @@ -52,7 +52,7 @@ #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" @@ -1419,8 +1419,8 @@ #include "e-util/e-text-event-processor-emacs-like.h" #include "e-util/e-util.h" ---- evolution-2.10.0/widgets/text/e-completion-view.c.use-glib-i18n 2007-01-03 10:34:41.000000000 -0500 -+++ evolution-2.10.0/widgets/text/e-completion-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/text/e-completion-view.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/widgets/text/e-completion-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include "table/e-table-scrolled.h" @@ -1439,8 +1439,8 @@ " " ---- evolution-2.10.0/widgets/text/e-entry.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/widgets/text/e-entry.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/widgets/text/e-entry.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/widgets/text/e-entry.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -1450,8 +1450,8 @@ #include "e-util/e-util.h" #include "misc/e-canvas.h" #include "misc/e-canvas-utils.h" ---- evolution-2.10.0/plugins/calendar-file/calendar-file.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/calendar-file/calendar-file.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/calendar-file/calendar-file.c.use-glib-i18n 2007-04-09 09:09:11.000000000 -0400 ++++ evolution-2.10.1/plugins/calendar-file/calendar-file.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -1461,8 +1461,8 @@ #include GtkWidget *e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); ---- evolution-2.10.0/plugins/mark-all-read/mark-all-read.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/plugins/mark-all-read/mark-all-read.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -1472,8 +1472,8 @@ #include #include #include ---- evolution-2.10.0/plugins/publish-calendar/publish-calendar.c.use-glib-i18n 2007-01-03 10:34:05.000000000 -0500 -+++ evolution-2.10.0/plugins/publish-calendar/publish-calendar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/publish-calendar/publish-calendar.c.use-glib-i18n 2007-04-09 09:09:16.000000000 -0400 ++++ evolution-2.10.1/plugins/publish-calendar/publish-calendar.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #include #include @@ -1483,8 +1483,8 @@ #include #include #include ---- evolution-2.10.0/plugins/calendar-weather/calendar-weather.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/calendar-weather/calendar-weather.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/calendar-weather/calendar-weather.c.use-glib-i18n 2007-04-09 09:09:15.000000000 -0400 ++++ evolution-2.10.1/plugins/calendar-weather/calendar-weather.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1494,8 +1494,8 @@ #include #include #include ---- evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/import-ics-attachments/icsimporter.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/import-ics-attachments/icsimporter.c.use-glib-i18n 2007-04-09 09:09:11.000000000 -0400 ++++ evolution-2.10.1/plugins/import-ics-attachments/icsimporter.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -1505,8 +1505,8 @@ #include #include #include ---- evolution-2.10.0/plugins/backup-restore/backup-restore.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/backup-restore/backup-restore.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/backup-restore/backup-restore.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 ++++ evolution-2.10.1/plugins/backup-restore/backup-restore.c 2007-04-30 13:06:43.000000000 -0400 @@ -2,7 +2,7 @@ #include #include @@ -1516,8 +1516,8 @@ #include "shell/es-menu.h" void org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target); ---- evolution-2.10.0/plugins/backup-restore/backup.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/backup-restore/backup.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/backup-restore/backup.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 ++++ evolution-2.10.1/plugins/backup-restore/backup.c 2007-04-30 13:06:43.000000000 -0400 @@ -8,7 +8,7 @@ #include #include @@ -1527,8 +1527,8 @@ #include #define EVOLUTION "evolution-" BASE_VERSION ---- evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c.use-glib-i18n 2007-01-23 03:23:42.000000000 -0500 -+++ evolution-2.10.0/plugins/exchange-operations/exchange-send-options.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.use-glib-i18n 2007-04-09 09:09:13.000000000 -0400 ++++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include #include @@ -1538,8 +1538,8 @@ #include #include "e-util/e-util-private.h" ---- evolution-2.10.0/plugins/default-source/default-source.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/default-source/default-source.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/default-source/default-source.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 ++++ evolution-2.10.1/plugins/default-source/default-source.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1549,8 +1549,8 @@ #include GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data); void commit_default_calendar (EPlugin *epl, EConfigTarget *target); ---- evolution-2.10.0/plugins/subject-thread/subject-thread.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/subject-thread/subject-thread.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/subject-thread/subject-thread.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 ++++ evolution-2.10.1/plugins/subject-thread/subject-thread.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -1560,8 +1560,8 @@ #include #include #include ---- evolution-2.10.0/plugins/calendar-http/calendar-http.c.use-glib-i18n 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/calendar-http/calendar-http.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/calendar-http/calendar-http.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 ++++ evolution-2.10.1/plugins/calendar-http/calendar-http.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -1571,8 +1571,8 @@ #include GtkWidget *e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data); ---- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/itip-formatter/itip-formatter.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/plugins/itip-formatter/itip-formatter.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1582,8 +1582,8 @@ #include #include #include ---- evolution-2.10.0/plugins/itip-formatter/itip-view.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/plugins/itip-formatter/itip-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/itip-formatter/itip-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/plugins/itip-formatter/itip-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -1593,8 +1593,8 @@ #include #include #include ---- evolution-2.10.0/plugins/groupwise-features/share-folder-common.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/plugins/groupwise-features/share-folder-common.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -1604,8 +1604,8 @@ #include #include #include ---- evolution-2.10.0/plugins/groupwise-features/junk-settings.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/junk-settings.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/groupwise-features/junk-settings.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 ++++ evolution-2.10.1/plugins/groupwise-features/junk-settings.c 2007-04-30 13:06:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -1615,8 +1615,8 @@ #include #include #include ---- evolution-2.10.0/plugins/groupwise-features/install-shared.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/install-shared.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/groupwise-features/install-shared.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 ++++ evolution-2.10.1/plugins/groupwise-features/install-shared.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include #include @@ -1626,8 +1626,8 @@ #include #include #include ---- evolution-2.10.0/plugins/groupwise-features/process-meeting.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/process-meeting.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/groupwise-features/process-meeting.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 ++++ evolution-2.10.1/plugins/groupwise-features/process-meeting.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -1637,8 +1637,8 @@ #include #include #include ---- evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c.use-glib-i18n 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/addressbook-groupwise.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/groupwise-features/addressbook-groupwise.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 ++++ evolution-2.10.1/plugins/groupwise-features/addressbook-groupwise.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -1648,8 +1648,8 @@ #include void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target); ---- evolution-2.10.0/plugins/groupwise-features/send-options.c.use-glib-i18n 2007-02-26 04:59:57.000000000 -0500 -+++ evolution-2.10.0/plugins/groupwise-features/send-options.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/groupwise-features/send-options.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 ++++ evolution-2.10.1/plugins/groupwise-features/send-options.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -1659,8 +1659,8 @@ #include #include #include "mail/em-account-editor.h" ---- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/bbdb/gaimbuddies.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/plugins/bbdb/gaimbuddies.c 2007-04-30 13:06:43.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -1670,8 +1670,8 @@ #include #include ---- evolution-2.10.0/plugins/bbdb/bbdb.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/plugins/bbdb/bbdb.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/plugins/bbdb/bbdb.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/plugins/bbdb/bbdb.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #endif @@ -1681,8 +1681,8 @@ #include #include ---- evolution-2.10.0/e-util/e-categories-config.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-categories-config.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-categories-config.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-categories-config.c 2007-04-30 13:06:43.000000000 -0400 @@ -10,7 +10,7 @@ #include @@ -1692,8 +1692,8 @@ #include #include #include ---- evolution-2.10.0/e-util/e-text-event-processor.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-text-event-processor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-text-event-processor.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-text-event-processor.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,8 @@ #include @@ -1704,8 +1704,8 @@ #include "e-util-marshal.h" #include "e-text-event-processor.h" #include "e-util.h" ---- evolution-2.10.0/e-util/e-util.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-util.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-util.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-util.c 2007-04-30 13:06:43.000000000 -0400 @@ -1112,20 +1112,6 @@ } } @@ -1727,8 +1727,8 @@ cairo_font_options_t * get_font_options () { ---- evolution-2.10.0/e-util/e-popup.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-popup.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-popup.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-popup.c 2007-04-30 13:06:43.000000000 -0400 @@ -42,7 +42,7 @@ #include @@ -1738,8 +1738,8 @@ #define d(x) ---- evolution-2.10.0/e-util/e-xml-utils.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-xml-utils.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-xml-utils.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-xml-utils.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,155 +36,14 @@ #include @@ -1897,8 +1897,8 @@ gint e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name) { ---- evolution-2.10.0/e-util/e-config.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-config.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-config.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-config.c 2007-04-30 13:06:43.000000000 -0400 @@ -45,7 +45,7 @@ #include @@ -1908,8 +1908,8 @@ #define d(x) ---- evolution-2.10.0/e-util/e-dialog-utils.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-dialog-utils.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-dialog-utils.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-dialog-utils.c 2007-04-30 13:06:43.000000000 -0400 @@ -46,7 +46,7 @@ #include @@ -1919,8 +1919,8 @@ #include #include ---- evolution-2.10.0/e-util/e-import.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-import.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-import.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-import.c 2007-04-30 13:06:43.000000000 -0400 @@ -45,7 +45,7 @@ #include @@ -1930,8 +1930,8 @@ #define d(x) ---- evolution-2.10.0/e-util/Makefile.am.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/Makefile.am 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/Makefile.am.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/Makefile.am 2007-04-30 13:06:43.000000000 -0400 @@ -108,7 +108,6 @@ eggtrayicon.c \ eggtrayicon.h \ @@ -1940,8 +1940,8 @@ e-sorter.c \ e-sorter-array.c \ e-text-event-processor-emacs-like.c \ ---- evolution-2.10.0/e-util/e-error.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-error.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-error.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-error.c 2007-04-30 13:06:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -1951,8 +1951,8 @@ #include #include ---- evolution-2.10.0/e-util/e-event.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-event.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-event.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-event.c 2007-04-30 13:06:43.000000000 -0400 @@ -42,7 +42,7 @@ #include @@ -1962,8 +1962,8 @@ #include #define d(x) ---- evolution-2.10.0/e-util/e-xml-utils.h.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-xml-utils.h 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-xml-utils.h.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-xml-utils.h 2007-04-30 13:06:43.000000000 -0400 @@ -30,18 +30,6 @@ G_BEGIN_DECLS @@ -1983,8 +1983,8 @@ gint e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name); gint e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, ---- evolution-2.10.0/e-util/e-i18n.h.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-i18n.h 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/e-i18n.h.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-i18n.h 2007-04-30 13:06:43.000000000 -0400 @@ -1,74 +0,0 @@ -/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ -/* @@ -2060,8 +2060,27 @@ -G_END_DECLS - -#endif /* __E_I18N_H__ */ ---- evolution-2.10.0/e-util/e-menu.c.use-glib-i18n 2007-01-03 10:34:40.000000000 -0500 -+++ evolution-2.10.0/e-util/e-menu.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/e-util/Makefile.in.use-glib-i18n 2007-04-30 13:09:50.000000000 -0400 ++++ evolution-2.10.1/e-util/Makefile.in 2007-04-30 13:10:02.000000000 -0400 +@@ -90,7 +90,7 @@ + e-html-utils.c e-icon-factory.c e-import.c e-menu.c e-mktemp.c \ + e-plugin.c e-popup.c e-print.c e-profile-event.c e-request.c \ + e-signature.c e-signature-list.c eggtrayicon.c eggtrayicon.h \ +- e-bit-array.c e-i18n.h e-sorter.c e-sorter-array.c \ ++ e-bit-array.c e-sorter.c e-sorter-array.c \ + e-text-event-processor-emacs-like.c e-text-event-processor.c \ + e-util.c e-util-private.h e-xml-utils.c e-win32-reloc.c + @OS_WIN32_TRUE@am__objects_4 = e-win32-reloc.lo +@@ -588,7 +588,6 @@ + eggtrayicon.c \ + eggtrayicon.h \ + e-bit-array.c \ +- e-i18n.h \ + e-sorter.c \ + e-sorter-array.c \ + e-text-event-processor-emacs-like.c \ +--- evolution-2.10.1/e-util/e-menu.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 ++++ evolution-2.10.1/e-util/e-menu.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -2071,8 +2090,8 @@ #include #include ---- evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c.use-glib-i18n 2007-01-03 10:32:48.000000000 -0500 -+++ evolution-2.10.0/addressbook/printing/e-contact-print-envelope.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/printing/e-contact-print-envelope.c.use-glib-i18n 2007-04-09 09:07:43.000000000 -0400 ++++ evolution-2.10.1/addressbook/printing/e-contact-print-envelope.c 2007-04-30 13:06:43.000000000 -0400 @@ -22,7 +22,7 @@ #include #include "addressbook/printing/e-contact-print-envelope.h" @@ -2082,8 +2101,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/printing/e-contact-print.c.use-glib-i18n 2007-03-08 01:10:56.000000000 -0500 -+++ evolution-2.10.0/addressbook/printing/e-contact-print.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/printing/e-contact-print.c.use-glib-i18n 2007-04-09 09:07:43.000000000 -0400 ++++ evolution-2.10.1/addressbook/printing/e-contact-print.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -2093,8 +2112,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/component/addressbook-config.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/addressbook-config.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/component/addressbook-config.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/component/addressbook-config.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include #include @@ -2104,8 +2123,8 @@ #include ---- evolution-2.10.0/addressbook/gui/component/addressbook.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/addressbook.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/component/addressbook.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/component/addressbook.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include @@ -2115,8 +2134,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/addressbook-migrate.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c 2007-04-30 13:06:43.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -2126,8 +2145,8 @@ #include ---- evolution-2.10.0/addressbook/gui/component/autocompletion-config.c.use-glib-i18n 2007-01-03 10:32:46.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/autocompletion-config.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/component/autocompletion-config.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/component/autocompletion-config.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include @@ -2137,8 +2156,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/component/addressbook-view.c.use-glib-i18n 2007-02-26 04:59:17.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/component/addressbook-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/component/addressbook-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/component/addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2148,8 +2167,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -2159,8 +2178,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view-widget.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/widgets/e-minicard-view-widget.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-view-widget.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include #include @@ -2170,8 +2189,8 @@ #include "eab-marshal.h" #include "e-minicard-view-widget.h" ---- evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-reflow-adapter.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/widgets/e-addressbook-reflow-adapter.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/widgets/e-addressbook-reflow-adapter.c 2007-04-30 13:06:43.000000000 -0400 @@ -4,7 +4,7 @@ #include #include @@ -2181,8 +2200,8 @@ #include "eab-marshal.h" #include "e-addressbook-reflow-adapter.h" #include "e-addressbook-model.h" ---- evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/eab-contact-display.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/widgets/eab-contact-display.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/widgets/eab-contact-display.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include "e-util/e-icon-factory.h" @@ -2192,8 +2211,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/gal-view-factory-minicard.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/widgets/gal-view-factory-minicard.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/widgets/gal-view-factory-minicard.c 2007-04-30 13:06:43.000000000 -0400 @@ -13,7 +13,7 @@ #endif @@ -2203,8 +2222,8 @@ #include "gal-view-factory-minicard.h" #include "gal-view-minicard.h" ---- evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c.use-glib-i18n 2007-03-08 01:10:56.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-addressbook-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/widgets/e-addressbook-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/widgets/e-addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2214,8 +2233,8 @@ #include #include #include
---- evolution-2.10.0/addressbook/gui/widgets/e-minicard.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/widgets/e-minicard.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/widgets/e-minicard.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -2225,8 +2244,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-label.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/widgets/e-minicard-label.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-label.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -2236,8 +2255,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c.use-glib-i18n 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/widgets/e-minicard-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/widgets/e-minicard-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2247,8 +2266,8 @@ #include #include "a11y/addressbook/ea-addressbook.h" ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include #include @@ -2258,8 +2277,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -2269,8 +2288,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-address.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include @@ -2280,8 +2299,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/eab-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/contact-editor/eab-editor.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/contact-editor/eab-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2291,8 +2310,8 @@ #include "eab-editor.h" #include "addressbook/gui/widgets/eab-gui-util.h" ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c.use-glib-i18n 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-im.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-04-30 13:06:43.000000000 -0400 @@ -22,7 +22,7 @@ #include #include "e-contact-editor-im.h" @@ -2302,8 +2321,8 @@ #include #include #include ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -2313,8 +2332,8 @@ #include #include ---- evolution-2.10.0/composer/e-msg-composer.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/composer/e-msg-composer.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/composer/e-msg-composer.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/composer/e-msg-composer.c 2007-04-30 13:06:43.000000000 -0400 @@ -63,7 +63,7 @@ #include @@ -2324,8 +2343,8 @@ #include #include ---- evolution-2.10.0/composer/e-msg-composer-select-file.c.use-glib-i18n 2007-01-03 10:34:14.000000000 -0500 -+++ evolution-2.10.0/composer/e-msg-composer-select-file.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/composer/e-msg-composer-select-file.c.use-glib-i18n 2007-04-09 09:09:32.000000000 -0400 ++++ evolution-2.10.1/composer/e-msg-composer-select-file.c 2007-04-30 13:06:43.000000000 -0400 @@ -41,7 +41,7 @@ #endif @@ -2335,8 +2354,8 @@ #include "e-msg-composer-select-file.h" #include ---- evolution-2.10.0/composer/e-msg-composer-hdrs.c.use-glib-i18n 2007-01-03 10:34:14.000000000 -0500 -+++ evolution-2.10.0/composer/e-msg-composer-hdrs.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/composer/e-msg-composer-hdrs.c.use-glib-i18n 2007-04-09 09:09:32.000000000 -0400 ++++ evolution-2.10.1/composer/e-msg-composer-hdrs.c 2007-04-30 13:06:43.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -2346,8 +2365,8 @@ #include #include #include ---- evolution-2.10.0/shell/e-shell-window.c.use-glib-i18n 2007-03-12 16:17:12.000000000 -0400 -+++ evolution-2.10.0/shell/e-shell-window.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-shell-window.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell-window.c 2007-04-30 13:06:43.000000000 -0400 @@ -51,7 +51,7 @@ #include #include @@ -2357,8 +2376,8 @@ #include #include ---- evolution-2.10.0/shell/e-shell-utils.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell-utils.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-shell-utils.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell-utils.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -2368,8 +2387,8 @@ #include "e-util/e-util-private.h" ---- evolution-2.10.0/shell/e-shell.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-shell.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell.c 2007-04-30 13:06:43.000000000 -0400 @@ -44,7 +44,7 @@ #undef interface #endif @@ -2379,8 +2398,8 @@ #include #include ---- evolution-2.10.0/shell/e-shell-folder-title-bar.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell-folder-title-bar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-shell-folder-title-bar.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell-folder-title-bar.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2390,8 +2409,8 @@ #include #include "misc/e-clipped-label.h" ---- evolution-2.10.0/shell/e-shell-settings-dialog.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell-settings-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-shell-settings-dialog.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell-settings-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -148,9 +148,9 @@ { EShellSettingsDialogPrivate *priv; @@ -2438,8 +2457,8 @@ page_list = sort_page_list (page_list); for (p = page_list, i = 0; p != NULL; p = p->next, i++) { ---- evolution-2.10.0/shell/e-user-creatable-items-handler.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-user-creatable-items-handler.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-user-creatable-items-handler.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-user-creatable-items-handler.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -2449,8 +2468,8 @@ #include #include ---- evolution-2.10.0/shell/main.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/shell/main.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/main.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/shell/main.c 2007-04-30 13:06:43.000000000 -0400 @@ -55,7 +55,7 @@ #include #include @@ -2460,8 +2479,8 @@ #include #include #include ---- evolution-2.10.0/shell/evolution-shell-component-utils.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/evolution-shell-component-utils.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/evolution-shell-component-utils.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/evolution-shell-component-utils.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include "e-util/e-dialog-utils.h" @@ -2471,8 +2490,8 @@ #include #include #include ---- evolution-2.10.0/shell/e-shell-window-commands.c.use-glib-i18n 2007-03-12 08:40:01.000000000 -0400 -+++ evolution-2.10.0/shell/e-shell-window-commands.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-shell-window-commands.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell-window-commands.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include @@ -2497,8 +2516,8 @@ /* This has to be a valid language AND a language with * no encoding postfix. The language will come up without ---- evolution-2.10.0/shell/e-component-registry.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-component-registry.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-component-registry.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-component-registry.c 2007-04-30 13:06:43.000000000 -0400 @@ -28,7 +28,7 @@ #include @@ -2559,8 +2578,8 @@ CORBA_free (info_list); CORBA_exception_free (&ev); ---- evolution-2.10.0/shell/e-shell-importer.c.use-glib-i18n 2007-01-03 10:32:54.000000000 -0500 -+++ evolution-2.10.0/shell/e-shell-importer.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/shell/e-shell-importer.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 ++++ evolution-2.10.1/shell/e-shell-importer.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include @@ -2570,8 +2589,8 @@ #include #include ---- evolution-2.10.0/calendar/gui/print.c.use-glib-i18n 2007-02-26 05:01:17.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/print.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/print.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/print.c 2007-04-30 13:06:43.000000000 -0400 @@ -34,7 +34,7 @@ #include #include @@ -2581,8 +2600,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/calendar-view-factory.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/calendar-view-factory.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/calendar-view-factory.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/calendar-view-factory.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -2592,8 +2611,8 @@ #include "calendar-view-factory.h" #include "calendar-view.h" ---- evolution-2.10.0/calendar/gui/itip-utils.c.use-glib-i18n 2007-01-08 08:36:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/itip-utils.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/itip-utils.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/itip-utils.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -2603,8 +2622,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/alarm-notify/util.c.use-glib-i18n 2007-01-03 10:34:50.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/alarm-notify/util.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/alarm-notify/util.c.use-glib-i18n 2007-04-09 09:10:29.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/util.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #include #endif @@ -2614,8 +2633,8 @@ #include #include #include "config-data.h" ---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-queue.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-30 13:06:43.000000000 -0400 @@ -43,7 +43,7 @@ #include #include @@ -2625,8 +2644,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c.use-glib-i18n 2007-01-03 10:34:50.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/alarm-notify/alarm-notify-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify-dialog.c.use-glib-i18n 2007-04-09 09:10:29.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -2636,8 +2655,8 @@ #if 0 # include #endif ---- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/notify-main.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -2647,8 +2666,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-itip-control.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-itip-control.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-itip-control.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-itip-control.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include #include @@ -2658,8 +2677,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-day-view-top-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-day-view-top-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-day-view-top-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-day-view-top-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #endif @@ -2669,8 +2688,8 @@ #include "e-util/e-categories-config.h" #include #include ---- evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-meeting-time-sel-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-meeting-time-sel-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-meeting-time-sel-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -34,7 +34,7 @@ #include @@ -2680,8 +2699,8 @@ #include "calendar-config.h" #include "e-meeting-time-sel-item.h" #include "e-meeting-time-sel.h" ---- evolution-2.10.0/calendar/gui/e-meeting-list-view.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-meeting-list-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-meeting-list-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-meeting-list-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2691,8 +2710,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/tasks-control.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/tasks-control.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/tasks-control.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/tasks-control.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -2702,8 +2721,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-cal-model-calendar.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cal-model-calendar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-cal-model-calendar.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-cal-model-calendar.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -2713,8 +2732,8 @@ #include "e-cal-model-calendar.h" #include "e-cell-date-edit-text.h" #include "itip-utils.h" ---- evolution-2.10.0/calendar/gui/dialogs/memo-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/memo-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/memo-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/memo-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -2724,8 +2743,8 @@ #include #include ---- evolution-2.10.0/calendar/gui/dialogs/task-page.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/task-page.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/task-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/task-page.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -2735,8 +2754,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/alarm-list-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/alarm-list-dialog.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/alarm-list-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -2746,8 +2765,8 @@ #include #include #include "e-util/e-dialog-widgets.h" ---- evolution-2.10.0/calendar/gui/dialogs/comp-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -34,7 +34,7 @@ #include #include @@ -2757,8 +2776,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/recurrence-page.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/recurrence-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/recurrence-page.c 2007-04-30 13:06:43.000000000 -0400 @@ -39,7 +39,7 @@ #include #include @@ -2768,8 +2787,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/event-page.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/event-page.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/event-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/event-page.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include #include @@ -2779,8 +2798,8 @@ #include #include #include "common/authentication.h" ---- evolution-2.10.0/calendar/gui/dialogs/task-editor.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/task-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/task-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/task-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -2790,8 +2809,8 @@ #include #include ---- evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/calendar-setup.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/calendar-setup.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -2801,8 +2820,8 @@ #include #include #include "calendar-setup.h" ---- evolution-2.10.0/calendar/gui/dialogs/recur-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/recur-comp.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/recur-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/recur-comp.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2812,8 +2831,8 @@ #include #include "recur-comp.h" ---- evolution-2.10.0/calendar/gui/dialogs/delete-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/delete-comp.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/delete-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/delete-comp.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -2823,8 +2842,8 @@ #include #include "e-util/e-error.h" #include "../calendar-config.h" ---- evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-page.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/comp-editor-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/comp-editor-page.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #endif @@ -2834,8 +2853,8 @@ #include #include #include "comp-editor-page.h" ---- evolution-2.10.0/calendar/gui/dialogs/delete-error.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/delete-error.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/delete-error.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/delete-error.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2845,8 +2864,8 @@ #include #include #include "delete-error.h" ---- evolution-2.10.0/calendar/gui/dialogs/task-details-page.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/task-details-page.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/task-details-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/task-details-page.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -2856,8 +2875,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/cal-attachment-select-file.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/cal-attachment-select-file.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/cal-attachment-select-file.c 2007-04-30 13:06:43.000000000 -0400 @@ -45,7 +45,7 @@ #endif @@ -2867,8 +2886,8 @@ #include "cal-attachment-select-file.h" #include ---- evolution-2.10.0/calendar/gui/dialogs/event-editor.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/event-editor.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/event-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/event-editor.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -2878,8 +2897,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/cancel-comp.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/cancel-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/cancel-comp.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2889,8 +2908,8 @@ #include #include #include "e-util/e-error.h" ---- evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/comp-editor-util.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/comp-editor-util.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/comp-editor-util.c 2007-04-30 13:06:43.000000000 -0400 @@ -27,7 +27,7 @@ #include #include @@ -2900,8 +2919,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/cal-prefs-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/cal-prefs-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -2911,8 +2930,8 @@ #include static const int week_start_day_map[] = { ---- evolution-2.10.0/calendar/gui/dialogs/schedule-page.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/schedule-page.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/schedule-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/schedule-page.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include #include @@ -2922,8 +2941,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/dialogs/changed-comp.c.use-glib-i18n 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/changed-comp.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/changed-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/changed-comp.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -2933,8 +2952,8 @@ #include #include #include "changed-comp.h" ---- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/dialogs/memo-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/dialogs/memo-page.c 2007-04-30 13:06:43.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -2944,8 +2963,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-meeting-time-sel.c.use-glib-i18n 2007-03-08 01:11:21.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-meeting-time-sel.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-meeting-time-sel.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-meeting-time-sel.c 2007-04-30 13:06:43.000000000 -0400 @@ -51,7 +51,7 @@ #include #include @@ -2955,8 +2974,8 @@ #include #include ---- evolution-2.10.0/calendar/gui/calendar-commands.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/calendar-commands.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/calendar-commands.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/calendar-commands.c 2007-04-30 13:06:43.000000000 -0400 @@ -47,7 +47,7 @@ #include #include @@ -2966,8 +2985,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/memos-control.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/memos-control.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/memos-control.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/memos-control.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include #include @@ -2977,8 +2996,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/misc.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/misc.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/misc.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/misc.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #include #include @@ -2988,8 +3007,8 @@ #include "misc.h" ---- evolution-2.10.0/calendar/gui/e-cal-model-tasks.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-cal-model-tasks.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-cal-model-tasks.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-cal-model-tasks.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -2999,8 +3018,8 @@ #include #include "calendar-config.h" #include "e-cal-model-tasks.h" ---- evolution-2.10.0/calendar/gui/e-calendar-view.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-calendar-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-calendar-view.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-calendar-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -3010,8 +3029,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cell-date-edit-text.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-cell-date-edit-text.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-cell-date-edit-text.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -3021,8 +3040,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-timezone-entry.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-timezone-entry.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-timezone-entry.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-timezone-entry.c 2007-04-30 13:06:43.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -3032,8 +3051,8 @@ #include "e-timezone-entry.h" #include ---- evolution-2.10.0/calendar/gui/e-alarm-list.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-alarm-list.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-alarm-list.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-alarm-list.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -3043,8 +3062,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-day-view.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-day-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-day-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-day-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -46,7 +46,7 @@ #include #include @@ -3054,8 +3073,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-cal-model.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-cal-model.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-cal-model.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-cal-model.c 2007-04-30 13:06:43.000000000 -0400 @@ -24,7 +24,7 @@ #include @@ -3065,8 +3084,8 @@ #include #include #include "comp-util.h" ---- evolution-2.10.0/calendar/gui/weekday-picker.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/weekday-picker.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/weekday-picker.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/weekday-picker.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #include #include @@ -3076,8 +3095,8 @@ #include #include #include "weekday-picker.h" ---- evolution-2.10.0/calendar/gui/e-week-view.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-week-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-week-view.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-week-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -41,7 +41,7 @@ #include #include @@ -3087,8 +3106,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-cal-model-memos.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cal-model-memos.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-cal-model-memos.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-cal-model-memos.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #endif @@ -3098,8 +3117,8 @@ #include "e-cal-model-memos.h" #include "e-cell-date-edit-text.h" #include "misc.h" ---- evolution-2.10.0/calendar/gui/main.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/main.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/main.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/main.c 2007-04-30 13:06:43.000000000 -0400 @@ -25,7 +25,7 @@ #endif @@ -3109,8 +3128,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/cal-search-bar.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/cal-search-bar.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/cal-search-bar.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/cal-search-bar.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include #include @@ -3120,8 +3139,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-day-view-time-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-day-view-time-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-day-view-time-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-day-view-time-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -3131,8 +3150,8 @@ #include #include "e-day-view-time-item.h" #include "calendar-config.h" ---- evolution-2.10.0/calendar/gui/e-cal-popup.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cal-popup.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-cal-popup.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-cal-popup.c 2007-04-30 13:06:43.000000000 -0400 @@ -39,7 +39,7 @@ #include #include @@ -3142,8 +3161,8 @@ #include "e-util/e-mktemp.h" #include "e-util/e-dialog-utils.h" ---- evolution-2.10.0/calendar/gui/e-meeting-store.c.use-glib-i18n 2007-04-03 15:07:43.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/e-meeting-store.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-meeting-store.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-meeting-store.c 2007-04-30 13:06:43.000000000 -0400 @@ -26,7 +26,7 @@ #endif @@ -3153,8 +3172,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-week-view-main-item.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-week-view-main-item.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-week-view-main-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-week-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 @@ -32,7 +32,7 @@ #include @@ -3164,8 +3183,8 @@ #include "e-week-view-main-item.h" #include "ea-calendar.h" ---- evolution-2.10.0/calendar/gui/gnome-cal.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/gnome-cal.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/gnome-cal.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/gnome-cal.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -3175,8 +3194,8 @@ #include #include #include ---- evolution-2.10.0/calendar/gui/e-cal-list-view.c.use-glib-i18n 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-cal-list-view.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/calendar/gui/e-cal-list-view.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/e-cal-list-view.c 2007-04-30 13:06:43.000000000 -0400 @@ -50,7 +50,7 @@ #include
#include @@ -3186,8 +3205,8 @@ #include #include #include ---- evolution-2.10.0/smime/lib/e-cert-db.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/lib/e-cert-db.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/lib/e-cert-db.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 ++++ evolution-2.10.1/smime/lib/e-cert-db.c 2007-04-30 13:06:43.000000000 -0400 @@ -90,7 +90,7 @@ #include "e-util/e-dialog-utils.h" #include "e-util/e-util-private.h" @@ -3197,8 +3216,8 @@ #include #include #include ---- evolution-2.10.0/smime/lib/e-cert.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/lib/e-cert.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/lib/e-cert.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 ++++ evolution-2.10.1/smime/lib/e-cert.c 2007-04-30 13:06:43.000000000 -0400 @@ -62,7 +62,7 @@ #include @@ -3208,8 +3227,8 @@ #include #include /* for e_utf8_strftime, what about e_time_format_time? */ ---- evolution-2.10.0/smime/lib/e-pkcs12.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/lib/e-pkcs12.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/lib/e-pkcs12.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 ++++ evolution-2.10.1/smime/lib/e-pkcs12.c 2007-04-30 13:06:43.000000000 -0400 @@ -63,7 +63,7 @@ #include #include @@ -3219,8 +3238,8 @@ #include #include ---- evolution-2.10.0/smime/gui/certificate-viewer.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/certificate-viewer.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/gui/certificate-viewer.c.use-glib-i18n 2007-04-09 09:07:55.000000000 -0400 ++++ evolution-2.10.1/smime/gui/certificate-viewer.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include @@ -3230,8 +3249,8 @@ #include #include "e-util/e-util-private.h" ---- evolution-2.10.0/smime/gui/certificate-manager.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/certificate-manager.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/gui/certificate-manager.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 ++++ evolution-2.10.1/smime/gui/certificate-manager.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -3241,8 +3260,8 @@ #include #include "evolution-config-control.h" ---- evolution-2.10.0/smime/gui/e-cert-selector.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/e-cert-selector.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/gui/e-cert-selector.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 ++++ evolution-2.10.1/smime/gui/e-cert-selector.c 2007-04-30 13:06:43.000000000 -0400 @@ -23,7 +23,7 @@ #include #endif @@ -3252,8 +3271,8 @@ #include #include ---- evolution-2.10.0/smime/gui/cert-trust-dialog.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/cert-trust-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/gui/cert-trust-dialog.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 ++++ evolution-2.10.1/smime/gui/cert-trust-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -36,7 +36,7 @@ #include #include @@ -3263,8 +3282,8 @@ #include #include "e-util/e-util-private.h" ---- evolution-2.10.0/smime/gui/component.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/component.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/gui/component.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 ++++ evolution-2.10.1/smime/gui/component.c 2007-04-30 13:06:43.000000000 -0400 @@ -29,7 +29,7 @@ #include @@ -3274,8 +3293,8 @@ #include #include "ca-trust-dialog.h" ---- evolution-2.10.0/smime/gui/ca-trust-dialog.c.use-glib-i18n 2007-01-03 10:32:55.000000000 -0500 -+++ evolution-2.10.0/smime/gui/ca-trust-dialog.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/smime/gui/ca-trust-dialog.c.use-glib-i18n 2007-04-09 09:07:55.000000000 -0400 ++++ evolution-2.10.1/smime/gui/ca-trust-dialog.c 2007-04-30 13:06:43.000000000 -0400 @@ -30,7 +30,7 @@ #include @@ -3285,8 +3304,8 @@ #include #include "e-util/e-util-private.h" ---- evolution-2.10.0/tools/killev.c.use-glib-i18n 2007-01-03 10:32:49.000000000 -0500 -+++ evolution-2.10.0/tools/killev.c 2007-04-03 15:07:43.000000000 -0400 +--- evolution-2.10.1/tools/killev.c.use-glib-i18n 2007-04-09 09:07:44.000000000 -0400 ++++ evolution-2.10.1/tools/killev.c 2007-04-30 13:06:43.000000000 -0400 @@ -31,7 +31,7 @@ #include diff --git a/evolution.spec b/evolution.spec index 068049a..13f07a3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -158,20 +158,17 @@ Patch46: evolution-2.10.0-use-glib-i18n.patch # GNOME bug #418971 Patch47: evolution-2.10.0-drop-old-glib-support.patch -# GNOME bug #427939 (gnome-doc-utils) -Patch48: evolution-2.10.1-fix-gnome-doc-utils.patch - # RH bug #235878 / GNOME bug #386503 -Patch49: evolution-2.10.1-fix-help.patch +Patch48: evolution-2.10.1-fix-help.patch # RH bug #234315 / GNOME bug #423766 -Patch50: evolution-2.10.1-saving-attachments.patch +Patch49: evolution-2.10.1-saving-attachments.patch # RH bug #236860 / GNOME bug #407104 -Patch51: evolution-2.10.1-fix-uri-handling.patch +Patch50: evolution-2.10.1-fix-uri-handling.patch # RH bug #236399 / GNOME bug #434019 -Patch52: evolution-2.10.1-en_CA-attribution-format.patch +Patch51: evolution-2.10.1-en_CA-attribution-format.patch ## Dependencies ### @@ -325,11 +322,10 @@ Development files needed for building things which link against evolution. %patch45 -p1 -b .shell-main-cleanups %patch46 -p1 -b .use-glib-i18n %patch47 -p1 -b .drop-old-glib-support -%patch48 -p1 -b .fix-gnome-doc-utils -%patch49 -p1 -b .fix-help -%patch50 -p1 -b .saving-attachments -%patch51 -p1 -b .fix-uri-handling -%patch52 -p1 -b .en_CA-attribution-format +%patch48 -p1 -b .fix-help +%patch49 -p1 -b .saving-attachments +%patch50 -p1 -b .fix-uri-handling +%patch51 -p1 -b .en_CA-attribution-format mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -413,9 +409,9 @@ CFLAGS="$CFLAGS \ -Werror-implicit-function-declaration" %endif -# Rerun the GNU Autotools since we patched some of the input files. -# Disable portability checking to keep automake 1.10 quiet. -autoreconf --force --warnings=no-portability +# Temporary work-around for a bad gnome-doc-utils.make. +# See GNOME bug #427939. Should be fixed in evolution-2.10.2. +sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in %configure \ --disable-scrollkeeper \ @@ -751,6 +747,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Apr 30 2007 Matthew Barnes - 2.10.1-9.fc7 +- Revise some patches so that we don't have to run autoreconf. +- Remove patch for GNOME bug #427939 (use a different work-around). + * Fri Apr 27 2007 Matthew Barnes - 2.10.1-8.fc7 - Add patch for RH bug #236399 (en_CA attribution format). From 2e368180bfb5ab740829a284dc116ba33907dfc3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 May 2007 15:57:42 +0000 Subject: [PATCH 130/844] - Revise patch for GNOME bug #363695 to fix RH bug #238497 (crash sorting "To" column). --- evolution-2.9.1-kill-ememory.patch | 2 +- evolution.spec | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index de2da1d..d873dba 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -122,7 +122,7 @@ return (void *)(str ? str : ""); case COL_TO_NORM: - return (void *) get_normalised_string (message_list, msg_info, col); -+ str = camel_message_info_to (str); ++ str = camel_message_info_to (msg_info); + return (void *) get_normalised_string (message_list, str); case COL_SIZE: return GINT_TO_POINTER (camel_message_info_size(msg_info)); diff --git a/evolution.spec b/evolution.spec index 13f07a3..4b9f4e5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 9%{?dist} +Release: 10%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -747,6 +747,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue May 01 2007 Matthew Barnes - 2.10.1-10.fc7 +- Revise patch for GNOME bug #363695 to fix RH bug #238497 + (crash sorting "To" column). + * Mon Apr 30 2007 Matthew Barnes - 2.10.1-9.fc7 - Revise some patches so that we don't have to run autoreconf. - Remove patch for GNOME bug #427939 (use a different work-around). From cb9f1e1060befa445e4a823e347f631fc81cf1fe Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 May 2007 20:18:55 +0000 Subject: [PATCH 131/844] - Add patch for RH bug #238551 (incorrect attachment count). --- evolution-2.10.1-e-attachment-bar.patch | 11 +++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 evolution-2.10.1-e-attachment-bar.patch diff --git a/evolution-2.10.1-e-attachment-bar.patch b/evolution-2.10.1-e-attachment-bar.patch new file mode 100644 index 0000000..fdea03a --- /dev/null +++ b/evolution-2.10.1-e-attachment-bar.patch @@ -0,0 +1,11 @@ +--- evolution-2.10.1/widgets/misc/e-attachment-bar.c.e-attachment-bar 2007-05-01 11:22:41.000000000 -0400 ++++ evolution-2.10.1/widgets/misc/e-attachment-bar.c 2007-05-01 15:10:49.000000000 -0400 +@@ -491,6 +491,8 @@ + g_ptr_array_free (temp_arr, TRUE); + + update (bar); ++ ++ g_signal_emit (bar, signals[CHANGED], 0); + + id++; + diff --git a/evolution.spec b/evolution.spec index 4b9f4e5..6f079be 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 10%{?dist} +Release: 11%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -170,6 +170,9 @@ Patch50: evolution-2.10.1-fix-uri-handling.patch # RH bug #236399 / GNOME bug #434019 Patch51: evolution-2.10.1-en_CA-attribution-format.patch +# RH bug #238551 / GNOME bug #434981 +Patch52: evolution-2.10.1-e-attachment-bar.patch + ## Dependencies ### Requires(post): GConf2 @@ -326,6 +329,7 @@ Development files needed for building things which link against evolution. %patch49 -p1 -b .saving-attachments %patch50 -p1 -b .fix-uri-handling %patch51 -p1 -b .en_CA-attribution-format +%patch52 -p1 -b .e-attachment-bar mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -747,6 +751,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue May 01 2007 Matthew Barnes - 2.10.1-10.fc7 - Revise patch for GNOME bug #363695 to fix RH bug #238497 (crash sorting "To" column). From 65ba615ecbbea96f8c5f44c006360d316655f9dd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 3 May 2007 21:08:58 +0000 Subject: [PATCH 132/844] - Add patch for RH bug #238551 (incorrect attachment count). --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6f079be..ed804a5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 11%{?dist} +Release: 12%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -751,7 +751,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog -* Tue May 01 2007 Matthew Barnes - 2.10.1-12.fc7 - Add patch for RH bug #238551 (incorrect attachment count). * Tue May 01 2007 Matthew Barnes - 2.10.1-10.fc7 From fdddfb0ad7d5f190dc6cc9454dee2851c9a3931a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 7 May 2007 19:51:12 +0000 Subject: [PATCH 133/844] - Add patch for RH bug #238155 (crash on startup). --- evolution-2.10.1-calendar-component.patch | 17 +++++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 evolution-2.10.1-calendar-component.patch diff --git a/evolution-2.10.1-calendar-component.patch b/evolution-2.10.1-calendar-component.patch new file mode 100644 index 0000000..59982b5 --- /dev/null +++ b/evolution-2.10.1-calendar-component.patch @@ -0,0 +1,17 @@ +--- evolution-2.10.1/calendar/gui/calendar-component.c.calendar-component 2007-05-07 14:07:16.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-07 14:11:48.000000000 -0400 +@@ -210,7 +210,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + personal_source = source; + break; + } diff --git a/evolution.spec b/evolution.spec index ed804a5..02d94b4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 12%{?dist} +Release: 13%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -173,6 +173,9 @@ Patch51: evolution-2.10.1-en_CA-attribution-format.patch # RH bug #238551 / GNOME bug #434981 Patch52: evolution-2.10.1-e-attachment-bar.patch +# RH bug #238155 / GNOME bug #427232 +Patch53: evolution-2.10.1-calendar-component.patch + ## Dependencies ### Requires(post): GConf2 @@ -330,6 +333,7 @@ Development files needed for building things which link against evolution. %patch50 -p1 -b .fix-uri-handling %patch51 -p1 -b .en_CA-attribution-format %patch52 -p1 -b .e-attachment-bar +%patch53 -p1 -b .calendar-component mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -751,6 +755,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon May 07 2007 Matthew Barnes - 2.10.1-13.fc7 +- Add patch for RH bug #238155 (crash on startup). + * Tue May 01 2007 Matthew Barnes - 2.10.1-12.fc7 - Add patch for RH bug #238551 (incorrect attachment count). From d67d2bcbf76e02e0abbe7a38e6e9b2c93675093c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 May 2007 16:56:18 +0000 Subject: [PATCH 134/844] - Revise patch for RH bug #238155 (crash on startup). --- evolution-2.10.1-check-uri-before-strcmp.patch | 17 +++++++++++++++++ evolution.spec | 9 ++++++--- 2 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 evolution-2.10.1-check-uri-before-strcmp.patch diff --git a/evolution-2.10.1-check-uri-before-strcmp.patch b/evolution-2.10.1-check-uri-before-strcmp.patch new file mode 100644 index 0000000..59982b5 --- /dev/null +++ b/evolution-2.10.1-check-uri-before-strcmp.patch @@ -0,0 +1,17 @@ +--- evolution-2.10.1/calendar/gui/calendar-component.c.calendar-component 2007-05-07 14:07:16.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-07 14:11:48.000000000 -0400 +@@ -210,7 +210,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + personal_source = source; + break; + } diff --git a/evolution.spec b/evolution.spec index 02d94b4..15df3f4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 13%{?dist} +Release: 14%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -174,7 +174,7 @@ Patch51: evolution-2.10.1-en_CA-attribution-format.patch Patch52: evolution-2.10.1-e-attachment-bar.patch # RH bug #238155 / GNOME bug #427232 -Patch53: evolution-2.10.1-calendar-component.patch +Patch53: evolution-2.10.1-check-uri-before-strcmp.patch ## Dependencies ### @@ -333,7 +333,7 @@ Development files needed for building things which link against evolution. %patch50 -p1 -b .fix-uri-handling %patch51 -p1 -b .en_CA-attribution-format %patch52 -p1 -b .e-attachment-bar -%patch53 -p1 -b .calendar-component +%patch53 -p1 -b .check-uri-before-strcmp mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -755,6 +755,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon May 14 2007 Matthew Barnes - 2.10.1-14.fc7 +- Revise patch for RH bug #238155 (crash on startup). + * Mon May 07 2007 Matthew Barnes - 2.10.1-13.fc7 - Add patch for RH bug #238155 (crash on startup). From 69fe630e0939fef207911a3a3dcc9d63bb059050 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 May 2007 17:35:08 +0000 Subject: [PATCH 135/844] - Revise patch for RH bug #238155 (crash on startup). --- evolution-2.10.1-calendar-component.patch | 17 - ...ution-2.10.1-check-uri-before-strcmp.patch | 344 +++++++++++++++++- evolution.spec | 2 +- 3 files changed, 343 insertions(+), 20 deletions(-) delete mode 100644 evolution-2.10.1-calendar-component.patch diff --git a/evolution-2.10.1-calendar-component.patch b/evolution-2.10.1-calendar-component.patch deleted file mode 100644 index 59982b5..0000000 --- a/evolution-2.10.1-calendar-component.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- evolution-2.10.1/calendar/gui/calendar-component.c.calendar-component 2007-05-07 14:07:16.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-07 14:11:48.000000000 -0400 -@@ -210,7 +210,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - personal_source = source; - break; - } diff --git a/evolution-2.10.1-check-uri-before-strcmp.patch b/evolution-2.10.1-check-uri-before-strcmp.patch index 59982b5..ff7e766 100644 --- a/evolution-2.10.1-check-uri-before-strcmp.patch +++ b/evolution-2.10.1-check-uri-before-strcmp.patch @@ -1,5 +1,264 @@ ---- evolution-2.10.1/calendar/gui/calendar-component.c.calendar-component 2007-05-07 14:07:16.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-07 14:11:48.000000000 -0400 +--- evolution-2.10.1/plugins/exchange-operations/exchange-config-listener.c.check-uri-before-strcmp 2007-04-09 09:09:13.000000000 -0400 ++++ evolution-2.10.1/plugins/exchange-operations/exchange-config-listener.c 2007-05-14 13:34:13.000000000 -0400 +@@ -1250,26 +1250,30 @@ + exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *account) + { + ESourceList *sl=NULL; +- ESourceGroup *group; + ESource *source; +- GSList *groups, *sources; ++ GSList *groups; + gboolean found_group=FALSE; + + sl = e_source_list_new_for_gconf (gc_client, CONF_KEY_CONTACTS); + groups = e_source_list_peek_groups (sl); + + for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { +- group = E_SOURCE_GROUP (groups->data); ++ ESourceGroup *group = E_SOURCE_GROUP (groups->data); ++ + if (strcmp (e_source_group_peek_name (group), account->account_name) == 0 + && + strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) { +- +- sources = e_source_group_peek_sources (group); ++ GSList *sources = e_source_group_peek_sources (group); + + for( ; sources != NULL; sources = g_slist_next (sources)) { +- source = E_SOURCE (sources->data); +- if (g_str_has_prefix (e_source_peek_absolute_uri (source), +- "gal://")) { ++ ESource *source = E_SOURCE (sources->data); ++ const gchar *absolute_uri; ++ ++ g_assert (source != NULL); ++ absolute_uri = e_source_peek_absolute_uri (source); ++ if (absolute_uri == NULL) ++ continue; ++ if (g_str_has_prefix (absolute_uri, "gal://")) { + /* Set autocompletion on GAL alone by default */ + e_source_set_property (source, "completion", "true"); + break; +--- evolution-2.10.1/plugins/groupwise-account-setup/camel-gw-listener.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 ++++ evolution-2.10.1/plugins/groupwise-account-setup/camel-gw-listener.c 2007-05-14 13:34:13.000000000 -0400 +@@ -254,10 +254,7 @@ + remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri) + { + ESourceList *list; +- ESourceGroup *group; +- ESource *source; + GSList *groups; +- GSList *sources; + gboolean found_group; + GConfClient* client; + GSList *ids; +@@ -271,19 +268,21 @@ + found_group = FALSE; + + for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { +- +- group = E_SOURCE_GROUP (groups->data); ++ ESourceGroup *group = E_SOURCE_GROUP (groups->data); + + if (strcmp (e_source_group_peek_name (group), group_name) == 0 && + strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX ) == 0) { +- +- sources = e_source_group_peek_sources (group); ++ GSList *sources = e_source_group_peek_sources (group); + + for( ; sources != NULL; sources = g_slist_next (sources)) { +- +- source = E_SOURCE (sources->data); +- +- if (strcmp (e_source_peek_relative_uri (source), relative_uri) == 0) { ++ ESource *source = E_SOURCE (sources->data); ++ const gchar *source_relative_uri; ++ ++ g_assert (source != NULL); ++ source_relative_uri = e_source_peek_relative_uri (source); ++ if (source_relative_uri == NULL) ++ continue; ++ if (strcmp (source_relative_uri, relative_uri) == 0) { + + if (!strcmp (conf_key, CALENDAR_SOURCES)) + source_selection_key = SELECTED_CALENDARS; +@@ -328,16 +327,12 @@ + modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url) + { + ESourceList *list; +- ESourceGroup *group; +- ESource *source; + GSList *groups; +- GSList *sources; + char *old_relative_uri; + CamelURL *url; + gboolean found_group; + GConfClient* client; + const char *poa_address; +- char *new_relative_uri; + const char *new_poa_address; + + url = camel_url_new (old_account_info->source_url, NULL); +@@ -354,20 +349,23 @@ + found_group = FALSE; + + for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { +- +- group = E_SOURCE_GROUP (groups->data); ++ ESourceGroup *group = E_SOURCE_GROUP (groups->data); + + if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && + strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX) == 0) { +- +- sources = e_source_group_peek_sources (group); ++ GSList *sources = e_source_group_peek_sources (group); + + for ( ; sources != NULL; sources = g_slist_next (sources)) { +- +- source = E_SOURCE (sources->data); +- +- if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) { +- ++ ESource *source = E_SOURCE (sources->data); ++ const gchar *source_relative_uri; ++ ++ g_assert (source != NULL); ++ source_relative_uri = e_source_peek_relative_uri (source); ++ if (source_relative_uri == NULL) ++ continue; ++ if (strcmp (source_relative_uri, old_relative_uri) == 0) { ++ gchar *new_relative_uri; ++ + new_relative_uri = g_strdup_printf ("%s@%s/", new_url->user, new_poa_address); + e_source_group_set_name (group, new_group_name); + e_source_set_relative_uri (source, new_relative_uri); +--- evolution-2.10.1/plugins/hula-account-setup/camel-hula-listener.c.check-uri-before-strcmp 2007-04-09 09:09:14.000000000 -0400 ++++ evolution-2.10.1/plugins/hula-account-setup/camel-hula-listener.c 2007-05-14 13:34:13.000000000 -0400 +@@ -241,10 +241,7 @@ + remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri) + { + ESourceList *list; +- ESourceGroup *group; +- ESource *source; + GSList *groups; +- GSList *sources; + gboolean found_group; + GConfClient* client; + GSList *ids; +@@ -258,19 +255,21 @@ + found_group = FALSE; + + for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { +- +- group = E_SOURCE_GROUP (groups->data); ++ ESourceGroup *group = E_SOURCE_GROUP (groups->data); + + if (strcmp (e_source_group_peek_name (group), group_name) == 0 && + strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) { +- +- sources = e_source_group_peek_sources (group); ++ GSList *sources = e_source_group_peek_sources (group); + + for( ; sources != NULL; sources = g_slist_next (sources)) { +- +- source = E_SOURCE (sources->data); +- +- if (strcmp (e_source_peek_relative_uri (source), relative_uri) == 0) { ++ ESource *source = E_SOURCE (sources->data); ++ const gchar *source_relative_uri; ++ ++ g_assert (source != NULL); ++ source_relative_uri = e_source_peek_relative_uri (source); ++ if (source_relative_uri == NULL) ++ continue; ++ if (strcmp (source_relative_uri, relative_uri) == 0) { + + if (!strcmp (conf_key, CALENDAR_SOURCES)) + source_selection_key = SELECTED_CALENDARS; +@@ -311,15 +310,11 @@ + modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url) + { + ESourceList *list; +- ESourceGroup *group; +- ESource *source; + GSList *groups; +- GSList *sources; + char *old_relative_uri; + CamelURL *url; + gboolean found_group; + GConfClient* client; +- char *new_relative_uri; + + url = camel_url_new (old_account_info->source_url, NULL); + if (!url->host || strlen (url->host) ==0) +@@ -334,19 +329,23 @@ + + for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { + +- group = E_SOURCE_GROUP (groups->data); ++ ESourceGroup *group = E_SOURCE_GROUP (groups->data); + + if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && + strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) { +- +- sources = e_source_group_peek_sources (group); ++ GSList *sources = e_source_group_peek_sources (group); + + for ( ; sources != NULL; sources = g_slist_next (sources)) { +- +- source = E_SOURCE (sources->data); +- +- if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) { +- ++ ESource *source = E_SOURCE (sources->data); ++ const gchar *source_relative_uri; ++ ++ g_assert (source != NULL); ++ source_relative_uri = e_source_peek_relative_uri (source); ++ if (source_relative_uri == NULL) ++ continue; ++ if (strcmp (source_relative_uri, old_relative_uri) == 0) { ++ gchar *new_relative_uri; ++ + new_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", new_url->user, new_url->host, new_url->port, new_url->user); + e_source_group_set_name (group, new_group_name); + e_source_set_relative_uri (source, new_relative_uri); +--- evolution-2.10.1/addressbook/gui/component/addressbook-component.c.check-uri-before-strcmp 2007-04-09 09:07:42.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/component/addressbook-component.c 2007-05-14 13:34:13.000000000 -0400 +@@ -118,7 +118,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + personal_source = source; + break; + } +--- evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 ++++ evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c 2007-05-14 13:34:13.000000000 -0400 +@@ -472,7 +472,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + *personal_source = g_object_ref (source); + break; + } +--- evolution-2.10.1/calendar/gui/calendar-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-14 13:34:13.000000000 -0400 @@ -210,7 +210,13 @@ GSList *s; for (s = sources; s; s = s->next) { @@ -15,3 +274,84 @@ personal_source = source; break; } +--- evolution-2.10.1/calendar/gui/tasks-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/tasks-component.c 2007-05-14 13:34:13.000000000 -0400 +@@ -170,7 +170,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + personal_source = source; + break; + } +--- evolution-2.10.1/calendar/gui/memos-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/memos-component.c 2007-05-14 13:34:13.000000000 -0400 +@@ -174,7 +174,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + personal_source = source; + break; + } +--- evolution-2.10.1/calendar/gui/migration.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/migration.c 2007-05-14 13:34:13.000000000 -0400 +@@ -466,7 +466,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + *personal_source = g_object_ref (source); + break; + } +@@ -562,7 +568,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + *personal_source = g_object_ref (source); + break; + } +@@ -1070,7 +1082,13 @@ + GSList *s; + for (s = sources; s; s = s->next) { + ESource *source = E_SOURCE (s->data); +- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { ++ const gchar *relative_uri; ++ ++ g_assert (source != NULL); ++ relative_uri = e_source_peek_relative_uri (source); ++ if (relative_uri == NULL) ++ continue; ++ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { + *personal_source = g_object_ref (source); + break; + } diff --git a/evolution.spec b/evolution.spec index 15df3f4..2c87f5f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -333,7 +333,7 @@ Development files needed for building things which link against evolution. %patch50 -p1 -b .fix-uri-handling %patch51 -p1 -b .en_CA-attribution-format %patch52 -p1 -b .e-attachment-bar -%patch53 -p1 -b .check-uri-before-strcmp +#%patch53 -p1 -b .check-uri-before-strcmp mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From 1d5093c6d5c74dabd4dcc61b737fbef4c4489870 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 May 2007 17:36:11 +0000 Subject: [PATCH 136/844] - Uncomment the patch. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 2c87f5f..15df3f4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -333,7 +333,7 @@ Development files needed for building things which link against evolution. %patch50 -p1 -b .fix-uri-handling %patch51 -p1 -b .en_CA-attribution-format %patch52 -p1 -b .e-attachment-bar -#%patch53 -p1 -b .check-uri-before-strcmp +%patch53 -p1 -b .check-uri-before-strcmp mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From adf0f6baa10c0a450d0ff3b6b1352f32ce19c4aa Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 May 2007 18:57:22 +0000 Subject: [PATCH 137/844] - Revise patch for RH bug #236860 to match upstream's solution. --- evolution-2.10.1-fix-uri-handling.patch | 53 +++++-------------------- evolution.spec | 5 ++- 2 files changed, 15 insertions(+), 43 deletions(-) diff --git a/evolution-2.10.1-fix-uri-handling.patch b/evolution-2.10.1-fix-uri-handling.patch index 6df1026..53fbe39 100644 --- a/evolution-2.10.1-fix-uri-handling.patch +++ b/evolution-2.10.1-fix-uri-handling.patch @@ -1,45 +1,14 @@ ---- evolution-2.10.1/shell/e-shell.c.fix-uri-handling 2007-04-22 20:19:39.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell.c 2007-04-22 20:20:25.000000000 -0400 -@@ -257,8 +257,8 @@ - { - EShell *shell = E_SHELL (bonobo_object_from_servant (servant)); - EComponentInfo *component_info; -+ GtkWidget *shell_window; - char *schema, *p; -- int show = FALSE; +--- evolution-2.10.1/calendar/gui/GNOME_Evolution_Calendar.server.in.in.fix-uri-handling 2007-04-09 09:10:33.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/GNOME_Evolution_Calendar.server.in.in 2007-05-14 14:11:59.000000000 -0400 +@@ -50,9 +50,11 @@ + + - schema = g_alloca(strlen(uri)+1); - strcpy(schema, uri); -@@ -267,26 +267,20 @@ - *p = 0; ++ - component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_SCHEMA, schema); -- if (component_info == NULL) { -- show = TRUE; -+ if (component_info == NULL) - component_info = e_component_registry_peek_info(shell->priv->component_registry, ECR_FIELD_ALIAS, schema); -- } + - if (component_info == NULL) { - CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_UnsupportedSchema, NULL); - return; - } - -- if (show) { -- GtkWidget *shell_window; -- -- shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL); -- if (shell_window == NULL) { -- CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL); -- return; -- } -+ shell_window = (GtkWidget *)e_shell_create_window (shell, component_info->id, NULL); -+ if (shell_window == NULL) { -+ CORBA_exception_set (ev, CORBA_USER_EXCEPTION, ex_GNOME_Evolution_Shell_ComponentNotFound, NULL); -+ return; - } -- -+ - GNOME_Evolution_Component_handleURI (component_info->iface, uri, ev); - /* not an error not to implement it */ - if (ev->_id != NULL && strcmp(ev->_id, ex_CORBA_NO_IMPLEMENT) == 0) diff --git a/evolution.spec b/evolution.spec index 15df3f4..0128f0c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 14%{?dist} +Release: 15%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -755,6 +755,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon May 14 2007 Matthew Barnes - 2.10.1-15.fc7 +- Revise patch for RH bug #236860 to match upstream's solution. + * Mon May 14 2007 Matthew Barnes - 2.10.1-14.fc7 - Revise patch for RH bug #238155 (crash on startup). From 499936e2fb31d9eb34d6eb95bb7401a34edc9acc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 15 May 2007 19:18:49 +0000 Subject: [PATCH 138/844] - Add patch for RH bug #240147 (Send/Receive dialog layout). --- evolution-2.10.1-send-recv-dialog.patch | 85 +++++++++++++++++++++++++ evolution.spec | 9 ++- 2 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 evolution-2.10.1-send-recv-dialog.patch diff --git a/evolution-2.10.1-send-recv-dialog.patch b/evolution-2.10.1-send-recv-dialog.patch new file mode 100644 index 0000000..3f26184 --- /dev/null +++ b/evolution-2.10.1-send-recv-dialog.patch @@ -0,0 +1,85 @@ +--- evolution-2.10.1/mail/mail-send-recv.c.send-recv-dialog 2007-05-15 14:26:24.000000000 -0400 ++++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-15 14:30:51.000000000 -0400 +@@ -312,21 +312,6 @@ + return SEND_INVALID; + } + +-gboolean +-dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table) +-{ +- int h, w; +- +- w = table->allocation.width + 30 /* Spacing around the table */; +- h = table->allocation.height + 60 /* Cancell All button and Seperator and outer spacing */; +- +- if (w > 750) +- w = 750; +- if (h > 400) +- h = 400; +- gtk_widget_set_usize (window, w, h); +-} +- + static struct _send_data * + build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination) + { +@@ -385,7 +370,7 @@ + + scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), +- GTK_POLICY_AUTOMATIC, ++ GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); + + gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), table); +@@ -443,6 +428,7 @@ + recv_icon = e_icon_factory_get_image ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); + pretty_url = format_url (source->url, account->name); + label = (GtkLabel *)gtk_label_new (NULL); ++ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_label_set_markup (label, pretty_url); + g_free (pretty_url); + +@@ -457,10 +443,10 @@ + gtk_misc_set_alignment (GTK_MISC (label), 0, .5); + gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); + +- gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, 0, 0, 0, 0); + gtk_table_attach (table, (GtkWidget *)label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); +- gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); +- gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, 0, 0, 0, 0); ++ gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, 0, 0, 0, 0); + gtk_table_attach (table, (GtkWidget *)status_label, 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); + + info->bar = bar; +@@ -496,6 +482,7 @@ + send_icon = e_icon_factory_get_image ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); + pretty_url = format_url (destination, NULL); + label = (GtkLabel *)gtk_label_new (NULL); ++ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); + gtk_label_set_markup (label, pretty_url); + + g_free (pretty_url); +@@ -508,10 +495,10 @@ + gtk_misc_set_alignment (GTK_MISC (label), 0, .5); + gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); + +- gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, 0, 0, 0, 0); + gtk_table_attach (table, GTK_WIDGET (label), 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); +- gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); +- gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, 0, 0, 0, 0); ++ gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, 0, 0, 0, 0); + gtk_table_attach (table, GTK_WIDGET (status_label), 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); + + info->bar = bar; +@@ -526,7 +513,6 @@ + gtk_widget_show (GTK_WIDGET (gd)); + + g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data); +- g_signal_connect (gd, "map-event", G_CALLBACK (dialog_map), table); + + g_object_weak_ref ((GObject *) gd, (GWeakNotify) dialog_destroy_cb, data); + diff --git a/evolution.spec b/evolution.spec index 0128f0c..afd9be9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 15%{?dist} +Release: 16%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -176,6 +176,9 @@ Patch52: evolution-2.10.1-e-attachment-bar.patch # RH bug #238155 / GNOME bug #427232 Patch53: evolution-2.10.1-check-uri-before-strcmp.patch +# RH bug #240147 / GNOME bug #335241 +Patch54: evolution-2.10.1-send-recv-dialog.patch + ## Dependencies ### Requires(post): GConf2 @@ -334,6 +337,7 @@ Development files needed for building things which link against evolution. %patch51 -p1 -b .en_CA-attribution-format %patch52 -p1 -b .e-attachment-bar %patch53 -p1 -b .check-uri-before-strcmp +%patch54 -p1 -b .send-recv-dialog mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -755,6 +759,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue May 15 2007 Matthew Barnes - 2.10.1-16.fc7 +- Add patch for RH bug #240147 (Send/Receive dialog layout). + * Mon May 14 2007 Matthew Barnes - 2.10.1-15.fc7 - Revise patch for RH bug #236860 to match upstream's solution. From 1e91f2f7b151984a30552aef782efaf41156f7c5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 16 May 2007 21:08:37 +0000 Subject: [PATCH 139/844] - Revise patch for GNOME bug #362638 to fix RH bug #237206 (certificate prompt causes crash, again). --- evolution-2.8.1-kill-ethread.patch | 4838 ++++++++++++++++++++++++++-- evolution.spec | 6 +- 2 files changed, 4552 insertions(+), 292 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 00e4630..1300292 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,16 +1,89 @@ --- evolution-2.10.1/mail/mail-send-recv.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-send-recv.c 2007-04-10 22:37:49.000000000 -0400 -@@ -819,7 +819,7 @@ ++++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-16 16:17:38.000000000 -0400 +@@ -725,23 +725,22 @@ + /* ********************************************************************** */ + + struct _refresh_folders_msg { +- struct _mail_msg msg; ++ MailMsg base; + + struct _send_info *info; + GPtrArray *folders; + CamelStore *store; + }; + +-static char * +-refresh_folders_desc (struct _mail_msg *mm, int done) ++static gchar * ++refresh_folders_desc (struct _refresh_folders_msg *m) + { + return g_strdup_printf(_("Checking for new mail")); + } + + static void +-refresh_folders_get (struct _mail_msg *mm) ++refresh_folders_exec (struct _refresh_folders_msg *m) + { +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; + int i; + CamelFolder *folder; + +@@ -757,17 +756,14 @@ + } + + static void +-refresh_folders_got (struct _mail_msg *mm) ++refresh_folders_done (struct _refresh_folders_msg *m) + { +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; +- + receive_done("", m->info); + } + + static void +-refresh_folders_free (struct _mail_msg *mm) ++refresh_folders_free (struct _refresh_folders_msg *m) + { +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; + int i; + + for (i=0;ifolders->len;i++) +@@ -776,11 +772,12 @@ + camel_object_unref(m->store); + } + +-static struct _mail_msg_op refresh_folders_op = { +- refresh_folders_desc, +- refresh_folders_get, +- refresh_folders_got, +- refresh_folders_free, ++static MailMsgInfo refresh_folders_info = { ++ sizeof (struct _refresh_folders_msg), ++ (MailMsgDescFunc) refresh_folders_desc, ++ (MailMsgExecFunc) refresh_folders_exec, ++ (MailMsgDoneFunc) refresh_folders_done, ++ (MailMsgFreeFunc) refresh_folders_free + }; + + static void +@@ -813,13 +810,13 @@ + + get_folders(store, folders, info); + +- m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&refresh_folders_info); + m->store = store; + camel_object_ref(store); m->folders = folders; m->info = sinfo; - e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } else { receive_done ("", data); } --- evolution-2.10.1/mail/mail-component.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-component.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/mail-component.c 2007-05-16 16:17:38.000000000 -0400 @@ -965,7 +965,7 @@ if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -21,62 +94,715 @@ } else { g_warning("email uri's must include a uid parameter"); --- evolution-2.10.1/mail/mail-ops.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-ops.c 2007-04-10 22:37:49.000000000 -0400 -@@ -221,7 +221,7 @@ ++++ evolution-2.10.1/mail/mail-ops.c 2007-05-16 16:19:33.000000000 -0400 +@@ -75,7 +75,7 @@ + /* used for both just filtering a folder + uid's, and for filtering a whole folder */ + /* used both for fetching mail, and for filtering mail */ + struct _filter_mail_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *source_folder; /* where they come from */ + GPtrArray *source_uids; /* uids to copy, or NULL == copy all */ +@@ -99,8 +99,8 @@ + void *data; + }; + +-static char * +-em_filter_folder_element_describe (struct _mail_msg *mm, int complete) ++static gchar * ++em_filter_folder_element_desc (struct _filter_mail_msg *m) + { + return g_strdup (_("Filtering Selected Messages")); + } +@@ -108,9 +108,8 @@ + /* filter a folder, or a subset thereof, uses source_folder/source_uids */ + /* this is shared with fetch_mail */ + static void +-em_filter_folder_element_filter (struct _mail_msg *mm) ++em_filter_folder_element_exec (struct _filter_mail_msg *m) + { +- struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm; + CamelFolder *folder; + GPtrArray *uids, *folder_uids = NULL; + +@@ -137,15 +136,15 @@ + else + folder_uids = uids = camel_folder_get_uids (folder); + +- camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &mm->ex); +- camel_filter_driver_flush (m->driver, &mm->ex); ++ camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &m->base.ex); ++ camel_filter_driver_flush (m->driver, &m->base.ex); + + if (folder_uids) + camel_folder_free_uids (folder, folder_uids); + + /* sync our source folder */ + if (!m->cache) +- camel_folder_sync (folder, FALSE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex); ++ camel_folder_sync (folder, FALSE, camel_exception_is_set (&m->base.ex) ? NULL : &m->base.ex); + camel_folder_thaw (folder); + + if (m->destination) +@@ -161,15 +160,13 @@ + } + + static void +-em_filter_folder_element_filtered (struct _mail_msg *mm) ++em_filter_folder_element_done (struct _filter_mail_msg *m) + { + } + + static void +-em_filter_folder_element_free (struct _mail_msg *mm) ++em_filter_folder_element_free (struct _filter_mail_msg *m) + { +- struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm; +- + if (m->source_folder) + camel_object_unref (m->source_folder); + +@@ -188,11 +185,12 @@ + mail_session_flush_filter_log (); + } + +-static struct _mail_msg_op em_filter_folder_element_op = { +- em_filter_folder_element_describe, /* we do our own progress reporting? */ +- em_filter_folder_element_filter, +- em_filter_folder_element_filtered, +- em_filter_folder_element_free, ++static MailMsgInfo em_filter_folder_element_info = { ++ sizeof (struct _filter_mail_msg), ++ (MailMsgDescFunc) em_filter_folder_element_desc, /* we do our own progress reporting? */ ++ (MailMsgExecFunc) em_filter_folder_element_exec, ++ (MailMsgDoneFunc) em_filter_folder_element_done, ++ (MailMsgFreeFunc) em_filter_folder_element_free + }; + + void +@@ -202,7 +200,7 @@ + { + struct _filter_mail_msg *m; + +- m = mail_msg_new (&em_filter_folder_element_op, NULL, sizeof (*m)); ++ m = mail_msg_new (&em_filter_folder_element_info); + m->source_folder = source_folder; + camel_object_ref (source_folder); + m->source_uids = uids; +@@ -221,7 +219,7 @@ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } - e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } /* convenience functions for it */ -@@ -426,7 +426,7 @@ +@@ -260,17 +258,16 @@ + return filename; + } + +-static char * +-fetch_mail_describe (struct _mail_msg *mm, int complete) ++static gchar * ++fetch_mail_desc (struct _fetch_mail_msg *m) + { + return g_strdup (_("Fetching Mail")); + } + + static void +-fetch_mail_fetch (struct _mail_msg *mm) ++fetch_mail_exec (struct _fetch_mail_msg *m) + { +- struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm; +- struct _filter_mail_msg *fm = (struct _filter_mail_msg *)mm; ++ struct _filter_mail_msg *fm = (struct _filter_mail_msg *)m; + int i; + + if (m->cancel) +@@ -283,20 +280,20 @@ + /* FIXME: this should support keep_on_server too, which would then perform a spool + access thingy, right? problem is matching raw messages to uid's etc. */ + if (!strncmp (m->source_uri, "mbox:", 5)) { +- char *path = mail_tool_do_movemail (m->source_uri, &mm->ex); ++ char *path = mail_tool_do_movemail (m->source_uri, &fm->base.ex); + +- if (path && !camel_exception_is_set (&mm->ex)) { ++ if (path && !camel_exception_is_set (&fm->base.ex)) { + camel_folder_freeze (fm->destination); + camel_filter_driver_set_default_folder (fm->driver, fm->destination); +- camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &mm->ex); ++ camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &fm->base.ex); + camel_folder_thaw (fm->destination); + +- if (!camel_exception_is_set (&mm->ex)) ++ if (!camel_exception_is_set (&fm->base.ex)) + g_unlink (path); + } + g_free (path); + } else { +- CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &mm->ex); ++ CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &fm->base.ex); + + if (folder) { + /* this handles 'keep on server' stuff, if we have any new uid's to copy +@@ -322,17 +319,17 @@ + camel_uid_cache_free_uids (cache_uids); + + fm->cache = cache; +- em_filter_folder_element_filter (mm); ++ em_filter_folder_element_exec (&fm->base); + + /* need to uncancel so writes/etc. don't fail */ +- if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) ++ if (fm->base.ex.id == CAMEL_EXCEPTION_USER_CANCEL) + camel_operation_uncancel(NULL); + + /* save the cache of uids that we've just downloaded */ + camel_uid_cache_save (cache); + } + +- if (fm->delete && mm->ex.id == CAMEL_EXCEPTION_NONE) { ++ if (fm->delete && fm->base.ex.id == CAMEL_EXCEPTION_NONE) { + /* not keep on server - just delete all the actual messages on the server */ + for (i=0;ilen;i++) { + d(printf("force delete uid '%s'\n", (char *)folder_uids->pdata[i])); +@@ -348,7 +345,7 @@ + camel_uid_cache_destroy (cache); + camel_folder_free_uids (folder, folder_uids); + } else { +- em_filter_folder_element_filter (mm); ++ em_filter_folder_element_exec (&fm->base); + } + + /* we unref the source folder here since we +@@ -372,31 +369,28 @@ + } + + static void +-fetch_mail_fetched (struct _mail_msg *mm) ++fetch_mail_done (struct _fetch_mail_msg *m) + { +- struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm; +- + if (m->done) + m->done (m->source_uri, m->data); + } + + static void +-fetch_mail_free (struct _mail_msg *mm) ++fetch_mail_free (struct _fetch_mail_msg *m) + { +- struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm; +- + g_free (m->source_uri); + if (m->cancel) + camel_operation_unref (m->cancel); + +- em_filter_folder_element_free (mm); ++ em_filter_folder_element_free (&m->fmsg.base); + } + +-static struct _mail_msg_op fetch_mail_op = { +- fetch_mail_describe, /* we do our own progress reporting */ +- fetch_mail_fetch, +- fetch_mail_fetched, +- fetch_mail_free, ++static MailMsgInfo fetch_mail_info = { ++ sizeof (struct _fetch_mail_msg), ++ (MailMsgDescFunc) fetch_mail_desc, ++ (MailMsgExecFunc) fetch_mail_exec, ++ (MailMsgDoneFunc) fetch_mail_done, ++ (MailMsgFreeFunc) fetch_mail_free + }; + + /* ouch, a 'do everything' interface ... */ +@@ -409,7 +403,7 @@ + struct _fetch_mail_msg *m; + struct _filter_mail_msg *fm; + +- m = mail_msg_new (&fetch_mail_op, NULL, sizeof (*m)); ++ m = mail_msg_new (&fetch_mail_info); + fm = (struct _filter_mail_msg *)m; + m->source_uri = g_strdup (source); + fm->delete = !keep; +@@ -426,7 +420,7 @@ if (status) camel_filter_driver_set_status_func (fm->driver, status, status_data); - e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } /* ********************************************************************** */ -@@ -839,7 +839,7 @@ +@@ -657,7 +651,7 @@ + /* ** SEND MAIL QUEUE ***************************************************** */ + + struct _send_queue_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *queue; + char *destination; +@@ -689,9 +683,8 @@ + } + + static void +-send_queue_send(struct _mail_msg *mm) ++send_queue_exec (struct _send_queue_msg *m) + { +- struct _send_queue_msg *m = (struct _send_queue_msg *)mm; + CamelFolder *sent_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT); + GPtrArray *uids, *send_uids = NULL; + CamelException ex; +@@ -739,17 +732,17 @@ + if (camel_exception_is_set (&ex)) { + if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { + /* merge exceptions into one */ +- if (camel_exception_is_set (&mm->ex)) +- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, "%s\n\n%s", mm->ex.desc, ex.desc); ++ if (camel_exception_is_set (&m->base.ex)) ++ camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, "%s\n\n%s", m->base.ex.desc, ex.desc); + else +- camel_exception_xfer (&mm->ex, &ex); ++ camel_exception_xfer (&m->base.ex, &ex); + camel_exception_clear (&ex); + + /* keep track of the number of failures */ + j++; + } else { + /* transfer the USER_CANCEL exeption to the async op exception and then break */ +- camel_exception_xfer (&mm->ex, &ex); ++ camel_exception_xfer (&m->base.ex, &ex); + break; + } + } +@@ -759,7 +752,7 @@ + + if (j > 0) + report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed to send %d of %d messages"), j, send_uids->len); +- else if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) ++ else if (m->base.ex.id == CAMEL_EXCEPTION_USER_CANCEL) + report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Canceled.")); + else + report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); +@@ -785,19 +778,15 @@ + } + + static void +-send_queue_sent(struct _mail_msg *mm) ++send_queue_done (struct _send_queue_msg *m) + { +- struct _send_queue_msg *m = (struct _send_queue_msg *)mm; +- + if (m->done) + m->done(m->destination, m->data); + } + + static void +-send_queue_free(struct _mail_msg *mm) ++send_queue_free (struct _send_queue_msg *m) + { +- struct _send_queue_msg *m = (struct _send_queue_msg *)mm; +- + if (m->driver) + camel_object_unref(m->driver); + camel_object_unref(m->queue); +@@ -806,11 +795,12 @@ + camel_operation_unref(m->cancel); + } + +-static struct _mail_msg_op send_queue_op = { +- NULL, /* do our own reporting, as with fetch mail */ +- send_queue_send, +- send_queue_sent, +- send_queue_free, ++static MailMsgInfo send_queue_info = { ++ sizeof (struct _send_queue_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) send_queue_exec, ++ (MailMsgDoneFunc) send_queue_done, ++ (MailMsgFreeFunc) send_queue_free + }; + + /* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */ +@@ -823,7 +813,7 @@ + { + struct _send_queue_msg *m; + +- m = mail_msg_new(&send_queue_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&send_queue_info); + m->queue = queue; + camel_object_ref(queue); + m->destination = g_strdup(destination); +@@ -839,13 +829,13 @@ m->driver = camel_session_get_filter_driver (session, type, NULL); camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); - e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } /* ** APPEND MESSAGE TO FOLDER ******************************************** */ -@@ -921,7 +921,7 @@ + + struct _append_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + CamelMimeMessage *message; +@@ -856,45 +846,40 @@ + void *data; + }; + +-static char * +-append_mail_desc (struct _mail_msg *mm, int done) ++static gchar * ++append_mail_desc (struct _append_msg *m) + { + return g_strdup (_("Saving message to folder")); + } + + static void +-append_mail_append (struct _mail_msg *mm) ++append_mail_exec (struct _append_msg *m) + { +- struct _append_msg *m = (struct _append_msg *)mm; +- + camel_mime_message_set_date(m->message, CAMEL_MESSAGE_DATE_CURRENT, 0); +- camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &mm->ex); ++ camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &m->base.ex); + } + + static void +-append_mail_appended (struct _mail_msg *mm) ++append_mail_done (struct _append_msg *m) + { +- struct _append_msg *m = (struct _append_msg *)mm; +- + if (m->done) +- m->done(m->folder, m->message, m->info, !camel_exception_is_set(&mm->ex), m->appended_uid, m->data); ++ m->done(m->folder, m->message, m->info, !camel_exception_is_set(&m->base.ex), m->appended_uid, m->data); + } + + static void +-append_mail_free (struct _mail_msg *mm) ++append_mail_free (struct _append_msg *m) + { +- struct _append_msg *m = (struct _append_msg *)mm; +- + camel_object_unref(m->message); + camel_object_unref(m->folder); + g_free (m->appended_uid); + } + +-static struct _mail_msg_op append_mail_op = { +- append_mail_desc, +- append_mail_append, +- append_mail_appended, +- append_mail_free ++static MailMsgInfo append_mail_info = { ++ sizeof (struct _append_msg), ++ (MailMsgDescFunc) append_mail_desc, ++ (MailMsgExecFunc) append_mail_exec, ++ (MailMsgDoneFunc) append_mail_done, ++ (MailMsgFreeFunc) append_mail_free + }; + + void +@@ -911,7 +896,7 @@ + camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", + "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); + +- m = mail_msg_new (&append_mail_op, NULL, sizeof (*m)); ++ m = mail_msg_new (&append_mail_info); + m->folder = folder; + camel_object_ref(folder); + m->message = message; +@@ -921,13 +906,13 @@ m->done = done; m->data = data; - e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } /* ** TRANSFER MESSAGES **************************************************** */ -@@ -1036,7 +1036,7 @@ + + struct _transfer_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *source; + GPtrArray *uids; +@@ -939,24 +924,21 @@ + void *data; + }; + +-static char * +-transfer_messages_desc (struct _mail_msg *mm, int done) ++static gchar * ++transfer_messages_desc (struct _transfer_msg *m) + { +- struct _transfer_msg *m = (struct _transfer_msg *)mm; +- + return g_strdup_printf(m->delete?_("Moving messages to %s"):_("Copying messages to %s"), + m->dest_uri); + + } + + static void +-transfer_messages_transfer (struct _mail_msg *mm) ++transfer_messages_exec (struct _transfer_msg *m) + { +- struct _transfer_msg *m = (struct _transfer_msg *)mm; + CamelFolder *dest; + +- dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &mm->ex); +- if (camel_exception_is_set (&mm->ex)) ++ dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &m->base.ex); ++ if (camel_exception_is_set (&m->base.ex)) + return; + + if (dest == m->source) { +@@ -968,7 +950,7 @@ + camel_folder_freeze (m->source); + camel_folder_freeze (dest); + +- camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &mm->ex); ++ camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &m->base.ex); + + /* make sure all deleted messages are marked as seen */ + +@@ -987,29 +969,26 @@ + } + + static void +-transfer_messages_transferred (struct _mail_msg *mm) ++transfer_messages_done (struct _transfer_msg *m) + { +- struct _transfer_msg *m = (struct _transfer_msg *)mm; +- + if (m->done) +- m->done (!camel_exception_is_set (&mm->ex), m->data); ++ m->done (!camel_exception_is_set (&m->base.ex), m->data); + } + + static void +-transfer_messages_free (struct _mail_msg *mm) ++transfer_messages_free (struct _transfer_msg *m) + { +- struct _transfer_msg *m = (struct _transfer_msg *)mm; +- + camel_object_unref (m->source); + g_free (m->dest_uri); + em_utils_uids_free (m->uids); + } + +-static struct _mail_msg_op transfer_messages_op = { +- transfer_messages_desc, +- transfer_messages_transfer, +- transfer_messages_transferred, +- transfer_messages_free, ++static MailMsgInfo transfer_messages_info = { ++ sizeof (struct _transfer_msg), ++ (MailMsgDescFunc) transfer_messages_desc, ++ (MailMsgExecFunc) transfer_messages_exec, ++ (MailMsgDoneFunc) transfer_messages_done, ++ (MailMsgFreeFunc) transfer_messages_free + }; + + void +@@ -1026,7 +1005,7 @@ + g_assert(uids != NULL); + g_assert(dest_uri != NULL); + +- m = mail_msg_new(&transfer_messages_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&transfer_messages_info); + m->source = source; + camel_object_ref (source); + m->uids = uids; +@@ -1036,13 +1015,13 @@ m->done = done; m->data = data; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ mail_msg_slow_ordered_push (m); } /* ** SCAN SUBFOLDERS ***************************************************** */ -@@ -1124,7 +1124,7 @@ + + struct _get_folderinfo_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelStore *store; + CamelFolderInfo *info; +@@ -1050,10 +1029,9 @@ + void *data; + }; + +-static char * +-get_folderinfo_desc (struct _mail_msg *mm, int done) ++static gchar * ++get_folderinfo_desc (struct _get_folderinfo_msg *m) + { +- struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; + char *ret, *name; + + name = camel_service_get_name((CamelService *)m->store, TRUE); +@@ -1063,25 +1041,22 @@ + } + + static void +-get_folderinfo_get (struct _mail_msg *mm) ++get_folderinfo_exec (struct _get_folderinfo_msg *m) + { +- struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; + guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; + +- m->info = camel_store_get_folder_info (m->store, NULL, flags, &mm->ex); ++ m->info = camel_store_get_folder_info (m->store, NULL, flags, &m->base.ex); + } + + static void +-get_folderinfo_got (struct _mail_msg *mm) ++get_folderinfo_done (struct _get_folderinfo_msg *m) + { +- struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; +- +- if (!m->info && camel_exception_is_set (&mm->ex)) { ++ if (!m->info && camel_exception_is_set (&m->base.ex)) { + char *url; + + url = camel_service_get_url (CAMEL_SERVICE (m->store)); + w(g_warning ("Error getting folder info from store at %s: %s", +- url, camel_exception_get_description (&mm->ex))); ++ url, camel_exception_get_description (&m->base.ex))); + g_free (url); + } + +@@ -1090,20 +1065,19 @@ + } + + static void +-get_folderinfo_free (struct _mail_msg *mm) ++get_folderinfo_free (struct _get_folderinfo_msg *m) + { +- struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; +- + if (m->info) + camel_store_free_folder_info(m->store, m->info); + camel_object_unref(m->store); + } + +-static struct _mail_msg_op get_folderinfo_op = { +- get_folderinfo_desc, +- get_folderinfo_get, +- get_folderinfo_got, +- get_folderinfo_free, ++static MailMsgInfo get_folderinfo_info = { ++ sizeof (struct _get_folderinfo_msg), ++ (MailMsgDescFunc) get_folderinfo_desc, ++ (MailMsgExecFunc) get_folderinfo_exec, ++ (MailMsgDoneFunc) get_folderinfo_done, ++ (MailMsgFreeFunc) get_folderinfo_free + }; + + int +@@ -1112,19 +1086,19 @@ + struct _get_folderinfo_msg *m; + int id; + +- m = mail_msg_new(&get_folderinfo_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&get_folderinfo_info); + if (op) { +- camel_operation_unref(m->msg.cancel); +- m->msg.cancel = op; ++ camel_operation_unref(m->base.cancel); ++ m->base.cancel = op; + camel_operation_ref(op); + } + m->store = store; + camel_object_ref(store); + m->done = done; m->data = data; - id = m->msg.seq; +- id = m->msg.seq; ++ id = m->base.seq; - e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); return id; } -@@ -1250,7 +1250,7 @@ +@@ -1196,7 +1170,7 @@ + presumably create a folder ... */ + + struct _get_folder_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *uri; + guint32 flags; +@@ -1205,71 +1179,64 @@ + void *data; + }; + +-static char * +-get_folder_desc (struct _mail_msg *mm, int done) ++static gchar * ++get_folder_desc (struct _get_folder_msg *m) + { +- struct _get_folder_msg *m = (struct _get_folder_msg *)mm; +- + return g_strdup_printf(_("Opening folder %s"), m->uri); + } + + static void +-get_folder_get (struct _mail_msg *mm) ++get_folder_exec (struct _get_folder_msg *m) + { +- struct _get_folder_msg *m = (struct _get_folder_msg *)mm; +- +- m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &mm->ex); ++ m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &m->base.ex); + } + + static void +-get_folder_got (struct _mail_msg *mm) ++get_folder_done (struct _get_folder_msg *m) + { +- struct _get_folder_msg *m = (struct _get_folder_msg *)mm; +- + if (m->done) + m->done (m->uri, m->folder, m->data); + } + + static void +-get_folder_free (struct _mail_msg *mm) ++get_folder_free (struct _get_folder_msg *m) + { +- struct _get_folder_msg *m = (struct _get_folder_msg *)mm; +- + g_free (m->uri); + if (m->folder) + camel_object_unref (m->folder); + } + +-static struct _mail_msg_op get_folder_op = { +- get_folder_desc, +- get_folder_get, +- get_folder_got, +- get_folder_free, ++static MailMsgInfo get_folder_info = { ++ sizeof (struct _get_folder_msg), ++ (MailMsgDescFunc) get_folder_desc, ++ (MailMsgExecFunc) get_folder_exec, ++ (MailMsgDoneFunc) get_folder_done, ++ (MailMsgFreeFunc) get_folder_free + }; + int mail_get_folder (const char *uri, guint32 flags, void (*done)(char *uri, CamelFolder *folder, void *data), @@ -85,79 +811,645 @@ { struct _get_folder_msg *m; int id; -@@ -1262,7 +1262,7 @@ + +- m = mail_msg_new(&get_folder_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&get_folder_info); + m->uri = g_strdup (uri); + m->flags = flags; + m->data = data; m->done = done; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put(thread, (EMsg *)m); -+ dispatch ((mail_msg_t *) m); ++ id = m->base.seq; ++ dispatch (m); return id; } -@@ -1340,7 +1340,7 @@ + /* ** GET STORE ******************************************************* */ + + struct _get_store_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *uri; + CamelStore *store; +@@ -1277,50 +1244,43 @@ + void *data; + }; + +-static char * +-get_store_desc (struct _mail_msg *mm, int done) ++static gchar * ++get_store_desc (struct _get_store_msg *m) + { +- struct _get_store_msg *m = (struct _get_store_msg *)mm; +- + return g_strdup_printf(_("Opening store %s"), m->uri); + } + + static void +-get_store_get (struct _mail_msg *mm) ++get_store_exec (struct _get_store_msg *m) + { +- struct _get_store_msg *m = (struct _get_store_msg *)mm; +- + /*camel_session_get_store connects us, which we don't want to do on startup. */ + + m->store = (CamelStore *) camel_session_get_service (session, m->uri, + CAMEL_PROVIDER_STORE, +- &mm->ex); ++ &m->base.ex); + } + + static void +-get_store_got (struct _mail_msg *mm) ++get_store_done (struct _get_store_msg *m) + { +- struct _get_store_msg *m = (struct _get_store_msg *)mm; +- + if (m->done) + m->done (m->uri, m->store, m->data); + } + + static void +-get_store_free (struct _mail_msg *mm) ++get_store_free (struct _get_store_msg *m) + { +- struct _get_store_msg *m = (struct _get_store_msg *)mm; +- + g_free (m->uri); + if (m->store) + camel_object_unref (m->store); + } + +-static struct _mail_msg_op get_store_op = { +- get_store_desc, +- get_store_get, +- get_store_got, +- get_store_free, ++static MailMsgInfo get_store_info = { ++ sizeof (struct _get_store_msg), ++ (MailMsgDescFunc) get_store_desc, ++ (MailMsgExecFunc) get_store_exec, ++ (MailMsgDoneFunc) get_store_done, ++ (MailMsgFreeFunc) get_store_free + }; + + int +@@ -1329,25 +1289,25 @@ + struct _get_store_msg *m; + int id; + +- m = mail_msg_new (&get_store_op, NULL, sizeof (*m)); ++ m = mail_msg_new (&get_store_info); + if (op) { +- camel_operation_unref(m->msg.cancel); +- m->msg.cancel = op; ++ camel_operation_unref(m->base.cancel); ++ m->base.cancel = op; + camel_operation_ref(op); + } + m->uri = g_strdup (uri); + m->data = data; m->done = done; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); return id; } -@@ -1437,7 +1437,7 @@ + /* ** REMOVE FOLDER ******************************************************* */ + + struct _remove_folder_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *uri; + gboolean removed; +@@ -1355,18 +1315,15 @@ + void *data; + }; + +-static char * +-remove_folder_desc (struct _mail_msg *mm, int done) ++static gchar * ++remove_folder_desc (struct _remove_folder_msg *m) + { +- struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; +- + return g_strdup_printf (_("Removing folder %s"), m->uri); + } + + static void +-remove_folder_get (struct _mail_msg *mm) ++remove_folder_exec (struct _remove_folder_msg *m) + { +- struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; + CamelStore *store; + CamelFolder *folder; + GPtrArray *uids; +@@ -1374,7 +1331,7 @@ + + m->removed = FALSE; + +- folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); + if (!folder) + return; + +@@ -1394,16 +1351,14 @@ + camel_store_unsubscribe_folder (store, folder->full_name, NULL); + + /* Then delete the folder from the store */ +- camel_store_delete_folder (store, folder->full_name, &mm->ex); +- m->removed = !camel_exception_is_set (&mm->ex); ++ camel_store_delete_folder (store, folder->full_name, &m->base.ex); ++ m->removed = !camel_exception_is_set (&m->base.ex); + camel_object_unref (folder); + } + + static void +-remove_folder_got (struct _mail_msg *mm) ++remove_folder_done (struct _remove_folder_msg *m) + { +- struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; +- + if (m->removed) { + /* FIXME: Remove this folder from the folder cache ??? */ + } +@@ -1413,18 +1368,17 @@ + } + + static void +-remove_folder_free (struct _mail_msg *mm) ++remove_folder_free (struct _remove_folder_msg *m) + { +- struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; +- + g_free (m->uri); + } + +-static struct _mail_msg_op remove_folder_op = { +- remove_folder_desc, +- remove_folder_get, +- remove_folder_got, +- remove_folder_free, ++static MailMsgInfo remove_folder_info = { ++ sizeof (struct _remove_folder_msg), ++ (MailMsgDescFunc) remove_folder_desc, ++ (MailMsgExecFunc) remove_folder_exec, ++ (MailMsgDoneFunc) remove_folder_done, ++ (MailMsgFreeFunc) remove_folder_free + }; + + void +@@ -1432,59 +1386,56 @@ + { + struct _remove_folder_msg *m; + +- m = mail_msg_new (&remove_folder_op, NULL, sizeof (*m)); ++ m = mail_msg_new (&remove_folder_info); + m->uri = g_strdup (uri); m->data = data; m->done = done; - e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } /* ** SYNC FOLDER ********************************************************* */ -@@ -1498,7 +1498,7 @@ + + struct _sync_folder_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + void (*done) (CamelFolder *folder, void *data); + void *data; + }; + +-static char *sync_folder_desc(struct _mail_msg *mm, int done) ++static gchar * ++sync_folder_desc (struct _sync_folder_msg *m) + { +- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; +- + return g_strdup_printf (_("Storing folder \'%s\'"), + camel_folder_get_full_name (m->folder)); + } + +-static void sync_folder_sync(struct _mail_msg *mm) ++static void ++sync_folder_exec (struct _sync_folder_msg *m) + { +- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; +- +- camel_folder_sync(m->folder, FALSE, &mm->ex); ++ camel_folder_sync(m->folder, FALSE, &m->base.ex); + } + +-static void sync_folder_synced(struct _mail_msg *mm) ++static void ++sync_folder_done (struct _sync_folder_msg *m) + { +- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; +- + if (m->done) + m->done(m->folder, m->data); + } + +-static void sync_folder_free(struct _mail_msg *mm) ++static void ++sync_folder_free (struct _sync_folder_msg *m) + { +- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; +- + camel_object_unref((CamelObject *)m->folder); + } + +-static struct _mail_msg_op sync_folder_op = { +- sync_folder_desc, +- sync_folder_sync, +- sync_folder_synced, +- sync_folder_free, ++static MailMsgInfo sync_folder_info = { ++ sizeof (struct _sync_folder_msg), ++ (MailMsgDescFunc) sync_folder_desc, ++ (MailMsgExecFunc) sync_folder_exec, ++ (MailMsgDoneFunc) sync_folder_done, ++ (MailMsgFreeFunc) sync_folder_free + }; + + void +@@ -1492,19 +1443,19 @@ + { + struct _sync_folder_msg *m; + +- m = mail_msg_new(&sync_folder_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&sync_folder_info); + m->folder = folder; + camel_object_ref(folder); m->data = data; m->done = done; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ mail_msg_slow_ordered_push (m); } /* ** SYNC STORE ********************************************************* */ -@@ -1568,7 +1568,7 @@ + + struct _sync_store_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelStore *store; + int expunge; +@@ -1512,9 +1463,9 @@ + void *data; + }; + +-static char *sync_store_desc(struct _mail_msg *mm, int done) ++static gchar * ++sync_store_desc (struct _sync_store_msg *m) + { +- struct _sync_store_msg *m = (struct _sync_store_msg *)mm; + char *uri, *res; + + uri = camel_url_to_string(((CamelService *)m->store)->url, CAMEL_URL_HIDE_ALL); +@@ -1527,33 +1478,31 @@ + return res; + } + +-static void sync_store_sync(struct _mail_msg *mm) ++static void ++sync_store_exec (struct _sync_store_msg *m) + { +- struct _sync_store_msg *m = (struct _sync_store_msg *)mm; +- +- camel_store_sync(m->store, m->expunge, &mm->ex); ++ camel_store_sync(m->store, m->expunge, &m->base.ex); + } + +-static void sync_store_synced(struct _mail_msg *mm) ++static void ++sync_store_done (struct _sync_store_msg *m) + { +- struct _sync_store_msg *m = (struct _sync_store_msg *)mm; +- + if (m->done) + m->done(m->store, m->data); + } + +-static void sync_store_free(struct _mail_msg *mm) ++static void ++sync_store_free (struct _sync_store_msg *m) + { +- struct _sync_store_msg *m = (struct _sync_store_msg *)mm; +- + camel_object_unref(m->store); + } + +-static struct _mail_msg_op sync_store_op = { +- sync_store_desc, +- sync_store_sync, +- sync_store_synced, +- sync_store_free, ++static MailMsgInfo sync_store_info = { ++ sizeof (struct _sync_store_msg), ++ (MailMsgDescFunc) sync_store_desc, ++ (MailMsgExecFunc) sync_store_exec, ++ (MailMsgDoneFunc) sync_store_done, ++ (MailMsgFreeFunc) sync_store_free + }; + + void +@@ -1561,36 +1510,37 @@ + { + struct _sync_store_msg *m; + +- m = mail_msg_new(&sync_store_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&sync_store_info); + m->store = store; + m->expunge = expunge; + camel_object_ref(store); m->data = data; m->done = done; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ mail_msg_slow_ordered_push (m); } /* ******************************************************************************** */ -@@ -1604,7 +1604,7 @@ + +-static char *refresh_folder_desc(struct _mail_msg *mm, int done) ++static gchar * ++refresh_folder_desc (struct _sync_folder_msg *m) + { + return g_strdup(_("Refreshing folder")); + } + +-static void refresh_folder_refresh(struct _mail_msg *mm) ++static void ++refresh_folder_exec (struct _sync_folder_msg *m) + { +- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; +- +- camel_folder_refresh_info(m->folder, &mm->ex); ++ camel_folder_refresh_info(m->folder, &m->base.ex); + } + + /* we just use the sync stuff where we can, since it would be the same */ +-static struct _mail_msg_op refresh_folder_op = { +- refresh_folder_desc, +- refresh_folder_refresh, +- sync_folder_synced, +- sync_folder_free, ++static MailMsgInfo refresh_folder_info = { ++ sizeof (struct _sync_folder_msg), ++ (MailMsgDescFunc) refresh_folder_desc, ++ (MailMsgExecFunc) refresh_folder_exec, ++ (MailMsgDoneFunc) sync_folder_done, ++ (MailMsgFreeFunc) sync_folder_free + }; + + void +@@ -1598,35 +1548,36 @@ + { + struct _sync_folder_msg *m; + +- m = mail_msg_new(&refresh_folder_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&refresh_folder_info); + m->folder = folder; + camel_object_ref(folder); m->data = data; m->done = done; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ mail_msg_slow_ordered_push (m); } /* ******************************************************************************** */ -@@ -1640,7 +1640,7 @@ + +-static char *expunge_folder_desc(struct _mail_msg *mm, int done) ++static gchar * ++expunge_folder_desc (struct _sync_folder_msg *m) + { + return g_strdup(_("Expunging folder")); + } + +-static void expunge_folder_expunge(struct _mail_msg *mm) ++static void ++expunge_folder_exec (struct _sync_folder_msg *m) + { +- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; +- +- camel_folder_expunge(m->folder, &mm->ex); ++ camel_folder_expunge(m->folder, &m->base.ex); + } + + /* we just use the sync stuff where we can, since it would be the same */ +-static struct _mail_msg_op expunge_folder_op = { +- expunge_folder_desc, +- expunge_folder_expunge, +- sync_folder_synced, +- sync_folder_free, ++static MailMsgInfo expunge_folder_info = { ++ sizeof (struct _sync_folder_msg), ++ (MailMsgDescFunc) expunge_folder_desc, ++ (MailMsgExecFunc) expunge_folder_exec, ++ (MailMsgDoneFunc) sync_folder_done, ++ (MailMsgFreeFunc) sync_folder_free + }; + + void +@@ -1634,31 +1585,30 @@ + { + struct _sync_folder_msg *m; + +- m = mail_msg_new(&expunge_folder_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&expunge_folder_info); + m->folder = folder; + camel_object_ref(folder); m->data = data; m->done = done; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ mail_msg_slow_ordered_push (m); } /* ******************************************************************************** */ -@@ -1723,7 +1723,7 @@ + + struct _empty_trash_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EAccount *account; + void (*done) (EAccount *account, void *data); + void *data; + }; + +-static char *empty_trash_desc(struct _mail_msg *mm, int done) ++static gchar * ++empty_trash_desc (struct _empty_trash_msg *m) + { + /* FIXME after 1.4 is out and we're not in string freeze any more. */ + #if 0 +- struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; +- + return g_strdup_printf (_("Emptying trash in \'%s\'"), + m->account ? m->account->name : _("Local Folders")); + #else +@@ -1666,49 +1616,48 @@ + #endif + } + +-static void empty_trash_empty(struct _mail_msg *mm) ++static void ++empty_trash_exec (struct _empty_trash_msg *m) + { +- struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; + const char *evolution_dir; + CamelFolder *trash; + char *uri; + + if (m->account) { +- trash = mail_tool_get_trash (m->account->source->url, FALSE, &mm->ex); ++ trash = mail_tool_get_trash (m->account->source->url, FALSE, &m->base.ex); + } else { + evolution_dir = mail_component_peek_base_directory (mail_component_peek ()); + uri = g_strdup_printf ("mbox:%s/mail/local", evolution_dir); +- trash = mail_tool_get_trash (uri, TRUE, &mm->ex); ++ trash = mail_tool_get_trash (uri, TRUE, &m->base.ex); + g_free (uri); + } + + if (trash) +- camel_folder_expunge (trash, &mm->ex); ++ camel_folder_expunge (trash, &m->base.ex); + + camel_object_unref (trash); + } + +-static void empty_trash_emptied(struct _mail_msg *mm) ++static void ++empty_trash_done (struct _empty_trash_msg *m) + { +- struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; +- + if (m->done) + m->done(m->account, m->data); + } + +-static void empty_trash_free(struct _mail_msg *mm) ++static void ++empty_trash_free (struct _empty_trash_msg *m) + { +- struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; +- + if (m->account) + g_object_unref(m->account); + } + +-static struct _mail_msg_op empty_trash_op = { +- empty_trash_desc, +- empty_trash_empty, +- empty_trash_emptied, +- empty_trash_free, ++static MailMsgInfo empty_trash_info = { ++ sizeof (struct _empty_trash_msg), ++ (MailMsgDescFunc) empty_trash_desc, ++ (MailMsgExecFunc) empty_trash_exec, ++ (MailMsgDoneFunc) empty_trash_done, ++ (MailMsgFreeFunc) empty_trash_free + }; + + void +@@ -1716,20 +1665,20 @@ + { + struct _empty_trash_msg *m; + +- m = mail_msg_new(&empty_trash_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&empty_trash_info); + m->account = account; + if (account) + g_object_ref(account); m->data = data; m->done = done; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ mail_msg_slow_ordered_push (m); } /* ** GET MESSAGE(s) ***************************************************** */ -@@ -1783,7 +1783,7 @@ + + struct _get_message_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + char *uid; +@@ -1739,32 +1688,28 @@ + CamelOperation *cancel; + }; + +-static char *get_message_desc(struct _mail_msg *mm, int done) ++static gchar * ++get_message_desc (struct _get_message_msg *m) + { +- struct _get_message_msg *m = (struct _get_message_msg *)mm; +- + return g_strdup_printf(_("Retrieving message %s"), m->uid); + } + +-static void get_message_get(struct _mail_msg *mm) ++static void ++get_message_exec (struct _get_message_msg *m) + { +- struct _get_message_msg *m = (struct _get_message_msg *)mm; +- +- m->message = camel_folder_get_message(m->folder, m->uid, &mm->ex); ++ m->message = camel_folder_get_message(m->folder, m->uid, &m->base.ex); + } + +-static void get_message_got(struct _mail_msg *mm) ++static void ++get_message_done (struct _get_message_msg *m) + { +- struct _get_message_msg *m = (struct _get_message_msg *)mm; +- + if (m->done) + m->done(m->folder, m->uid, m->message, m->data); + } + +-static void get_message_free(struct _mail_msg *mm) ++static void ++get_message_free (struct _get_message_msg *m) + { +- struct _get_message_msg *m = (struct _get_message_msg *)mm; +- + g_free (m->uid); + camel_object_unref (m->folder); + camel_operation_unref (m->cancel); +@@ -1773,21 +1718,22 @@ + camel_object_unref (m->message); + } + +-static struct _mail_msg_op get_message_op = { +- get_message_desc, +- get_message_get, +- get_message_got, +- get_message_free, ++static MailMsgInfo get_message_info = { ++ sizeof (struct _get_message_msg), ++ (MailMsgDescFunc) get_message_desc, ++ (MailMsgExecFunc) get_message_exec, ++ (MailMsgDoneFunc) get_message_done, ++ (MailMsgFreeFunc) get_message_free + }; + void mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), @@ -166,16 +1458,48 @@ { struct _get_message_msg *m; -@@ -1795,7 +1795,7 @@ +- m = mail_msg_new(&get_message_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&get_message_info); + m->folder = folder; + camel_object_ref(folder); + m->uid = g_strdup(uid); +@@ -1795,37 +1741,37 @@ m->done = done; m->cancel = camel_operation_new(NULL, NULL); - e_thread_put(thread, (EMsg *)m); -+ dispatch ((mail_msg_t *) m); ++ dispatch (m); } typedef void (*get_done)(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *); -@@ -1821,7 +1821,7 @@ + +-static void get_messagex_got(struct _mail_msg *mm) ++static void ++get_messagex_done (struct _get_message_msg *m) + { +- struct _get_message_msg *m = (struct _get_message_msg *)mm; +- + if (m->done) { + get_done done = (get_done)m->done; +- done(m->folder, m->uid, m->message, m->data, &mm->ex); ++ done(m->folder, m->uid, m->message, m->data, &m->base.ex); + } + } + +-static struct _mail_msg_op get_messagex_op = { +- get_message_desc, +- get_message_get, +- get_messagex_got, +- get_message_free, ++static MailMsgInfo get_messagex_info = { ++ sizeof (struct _get_message_msg), ++ (MailMsgDescFunc) get_message_desc, ++ (MailMsgExecFunc) get_message_exec, ++ (MailMsgDoneFunc) get_messagex_done, ++ (MailMsgFreeFunc) get_message_free + }; + + /* This is temporary, to avoid having to rewrite everything that uses mail_get_message; it adds an exception argument to the callback */ void mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), @@ -184,143 +1508,1418 @@ { struct _get_message_msg *m; -@@ -1833,7 +1833,7 @@ +- m = mail_msg_new(&get_messagex_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&get_messagex_info); + m->folder = folder; + camel_object_ref(folder); + m->uid = g_strdup(uid); +@@ -1833,13 +1779,13 @@ m->done = done; m->cancel = camel_operation_new(NULL, NULL); - e_thread_put(thread, (EMsg *)m); -+ dispatch ((mail_msg_t *) m); ++ dispatch (m); } /* ********************************************************************** */ -@@ -1920,7 +1920,7 @@ + + struct _get_messages_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + GPtrArray *uids; +@@ -1849,26 +1795,25 @@ + void *data; + }; + +-static char * get_messages_desc(struct _mail_msg *mm, int done) ++static gchar * ++get_messages_desc (struct _get_messages_msg *m) + { +- struct _get_messages_msg *m = (struct _get_messages_msg *)mm; +- + return g_strdup_printf(ngettext("Retrieving %d message", + "Retrieving %d messages", m->uids->len), + m->uids->len); + } + +-static void get_messages_get(struct _mail_msg *mm) ++static void ++get_messages_exec (struct _get_messages_msg *m) + { +- struct _get_messages_msg *m = (struct _get_messages_msg *)mm; + int i; + CamelMimeMessage *message; + + for (i=0; iuids->len; i++) { + int pc = ((i+1) * 100) / m->uids->len; + +- message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex); +- camel_operation_progress(mm->cancel, pc); ++ message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); ++ camel_operation_progress(m->base.cancel, pc); + if (message == NULL) + break; + +@@ -1876,17 +1821,16 @@ + } + } + +-static void get_messages_got(struct _mail_msg *mm) ++static void ++get_messages_done (struct _get_messages_msg *m) + { +- struct _get_messages_msg *m = (struct _get_messages_msg *)mm; +- + if (m->done) + m->done(m->folder, m->uids, m->messages, m->data); + } + +-static void get_messages_free(struct _mail_msg *mm) ++static void ++get_messages_free (struct _get_messages_msg *m) + { +- struct _get_messages_msg *m = (struct _get_messages_msg *)mm; + int i; + + em_utils_uids_free (m->uids); +@@ -1898,11 +1842,12 @@ + camel_object_unref(m->folder); + } + +-static struct _mail_msg_op get_messages_op = { +- get_messages_desc, +- get_messages_get, +- get_messages_got, +- get_messages_free, ++static MailMsgInfo get_messages_info = { ++ sizeof (struct _get_messages_msg), ++ (MailMsgDescFunc) get_messages_desc, ++ (MailMsgExecFunc) get_messages_exec, ++ (MailMsgDoneFunc) get_messages_done, ++ (MailMsgFreeFunc) get_messages_free + }; + + void +@@ -1912,7 +1857,7 @@ + { + struct _get_messages_msg *m; + +- m = mail_msg_new(&get_messages_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&get_messages_info); + m->folder = folder; + camel_object_ref(folder); + m->uids = uids; +@@ -1920,13 +1865,13 @@ m->data = data; m->done = done; - e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } /* ** SAVE MESSAGES ******************************************************* */ -@@ -2063,7 +2063,7 @@ + + struct _save_messages_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + GPtrArray *uids; +@@ -1935,10 +1880,9 @@ + void *data; + }; + +-static char *save_messages_desc(struct _mail_msg *mm, int done) ++static gchar * ++save_messages_desc (struct _save_messages_msg *m) + { +- struct _save_messages_msg *m = (struct _save_messages_msg *)mm; +- + return g_strdup_printf(ngettext("Saving %d message", + "Saving %d messsages", m->uids->len), + m->uids->len); +@@ -1977,9 +1921,8 @@ + } + + static void +-save_messages_save (struct _mail_msg *mm) ++save_messages_exec (struct _save_messages_msg *m) + { +- struct _save_messages_msg *m = (struct _save_messages_msg *)mm; + CamelStreamFilter *filtered_stream; + CamelMimeFilterFrom *from_filter; + CamelStream *stream; +@@ -1996,8 +1939,8 @@ + CamelMimeMessage *message; + int pc = ((i+1) * 100) / m->uids->len; + +- message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex); +- camel_operation_progress(mm->cancel, pc); ++ message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); ++ camel_operation_progress(m->base.cancel, pc); + if (message == NULL) + break; + +@@ -2009,7 +1952,7 @@ + || camel_stream_flush(stream) == -1 + || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1 + || camel_stream_flush((CamelStream *)filtered_stream) == -1) { +- camel_exception_setv(&mm->ex, CAMEL_EXCEPTION_SYSTEM, ++ camel_exception_setv(&m->base.ex, CAMEL_EXCEPTION_SYSTEM, + _("Error saving messages to: %s:\n %s"), m->path, strerror(errno)); + g_free(from); + camel_object_unref((CamelObject *)message); +@@ -2023,28 +1966,27 @@ + camel_object_unref(stream); + } + +-static void save_messages_saved(struct _mail_msg *mm) ++static void ++save_messages_done (struct _save_messages_msg *m) + { +- struct _save_messages_msg *m = (struct _save_messages_msg *)mm; +- + if (m->done) + m->done(m->folder, m->uids, m->path, m->data); + } + +-static void save_messages_free(struct _mail_msg *mm) ++static void ++save_messages_free (struct _save_messages_msg *m) + { +- struct _save_messages_msg *m = (struct _save_messages_msg *)mm; +- + em_utils_uids_free (m->uids); + camel_object_unref(m->folder); + g_free(m->path); + } + +-static struct _mail_msg_op save_messages_op = { +- save_messages_desc, +- save_messages_save, +- save_messages_saved, +- save_messages_free, ++static MailMsgInfo save_messages_info = { ++ sizeof (struct _save_messages_msg), ++ (MailMsgDescFunc) save_messages_desc, ++ (MailMsgExecFunc) save_messages_exec, ++ (MailMsgDoneFunc) save_messages_done, ++ (MailMsgFreeFunc) save_messages_free + }; + + int +@@ -2054,7 +1996,7 @@ + struct _save_messages_msg *m; + int id; + +- m = mail_msg_new(&save_messages_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&save_messages_info); + m->folder = folder; + camel_object_ref(folder); + m->uids = uids; +@@ -2062,8 +2004,8 @@ + m->data = data; m->done = done; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); return id; } -@@ -2156,7 +2156,7 @@ +@@ -2071,7 +2013,7 @@ + /* ** SAVE PART ******************************************************* */ + + struct _save_part_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelMimePart *part; + char *path; +@@ -2080,27 +2022,27 @@ + gboolean readonly; + }; + +-static char *save_part_desc(struct _mail_msg *mm, int done) ++static gchar * ++save_part_desc (struct _save_part_msg *m) + { + return g_strdup(_("Saving attachment")); + } + + static void +-save_part_save (struct _mail_msg *mm) ++save_part_exec (struct _save_part_msg *m) + { +- struct _save_part_msg *m = (struct _save_part_msg *)mm; + CamelDataWrapper *content; + CamelStream *stream; + + if(!m->readonly){ + if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { +- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, ++ camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, + _("Cannot create output file: %s:\n %s"), + m->path, g_strerror (errno)); + return; + } + } else if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0444))) { +- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, ++ camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, + _("Cannot create output file: %s:\n %s"), + m->path, g_strerror (errno)); + return; +@@ -2110,7 +2052,7 @@ + + if (camel_data_wrapper_decode_to_stream (content, stream) == -1 + || camel_stream_flush (stream) == -1) +- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, ++ camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, + _("Could not write data: %s"), + g_strerror (errno)); + +@@ -2118,27 +2060,25 @@ + } + + static void +-save_part_saved (struct _mail_msg *mm) ++save_part_done (struct _save_part_msg *m) + { +- struct _save_part_msg *m = (struct _save_part_msg *)mm; +- + if (m->done) +- m->done (m->part, m->path, !camel_exception_is_set (&mm->ex), m->data); ++ m->done (m->part, m->path, !camel_exception_is_set (&m->base.ex), m->data); + } + + static void +-save_part_free (struct _mail_msg *mm) ++save_part_free (struct _save_part_msg *m) + { +- struct _save_part_msg *m = (struct _save_part_msg *)mm; + camel_object_unref (m->part); + g_free (m->path); + } + +-static struct _mail_msg_op save_part_op = { +- save_part_desc, +- save_part_save, +- save_part_saved, +- save_part_free, ++static MailMsgInfo save_part_info = { ++ sizeof (struct _save_part_msg), ++ (MailMsgDescFunc) save_part_desc, ++ (MailMsgExecFunc) save_part_exec, ++ (MailMsgDoneFunc) save_part_done, ++ (MailMsgFreeFunc) save_part_free + }; + + int +@@ -2147,7 +2087,7 @@ + { + struct _save_part_msg *m; + int id; +- m = mail_msg_new (&save_part_op, NULL, sizeof (*m)); ++ m = mail_msg_new (&save_part_info); + m->part = part; + camel_object_ref (part); + m->path = g_strdup (path); +@@ -2155,8 +2095,8 @@ + m->done = done; m->readonly = readonly; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); return id; } -@@ -2240,7 +2240,7 @@ +@@ -2165,7 +2105,7 @@ + /* ** PREPARE OFFLINE ***************************************************** */ + + struct _prep_offline_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelOperation *cancel; + char *uri; +@@ -2173,22 +2113,22 @@ + void *data; + }; + +-static void prep_offline_do(struct _mail_msg *mm) ++static void ++prep_offline_exec (struct _prep_offline_msg *m) + { +- struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm; + CamelFolder *folder; + + if (m->cancel) + camel_operation_register(m->cancel); + +- folder = mail_tool_uri_to_folder(m->uri, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder(m->uri, 0, &m->base.ex); + if (folder) { + if (CAMEL_IS_DISCO_FOLDER(folder)) { + camel_disco_folder_prepare_for_offline((CamelDiscoFolder *)folder, + "(match-all)", +- &mm->ex); ++ &m->base.ex); + } else if (CAMEL_IS_OFFLINE_FOLDER (folder)) { +- camel_offline_folder_downsync ((CamelOfflineFolder *) folder, "(match-all)", &mm->ex); ++ camel_offline_folder_downsync ((CamelOfflineFolder *) folder, "(match-all)", &m->base.ex); + } + /* prepare_for_offline should do this? */ + /* of course it should all be atomic, but ... */ +@@ -2200,28 +2140,27 @@ + camel_operation_unregister(m->cancel); + } + +-static void prep_offline_done(struct _mail_msg *mm) ++static void ++prep_offline_done (struct _prep_offline_msg *m) + { +- struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm; +- + if (m->done) + m->done(m->uri, m->data); + } + +-static void prep_offline_free(struct _mail_msg *mm) ++static void ++prep_offline_free (struct _prep_offline_msg *m) + { +- struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm; +- + if (m->cancel) + camel_operation_unref(m->cancel); + g_free(m->uri); + } + +-static struct _mail_msg_op prep_offline_op = { +- NULL, /* DO NOT CHANGE THIS, IT MUST BE NULL FOR CANCELLATION TO WORK */ +- prep_offline_do, +- prep_offline_done, +- prep_offline_free, ++static MailMsgInfo prep_offline_info = { ++ sizeof (struct _prep_offline_msg), ++ (MailMsgDescFunc) NULL, /* DO NOT CHANGE THIS, IT MUST BE NULL FOR CANCELLATION TO WORK */ ++ (MailMsgExecFunc) prep_offline_exec, ++ (MailMsgDoneFunc) prep_offline_done, ++ (MailMsgFreeFunc) prep_offline_free + }; + + void +@@ -2232,7 +2171,7 @@ + { + struct _prep_offline_msg *m; + +- m = mail_msg_new(&prep_offline_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&prep_offline_info); + m->cancel = cancel; + if (cancel) + camel_operation_ref(cancel); +@@ -2240,13 +2179,13 @@ m->data = data; m->done = done; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ mail_msg_slow_ordered_push (m); } /* ** GO OFFLINE ***************************************************** */ -@@ -2345,7 +2345,7 @@ + + struct _set_offline_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelStore *store; + gboolean offline; +@@ -2254,9 +2193,9 @@ + void *data; + }; + +-static char *set_offline_desc(struct _mail_msg *mm, int done) ++static gchar * ++set_offline_desc (struct _set_offline_msg *m) + { +- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; + char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); + char *msg; + +@@ -2266,61 +2205,59 @@ + return msg; + } + +-static void set_offline_do(struct _mail_msg *mm) ++static void ++set_offline_exec (struct _set_offline_msg *m) + { +- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; +- + if (CAMEL_IS_DISCO_STORE (m->store)) { + if (!m->offline) { + camel_disco_store_set_status (CAMEL_DISCO_STORE (m->store), + CAMEL_DISCO_STORE_ONLINE, +- &mm->ex); ++ &m->base.ex); + return; + } else if (camel_disco_store_can_work_offline (CAMEL_DISCO_STORE (m->store))) { + camel_disco_store_set_status (CAMEL_DISCO_STORE (m->store), + CAMEL_DISCO_STORE_OFFLINE, +- &mm->ex); ++ &m->base.ex); + return; + } + } else if (CAMEL_IS_OFFLINE_STORE (m->store)) { + if (!m->offline) { + camel_offline_store_set_network_state (CAMEL_OFFLINE_STORE (m->store), + CAMEL_OFFLINE_STORE_NETWORK_AVAIL, +- &mm->ex); ++ &m->base.ex); + return; + } else { + camel_offline_store_set_network_state (CAMEL_OFFLINE_STORE (m->store), + CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL, +- &mm->ex); ++ &m->base.ex); + return; + } + } + + if (m->offline) + camel_service_disconnect (CAMEL_SERVICE (m->store), +- TRUE, &mm->ex); ++ TRUE, &m->base.ex); + } + +-static void set_offline_done(struct _mail_msg *mm) ++static void ++set_offline_done (struct _set_offline_msg *m) + { +- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; +- + if (m->done) + m->done(m->store, m->data); + } + +-static void set_offline_free(struct _mail_msg *mm) ++static void ++set_offline_free (struct _set_offline_msg *m) + { +- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; +- + camel_object_unref(m->store); + } + +-static struct _mail_msg_op set_offline_op = { +- set_offline_desc, +- set_offline_do, +- set_offline_done, +- set_offline_free, ++static MailMsgInfo set_offline_info = { ++ sizeof (struct _set_offline_msg), ++ (MailMsgDescFunc) set_offline_desc, ++ (MailMsgExecFunc) set_offline_exec, ++ (MailMsgDoneFunc) set_offline_done, ++ (MailMsgFreeFunc) set_offline_free + }; + + int +@@ -2337,15 +2274,15 @@ + if (offline) + camel_service_cancel_connect (CAMEL_SERVICE (store)); + +- m = mail_msg_new(&set_offline_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&set_offline_info); + m->store = store; + camel_object_ref(store); + m->offline = offline; + m->data = data; m->done = done; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); return id; } -@@ -2433,7 +2433,7 @@ +@@ -2363,7 +2300,7 @@ + + /* Async service-checking/authtype-lookup code. */ + struct _check_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *url; + CamelProviderType type; +@@ -2373,51 +2310,47 @@ + void *data; + }; + +-static char * +-check_service_describe(struct _mail_msg *mm, int complete) ++static gchar * ++check_service_desc (struct _check_msg *m) + { + return g_strdup(_("Checking Service")); + } + + static void +-check_service_check(struct _mail_msg *mm) ++check_service_exec (struct _check_msg *m) + { +- struct _check_msg *m = (struct _check_msg *)mm; + CamelService *service; + +- service = camel_session_get_service(session, m->url, m->type, &mm->ex); ++ service = camel_session_get_service(session, m->url, m->type, &m->base.ex); + if (!service) { +- camel_operation_unregister(mm->cancel); ++ camel_operation_unregister(m->base.cancel); + return; + } + +- m->authtypes = camel_service_query_auth_types(service, &mm->ex); ++ m->authtypes = camel_service_query_auth_types(service, &m->base.ex); + camel_object_unref(service); + } + + static void +-check_service_done(struct _mail_msg *mm) ++check_service_done (struct _check_msg *m) + { +- struct _check_msg *m = (struct _check_msg *)mm; +- + if (m->done) + m->done(m->url, m->type, m->authtypes, m->data); + } + + static void +-check_service_free(struct _mail_msg *mm) ++check_service_free (struct _check_msg *m) + { +- struct _check_msg *m = (struct _check_msg *)mm; +- + g_free(m->url); + g_list_free(m->authtypes); + } + +-static struct _mail_msg_op check_service_op = { +- check_service_describe, +- check_service_check, +- check_service_done, +- check_service_free, ++static MailMsgInfo check_service_info = { ++ sizeof (struct _check_msg), ++ (MailMsgDescFunc) check_service_desc, ++ (MailMsgExecFunc) check_service_exec, ++ (MailMsgDoneFunc) check_service_done, ++ (MailMsgFreeFunc) check_service_free + }; + + int +@@ -2426,14 +2359,14 @@ + struct _check_msg *m; + int id; + +- m = mail_msg_new (&check_service_op, NULL, sizeof(*m)); ++ m = mail_msg_new (&check_service_info); + m->url = g_strdup(url); + m->type = type; + m->done = done; m->data = data; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); return id; } --- evolution-2.10.1/mail/em-folder-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-utils.c 2007-04-10 22:37:49.000000000 -0400 -@@ -260,7 +260,7 @@ ++++ evolution-2.10.1/mail/em-folder-utils.c 2007-05-16 16:17:38.000000000 -0400 +@@ -84,7 +84,7 @@ + } + + struct _EMCopyFolders { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *fromstore; +@@ -96,18 +96,15 @@ + int delete; + }; + +-static char * +-emft_copy_folders__desc (struct _mail_msg *mm, int complete) ++static gchar * ++emft_copy_folders__desc (struct _EMCopyFolders *m, gint complete) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; +- + return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); + } + + static void +-emft_copy_folders__copy (struct _mail_msg *mm) ++emft_copy_folders__exec (struct _EMCopyFolders *m) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; + guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; + GList *pending = NULL, *deleting = NULL, *l; + GString *fromname, *toname; +@@ -115,7 +112,7 @@ + const char *tmp; + int fromlen; + +- if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &mm->ex))) ++ if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) + return; + + pending = g_list_append (pending, fi); +@@ -155,8 +152,8 @@ + if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { + d(printf ("this folder is selectable\n")); + if (m->tostore == m->fromstore && m->delete) { +- camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &mm->ex); +- if (camel_exception_is_set (&mm->ex)) ++ camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex); ++ if (camel_exception_is_set (&m->base.ex)) + goto exception; + + /* this folder no longer exists, unsubscribe it */ +@@ -165,16 +162,16 @@ + + deleted = 1; + } else { +- if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &mm->ex))) ++ if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex))) + goto exception; + +- if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &mm->ex))) { ++ if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) { + camel_object_unref (fromfolder); + goto exception; + } + + uids = camel_folder_get_uids (fromfolder); +- camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &mm->ex); ++ camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex); + camel_folder_free_uids (fromfolder, uids); + + if (m->delete) +@@ -185,7 +182,7 @@ + } + } + +- if (camel_exception_is_set (&mm->ex)) ++ if (camel_exception_is_set (&m->base.ex)) + goto exception; + else if (m->delete && !deleted) + deleting = g_list_prepend (deleting, info); +@@ -226,10 +223,8 @@ + } + + static void +-emft_copy_folders__free (struct _mail_msg *mm) ++emft_copy_folders__free (struct _EMCopyFolders *m) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; +- + camel_object_unref (m->fromstore); + camel_object_unref (m->tostore); + +@@ -237,11 +232,12 @@ + g_free (m->tobase); + } + +-static struct _mail_msg_op copy_folders_op = { +- emft_copy_folders__desc, +- emft_copy_folders__copy, +- NULL, +- emft_copy_folders__free, ++static MailMsgInfo copy_folders_info = { ++ sizeof (struct _EMCopyFolders), ++ (MailMsgDescFunc) emft_copy_folders__desc, ++ (MailMsgExecFunc) emft_copy_folders__exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) emft_copy_folders__free + }; + + int +@@ -250,7 +246,7 @@ + struct _EMCopyFolders *m; + int seq; + +- m = mail_msg_new (©_folders_op, NULL, sizeof (struct _EMCopyFolders)); ++ m = mail_msg_new (©_folders_info); + camel_object_ref (fromstore); + m->fromstore = fromstore; + camel_object_ref (tostore); +@@ -258,9 +254,9 @@ + m->frombase = g_strdup (frombase); + m->tobase = g_strdup (tobase); m->delete = delete; - seq = m->msg.seq; +- seq = m->msg.seq; ++ seq = m->base.seq; - e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); return seq; } -@@ -652,7 +652,7 @@ +@@ -557,7 +553,7 @@ + } + + struct _EMCreateFolder { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *store; +@@ -573,41 +569,33 @@ + void *user_data; + }; + +-static char * +-emfu_create_folder__desc (struct _mail_msg *mm, int done) ++static gchar * ++emfu_create_folder__desc (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + return g_strdup_printf (_("Creating folder `%s'"), m->full_name); + } + + static void +-emfu_create_folder__create (struct _mail_msg *mm) ++emfu_create_folder__exec (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); + +- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { ++ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { + if (camel_store_supports_subscriptions (m->store)) +- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); + } + } + + static void +-emfu_create_folder__created (struct _mail_msg *mm) ++emfu_create_folder__done (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + if (m->done) + m->done (m->fi, m->user_data); + } + + static void +-emfu_create_folder__free (struct _mail_msg *mm) ++emfu_create_folder__free (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + camel_object_unref (m->store); + g_free (m->full_name); +@@ -615,11 +603,12 @@ + g_free (m->name); + } + +-static struct _mail_msg_op create_folder_op = { +- emfu_create_folder__desc, +- emfu_create_folder__create, +- emfu_create_folder__created, +- emfu_create_folder__free, ++static MailMsgInfo create_folder_info = { ++ sizeof (struct _EMCreateFolder), ++ (MailMsgDescFunc) emfu_create_folder__desc, ++ (MailMsgExecFunc) emfu_create_folder__exec, ++ (MailMsgDoneFunc) emfu_create_folder__done, ++ (MailMsgFreeFunc) emfu_create_folder__free + }; + + +@@ -640,7 +629,7 @@ + parent = namebuf; + } + +- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); ++ m = mail_msg_new (&create_folder_info); + camel_object_ref (store); + m->store = store; + m->full_name = g_strdup (full_name); +@@ -651,8 +640,8 @@ + g_free (namebuf); - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); return id; } --- evolution-2.10.1/mail/importers/elm-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/elm-importer.c 2007-04-10 22:37:49.000000000 -0400 -@@ -312,7 +312,7 @@ ++++ evolution-2.10.1/mail/importers/elm-importer.c 2007-05-16 16:17:38.000000000 -0400 +@@ -51,7 +51,7 @@ + #define d(x) x - id = m->msg.seq; + struct _elm_import_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EImport *import; + EImportTargetHome *target; +@@ -186,8 +186,8 @@ + return mailexists; + } + +-static char * +-elm_import_describe (struct _mail_msg *mm, int complete) ++static gchar * ++elm_import_desc (struct _elm_import_msg *m) + { + return g_strdup (_("Importing Elm data")); + } +@@ -198,9 +198,8 @@ + }; + + static void +-elm_import_import(struct _mail_msg *mm) ++elm_import_exec (struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *) mm; + const char *maildir; + char *elmdir; + +@@ -218,13 +217,11 @@ + } + + static void +-elm_import_imported(struct _mail_msg *mm) ++elm_import_done(struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; +- + printf("importing complete\n"); + +- if (!camel_exception_is_set(&mm->ex)) { ++ if (!camel_exception_is_set(&m->base.ex)) { + GConfClient *gconf; + + gconf = gconf_client_get_default(); +@@ -236,10 +233,8 @@ + } + + static void +-elm_import_free(struct _mail_msg *mm) ++elm_import_free(struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; +- + camel_operation_unref(m->status); + + g_free(m->status_what); +@@ -288,11 +283,12 @@ + return TRUE; + } + +-static struct _mail_msg_op elm_import_op = { +- elm_import_describe, +- elm_import_import, +- elm_import_imported, +- elm_import_free, ++static MailMsgInfo elm_import_info = { ++ sizeof (struct _elm_import_msg), ++ (MailMsgDescFunc) elm_import_desc, ++ (MailMsgExecFunc) elm_import_exec, ++ (MailMsgDoneFunc) elm_import_done, ++ (MailMsgFreeFunc) elm_import_free + }; + + static int +@@ -301,7 +297,7 @@ + struct _elm_import_msg *m; + int id; + +- m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&elm_import_info); + g_datalist_set_data(&target->data, "elm-msg", m); + m->import = ei; + g_object_ref(m->import); +@@ -310,9 +306,9 @@ + m->status_lock = g_mutex_new(); + m->status = camel_operation_new(elm_status, m); + +- id = m->msg.seq; ++ id = m->base.seq; - e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); ++ mail_msg_fast_ordered_push (m); return id; } --- evolution-2.10.1/mail/importers/mail-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/mail-importer.c 2007-04-10 22:37:49.000000000 -0400 -@@ -329,7 +329,7 @@ ++++ evolution-2.10.1/mail/importers/mail-importer.c 2007-05-16 16:17:38.000000000 -0400 +@@ -132,7 +132,7 @@ + } + + struct _import_mbox_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *path; + char *uri; +@@ -142,8 +142,8 @@ + void *done_data; + }; + +-static char * +-import_mbox_describe(struct _mail_msg *mm, int complete) ++static gchar * ++import_mbox_desc (struct _import_mbox_msg *m) + { + return g_strdup (_("Importing mailbox")); + } +@@ -190,9 +190,8 @@ + } + + static void +-import_mbox_import(struct _mail_msg *mm) ++import_mbox_exec (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *) mm; + CamelFolder *folder; + CamelMimeParser *mp = NULL; + struct stat st; +@@ -207,7 +206,7 @@ + if (m->uri == NULL || m->uri[0] == 0) + folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_INBOX); + else +- folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &mm->ex); ++ folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); + + if (folder == NULL) + return; +@@ -262,11 +261,11 @@ + flags |= decode_status(tmp); + + camel_message_info_set_flags(info, flags, ~0); +- camel_folder_append_message(folder, msg, info, NULL, &mm->ex); ++ camel_folder_append_message(folder, msg, info, NULL, &m->base.ex); + camel_message_info_free(info); + camel_object_unref(msg); + +- if (camel_exception_is_set(&mm->ex)) ++ if (camel_exception_is_set(&m->base.ex)) + break; + + camel_mime_parser_step(mp, 0, 0); +@@ -286,30 +285,27 @@ + } + + static void +-import_mbox_done(struct _mail_msg *mm) ++import_mbox_done (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; +- + if (m->done) +- m->done(m->done_data, &mm->ex); ++ m->done(m->done_data, &m->base.ex); + } + + static void +-import_mbox_free (struct _mail_msg *mm) ++import_mbox_free (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; +- + if (m->cancel) + camel_operation_unref(m->cancel); + g_free(m->uri); + g_free(m->path); + } + +-static struct _mail_msg_op import_mbox_op = { +- import_mbox_describe, +- import_mbox_import, +- import_mbox_done, +- import_mbox_free, ++static MailMsgInfo import_mbox_info = { ++ sizeof (struct _import_mbox_msg), ++ (MailMsgDescFunc) import_mbox_desc, ++ (MailMsgExecFunc) import_mbox_exec, ++ (MailMsgDoneFunc) import_mbox_done, ++ (MailMsgFreeFunc) import_mbox_free + }; + + int +@@ -318,7 +314,7 @@ + struct _import_mbox_msg *m; + int id; + +- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&import_mbox_info); + m->path = g_strdup(path); + m->uri = g_strdup(folderuri); + m->done = done; +@@ -328,8 +324,8 @@ + camel_operation_ref(cancel); } - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_fast_ordered_push (m); return id; } ---- evolution-2.10.1/mail/importers/pine-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/pine-importer.c 2007-04-10 22:37:49.000000000 -0400 -@@ -350,7 +350,7 @@ +@@ -339,7 +335,7 @@ + { + struct _import_mbox_msg *m; - id = m->msg.seq; +- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&import_mbox_info); + m->path = g_strdup(path); + m->uri = g_strdup(folderuri); + if (cancel) { +@@ -347,9 +343,9 @@ + camel_operation_ref(cancel); + } + +- import_mbox_import(&m->msg); +- import_mbox_done(&m->msg); +- mail_msg_free(&m->msg); ++ import_mbox_exec(&m->base); ++ import_mbox_done(&m->base); ++ mail_msg_unref(m); + } + + struct _import_folders_data { +--- evolution-2.10.1/mail/importers/pine-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 ++++ evolution-2.10.1/mail/importers/pine-importer.c 2007-05-16 16:17:38.000000000 -0400 +@@ -56,7 +56,7 @@ + #define d(x) x + + struct _pine_import_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EImport *import; + EImportTarget *target; +@@ -223,8 +223,8 @@ + g_object_unref(book); + } + +-static char * +-pine_import_describe (struct _mail_msg *mm, int complete) ++static gchar * ++pine_import_desc (struct _pine_import_msg *m) + { + return g_strdup (_("Importing Pine data")); + } +@@ -236,10 +236,8 @@ + }; + + static void +-pine_import_import(struct _mail_msg *mm) ++pine_import_exec(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *) mm; +- + if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) + import_contacts(); + +@@ -253,13 +251,11 @@ + } + + static void +-pine_import_imported(struct _mail_msg *mm) ++pine_import_done(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; +- + printf("importing complete\n"); + +- if (!camel_exception_is_set(&mm->ex)) { ++ if (!camel_exception_is_set(&m->base.ex)) { + GConfClient *gconf; + + gconf = gconf_client_get_default(); +@@ -274,10 +270,8 @@ + } + + static void +-pine_import_free(struct _mail_msg *mm) ++pine_import_free(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; +- + camel_operation_unref(m->status); + + g_free(m->status_what); +@@ -326,11 +320,12 @@ + return TRUE; + } + +-static struct _mail_msg_op pine_import_op = { +- pine_import_describe, +- pine_import_import, +- pine_import_imported, +- pine_import_free, ++static MailMsgInfo pine_import_info = { ++ sizeof (struct _pine_import_msg), ++ (MailMsgDescFunc) pine_import_desc, ++ (MailMsgExecFunc) pine_import_exec, ++ (MailMsgDoneFunc) pine_import_done, ++ (MailMsgFreeFunc) pine_import_free + }; + + static int +@@ -339,7 +334,7 @@ + struct _pine_import_msg *m; + int id; + +- m = mail_msg_new(&pine_import_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&pine_import_info); + g_datalist_set_data(&target->data, "pine-msg", m); + m->import = ei; + g_object_ref(m->import); +@@ -348,9 +343,9 @@ + m->status_lock = g_mutex_new(); + m->status = camel_operation_new(pine_status, m); + +- id = m->msg.seq; ++ id = m->base.seq; - e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); ++ mail_msg_fast_ordered_push (m); return id; } --- evolution-2.10.1/mail/mail-vfolder.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-vfolder.c 2007-04-10 22:37:49.000000000 -0400 -@@ -188,7 +188,7 @@ ++++ evolution-2.10.1/mail/mail-vfolder.c 2007-05-16 16:17:38.000000000 -0400 +@@ -21,7 +21,7 @@ + */ + + #include +- ++#include + #include + + #include +@@ -75,7 +75,7 @@ + /* ********************************************************************** */ + + struct _setup_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + char *query; +@@ -83,18 +83,15 @@ + GList *sources_folder; + }; + +-static char * +-vfolder_setup_desc(struct _mail_msg *mm, int done) ++static gchar * ++vfolder_setup_desc (struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; +- + return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name); + } + + static void +-vfolder_setup_do(struct _mail_msg *mm) ++vfolder_setup_exec (struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l, *list = NULL; + CamelFolder *folder; + +@@ -105,12 +102,12 @@ + l = m->sources_uri; + while (l && !shutdown) { + d(printf(" Adding uri: %s\n", (char *)l->data)); +- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); + if (folder) { + list = g_list_append(list, folder); + } else { + g_warning("Could not open vfolder source: %s", (char *)l->data); +- camel_exception_clear(&mm->ex); ++ camel_exception_clear(&m->base.ex); + } + l = l->next; + } +@@ -135,17 +132,13 @@ + } + + static void +-vfolder_setup_done(struct _mail_msg *mm) ++vfolder_setup_done (struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; +- +- m = m; + } + + static void +-vfolder_setup_free (struct _mail_msg *mm) ++vfolder_setup_free (struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l; + + camel_object_unref(m->folder); +@@ -166,11 +159,12 @@ + g_list_free(m->sources_folder); + } + +-static struct _mail_msg_op vfolder_setup_op = { +- vfolder_setup_desc, +- vfolder_setup_do, +- vfolder_setup_done, +- vfolder_setup_free, ++static MailMsgInfo vfolder_setup_info = { ++ sizeof (struct _setup_msg), ++ (MailMsgDescFunc) vfolder_setup_desc, ++ (MailMsgExecFunc) vfolder_setup_exec, ++ (MailMsgDoneFunc) vfolder_setup_done, ++ (MailMsgFreeFunc) vfolder_setup_free + }; + + /* sources_uri should be camel uri's */ +@@ -180,15 +174,15 @@ + struct _setup_msg *m; + int id; + +- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&vfolder_setup_info); + m->folder = folder; + camel_object_ref(folder); + m->query = g_strdup(query); + m->sources_uri = sources_uri; m->sources_folder = sources_folder; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_slow_ordered_push (m); return id; } -@@ -323,7 +323,7 @@ +@@ -196,17 +190,16 @@ + /* ********************************************************************** */ + + struct _adduri_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *uri; + GList *folders; + int remove; + }; + +-static char * +-vfolder_adduri_desc(struct _mail_msg *mm, int done) ++static gchar * ++vfolder_adduri_desc (struct _adduri_msg *m) + { +- struct _adduri_msg *m = (struct _adduri_msg *)mm; + char *euri, *desc = NULL; + + /* Yuck yuck. Lookup the account name and use that to describe the path */ +@@ -250,9 +243,8 @@ + } + + static void +-vfolder_adduri_do(struct _mail_msg *mm) ++vfolder_adduri_exec (struct _adduri_msg *m) + { +- struct _adduri_msg *m = (struct _adduri_msg *)mm; + GList *l; + CamelFolder *folder = NULL; + +@@ -269,7 +261,7 @@ + } + + if (folder == NULL) +- folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); + + if (folder != NULL) { + l = m->folders; +@@ -285,28 +277,24 @@ + } + + static void +-vfolder_adduri_done(struct _mail_msg *mm) ++vfolder_adduri_done(struct _adduri_msg *m) + { +- struct _adduri_msg *m = (struct _adduri_msg *)mm; +- +- m = m; + } + + static void +-vfolder_adduri_free (struct _mail_msg *mm) ++vfolder_adduri_free (struct _adduri_msg *m) + { +- struct _adduri_msg *m = (struct _adduri_msg *)mm; +- + g_list_foreach(m->folders, (GFunc)camel_object_unref, NULL); + g_list_free(m->folders); + g_free(m->uri); + } + +-static struct _mail_msg_op vfolder_adduri_op = { +- vfolder_adduri_desc, +- vfolder_adduri_do, +- vfolder_adduri_done, +- vfolder_adduri_free, ++static MailMsgInfo vfolder_adduri_info = { ++ sizeof (struct _adduri_msg), ++ (MailMsgDescFunc) vfolder_adduri_desc, ++ (MailMsgExecFunc) vfolder_adduri_exec, ++ (MailMsgDoneFunc) vfolder_adduri_done, ++ (MailMsgFreeFunc) vfolder_adduri_free + }; + + +@@ -317,13 +305,13 @@ + struct _adduri_msg *m; + int id; + +- m = mail_msg_new(&vfolder_adduri_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&vfolder_adduri_info); + m->folders = folders; + m->uri = g_strdup(uri); m->remove = remove; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_slow_ordered_push (m); return id; } -@@ -447,7 +447,7 @@ +@@ -447,7 +435,7 @@ return; } @@ -329,7 +2928,7 @@ is_ignore = uri_is_ignore(store, curi); -@@ -540,7 +540,7 @@ +@@ -540,7 +528,7 @@ d(printf ("Deleting uri to check: %s\n", uri)); @@ -338,7 +2937,7 @@ changed = g_string_new (""); -@@ -615,7 +615,7 @@ +@@ -615,7 +603,7 @@ if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) return; @@ -348,18 +2947,133 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); --- evolution-2.10.1/mail/em-format-html.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html.c 2007-04-10 22:37:49.000000000 -0400 -@@ -1375,7 +1375,7 @@ ++++ evolution-2.10.1/mail/em-format-html.c 2007-05-16 16:17:38.000000000 -0400 +@@ -166,7 +166,7 @@ + if (efh->priv->format_timeout_id != 0) { + g_source_remove(efh->priv->format_timeout_id); + efh->priv->format_timeout_id = 0; +- mail_msg_free(efh->priv->format_timeout_msg); ++ mail_msg_unref(efh->priv->format_timeout_msg); + efh->priv->format_timeout_msg = NULL; + } + +@@ -1180,7 +1180,7 @@ + + /* Sigh, this is so we have a cancellable, async rendering thread */ + struct _format_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EMFormatHTML *format; + EMFormat *format_source; +@@ -1190,14 +1190,15 @@ + CamelMimeMessage *message; + }; + +-static char *efh_format_desc(struct _mail_msg *mm, int done) ++static gchar * ++efh_format_desc (struct _format_msg *m) + { + return g_strdup(_("Formatting message")); + } + +-static void efh_format_do(struct _mail_msg *mm) ++static void ++efh_format_exec (struct _format_msg *m) + { +- struct _format_msg *m = (struct _format_msg *)mm; + struct _EMFormatHTMLJob *job; + struct _EMFormatPURITree *puri_level; + int cancelled = FALSE; +@@ -1282,10 +1283,9 @@ + ((EMFormat *)m->format)->pending_uri_level = puri_level; + } + +-static void efh_format_done(struct _mail_msg *mm) ++static void ++efh_format_done (struct _format_msg *m) + { +- struct _format_msg *m = (struct _format_msg *)mm; +- + d(printf("formatting finished\n")); + + m->format->load_http_now = FALSE; +@@ -1293,10 +1293,9 @@ + g_signal_emit_by_name(m->format, "complete"); + } + +-static void efh_format_free(struct _mail_msg *mm) ++static void ++efh_format_free (struct _format_msg *m) + { +- struct _format_msg *m = (struct _format_msg *)mm; +- + d(printf("formatter freed\n")); + g_object_unref(m->format); + if (m->estream) { +@@ -1312,11 +1311,12 @@ + g_object_unref(m->format_source); + } + +-static struct _mail_msg_op efh_format_op = { +- efh_format_desc, +- efh_format_do, +- efh_format_done, +- efh_format_free, ++static MailMsgInfo efh_format_info = { ++ sizeof (struct _format_msg), ++ (MailMsgDescFunc) efh_format_desc, ++ (MailMsgExecFunc) efh_format_exec, ++ (MailMsgDoneFunc) efh_format_done, ++ (MailMsgFreeFunc) efh_format_free + }; + + static gboolean +@@ -1327,7 +1327,7 @@ + struct _EMFormatHTMLPrivate *p = efh->priv; + + if (m->format->html == NULL) { +- mail_msg_free(m); ++ mail_msg_unref(m); + return FALSE; + } + +@@ -1355,7 +1355,7 @@ + if (m->message == NULL) { + hstream = gtk_html_begin(efh->html); + gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); +- mail_msg_free(m); ++ mail_msg_unref(m); + p->last_part = NULL; + } else { + hstream = NULL; +@@ -1374,8 +1374,8 @@ + p->last_part = m->message; } - efh->priv->format_id = m->msg.seq; +- efh->priv->format_id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ efh->priv->format_id = m->base.seq; ++ mail_msg_unordered_push (m); } efh->priv->format_timeout_id = 0; +@@ -1399,11 +1399,11 @@ + d(printf(" timeout for last still active, removing ...\n")); + g_source_remove(efh->priv->format_timeout_id); + efh->priv->format_timeout_id = 0; +- mail_msg_free(efh->priv->format_timeout_msg); ++ mail_msg_unref(efh->priv->format_timeout_msg); + efh->priv->format_timeout_msg = NULL; + } + +- m = mail_msg_new(&efh_format_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&efh_format_info); + m->format = (EMFormatHTML *)emf; + g_object_ref(emf); + m->format_source = emfsource; --- evolution-2.10.1/mail/em-folder-properties.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-properties.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-properties.c 2007-05-16 16:17:38.000000000 -0400 @@ -386,7 +386,7 @@ } @@ -370,58 +3084,627 @@ emfp_dialog_got_folder((char *)uri, folder, NULL); } --- evolution-2.10.1/mail/em-folder-tree.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-tree.c 2007-04-10 22:37:49.000000000 -0400 -@@ -969,7 +969,7 @@ ++++ evolution-2.10.1/mail/em-folder-tree.c 2007-05-16 16:17:38.000000000 -0400 +@@ -834,7 +834,7 @@ + /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ + /* Drop handling */ + struct _DragDataReceivedAsync { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + GdkDragContext *context; +@@ -859,17 +859,16 @@ + + d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); + +- if (!(src = mail_tool_uri_to_folder(m->selection->data, 0, &m->msg.ex))) ++ if (!(src = mail_tool_uri_to_folder(m->selection->data, 0, &m->base.ex))) + return; + + em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); + camel_object_unref(src); + } + +-static char * +-emft_drop_async_desc (struct _mail_msg *mm, int done) ++static gchar * ++emft_drop_async__desc (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + CamelURL *url; + char *buf; + +@@ -893,9 +892,8 @@ + } + + static void +-emft_drop_async_drop (struct _mail_msg *mm) ++emft_drop_async__exec (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + CamelFolder *folder; + + /* for types other than folder, we can't drop to the root path */ +@@ -903,14 +901,14 @@ + /* copy or move (aka rename) a folder */ + emft_drop_folder(m); + } else if (m->full_name == NULL) { +- camel_exception_set (&mm->ex, CAMEL_EXCEPTION_SYSTEM, ++ camel_exception_set (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, + _("Cannot drop message(s) into toplevel store")); +- } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &mm->ex))) { ++ } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &m->base.ex))) { + switch (m->info) { + case DND_DROP_TYPE_UID_LIST: + /* import a list of uids from another evo folder */ +- em_utils_selection_get_uidlist(m->selection, folder, m->move, &mm->ex); +- m->moved = m->move && !camel_exception_is_set(&mm->ex); ++ em_utils_selection_get_uidlist(m->selection, folder, m->move, &m->base.ex); ++ m->moved = m->move && !camel_exception_is_set(&m->base.ex); + break; + case DND_DROP_TYPE_MESSAGE_RFC822: + /* import a message/rfc822 stream */ +@@ -928,9 +926,8 @@ + } + + static void +-emft_drop_async_done (struct _mail_msg *mm) ++emft_drop_async__done (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + gboolean success, delete; + + /* ?? */ +@@ -938,7 +935,7 @@ + success = FALSE; + delete = FALSE; + } else { +- success = !camel_exception_is_set (&mm->ex); ++ success = !camel_exception_is_set (&m->base.ex); + delete = success && m->move && !m->moved; + } + +@@ -946,10 +943,8 @@ + } + + static void +-emft_drop_async_free (struct _mail_msg *mm) ++emft_drop_async__free (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; +- + g_object_unref(m->context); + camel_object_unref(m->store); + g_free(m->full_name); +@@ -958,18 +953,19 @@ + g_free(m->selection); + } + +-static struct _mail_msg_op emft_drop_async_op = { +- emft_drop_async_desc, +- emft_drop_async_drop, +- emft_drop_async_done, +- emft_drop_async_free, ++static MailMsgInfo emft_drop_async_info = { ++ sizeof (struct _DragDataReceivedAsync), ++ (MailMsgDescFunc) emft_drop_async__desc, ++ (MailMsgExecFunc) emft_drop_async__exec, ++ (MailMsgDoneFunc) emft_drop_async__done, ++ (MailMsgFreeFunc) emft_drop_async__free + }; + + static void tree_drag_data_action(struct _DragDataReceivedAsync *m) { m->move = m->action == GDK_ACTION_MOVE; - e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } static void -@@ -1915,7 +1915,7 @@ +@@ -996,7 +992,7 @@ + struct _DragDataReceivedAsync *m = data; + + m->aborted = TRUE; +- mail_msg_free(&m->msg); ++ mail_msg_unref(m); + } + + static EPopupItem emft_drop_popup_menu[] = { +@@ -1052,7 +1048,7 @@ + return; + } + +- m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync)); ++ m = mail_msg_new (&emft_drop_async_info); + m->context = context; + g_object_ref(context); + m->store = store; +@@ -1686,7 +1682,7 @@ + #endif + + struct _EMFolderTreeGetFolderInfo { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + GtkTreeRowReference *root; +@@ -1699,10 +1695,9 @@ + CamelFolderInfo *fi; + }; + +-static char * +-emft_get_folder_info__desc(struct _mail_msg *mm, int done) ++static gchar * ++emft_get_folder_info__desc (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm; + char *ret, *name; + + name = camel_service_get_name((CamelService *)m->store, TRUE); +@@ -1712,18 +1707,16 @@ + } + + static void +-emft_get_folder_info__get (struct _mail_msg *mm) ++emft_get_folder_info__exec (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; + guint32 flags = m->flags | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; + +- m->fi = camel_store_get_folder_info (m->store, m->top, flags, &mm->ex); ++ m->fi = camel_store_get_folder_info (m->store, m->top, flags, &m->base.ex); + } + + static void +-emft_get_folder_info__got (struct _mail_msg *mm) ++emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; + struct _EMFolderTreePrivate *priv = m->emft->priv; + struct _EMFolderTreeModelStoreInfo *si; + GtkTreeIter root, iter; +@@ -1751,7 +1744,7 @@ + gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); + + /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ +- if (!m->fi && camel_exception_is_set(&mm->ex)) { ++ if (!m->fi && camel_exception_is_set(&m->base.ex)) { + gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); + gtk_tree_view_collapse_row (priv->treeview, path); + gtk_tree_path_free (path); +@@ -1806,10 +1799,8 @@ + } + + static void +-emft_get_folder_info__free (struct _mail_msg *mm) ++emft_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + + gtk_tree_row_reference_free (m->root); +@@ -1818,11 +1809,12 @@ + g_free (m->top); + } + +-static struct _mail_msg_op get_folder_info_op = { +- emft_get_folder_info__desc, +- emft_get_folder_info__get, +- emft_get_folder_info__got, +- emft_get_folder_info__free, ++static MailMsgInfo get_folder_info_info = { ++ sizeof (struct _EMFolderTreeGetFolderInfo), ++ (MailMsgDescFunc) emft_get_folder_info__desc, ++ (MailMsgExecFunc) emft_get_folder_info__exec, ++ (MailMsgDoneFunc) emft_get_folder_info__done, ++ (MailMsgFreeFunc) emft_get_folder_info__free + }; + + static void +@@ -1906,7 +1898,7 @@ + + gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); + +- m = mail_msg_new (&get_folder_info_op, NULL, sizeof (struct _EMFolderTreeGetFolderInfo)); ++ m = mail_msg_new (&get_folder_info_info); + m->root = gtk_tree_row_reference_new (model, tree_path); + camel_object_ref (store); + m->store = store; +@@ -1915,7 +1907,7 @@ m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; - e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } static gboolean --- evolution-2.10.1/mail/em-folder-browser.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-browser.c 2007-04-10 22:37:49.000000000 -0400 -@@ -948,7 +948,7 @@ ++++ evolution-2.10.1/mail/em-folder-browser.c 2007-05-16 16:17:38.000000000 -0400 +@@ -838,7 +838,7 @@ + + + struct _setup_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + char *query; +@@ -846,16 +846,15 @@ + GList *sources_folder; + }; + +-static char * +-vfolder_setup_desc(struct _mail_msg *mm, int done) ++static gchar * ++vfolder_setup_desc(struct _setup_msg *m) + { + return g_strdup(_("Searching")); + } + + static void +-vfolder_setup_do(struct _mail_msg *mm) ++vfolder_setup_exec(struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l, *list = NULL; + CamelFolder *folder; + +@@ -866,12 +865,12 @@ + l = m->sources_uri; + while (l) { + d(printf(" Adding uri: %s\n", (char *)l->data)); +- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); + if (folder) { + list = g_list_append(list, folder); + } else { + g_warning("Could not open vfolder source: %s", (char *)l->data); +- camel_exception_clear(&mm->ex); ++ camel_exception_clear(&m->base.ex); + } + l = l->next; + } +@@ -895,17 +894,13 @@ + } + + static void +-vfolder_setup_done(struct _mail_msg *mm) ++vfolder_setup_done(struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; +- +- m = m; + } + + static void +-vfolder_setup_free (struct _mail_msg *mm) ++vfolder_setup_free (struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l; + + camel_object_unref(m->folder); +@@ -926,11 +921,12 @@ + g_list_free(m->sources_folder); + } + +-static struct _mail_msg_op vfolder_setup_op = { +- vfolder_setup_desc, +- vfolder_setup_do, +- vfolder_setup_done, +- vfolder_setup_free, ++static MailMsgInfo vfolder_setup_info = { ++ sizeof (struct _setup_msg), ++ (MailMsgDescFunc) vfolder_setup_desc, ++ (MailMsgExecFunc) vfolder_setup_exec, ++ (MailMsgDoneFunc) vfolder_setup_done, ++ (MailMsgFreeFunc) vfolder_setup_free + }; + + /* sources_uri should be camel uri's */ +@@ -940,15 +936,15 @@ + struct _setup_msg *m; + int id; + +- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&vfolder_setup_info); + m->folder = folder; + camel_object_ref(folder); + m->query = g_strdup(query); + m->sources_uri = sources_uri; m->sources_folder = sources_folder; - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_slow_ordered_push (m); return id; } --- evolution-2.10.1/mail/message-list.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/message-list.c 2007-04-10 22:37:49.000000000 -0400 -@@ -1889,7 +1889,7 @@ ++++ evolution-2.10.1/mail/message-list.c 2007-05-16 16:17:38.000000000 -0400 +@@ -1802,7 +1802,7 @@ + /* TODO: merge this with the folder tree stuff via empopup targets */ + /* Drop handling */ + struct _drop_msg { +- struct _mail_msg msg; ++ MailMsg base; + + GdkDragContext *context; + +@@ -1819,11 +1819,9 @@ + unsigned int aborted:1; + }; + +-static char * +-ml_drop_async_desc (struct _mail_msg *mm, int done) ++static gchar * ++ml_drop_async_desc (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *) mm; +- + if (m->move) + return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); + else +@@ -1831,13 +1829,11 @@ + } + + static void +-ml_drop_async_drop(struct _mail_msg *mm) ++ml_drop_async_exec (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; +- + switch (m->info) { + case DND_X_UID_LIST: +- em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &mm->ex); ++ em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &m->base.ex); + break; + case DND_MESSAGE_RFC822: + em_utils_selection_get_message(m->selection, m->folder); +@@ -1849,9 +1845,8 @@ + } + + static void +-ml_drop_async_done(struct _mail_msg *mm) ++ml_drop_async_done (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; + gboolean success, delete; + + /* ?? */ +@@ -1859,7 +1854,7 @@ + success = FALSE; + delete = FALSE; + } else { +- success = !camel_exception_is_set (&mm->ex); ++ success = !camel_exception_is_set (&m->base.ex); + delete = success && m->move && !m->moved; + } + +@@ -1867,10 +1862,8 @@ + } + + static void +-ml_drop_async_free(struct _mail_msg *mm) ++ml_drop_async_free (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; +- + g_object_unref(m->context); + camel_object_unref(m->folder); + +@@ -1878,18 +1871,19 @@ + g_free(m->selection); + } + +-static struct _mail_msg_op ml_drop_async_op = { +- ml_drop_async_desc, +- ml_drop_async_drop, +- ml_drop_async_done, +- ml_drop_async_free, ++static MailMsgInfo ml_drop_async_info = { ++ sizeof (struct _drop_msg), ++ (MailMsgDescFunc) ml_drop_async_desc, ++ (MailMsgExecFunc) ml_drop_async_exec, ++ (MailMsgDoneFunc) ml_drop_async_done, ++ (MailMsgFreeFunc) ml_drop_async_free + }; + + static void ml_drop_action(struct _drop_msg *m) { m->move = m->action == GDK_ACTION_MOVE; - e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } static void -@@ -3978,7 +3978,7 @@ +@@ -1916,7 +1910,7 @@ + struct _drop_msg *m = data; + + m->aborted = TRUE; +- mail_msg_free(&m->msg); ++ mail_msg_unref(m); + } + + static EPopupItem ml_drop_popup_menu[] = { +@@ -1946,7 +1940,7 @@ + if (data->data == NULL || data->length == -1) + return; + +- m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&ml_drop_async_info); + m->context = context; + g_object_ref(context); + m->folder = ml->folder; +@@ -3676,7 +3670,7 @@ + + /* ** REGENERATE MESSAGELIST ********************************************** */ + struct _regen_list_msg { +- struct _mail_msg msg; ++ MailMsg base; + + int complete; + +@@ -3704,16 +3698,15 @@ + + */ + +-static char * +-regen_list_describe (struct _mail_msg *mm, gint complete) ++static gchar * ++regen_list_desc (struct _regen_list_msg *m) + { + return g_strdup (_("Generating message list")); + } + + static void +-regen_list_regen (struct _mail_msg *mm) ++regen_list_exec (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; + GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; + CamelMessageInfo *info; + int i; +@@ -3743,7 +3736,7 @@ + } else + expr = "(match-all (not (system-flag \"deleted\")))"; + } +- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); + } else { + char *expr; + +@@ -3753,23 +3746,23 @@ + sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); + } else + expr = "(match-all (not (system-flag \"junk\")))"; +- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); + } else { + if (m->search) +- searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &m->base.ex); + else + uids = camel_folder_get_uids (m->folder); + } + } + +- if (camel_exception_is_set (&mm->ex)) ++ if (camel_exception_is_set (&m->base.ex)) + return; + + /* perform hiding */ + if (m->hideexpr && camel_folder_has_search_capability(m->folder)) { +- uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex); ++ uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &m->base.ex); + /* well, lets not abort just because this faileld ... */ +- camel_exception_clear (&mm->ex); ++ camel_exception_clear (&m->base.ex); + + if (uidnew) { + MESSAGE_LIST_LOCK(m->ml, hide_lock); +@@ -3844,7 +3837,7 @@ + + e_profile_event_emit("list.threaduids", m->folder->full_name, 0); + +- if (!camel_operation_cancel_check(mm->cancel)) { ++ if (!camel_operation_cancel_check(m->base.cancel)) { + /* update/build a new tree */ + if (m->dotree) { + if (m->tree) +@@ -3873,17 +3866,15 @@ + } + + static void +-regen_list_regened (struct _mail_msg *mm) ++regen_list_done (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; +- + if (m->ml->priv->destroyed) + return; + + if (!m->complete) + return; + +- if (camel_operation_cancel_check(mm->cancel)) ++ if (camel_operation_cancel_check(m->base.cancel)) + return; + + if (m->ml->folder != m->folder) +@@ -3934,9 +3925,8 @@ + } + + static void +-regen_list_free (struct _mail_msg *mm) ++regen_list_free (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; + int i; + + e_profile_event_emit("list.regenerated", m->folder->full_name, 0); +@@ -3964,11 +3954,12 @@ + g_object_unref(m->ml); + } + +-static struct _mail_msg_op regen_list_op = { +- regen_list_describe, +- regen_list_regen, +- regen_list_regened, +- regen_list_free, ++static MailMsgInfo regen_list_info = { ++ sizeof (struct _regen_list_msg), ++ (MailMsgDescFunc) regen_list_desc, ++ (MailMsgExecFunc) regen_list_exec, ++ (MailMsgDoneFunc) regen_list_done, ++ (MailMsgFreeFunc) regen_list_free + }; + + static gboolean +@@ -3978,7 +3969,7 @@ m->ml->regen = g_list_prepend(m->ml->regen, m); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ - e_thread_put (mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); ++ mail_msg_fast_ordered_push (m); m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; +@@ -3994,7 +3985,7 @@ + GList *l = ml->regen; + + while (l) { +- struct _mail_msg *mm = l->data; ++ MailMsg *mm = l->data; + + if (mm->cancel) + camel_operation_cancel(mm->cancel); +@@ -4006,7 +3997,7 @@ + if (ml->regen_timeout_id) { + g_source_remove(ml->regen_timeout_id); + ml->regen_timeout_id = 0; +- mail_msg_free((struct _mail_msg *)ml->regen_timeout_msg); ++ mail_msg_unref(ml->regen_timeout_msg); + ml->regen_timeout_msg = NULL; + } + } +@@ -4041,7 +4032,7 @@ + } + #endif + +- m = mail_msg_new (®en_list_op, NULL, sizeof (*m)); ++ m = mail_msg_new (®en_list_info); + m->ml = ml; + m->search = g_strdup (search); + m->hideexpr = g_strdup (hideexpr); --- evolution-2.10.1/mail/em-sync-stream.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-sync-stream.h 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/em-sync-stream.h 2007-05-16 16:17:38.000000000 -0400 @@ -29,41 +29,45 @@ #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -499,7 +3782,7 @@ #endif /* EM_SYNC_STREAM_H */ --- evolution-2.10.1/mail/em-format-html-print.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html-print.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/em-format-html-print.c 2007-05-16 16:17:38.000000000 -0400 @@ -262,7 +262,7 @@ g_object_ref(source); g_object_ref(efhp); @@ -510,7 +3793,7 @@ return 0; /* damn async ... */ } --- evolution-2.10.1/mail/em-sync-stream.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-sync-stream.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/em-sync-stream.c 2007-05-16 16:17:38.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -564,7 +3847,7 @@ struct _write_msg { - EMsg msg; + EMSyncStream *emss; -+ EFlag *processed; ++ EFlag *done; enum _write_msg_t op; @@ -706,7 +3989,7 @@ - p->data_port = e_msgport_new(); - p->reply_port = e_msgport_new(); -+ e_flag_set (msg->processed); ++ e_flag_set (msg->done); -#ifndef G_OS_WIN32 - p->gui_channel = g_io_channel_unix_new(e_msgport_fd(p->data_port)); @@ -745,7 +4028,7 @@ - this prevents overflow from banked up data */ - - msg.msg.reply_port = p->reply_port; -+ msg.processed = e_flag_new (); ++ msg.done = e_flag_new (); + msg.emss = emss; msg.op = op; - msg.data = data; @@ -779,8 +4062,8 @@ + g_idle_add ((GSourceFunc) emss_process_message, &msg); - g_free(p->buf_data); -+ e_flag_wait (msg.processed); -+ e_flag_free (msg.processed); ++ e_flag_wait (msg.done); ++ e_flag_free (msg.done); -#ifdef LOG_STREAM - if (p->logfd) @@ -937,55 +4220,276 @@ + emss->buffer = g_string_sized_new (size); } --- evolution-2.10.1/mail/em-subscribe-editor.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-subscribe-editor.c 2007-04-10 22:37:49.000000000 -0400 -@@ -229,7 +229,7 @@ ++++ evolution-2.10.1/mail/em-subscribe-editor.c 2007-05-16 16:17:38.000000000 -0400 +@@ -175,7 +175,7 @@ + /* ** Subscribe folder operation **************************************** */ + + struct _zsubscribe_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EMSubscribe *sub; + EMSubscribeNode *node; +@@ -184,20 +184,18 @@ + }; + + static void +-sub_folder_subscribe (struct _mail_msg *mm) ++sub_folder_exec (struct _zsubscribe_msg *m) + { +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; +- + if (m->subscribe) +- camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); + else +- camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); ++ camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); + } + + static void +-sub_folder_subscribed (struct _mail_msg *mm) ++sub_folder_done (struct _zsubscribe_msg *m) + { +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *)mm, *next; ++ struct _zsubscribe_msg *next; + GtkTreeIter iter; + GtkTreeModel *model; + EMSubscribeNode *node; +@@ -207,7 +205,7 @@ + if (m->sub->cancel) + return; + +- if (!camel_exception_is_set(&mm->ex)) { ++ if (!camel_exception_is_set(&m->base.ex)) { + if (m->subscribe) + m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; + else +@@ -228,8 +226,8 @@ + /* queue any further ones, or if out, update the ui */ next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); if (next) { - next->sub->subscribe_id = next->msg.seq; +- next->sub->subscribe_id = next->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)next); -+ mail_msg_unordered_push ((mail_msg_t *) next); ++ next->sub->subscribe_id = next->base.seq; ++ mail_msg_unordered_push (next); } else { /* should it go off the model instead? */ sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); -@@ -270,7 +270,7 @@ +@@ -237,19 +235,18 @@ + } + + static void +-sub_folder_free (struct _mail_msg *mm) ++sub_folder_free (struct _zsubscribe_msg *m) + { +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; +- + g_free(m->path); + sub_unref(m->sub); + } + +-static struct _mail_msg_op sub_subscribe_folder_op = { +- NULL, /*subscribe_folder_desc,*/ +- sub_folder_subscribe, +- sub_folder_subscribed, +- sub_folder_free, ++static MailMsgInfo sub_subscribe_folder_info = { ++ sizeof (struct _zsubscribe_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) sub_folder_exec, ++ (MailMsgDoneFunc) sub_folder_done, ++ (MailMsgFreeFunc) sub_folder_free + }; + + /* spath is tree path in string form */ +@@ -259,18 +256,18 @@ + struct _zsubscribe_msg *m; + int id; + +- m = mail_msg_new (&sub_subscribe_folder_op, NULL, sizeof(*m)); ++ m = mail_msg_new (&sub_subscribe_folder_info); + m->sub = sub; + sub_ref(sub); + m->node = node; + m->subscribe = state; + m->path = g_strdup(spath); + +- id = m->msg.seq; ++ id = m->base.seq; if (sub->subscribe_id == -1) { sub->subscribe_id = id; d(printf("running subscribe folder '%s'\n", spath)); - e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); } else { d(printf("queueing subscribe folder '%s'\n", spath)); e_dlist_addtail(&sub->subscribe, (EDListNode *)m); -@@ -443,7 +443,7 @@ +@@ -341,7 +338,7 @@ + /* async query of folderinfo */ - id = m->msg.seq; + struct _emse_folderinfo_msg { +- struct _mail_msg msg; ++ MailMsg base; + + int seq; + +@@ -351,31 +348,29 @@ + }; + + static void +-sub_folderinfo_get (struct _mail_msg *mm) ++sub_folderinfo_exec (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; + char *pub_full_name=NULL; + + if (m->seq == m->sub->seq) { +- camel_operation_register(mm->cancel); +- m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex); +- camel_operation_unregister(mm->cancel); ++ camel_operation_register(m->base.cancel); ++ m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &m->base.ex); ++ camel_operation_unregister(m->base.cancel); + } + } + + static void +-sub_folderinfo_got(struct _mail_msg *mm) ++sub_folderinfo_done (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; + EMSubscribeNode *node; + + m->sub->pending_id = -1; + if (m->sub->cancel || m->seq != m->sub->seq) + return; + +- if (camel_exception_is_set (&mm->ex)) { ++ if (camel_exception_is_set (&m->base.ex)) { + g_warning ("Error getting folder info from store: %s", +- camel_exception_get_description (&mm->ex)); ++ camel_exception_get_description (&m->base.ex)); + } + + if (m->info) { +@@ -396,10 +391,8 @@ + } + + static void +-sub_folderinfo_free(struct _mail_msg *mm) ++sub_folderinfo_free (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; +- + if (m->info) + m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); + +@@ -415,11 +408,12 @@ + sub_unref(m->sub); + } + +-static struct _mail_msg_op sub_folderinfo_op = { +- NULL, /*sub_folderinfo_desc, we do our own progress reporting/cancellation */ +- sub_folderinfo_get, +- sub_folderinfo_got, +- sub_folderinfo_free, ++static MailMsgInfo sub_folderinfo_info = { ++ sizeof (struct _emse_folderinfo_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) sub_folderinfo_exec, ++ (MailMsgDoneFunc) sub_folderinfo_done, ++ (MailMsgFreeFunc) sub_folderinfo_free + }; + + static int +@@ -431,19 +425,19 @@ + d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, + node?node->info->full_name:"")); + +- m = mail_msg_new (&sub_folderinfo_op, NULL, sizeof(*m)); ++ m = mail_msg_new (&sub_folderinfo_info); + sub_ref(sub); + m->sub = sub; + m->node = node; + m->seq = sub->seq; + +- sub->pending_id = m->msg.seq; ++ sub->pending_id = m->base.seq; + + sub_editor_busy(sub->editor, 1); + +- id = m->msg.seq; ++ id = m->base.seq; - e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ mail_msg_unordered_push (m); return id; } ---- evolution-2.10.1/mail/mail-mt.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-mt.h 2007-04-10 22:37:49.000000000 -0400 -@@ -25,14 +25,15 @@ +@@ -573,7 +567,7 @@ + mail_msg_cancel(sub->subscribe_id); - #include + while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) +- mail_msg_free(m); ++ mail_msg_unref(m); + + sub_unref(sub); + } +--- evolution-2.10.1/mail/mail-mt.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 ++++ evolution-2.10.1/mail/mail-mt.h 2007-05-16 16:17:38.000000000 -0400 +@@ -23,43 +23,60 @@ + #ifndef _MAIL_MT + #define _MAIL_MT + +-#include #include "camel/camel-exception.h" -#include "libedataserver/e-msgport.h" -+#include "libedataserver/e-flag.h" #include "camel/camel-object.h" #include "camel/camel-operation.h" - typedef struct _mail_msg { +-typedef struct _mail_msg { - EMsg msg; /* parent type */ -+ EFlag *processed; /* optional */ - struct _mail_msg_op *ops; /* operation functions */ +- struct _mail_msg_op *ops; /* operation functions */ ++typedef struct _MailMsg MailMsg; ++typedef struct _MailMsgInfo MailMsgInfo; ++typedef struct _MailMsgPrivate MailMsgPrivate; ++ ++typedef gchar * (*MailMsgDescFunc) (MailMsg *msg); ++typedef void (*MailMsgExecFunc) (MailMsg *msg); ++typedef void (*MailMsgDoneFunc) (MailMsg *msg); ++typedef void (*MailMsgFreeFunc) (MailMsg *msg); ++typedef void (*MailMsgDispatchFunc) (gpointer msg); ++ ++struct _MailMsg { ++ MailMsgInfo *info; ++ volatile gint ref_count; unsigned int seq; /* seq number for synchronisation */ + gint priority; /* priority (default = 0) */ CamelOperation *cancel; /* a cancellation/status handle */ CamelException ex; /* an initialised camel exception, upto the caller to use this */ - struct _mail_msg_priv *priv; /* private for internal use */ -@@ -51,8 +52,10 @@ +- struct _mail_msg_priv *priv; /* private for internal use */ +-} mail_msg_t; ++ MailMsgPrivate *priv; ++}; + +-/* callback functions for thread message */ +-typedef struct _mail_msg_op { +- char *(*describe_msg)(struct _mail_msg *msg, int complete); +- +- void (*receive_msg)(struct _mail_msg *msg); /* message received */ +- void (*reply_msg)(struct _mail_msg *msg); /* message replied */ +- void (*destroy_msg)(struct _mail_msg *msg); /* finalise message */ +-} mail_msg_op_t; ++struct _MailMsgInfo { ++ gsize size; ++ MailMsgDescFunc desc; ++ MailMsgExecFunc exec; ++ MailMsgDoneFunc done; ++ MailMsgFreeFunc free; ++}; + + /* setup ports */ void mail_msg_init(void); void mail_msg_cleanup (void); @@ -993,26 +4497,27 @@ + /* allocate a new message */ -void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size); -+void *mail_msg_new(mail_msg_op_t *ops, EFlag *processed, size_t size); - void mail_msg_free(void *msg); - void mail_msg_check_error(void *msg); +-void mail_msg_free(void *msg); +-void mail_msg_check_error(void *msg); ++gpointer mail_msg_new (MailMsgInfo *info); ++gpointer mail_msg_ref (gpointer msg); ++void mail_msg_unref (gpointer msg); ++void mail_msg_check_error (gpointer msg); void mail_msg_cancel(unsigned int msgid); -@@ -60,6 +63,14 @@ + void mail_msg_wait(unsigned int msgid); void mail_msg_wait_all(void); int mail_msg_active(unsigned int msgid); +/* dispatch a message */ -+void mail_msg_main_loop_push (mail_msg_t *msg); -+void mail_msg_unordered_push (mail_msg_t *msg); -+void mail_msg_fast_ordered_push (mail_msg_t *msg); -+void mail_msg_slow_ordered_push (mail_msg_t *msg); -+ -+typedef void (*MailMsgDispatchFunc) (mail_msg_t *msg); ++void mail_msg_main_loop_push (gpointer msg); ++void mail_msg_unordered_push (gpointer msg); ++void mail_msg_fast_ordered_push (gpointer msg); ++void mail_msg_slow_ordered_push (gpointer msg); + /* To implement the stop button */ void *mail_cancel_hook_add(GDestroyNotify func, void *data); void mail_cancel_hook_remove(void *handle); -@@ -112,24 +123,6 @@ +@@ -112,24 +129,6 @@ void mail_enable_stop(void); void mail_disable_stop(void); @@ -1038,7 +4543,7 @@ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; --- evolution-2.10.1/mail/mail-ops.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-ops.h 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/mail-ops.h 2007-05-16 16:17:38.000000000 -0400 @@ -30,13 +30,14 @@ #pragma } #endif /* __cplusplus */ @@ -1080,7 +4585,7 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, --- evolution-2.10.1/mail/em-composer-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-composer-utils.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/em-composer-utils.c 2007-05-16 16:17:38.000000000 -0400 @@ -534,7 +534,7 @@ strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -1125,17 +4630,84 @@ + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } --- evolution-2.10.1/mail/mail-folder-cache.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-folder-cache.c 2007-04-10 22:37:49.000000000 -0400 -@@ -907,7 +907,7 @@ ++++ evolution-2.10.1/mail/mail-folder-cache.c 2007-05-16 16:17:38.000000000 -0400 +@@ -843,15 +843,14 @@ + + + struct _ping_store_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelStore *store; + }; + +-static char * +-ping_store_desc (struct _mail_msg *mm, int done) ++static gchar * ++ping_store_desc (struct _ping_store_msg *m) + { +- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; + char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); + char *msg; + +@@ -862,10 +861,9 @@ + } + + static void +-ping_store_ping (struct _mail_msg *mm) ++ping_store_exec (struct _ping_store_msg *m) + { + gboolean online = FALSE; +- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; + + if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { + if (CAMEL_IS_DISCO_STORE (m->store) && +@@ -876,22 +874,21 @@ + online = TRUE; + } + if (online) +- camel_store_noop (m->store, &mm->ex); ++ camel_store_noop (m->store, &m->base.ex); + } + + static void +-ping_store_free (struct _mail_msg *mm) ++ping_store_free (struct _ping_store_msg *m) + { +- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; +- + camel_object_unref (m->store); + } + +-static struct _mail_msg_op ping_store_op = { +- ping_store_desc, +- ping_store_ping, +- NULL, +- ping_store_free ++static MailMsgInfo ping_store_info = { ++ sizeof (struct _ping_store_msg), ++ (MailMsgDescFunc) ping_store_desc, ++ (MailMsgExecFunc) ping_store_exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) ping_store_free + }; + + static void +@@ -903,11 +900,11 @@ + if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) + return; + +- m = mail_msg_new (&ping_store_op, NULL, sizeof (struct _ping_store_msg)); ++ m = mail_msg_new (&ping_store_info); m->store = store; camel_object_ref (store); - e_thread_put (mail_thread_queued_slow, (EMsg *) m); -+ mail_msg_slow_ordered_push ((mail_msg_t *) m); ++ mail_msg_slow_ordered_push (m); } static gboolean -@@ -952,7 +952,7 @@ +@@ -952,7 +949,7 @@ int hook = 0; g_assert(CAMEL_IS_STORE(store)); @@ -1145,7 +4717,7 @@ LOCK(info_lock); --- evolution-2.10.1/mail/em-folder-view.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-view.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/em-folder-view.c 2007-05-16 16:17:38.000000000 -0400 @@ -68,6 +68,7 @@ #include @@ -1191,7 +4763,7 @@ e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); --- evolution-2.10.1/mail/mail-session.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-session.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/mail/mail-session.c 2007-05-16 16:17:38.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -1201,49 +4773,82 @@ #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -256,7 +256,7 @@ +@@ -256,21 +256,22 @@ /* ********************************************************************** */ -static GtkDialog *message_dialog; -+static gpointer message_dialog; - static EDList message_list = E_DLIST_INITIALISER(message_list); +-static EDList message_list = E_DLIST_INITIALISER(message_list); ++static gpointer user_message_dialog; ++static GQueue user_message_queue = { NULL, NULL, 0 }; struct _user_message_msg { -@@ -283,7 +283,7 @@ +- struct _mail_msg msg; ++ MailMsg base; + + CamelSessionAlertType type; + char *prompt; ++ EFlag *done; + + unsigned int allow_cancel:1; + unsigned int result:1; + unsigned int ismain:1; + }; + +-static void do_user_message (struct _mail_msg *mm); ++static void user_message_exec (struct _user_message_msg *m); + + /* clicked, send back the reply */ + static void +@@ -278,122 +279,116 @@ + { + gtk_widget_destroy ((GtkWidget *) dialog); + +- message_dialog = NULL; ++ user_message_dialog = NULL; + /* if !allow_cancel, then we've already replied */ if (m->allow_cancel) { m->result = button == GTK_RESPONSE_OK; - e_msgport_reply((EMsg *)m); -+ e_flag_set (m->msg.processed); ++ e_flag_set (m->done); } /* check for pendings */ -@@ -292,22 +292,10 @@ - } - - static void +- if ((m = (struct _user_message_msg *)e_dlist_remhead(&message_list))) +- do_user_message((struct _mail_msg *)m); +-} +- +-static void -user_message_destroy_notify (struct _user_message_msg *m, GObject *deadbeef) -{ - message_dialog = NULL; --} -- ++ if (!g_queue_is_empty (&user_message_queue)) { ++ m = g_queue_pop_head (&user_message_queue); ++ user_message_exec (m); ++ mail_msg_unref (m); ++ } + } + -/* This is kinda ugly/inefficient, but oh well, it works */ -static const char *error_type[] = { - "mail:session-message-info", "mail:session-message-warning", "mail:session-message-error", - "mail:session-message-info-cancel", "mail:session-message-warning-cancel", "mail:session-message-error-cancel" -}; - --static void - do_user_message (struct _mail_msg *mm) + static void +-do_user_message (struct _mail_msg *mm) ++user_message_exec (struct _user_message_msg *m) { - struct _user_message_msg *m = (struct _user_message_msg *)mm; +- struct _user_message_msg *m = (struct _user_message_msg *)mm; - int type; + const gchar *error_type; - if (!m->ismain && message_dialog != NULL) { - e_dlist_addtail (&message_list, (EDListNode *)m); -@@ -315,24 +303,27 @@ +- if (!m->ismain && message_dialog != NULL) { +- e_dlist_addtail (&message_list, (EDListNode *)m); ++ if (!m->ismain && user_message_dialog != NULL) { ++ g_queue_push_tail (&user_message_queue, mail_msg_ref (m)); + return; } switch (m->type) { @@ -1282,36 +4887,58 @@ - - message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL); - g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); -+ message_dialog = e_error_new(NULL, error_type, m->prompt, NULL); -+ g_object_set (message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); ++ user_message_dialog = e_error_new(NULL, error_type, m->prompt, NULL); ++ g_object_set (user_message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); /* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */ if (m->allow_cancel) { -@@ -340,12 +331,13 @@ - user_message_response(message_dialog, gtk_dialog_run (message_dialog), m); + if (m->ismain) { +- user_message_response(message_dialog, gtk_dialog_run (message_dialog), m); ++ user_message_response(user_message_dialog, gtk_dialog_run (user_message_dialog), m); } else { - g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m); +- g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m); - gtk_widget_show ((GtkWidget *) message_dialog); -+ gtk_widget_show (message_dialog); ++ g_signal_connect (user_message_dialog, "response", G_CALLBACK (user_message_response), m); ++ gtk_widget_show (user_message_dialog); } } else { - g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog); +- g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog); - g_object_weak_ref ((GObject *) message_dialog, (GWeakNotify) user_message_destroy_notify, m); - gtk_widget_show ((GtkWidget *) message_dialog); -+ g_object_add_weak_pointer (message_dialog, &message_dialog); -+ gtk_widget_show (message_dialog); -+ e_flag_free (mm->processed); - mail_msg_free(m); +- mail_msg_free(m); ++ g_signal_connect (user_message_dialog, "response", G_CALLBACK (gtk_widget_destroy), user_message_dialog); ++ g_object_add_weak_pointer (user_message_dialog, &user_message_dialog); ++ gtk_widget_show (user_message_dialog); ++ mail_msg_unref(m); } } -@@ -364,17 +356,17 @@ + + static void +-free_user_message(struct _mail_msg *mm) ++user_message_free (struct _user_message_msg *m) + { +- struct _user_message_msg *m = (struct _user_message_msg *)mm; +- + g_free(m->prompt); ++ e_flag_free(m->done); + } + +-static struct _mail_msg_op user_message_op = { NULL, do_user_message, NULL, free_user_message }; ++static MailMsgInfo user_message_info = { ++ sizeof (struct _user_message_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) user_message_exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) user_message_free ++}; + + static gboolean alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) { MailSession *mail_session = MAIL_SESSION (session); - struct _user_message_msg *m, *r; - EMsgPort *user_message_reply = NULL; + struct _user_message_msg *m; -+ EFlag *processed = NULL; gboolean ret; if (!mail_session->interactive) @@ -1321,55 +4948,117 @@ - user_message_reply = e_msgport_new (); - m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); - m->ismain = pthread_equal(pthread_self(), mail_gui_thread); -+ processed = e_flag_new (); -+ -+ m = mail_msg_new (&user_message_op, processed, sizeof (*m)); ++ m = mail_msg_new (&user_message_info); + m->ismain = mail_in_main_thread(); m->type = type; m->prompt = g_strdup(prompt); ++ m->done = e_flag_new (); m->allow_cancel = cancel; -@@ -382,18 +374,14 @@ + ++ if (cancel) ++ mail_msg_ref (m); ++ if (m->ismain) - do_user_message((struct _mail_msg *)m); +- do_user_message((struct _mail_msg *)m); ++ user_message_exec(m); else { - extern EMsgPort *mail_gui_port2; - - e_msgport_put(mail_gui_port2, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); ++ mail_msg_main_loop_push(m); } if (cancel) { - r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); - g_assert(m == r); - -+ e_flag_wait (processed); -+ e_flag_free (processed); ++ e_flag_wait (m->done); ret = m->result; - mail_msg_free(m); +- mail_msg_free(m); - e_msgport_destroy(user_message_reply); ++ mail_msg_unref(m); } else ret = TRUE; -@@ -687,7 +675,7 @@ +@@ -533,7 +528,7 @@ + /* TODO: This is very temporary, until we have a better way to do the progress reporting, + we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ + +-static mail_msg_op_t ms_thread_ops_dummy = { NULL }; ++static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) }; + + static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) + { +@@ -542,7 +537,7 @@ + /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so + we get cancellation and progress in common with hte existing mail code, for free */ + if (msg) { +- struct _mail_msg *m = mail_msg_new(&ms_thread_ops_dummy, NULL, sizeof(struct _mail_msg)); ++ MailMsg *m = mail_msg_new(&ms_thread_info_dummy); + + msg->data = m; + camel_operation_unref(msg->op); +@@ -555,7 +550,7 @@ + + static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) + { +- mail_msg_free(m->data); ++ mail_msg_unref(m->data); + ms_parent_class->thread_msg_free(session, m); + } + +@@ -678,22 +673,23 @@ + MAIL_SESSION (session)->interactive = interactive; + + if (!interactive) { +- struct _user_message_msg *um; ++ struct _user_message_msg *msg; + + d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); + + e_passwords_cancel(); + /* flush/cancel pending user messages */ - while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { - d(printf ("Flusing message request: %s\n", um->prompt)); +- while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { +- d(printf ("Flusing message request: %s\n", um->prompt)); - e_msgport_reply((EMsg *) um); -+ e_flag_set (um->msg.processed); ++ while (!g_queue_is_empty (&user_message_queue)) { ++ msg = g_queue_pop_head (&user_message_queue); ++ e_flag_set (msg->done); ++ mail_msg_unref (msg); } /* and the current */ +- if (message_dialog) { ++ if (user_message_dialog) { + d(printf("Destroying message dialogue\n")); +- gtk_widget_destroy ((GtkWidget *) message_dialog); ++ gtk_widget_destroy ((GtkWidget *) user_message_dialog); + } + } + } --- evolution-2.10.1/mail/mail-mt.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-mt.c 2007-04-10 22:37:49.000000000 -0400 -@@ -29,7 +29,6 @@ ++++ evolution-2.10.1/mail/mail-mt.c 2007-05-16 16:17:38.000000000 -0400 +@@ -29,8 +29,8 @@ #include #include -#include #include ++#include #include -@@ -82,13 +81,9 @@ + #include +@@ -63,7 +63,7 @@ + #endif + + /* background operation status stuff */ +-struct _mail_msg_priv { ++struct _MailMsgPrivate { + int activity_state; /* sigh sigh sigh, we need to keep track of the state external to the + pointer itself for locking/race conditions */ + int activity_id; +@@ -82,15 +82,12 @@ static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; @@ -1380,11 +5069,15 @@ -static void mail_msg_destroy(EThread *e, EMsg *msg, void *data); - -void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size) -+void *mail_msg_new(mail_msg_op_t *ops, EFlag *processed, size_t size) ++gpointer ++mail_msg_new (MailMsgInfo *info) { - struct _mail_msg *msg; +- struct _mail_msg *msg; ++ MailMsg *msg; -@@ -112,7 +107,6 @@ + MAIL_MT_LOCK(mail_msg_lock); + +@@ -112,7 +109,6 @@ fprintf(log, "Logging async operations\n"); if (log_locks) { @@ -1392,29 +5085,220 @@ fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -123,9 +117,9 @@ +@@ -122,13 +118,13 @@ + } } #endif - msg = g_malloc0(size); -+ msg->processed = processed; /* owned by caller */ - msg->ops = ops; +- msg = g_malloc0(size); +- msg->ops = ops; ++ msg = g_slice_alloc0 (info->size); ++ msg->info = info; ++ msg->ref_count = 1; msg->seq = mail_msg_seq++; - msg->msg.reply_port = reply_port; msg->cancel = camel_operation_new(mail_operation_status, GINT_TO_POINTER(msg->seq)); camel_exception_init(&msg->ex); - msg->priv = g_malloc0(sizeof(*msg->priv)); -@@ -308,9 +302,8 @@ +- msg->priv = g_malloc0(sizeof(*msg->priv)); ++ msg->priv = g_slice_new (MailMsgPrivate); + + g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); + +@@ -143,12 +139,15 @@ + return msg; + } + +- +-static void end_event_callback (CamelObject *o, void *event_data, void *data) ++static void ++end_event_callback (CamelObject *o, void *event_data, void *data) + { +- EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); ++ MailComponent *component; ++ EActivityHandler *activity_handler; + guint activity_id = GPOINTER_TO_INT (event_data); + ++ component = mail_component_peek (); ++ activity_handler = mail_component_peek_activity_handler (component); + e_activity_handler_operation_finished (activity_handler, activity_id); + } + +@@ -177,58 +176,84 @@ + } + #endif + +-void mail_msg_free(void *msg) ++gpointer ++mail_msg_ref (gpointer msg) + { +- struct _mail_msg *m = msg; +- int activity_id; ++ MailMsg *mail_msg = msg; ++ ++ g_return_val_if_fail (mail_msg != NULL, msg); ++ g_return_val_if_fail (mail_msg->ref_count > 0, msg); ++ ++ g_atomic_int_add (&mail_msg->ref_count, 1); ++ return msg; ++} ++ ++void ++mail_msg_unref (gpointer msg) ++{ ++ MailMsg *mail_msg = msg; ++ gint activity_id; ++ ++ g_return_if_fail (mail_msg != NULL); ++ g_return_if_fail (mail_msg->ref_count > 0); ++ ++ if (g_atomic_int_exchange_and_add (&mail_msg->ref_count, -1) > 1) ++ return; + + #ifdef MALLOC_CHECK +- checkmem(m); +- checkmem(m->cancel); +- checkmem(m->priv); ++ checkmem(mail_msg); ++ checkmem(mail_msg->cancel); ++ checkmem(mail_msg->priv); + #endif + d(printf("Free message %p\n", msg)); + +- if (m->ops->destroy_msg) +- m->ops->destroy_msg(m); ++ if (mail_msg->info->free) ++ mail_msg->info->free(mail_msg); + + MAIL_MT_LOCK(mail_msg_lock); + + #ifdef LOG_OPS +- if (log_ops) +- fprintf(log, "%p: Free (exception `%s')\n", msg, +- camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); ++ if (log_ops) { ++ const gchar *description; ++ ++ description = camel_exception_get_description (&mail_msg->ex); ++ if (description == NULL) ++ description = "None"; ++ fprintf(log, "%p: Free (exception `%s')\n", msg, description); ++ } + #endif +- g_hash_table_remove(mail_msg_active_table, GINT_TO_POINTER(m->seq)); +- pthread_cond_broadcast(&mail_msg_cond); ++ g_hash_table_remove ( ++ mail_msg_active_table, GINT_TO_POINTER (mail_msg->seq)); ++ pthread_cond_broadcast (&mail_msg_cond); + + /* We need to make sure we dont lose a reference here YUCK YUCK */ + /* This is tightly integrated with the code in do_op_status, + as it closely relates to the CamelOperation setup in msg_new() above */ +- if (m->priv->activity_state == 1) { +- m->priv->activity_state = 3; /* tell the other thread +- * to free it itself (yuck yuck) */ ++ if (mail_msg->priv->activity_state == 1) { ++ /* tell the other to free it itself */ ++ mail_msg->priv->activity_state = 3; + MAIL_MT_UNLOCK(mail_msg_lock); + return; + } else { +- activity_id = m->priv->activity_id; ++ activity_id = mail_msg->priv->activity_id; + } + + MAIL_MT_UNLOCK(mail_msg_lock); + +- if (m->cancel) { +- camel_operation_mute(m->cancel); +- camel_operation_unref(m->cancel); ++ if (mail_msg->cancel) { ++ camel_operation_mute (mail_msg->cancel); ++ camel_operation_unref (mail_msg->cancel); + } + +- camel_exception_clear(&m->ex); +- /*g_free(m->priv->what);*/ +- g_free(m->priv); +- g_free(m); ++ camel_exception_clear (&mail_msg->ex); ++ g_slice_free (MailMsgPrivate, mail_msg->priv); ++ g_slice_free1 (mail_msg->info->size, mail_msg); + + if (activity_id != 0) +- mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, +- NULL, GINT_TO_POINTER (activity_id), NULL); ++ mail_async_event_emit ( ++ mail_async_event, MAIL_ASYNC_GUI, ++ (MailAsyncFunc) end_event_callback, ++ NULL, GINT_TO_POINTER (activity_id), NULL); + } + + /* hash table of ops->dialogue of active errors */ +@@ -244,9 +269,10 @@ + gtk_widget_destroy((GtkWidget *)o); + } + +-void mail_msg_check_error(void *msg) ++void ++mail_msg_check_error (gpointer msg) + { +- struct _mail_msg *m = msg; ++ MailMsg *m = msg; + char *what; + GtkDialog *gd; + +@@ -271,27 +297,27 @@ + /* check to see if we have dialogue already running for this operation */ + /* we key on the operation pointer, which is at least accurate enough + for the operation type, although it could be on a different object. */ +- if (g_hash_table_lookup(active_errors, m->ops)) { ++ if (g_hash_table_lookup(active_errors, m->info)) { + g_warning("Error occurred while existing dialogue active:\n%s", camel_exception_get_description(&m->ex)); + return; + } + +- if (m->ops->describe_msg +- && (what = m->ops->describe_msg(m, FALSE))) { ++ if (m->info->desc ++ && (what = m->info->desc (m))) { + gd = (GtkDialog *)e_error_new(NULL, "mail:async-error", what, camel_exception_get_description(&m->ex), NULL); + g_free(what); + } else + gd = (GtkDialog *)e_error_new(NULL, "mail:async-error-nodescribe", camel_exception_get_description(&m->ex), NULL); + +- g_hash_table_insert(active_errors, m->ops, gd); +- g_signal_connect(gd, "response", G_CALLBACK(error_response), m->ops); +- g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->ops); ++ g_hash_table_insert(active_errors, m->info, gd); ++ g_signal_connect(gd, "response", G_CALLBACK(error_response), m->info); ++ g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->info); + gtk_widget_show((GtkWidget *)gd); + } + + void mail_msg_cancel(unsigned int msgid) + { +- struct _mail_msg *m; ++ MailMsg *m; + + MAIL_MT_LOCK(mail_msg_lock); + m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); +@@ -304,13 +330,12 @@ + + + /* waits for a message to be finished processing (freed) +- the messageid is from struct _mail_msg->seq */ ++ the messageid is from MailMsg->seq */ void mail_msg_wait(unsigned int msgid) { - struct _mail_msg *m; +- struct _mail_msg *m; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); ++ MailMsg *m; - if (ismain) { + if (mail_in_main_thread ()) { MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +340,7 @@ +@@ -347,9 +372,7 @@ void mail_msg_wait_all(void) { @@ -1425,7 +5309,7 @@ MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -420,241 +411,193 @@ +@@ -420,241 +443,183 @@ MAIL_MT_UNLOCK(mail_msg_lock); } @@ -1481,7 +5365,7 @@ { - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; -+ mail_msg_t *msg; ++ MailMsg *msg; - while (( m = (mail_msg_t *)e_msgport_get(port))) { + g_assert (main_loop_queue != NULL); @@ -1498,35 +5382,26 @@ - fprintf(log, "%p: Replied to GUI thread (exception `%s'\n", m, - camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); -#endif -+ /* check the main loop queue */ -+ while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { -+ -+ /* If the message has a "processed" EFlag, it must also have -+ * a receive_msg() callback. The receive_msg() callback is -+ * responsible for setting the EFlag, and thread blocked on -+ * the EFlag is reponsible for freeing it. */ -+ if (msg->processed != NULL) { -+ g_assert (msg->ops->receive_msg != NULL); -+ msg->ops->receive_msg (msg); -+ } else { -+ if (msg->ops->receive_msg != NULL) -+ msg->ops->receive_msg (msg); -+ if (msg->ops->reply_msg != NULL) -+ msg->ops->reply_msg (msg); -+ mail_msg_free (msg); -+ } -+ } - +- - if (m->ops->reply_msg) - m->ops->reply_msg(m); - mail_msg_check_error(m); - mail_msg_free(m); ++ /* check the main loop queue */ ++ while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { ++ if (msg->info->exec != NULL) ++ msg->info->exec (msg); ++ if (msg->info->done != NULL) ++ msg->info->done (msg); ++ mail_msg_unref (msg); ++ } ++ + /* check the reply queue */ + while ((msg = g_async_queue_try_pop (msg_reply_queue)) != NULL) { -+ if (msg->ops->reply_msg != NULL) -+ msg->ops->reply_msg (msg); ++ if (msg->info->done != NULL) ++ msg->info->done (msg); + mail_msg_check_error (msg); -+ mail_msg_free (msg); ++ mail_msg_unref (msg); } return TRUE; @@ -1535,24 +5410,24 @@ -static gboolean -mail_msgport_received(GIOChannel *source, GIOCondition cond, void *d) +static void -+mail_msg_proxy (mail_msg_t *msg) ++mail_msg_proxy (MailMsg *msg) { - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; -+ if (msg->ops->describe_msg != NULL) { -+ gchar *text = msg->ops->describe_msg (msg, FALSE); ++ if (msg->info->desc != NULL) { ++ gchar *text = msg->info->desc (msg); + camel_operation_register (msg->cancel); + camel_operation_start (msg->cancel, "%s", text); + g_free (text); + } + -+ if (msg->ops->receive_msg != NULL) { ++ if (msg->info->exec != NULL) { + mail_enable_stop (); -+ msg->ops->receive_msg (msg); ++ msg->info->exec (msg); + mail_disable_stop (); + } + -+ if (msg->ops->describe_msg != NULL) { ++ if (msg->info->desc != NULL) { + camel_operation_end (msg->cancel); + camel_operation_unregister (msg->cancel); + MAIL_MT_LOCK (mail_msg_lock); @@ -1638,7 +5513,7 @@ -static void -mail_msg_destroy(EThread *e, EMsg *msg, void *data) +static gint -+mail_msg_compare (const mail_msg_t *msg1, const mail_msg_t *msg2) ++mail_msg_compare (const MailMsg *msg1, const MailMsg *msg2) { - mail_msg_t *m = (mail_msg_t *)msg; + gint priority1 = msg1->priority; @@ -1686,7 +5561,7 @@ - fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x: '%s'\n", m, e_util_pthread_id(pthread_self()), text); -#endif +void -+mail_msg_main_loop_push (mail_msg_t *msg) ++mail_msg_main_loop_push (gpointer msg) +{ + g_async_queue_push_sorted (main_loop_queue, msg, + (GCompareDataFunc) mail_msg_compare, NULL); @@ -1703,7 +5578,7 @@ - fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x\n", m, e_util_pthread_id(pthread_self())); -#endif +void -+mail_msg_unordered_push (mail_msg_t *msg) ++mail_msg_unordered_push (gpointer msg) +{ + static GOnce once = G_ONCE_INIT; @@ -1727,7 +5602,7 @@ -void mail_msg_cleanup(void) +void -+mail_msg_fast_ordered_push (mail_msg_t *msg) ++mail_msg_fast_ordered_push (gpointer msg) { - mail_msg_wait_all(); - @@ -1748,7 +5623,7 @@ -static guint -em_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) +void -+mail_msg_slow_ordered_push (mail_msg_t *msg) ++mail_msg_slow_ordered_push (gpointer msg) { - GSource *source; - guint id; @@ -1803,15 +5678,74 @@ } /* ********************************************************************** */ -@@ -723,7 +666,6 @@ +@@ -665,7 +630,8 @@ + /* ********************************************************************** */ + + struct _proxy_msg { +- struct _mail_msg msg; ++ MailMsg base; ++ + MailAsyncEvent *ea; + mail_async_event_t type; + +@@ -679,10 +645,8 @@ + }; + + static void +-do_async_event(struct _mail_msg *mm) ++do_async_event(struct _proxy_msg *m) + { +- struct _proxy_msg *m = (struct _proxy_msg *)mm; +- + m->thread = pthread_self(); + m->have_thread = TRUE; + m->func(m->o, m->event_data, m->data); +@@ -697,16 +661,17 @@ + idle_async_event(void *mm) + { + do_async_event(mm); +- mail_msg_free(mm); ++ mail_msg_unref(mm); + + return FALSE; + } + +-static struct _mail_msg_op async_event_op = { +- NULL, +- do_async_event, +- NULL, +- NULL, ++static MailMsgInfo async_event_info = { ++ sizeof (struct _proxy_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) do_async_event, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) NULL + }; + + MailAsyncEvent *mail_async_event_new(void) +@@ -723,10 +688,9 @@ { struct _proxy_msg *m; int id; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ - m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); -@@ -743,12 +685,12 @@ +- m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&async_event_info); + m->func = func; + m->o = o; + m->event_data = event_data; +@@ -735,7 +699,7 @@ + m->type = type; + m->have_thread = FALSE; + +- id = m->msg.seq; ++ id = m->base.seq; + g_mutex_lock(ea->lock); + ea->tasks = g_slist_prepend(ea->tasks, m); + g_mutex_unlock(ea->lock); +@@ -743,12 +707,12 @@ /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -1820,40 +5754,83 @@ g_idle_add(idle_async_event, m); else - e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); ++ mail_msg_main_loop_push(m); } else - e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push ((mail_msg_t *) m); ++ mail_msg_fast_ordered_push (m); return id; } -@@ -842,6 +784,9 @@ +@@ -762,7 +726,7 @@ + g_mutex_lock(ea->lock); + while (ea->tasks) { + m = ea->tasks->data; +- id = m->msg.seq; ++ id = m->base.seq; + if (m->have_thread && pthread_equal(m->thread, thread)) { + g_warning("Destroying async event from inside an event, returning EDEADLK"); + g_mutex_unlock(ea->lock); +@@ -784,17 +748,18 @@ + /* ********************************************************************** */ + + struct _call_msg { +- struct _mail_msg msg; ++ MailMsg base; ++ + mail_call_t type; + MailMainFunc func; + void *ret; + va_list ap; ++ EFlag *done; + }; + + static void +-do_call(struct _mail_msg *mm) ++do_call(struct _call_msg *m) + { +- struct _call_msg *m = (struct _call_msg *)mm; + void *p1, *p2, *p3, *p4, *p5; + int i1; + va_list ap; +@@ -842,45 +807,48 @@ m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } + -+ if (mm->processed != NULL) -+ e_flag_set (mm->processed); ++ if (m->done != NULL) ++ e_flag_set (m->done); } - static struct _mail_msg_op mail_call_op = { -@@ -856,23 +801,22 @@ +-static struct _mail_msg_op mail_call_op = { +- NULL, +- do_call, +- NULL, +- NULL, ++static MailMsgInfo mail_call_info = { ++ sizeof (struct _call_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) do_call, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) NULL + }; + +-void *mail_call_main(mail_call_t type, MailMainFunc func, ...) ++void * ++mail_call_main (mail_call_t type, MailMainFunc func, ...) + { struct _call_msg *m; void *ret; va_list ap; - EMsgPort *reply = NULL; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); -+ EFlag *processed = NULL; va_start(ap, func); - if (!ismain) - reply = e_msgport_new(); -+ if (!mail_in_main_thread ()) -+ processed = e_flag_new (); - +- - m = mail_msg_new(&mail_call_op, reply, sizeof(*m)); -+ m = mail_msg_new(&mail_call_op, processed, sizeof(*m)); ++ m = mail_msg_new (&mail_call_info); m->type = type; m->func = func; G_VA_COPY(m->ap, ap); @@ -1862,32 +5839,105 @@ - e_msgport_put(mail_gui_port, (EMsg *)m); - e_msgport_wait(reply); - e_msgport_destroy(reply); -+ if (processed != NULL) { -+ mail_msg_main_loop_push((mail_msg_t *) m); -+ e_flag_wait (processed); -+ e_flag_free (processed); - } else { - do_call(&m->msg); +- } else { +- do_call(&m->msg); ++ mail_msg_ref (m); ++ ++ if (mail_in_main_thread ()) ++ do_call (m); ++ else { ++ m->done = e_flag_new (); ++ mail_msg_main_loop_push (m); ++ e_flag_wait (m->done); ++ e_flag_free (m->done); } -@@ -909,7 +853,7 @@ + + va_end(ap); + + ret = m->ret; +- mail_msg_free(m); ++ mail_msg_unref (m); + + return ret; + } +@@ -889,40 +857,42 @@ + /* locked via status_lock */ + static int busy_state; + +-static void do_set_busy(struct _mail_msg *mm) ++static void ++do_set_busy(MailMsg *mm) + { + set_stop(busy_state > 0); + } + +-static struct _mail_msg_op set_busy_op = { +- NULL, +- do_set_busy, +- NULL, +- NULL, ++static MailMsgInfo set_busy_info = { ++ sizeof (MailMsg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) do_set_busy, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) NULL + }; + + void mail_enable_stop(void) + { +- struct _mail_msg *m; ++ MailMsg *m; + + MAIL_MT_LOCK(status_lock); busy_state++; if (busy_state == 1) { - m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); +- m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); - e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); ++ m = mail_msg_new(&set_busy_info); ++ mail_msg_main_loop_push(m); } MAIL_MT_UNLOCK(status_lock); } -@@ -922,7 +866,7 @@ + + void mail_disable_stop(void) + { +- struct _mail_msg *m; ++ MailMsg *m; + + MAIL_MT_LOCK(status_lock); busy_state--; if (busy_state == 0) { - m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); +- m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); - e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); ++ m = mail_msg_new(&set_busy_info); ++ mail_msg_main_loop_push(m); } MAIL_MT_UNLOCK(status_lock); } -@@ -947,7 +891,7 @@ +@@ -930,7 +900,7 @@ + /* ******************************************************************************** */ + + struct _op_status_msg { +- struct _mail_msg msg; ++ MailMsg base; + + struct _CamelOperation *op; + char *what; +@@ -938,16 +908,16 @@ + void *data; + }; + +-static void do_op_status(struct _mail_msg *mm) ++static void ++op_status_exec (struct _op_status_msg *m) + { + EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); +- struct _op_status_msg *m = (struct _op_status_msg *)mm; +- struct _mail_msg *msg; +- struct _mail_msg_priv *data; ++ MailMsg *msg; ++ MailMsgPrivate *data; char *out, *p, *o, c; int pc; @@ -1896,26 +5946,144 @@ MAIL_MT_LOCK (mail_msg_lock); -@@ -1055,7 +999,7 @@ +@@ -986,8 +956,8 @@ + progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); + + MAIL_MT_UNLOCK (mail_msg_lock); +- if (msg->ops->describe_msg) +- what = msg->ops->describe_msg (msg, FALSE); ++ if (msg->info->desc) ++ what = msg->info->desc (msg); + /* uncommenting because message is not very useful for a user, see bug 271734*/ + else { + what = g_strdup(""); +@@ -1021,18 +991,17 @@ + } + + static void +-do_op_status_free (struct _mail_msg *mm) ++op_status_free (struct _op_status_msg *m) + { +- struct _op_status_msg *m = (struct _op_status_msg *)mm; +- + g_free (m->what); + } + +-static struct _mail_msg_op op_status_op = { +- NULL, +- do_op_status, +- NULL, +- do_op_status_free, ++static MailMsgInfo op_status_info = { ++ sizeof (struct _op_status_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) op_status_exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) op_status_free + }; + + static void +@@ -1042,7 +1011,7 @@ + + d(printf("got operation statys: %s %d%%\n", what, pc)); + +- m = mail_msg_new(&op_status_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&op_status_info); + m->op = op; + m->what = g_strdup(what); + switch (pc) { +@@ -1055,7 +1024,7 @@ } m->pc = pc; m->data = data; - e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push((mail_msg_t *) m); ++ mail_msg_main_loop_push(m); } /* ******************** */ --- evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-09 09:09:11.000000000 -0400 -+++ evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-04-10 22:37:49.000000000 -0400 -@@ -108,5 +108,5 @@ - unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); ++++ evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-05-16 16:17:38.000000000 -0400 +@@ -44,32 +44,30 @@ + + + struct _folder_unsub_t { +- struct _mail_msg msg; ++ MailMsg base; + + char *uri; + }; + +-static char * +-folder_unsubscribe__desc (struct _mail_msg *mm, int done) ++static gchar * ++folder_unsubscribe_desc (struct _folder_unsub_t *msg) + { +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; +- +- return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri); ++ return g_strdup_printf ( ++ _("Unsubscribing from folder \"%s\""), msg->uri); + } + + static void +-folder_unsubscribe__unsub (struct _mail_msg *mm) ++folder_unsubscribe_exec (struct _folder_unsub_t *msg) + { +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; + extern CamelSession *session; + const char *path = NULL; + CamelStore *store; + CamelURL *url; + +- if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex))) ++ if (!(store = camel_session_get_store (session, msg->uri, &mm->ex))) + return; + +- url = camel_url_new (unsub->uri, NULL); ++ url = camel_url_new (msg->uri, NULL); + if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) + path = url->fragment; + else if (url->path && url->path[0]) +@@ -82,18 +80,17 @@ + } + + static void +-folder_unsubscribe__free (struct _mail_msg *mm) ++folder_unsubscribe_free (struct _folder_unsub_t *msg) + { +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; +- +- g_free (unsub->uri); ++ g_free (msg->uri); + } + +-static struct _mail_msg_op unsubscribe_op = { +- folder_unsubscribe__desc, +- folder_unsubscribe__unsub, +- NULL, +- folder_unsubscribe__free, ++static MailMsgInfo unsubscribe_info = { ++ sizeof (struct _folder_unsub_t), ++ (MailMsgDescFunc) folder_unsubscribe_desc, ++ (MailMsgExecFunc) folder_unsubscribe_exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) folder_unsubscribe_free + }; + + +@@ -105,8 +102,8 @@ + if (target->uri == NULL) + return; + +- unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); ++ unsub = mail_msg_new (&unsubscribe_info); unsub->uri = g_strdup (target->uri); - e_thread_put (mail_thread_new, (EMsg *) unsub); -+ mail_msg_unordered_push ((mail_msg_t *) unsub); ++ mail_msg_unordered_push (unsub); } --- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-05-16 16:17:38.000000000 -0400 @@ -44,7 +44,7 @@ return; } @@ -1926,7 +6094,7 @@ static void --- evolution-2.10.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-04-09 09:09:13.000000000 -0400 -+++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c 2007-05-16 16:17:38.000000000 -0400 @@ -134,7 +134,7 @@ inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -1937,7 +6105,7 @@ } --- evolution-2.10.1/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-09 09:09:15.000000000 -0400 -+++ evolution-2.10.1/plugins/save-attachments/save-attachments.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/plugins/save-attachments/save-attachments.c 2007-05-16 16:17:38.000000000 -0400 @@ -407,5 +407,5 @@ camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -1946,7 +6114,7 @@ + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } --- evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-05-16 16:17:38.000000000 -0400 @@ -89,7 +89,7 @@ data->uri = strdup (sel->uri); @@ -1957,18 +6125,106 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) --- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-04-10 22:37:49.000000000 -0400 -@@ -239,7 +239,7 @@ ++++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-05-16 16:17:38.000000000 -0400 +@@ -121,7 +121,7 @@ + } + + struct _EMCreateFolder { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *store; +@@ -137,31 +137,26 @@ + void *user_data; + }; + +-static char * +-create_folder__desc (struct _mail_msg *mm, int done) ++static gchar * ++create_folder_desc (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + return g_strdup_printf (_("Creating folder `%s'"), m->full_name); + } + + static void +-create_folder__create (struct _mail_msg *mm) ++create_folder_exec (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); + +- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { ++ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { + if (camel_store_supports_subscriptions (m->store)) +- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); + } + } + + static void +-create_folder__created (struct _mail_msg *mm) ++create_folder_done (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; + struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; + CamelStore *store = CAMEL_STORE (m->store) ; + EGwConnection *ccnc; +@@ -180,10 +175,8 @@ + } + + static void +-create_folder__free (struct _mail_msg *mm) ++create_folder_free (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + camel_object_unref (m->store); + g_free (m->full_name); +@@ -191,11 +184,12 @@ + g_free (m->name); + } + +-static struct _mail_msg_op create_folder_op = { +- create_folder__desc, +- create_folder__create, +- create_folder__created, +- create_folder__free, ++static MailMsgInfo create_folder_info = { ++ sizeof (struct _EMCreateFolder), ++ (MailMsgDescFunc) create_folder_desc, ++ (MailMsgExecFunc) create_folder_exec, ++ (MailMsgDoneFunc) create_folder_done, ++ (MailMsgFreeFunc) create_folder_free + }; + + static void +@@ -229,7 +223,7 @@ + parent = namebuf; + } + +- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); ++ m = mail_msg_new (&create_folder_info); + camel_object_ref (store); + m->store = store; + m->full_name = g_strdup (full_name); +@@ -238,8 +232,8 @@ + m->user_data = (struct ShareInfo *) user_data; m->done = done; g_free (namebuf); - id = m->msg.seq; +- id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push ((mail_msg_t *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); return id; } --- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h 2007-05-16 16:17:38.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -1990,7 +6246,7 @@ BonoboObject object; --- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-05-16 16:17:38.000000000 -0400 @@ -45,10 +45,6 @@ GMutex *mutex; }; @@ -2104,7 +6360,7 @@ static void --- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-10 22:37:49.000000000 -0400 ++++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-05-16 16:17:38.000000000 -0400 @@ -115,9 +115,6 @@ static int tray_blink_state = FALSE; static AlarmNotify *an; diff --git a/evolution.spec b/evolution.spec index afd9be9..982738c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,7 +47,7 @@ Name: evolution Version: 2.10.1 -Release: 16%{?dist} +Release: 17%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -759,6 +759,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed May 16 2007 Matthew Barnes - 2.10.1-17.fc7 +- Revise patch for GNOME bug #362638 to fix RH bug #237206 + (certificate prompt causes crash, again). + * Tue May 15 2007 Matthew Barnes - 2.10.1-16.fc7 - Add patch for RH bug #240147 (Send/Receive dialog layout). From f9c5e8a69a9714fa59090bd250ab50adc5900693 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 19 May 2007 00:56:12 +0000 Subject: [PATCH 140/844] - Update to 2.11.2 - Bump evo_major to 2.12. - Bump eds_version to 1.11.0. - Update files with new plugins and icons. - Remove patch for RH bug #190359 (fixed upstream). - Remove patch for RH bug #218801 (fixed upstream). - Remove patch for RH bug #234315 (fixed upstream). - Remove patch for RH bug #236399 (fixed upstream). - Remove patch for RH bug #236860 (fixed upstream). - Remove patch for RH bug #238551 (fixed upstream). - Remove patch for GNOME bug #373837 (fixed upstream). - Remove patch for GNOME bug #373116 (fixed upstream). - Remove patch for GNOME bug #418971 (fixed upstream). - Remove patch for GNOME bug #419469 (fixed upstream). - Remove patch for GNOME bug #419524 (fixed upstream). - Remove evolution-2.6.0-prototypes.patch (obsolete). --- .cvsignore | 2 +- evolution-2.10.0-drop-old-glib-support.patch | 39 - evolution-2.10.0-e-source-combo-box.patch | 122 +- evolution-2.10.0-shell-main-cleanups.patch | 274 -- evolution-2.10.0-use-glib-i18n.patch | 3348 ----------------- evolution-2.10.1-e-attachment-bar.patch | 11 - ...tion-2.10.1-en_CA-attribution-format.patch | 11 - evolution-2.10.1-fix-uri-handling.patch | 14 - evolution-2.10.1-saving-attachments.patch | 218 -- evolution-2.10.1-send-recv-dialog.patch | 114 +- evolution-2.7.3-filter-datespec.patch | 178 - evolution-2.8.0-fix-indic-printing.patch | 39 +- evolution-2.8.1-kill-ethread.patch | 300 +- evolution-2.9.2-gtk-font-button.patch | 153 - evolution-2.9.3-gtk-color-button.patch | 1219 ------ evolution-2.9.3-unread-messages.patch | 63 - evolution.spec | 192 +- sources | 2 +- 18 files changed, 382 insertions(+), 5917 deletions(-) delete mode 100644 evolution-2.10.0-drop-old-glib-support.patch delete mode 100644 evolution-2.10.0-shell-main-cleanups.patch delete mode 100644 evolution-2.10.0-use-glib-i18n.patch delete mode 100644 evolution-2.10.1-e-attachment-bar.patch delete mode 100644 evolution-2.10.1-en_CA-attribution-format.patch delete mode 100644 evolution-2.10.1-fix-uri-handling.patch delete mode 100644 evolution-2.10.1-saving-attachments.patch delete mode 100644 evolution-2.7.3-filter-datespec.patch delete mode 100644 evolution-2.9.2-gtk-font-button.patch delete mode 100644 evolution-2.9.3-gtk-color-button.patch delete mode 100644 evolution-2.9.3-unread-messages.patch diff --git a/.cvsignore b/.cvsignore index 8aa3781..decf6ed 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.10.1.tar.bz2 +evolution-2.11.2.tar.bz2 diff --git a/evolution-2.10.0-drop-old-glib-support.patch b/evolution-2.10.0-drop-old-glib-support.patch deleted file mode 100644 index 2ece0c8..0000000 --- a/evolution-2.10.0-drop-old-glib-support.patch +++ /dev/null @@ -1,39 +0,0 @@ ---- evolution-2.10.0/mail/em-utils.c.drop-old-glib-support 2007-03-18 08:17:46.000000000 -0400 -+++ evolution-2.10.0/mail/em-utils.c 2007-03-18 08:24:07.000000000 -0400 -@@ -42,10 +42,6 @@ - #undef interface - #endif - --#if !GLIB_CHECK_VERSION (2, 8, 0) --#define g_access access --#endif -- - #include - #include - #include ---- evolution-2.10.0/mail/mail-config.c.drop-old-glib-support 2007-01-03 10:34:12.000000000 -0500 -+++ evolution-2.10.0/mail/mail-config.c 2007-03-18 08:24:07.000000000 -0400 -@@ -76,10 +76,6 @@ - #include "mail-mt.h" - #include "mail-tools.h" - --#if !GLIB_CHECK_VERSION (2, 8, 0) --#define g_creat creat --#endif -- - /* Note, the first element of each MailConfigLabel must NOT be translated */ - MailConfigLabel label_defaults[5] = { - { "important", N_("I_mportant"), "#ff0000" }, /* red */ ---- evolution-2.10.0/plugins/save-attachments/save-attachments.c.drop-old-glib-support 2007-03-18 08:17:29.000000000 -0400 -+++ evolution-2.10.0/plugins/save-attachments/save-attachments.c 2007-03-18 08:24:07.000000000 -0400 -@@ -32,10 +32,6 @@ - #include - #include - --#if !GLIB_CHECK_VERSION (2, 8, 0) --#define g_access access --#endif -- - #include - #include - #include diff --git a/evolution-2.10.0-e-source-combo-box.patch b/evolution-2.10.0-e-source-combo-box.patch index 43b5d69..e1d0078 100644 --- a/evolution-2.10.0-e-source-combo-box.patch +++ b/evolution-2.10.0-e-source-combo-box.patch @@ -1,9 +1,9 @@ ---- evolution-2.10.0/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-01-03 10:34:47.000000000 -0500 -+++ evolution-2.10.0/widgets/misc/e-pilot-settings.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-18 06:18:34.000000000 -0400 ++++ evolution-2.11.2/widgets/misc/e-pilot-settings.c 2007-05-18 15:49:15.000000000 -0400 @@ -27,7 +27,7 @@ #include - #include + #include -#include +#include #include "e-pilot-settings.h" @@ -40,8 +40,8 @@ } gboolean ---- evolution-2.10.0/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-02-26 04:59:58.000000000 -0500 -+++ evolution-2.10.0/plugins/itip-formatter/itip-formatter.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-04-18 06:17:20.000000000 -0400 ++++ evolution-2.11.2/plugins/itip-formatter/itip-formatter.c 2007-05-18 15:48:37.000000000 -0400 @@ -39,7 +39,7 @@ #include #include @@ -51,8 +51,8 @@ #include #include #include ---- evolution-2.10.0/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-01-03 10:34:04.000000000 -0500 -+++ evolution-2.10.0/plugins/itip-formatter/itip-view.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-05-13 13:41:08.000000000 -0400 ++++ evolution-2.11.2/plugins/itip-formatter/itip-view.c 2007-05-18 15:48:37.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -62,7 +62,7 @@ #include #include #include -@@ -104,8 +104,8 @@ +@@ -103,8 +103,8 @@ char *description; GtkWidget *selector_box; @@ -73,7 +73,7 @@ ESourceList *source_list; GtkWidget *rsvp_box; -@@ -1664,10 +1664,12 @@ +@@ -1671,10 +1671,12 @@ } static void @@ -89,7 +89,7 @@ g_signal_emit (view, signals[SOURCE_SELECTED], 0, source); } -@@ -1684,40 +1686,42 @@ +@@ -1691,40 +1693,42 @@ if (priv->source_list) g_object_unref (priv->source_list); @@ -149,7 +149,7 @@ } ESourceList * -@@ -1743,10 +1747,11 @@ +@@ -1750,10 +1754,11 @@ priv = view->priv; @@ -163,7 +163,7 @@ } ESource * -@@ -1759,10 +1764,11 @@ +@@ -1766,10 +1771,11 @@ priv = view->priv; @@ -177,8 +177,8 @@ } void ---- evolution-2.10.0/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/bbdb/gaimbuddies.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-05-13 13:41:06.000000000 -0400 ++++ evolution-2.11.2/plugins/bbdb/gaimbuddies.c 2007-05-18 15:48:37.000000000 -0400 @@ -44,7 +44,7 @@ #include @@ -188,8 +188,8 @@ #include #include ---- evolution-2.10.0/plugins/bbdb/bbdb.c.e-source-combo-box 2007-01-03 10:34:02.000000000 -0500 -+++ evolution-2.10.0/plugins/bbdb/bbdb.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/plugins/bbdb/bbdb.c.e-source-combo-box 2007-04-18 06:17:14.000000000 -0400 ++++ evolution-2.11.2/plugins/bbdb/bbdb.c 2007-05-18 15:48:37.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -259,8 +259,8 @@ } GtkWidget * ---- evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-05-14 00:24:02.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-05-18 15:48:37.000000000 -0400 @@ -158,9 +158,9 @@ @@ -273,8 +273,8 @@ 0 0 Tue, 01 Jun 2004 18:22:38 GMT ---- evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-04-18 06:15:40.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-05-18 15:48:37.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -390,8 +390,8 @@ gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list); gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list); } ---- evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-02-26 04:59:17.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/contact-editor.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-04-18 06:15:34.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-editor/contact-editor.glade 2007-05-18 15:48:37.000000000 -0400 @@ -356,9 +356,9 @@ @@ -404,8 +404,8 @@ 0 0 Tue, 13 Apr 2004 20:47:50 GMT ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-02-26 04:59:17.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-05-09 00:14:39.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-editor.c 2007-05-18 15:48:37.000000000 -0400 @@ -46,7 +46,7 @@ #include @@ -415,7 +415,7 @@ #include -@@ -590,15 +590,16 @@ +@@ -589,15 +589,16 @@ fill_in_source_field (EContactEditor *editor) { GtkWidget *source_menu; @@ -436,7 +436,7 @@ } static void -@@ -2525,13 +2526,15 @@ +@@ -2521,13 +2522,15 @@ editor->load_book = NULL; if (status != E_BOOK_ERROR_OK || new_book == NULL) { @@ -456,7 +456,7 @@ if (new_book) g_object_unref (new_book); -@@ -2555,8 +2558,12 @@ +@@ -2551,8 +2554,12 @@ } static void @@ -470,7 +470,7 @@ cancel_load (editor); if (e_source_equal (e_book_get_source (editor->target_book), source)) -@@ -3330,8 +3337,8 @@ +@@ -3323,8 +3330,8 @@ g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor); widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories"); g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor); @@ -481,7 +481,7 @@ label = glade_xml_get_widget (e_contact_editor->gui, "where-label"); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok"); -@@ -3782,25 +3789,25 @@ +@@ -3775,25 +3782,25 @@ } GtkWidget * @@ -517,8 +517,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-01-03 10:32:45.000000000 -0500 -+++ evolution-2.10.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-04-18 06:15:34.000000000 -0400 ++++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-05-18 15:48:37.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -542,7 +542,7 @@ if (qa->book) { g_object_unref (qa->book); qa->book = NULL; -@@ -317,16 +321,20 @@ +@@ -316,16 +320,20 @@ gconf_client = gconf_client_get_default (); source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); @@ -567,8 +567,8 @@ g_object_unref (source_list); ---- evolution-2.10.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-04-18 06:18:36.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/memo-page.glade 2007-05-18 15:48:37.000000000 -0400 @@ -141,7 +141,7 @@ @@ -578,8 +578,8 @@ 0 0 Tue, 13 Jan 2004 22:00:00 GMT ---- evolution-2.10.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/event-page.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-04-18 06:18:36.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/event-page.glade 2007-05-18 15:48:37.000000000 -0400 @@ -774,7 +774,7 @@ @@ -589,8 +589,8 @@ 0 0 Wed, 17 Dec 2003 18:20:26 GMT ---- evolution-2.10.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/task-page.glade 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-05-09 00:14:46.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/task-page.glade 2007-05-18 15:48:37.000000000 -0400 @@ -618,7 +618,7 @@ 24 @@ -600,11 +600,11 @@ 0 0 Thu, 18 Dec 2003 01:58:48 GMT ---- evolution-2.10.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/memo-page.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-04-20 00:28:26.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/memo-page.c 2007-05-18 15:48:37.000000000 -0400 @@ -35,7 +35,7 @@ #include - #include + #include #include -#include +#include @@ -631,7 +631,7 @@ priv->updating = FALSE; -@@ -844,13 +844,12 @@ +@@ -842,13 +842,12 @@ } static void @@ -649,7 +649,7 @@ if (!priv->updating) { ECal *client; -@@ -862,8 +861,9 @@ +@@ -860,8 +859,9 @@ if (client) g_object_unref (client); @@ -661,7 +661,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -973,7 +973,7 @@ +@@ -971,7 +971,7 @@ G_CALLBACK (categories_clicked_cb), mpage); /* Source selector */ @@ -670,7 +670,7 @@ G_CALLBACK (source_changed_cb), mpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1167,21 +1167,22 @@ +@@ -1165,21 +1165,22 @@ return dedit; } @@ -700,18 +700,18 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.10.0/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-03-12 23:45:00.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/dialogs/event-page.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-05-09 00:14:46.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/event-page.c 2007-05-18 15:48:37.000000000 -0400 @@ -33,7 +33,7 @@ #include - #include + #include #include -#include +#include #include "common/authentication.h" #include "e-util/e-categories-config.h" #include "e-util/e-dialog-widgets.h" -@@ -967,7 +967,6 @@ +@@ -969,7 +969,6 @@ ECalComponentDateTime start_date, end_date; const char *location, *uid = NULL; const char *categories; @@ -719,7 +719,7 @@ GSList *l; gboolean validated = TRUE; -@@ -1163,8 +1162,9 @@ +@@ -1165,8 +1164,9 @@ e_dialog_editable_set (priv->categories, categories); /* Source */ @@ -812,11 +812,11 @@ } GtkWidget *make_status_icons (void); ---- evolution-2.10.0/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-01-03 10:34:49.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/dialogs/task-page.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-04-20 00:28:26.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/dialogs/task-page.c 2007-05-18 15:48:37.000000000 -0400 @@ -35,7 +35,7 @@ #include - #include + #include #include -#include +#include @@ -843,7 +843,7 @@ if (priv->is_assignment) { ECalComponentOrganizer organizer; -@@ -1617,13 +1617,12 @@ +@@ -1615,13 +1615,12 @@ } static void @@ -861,7 +861,7 @@ if (!priv->updating) { ECal *client; -@@ -1642,8 +1641,9 @@ +@@ -1640,8 +1639,9 @@ if (client) g_object_unref (client); @@ -873,7 +873,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -1655,7 +1655,7 @@ +@@ -1653,7 +1653,7 @@ comp_editor_notify_client_changed ( COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), client); @@ -882,7 +882,7 @@ if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment) task_page_show_options (tpage); else -@@ -1679,7 +1679,8 @@ +@@ -1677,7 +1677,8 @@ if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); priv->sod->data->initialized = TRUE; @@ -892,7 +892,7 @@ e_sendoptions_utils_set_default_data (priv->sod, source, "task"); } -@@ -1734,7 +1735,7 @@ +@@ -1732,7 +1733,7 @@ G_CALLBACK (categories_clicked_cb), tpage); /* Source selector */ @@ -901,7 +901,7 @@ G_CALLBACK (source_changed_cb), tpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1955,21 +1956,22 @@ +@@ -1953,21 +1954,22 @@ return dedit; } @@ -931,8 +931,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.10.0/calendar/gui/e-itip-control.c.e-source-combo-box 2007-01-03 10:34:53.000000000 -0500 -+++ evolution-2.10.0/calendar/gui/e-itip-control.c 2007-03-13 16:56:41.000000000 -0400 +--- evolution-2.11.2/calendar/gui/e-itip-control.c.e-source-combo-box 2007-04-20 00:28:27.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/e-itip-control.c 2007-05-18 15:48:37.000000000 -0400 @@ -44,7 +44,7 @@ #include #include diff --git a/evolution-2.10.0-shell-main-cleanups.patch b/evolution-2.10.0-shell-main-cleanups.patch deleted file mode 100644 index 2549279..0000000 --- a/evolution-2.10.0-shell-main-cleanups.patch +++ /dev/null @@ -1,274 +0,0 @@ ---- evolution-2.10.0/shell/main.c.shell-main-cleanups 2007-03-17 22:19:29.000000000 -0400 -+++ evolution-2.10.0/shell/main.c 2007-03-17 22:21:01.000000000 -0400 -@@ -88,6 +88,9 @@ - - #include "e-util/e-plugin.h" - -+#define SKIP_WARNING_DIALOG_KEY \ -+ "/apps/evolution/shell/skip_warning_dialog" -+ - static EShell *shell = NULL; - - /* Command-line options. */ -@@ -100,7 +103,7 @@ - #endif - static gboolean disable_eplugin = FALSE; - --static gint idle_cb (void *data); -+static gboolean idle_cb (gchar **uris); - - static char *default_component_id = NULL; - static char *evolution_debug_log = NULL; -@@ -133,6 +136,7 @@ - system (KILL_PROCESS_CMD " -9 evolution-data-server-1.2 2> /dev/null"); - system (KILL_PROCESS_CMD " -9 evolution-data-server-1.4 2> /dev/null"); - system (KILL_PROCESS_CMD " -9 evolution-data-server-1.6 2> /dev/null"); -+ system (KILL_PROCESS_CMD " -9 evolution-data-server-1.8 2> /dev/null"); - - system (KILL_PROCESS_CMD " -9 lt-evolution-alarm-notify 2> /dev/null"); - system (KILL_PROCESS_CMD " -9 evolution-alarm-notify 2> /dev/null"); -@@ -182,35 +186,15 @@ - - /* Warning dialog to scare people off a little bit. */ - --static void --warning_dialog_response_callback (GtkDialog *dialog, -- int button_number, -- void *data) --{ -- GtkCheckButton *dont_bother_me_again_checkbox; -- GConfClient *client; -- -- dont_bother_me_again_checkbox = GTK_CHECK_BUTTON (data); -- -- client = gconf_client_get_default (); -- gconf_client_set_bool (client, "/apps/evolution/shell/skip_warning_dialog", -- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (dont_bother_me_again_checkbox)), -- NULL); -- g_object_unref (client); -- -- gtk_widget_destroy (GTK_WIDGET (dialog)); -- -- idle_cb(NULL); --} -- --static void -+static gboolean - show_development_warning(void) - { - GtkWidget *vbox; - GtkWidget *label; - GtkWidget *warning_dialog; -- GtkWidget *dont_bother_me_again_checkbox; -+ GtkWidget *checkbox; - GtkWidget *alignment; -+ gboolean skip; - char *text; - - warning_dialog = gtk_dialog_new (); -@@ -262,59 +246,58 @@ - - gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE, 0); - -- dont_bother_me_again_checkbox = gtk_check_button_new_with_label (_("Do not tell me again")); -+ checkbox = gtk_check_button_new_with_label (_("Do not tell me again")); - - alignment = gtk_alignment_new (0.0, 0.0, 0.0, 0.0); - -- gtk_container_add (GTK_CONTAINER (alignment), dont_bother_me_again_checkbox); -+ gtk_container_add (GTK_CONTAINER (alignment), checkbox); - gtk_box_pack_start (GTK_BOX (vbox), alignment, TRUE, TRUE, 0); - - gtk_widget_show_all (warning_dialog); - -- g_signal_connect (warning_dialog, "response", -- G_CALLBACK (warning_dialog_response_callback), -- dont_bother_me_again_checkbox); -+ gtk_dialog_run (GTK_DIALOG (warning_dialog)); -+ -+ skip = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (checkbox)); -+ -+ gtk_widget_destroy (warning_dialog); -+ -+ idle_cb (NULL); -+ -+ return skip; - } - - static void --destroy_config (void) -+destroy_config (GConfClient *client) - { -- GConfClient *gconf; -- -- gconf = gconf_client_get_default (); -- - /* Unset the source stuff */ -- gconf_client_unset (gconf, "/apps/evolution/calendar/sources", NULL); -- gconf_client_unset (gconf, "/apps/evolution/tasks/sources", NULL); -- gconf_client_unset (gconf, "/apps/evolution/addressbook/sources", NULL); -- gconf_client_unset (gconf, "/apps/evolution/addressbook/sources", NULL); -+ gconf_client_unset (client, "/apps/evolution/calendar/sources", NULL); -+ gconf_client_unset (client, "/apps/evolution/tasks/sources", NULL); -+ gconf_client_unset (client, "/apps/evolution/addressbook/sources", NULL); - - /* Reset the version */ -- gconf_client_set_string (gconf, "/apps/evolution/version", "1.4.0", NULL); -+ gconf_client_set_string (client, "/apps/evolution/version", "1.4.0", NULL); - - /* Clear the dir */ - system ("rm -Rf ~/.evolution"); -- -- g_object_unref (gconf); - } - - #endif /* DEVELOPMENT */ - - static void --open_uris (GNOME_Evolution_Shell corba_shell, GSList *uri_list) -+open_uris (GNOME_Evolution_Shell corba_shell, gchar **uris) - { -- GSList *p; - CORBA_Environment ev; -+ guint n_uris, ii; - -- CORBA_exception_init (&ev); -+ g_assert (uris != NULL); -+ n_uris = g_strv_length (uris); - -- for (p = uri_list; p != NULL; p = p->next) { -- const char *uri; -+ CORBA_exception_init (&ev); - -- uri = (const char *) p->data; -- GNOME_Evolution_Shell_handleURI (corba_shell, uri, &ev); -+ for (ii = 0; ii < n_uris; ii++) { -+ GNOME_Evolution_Shell_handleURI (corba_shell, uris[ii], &ev); - if (ev._major != CORBA_NO_EXCEPTION) { -- g_warning ("Invalid URI: %s", uri); -+ g_warning ("Invalid URI: %s", uris[ii]); - CORBA_exception_free (&ev); - } - } -@@ -324,23 +307,22 @@ - - /* This is for doing stuff that requires the GTK+ loop to be running already. */ - --static gint --idle_cb (void *data) -+static gboolean -+idle_cb (gchar **uris) - { -- GSList *uri_list; - GNOME_Evolution_Shell corba_shell; - CORBA_Environment ev; - EShellConstructResult result; - EShellStartupLineMode startup_line_mode; - -+ g_assert (uris == NULL || g_strv_length (uris) > 0); -+ - #ifdef KILL_PROCESS_CMD - kill_old_dataserver (); - #endif - - CORBA_exception_init (&ev); - -- uri_list = (GSList *) data; -- - if (! start_online && ! start_offline) - startup_line_mode = E_SHELL_STARTUP_LINE_MODE_CONFIG; - else if (start_online) -@@ -378,15 +360,16 @@ - } - - if (shell != NULL) { -- if (g_slist_length (uri_list) == 0) -+ if (uris != NULL) -+ open_uris (corba_shell, uris); -+ else - e_shell_create_window (shell, default_component_id, NULL); -- open_uris (corba_shell, uri_list); - } else { - CORBA_Environment ev; - - CORBA_exception_init (&ev); -- if (uri_list != NULL) -- open_uris (corba_shell, uri_list); -+ if (uris != NULL) -+ open_uris (corba_shell, uris); - else - if (default_component_id == NULL) - GNOME_Evolution_Shell_createNewWindow (corba_shell, "", &ev); -@@ -396,8 +379,6 @@ - CORBA_exception_free (&ev); - } - -- g_slist_free (uri_list); -- - CORBA_Object_release (corba_shell, &ev); - - CORBA_exception_free (&ev); -@@ -501,7 +482,6 @@ - GConfClient *client; - gboolean skip_warning_dialog; - #endif -- GSList *uri_list; - GnomeProgram *program; - GOptionContext *context; - char *filename; -@@ -543,8 +523,10 @@ - #endif - - #if DEVELOPMENT -+ client = g_conf_client_get_default (); -+ - if (force_migrate) { -- destroy_config (); -+ destroy_config (client); - } - #endif - -@@ -571,17 +553,6 @@ - if (setup_only) - exit (0); - -- uri_list = NULL; -- -- if (remaining_args != NULL) { -- const char **p; -- -- for (p = (const char**)remaining_args; *p != NULL; p++) -- uri_list = g_slist_prepend (uri_list, (char *) *p); -- } -- uri_list = g_slist_reverse (uri_list); -- -- - gnome_sound_init ("localhost"); - - if (!disable_eplugin) { -@@ -597,15 +568,20 @@ - } - - #if DEVELOPMENT -- client = gconf_client_get_default (); -- skip_warning_dialog = gconf_client_get_bool (client, "/apps/evolution/shell/skip_warning_dialog", NULL); -- g_object_unref (client); -+ skip_warning_dialog = gconf_client_get_bool ( -+ client, SKIP_WARNING_DIALOG_KEY, NULL); - - if (!skip_warning_dialog && !getenv ("EVOLVE_ME_HARDER")) -- show_development_warning(); -+ gconf_client_set_bool ( -+ client, SKIP_WARNING_DIALOG_KEY, -+ show_development_warning (), NULL); - else -+ g_idle_add ((GSourceFunc) idle_cb, remaining_args); -+ -+ g_object_unref (client); -+#else -+ g_idle_add ((GSourceFunc) idle_cb, remaining_args); - #endif -- g_idle_add (idle_cb, uri_list); - - bonobo_main (); - diff --git a/evolution-2.10.0-use-glib-i18n.patch b/evolution-2.10.0-use-glib-i18n.patch deleted file mode 100644 index 8e45357..0000000 --- a/evolution-2.10.0-use-glib-i18n.patch +++ /dev/null @@ -1,3348 +0,0 @@ ---- evolution-2.10.1/mail/message-tag-followup.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/message-tag-followup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -52,7 +52,7 @@ - #include - - #include --#include -+#include - - #include "e-util/e-icon-factory.h" - #include "e-util/e-util-private.h" ---- evolution-2.10.1/mail/em-popup.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-popup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -41,7 +41,7 @@ - #include - #include - #include --#include -+#include - - #include "em-popup.h" - #include "libedataserver/e-msgport.h" ---- evolution-2.10.1/mail/em-composer-utils.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-composer-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - #include --#include -+#include - - #include "mail-mt.h" - #include "mail-ops.h" ---- evolution-2.10.1/mail/em-account-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-account-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -64,7 +64,7 @@ - #include - #include - --#include -+#include - #include - #include - ---- evolution-2.10.1/mail/mail-tools.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-tools.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-folder-selection-button.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-selection-button.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - - #include --#include -+#include - - #include "mail-component.h" - #include "em-folder-tree.h" ---- evolution-2.10.1/mail/em-format-hook.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-hook.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - - #include - --#include -+#include - - - /* class name -> klass map for EMFormat and subclasses */ ---- evolution-2.10.1/mail/em-format-quote.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-quote.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - - #include --#include -+#include - - #include "em-stripsig-filter.h" - #include "em-format-quote.h" ---- evolution-2.10.1/mail/em-utils.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 -+++ evolution-2.10.1/mail/em-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -59,7 +59,7 @@ - #include - #include - #include --#include -+#include - - #include "mail-component.h" - #include "mail-mt.h" ---- evolution-2.10.1/mail/em-filter-rule.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-filter-rule.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - - #include --#include -+#include - - #include "em-filter-rule.h" - #include "em-filter-context.h" ---- evolution-2.10.1/mail/mail-component.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-component.c 2007-04-30 13:06:43.000000000 -0400 -@@ -78,7 +78,7 @@ - - #include
- #include
--#include -+#include - - #include - #include ---- evolution-2.10.1/mail/importers/mail-importer.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/importers/mail-importer.c 2007-04-30 13:06:43.000000000 -0400 -@@ -38,7 +38,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/mail/mail-send-recv.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-send-recv.c 2007-04-30 13:06:43.000000000 -0400 -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - - #include "e-util/e-gtk-utils.h" - #include "libedataserver/e-account-list.h" ---- evolution-2.10.1/mail/em-format-html.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html.c 2007-04-30 13:06:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-filter-folder-element.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-filter-folder-element.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - - #include --#include -+#include - - #include "em-filter-folder-element.h" - #include "mail/em-folder-selection-button.h" ---- evolution-2.10.1/mail/em-folder-tree.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-tree.c 2007-04-30 13:06:43.000000000 -0400 -@@ -38,7 +38,7 @@ - #include - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-filter-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-filter-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #endif - - #include --#include -+#include - - #include "e-util/e-util-private.h" - ---- evolution-2.10.1/mail/em-folder-tree-model.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-tree-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -39,7 +39,7 @@ - - #include - --#include -+#include - - #include - ---- evolution-2.10.1/mail/message-list.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/message-list.c 2007-04-30 13:06:43.000000000 -0400 -@@ -38,7 +38,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-folder-properties.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-properties.c 2007-04-30 13:06:43.000000000 -0400 -@@ -44,7 +44,7 @@ - #include - #include - #include --#include -+#include - - #include "em-folder-properties.h" - #include "em-config.h" ---- evolution-2.10.1/mail/mail-ops.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-ops.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-migrate.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-migrate.c 2007-04-30 13:06:43.000000000 -0400 -@@ -54,7 +54,7 @@ - #include - #include - --#include -+#include - - #include - #include -@@ -2645,38 +2645,34 @@ - { - GDir *dir; - const char *d; -- struct stat st; -- const GList *l; - char *local, *base; -+ const gchar * const *language_names; - - /* special-case - this means brand new install of evolution */ - /* FIXME: create default folders and stuff... */ - - d(printf("Setting up initial mail tree\n")); - -- base = g_build_filename(evolution_dir, "mail/local", NULL); -+ base = g_build_filename(evolution_dir, "mail", "local", NULL); - if (e_util_mkdir_hier(base, 0777) == -1 && errno != EEXIST) { - g_free(base); - return -1; - } - - /* e.g. try en-AU then en, etc */ -- for (l = gnome_i18n_get_language_list("LC_MESSAGES"); -- l != NULL; -- l = g_list_next(l)) { -- local = g_build_filename(EVOLUTION_PRIVDATADIR, -- "default", -- (char *)l->data, -- "mail/local", NULL); -- if (g_stat(local, &st) == 0) -- goto gotlocal; -- -- g_free(local); -- } -- -- local = g_build_filename(EVOLUTION_PRIVDATADIR, -- "default/C/mail/local", NULL); --gotlocal: -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) { -+ local = g_build_filename ( -+ EVOLUTION_PRIVDATADIR, "default", -+ *language_names, "mail", "local", NULL); -+ if (g_file_test (local, G_FILE_TEST_EXISTS)) -+ break; -+ g_free (local); -+ language_names++; -+ } -+ -+ /* Make sure we found one. */ -+ g_assert (*language_names != NULL); - - dir = g_dir_open(local, 0, NULL); - if (dir) { ---- evolution-2.10.1/mail/mail-vfolder.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-vfolder.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-folder-selector.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-selector.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-subscribe-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-subscribe-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -44,7 +44,7 @@ - #include "mail-config.h" - - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/mail-autofilter.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-autofilter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/mail/em-format-html-display.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html-display.c 2007-04-30 13:06:43.000000000 -0400 -@@ -67,7 +67,7 @@ - #include - - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-account-prefs.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-account-prefs.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - --#include -+#include - - #include "mail-component.h" - #include "mail-config.h" ---- evolution-2.10.1/mail/mail-folder-cache.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-folder-cache.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/mail/em-format.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-vfolder-editor.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-vfolder-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #endif - - #include --#include -+#include - - #include "e-util/e-util-private.h" - ---- evolution-2.10.1/mail/mail-mt.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/mail-mt.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - - #include --#include -+#include - - #include - ---- evolution-2.10.1/mail/em-folder-utils.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/mail/em-vfolder-rule.c.use-glib-i18n 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-vfolder-rule.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - - #include - #include --#include -+#include - - #include "camel/camel-url.h" - #include "em-vfolder-context.h" ---- evolution-2.10.1/a11y/widgets/ea-calendar-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/widgets/ea-calendar-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - #include "ea-calendar-item.h" - #include "ea-calendar-cell.h" ---- evolution-2.10.1/a11y/addressbook/ea-minicard-view.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 -+++ evolution-2.10.1/a11y/addressbook/ea-minicard-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -20,11 +20,10 @@ - */ - - #include --#include - #include - #include - #include --#include -+#include - #include "ea-minicard.h" - #include "ea-minicard-view.h" - #include "eab-gui-util.h" ---- evolution-2.10.1/a11y/addressbook/ea-addressbook-view.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 -+++ evolution-2.10.1/a11y/addressbook/ea-addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -22,7 +22,7 @@ - - #include - --#include -+#include - #include "ea-addressbook-view.h" - - static G_CONST_RETURN gchar* ea_ab_view_get_name (AtkObject *accessible); ---- evolution-2.10.1/a11y/addressbook/ea-minicard.c.use-glib-i18n 2007-04-09 09:10:36.000000000 -0400 -+++ evolution-2.10.1/a11y/addressbook/ea-minicard.c 2007-04-30 13:06:43.000000000 -0400 -@@ -22,7 +22,7 @@ - - #include - #include --#include -+#include - #include "ea-minicard.h" - #include "ea-minicard-view.h" - #include "e-minicard.h" ---- evolution-2.10.1/a11y/calendar/ea-day-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-day-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include "ea-gnome-calendar.h" - #include "calendar-commands.h" - #include --#include -+#include - - static void ea_day_view_class_init (EaDayViewClass *klass); - ---- evolution-2.10.1/a11y/calendar/ea-jump-button.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-jump-button.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include "ea-week-view.h" - #include "e-week-view.h" - #include --#include -+#include - - static void ea_jump_button_class_init (EaJumpButtonClass *klass); - ---- evolution-2.10.1/a11y/calendar/ea-cal-view-event.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-cal-view-event.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include "ea-day-view.h" - #include "ea-week-view.h" - #include --#include -+#include - - static void ea_cal_view_event_class_init (EaCalViewEventClass *klass); - static void ea_cal_view_event_init (EaCalViewEvent *a11y); ---- evolution-2.10.1/a11y/calendar/ea-week-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-week-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include "ea-gnome-calendar.h" - #include "calendar-commands.h" - #include --#include -+#include - - static void ea_week_view_class_init (EaWeekViewClass *klass); - ---- evolution-2.10.1/a11y/calendar/ea-week-view-main-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-week-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include "ea-week-view.h" - #include "ea-week-view-cell.h" - #include "ea-cell-table.h" --#include -+#include - - /* EaWeekViewMainItem */ - static void ea_week_view_main_item_class_init (EaWeekViewMainItemClass *klass); ---- evolution-2.10.1/a11y/calendar/ea-day-view-main-item.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-day-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include "ea-day-view.h" - #include "ea-day-view-cell.h" - #include "ea-cell-table.h" --#include -+#include - - /* EaDayViewMainItem */ - static void ea_day_view_main_item_class_init (EaDayViewMainItemClass *klass); ---- evolution-2.10.1/a11y/calendar/ea-gnome-calendar.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-gnome-calendar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - - static void ea_gnome_calendar_class_init (EaGnomeCalendarClass *klass); - ---- evolution-2.10.1/a11y/calendar/ea-cal-view.c.use-glib-i18n 2007-04-09 09:10:37.000000000 -0400 -+++ evolution-2.10.1/a11y/calendar/ea-cal-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include "calendar-commands.h" - #include "goto.h" - #include --#include -+#include - - static void ea_cal_view_class_init (EaCalViewClass *klass); - ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-popup.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-popup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include "a11y/gal-a11y-util.h" - #include "table/e-cell-popup.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell-popup.h" - #include "gal-a11y-e-cell-registry.h" ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell.c 2007-04-30 13:06:43.000000000 -0400 -@@ -15,7 +15,7 @@ - #include "a11y/gal-a11y-util.h" - #include "table/e-table.h" - #include "table/e-tree.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell.h" - #include "gal-a11y-e-cell-vbox.h" ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-toggle.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-toggle.c 2007-04-30 13:06:43.000000000 -0400 -@@ -2,7 +2,7 @@ - - #include "table/e-cell-toggle.h" - #include "table/e-table-model.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell-toggle.h" - ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-text.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-text.c 2007-04-30 13:06:43.000000000 -0400 -@@ -14,7 +14,7 @@ - - #include "a11y/gal-a11y-util.h" - #include "table/e-cell-text.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell-text.h" - ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-tree.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-cell-tree.c 2007-04-30 13:06:43.000000000 -0400 -@@ -14,7 +14,7 @@ - #include "table/e-cell-tree.h" - #include "table/e-table.h" - #include "table/e-tree-table-adapter.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-cell-tree.h" - #include "gal-a11y-e-cell-registry.h" ---- evolution-2.10.1/a11y/e-table/gal-a11y-e-table-click-to-add.c.use-glib-i18n 2007-04-09 09:10:38.000000000 -0400 -+++ evolution-2.10.1/a11y/e-table/gal-a11y-e-table-click-to-add.c 2007-04-30 13:06:43.000000000 -0400 -@@ -13,7 +13,7 @@ - #include "table/e-table-click-to-add.h" - #include "table/e-table-group.h" - #include "table/e-table-group-leaf.h" --#include "e-util/e-i18n.h" -+#include - - #include "gal-a11y-e-table-click-to-add.h" - #include "gal-a11y-e-table-click-to-add-factory.h" ---- evolution-2.10.1/filter/rule-editor.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/rule-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - --#include -+#include - - #include "e-util/e-error.h" - #include "e-util/e-util-private.h" ---- evolution-2.10.1/filter/filter-label.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-label.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/filter/filter-part.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-part.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - #include --#include -+#include - - #include "filter-part.h" - #include "rule-context.h" ---- evolution-2.10.1/filter/filter-datespec.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/filter/filter-datespec.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - - #include --#include -+#include - #include - - #include "filter-datespec.h" ---- evolution-2.10.1/filter/rule-context.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/rule-context.c 2007-04-30 13:06:43.000000000 -0400 -@@ -34,7 +34,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/filter/filter-option.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-option.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - - #include --#include -+#include - - #include "filter-option.h" - #include "filter-part.h" ---- evolution-2.10.1/filter/filter-file.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-file.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - --#include -+#include - #include - - #include ---- evolution-2.10.1/filter/filter-input.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-input.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - - #include --#include -+#include - - #include "filter-input.h" - #include "libedataserver/e-sexp.h" ---- evolution-2.10.1/filter/filter-rule.c.use-glib-i18n 2007-04-09 09:09:28.000000000 -0400 -+++ evolution-2.10.1/filter/filter-rule.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - - #include --#include -+#include - - #include "e-util/e-error.h" - #include "filter-rule.h" ---- evolution-2.10.1/widgets/misc/e-calendar-item.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-calendar-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - #include - #include - ---- evolution-2.10.1/widgets/misc/e-unicode.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-unicode.c 2007-04-30 13:06:43.000000000 -0400 -@@ -42,7 +42,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-unicode.h" - - #define d(x) x ---- evolution-2.10.1/widgets/misc/e-task-widget.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-task-widget.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include -+#include - - - #define SPACING 2 ---- evolution-2.10.1/widgets/misc/e-filter-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-filter-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include -+#include - - #include "e-dropdown-button.h" - #include "e-filter-bar.h" ---- evolution-2.10.1/widgets/misc/e-dateedit.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-dateedit.c 2007-04-30 13:06:43.000000000 -0400 -@@ -58,7 +58,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/widgets/misc/e-charset-picker.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-charset-picker.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/widgets/misc/e-clipped-label.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-clipped-label.c 2007-04-30 13:06:43.000000000 -0400 -@@ -40,7 +40,7 @@ - - #include - #include --#include -+#include - - - static void e_clipped_label_class_init (EClippedLabelClass *class); ---- evolution-2.10.1/widgets/misc/e-cell-percent.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-cell-percent.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - - #include "e-cell-percent.h" - ---- evolution-2.10.1/widgets/misc/e-cell-date-edit.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-cell-date-edit.c 2007-04-30 13:06:43.000000000 -0400 -@@ -44,7 +44,7 @@ - #include
- - #include --#include -+#include - - #include - ---- evolution-2.10.1/widgets/misc/e-map.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-map.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - - #include "e-util/e-util-private.h" - #include "e-util/e-util.h" ---- evolution-2.10.1/widgets/misc/e-canvas-background.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-canvas-background.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - #include "misc/e-canvas-utils.h" ---- evolution-2.10.1/widgets/misc/e-selection-model.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-selection-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" - ---- evolution-2.10.1/widgets/misc/e-selection-model-array.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-selection-model-array.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-selection-model-array.h" ---- evolution-2.10.1/widgets/misc/e-send-options.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-send-options.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - #include - ---- evolution-2.10.1/widgets/misc/e-calendar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-calendar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - - #define E_CALENDAR_SMALL_FONT_PTSIZE 6 - ---- evolution-2.10.1/widgets/misc/e-reflow.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-reflow.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - - #include "text/e-text.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" - #include "misc/e-unicode.h" ---- evolution-2.10.1/widgets/misc/e-search-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-search-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -42,7 +42,7 @@ - #include - #include - --#include -+#include - - #include - ---- evolution-2.10.1/widgets/misc/e-attachment-bar.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-attachment-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "e-attachment.h" ---- evolution-2.10.1/widgets/misc/e-attachment.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-attachment.c 2007-04-30 13:06:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "e-util/e-mktemp.h" ---- evolution-2.10.1/widgets/misc/e-canvas-vbox.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-canvas-vbox.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-canvas.h" ---- evolution-2.10.1/widgets/misc/e-activity-handler.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-activity-handler.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - --#include -+#include - #include - - #include ---- evolution-2.10.1/widgets/misc/e-image-chooser.c.use-glib-i18n 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-image-chooser.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - - #include --#include -+#include - - #include "e-image-chooser.h" - #include "e-util/e-util-marshal.h" ---- evolution-2.10.1/widgets/menus/gal-view-new-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-new-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - - #include "table/e-table-scrolled.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-util-private.h" - #include "misc/e-unicode.h" -@@ -92,7 +92,7 @@ - "gal-view-new-dialog.glade", - NULL); - -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; - ---- evolution-2.10.1/widgets/menus/gal-view-factory-etable.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-factory-etable.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "gal-view-etable.h" ---- evolution-2.10.1/widgets/menus/gal-define-views-model.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-define-views-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "gal-define-views-model.h" ---- evolution-2.10.1/widgets/menus/gal-define-views-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-define-views-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - - #include "table/e-table-scrolled.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-util-private.h" - -@@ -80,7 +80,7 @@ - } - - /* ETable creation */ --#define SPEC "" \ -+#define SPEC "" \ - "" \ - " " \ - "" -@@ -250,7 +250,7 @@ - - dialog->collection = NULL; - -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; - ---- evolution-2.10.1/widgets/menus/gal-view-instance-save-as-dialog.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-instance-save-as-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - - #include "table/e-table-scrolled.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-private.h" - - #include "gal-define-views-model.h" -@@ -197,7 +197,7 @@ - - dialog->instance = NULL; - -- gui = glade_xml_new_with_domain (filename , NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new_with_domain (filename , NULL, GETTEXT_PACKAGE); - g_free (filename); - dialog->gui = gui; - -@@ -235,7 +235,7 @@ - - /* For use from libglade. */ - /* ETable creation */ --#define SPEC "" \ -+#define SPEC "" \ - "" \ - " " \ - "" ---- evolution-2.10.1/widgets/menus/gal-view-instance.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-instance.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-xml-utils.h" - #include "misc/e-unicode.h" ---- evolution-2.10.1/widgets/menus/gal-view-collection.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-collection.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-xml-utils.h" - #include "misc/e-unicode.h" ---- evolution-2.10.1/widgets/menus/gal-view-menus.c.use-glib-i18n 2007-04-09 09:10:17.000000000 -0400 -+++ evolution-2.10.1/widgets/menus/gal-view-menus.c 2007-04-30 13:06:43.000000000 -0400 -@@ -20,7 +20,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/widgets/table/e-cell-pixbuf.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-pixbuf.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include - #include "e-cell-pixbuf.h" - ---- evolution-2.10.1/widgets/table/e-table-field-chooser-dialog.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-field-chooser-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-table-field-chooser-dialog.h" ---- evolution-2.10.1/widgets/table/e-table-sorter.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-sorter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-table-sorter.h" ---- evolution-2.10.1/widgets/table/e-table-selection-model.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-selection-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-table-selection-model.h" ---- evolution-2.10.1/widgets/table/e-table-group-leaf.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-group-leaf.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - ---- evolution-2.10.1/widgets/table/e-table-field-chooser.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-field-chooser.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-util-private.h" - -@@ -156,7 +156,7 @@ - gchar *filename = g_build_filename (EVOLUTION_GLADEDIR, - "e-table-field-chooser.glade", - NULL); -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - etfc->gui = gui; - ---- evolution-2.10.1/widgets/table/e-table-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -38,7 +38,7 @@ - - #include "a11y/e-table/gal-a11y-e-table-item-factory.h" - #include "a11y/e-table/gal-a11y-e-table-item.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - #include "misc/e-canvas-utils.h" ---- evolution-2.10.1/widgets/table/e-table.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - - #include "a11y/e-table/gal-a11y-e-table.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - #include "misc/e-canvas-background.h" ---- evolution-2.10.1/widgets/table/e-table-group-container.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-group-container.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - - #include "text/e-text.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas-utils.h" - #include "misc/e-canvas.h" ---- evolution-2.10.1/widgets/table/e-cell-float.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-float.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-cell-float.h" ---- evolution-2.10.1/widgets/table/e-tree-scrolled.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-tree-scrolled.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-tree-scrolled.h" ---- evolution-2.10.1/widgets/table/e-table-col.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-col.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-table-col.h" ---- evolution-2.10.1/widgets/table/e-table-scrolled.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-scrolled.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - - #include "e-table.h" - #include "e-table-scrolled.h" ---- evolution-2.10.1/widgets/table/e-table-header-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-header-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" - #include "e-util/e-xml-utils.h" -@@ -1531,7 +1531,7 @@ - ((ethi->table || ethi->tree) ? 0 : 4) + - ((e_table_header_count (ethi->eth) > 1) ? 0 : 8), - ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) + -- 128, info, E_I18N_DOMAIN); -+ 128, info, GETTEXT_PACKAGE); - - menu_item = gtk_menu_item_new_with_label (_("Sort By")); - gtk_widget_show (menu_item); -@@ -1813,7 +1813,7 @@ - ((ethi->table || ethi->tree) ? 0 : 4) + - ((e_table_header_count (ethi->eth) > 1) ? 0 : 8), - ((e_table_sort_info_get_can_group (ethi->sort_info)) ? 0 : 16) + -- 128, info, E_I18N_DOMAIN); -+ 128, info, GETTEXT_PACKAGE); - g_object_ref (popup); - gtk_object_sink (GTK_OBJECT (popup)); - g_signal_connect (popup, "selection-done", ---- evolution-2.10.1/widgets/table/e-table-field-chooser-item.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-field-chooser-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-xml-utils.h" - #include "misc/e-canvas.h" ---- evolution-2.10.1/widgets/table/e-table-config.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-private.h" - #include "e-util/e-util.h" - #include "misc/e-unicode.h" -@@ -539,7 +539,7 @@ - } - } - --char *spec = "" - "" - " " -@@ -1093,14 +1093,14 @@ - g_build_filename (EVOLUTION_GLADEDIR, - "e-table-config.glade", - NULL); -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - } else { - gchar *filename = - g_build_filename (EVOLUTION_GLADEDIR, - "e-table-config-no-group.glade", - NULL); -- gui = glade_xml_new (filename, NULL, E_I18N_DOMAIN); -+ gui = glade_xml_new (filename, NULL, GETTEXT_PACKAGE); - g_free (filename); - } - ---- evolution-2.10.1/widgets/table/e-cell-text.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-text.c 2007-04-30 13:06:43.000000000 -0400 -@@ -50,7 +50,7 @@ - #include "a11y/e-table/gal-a11y-e-cell-registry.h" - #include "a11y/e-table/gal-a11y-e-cell-text.h" - #include "text/e-text.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-text-event-processor.h" - #include "e-util/e-text-event-processor-emacs-like.h" - #include "e-util/e-util.h" ---- evolution-2.10.1/widgets/table/e-tree.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-tree.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - - #include "a11y/e-table/gal-a11y-e-tree.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "e-util/e-util-marshal.h" - #include "misc/e-canvas.h" ---- evolution-2.10.1/widgets/table/e-cell-number.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-number.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-cell-number.h" ---- evolution-2.10.1/widgets/table/e-tree-selection-model.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-tree-selection-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - - #include "table/e-tree-table-adapter.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - - #include "e-tree-selection-model.h" ---- evolution-2.10.1/widgets/table/e-cell-combo.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-combo.c 2007-04-30 13:06:43.000000000 -0400 -@@ -59,7 +59,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-unicode.h" - ---- evolution-2.10.1/widgets/table/e-table-click-to-add.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-table-click-to-add.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - - #include "a11y/e-table/gal-a11y-e-table-click-to-add.h" - #include "text/e-text.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - #include "e-util/e-util.h" - #include "misc/e-canvas-utils.h" ---- evolution-2.10.1/widgets/table/e-cell-date.c.use-glib-i18n 2007-04-09 09:10:21.000000000 -0400 -+++ evolution-2.10.1/widgets/table/e-cell-date.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-unicode.h" - ---- evolution-2.10.1/widgets/text/e-text.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/widgets/text/e-text.c 2007-04-30 13:06:43.000000000 -0400 -@@ -52,7 +52,7 @@ - #include "misc/e-canvas.h" - #include "misc/e-canvas-utils.h" - #include "misc/e-unicode.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-text-event-processor-emacs-like.h" - #include "e-util/e-util.h" - ---- evolution-2.10.1/widgets/text/e-completion-view.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/widgets/text/e-completion-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include "table/e-table-scrolled.h" - #include "table/e-table-simple.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util-marshal.h" - - #include "e-completion-view.h" -@@ -623,7 +623,7 @@ - /* XXX toshok - we need to add sorting to this etable, through the use - of undisplayed fields of all the sort keys we want to use */ - static char *simple_spec = --"" -+"" - " " ---- evolution-2.10.1/widgets/text/e-entry.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/widgets/text/e-entry.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-util.h" - #include "misc/e-canvas.h" - #include "misc/e-canvas-utils.h" ---- evolution-2.10.1/plugins/calendar-file/calendar-file.c.use-glib-i18n 2007-04-09 09:09:11.000000000 -0400 -+++ evolution-2.10.1/plugins/calendar-file/calendar-file.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - - GtkWidget *e_calendar_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data); ---- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/publish-calendar/publish-calendar.c.use-glib-i18n 2007-04-09 09:09:16.000000000 -0400 -+++ evolution-2.10.1/plugins/publish-calendar/publish-calendar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/calendar-weather/calendar-weather.c.use-glib-i18n 2007-04-09 09:09:15.000000000 -0400 -+++ evolution-2.10.1/plugins/calendar-weather/calendar-weather.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/import-ics-attachments/icsimporter.c.use-glib-i18n 2007-04-09 09:09:11.000000000 -0400 -+++ evolution-2.10.1/plugins/import-ics-attachments/icsimporter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/backup-restore/backup-restore.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/backup-restore/backup-restore.c 2007-04-30 13:06:43.000000000 -0400 -@@ -2,7 +2,7 @@ - #include - #include - #include --#include -+#include - #include "shell/es-menu.h" - - void org_gnome_backup_restore_backup (EPlugin *ep, ESMenuTargetShell *target); ---- evolution-2.10.1/plugins/backup-restore/backup.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/backup-restore/backup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -8,7 +8,7 @@ - #include - #include - --#include -+#include - #include - - #define EVOLUTION "evolution-" BASE_VERSION ---- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.use-glib-i18n 2007-04-09 09:09:13.000000000 -0400 -+++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "e-util/e-util-private.h" ---- evolution-2.10.1/plugins/default-source/default-source.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/default-source/default-source.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data); - void commit_default_calendar (EPlugin *epl, EConfigTarget *target); ---- evolution-2.10.1/plugins/subject-thread/subject-thread.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/subject-thread/subject-thread.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/calendar-http/calendar-http.c.use-glib-i18n 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/calendar-http/calendar-http.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - - GtkWidget *e_calendar_http_url (EPlugin *epl, EConfigHookItemFactoryData *data); ---- evolution-2.10.1/plugins/itip-formatter/itip-formatter.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/itip-formatter/itip-formatter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/itip-formatter/itip-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/itip-formatter/itip-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/junk-settings.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/junk-settings.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/install-shared.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/install-shared.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/process-meeting.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/process-meeting.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/plugins/groupwise-features/addressbook-groupwise.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/addressbook-groupwise.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - - void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target); ---- evolution-2.10.1/plugins/groupwise-features/send-options.c.use-glib-i18n 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/send-options.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include "mail/em-account-editor.h" ---- evolution-2.10.1/plugins/bbdb/gaimbuddies.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/bbdb/gaimbuddies.c 2007-04-30 13:06:43.000000000 -0400 -@@ -40,7 +40,7 @@ - #include - - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/plugins/bbdb/bbdb.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/plugins/bbdb/bbdb.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #endif - - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/e-util/e-categories-config.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-categories-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -10,7 +10,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/e-util/e-text-event-processor.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-text-event-processor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,8 @@ - - #include - --#include "e-i18n.h" -+#include -+ - #include "e-util-marshal.h" - #include "e-text-event-processor.h" - #include "e-util.h" ---- evolution-2.10.1/e-util/e-util.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-util.c 2007-04-30 13:06:43.000000000 -0400 -@@ -1112,20 +1112,6 @@ - } - } - --char * --e_gettext (const char *msgid) --{ -- static gboolean initialized = FALSE; -- -- if (!initialized) { -- bindtextdomain (E_I18N_DOMAIN, EVOLUTION_LOCALEDIR); -- bind_textdomain_codeset (E_I18N_DOMAIN, "UTF-8"); -- initialized = TRUE; -- } -- -- return dgettext (E_I18N_DOMAIN, msgid); --} -- - cairo_font_options_t * - get_font_options () - { ---- evolution-2.10.1/e-util/e-popup.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-popup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -42,7 +42,7 @@ - - #include - --#include -+#include - - #define d(x) - ---- evolution-2.10.1/e-util/e-xml-utils.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-xml-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,155 +36,14 @@ - #include - - #include -+#include - #include - #include - #include - --#include "e-i18n.h" - #include "e-util.h" - #include "e-xml-utils.h" - --/* Returns the first child with the name child_name and the "lang" -- * attribute that matches the current LC_MESSAGES, or else, the first -- * child with the name child_name and no "lang" attribute. -- */ --xmlNode * --e_xml_get_child_by_name_by_lang (const xmlNode *parent, -- const xmlChar *child_name, -- const gchar *lang) --{ --#ifdef G_OS_WIN32 -- gchar *freeme = NULL; --#endif -- xmlNode *child; -- /* This is the default version of the string. */ -- xmlNode *C = NULL; -- -- g_return_val_if_fail (parent != NULL, NULL); -- g_return_val_if_fail (child_name != NULL, NULL); -- -- if (lang == NULL) { --#ifndef G_OS_WIN32 --#ifdef HAVE_LC_MESSAGES -- lang = setlocale (LC_MESSAGES, NULL); --#else -- lang = setlocale (LC_CTYPE, NULL); --#endif --#else -- lang = freeme = g_win32_getlocale (); --#endif -- } -- for (child = parent->xmlChildrenNode; child != NULL; child = child->next) { -- if (xmlStrcmp (child->name, child_name) == 0) { -- xmlChar *this_lang = xmlGetProp (child, "lang"); -- if (this_lang == NULL) { -- C = child; -- } else if (xmlStrcmp(this_lang, lang) == 0) { --#ifdef G_OS_WIN32 -- g_free (freeme); --#endif -- return child; -- } -- } -- } --#ifdef G_OS_WIN32 -- g_free (freeme); --#endif -- return C; --} -- --static xmlNode * --e_xml_get_child_by_name_by_lang_list_with_score (const xmlNode *parent, -- const gchar *name, -- const GList *lang_list, -- gint *best_lang_score) --{ -- xmlNodePtr best_node = NULL, node; -- -- for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { -- xmlChar *lang; -- -- if (node->name == NULL || strcmp (node->name, name) != 0) { -- continue; -- } -- lang = xmlGetProp (node, "xml:lang"); -- if (lang != NULL) { -- const GList *l; -- gint i; -- -- for (l = lang_list, i = 0; -- l != NULL && i < *best_lang_score; -- l = l->next, i++) { -- if (strcmp ((gchar *) l->data, lang) == 0) { -- best_node = node; -- *best_lang_score = i; -- } -- } -- } else { -- if (best_node == NULL) { -- best_node = node; -- } -- } -- xmlFree (lang); -- if (*best_lang_score == 0) { -- return best_node; -- } -- } -- -- return best_node; --} -- --/* -- * e_xml_get_child_by_name_by_lang_list: -- * -- */ --xmlNode * --e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, -- const gchar *name, -- const GList *lang_list) --{ -- gint best_lang_score = INT_MAX; -- -- g_return_val_if_fail (parent != NULL, NULL); -- g_return_val_if_fail (name != NULL, NULL); -- -- if (lang_list == NULL) { -- lang_list = gnome_i18n_get_language_list ("LC_MESSAGES"); -- } -- return e_xml_get_child_by_name_by_lang_list_with_score -- (parent,name, -- lang_list, -- &best_lang_score); --} -- --/* -- * e_xml_get_child_by_name_no_lang -- * -- */ --xmlNode * --e_xml_get_child_by_name_no_lang (const xmlNode *parent, const gchar *name) --{ -- xmlNodePtr node; -- -- g_return_val_if_fail (parent != NULL, NULL); -- g_return_val_if_fail (name != NULL, NULL); -- -- for (node = parent->xmlChildrenNode; node != NULL; node = node->next) { -- xmlChar *lang; -- -- if (node->name == NULL || strcmp (node->name, name) != 0) { -- continue; -- } -- lang = xmlGetProp (node, "xml:lang"); -- if (lang == NULL) { -- return node; -- } -- xmlFree (lang); -- } -- -- return NULL; --} -- - gint - e_xml_get_integer_prop_by_name (const xmlNode *parent, const xmlChar *prop_name) - { ---- evolution-2.10.1/e-util/e-config.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -45,7 +45,7 @@ - - #include - --#include -+#include - - #define d(x) - ---- evolution-2.10.1/e-util/e-dialog-utils.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-dialog-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -46,7 +46,7 @@ - #include - - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/e-util/e-import.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-import.c 2007-04-30 13:06:43.000000000 -0400 -@@ -45,7 +45,7 @@ - - #include - --#include -+#include - - #define d(x) - ---- evolution-2.10.1/e-util/Makefile.am.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/Makefile.am 2007-04-30 13:06:43.000000000 -0400 -@@ -108,7 +108,6 @@ - eggtrayicon.c \ - eggtrayicon.h \ - e-bit-array.c \ -- e-i18n.h \ - e-sorter.c \ - e-sorter-array.c \ - e-text-event-processor-emacs-like.c \ ---- evolution-2.10.1/e-util/e-error.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-error.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/e-util/e-event.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-event.c 2007-04-30 13:06:43.000000000 -0400 -@@ -42,7 +42,7 @@ - - #include - --#include -+#include - #include - - #define d(x) ---- evolution-2.10.1/e-util/e-xml-utils.h.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-xml-utils.h 2007-04-30 13:06:43.000000000 -0400 -@@ -30,18 +30,6 @@ - - G_BEGIN_DECLS - --/* lang set to NULL means use the current locale. */ --xmlNode *e_xml_get_child_by_name_by_lang (const xmlNode *parent, -- const xmlChar *child_name, -- const gchar *lang); --/* lang_list set to NULL means use the current locale. */ --xmlNode *e_xml_get_child_by_name_by_lang_list (const xmlNode *parent, -- const gchar *name, -- const GList *lang_list); --xmlNode *e_xml_get_child_by_name_no_lang (const xmlNode *parent, -- const gchar *name); -- -- - gint e_xml_get_integer_prop_by_name (const xmlNode *parent, - const xmlChar *prop_name); - gint e_xml_get_integer_prop_by_name_with_default (const xmlNode *parent, ---- evolution-2.10.1/e-util/e-i18n.h.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-i18n.h 2007-04-30 13:06:43.000000000 -0400 -@@ -1,74 +0,0 @@ --/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */ --/* -- * e-i18n.h -- * Copyright 2000, 2001, Ximian, Inc. -- * -- * Authors: -- * Chris Lahey -- * -- * Copied from gnome-i18nP.h, because this header is typically not installed -- * -- * This file has to be included before any file from the GNOME libraries -- * to have this override the definitions that are pulled from the gnome-i18n.h -- * -- * the difference is that gnome-i18n.h is used for applications, and this is -- * used by libraries (because libraries have to use dcgettext instead of -- * gettext and they need to provide the translation domain, unlike apps). -- * -- * So you can just put this after you include config.h -- * -- * This library is free software; you can redistribute it and/or -- * modify it under the terms of the GNU Library General Public -- * License, version 2, as published by the Free Software Foundation. -- * -- * This library is distributed in the hope that it will be useful, but -- * WITHOUT ANY WARRANTY; without even the implied warranty of -- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -- * Library General Public License for more details. -- * -- * You should have received a copy of the GNU Library General Public -- * License along with this library; if not, write to the Free Software -- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA -- * 02111-1307, USA. -- */ -- --#ifndef __E_I18N_H__ --#define __E_I18N_H__ -- --#include -- --G_BEGIN_DECLS -- --#ifdef ENABLE_NLS -- /* this function is defined in e-util.c */ -- extern char *e_gettext (const char *msgid); --# undef _ --# ifdef GNOME_EXPLICIT_TRANSLATION_DOMAIN --/* No parentheses allowed here since that breaks string concatenation. */ --# define E_I18N_DOMAIN GNOME_EXPLICIT_TRANSLATION_DOMAIN --# else --/* No parentheses allowed here since that breaks string concatenation. */ --# define E_I18N_DOMAIN GETTEXT_PACKAGE --# endif --# define _(String) e_gettext (String) --# ifdef gettext_noop --# define N_(String) gettext_noop (String) --# else --# define N_(String) (String) --# endif --#else --/* Stubs that do something close enough. */ --# define textdomain(String) (String) --# define gettext(String) (String) --# define dgettext(Domain,Message) (Message) --# define dcgettext(Domain,Message,Type) (Message) --# define bindtextdomain(Domain,Directory) (Domain) --# define _(String) (String) --# define N_(String) (String) --/* No parentheses allowed here since that breaks string concatenation. */ --# define E_I18N_DOMAIN "" --#endif -- --G_END_DECLS -- --#endif /* __E_I18N_H__ */ ---- evolution-2.10.1/e-util/Makefile.in.use-glib-i18n 2007-04-30 13:09:50.000000000 -0400 -+++ evolution-2.10.1/e-util/Makefile.in 2007-04-30 13:10:02.000000000 -0400 -@@ -90,7 +90,7 @@ - e-html-utils.c e-icon-factory.c e-import.c e-menu.c e-mktemp.c \ - e-plugin.c e-popup.c e-print.c e-profile-event.c e-request.c \ - e-signature.c e-signature-list.c eggtrayicon.c eggtrayicon.h \ -- e-bit-array.c e-i18n.h e-sorter.c e-sorter-array.c \ -+ e-bit-array.c e-sorter.c e-sorter-array.c \ - e-text-event-processor-emacs-like.c e-text-event-processor.c \ - e-util.c e-util-private.h e-xml-utils.c e-win32-reloc.c - @OS_WIN32_TRUE@am__objects_4 = e-win32-reloc.lo -@@ -588,7 +588,6 @@ - eggtrayicon.c \ - eggtrayicon.h \ - e-bit-array.c \ -- e-i18n.h \ - e-sorter.c \ - e-sorter-array.c \ - e-text-event-processor-emacs-like.c \ ---- evolution-2.10.1/e-util/e-menu.c.use-glib-i18n 2007-04-09 09:10:16.000000000 -0400 -+++ evolution-2.10.1/e-util/e-menu.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - --#include -+#include - #include - - #include ---- evolution-2.10.1/addressbook/printing/e-contact-print-envelope.c.use-glib-i18n 2007-04-09 09:07:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/printing/e-contact-print-envelope.c 2007-04-30 13:06:43.000000000 -0400 -@@ -22,7 +22,7 @@ - #include - #include "addressbook/printing/e-contact-print-envelope.h" - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/printing/e-contact-print.c.use-glib-i18n 2007-04-09 09:07:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/printing/e-contact-print.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/component/addressbook-config.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - - #include - ---- evolution-2.10.1/addressbook/gui/component/addressbook.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - - #include - #include --#include -+#include - - #include - ---- evolution-2.10.1/addressbook/gui/component/autocompletion-config.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/autocompletion-config.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/component/addressbook-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-list-editor/e-contact-list-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/widgets/e-minicard-view-widget.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-view-widget.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - - #include "eab-marshal.h" - #include "e-minicard-view-widget.h" ---- evolution-2.10.1/addressbook/gui/widgets/e-addressbook-reflow-adapter.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-addressbook-reflow-adapter.c 2007-04-30 13:06:43.000000000 -0400 -@@ -4,7 +4,7 @@ - #include - #include - --#include -+#include - #include "eab-marshal.h" - #include "e-addressbook-reflow-adapter.h" - #include "e-addressbook-model.h" ---- evolution-2.10.1/addressbook/gui/widgets/eab-contact-display.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/eab-contact-display.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include "e-util/e-icon-factory.h" - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/widgets/gal-view-factory-minicard.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/gal-view-factory-minicard.c 2007-04-30 13:06:43.000000000 -0400 -@@ -13,7 +13,7 @@ - #endif - - #include --#include -+#include - #include "gal-view-factory-minicard.h" - #include "gal-view-minicard.h" - ---- evolution-2.10.1/addressbook/gui/widgets/e-addressbook-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-addressbook-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - --#include -+#include - #include - #include - #include
---- evolution-2.10.1/addressbook/gui/widgets/e-minicard.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-minicard.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/widgets/e-minicard-label.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-label.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/widgets/e-minicard-view.c.use-glib-i18n 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/widgets/e-minicard-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include "a11y/addressbook/ea-addressbook.h" - ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-quick-add.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-address.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-editor/eab-editor.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/eab-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - - #include "eab-editor.h" - #include "addressbook/gui/widgets/eab-gui-util.h" ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-im.c.use-glib-i18n 2007-04-09 09:07:40.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-04-30 13:06:43.000000000 -0400 -@@ -22,7 +22,7 @@ - #include - #include "e-contact-editor-im.h" - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/composer/e-msg-composer.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/composer/e-msg-composer.c 2007-04-30 13:06:43.000000000 -0400 -@@ -63,7 +63,7 @@ - - #include - #include --#include -+#include - #include - #include - ---- evolution-2.10.1/composer/e-msg-composer-select-file.c.use-glib-i18n 2007-04-09 09:09:32.000000000 -0400 -+++ evolution-2.10.1/composer/e-msg-composer-select-file.c 2007-04-30 13:06:43.000000000 -0400 -@@ -41,7 +41,7 @@ - #endif - - #include --#include -+#include - - #include "e-msg-composer-select-file.h" - #include ---- evolution-2.10.1/composer/e-msg-composer-hdrs.c.use-glib-i18n 2007-04-09 09:09:32.000000000 -0400 -+++ evolution-2.10.1/composer/e-msg-composer-hdrs.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/shell/e-shell-window.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-window.c 2007-04-30 13:06:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include - #include - --#include -+#include - #include - - #include ---- evolution-2.10.1/shell/e-shell-utils.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - - #include --#include -+#include - - #include "e-util/e-util-private.h" - ---- evolution-2.10.1/shell/e-shell.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell.c 2007-04-30 13:06:43.000000000 -0400 -@@ -44,7 +44,7 @@ - #undef interface - #endif - --#include -+#include - #include - - #include ---- evolution-2.10.1/shell/e-shell-folder-title-bar.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-folder-title-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - - #include "misc/e-clipped-label.h" ---- evolution-2.10.1/shell/e-shell-settings-dialog.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-settings-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -148,9 +148,9 @@ - { - EShellSettingsDialogPrivate *priv; - Bonobo_ServerInfoList *control_list; -+ const gchar * const *language_names; - CORBA_Environment ev; -- const GList *l; -- GSList *language_list; -+ GSList *languages = NULL; - GList *page_list; - GList *p; - int i, j; -@@ -168,10 +168,9 @@ - - CORBA_exception_free (&ev); - -- /* Great, one uses GList the other GSList (!) */ -- l = gnome_i18n_get_language_list("LC_MESSAGES"); -- for (language_list=NULL;l;l=l->next) -- language_list = g_slist_append(language_list, l->data); -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) -+ languages = g_list_append (languages, *language_names++); - - page_list = NULL; - for (i = 0; i < control_list->_length; i ++) { -@@ -189,8 +188,8 @@ - - info = & control_list->_buffer[i]; - -- title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", language_list); -- description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", language_list); -+ title = bonobo_server_info_prop_lookup (info, "evolution2:config_item:title", languages); -+ description = bonobo_server_info_prop_lookup (info, "evolution2:config_item:description", languages); - icon_path = bonobo_server_info_prop_lookup (info, "evolution2:config_item:icon_name", NULL); - type = bonobo_server_info_prop_find (info, "evolution2:config_item:type"); - priority_string = bonobo_server_info_prop_lookup (info, "evolution2:config_item:priority", NULL); -@@ -232,7 +231,7 @@ - - CORBA_exception_free (&ev); - } -- g_slist_free(language_list); -+ g_slist_free(languages); - - page_list = sort_page_list (page_list); - for (p = page_list, i = 0; p != NULL; p = p->next, i++) { ---- evolution-2.10.1/shell/e-user-creatable-items-handler.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-user-creatable-items-handler.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/shell/main.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/shell/main.c 2007-04-30 13:06:43.000000000 -0400 -@@ -55,7 +55,7 @@ - #include - #include - --#include -+#include - #include - #include - #include ---- evolution-2.10.1/shell/evolution-shell-component-utils.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/evolution-shell-component-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include "e-util/e-dialog-utils.h" - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/shell/e-shell-window-commands.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-window-commands.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - #include - - #include --#include -+#include - #include - - #include -@@ -611,10 +611,11 @@ - { - char *quickref; - GnomeVFSMimeApplication *app; -- const GList *lang_list = gnome_i18n_get_language_list ("LC_MESSAGES"); -+ const gchar * const *language_names; - -- for (; lang_list != NULL; lang_list = lang_list->next) { -- const char *lang = lang_list->data; -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) { -+ const gchar *lang = *language_names++; - - /* This has to be a valid language AND a language with - * no encoding postfix. The language will come up without ---- evolution-2.10.1/shell/e-component-registry.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-component-registry.c 2007-04-30 13:06:43.000000000 -0400 -@@ -28,7 +28,7 @@ - - #include - --#include -+#include - - #include - #include -@@ -146,8 +146,9 @@ - query_components (EComponentRegistry *registry) - { - Bonobo_ServerInfoList *info_list; -+ const gchar * const *language_names; - CORBA_Environment ev; -- GSList *language_list; -+ GSList *languages = NULL; - const GList *l; - char *query; - int i; -@@ -170,9 +171,9 @@ - return; - } - -- l = gnome_i18n_get_language_list("LC_MESSAGES"); -- for (language_list=NULL;l;l=l->next) -- language_list = g_slist_append(language_list, l->data); -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) -+ languages = g_slist_append (languages, *language_names++); - - for (i = 0; i < info_list->_length; i++) { - const char *id; -@@ -200,13 +201,13 @@ - continue; - } - -- label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", language_list); -+ label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_label", languages); - -- tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", language_list); -+ tooltips = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:button_tooltips", languages); - -- menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", language_list); -+ menu_label = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_label", languages); - -- menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", language_list); -+ menu_accelerator = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:menu_accelerator", languages); - - alias = bonobo_server_info_prop_lookup (& info_list->_buffer[i], "evolution:component_alias", NULL); - -@@ -235,7 +236,7 @@ - g_object_unref (menuicon); - bonobo_object_release_unref(iface, NULL); - } -- g_slist_free(language_list); -+ g_slist_free(languages); - - CORBA_free (info_list); - CORBA_exception_free (&ev); ---- evolution-2.10.1/shell/e-shell-importer.c.use-glib-i18n 2007-04-09 09:07:48.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-importer.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - - #include - --#include -+#include - - #include - #include ---- evolution-2.10.1/calendar/gui/print.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/print.c 2007-04-30 13:06:43.000000000 -0400 -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/calendar-view-factory.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/calendar-view-factory.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include "calendar-view-factory.h" - #include "calendar-view.h" - ---- evolution-2.10.1/calendar/gui/itip-utils.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/itip-utils.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/alarm-notify/util.c.use-glib-i18n 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/util.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #include - #endif - --#include -+#include - #include - #include - #include "config-data.h" ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-04-30 13:06:43.000000000 -0400 -@@ -43,7 +43,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify-dialog.c.use-glib-i18n 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #if 0 - # include - #endif ---- evolution-2.10.1/calendar/gui/alarm-notify/notify-main.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/notify-main.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-itip-control.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-itip-control.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-day-view-top-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-day-view-top-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #endif - - #include --#include -+#include - #include "e-util/e-categories-config.h" - #include - #include ---- evolution-2.10.1/calendar/gui/e-meeting-time-sel-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-meeting-time-sel-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -34,7 +34,7 @@ - - #include - #include --#include -+#include - #include "calendar-config.h" - #include "e-meeting-time-sel-item.h" - #include "e-meeting-time-sel.h" ---- evolution-2.10.1/calendar/gui/e-meeting-list-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-meeting-list-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/tasks-control.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/tasks-control.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cal-model-calendar.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-model-calendar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include "e-cal-model-calendar.h" - #include "e-cell-date-edit-text.h" - #include "itip-utils.h" ---- evolution-2.10.1/calendar/gui/dialogs/memo-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/memo-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/task-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/task-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/alarm-list-dialog.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/alarm-list-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "e-util/e-dialog-widgets.h" ---- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -34,7 +34,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/recurrence-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/recurrence-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -39,7 +39,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/event-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/event-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "common/authentication.h" ---- evolution-2.10.1/calendar/gui/dialogs/task-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/task-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - #include --#include -+#include - - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/calendar-setup.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/calendar-setup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "calendar-setup.h" ---- evolution-2.10.1/calendar/gui/dialogs/recur-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/recur-comp.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include "recur-comp.h" - ---- evolution-2.10.1/calendar/gui/dialogs/delete-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/delete-comp.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - #include --#include -+#include - #include - #include "e-util/e-error.h" - #include "../calendar-config.h" ---- evolution-2.10.1/calendar/gui/dialogs/comp-editor-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include "comp-editor-page.h" ---- evolution-2.10.1/calendar/gui/dialogs/delete-error.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/delete-error.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "delete-error.h" ---- evolution-2.10.1/calendar/gui/dialogs/task-details-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/task-details-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/cal-attachment-select-file.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/cal-attachment-select-file.c 2007-04-30 13:06:43.000000000 -0400 -@@ -45,7 +45,7 @@ - #endif - - #include --#include -+#include - - #include "cal-attachment-select-file.h" - #include ---- evolution-2.10.1/calendar/gui/dialogs/event-editor.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/event-editor.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/cancel-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/cancel-comp.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "e-util/e-error.h" ---- evolution-2.10.1/calendar/gui/dialogs/comp-editor-util.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor-util.c 2007-04-30 13:06:43.000000000 -0400 -@@ -27,7 +27,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/cal-prefs-dialog.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/cal-prefs-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - - static const int week_start_day_map[] = { ---- evolution-2.10.1/calendar/gui/dialogs/schedule-page.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/schedule-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/dialogs/changed-comp.c.use-glib-i18n 2007-04-09 09:10:28.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/changed-comp.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "changed-comp.h" ---- evolution-2.10.1/calendar/gui/dialogs/memo-page.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/memo-page.c 2007-04-30 13:06:43.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-meeting-time-sel.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-meeting-time-sel.c 2007-04-30 13:06:43.000000000 -0400 -@@ -51,7 +51,7 @@ - #include - #include - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/calendar/gui/calendar-commands.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/calendar-commands.c 2007-04-30 13:06:43.000000000 -0400 -@@ -47,7 +47,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/memos-control.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/memos-control.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/misc.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/misc.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #include - #include - #include --#include "e-util/e-i18n.h" -+#include - - #include "misc.h" - ---- evolution-2.10.1/calendar/gui/e-cal-model-tasks.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-model-tasks.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include "calendar-config.h" - #include "e-cal-model-tasks.h" ---- evolution-2.10.1/calendar/gui/e-calendar-view.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-calendar-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cell-date-edit-text.c.use-glib-i18n 2007-04-09 09:10:34.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cell-date-edit-text.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-timezone-entry.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-timezone-entry.c 2007-04-30 13:06:43.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include "e-timezone-entry.h" - #include - ---- evolution-2.10.1/calendar/gui/e-alarm-list.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-alarm-list.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-day-view.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-day-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -46,7 +46,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cal-model.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-model.c 2007-04-30 13:06:43.000000000 -0400 -@@ -24,7 +24,7 @@ - - #include - #include --#include -+#include - #include - #include - #include "comp-util.h" ---- evolution-2.10.1/calendar/gui/weekday-picker.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/weekday-picker.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "weekday-picker.h" ---- evolution-2.10.1/calendar/gui/e-week-view.c.use-glib-i18n 2007-04-30 13:06:42.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-week-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -41,7 +41,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cal-model-memos.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-model-memos.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #endif - - #include --#include -+#include - #include "e-cal-model-memos.h" - #include "e-cell-date-edit-text.h" - #include "misc.h" ---- evolution-2.10.1/calendar/gui/main.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/main.c 2007-04-30 13:06:43.000000000 -0400 -@@ -25,7 +25,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/cal-search-bar.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/cal-search-bar.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-day-view-time-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-day-view-time-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include "e-day-view-time-item.h" - #include "calendar-config.h" ---- evolution-2.10.1/calendar/gui/e-cal-popup.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-popup.c 2007-04-30 13:06:43.000000000 -0400 -@@ -39,7 +39,7 @@ - #include - #include - #include "e-util/e-util.h" --#include "e-util/e-i18n.h" -+#include - #include "e-util/e-mktemp.h" - #include "e-util/e-dialog-utils.h" - ---- evolution-2.10.1/calendar/gui/e-meeting-store.c.use-glib-i18n 2007-04-30 13:06:43.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-meeting-store.c 2007-04-30 13:06:43.000000000 -0400 -@@ -26,7 +26,7 @@ - #endif - - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-week-view-main-item.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-week-view-main-item.c 2007-04-30 13:06:43.000000000 -0400 -@@ -32,7 +32,7 @@ - - #include - #include --#include -+#include - #include "e-week-view-main-item.h" - #include "ea-calendar.h" - ---- evolution-2.10.1/calendar/gui/gnome-cal.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/gnome-cal.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/calendar/gui/e-cal-list-view.c.use-glib-i18n 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/e-cal-list-view.c 2007-04-30 13:06:43.000000000 -0400 -@@ -50,7 +50,7 @@ - #include
- #include - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/smime/lib/e-cert-db.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 -+++ evolution-2.10.1/smime/lib/e-cert-db.c 2007-04-30 13:06:43.000000000 -0400 -@@ -90,7 +90,7 @@ - #include "e-util/e-dialog-utils.h" - #include "e-util/e-util-private.h" - #include --#include -+#include - #include - #include - #include ---- evolution-2.10.1/smime/lib/e-cert.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 -+++ evolution-2.10.1/smime/lib/e-cert.c 2007-04-30 13:06:43.000000000 -0400 -@@ -62,7 +62,7 @@ - - #include - --#include -+#include - #include - #include /* for e_utf8_strftime, what about e_time_format_time? */ - ---- evolution-2.10.1/smime/lib/e-pkcs12.c.use-glib-i18n 2007-04-09 09:07:58.000000000 -0400 -+++ evolution-2.10.1/smime/lib/e-pkcs12.c 2007-04-30 13:06:43.000000000 -0400 -@@ -63,7 +63,7 @@ - #include - #include - #include --#include -+#include - #include - - #include ---- evolution-2.10.1/smime/gui/certificate-viewer.c.use-glib-i18n 2007-04-09 09:07:55.000000000 -0400 -+++ evolution-2.10.1/smime/gui/certificate-viewer.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - - #include - --#include -+#include - #include - - #include "e-util/e-util-private.h" ---- evolution-2.10.1/smime/gui/certificate-manager.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 -+++ evolution-2.10.1/smime/gui/certificate-manager.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - --#include -+#include - - #include - #include "evolution-config-control.h" ---- evolution-2.10.1/smime/gui/e-cert-selector.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 -+++ evolution-2.10.1/smime/gui/e-cert-selector.c 2007-04-30 13:06:43.000000000 -0400 -@@ -23,7 +23,7 @@ - #include - #endif - --#include -+#include - - #include - #include ---- evolution-2.10.1/smime/gui/cert-trust-dialog.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 -+++ evolution-2.10.1/smime/gui/cert-trust-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -36,7 +36,7 @@ - #include - #include - --#include -+#include - #include - - #include "e-util/e-util-private.h" ---- evolution-2.10.1/smime/gui/component.c.use-glib-i18n 2007-04-09 09:07:56.000000000 -0400 -+++ evolution-2.10.1/smime/gui/component.c 2007-04-30 13:06:43.000000000 -0400 -@@ -29,7 +29,7 @@ - - #include - --#include -+#include - #include - - #include "ca-trust-dialog.h" ---- evolution-2.10.1/smime/gui/ca-trust-dialog.c.use-glib-i18n 2007-04-09 09:07:55.000000000 -0400 -+++ evolution-2.10.1/smime/gui/ca-trust-dialog.c 2007-04-30 13:06:43.000000000 -0400 -@@ -30,7 +30,7 @@ - - #include - --#include -+#include - #include - - #include "e-util/e-util-private.h" ---- evolution-2.10.1/tools/killev.c.use-glib-i18n 2007-04-09 09:07:44.000000000 -0400 -+++ evolution-2.10.1/tools/killev.c 2007-04-30 13:06:43.000000000 -0400 -@@ -31,7 +31,7 @@ - - #include - #include --#include -+#include - #include - - typedef struct { -@@ -39,7 +39,7 @@ - GPtrArray *names; - } KillevComponent; - --static GSList *languages; -+static GSList *languages = NULL; - static GHashTable *components; - - static gboolean -@@ -186,7 +186,7 @@ - int - main (int argc, char **argv) - { -- const GList *l; -+ const gchar * const *language_names; - - bindtextdomain (GETTEXT_PACKAGE, EVOLUTION_LOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); -@@ -196,9 +196,9 @@ - GNOME_PROGRAM_STANDARD_PROPERTIES, - NULL); - -- l = gnome_i18n_get_language_list("LC_MESSAGES"); -- for (languages=NULL;l;l=l->next) -- languages = g_slist_append(languages, l->data); -+ language_names = g_get_language_names (); -+ while (*language_names != NULL) -+ languages = g_slist_append (languages, *language_names++); - - components = g_hash_table_new (g_str_hash, g_str_equal); - diff --git a/evolution-2.10.1-e-attachment-bar.patch b/evolution-2.10.1-e-attachment-bar.patch deleted file mode 100644 index fdea03a..0000000 --- a/evolution-2.10.1-e-attachment-bar.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.10.1/widgets/misc/e-attachment-bar.c.e-attachment-bar 2007-05-01 11:22:41.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-attachment-bar.c 2007-05-01 15:10:49.000000000 -0400 -@@ -491,6 +491,8 @@ - g_ptr_array_free (temp_arr, TRUE); - - update (bar); -+ -+ g_signal_emit (bar, signals[CHANGED], 0); - - id++; - diff --git a/evolution-2.10.1-en_CA-attribution-format.patch b/evolution-2.10.1-en_CA-attribution-format.patch deleted file mode 100644 index 663d243..0000000 --- a/evolution-2.10.1-en_CA-attribution-format.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.10.1/po/en_CA.po.en_CA-attribution-format 2007-04-27 22:58:06.000000000 -0400 -+++ evolution-2.10.1/po/en_CA.po 2007-04-27 22:58:36.000000000 -0400 -@@ -10992,7 +10992,7 @@ - "On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " - "${TimeZone}, ${Sender} wrote:" - msgstr "" --"On ${AbbrevWeekdayName}, ${Year}-${Day}-${Month} at ${24Hour}:${Minute} " -+"On ${AbbrevWeekdayName}, ${Year}-${Month}-${Day} at ${24Hour}:${Minute} " - "${TimeZone}, ${Sender} wrote:" - - #: ../mail/em-filter-editor.c:155 diff --git a/evolution-2.10.1-fix-uri-handling.patch b/evolution-2.10.1-fix-uri-handling.patch deleted file mode 100644 index 53fbe39..0000000 --- a/evolution-2.10.1-fix-uri-handling.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- evolution-2.10.1/calendar/gui/GNOME_Evolution_Calendar.server.in.in.fix-uri-handling 2007-04-09 09:10:33.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/GNOME_Evolution_Calendar.server.in.in 2007-05-14 14:11:59.000000000 -0400 -@@ -50,9 +50,11 @@ - - - -+ - - - diff --git a/evolution-2.10.1-saving-attachments.patch b/evolution-2.10.1-saving-attachments.patch deleted file mode 100644 index 1f591f5..0000000 --- a/evolution-2.10.1-saving-attachments.patch +++ /dev/null @@ -1,218 +0,0 @@ ---- evolution-2.10.1/mail/em-utils.c.saving-attachments 2007-04-14 14:25:40.000000000 -0400 -+++ evolution-2.10.1/mail/em-utils.c 2007-04-14 15:08:50.000000000 -0400 -@@ -354,28 +354,23 @@ - - /* Saving messages... */ - --static void --emu_save_part_response(GtkWidget *filesel, int response, CamelMimePart *part) -+static const gchar * -+emu_save_get_filename_for_part (CamelMimePart *part) - { -- char *uri; -- -- if (response == GTK_RESPONSE_OK) { -- uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (filesel)); -+ const gchar *filename; - -- if (!e_file_can_save((GtkWindow *)filesel, uri)) { -- g_free(uri); -- return; -- } -- -- e_file_update_save_path(gtk_file_chooser_get_current_folder_uri( -- GTK_FILE_CHOOSER(filesel)), TRUE); -- /* FIXME: popup error if it fails? */ -- mail_save_part(part, uri, NULL, NULL, FALSE); -- g_free(uri); -+ filename = camel_mime_part_get_filename (part); -+ if (filename == NULL) { -+ if (CAMEL_IS_MIME_MESSAGE (part)) { -+ filename = camel_mime_message_get_subject ( -+ CAMEL_MIME_MESSAGE (part)); -+ if (filename == NULL) -+ filename = _("message"); -+ } else -+ filename = _("attachment"); - } - -- gtk_widget_destroy((GtkWidget *)filesel); -- camel_object_unref(part); -+ return filename; - } - - /** -@@ -387,83 +382,78 @@ - * Saves a mime part to disk (prompting the user for filename). - **/ - void --em_utils_save_part(GtkWidget *parent, const char *prompt, CamelMimePart *part) -+em_utils_save_part (GtkWidget *parent, const char *prompt, CamelMimePart *part) - { -- const char *name; -- GtkWidget *filesel; -+ GtkWidget *file_chooser; -+ const gchar *filename; -+ gchar *uri = NULL; - -- name = camel_mime_part_get_filename(part); -- if (name == NULL) { -- if (CAMEL_IS_MIME_MESSAGE(part)) { -- name = camel_mime_message_get_subject((CamelMimeMessage *)part); -- if (name == NULL) -- name = _("message"); -- } else { -- name = _("attachment"); -- } -+ filename = emu_save_get_filename_for_part (part); -+ -+ file_chooser = e_file_get_save_filesel ( -+ parent, prompt, filename, GTK_FILE_CHOOSER_ACTION_SAVE); -+ -+ if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK) -+ goto exit; -+ -+ uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser)); -+ -+ /* XXX Would be nice to mention _why_ we can't save. */ -+ if (!e_file_can_save (GTK_WINDOW (file_chooser), uri)) { -+ g_warning ("Unable to save %s", uri); -+ goto exit; - } - -- filesel = e_file_get_save_filesel(parent, prompt, name, GTK_FILE_CHOOSER_ACTION_SAVE); -- camel_object_ref(part); -- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_part_response), part); -- gtk_widget_show (filesel); -+ e_file_update_save_path ( -+ gtk_file_chooser_get_current_folder_uri ( -+ GTK_FILE_CHOOSER (file_chooser)), TRUE); -+ -+ mail_save_part (part, uri, NULL, NULL, FALSE); -+ -+exit: -+ gtk_widget_destroy (file_chooser); -+ g_free (uri); - } - --static void --emu_save_parts_response (GtkWidget *filesel, int response, GSList *parts) -+void -+em_utils_save_parts (GtkWidget *parent, const gchar *prompt, GSList *parts) - { -- GSList *selected; -- char *uri = NULL; -- if (response == GTK_RESPONSE_OK) { -- uri = gtk_file_chooser_get_current_folder_uri(GTK_FILE_CHOOSER (filesel)); -- e_file_update_save_path(uri, FALSE); -- -- for ( selected = parts; selected != NULL; selected = selected->next) { -- const char *file_name; -- char *safe_name = NULL; -- char *file_path; -- CamelMimePart *part = selected->data; -- -- file_name = camel_mime_part_get_filename(part); -- if (file_name == NULL) { -- if (CAMEL_IS_MIME_MESSAGE(part)) { -- file_name = camel_mime_message_get_subject((CamelMimeMessage *)part); -- if (file_name == NULL) -- file_name = _("message"); -- } else { -- file_name = _("attachment"); -- } -- } else { -- safe_name = g_strdup(file_name); -- em_filename_make_safe(safe_name); -- file_name = safe_name; -- } -- -- file_path = g_build_filename (uri, file_name, NULL); -- if (!e_file_check_local(file_path) || !g_file_test(file_path, (G_FILE_TEST_EXISTS)) || e_error_run(NULL, E_ERROR_ASK_FILE_EXISTS_OVERWRITE, file_name, NULL) == GTK_RESPONSE_OK) -- mail_save_part(part, file_path, NULL, NULL, FALSE); -- else -- g_warning ("Could not save %s. File already exists", file_path); -+ GtkWidget *file_chooser; -+ gchar *path_uri; -+ GSList *iter; -+ -+ file_chooser = e_file_get_save_filesel ( -+ parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); -+ -+ if (gtk_dialog_run (GTK_DIALOG (file_chooser)) != GTK_RESPONSE_OK) -+ goto exit; -+ -+ path_uri = gtk_file_chooser_get_uri (GTK_FILE_CHOOSER (file_chooser)); -+ -+ e_file_update_save_path (path_uri, FALSE); - -- g_free (file_path); -- g_free (safe_name); -- } -+ for (iter = parts; iter != NULL; iter = iter->next) { -+ CamelMimePart *part = iter->data; -+ const gchar *filename; -+ gchar *uri; -+ -+ filename = emu_save_get_filename_for_part (part); -+ -+ uri = g_build_path ("/", path_uri, filename, NULL); -+ -+ /* XXX Would be nice to mention _why_ we can't save. */ -+ if (e_file_can_save (GTK_WINDOW (file_chooser), uri)) -+ mail_save_part (part, uri, NULL, NULL, FALSE); -+ else -+ g_warning ("Unable to save %s", uri); - - g_free (uri); -- } -- -- g_slist_free (parts); -- gtk_widget_destroy((GtkWidget *)filesel); --} -+ } - --void --em_utils_save_parts (GtkWidget *parent, const char *prompt, GSList * parts) --{ -- GtkWidget *filesel; -+ g_free (path_uri); - -- filesel = e_file_get_save_filesel (parent, prompt, NULL, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER); -- g_signal_connect (filesel, "response", G_CALLBACK (emu_save_parts_response), parts); -- gtk_widget_show (filesel); -+exit: -+ gtk_widget_destroy (file_chooser); - } - - ---- evolution-2.10.1/mail/em-format-html-display.c.saving-attachments 2007-04-14 14:25:40.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html-display.c 2007-04-14 15:08:50.000000000 -0400 -@@ -2099,12 +2099,24 @@ - } - - static void --attachments_save_all_clicked(GtkWidget *w, EMFormatHTMLDisplay *efhd) -+attachments_save_all_clicked (GtkWidget *widget, EMFormatHTMLDisplay *efhd) - { - GSList *attachment_parts; -+ guint n_attachment_parts; - -- attachment_parts = e_attachment_bar_get_parts(E_ATTACHMENT_BAR(efhd->priv->attachment_bar)); -- em_utils_save_parts(w, _("Select folder to save all attachments..."), attachment_parts); -+ attachment_parts = e_attachment_bar_get_parts ( -+ E_ATTACHMENT_BAR (efhd->priv->attachment_bar)); -+ n_attachment_parts = g_slist_length (attachment_parts); -+ g_return_if_fail (n_attachment_parts > 0); -+ -+ if (n_attachment_parts == 1) -+ em_utils_save_part ( -+ widget, _("Save attachment as"), -+ attachment_parts->data); -+ else -+ em_utils_save_parts ( -+ widget, _("Select folder to save all attachments"), -+ attachment_parts); - } - - static void diff --git a/evolution-2.10.1-send-recv-dialog.patch b/evolution-2.10.1-send-recv-dialog.patch index 3f26184..e8fb570 100644 --- a/evolution-2.10.1-send-recv-dialog.patch +++ b/evolution-2.10.1-send-recv-dialog.patch @@ -1,10 +1,10 @@ ---- evolution-2.10.1/mail/mail-send-recv.c.send-recv-dialog 2007-05-15 14:26:24.000000000 -0400 -+++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-15 14:30:51.000000000 -0400 -@@ -312,21 +312,6 @@ +--- evolution-2.11.2/mail/mail-send-recv.c.send-recv-dialog 2007-05-18 16:03:24.000000000 -0400 ++++ evolution-2.11.2/mail/mail-send-recv.c 2007-05-18 16:08:58.000000000 -0400 +@@ -362,23 +362,6 @@ return SEND_INVALID; } --gboolean +-static gboolean -dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table) -{ - int h, w; @@ -16,66 +16,82 @@ - w = 750; - if (h > 400) - h = 400; -- gtk_widget_set_usize (window, w, h); +- gtk_widget_set_size_request (window, w, h); +- +- return FALSE; -} - static struct _send_data * build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination) { -@@ -385,7 +370,7 @@ - +@@ -444,7 +427,7 @@ scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), -- GTK_POLICY_AUTOMATIC, -+ GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); + gtk_scrolled_window_set_policy ( + GTK_SCROLLED_WINDOW (scrolled_window), +- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); ++ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolled_window), table); -@@ -443,6 +428,7 @@ - recv_icon = e_icon_factory_get_image ("stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); + gtk_scrolled_window_add_with_viewport ( + GTK_SCROLLED_WINDOW (scrolled_window), table); +@@ -504,6 +487,8 @@ + "stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (source->url, account->name); - label = (GtkLabel *)gtk_label_new (NULL); -+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); - gtk_label_set_markup (label, pretty_url); + label = gtk_label_new (NULL); ++ gtk_label_set_ellipsize ( ++ GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_label_set_markup (GTK_LABEL (label), pretty_url); g_free (pretty_url); -@@ -457,10 +443,10 @@ - gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); +@@ -522,16 +507,16 @@ -- gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_table_attach (table, (GtkWidget *)recv_icon, 0, 1, row, row+2, 0, 0, 0, 0); - gtk_table_attach (table, (GtkWidget *)label, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_table_attach (table, (GtkWidget *)bar, 2, 3, row, row+2, 0, 0, 0, 0); -+ gtk_table_attach (table, (GtkWidget *)stop, 3, 4, row, row+2, 0, 0, 0, 0); - gtk_table_attach (table, (GtkWidget *)status_label, 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); - - info->bar = bar; -@@ -496,6 +482,7 @@ - send_icon = e_icon_factory_get_image ("stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); + gtk_table_attach ( + GTK_TABLE (table), recv_icon, +- 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 0, 1, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), label, + 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), progress_bar, +- 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 2, 3, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), cancel_button, +- 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 3, 4, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), status_label, + 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); +@@ -572,6 +557,8 @@ + "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); pretty_url = format_url (destination, NULL); - label = (GtkLabel *)gtk_label_new (NULL); -+ gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END); - gtk_label_set_markup (label, pretty_url); + label = gtk_label_new (NULL); ++ gtk_label_set_ellipsize ( ++ GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_label_set_markup (GTK_LABEL (label), pretty_url); g_free (pretty_url); -@@ -508,10 +495,10 @@ - gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); +@@ -587,16 +574,16 @@ -- gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_table_attach (table, GTK_WIDGET (send_icon), 0, 1, row, row+2, 0, 0, 0, 0); - gtk_table_attach (table, GTK_WIDGET (label), 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_table_attach (table, GTK_WIDGET (bar), 2, 3, row, row+2, 0, 0, 0, 0); -+ gtk_table_attach (table, GTK_WIDGET (stop), 3, 4, row, row+2, 0, 0, 0, 0); - gtk_table_attach (table, GTK_WIDGET (status_label), 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); - - info->bar = bar; -@@ -526,7 +513,6 @@ + gtk_table_attach ( + GTK_TABLE (table), send_icon, +- 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 0, 1, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), label, + 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), progress_bar, +- 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 2, 3, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), cancel_button, +- 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); ++ 3, 4, row, row+2, 0, 0, 0, 0); + gtk_table_attach ( + GTK_TABLE (table), status_label, + 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); +@@ -615,7 +602,6 @@ gtk_widget_show (GTK_WIDGET (gd)); g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data); diff --git a/evolution-2.7.3-filter-datespec.patch b/evolution-2.7.3-filter-datespec.patch deleted file mode 100644 index 000adb1..0000000 --- a/evolution-2.7.3-filter-datespec.patch +++ /dev/null @@ -1,178 +0,0 @@ -diff -ur evolution-2.7.3/filter/filter-datespec.c my-evolution-2.7.3/filter/filter-datespec.c ---- evolution-2.7.3/filter/filter-datespec.c 2005-08-09 17:29:27.000000000 -0600 -+++ my-evolution-2.7.3/filter/filter-datespec.c 2006-06-28 20:51:01.000000000 -0600 -@@ -61,8 +61,10 @@ - - typedef struct _timespan { - guint32 seconds; -- const char *singular; -- const char *plural; -+ const char *past_singular; -+ const char *past_plural; -+ const char *future_singular; -+ const char *future_plural; - float max; - } timespan; - -@@ -75,13 +77,13 @@ - #define ngettext(a, b) a, b - - static const timespan timespans[] = { -- { 1, ngettext("1 second ago", "%d seconds ago"), 59.0 }, -- { 60, ngettext("1 minute ago", "%d minutes ago"), 59.0 }, -- { 3600, ngettext("1 hour ago", "%d hours ago"), 23.0 }, -- { 86400, ngettext("1 day ago", "%d days ago"), 31.0 }, -- { 604800, ngettext("1 week ago", "%d weeks ago"), 52.0 }, -- { 2419200, ngettext("1 month ago", "%d months ago"), 12.0 }, -- { 31557600, ngettext("1 year ago", "%d years ago"), 1000.0 }, -+ { 1, ngettext("1 second ago", "%d seconds ago"), ngettext("1 second in the future", "%d seconds in the future"), 59.0 }, -+ { 60, ngettext("1 minute ago", "%d minutes ago"), ngettext("1 minute in the future", "%d minutes in the future"), 59.0 }, -+ { 3600, ngettext("1 hour ago", "%d hours ago"), ngettext("1 hour in the future", "%d hours in the future"), 23.0 }, -+ { 86400, ngettext("1 day ago", "%d days ago"), ngettext("1 day in the future", "%d days in the future"), 31.0 }, -+ { 604800, ngettext("1 week ago", "%d weeks ago"), ngettext("1 week in the future", "%d weeks in the future"), 52.0 }, -+ { 2419200, ngettext("1 month ago", "%d months ago"), ngettext("1 month in the future", "%d months in the future"), 12.0 }, -+ { 31557600, ngettext("1 year ago", "%d years ago"), ngettext("1 year in the future", "%d years in the future"), 1000.0 }, - }; - - /* now we let the compiler see the real function call */ -@@ -92,7 +94,7 @@ - - struct _FilterDatespecPrivate { - GtkWidget *label_button; -- GtkWidget *notebook_type, *option_type, *calendar_specify, *spin_relative, *option_relative; -+ GtkWidget *notebook_type, *option_type, *calendar_specify, *spin_relative, *option_relative, *option_past_future; - FilterDatespec_type type; - int span; - }; -@@ -264,7 +266,7 @@ - get_best_span (time_t val) - { - int i; -- -+ - for (i=N_TIMESPANS-1;i>=0;i--) { - if (val % timespans[i].seconds == 0) - return i; -@@ -302,8 +304,18 @@ - - span = get_best_span(fds->value); - count = fds->value / timespans[span].seconds; -+ sprintf(buf, ngettext(timespans[span].past_singular, timespans[span].past_plural, count), count); -+ } -+ break; -+ case FDST_X_FUTURE: -+ if (fds->value == 0) -+ label = _("now"); -+ else { -+ int span, count; - -- sprintf(buf, ngettext(timespans[span].singular, timespans[span].plural, count), count); -+ span = get_best_span(fds->value); -+ count = fds->value / timespans[span].seconds; -+ sprintf(buf, ngettext(timespans[span].future_singular, timespans[span].future_plural, count), count); - } - break; - } -@@ -329,6 +341,7 @@ - fds->value = mktime(&tm); - /* what about timezone? */ - break; } -+ case FDST_X_FUTURE: - case FDST_X_AGO: { - int val; - -@@ -349,6 +362,8 @@ - struct _FilterDatespecPrivate *p = PRIV(fds); - - p->type = fds->type==FDST_UNKNOWN ? FDST_NOW : fds->type; -+ -+ int note_type = fds->type==FDST_X_FUTURE ? FDST_X_AGO : fds->type; // FUTURE and AGO use the same notebook pages/etc. - - switch (p->type) { - case FDST_NOW: -@@ -368,11 +383,18 @@ - p->span = get_best_span(fds->value); - gtk_spin_button_set_value((GtkSpinButton*)p->spin_relative, fds->value/timespans[p->span].seconds); - gtk_option_menu_set_history((GtkOptionMenu*)p->option_relative, p->span); -+ gtk_option_menu_set_history((GtkOptionMenu*)p->option_past_future, 0); -+ break; -+ case FDST_X_FUTURE: -+ p->span = get_best_span(fds->value); -+ gtk_spin_button_set_value((GtkSpinButton*)p->spin_relative, fds->value/timespans[p->span].seconds); -+ gtk_option_menu_set_history((GtkOptionMenu*)p->option_relative, p->span); -+ gtk_option_menu_set_history((GtkOptionMenu*)p->option_past_future, 1); - break; - } - -- gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, p->type); -- gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, p->type); -+ gtk_notebook_set_current_page ((GtkNotebook*) p->notebook_type, note_type); -+ gtk_option_menu_set_history ((GtkOptionMenu*) p->option_type, note_type); - } - - -@@ -397,6 +419,18 @@ - } - - static void -+set_option_past_future (GtkMenu *menu, FilterDatespec *fds) -+{ -+ GtkWidget *w; -+ -+ w = gtk_menu_get_active (menu); -+ if(g_list_index (GTK_MENU_SHELL (menu)->children, w) == 0) -+ fds->type = fds->priv->type = FDST_X_AGO; -+ else -+ fds->type = fds->priv->type = FDST_X_FUTURE; -+} -+ -+static void - button_clicked (GtkButton *button, FilterDatespec *fds) - { - struct _FilterDatespecPrivate *p = PRIV(fds); -@@ -424,6 +458,7 @@ - p->calendar_specify = glade_xml_get_widget (gui, "calendar_specify"); - p->spin_relative = glade_xml_get_widget (gui, "spin_relative"); - p->option_relative = glade_xml_get_widget (gui, "option_relative"); -+ p->option_past_future = glade_xml_get_widget (gui, "option_past_future"); - - set_values (fds); - -@@ -431,6 +466,8 @@ - G_CALLBACK (set_option_type), fds); - g_signal_connect (GTK_OPTION_MENU (p->option_relative)->menu, "deactivate", - G_CALLBACK (set_option_relative), fds); -+ g_signal_connect (GTK_OPTION_MENU (p->option_past_future)->menu, "deactivate", -+ G_CALLBACK (set_option_past_future), fds); - - gtk_box_pack_start ((GtkBox *) dialog->vbox, toplevel, TRUE, TRUE, 3); - -@@ -486,5 +523,8 @@ - case FDST_X_AGO: - g_string_append_printf (out, "(- (get-current-date) %d)", (int) fds->value); - break; -+ case FDST_X_FUTURE: -+ g_string_append_printf (out, "(+ (get-current-date) %d)", (int) fds->value); -+ break; - } - } -diff -ur evolution-2.7.3/filter/filter-datespec.h my-evolution-2.7.3/filter/filter-datespec.h ---- evolution-2.7.3/filter/filter-datespec.h 2002-11-01 16:22:57.000000000 -0700 -+++ my-evolution-2.7.3/filter/filter-datespec.h 2006-06-28 17:25:55.000000000 -0600 -@@ -42,6 +42,7 @@ - FDST_NOW, - FDST_SPECIFIED, - FDST_X_AGO, -+ FDST_X_FUTURE, - } FilterDatespec_type; - - struct _FilterDatespec { -@@ -52,7 +53,7 @@ - - /* either a timespan, an absolute time, or 0 - * depending on type -- the above mapping to -- * (X_AGO, SPECIFIED, NOW) -+ * (X_FUTURE, X_AGO, SPECIFIED, NOW) - */ - - time_t value; diff --git a/evolution-2.8.0-fix-indic-printing.patch b/evolution-2.8.0-fix-indic-printing.patch index 226be93..7eb8585 100644 --- a/evolution-2.8.0-fix-indic-printing.patch +++ b/evolution-2.8.0-fix-indic-printing.patch @@ -1,25 +1,16 @@ ---- evolution-2.9.91/plugins/print-message/print-message.c.fix-indic-printing 2007-02-12 01:58:01.000000000 -0500 -+++ evolution-2.9.91/plugins/print-message/print-message.c 2007-02-12 13:30:17.000000000 -0500 -@@ -83,7 +83,7 @@ - data->config = e_print_load_settings (); - data->preview = 0; - -- data->msg = e_msg_composer_get_message (composer, 1); -+ data->msg = e_msg_composer_get_message_print (composer, 1); - dialog = (GtkDialog *)e_print_get_dialog_with_config (_("Print Message"), 0, data->config); - gtk_dialog_set_default_response(dialog, GTK_RESPONSE_OK); - e_dialog_set_transient_for ((GtkWindow *) dialog, (GtkWidget *) composer); -@@ -102,7 +102,7 @@ - data->config = e_print_load_settings (); - data->preview = 0; - -- data->msg = e_msg_composer_get_message (composer, 1); -+ data->msg = e_msg_composer_get_message_print (composer, 1); +--- evolution-2.11.2/plugins/print-message/print-message.c.fix-indic-printing 2007-05-13 13:41:09.000000000 -0400 ++++ evolution-2.11.2/plugins/print-message/print-message.c 2007-05-18 15:32:12.000000000 -0400 +@@ -65,7 +65,7 @@ + EMFormatHTMLPrint *efhp; - print_response(NULL, GTK_RESPONSE_APPLY, data); - } ---- evolution-2.9.91/composer/e-msg-composer.h.fix-indic-printing 2007-01-22 10:23:06.000000000 -0500 -+++ evolution-2.9.91/composer/e-msg-composer.h 2007-02-12 13:29:24.000000000 -0500 + action = GTK_PRINT_OPERATION_ACTION_PREVIEW; +- message = e_msg_composer_get_message (composer, 1); ++ message = e_msg_composer_get_message_print (composer, 1); + + efhp = em_format_html_print_new (NULL, action); + em_format_html_print_raw_message (efhp, message); +--- evolution-2.11.2/composer/e-msg-composer.h.fix-indic-printing 2007-04-18 06:17:34.000000000 -0400 ++++ evolution-2.11.2/composer/e-msg-composer.h 2007-05-18 15:30:56.000000000 -0400 @@ -101,6 +101,8 @@ CamelMimePart *part); CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer, @@ -29,9 +20,9 @@ CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer); void e_msg_composer_show_sig_file (EMsgComposer *composer); gboolean e_msg_composer_get_send_html (EMsgComposer *composer); ---- evolution-2.9.91/composer/e-msg-composer.c.fix-indic-printing 2007-02-12 13:29:24.000000000 -0500 -+++ evolution-2.9.91/composer/e-msg-composer.c 2007-02-12 13:29:24.000000000 -0500 -@@ -5267,6 +5267,49 @@ +--- evolution-2.11.2/composer/e-msg-composer.c.fix-indic-printing 2007-04-18 06:17:34.000000000 -0400 ++++ evolution-2.11.2/composer/e-msg-composer.c 2007-05-18 15:30:56.000000000 -0400 +@@ -5273,6 +5273,49 @@ } CamelMimeMessage * diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 1300292..be61226 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,6 +1,6 @@ ---- evolution-2.10.1/mail/mail-send-recv.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-send-recv.c 2007-05-16 16:17:38.000000000 -0400 -@@ -725,23 +725,22 @@ +--- evolution-2.11.2/mail/mail-send-recv.c.kill-ethread 2007-04-20 00:28:22.000000000 -0400 ++++ evolution-2.11.2/mail/mail-send-recv.c 2007-05-18 15:34:09.000000000 -0400 +@@ -778,23 +778,22 @@ /* ********************************************************************** */ struct _refresh_folders_msg { @@ -27,8 +27,8 @@ - struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; int i; CamelFolder *folder; - -@@ -757,17 +756,14 @@ + CamelException ex = CAMEL_EXCEPTION_INITIALISER; +@@ -812,17 +811,14 @@ } static void @@ -48,7 +48,7 @@ int i; for (i=0;ifolders->len;i++) -@@ -776,11 +772,12 @@ +@@ -831,11 +827,12 @@ camel_object_unref(m->store); } @@ -66,7 +66,7 @@ }; static void -@@ -813,13 +810,13 @@ +@@ -868,13 +865,13 @@ get_folders(store, folders, info); @@ -82,9 +82,9 @@ } else { receive_done ("", data); } ---- evolution-2.10.1/mail/mail-component.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-component.c 2007-05-16 16:17:38.000000000 -0400 -@@ -965,7 +965,7 @@ +--- evolution-2.11.2/mail/mail-component.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 ++++ evolution-2.11.2/mail/mail-component.c 2007-05-18 15:34:09.000000000 -0400 +@@ -1014,7 +1014,7 @@ if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -93,8 +93,8 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.10.1/mail/mail-ops.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-ops.c 2007-05-16 16:19:33.000000000 -0400 +--- evolution-2.11.2/mail/mail-ops.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-ops.c 2007-05-18 15:34:09.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -1464,7 +1464,7 @@ camel_object_ref(folder); m->uid = g_strdup(uid); @@ -1795,37 +1741,37 @@ - m->done = done; + m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); - e_thread_put(thread, (EMsg *)m); @@ -1514,7 +1514,7 @@ camel_object_ref(folder); m->uid = g_strdup(uid); @@ -1833,13 +1779,13 @@ - m->done = done; + m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); - e_thread_put(thread, (EMsg *)m); @@ -2142,8 +2142,8 @@ return id; } ---- evolution-2.10.1/mail/em-folder-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-utils.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-utils.c 2007-05-18 15:34:09.000000000 -0400 @@ -84,7 +84,7 @@ } @@ -2371,8 +2371,8 @@ return id; } ---- evolution-2.10.1/mail/importers/elm-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/elm-importer.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.2/mail/importers/elm-importer.c 2007-05-18 15:34:09.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2471,8 +2471,8 @@ return id; } ---- evolution-2.10.1/mail/importers/mail-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/mail-importer.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/importers/mail-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.2/mail/importers/mail-importer.c 2007-05-18 15:34:09.000000000 -0400 @@ -132,7 +132,7 @@ } @@ -2609,8 +2609,8 @@ } struct _import_folders_data { ---- evolution-2.10.1/mail/importers/pine-importer.c.kill-ethread 2007-04-09 09:09:26.000000000 -0400 -+++ evolution-2.10.1/mail/importers/pine-importer.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.2/mail/importers/pine-importer.c 2007-05-18 15:34:09.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2710,8 +2710,8 @@ return id; } ---- evolution-2.10.1/mail/mail-vfolder.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-vfolder.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-vfolder.c 2007-05-18 15:34:09.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -2946,9 +2946,9 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.10.1/mail/em-format-html.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html.c 2007-05-16 16:17:38.000000000 -0400 -@@ -166,7 +166,7 @@ +--- evolution-2.11.2/mail/em-format-html.c.kill-ethread 2007-04-20 00:28:22.000000000 -0400 ++++ evolution-2.11.2/mail/em-format-html.c 2007-05-18 15:34:09.000000000 -0400 +@@ -165,7 +165,7 @@ if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -2957,7 +2957,7 @@ efh->priv->format_timeout_msg = NULL; } -@@ -1180,7 +1180,7 @@ +@@ -1179,7 +1179,7 @@ /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { @@ -2966,7 +2966,7 @@ EMFormatHTML *format; EMFormat *format_source; -@@ -1190,14 +1190,15 @@ +@@ -1189,14 +1189,15 @@ CamelMimeMessage *message; }; @@ -2985,7 +2985,7 @@ struct _EMFormatHTMLJob *job; struct _EMFormatPURITree *puri_level; int cancelled = FALSE; -@@ -1282,10 +1283,9 @@ +@@ -1281,10 +1282,9 @@ ((EMFormat *)m->format)->pending_uri_level = puri_level; } @@ -2998,7 +2998,7 @@ d(printf("formatting finished\n")); m->format->load_http_now = FALSE; -@@ -1293,10 +1293,9 @@ +@@ -1292,10 +1292,9 @@ g_signal_emit_by_name(m->format, "complete"); } @@ -3011,7 +3011,7 @@ d(printf("formatter freed\n")); g_object_unref(m->format); if (m->estream) { -@@ -1312,11 +1311,12 @@ +@@ -1311,11 +1310,12 @@ g_object_unref(m->format_source); } @@ -3029,7 +3029,7 @@ }; static gboolean -@@ -1327,7 +1327,7 @@ +@@ -1326,7 +1326,7 @@ struct _EMFormatHTMLPrivate *p = efh->priv; if (m->format->html == NULL) { @@ -3038,7 +3038,7 @@ return FALSE; } -@@ -1355,7 +1355,7 @@ +@@ -1354,7 +1354,7 @@ if (m->message == NULL) { hstream = gtk_html_begin(efh->html); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); @@ -3047,7 +3047,7 @@ p->last_part = NULL; } else { hstream = NULL; -@@ -1374,8 +1374,8 @@ +@@ -1373,8 +1373,8 @@ p->last_part = m->message; } @@ -3058,7 +3058,7 @@ } efh->priv->format_timeout_id = 0; -@@ -1399,11 +1399,11 @@ +@@ -1398,11 +1398,11 @@ d(printf(" timeout for last still active, removing ...\n")); g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3072,8 +3072,8 @@ m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; ---- evolution-2.10.1/mail/em-folder-properties.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-properties.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-properties.c 2007-05-18 15:34:09.000000000 -0400 @@ -386,7 +386,7 @@ } @@ -3083,8 +3083,8 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.10.1/mail/em-folder-tree.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-tree.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-folder-tree.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-tree.c 2007-05-18 15:34:09.000000000 -0400 @@ -834,7 +834,7 @@ /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ @@ -3304,7 +3304,7 @@ }; static void -@@ -1906,7 +1898,7 @@ +@@ -1909,7 +1901,7 @@ gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); @@ -3313,7 +3313,7 @@ m->root = gtk_tree_row_reference_new (model, tree_path); camel_object_ref (store); m->store = store; -@@ -1915,7 +1907,7 @@ +@@ -1918,7 +1910,7 @@ m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; @@ -3322,9 +3322,9 @@ } static gboolean ---- evolution-2.10.1/mail/em-folder-browser.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-browser.c 2007-05-16 16:17:38.000000000 -0400 -@@ -838,7 +838,7 @@ +--- evolution-2.11.2/mail/em-folder-browser.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-browser.c 2007-05-18 15:34:09.000000000 -0400 +@@ -839,7 +839,7 @@ struct _setup_msg { @@ -3333,7 +3333,7 @@ CamelFolder *folder; char *query; -@@ -846,16 +846,15 @@ +@@ -847,16 +847,15 @@ GList *sources_folder; }; @@ -3353,7 +3353,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -866,12 +865,12 @@ +@@ -867,12 +866,12 @@ l = m->sources_uri; while (l) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3368,7 +3368,7 @@ } l = l->next; } -@@ -895,17 +894,13 @@ +@@ -896,17 +895,13 @@ } static void @@ -3388,7 +3388,7 @@ GList *l; camel_object_unref(m->folder); -@@ -926,11 +921,12 @@ +@@ -927,11 +922,12 @@ g_list_free(m->sources_folder); } @@ -3406,7 +3406,7 @@ }; /* sources_uri should be camel uri's */ -@@ -940,15 +936,15 @@ +@@ -941,15 +937,15 @@ struct _setup_msg *m; int id; @@ -3425,9 +3425,9 @@ return id; } ---- evolution-2.10.1/mail/message-list.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/message-list.c 2007-05-16 16:17:38.000000000 -0400 -@@ -1802,7 +1802,7 @@ +--- evolution-2.11.2/mail/message-list.c.kill-ethread 2007-05-10 05:27:32.000000000 -0400 ++++ evolution-2.11.2/mail/message-list.c 2007-05-18 15:34:09.000000000 -0400 +@@ -1801,7 +1801,7 @@ /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ struct _drop_msg { @@ -3436,7 +3436,7 @@ GdkDragContext *context; -@@ -1819,11 +1819,9 @@ +@@ -1818,11 +1818,9 @@ unsigned int aborted:1; }; @@ -3450,7 +3450,7 @@ if (m->move) return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); else -@@ -1831,13 +1829,11 @@ +@@ -1830,13 +1828,11 @@ } static void @@ -3466,7 +3466,7 @@ break; case DND_MESSAGE_RFC822: em_utils_selection_get_message(m->selection, m->folder); -@@ -1849,9 +1845,8 @@ +@@ -1848,9 +1844,8 @@ } static void @@ -3477,7 +3477,7 @@ gboolean success, delete; /* ?? */ -@@ -1859,7 +1854,7 @@ +@@ -1858,7 +1853,7 @@ success = FALSE; delete = FALSE; } else { @@ -3486,7 +3486,7 @@ delete = success && m->move && !m->moved; } -@@ -1867,10 +1862,8 @@ +@@ -1866,10 +1861,8 @@ } static void @@ -3498,7 +3498,7 @@ g_object_unref(m->context); camel_object_unref(m->folder); -@@ -1878,18 +1871,19 @@ +@@ -1877,18 +1870,19 @@ g_free(m->selection); } @@ -3524,7 +3524,7 @@ } static void -@@ -1916,7 +1910,7 @@ +@@ -1915,7 +1909,7 @@ struct _drop_msg *m = data; m->aborted = TRUE; @@ -3533,7 +3533,7 @@ } static EPopupItem ml_drop_popup_menu[] = { -@@ -1946,7 +1940,7 @@ +@@ -1945,7 +1939,7 @@ if (data->data == NULL || data->length == -1) return; @@ -3542,7 +3542,7 @@ m->context = context; g_object_ref(context); m->folder = ml->folder; -@@ -3676,7 +3670,7 @@ +@@ -3674,7 +3668,7 @@ /* ** REGENERATE MESSAGELIST ********************************************** */ struct _regen_list_msg { @@ -3551,7 +3551,7 @@ int complete; -@@ -3704,16 +3698,15 @@ +@@ -3702,16 +3696,15 @@ */ @@ -3571,7 +3571,7 @@ GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; CamelMessageInfo *info; int i; -@@ -3743,7 +3736,7 @@ +@@ -3741,7 +3734,7 @@ } else expr = "(match-all (not (system-flag \"deleted\")))"; } @@ -3580,7 +3580,7 @@ } else { char *expr; -@@ -3753,23 +3746,23 @@ +@@ -3751,23 +3744,23 @@ sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); } else expr = "(match-all (not (system-flag \"junk\")))"; @@ -3609,7 +3609,7 @@ if (uidnew) { MESSAGE_LIST_LOCK(m->ml, hide_lock); -@@ -3844,7 +3837,7 @@ +@@ -3842,7 +3835,7 @@ e_profile_event_emit("list.threaduids", m->folder->full_name, 0); @@ -3618,7 +3618,7 @@ /* update/build a new tree */ if (m->dotree) { if (m->tree) -@@ -3873,17 +3866,15 @@ +@@ -3871,17 +3864,15 @@ } static void @@ -3638,7 +3638,7 @@ return; if (m->ml->folder != m->folder) -@@ -3934,9 +3925,8 @@ +@@ -3932,9 +3923,8 @@ } static void @@ -3649,7 +3649,7 @@ int i; e_profile_event_emit("list.regenerated", m->folder->full_name, 0); -@@ -3964,11 +3954,12 @@ +@@ -3962,11 +3952,12 @@ g_object_unref(m->ml); } @@ -3667,7 +3667,7 @@ }; static gboolean -@@ -3978,7 +3969,7 @@ +@@ -3976,7 +3967,7 @@ m->ml->regen = g_list_prepend(m->ml->regen, m); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ @@ -3676,7 +3676,7 @@ m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; -@@ -3994,7 +3985,7 @@ +@@ -3992,7 +3983,7 @@ GList *l = ml->regen; while (l) { @@ -3685,7 +3685,7 @@ if (mm->cancel) camel_operation_cancel(mm->cancel); -@@ -4006,7 +3997,7 @@ +@@ -4004,7 +3995,7 @@ if (ml->regen_timeout_id) { g_source_remove(ml->regen_timeout_id); ml->regen_timeout_id = 0; @@ -3694,7 +3694,7 @@ ml->regen_timeout_msg = NULL; } } -@@ -4041,7 +4032,7 @@ +@@ -4039,7 +4030,7 @@ } #endif @@ -3703,8 +3703,8 @@ m->ml = ml; m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); ---- evolution-2.10.1/mail/em-sync-stream.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-sync-stream.h 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-sync-stream.h 2007-05-18 15:34:09.000000000 -0400 @@ -29,41 +29,45 @@ #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3781,19 +3781,19 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.10.1/mail/em-format-html-print.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-format-html-print.c 2007-05-16 16:17:38.000000000 -0400 -@@ -262,7 +262,7 @@ - g_object_ref(source); - g_object_ref(efhp); +--- evolution-2.11.2/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 ++++ evolution-2.11.2/mail/em-format-html-print.c 2007-05-18 15:38:28.000000000 -0400 +@@ -224,7 +224,7 @@ + g_object_ref (efhp); -- mail_get_message(folder, uid, emfhp_got_message, efhp, mail_thread_new); -+ mail_get_message(folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); - - return 0; /* damn async ... */ + mail_get_message ( +- folder, uid, emfhp_got_message, efhp, mail_thread_new); ++ folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); } ---- evolution-2.10.1/mail/em-sync-stream.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-sync-stream.c 2007-05-16 16:17:38.000000000 -0400 + + void +--- evolution-2.11.2/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-sync-stream.c 2007-05-18 15:34:09.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -4219,8 +4219,8 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.10.1/mail/em-subscribe-editor.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-subscribe-editor.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-subscribe-editor.c 2007-05-18 15:34:09.000000000 -0400 @@ -175,7 +175,7 @@ /* ** Subscribe folder operation **************************************** */ @@ -4436,8 +4436,8 @@ sub_unref(sub); } ---- evolution-2.10.1/mail/mail-mt.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-mt.h 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-mt.h 2007-05-18 15:34:09.000000000 -0400 @@ -23,43 +23,60 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4542,8 +4542,8 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.10.1/mail/mail-ops.h.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-ops.h 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-ops.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-ops.h 2007-05-18 15:34:09.000000000 -0400 @@ -30,13 +30,14 @@ #pragma } #endif /* __cplusplus */ @@ -4584,8 +4584,8 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.10.1/mail/em-composer-utils.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-composer-utils.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/em-composer-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-composer-utils.c 2007-05-18 15:34:09.000000000 -0400 @@ -534,7 +534,7 @@ strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4629,9 +4629,9 @@ - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.10.1/mail/mail-folder-cache.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-folder-cache.c 2007-05-16 16:17:38.000000000 -0400 -@@ -843,15 +843,14 @@ +--- evolution-2.11.2/mail/mail-folder-cache.c.kill-ethread 2007-05-09 00:14:42.000000000 -0400 ++++ evolution-2.11.2/mail/mail-folder-cache.c 2007-05-18 15:34:09.000000000 -0400 +@@ -844,15 +844,14 @@ struct _ping_store_msg { @@ -4650,7 +4650,7 @@ char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -862,10 +861,9 @@ +@@ -863,10 +862,9 @@ } static void @@ -4662,7 +4662,7 @@ if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -876,22 +874,21 @@ +@@ -877,22 +875,21 @@ online = TRUE; } if (online) @@ -4693,7 +4693,7 @@ }; static void -@@ -903,11 +900,11 @@ +@@ -904,11 +901,11 @@ if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) return; @@ -4707,7 +4707,7 @@ } static gboolean -@@ -952,7 +949,7 @@ +@@ -953,7 +950,7 @@ int hook = 0; g_assert(CAMEL_IS_STORE(store)); @@ -4716,9 +4716,9 @@ LOCK(info_lock); ---- evolution-2.10.1/mail/em-folder-view.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/em-folder-view.c 2007-05-16 16:17:38.000000000 -0400 -@@ -68,6 +68,7 @@ +--- evolution-2.11.2/mail/em-folder-view.c.kill-ethread 2007-05-10 05:27:32.000000000 -0400 ++++ evolution-2.11.2/mail/em-folder-view.c 2007-05-18 15:39:28.000000000 -0400 +@@ -69,6 +69,7 @@ #include #include @@ -4735,7 +4735,7 @@ } static void -@@ -1613,7 +1614,7 @@ +@@ -1614,7 +1615,7 @@ data->type = type; data->source = source; @@ -4744,7 +4744,7 @@ } static void -@@ -1711,7 +1712,7 @@ +@@ -1712,7 +1713,7 @@ data->type = type; data->uri = g_strdup (uri); @@ -4753,17 +4753,17 @@ } static void -@@ -2370,7 +2371,7 @@ - g_object_ref (emfv); - /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ - e_profile_event_emit("goto.load", emfv->displayed_uid, 0); +@@ -2355,7 +2356,7 @@ + emfv->priv->selected_uid); + gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); + - mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued); + mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push); } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.10.1/mail/mail-session.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-session.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-session.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-session.c 2007-05-18 15:34:09.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -4773,7 +4773,7 @@ #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -256,21 +256,22 @@ +@@ -258,21 +258,22 @@ /* ********************************************************************** */ @@ -4800,7 +4800,7 @@ /* clicked, send back the reply */ static void -@@ -278,122 +279,116 @@ +@@ -280,122 +281,116 @@ { gtk_widget_destroy ((GtkWidget *) dialog); @@ -4980,7 +4980,7 @@ } else ret = TRUE; -@@ -533,7 +528,7 @@ +@@ -535,7 +530,7 @@ /* TODO: This is very temporary, until we have a better way to do the progress reporting, we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ @@ -4989,7 +4989,7 @@ static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { -@@ -542,7 +537,7 @@ +@@ -544,7 +539,7 @@ /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so we get cancellation and progress in common with hte existing mail code, for free */ if (msg) { @@ -4998,7 +4998,7 @@ msg->data = m; camel_operation_unref(msg->op); -@@ -555,7 +550,7 @@ +@@ -557,7 +552,7 @@ static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { @@ -5007,7 +5007,7 @@ ms_parent_class->thread_msg_free(session, m); } -@@ -678,22 +673,23 @@ +@@ -680,22 +675,23 @@ MAIL_SESSION (session)->interactive = interactive; if (!interactive) { @@ -5037,11 +5037,11 @@ } } } ---- evolution-2.10.1/mail/mail-mt.c.kill-ethread 2007-04-09 09:09:27.000000000 -0400 -+++ evolution-2.10.1/mail/mail-mt.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.2/mail/mail-mt.c 2007-05-18 15:34:09.000000000 -0400 @@ -29,8 +29,8 @@ #include - #include + #include -#include #include @@ -6001,8 +6001,8 @@ } /* ******************** */ ---- evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-09 09:09:11.000000000 -0400 -+++ evolution-2.10.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 ++++ evolution-2.11.2/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-05-18 15:34:09.000000000 -0400 @@ -44,32 +44,30 @@ @@ -6082,8 +6082,8 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } ---- evolution-2.10.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/mark-all-read/mark-all-read.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 ++++ evolution-2.11.2/plugins/mark-all-read/mark-all-read.c 2007-05-18 15:34:09.000000000 -0400 @@ -44,7 +44,7 @@ return; } @@ -6093,9 +6093,9 @@ } static void ---- evolution-2.10.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-04-09 09:09:13.000000000 -0400 -+++ evolution-2.10.1/plugins/exchange-operations/exchange-folder.c 2007-05-16 16:17:38.000000000 -0400 -@@ -134,7 +134,7 @@ +--- evolution-2.11.2/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 ++++ evolution-2.11.2/plugins/exchange-operations/exchange-folder.c 2007-05-18 15:34:09.000000000 -0400 +@@ -140,7 +140,7 @@ inbox_physical_uri = e_folder_get_physical_uri (inbox); /* To get the CamelStore/Folder */ @@ -6104,17 +6104,17 @@ } ---- evolution-2.10.1/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-09 09:09:15.000000000 -0400 -+++ evolution-2.10.1/plugins/save-attachments/save-attachments.c 2007-05-16 16:17:38.000000000 -0400 -@@ -407,5 +407,5 @@ +--- evolution-2.11.2/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 ++++ evolution-2.11.2/plugins/save-attachments/save-attachments.c 2007-05-18 15:34:09.000000000 -0400 +@@ -403,5 +403,5 @@ camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 ++++ evolution-2.11.2/plugins/mailing-list-actions/mailing-list-actions.c 2007-05-18 15:34:09.000000000 -0400 @@ -89,7 +89,7 @@ data->uri = strdup (sel->uri); @@ -6124,8 +6124,8 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.10.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-09 09:09:12.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-features/share-folder-common.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 ++++ evolution-2.11.2/plugins/groupwise-features/share-folder-common.c 2007-05-18 15:34:09.000000000 -0400 @@ -121,7 +121,7 @@ } @@ -6223,8 +6223,8 @@ return id; } ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.h 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.h 2007-05-18 15:34:09.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6245,8 +6245,8 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-notify.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.c 2007-05-18 15:34:09.000000000 -0400 @@ -45,10 +45,6 @@ GMutex *mutex; }; @@ -6359,8 +6359,8 @@ } static void ---- evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-04-09 09:10:29.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/alarm-notify/alarm-queue.c 2007-05-16 16:17:38.000000000 -0400 +--- evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-05-09 00:14:46.000000000 -0400 ++++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c 2007-05-18 15:34:09.000000000 -0400 @@ -115,9 +115,6 @@ static int tray_blink_state = FALSE; static AlarmNotify *an; @@ -6673,7 +6673,7 @@ GList *list = tray_icons_list; d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); -@@ -1087,28 +1097,25 @@ +@@ -1089,28 +1099,25 @@ gtk_tree_selection_select_iter (sel, &iter); } } @@ -6711,7 +6711,7 @@ { GList *list = tray_icons_list; -@@ -1138,55 +1145,50 @@ +@@ -1140,55 +1147,50 @@ } else list = list->next; } @@ -6785,7 +6785,7 @@ } static void -@@ -1394,29 +1396,24 @@ +@@ -1412,29 +1414,24 @@ /* Add a new data to tray list */ static void @@ -6826,7 +6826,7 @@ } /* Performs notification of a display alarm */ -@@ -1840,21 +1837,13 @@ +@@ -1862,21 +1859,13 @@ new_midnight = time_day_end_with_zone (time (NULL), zone); if (new_midnight > midnight) { @@ -6853,7 +6853,7 @@ } return TRUE; -@@ -1985,14 +1974,15 @@ +@@ -2007,14 +1996,15 @@ } struct _alarm_client_msg { @@ -6872,7 +6872,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2023,6 +2013,8 @@ +@@ -2045,6 +2035,8 @@ G_CALLBACK (cal_opened_cb), ca); } @@ -6881,7 +6881,7 @@ } /** -@@ -2042,20 +2034,13 @@ +@@ -2064,20 +2056,13 @@ void alarm_queue_add_client (ECal *client) { @@ -6907,7 +6907,7 @@ } /* Removes a component an its alarms */ -@@ -2107,11 +2092,10 @@ +@@ -2129,11 +2114,10 @@ * Removes a calendar client from the alarm queueing system. **/ static void @@ -6921,7 +6921,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2148,24 +2132,20 @@ +@@ -2170,24 +2154,20 @@ g_free (ca); g_hash_table_remove (client_alarms_hash, client); diff --git a/evolution-2.9.2-gtk-font-button.patch b/evolution-2.9.2-gtk-font-button.patch deleted file mode 100644 index a218e05..0000000 --- a/evolution-2.9.2-gtk-font-button.patch +++ /dev/null @@ -1,153 +0,0 @@ ---- evolution-2.9.2/mail/em-mailer-prefs.c.gtk-font-button 2006-08-09 04:43:27.000000000 -0400 -+++ evolution-2.9.2/mail/em-mailer-prefs.c 2006-11-11 08:31:53.000000000 -0500 -@@ -36,8 +36,8 @@ - #include - - #include --#include - #include -+#include - - #include - -@@ -535,12 +535,14 @@ - } - - static void --font_changed (GnomeFontPicker *fontpicker, const char *arg1, EMMailerPrefs *prefs) -+font_changed (GtkFontButton *font_button, EMMailerPrefs *prefs) - { -- const char *key; -+ const gchar *key; -+ const gchar *font_name; - -- key = g_object_get_data ((GObject *) fontpicker, "key"); -- gconf_client_set_string (prefs->gconf, key, gnome_font_picker_get_font_name (fontpicker), NULL); -+ key = g_object_get_data (G_OBJECT (font_button), "key"); -+ font_name = gtk_font_button_get_font_name (font_button); -+ gconf_client_set_string (prefs->gconf, key, font_name, NULL); - } - - static void -@@ -841,8 +843,8 @@ - - /* Mail Fonts */ - font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/monospace", NULL); -- prefs->font_fixed = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontFixed")); -- gnome_font_picker_set_font_name (prefs->font_fixed, font); -+ prefs->font_fixed = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontFixed")); -+ gtk_font_button_set_font_name (prefs->font_fixed, font); - g_free (font); - g_object_set_data ((GObject *) prefs->font_fixed, "key", "/apps/evolution/mail/display/fonts/monospace"); - g_signal_connect (prefs->font_fixed, "font-set", G_CALLBACK (font_changed), prefs); -@@ -850,8 +852,8 @@ - gtk_widget_set_sensitive ((GtkWidget *) prefs->font_fixed, FALSE); - - font = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/fonts/variable", NULL); -- prefs->font_variable = GNOME_FONT_PICKER (glade_xml_get_widget (gui, "FontVariable")); -- gnome_font_picker_set_font_name (prefs->font_variable, font); -+ prefs->font_variable = GTK_FONT_BUTTON (glade_xml_get_widget (gui, "FontVariable")); -+ gtk_font_button_set_font_name (prefs->font_variable, font); - g_free (font); - g_object_set_data ((GObject *) prefs->font_variable, "key", "/apps/evolution/mail/display/fonts/variable"); - g_signal_connect (prefs->font_variable, "font-set", G_CALLBACK (font_changed), prefs); ---- evolution-2.9.2/mail/em-mailer-prefs.h.gtk-font-button 2006-05-25 00:59:47.000000000 -0400 -+++ evolution-2.9.2/mail/em-mailer-prefs.h 2006-11-11 08:31:53.000000000 -0500 -@@ -39,7 +39,7 @@ - struct _GladeXML; - struct _GnomeColorPicker; - struct _GtkFileChooserbutton; --struct _GnomeFontPicker; -+struct _GtkFontButton; - struct _GConfClient; - struct _GtkButton; - struct _GtkTreeView; -@@ -92,8 +92,8 @@ - struct _GtkFileChooserButton *notify_sound_file; - - /* HTML Mail tab */ -- struct _GnomeFontPicker *font_variable; -- struct _GnomeFontPicker *font_fixed; -+ struct _GtkFontButton *font_variable; -+ struct _GtkFontButton *font_fixed; - struct _GtkToggleButton *font_share; - - /* Loading Images */ ---- evolution-2.9.2/mail/mail-config.glade.gtk-font-button 2006-07-19 11:26:27.000000000 -0400 -+++ evolution-2.9.2/mail/mail-config.glade 2006-11-11 08:31:53.000000000 -0500 -@@ -4700,14 +4700,14 @@ - - - -- -+ - True - True - Select HTML fixed width font -- GNOME_FONT_PICKER_MODE_FONT_INFO -+ True - True -- False -- 14 -+ False -+ False - True - - -@@ -4722,14 +4722,14 @@ - - - -- -+ - True - True - Select HTML variable width font -- GNOME_FONT_PICKER_MODE_FONT_INFO -+ True - True -- False -- 14 -+ False -+ False - True - - -@@ -8484,14 +8484,14 @@ - - - -- -+ - True - True - Select HTML fixed width font for printing -- GNOME_FONT_PICKER_MODE_FONT_INFO -+ True - True -- False -- 14 -+ False -+ False - True - - -@@ -8506,14 +8506,14 @@ - - - -- -+ - True - True - Select HTML variable width font for printing -- GNOME_FONT_PICKER_MODE_FONT_INFO -+ True - True -- False -- 14 -+ False -+ False - True - - diff --git a/evolution-2.9.3-gtk-color-button.patch b/evolution-2.9.3-gtk-color-button.patch deleted file mode 100644 index 665175b..0000000 --- a/evolution-2.9.3-gtk-color-button.patch +++ /dev/null @@ -1,1219 +0,0 @@ ---- evolution-2.9.91/mail/em-composer-prefs.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-composer-prefs.c 2007-02-12 13:32:03.000000000 -0500 -@@ -56,9 +56,8 @@ - #include - #include - #include -- -+#include - #include --#include - - #include - -@@ -545,7 +544,7 @@ - GtkTreeIter iter; - GError *err = NULL; - char **strv = NULL; -- guint r, g, b; -+ GdkColor color; - gboolean go; - char *lang; - int i; -@@ -580,21 +579,33 @@ - if (strv != NULL) - g_strfreev (strv); - -- r = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_red", NULL); -- g = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_green", NULL); -- b = gconf_client_get_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", NULL); -- -- gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (prefs->colour), r, g, b, 0xffff); -+ color.red = gconf_client_get_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_red", NULL); -+ color.green = gconf_client_get_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_green", NULL); -+ color.blue = gconf_client_get_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", NULL); -+ gtk_color_button_set_color (GTK_COLOR_BUTTON (prefs->color), &color); - - prefs->spell_active = TRUE; - } - - static void --spell_color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, EMComposerPrefs *prefs) -+spell_color_set (GtkColorButton *color_button, EMComposerPrefs *prefs) - { -- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_red", r, NULL); -- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_green", g, NULL); -- gconf_client_set_int (prefs->gconf, GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", b, NULL); -+ GdkColor color; -+ -+ gtk_color_button_get_color (GTK_COLOR_BUTTON (color_button), &color); -+ -+ gconf_client_set_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_red", -+ color.red, NULL); -+ gconf_client_set_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_green", -+ color.green, NULL); -+ gconf_client_set_int (prefs->gconf, -+ GNOME_SPELL_GCONF_DIR "/spell_error_color_blue", -+ color.blue, NULL); - } - - static char * -@@ -676,7 +687,7 @@ - - spell_set_ui (prefs); - -- widget = glade_xml_get_widget (prefs->gui, "colorpickerSpellCheckColor"); -+ widget = glade_xml_get_widget (prefs->gui, "colorButtonSpellCheckColor"); - g_signal_connect (widget, "color_set", G_CALLBACK (spell_color_set), prefs); - } - -@@ -922,7 +933,7 @@ - g_free (buf); - - /* Spell Checking: GNOME Spell part */ -- prefs->colour = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerSpellCheckColor")); -+ prefs->color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, "colorButtonSpellCheckColor")); - prefs->language = GTK_TREE_VIEW (glade_xml_get_widget (gui, "listSpellCheckLanguage")); - model = gtk_list_store_new (3, G_TYPE_BOOLEAN, G_TYPE_STRING, G_TYPE_POINTER); - gtk_tree_view_set_model (prefs->language, (GtkTreeModel *) model); -@@ -942,7 +953,7 @@ - info_pixmap = glade_xml_get_widget (gui, "pixmapSpellInfo"); - gtk_image_set_from_stock (GTK_IMAGE (info_pixmap), GTK_STOCK_DIALOG_INFO, GTK_ICON_SIZE_BUTTON); - if (!spell_setup_check_options (prefs)) { -- gtk_widget_hide (GTK_WIDGET (prefs->colour)); -+ gtk_widget_hide (GTK_WIDGET (prefs->color)); - gtk_widget_hide (GTK_WIDGET (prefs->language)); - } - ---- evolution-2.9.91/mail/mail-config.glade.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 -+++ evolution-2.9.91/mail/mail-config.glade 2007-02-12 13:32:03.000000000 -0500 -@@ -5138,10 +5138,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6079,10 +6078,9 @@ - 6 - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6098,10 +6096,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6117,10 +6114,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6136,10 +6132,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -6155,10 +6150,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -8315,7 +8309,7 @@ - 0.5 - 0 - 0 -- colorpickerSpellCheckColor -+ colorButtonSpellCheckColor - PANGO_ELLIPSIZE_NONE - -1 - False -@@ -8329,10 +8323,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True ---- evolution-2.9.91/mail/em-mailer-prefs.h.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 -+++ evolution-2.9.91/mail/em-mailer-prefs.h 2007-02-12 13:32:03.000000000 -0500 -@@ -37,7 +37,6 @@ - struct _GdkPixbuf; - struct _GtkWidget; - struct _GladeXML; --struct _GnomeColorPicker; - struct _GtkFileChooserbutton; - struct _GtkFontButton; - struct _GConfClient; -@@ -80,7 +79,7 @@ - struct _GtkSpinButton *mlimit_count; - struct _GtkOptionMenu *charset; - struct _GtkToggleButton *citation_highlight; -- struct _GnomeColorPicker *citation_color; -+ struct _GtkColorButton *citation_color; - - /* Deleting Mail */ - struct _GtkToggleButton *empty_trash; -@@ -110,7 +109,7 @@ - /* Labels and Colours tab */ - struct { - struct _GtkEntry *name; -- struct _GnomeColorPicker *color; -+ struct _GtkColorButton *color; - } labels[5]; - struct _GtkButton *restore_labels; - ---- evolution-2.9.91/mail/em-composer-prefs.h.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/mail/em-composer-prefs.h 2007-02-12 13:32:03.000000000 -0500 -@@ -48,7 +48,6 @@ - struct _GdkPixbuf; - struct _GtkWidget; - struct _GladeXML; --struct _GnomeColorPicker; - struct _GConfClient; - struct _GtkButton; - struct _GtkTreeView; -@@ -71,7 +70,7 @@ - struct _GtkOptionMenu *charset; - - struct _GtkToggleButton *spell_check; -- struct _GnomeColorPicker *colour; -+ struct _GtkColorButton *color; - struct _GtkTreeView *language; - CORBA_sequence_GNOME_Spell_Language *language_seq; - gboolean spell_active; ---- evolution-2.9.91/mail/em-mailer-prefs.c.gtk-color-button 2007-02-12 13:32:03.000000000 -0500 -+++ evolution-2.9.91/mail/em-mailer-prefs.c 2007-02-12 13:32:03.000000000 -0500 -@@ -35,7 +35,7 @@ - #include "misc/e-charset-picker.h" - #include - --#include -+#include - #include - #include - -@@ -157,49 +157,27 @@ - - - static void --colorpicker_set_color (GnomeColorPicker *color, const char *str) -+color_button_set_color (GtkColorButton *color_button, const gchar *spec) - { -- GdkColor colour; -- guint32 rgb; -- -- gdk_color_parse (str, &colour); -- rgb = ((colour.red & 0xff00) << 8) | (colour.green & 0xff00) | ((colour.blue & 0xff00) >> 8); -- -- gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff); --} -+ GdkColor color; - --static guint32 --colorpicker_get_color (GnomeColorPicker *color) --{ -- guint8 r, g, b, a; -- guint32 rgb = 0; -- -- gnome_color_picker_get_i8 (color, &r, &g, &b, &a); -- -- rgb = r; -- rgb <<= 8; -- rgb |= g; -- rgb <<= 8; -- rgb |= b; -- -- return rgb; -+ if (gdk_color_parse (spec, &color)) -+ gtk_color_button_set_color (color_button, &color); - } - - static void --citation_color_set (GtkWidget *widget, guint r, guint g, guint b, guint a, EMMailerPrefs *prefs) -+citation_color_set (GtkColorButton *color_button, EMMailerPrefs *prefs) - { -- guint32 rgb = 0; -- char buf[20]; -- -- rgb = r & 0xff; -- rgb <<= 8; -- rgb |= g & 0xff; -- rgb <<= 8; -- rgb |= b & 0xff; -- -- sprintf (buf, "#%06x", rgb & 0xffffff); -- -- gconf_client_set_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", buf, NULL); -+ GdkColor color; -+ gchar spec[16]; -+ -+ gtk_color_button_get_color (color_button, &color); -+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", -+ color.red, color.green, color.blue); -+ -+ gconf_client_set_string (prefs->gconf, -+ "/apps/evolution/mail/display/citation_colour", -+ spec, NULL); - } - - static void -@@ -212,9 +190,12 @@ - int i; - - for (i = 4; i >= 0; i--) { -+ GdkColor color; -+ - cstring = gtk_entry_get_text (prefs->labels[i].name); -- rgb = colorpicker_get_color (prefs->labels[i].color); -- string = g_strdup_printf ("%s:#%06x", cstring, rgb & 0xffffff); -+ gtk_color_button_get_color (prefs->labels[i].color, &color); -+ string = g_strdup_printf ("%s:#%04x%04x%04x", cstring, -+ color.red, color.green, color.blue); - list = g_slist_prepend (list, string); - } - -@@ -249,7 +230,7 @@ - - for (i = 0; i < 5; i++) { - gtk_entry_set_text (prefs->labels[i].name, _(label_defaults[i].name)); -- colorpicker_set_color (prefs->labels[i].color, label_defaults[i].colour); -+ color_button_set_color (prefs->labels[i].color, label_defaults[i].colour); - atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), _(label_defaults[i].name)); - } - } -@@ -812,9 +793,9 @@ - "/apps/evolution/mail/display/mark_citations", - G_CALLBACK (toggle_button_toggled)); - -- prefs->citation_color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, "colorpickerHighlightCitations")); -+ prefs->citation_color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, "colorButtonHighlightCitations")); - buf = gconf_client_get_string (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL); -- colorpicker_set_color (prefs->citation_color, buf ? buf : "#737373"); -+ color_button_set_color (prefs->citation_color, buf ? buf : "#737373"); - g_signal_connect (prefs->citation_color, "color-set", G_CALLBACK (citation_color_set), prefs); - if (!gconf_client_key_is_writable (prefs->gconf, "/apps/evolution/mail/display/citation_colour", NULL)) - gtk_widget_set_sensitive ((GtkWidget *) prefs->citation_color, FALSE); -@@ -935,14 +916,14 @@ - g_free (widget_name); - - widget_name = g_strdup_printf ("colorLabel%d", i); -- prefs->labels[i].color = GNOME_COLOR_PICKER (glade_xml_get_widget (gui, widget_name)); -+ prefs->labels[i].color = GTK_COLOR_BUTTON (glade_xml_get_widget (gui, widget_name)); - gtk_widget_set_sensitive ((GtkWidget *) prefs->labels[i].color, !locked); - g_free (widget_name); - - gtk_entry_set_text (prefs->labels[i].name, label->name); - g_signal_connect (prefs->labels[i].name, "changed", G_CALLBACK (label_entry_changed), prefs); - -- colorpicker_set_color (prefs->labels[i].color, label->colour); -+ color_button_set_color (prefs->labels[i].color, label->colour); - g_signal_connect (prefs->labels[i].color, "color-set", G_CALLBACK (label_color_set), prefs); - - atk_object_set_name(gtk_widget_get_accessible((GtkWidget *)prefs->labels[i].color), label->name); ---- evolution-2.9.91/filter/filter-colour.h.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/filter/filter-colour.h 2007-02-12 13:32:03.000000000 -0500 -@@ -39,7 +39,7 @@ - struct _FilterColour { - FilterElement parent_object; - -- guint16 r, g, b, a; -+ GdkColor color; - }; - - struct _FilterColourClass { ---- evolution-2.9.91/filter/filter-colour.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/filter/filter-colour.c 2007-02-12 13:32:03.000000000 -0500 -@@ -26,7 +26,7 @@ - #endif - - #include --#include -+#include - - #include "libedataserver/e-sexp.h" - #include "filter-colour.h" -@@ -120,13 +120,11 @@ - static int - colour_eq (FilterElement *fe, FilterElement *cm) - { -- FilterColour *fc = (FilterColour *)fe, *cc = (FilterColour *)cm; -- -- return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm) -- && fc->r == cc->r -- && fc->g == cc->g -- && fc->b == cc->b -- && fc->a == cc->a; -+ FilterColour *fc = (FilterColour *) fe; -+ FilterColour *cc = (FilterColour *) cm; -+ -+ return FILTER_ELEMENT_CLASS (parent_class)->eq (fe, cm) -+ && gdk_color_equal (&fc->color, &cc->color); - } - - static void -@@ -139,76 +137,70 @@ - static xmlNodePtr - xml_encode (FilterElement *fe) - { -- xmlNodePtr value; - FilterColour *fc = (FilterColour *)fe; -- char hex[16]; -- -- d(printf("Encoding colour as xml\n")); -+ xmlNodePtr value; -+ gchar spec[16]; -+ -+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", -+ fc->color.red, fc->color.green, fc->color.blue); -+ - value = xmlNewNode(NULL, "value"); - xmlSetProp(value, "name", fe->name); - xmlSetProp(value, "type", "colour"); -- -- sprintf(hex, "%04x", fc->r); -- xmlSetProp(value, "red", hex); -- sprintf(hex, "%04x", fc->g); -- xmlSetProp(value, "green", hex); -- sprintf(hex, "%04x", fc->b); -- xmlSetProp(value, "blue", hex); -- sprintf(hex, "%04x", fc->a); -- xmlSetProp(value, "alpha", hex); -- -- return value; --} -+ xmlSetProp(value, "spec", spec); - --static guint16 --get_value (xmlNodePtr node, char *name) --{ -- unsigned int ret; -- char *value; -- -- value = xmlGetProp(node, name); -- sscanf(value, "%04x", &ret); -- xmlFree(value); -- return ret; -+ return value; - } - -- - static int - xml_decode (FilterElement *fe, xmlNodePtr node) - { - FilterColour *fc = (FilterColour *)fe; -- -+ xmlChar *prop; -+ - xmlFree (fe->name); - fe->name = xmlGetProp(node, "name"); -- fc->r = get_value(node, "red"); -- fc->g = get_value(node, "green"); -- fc->b = get_value(node, "blue"); -- fc->a = get_value(node, "alpha"); -- -+ -+ prop = xmlGetProp(node, "spec"); -+ if (prop != NULL) { -+ gdk_color_parse(prop, &fc->color); -+ xmlFree (prop); -+ } else { -+ /* try reading the old RGB properties */ -+ prop = xmlGetProp(node, "red"); -+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.red); -+ xmlFree (prop); -+ prop = xmlGetProp(node, "green"); -+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.green); -+ xmlFree (prop); -+ prop = xmlGetProp(node, "blue"); -+ sscanf(prop, "%" G_GINT16_MODIFIER "x", &fc->color.blue); -+ xmlFree (prop); -+ } -+ - return 0; - } - - static void --set_colour (GnomeColorPicker *cp, guint r, guint g, guint b, guint a, FilterColour *fc) -+set_color (GtkColorButton *color_button, FilterColour *fc) - { -- fc->r = r; -- fc->g = g; -- fc->b = b; -- fc->a = a; -+ gtk_color_button_get_color (color_button, &fc->color); - } - - static GtkWidget * - get_widget (FilterElement *fe) - { - FilterColour *fc = (FilterColour *) fe; -- GnomeColorPicker *cp; -- -- cp = (GnomeColorPicker *) gnome_color_picker_new (); -- gnome_color_picker_set_i16 (cp, fc->r, fc->g, fc->b, fc->a); -- gtk_widget_show ((GtkWidget *) cp); -- g_signal_connect (cp, "color_set", G_CALLBACK (set_colour), fe); -+ GtkWidget *color_button; -+ -+ color_button = gtk_color_button_new_with_color (&fc->color); -+ gtk_widget_show (color_button); -+ -+ g_signal_connect ( -+ G_OBJECT (color_button), "color_set", -+ G_CALLBACK (set_color), fe); - -- return (GtkWidget *) cp; -+ return color_button; - } - - static void -@@ -221,9 +213,9 @@ - format_sexp (FilterElement *fe, GString *out) - { - FilterColour *fc = (FilterColour *)fe; -- char *str; -- -- str = g_strdup_printf ("#%02x%02x%02x", (fc->r >> 8) & 0xff, (fc->g >> 8) & 0xff, (fc->b >> 8) & 0xff); -- e_sexp_encode_string (out, str); -- g_free (str); -+ gchar spec[16]; -+ -+ g_snprintf (spec, sizeof (spec), "#%04x%04x%04x", -+ fc->color.red, fc->color.green, fc->color.blue); -+ e_sexp_encode_string (out, spec); - } ---- evolution-2.9.91/filter/filter-element.c.gtk-color-button 2007-01-03 10:27:18.000000000 -0500 -+++ evolution-2.9.91/filter/filter-element.c 2007-02-12 13:32:03.000000000 -0500 -@@ -293,12 +293,10 @@ - } - } else if (IS_FILTER_COLOUR(se)) { - if (IS_FILTER_COLOUR(de)) { -- FilterColour *s = (FilterColour *)se, *d = (FilterColour *)de; -+ FilterColour *s = (FilterColour *)se; -+ FilterColour *d = (FilterColour *)de; - -- d->r = s->r; -- d->g = s->g; -- d->b = s->b; -- d->a = s->a; -+ d->color = s->color; - } - } else if (IS_FILTER_DATESPEC(se)) { - if (IS_FILTER_DATESPEC(de)) { ---- evolution-2.9.91/plugins/groupwise-account-setup/camel-gw-listener.c.gtk-color-button 2007-02-09 15:16:33.000000000 -0500 -+++ evolution-2.9.91/plugins/groupwise-account-setup/camel-gw-listener.c 2007-02-12 13:41:50.000000000 -0500 -@@ -212,12 +212,13 @@ - e_source_set_property (source, "use_ssl", use_ssl); - e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); - if (parent_id_name) { -- guint32 color; -+ char *color; - e_source_set_property (source, "parent_id_name", parent_id_name); -- color = (guint32) atoi((char *)(camel_url_get_param (url, "color"))); -- e_source_set_color (source, color); -+ color = g_strdup_printf ("#%s", camel_url_get_param (url, "color")); -+ e_source_set_color_spec (source, color); -+ g_free (color); - } else -- e_source_set_color (source, 0xEEBC60); -+ e_source_set_color_spec (source, "#EEBC60"); - e_source_group_add_source (group, source, -1); - e_source_list_sync (source_list, NULL); - ---- evolution-2.9.91/calendar/gui/tasks-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/tasks-component.c 2007-02-12 13:32:03.000000000 -0500 -@@ -209,7 +209,7 @@ - calendar_config_set_tasks_selected (&selected); - } - -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - personal_source = source; - } - ---- evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.c.gtk-color-button 2007-02-12 13:32:02.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.c 2007-02-12 13:32:03.000000000 -0500 -@@ -96,21 +96,6 @@ - return glade_xml_get_widget (prefs->gui, item->label); - } - --/* Returns a pointer to a static string with an X color spec for the current -- * value of a color picker. -- */ --static const char * --spec_from_picker (GtkWidget *picker) --{ -- static char spec[8]; -- guint8 r, g, b; -- -- gnome_color_picker_get_i8 (GNOME_COLOR_PICKER (picker), &r, &g, &b, NULL); -- g_snprintf (spec, sizeof (spec), "#%02x%02x%02x", r, g, b); -- -- return spec; --} -- - static void - working_days_changed (GtkWidget *widget, CalendarPrefsDialog *prefs) - { -@@ -277,15 +262,21 @@ - } - - static void --tasks_due_today_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) -+tasks_due_today_set_color (GtkColorButton *color_button, CalendarPrefsDialog *prefs) - { -- calendar_config_set_tasks_due_today_color (spec_from_picker (prefs->tasks_due_today_color)); -+ GdkColor color; -+ -+ gtk_color_button_get_color (color_button, &color); -+ calendar_config_set_tasks_due_today_color (&color); - } - - static void --tasks_overdue_set_color (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, CalendarPrefsDialog *prefs) -+tasks_overdue_set_color (GtkColorButton *color_button, CalendarPrefsDialog *prefs) - { -- calendar_config_set_tasks_overdue_color (spec_from_picker (prefs->tasks_overdue_color)); -+ GdkColor color; -+ -+ gtk_color_button_get_color (color_button, &color); -+ calendar_config_set_tasks_overdue_color (&color); - } - - static void -@@ -417,22 +408,6 @@ - g_signal_connect (G_OBJECT (prefs->template_url), "changed", G_CALLBACK (template_url_changed), prefs); - } - --/* Sets the color in a color picker from an X color spec */ --static void --set_color_picker (GtkWidget *picker, const char *spec) --{ -- GdkColor color; -- -- if (!spec || !gdk_color_parse (spec, &color)) -- color.red = color.green = color.blue = 0; -- -- gnome_color_picker_set_i16 (GNOME_COLOR_PICKER (picker), -- color.red, -- color.green, -- color.blue, -- 65535); --} -- - /* Shows the current Free/Busy settings in the dialog */ - static void - show_fb_config (CalendarPrefsDialog *prefs) -@@ -449,11 +424,18 @@ - static void - show_task_list_config (CalendarPrefsDialog *prefs) - { -+ GtkColorButton *color_button; -+ GdkColor color; - CalUnits units; - gboolean hide_completed_tasks = FALSE; - -- set_color_picker (prefs->tasks_due_today_color, calendar_config_get_tasks_due_today_color ()); -- set_color_picker (prefs->tasks_overdue_color, calendar_config_get_tasks_overdue_color ()); -+ color_button = GTK_COLOR_BUTTON (prefs->tasks_due_today_color); -+ calendar_config_get_tasks_due_today_color (&color); -+ gtk_color_button_set_color (color_button, &color); -+ -+ color_button = GTK_COLOR_BUTTON (prefs->tasks_overdue_color); -+ calendar_config_get_tasks_overdue_color (&color); -+ gtk_color_button_set_color (color_button, &color); - - /* Hide Completed Tasks. */ - e_dialog_toggle_set (prefs->tasks_hide_completed, calendar_config_get_hide_completed_tasks ()); ---- evolution-2.9.91/calendar/gui/dialogs/calendar-setup.c.gtk-color-button 2007-01-03 10:27:56.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/dialogs/calendar-setup.c 2007-02-12 13:32:03.000000000 -0500 -@@ -73,44 +73,22 @@ - } - - static void --colorpicker_set_color (GnomeColorPicker *color, guint32 rgb) --{ -- gnome_color_picker_set_i8 (color, (rgb & 0xff0000) >> 16, (rgb & 0xff00) >> 8, rgb & 0xff, 0xff); --} -- --static guint32 --colorpicker_get_color (GnomeColorPicker *color) --{ -- guint8 r, g, b, a; -- guint32 rgb = 0; -- -- gnome_color_picker_get_i8 (color, &r, &g, &b, &a); -- -- rgb = r; -- rgb <<= 8; -- rgb |= g; -- rgb <<= 8; -- rgb |= b; -- -- return rgb; --} -- --static void - eccp_commit (EConfig *ec, GSList *items, void *data) - { - CalendarSourceDialog *sdialog = data; - xmlNodePtr xml; - - if (sdialog->original_source) { -- guint32 color; -+ const gchar *color_spec; - - xml = xmlNewNode (NULL, "dummy"); - e_source_dump_to_xml_node (sdialog->source, xml); - e_source_update_from_xml_node (sdialog->original_source, xml->children, NULL); - xmlFreeNode (xml); - -- if (e_source_get_color (sdialog->source, &color)) -- e_source_set_color (sdialog->original_source, color); -+ color_spec = e_source_peek_color_spec (sdialog->source); -+ if (color_spec != NULL) -+ e_source_set_color_spec (sdialog->original_source, color_spec); - } else { - e_source_group_add_source (sdialog->source_group, sdialog->source, -1); - e_source_list_sync (sdialog->source_list, NULL); -@@ -304,63 +282,80 @@ - } - - static void --color_changed (GnomeColorPicker *picker, guint r, guint g, guint b, guint a, ECalConfigTargetSource *t) -+color_changed (GtkColorButton *color_button, ECalConfigTargetSource *target) - { -- ESource *source = t->source; -- e_source_set_color (source, colorpicker_get_color (picker)); -+ ESource *source = target->source; -+ gchar color_spec[16]; -+ GdkColor color; -+ -+ gtk_color_button_get_color (color_button, &color); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color.red, color.green, color.blue); -+ e_source_set_color_spec (source, color_spec); -+} -+ -+static const gchar * -+choose_initial_color (void) -+{ -+ static const gchar *colors[] = { -+ "#BECEDD", /* 190 206 221 Blue */ -+ "#E2F0EF", /* 226 240 239 Light Blue */ -+ "#C6E2B7", /* 198 226 183 Green */ -+ "#E2F0D3", /* 226 240 211 Light Green */ -+ "#E2D4B7", /* 226 212 183 Khaki */ -+ "#EAEAC1", /* 234 234 193 Light Khaki */ -+ "#F0B8B7", /* 240 184 183 Pink */ -+ "#FED4D3", /* 254 212 211 Light Pink */ -+ "#E2C6E1", /* 226 198 225 Purple */ -+ "#F0E2EF" /* 240 226 239 Light Purple */ -+ }; -+ -+ return colors[g_random_int_range (0, G_N_ELEMENTS (colors))]; - } - - static GtkWidget * - eccp_get_source_color (EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data) - { - CalendarSourceDialog *sdialog = data; -- static GtkWidget *label, *picker; -- int row; -- ECalConfigTargetSource *t = (ECalConfigTargetSource *) ec->target; -- static guint32 assigned_colors[] = { -- 0xBECEDD, /* 190 206 221 Blue */ -- 0xE2F0EF, /* 226 240 239 Light Blue */ -- 0xC6E2B7, /* 198 226 183 Green */ -- 0xE2F0D3, /* 226 240 211 Light Green */ -- 0xE2D4B7, /* 226 212 183 Khaki */ -- 0xEAEAC1, /* 234 234 193 Light Khaki */ -- 0xF0B8B7, /* 240 184 183 Pink */ -- 0xFED4D3, /* 254 212 211 Light Pink */ -- 0xE2C6E1, /* 226 198 225 Purple */ -- 0xF0E2EF /* 240 226 239 Light Purple */ -- }; -- GRand *rand = g_rand_new (); -- guint32 color; -+ static GtkWidget *label, *color_button; -+ guint row = GTK_TABLE (parent)->nrows; -+ const gchar *color_spec = NULL; -+ GdkColor color; - - if (old) - gtk_widget_destroy (label); - -- row = ((GtkTable*)parent)->nrows; -+ if (sdialog->original_source) -+ color_spec = e_source_peek_color_spec (sdialog->original_source); -+ -+ if (color_spec == NULL) { -+ color_spec = choose_initial_color (); -+ e_source_set_color_spec (sdialog->source, color_spec); -+ } - -- color = assigned_colors[g_rand_int_range (rand, 0, 9)]; -- g_rand_free (rand); -+ if (!gdk_color_parse (color_spec, &color)) -+ g_warning ("Unknown color \"%s\" in calendar \"%s\"", -+ color_spec, e_source_peek_name (sdialog->source)); - - label = gtk_label_new_with_mnemonic (_("C_olor:")); - gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -+ gtk_table_attach ( -+ GTK_TABLE (parent), label, -+ 0, 1, row, row + 1, GTK_FILL, 0, 0, 0); - gtk_widget_show (label); -- gtk_table_attach (GTK_TABLE (parent), label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); -- -- picker = gnome_color_picker_new (); -- gtk_widget_show (picker); -- gtk_label_set_mnemonic_widget (GTK_LABEL (label), picker); -- gtk_table_attach (GTK_TABLE (parent), picker, 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); -- g_signal_connect (G_OBJECT (picker), "color-set", G_CALLBACK (color_changed), t); -- -- if (sdialog->original_source) -- e_source_get_color (sdialog->original_source, &color); -- else -- /* since we don't have an original source here, we want to set -- * the initial color */ -- e_source_set_color (sdialog->source, color); - -- colorpicker_set_color (GNOME_COLOR_PICKER (picker), color); -+ color_button = gtk_color_button_new_with_color (&color); -+ gtk_label_set_mnemonic_widget (GTK_LABEL (label), color_button); -+ gtk_table_attach ( -+ GTK_TABLE (parent), color_button, -+ 1, 2, row, row + 1, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ gtk_widget_show (color_button); -+ -+ g_signal_connect ( -+ G_OBJECT (color_button), "color-set", -+ G_CALLBACK (color_changed), ec->target); - -- return picker; -+ return color_button; - } - - static ECalConfigItem eccp_items[] = { -@@ -414,7 +409,7 @@ - ECalConfigTargetSource *target; - - if (source) { -- guint32 color; -+ const gchar *color_spec; - - sdialog->original_source = source; - g_object_ref (source); -@@ -423,8 +418,9 @@ - sdialog->source = e_source_new_from_standalone_xml (xml); - g_free (xml); - -- if (e_source_get_color (source, &color)) -- e_source_set_color (sdialog->source, color); -+ color_spec = e_source_peek_color_spec (source); -+ if (color_spec != NULL) -+ e_source_set_color_spec (sdialog->source, color_spec); - } else { - GConfClient *gconf; - GSList *l, *ptr, *temp = NULL; -@@ -504,7 +500,7 @@ - ECalConfigTargetSource *target; - - if (source) { -- guint32 color; -+ const gchar *color_spec; - - sdialog->original_source = source; - g_object_ref (source); -@@ -513,8 +509,8 @@ - sdialog->source = e_source_new_from_standalone_xml (xml); - g_free (xml); - -- e_source_get_color (source, &color); -- e_source_set_color (sdialog->source, color); -+ color_spec = e_source_peek_color_spec (source); -+ e_source_set_color_spec (sdialog->source, color_spec); - } else { - GConfClient *gconf; - GSList *l, *ptr, *temp = NULL; -@@ -589,7 +585,7 @@ - ECalConfigTargetSource *target; - - if (source) { -- guint32 color; -+ const gchar *color_spec; - - sdialog->original_source = source; - g_object_ref (source); -@@ -598,8 +594,8 @@ - sdialog->source = e_source_new_from_standalone_xml (xml); - g_free (xml); - -- e_source_get_color (source, &color); -- e_source_set_color (sdialog->source, color); -+ color_spec = e_source_peek_color_spec (source); -+ e_source_set_color_spec (sdialog->source, color_spec); - } else { - GConfClient *gconf; - GSList *l; ---- evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.glade.gtk-color-button 2007-01-03 10:27:56.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/dialogs/cal-prefs-dialog.glade 2007-02-12 13:32:03.000000000 -0500 -@@ -1231,10 +1231,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True -@@ -1250,10 +1249,9 @@ - - - -- -+ - True - True -- True - False - Pick a color - True ---- evolution-2.9.91/calendar/gui/e-cal-model-tasks.c.gtk-color-button 2007-01-08 09:50:33.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/e-cal-model-tasks.c 2007-02-12 13:32:03.000000000 -0500 -@@ -1025,14 +1025,28 @@ - static const char * - ecmt_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) - { -+ static gchar color_spec[16]; -+ GdkColor color; -+ - g_return_val_if_fail (E_IS_CAL_MODEL_TASKS (model), NULL); - g_return_val_if_fail (comp_data != NULL, NULL); - -+ /* XXX ECalModel's get_color_for_component() method should really -+ * get a GdkColor instead of a color specification string. */ -+ - switch (get_due_status ((ECalModelTasks *) model, comp_data)) { - case E_CAL_MODEL_TASKS_DUE_TODAY: -- return calendar_config_get_tasks_due_today_color (); -+ /* XXX ugly hack */ -+ calendar_config_get_tasks_due_today_color (&color); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color.red, color.green, color.blue); -+ return color_spec; - case E_CAL_MODEL_TASKS_DUE_OVERDUE: -- return calendar_config_get_tasks_overdue_color (); -+ /* XXX ugly hack */ -+ calendar_config_get_tasks_overdue_color (&color); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color.red, color.green, color.blue); -+ return color_spec; - case E_CAL_MODEL_TASKS_DUE_NEVER: - case E_CAL_MODEL_TASKS_DUE_FUTURE: - case E_CAL_MODEL_TASKS_DUE_COMPLETE: ---- evolution-2.9.91/calendar/gui/memos-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/memos-component.c 2007-02-12 13:32:03.000000000 -0500 -@@ -213,7 +213,7 @@ - calendar_config_set_memos_selected (&selected); - } - -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - personal_source = source; - } - ---- evolution-2.9.91/calendar/gui/calendar-component.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/calendar-component.c 2007-02-12 13:32:03.000000000 -0500 -@@ -252,7 +252,7 @@ - } - - g_free (primary_calendar); -- e_source_set_color (personal_source, 0xBECEDD); -+ e_source_set_color_spec (personal_source, "#BECEDD"); - } - - if (!on_the_web) { ---- evolution-2.9.91/calendar/gui/e-cal-model.c.gtk-color-button 2007-01-08 09:50:33.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/e-cal-model.c 2007-02-12 13:32:03.000000000 -0500 -@@ -947,7 +947,7 @@ - ecm_get_color_for_component (ECalModel *model, ECalModelComponent *comp_data) - { - ESource *source; -- guint32 source_color; -+ const gchar *color_spec; - gint i, first_empty = 0; - static AssignedColorData assigned_colors[] = { - { "#BECEDD", NULL }, /* 190 206 221 Blue */ -@@ -965,9 +965,10 @@ - g_return_val_if_fail (E_IS_CAL_MODEL (model), NULL); - - source = e_cal_get_source (comp_data->client); -- if (e_source_get_color (source, &source_color)) { -+ color_spec = e_source_peek_color_spec (source); -+ if (color_spec != NULL) { - g_free (comp_data->color); -- comp_data->color = g_strdup_printf ("#%06x", source_color & 0xffffff); -+ comp_data->color = g_strdup (color_spec); - return comp_data->color; - } - ---- evolution-2.9.91/calendar/gui/calendar-config.h.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/calendar-config.h 2007-02-12 13:32:03.000000000 -0500 -@@ -31,6 +31,7 @@ - #define _CALENDAR_CONFIG_H_ - - #include -+#include - #include - #include - -@@ -201,11 +202,11 @@ - guint calendar_config_add_notification_primary_memos (GConfClientNotifyFunc func, gpointer data); - - /* Colors for the task list */ --const char *calendar_config_get_tasks_due_today_color (void); --void calendar_config_set_tasks_due_today_color (const char *color); -+void calendar_config_get_tasks_due_today_color (GdkColor *color); -+void calendar_config_set_tasks_due_today_color (GdkColor *color); - --const char *calendar_config_get_tasks_overdue_color (void); --void calendar_config_set_tasks_overdue_color (const char *color); -+void calendar_config_get_tasks_overdue_color (GdkColor *color); -+void calendar_config_set_tasks_overdue_color (GdkColor *color); - - /* Settings to hide completed tasks. */ - gboolean calendar_config_get_hide_completed_tasks (void); ---- evolution-2.9.91/calendar/gui/migration.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/migration.c 2007-02-12 13:32:03.000000000 -0500 -@@ -406,7 +406,7 @@ - e_source_group_add_source (group, source, -1); - g_object_unref (source); - -- e_source_set_color (source, 0xFED4D3); -+ e_source_set_color_spec (source, "#FED4D3"); - e_source_group_set_readonly (group, TRUE); - - return group; -@@ -497,7 +497,7 @@ - } - - g_free (primary_calendar); -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - *personal_source = source; - } - -@@ -590,7 +590,7 @@ - calendar_config_set_tasks_selected (&selected); - } - -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - *personal_source = source; - } - -@@ -1098,7 +1098,7 @@ - calendar_config_set_memos_selected (&selected); - } - -- e_source_set_color (source, 0xBECEDD); -+ e_source_set_color_spec (source, "#BECEDD"); - *personal_source = source; - } - -@@ -1161,7 +1161,7 @@ - e_source_set_property (source, "use_ssl", use_ssl); - e_source_set_property (source, "offline_sync", offline_sync ? "1" : "0" ); - -- e_source_set_color (source, 0xEEBC60); -+ e_source_set_color_spec (source, "#EEBC60"); - e_source_group_add_source (group, source, -1); - - ids = gconf_client_get_list (client, CALENDAR_CONFIG_MEMOS_SELECTED_MEMOS, GCONF_VALUE_STRING, NULL); ---- evolution-2.9.91/calendar/gui/calendar-config.c.gtk-color-button 2007-01-03 10:28:00.000000000 -0500 -+++ evolution-2.9.91/calendar/gui/calendar-config.c 2007-02-12 13:32:03.000000000 -0500 -@@ -1219,68 +1219,104 @@ - - /** - * calendar_config_get_tasks_due_today_color: -+ * @color: the location to store the color - * - * Queries the color to be used to display tasks that are due today. -- * -- * Return value: An X color specification. - **/ --const char * --calendar_config_get_tasks_due_today_color (void) -+void -+calendar_config_get_tasks_due_today_color (GdkColor *color) - { -- static char *color = NULL; -+ const gchar *key = CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR; -+ GError *error = NULL; -+ gchar *color_spec; - -- if (color) -- g_free (color); -+ g_return_if_fail (color != NULL); - -- color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, NULL); -- return color; -+ color_spec = gconf_client_get_string (config, key, &error); -+ -+ if (color_spec != NULL && !gdk_color_parse (color_spec, color)) -+ g_warning ("Unknown color \"%s\"", color_spec); -+ else if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } -+ -+ g_free (color_spec); - } - - /** - * calendar_config_set_tasks_due_today_color: -- * @color: X color specification -+ * @color: a #GdkColor - * - * Sets the color to be used to display tasks that are due today. - **/ - void --calendar_config_set_tasks_due_today_color (const char *color) -+calendar_config_set_tasks_due_today_color (GdkColor *color) - { -+ const gchar *key = CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR; -+ GError *error = NULL; -+ gchar color_spec[16]; -+ - g_return_if_fail (color != NULL); - -- gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_DUE_TODAY_COLOR, color, NULL); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color->red, color->green, color->blue); -+ -+ if (!gconf_client_set_string (config, key, color_spec, &error)) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - /** - * calendar_config_get_tasks_overdue_color: -+ * @color: the location to store the color - * - * Queries the color to be used to display overdue tasks. -- * -- * Return value: An X color specification. - **/ --const char * --calendar_config_get_tasks_overdue_color (void) -+void -+calendar_config_get_tasks_overdue_color (GdkColor *color) - { -- static char *color = NULL; -+ const gchar *key = CALENDAR_CONFIG_TASKS_OVERDUE_COLOR; -+ GError *error = NULL; -+ gchar *color_spec; - -- if (color) -- g_free (color); -+ g_return_if_fail (color != NULL); - -- color = gconf_client_get_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, NULL); -- return color; -+ color_spec = gconf_client_get_string (config, key, &error); -+ -+ if (color_spec != NULL && !gdk_color_parse (color_spec, color)) -+ g_warning ("Unknown color \"%s\"", color_spec); -+ else if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } -+ -+ g_free (color_spec); - } - - /** - * calendar_config_set_tasks_overdue_color: -- * @color: X color specification -+ * @color: a #GdkColor - * - * Sets the color to be used to display overdue tasks. - **/ - void --calendar_config_set_tasks_overdue_color (const char *color) -+calendar_config_set_tasks_overdue_color (GdkColor *color) - { -+ const gchar *key = CALENDAR_CONFIG_TASKS_OVERDUE_COLOR; -+ GError *error = NULL; -+ gchar color_spec[16]; -+ - g_return_if_fail (color != NULL); - -- gconf_client_set_string (config, CALENDAR_CONFIG_TASKS_OVERDUE_COLOR, color, NULL); -+ g_snprintf (color_spec, sizeof (color_spec), "#%04x%04x%04x", -+ color->red, color->green, color->blue); -+ -+ if (!gconf_client_set_string (config, key, color_spec, &error)) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - /** diff --git a/evolution-2.9.3-unread-messages.patch b/evolution-2.9.3-unread-messages.patch deleted file mode 100644 index 9eb3b97..0000000 --- a/evolution-2.9.3-unread-messages.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- evolution-2.9.3/mail/em-folder-properties.c.unread-messages 2006-12-09 09:00:08.000000000 -0500 -+++ evolution-2.9.3/mail/em-folder-properties.c 2006-12-09 09:00:09.000000000 -0500 -@@ -145,27 +145,27 @@ - gtk_widget_show (table); - gtk_box_pack_start ((GtkBox *) parent, table, TRUE, TRUE, 0); - -- /* TODO: can this be done in a loop? */ - /* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */ -- label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total)); -+ label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread)); - gtk_widget_show (label); - gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); - gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); - -- sprintf(countstr, "%d", prop_data->total); -+ sprintf(countstr, "%d", prop_data->unread); - label = gtk_label_new (countstr); - gtk_widget_show (label); - gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5); - gtk_table_attach ((GtkTable *) table, label, 1, 2, row, row+1, GTK_FILL | GTK_EXPAND, 0, 0, 0); - row++; - -+ /* TODO: can this be done in a loop? */ - /* to be on the safe side, ngettext is used here, see e.g. comment #3 at bug 272567 */ -- label = gtk_label_new (ngettext ("Unread messages:", "Unread messages:", prop_data->unread)); -+ label = gtk_label_new (ngettext ("Total messages:", "Total messages:", prop_data->total)); - gtk_widget_show (label); - gtk_misc_set_alignment ((GtkMisc *) label, 0.0, 0.5); - gtk_table_attach ((GtkTable *) table, label, 0, 1, row, row+1, GTK_FILL, 0, 0, 0); - -- sprintf(countstr, "%d", prop_data->unread); -+ sprintf(countstr, "%d", prop_data->total); - label = gtk_label_new (countstr); - gtk_widget_show (label); - gtk_misc_set_alignment ((GtkMisc *) label, 1.0, 0.5); ---- evolution-2.9.3/mail/mail-component.c.unread-messages 2006-12-09 09:00:08.000000000 -0500 -+++ evolution-2.9.3/mail/mail-component.c 2006-12-09 09:00:09.000000000 -0500 -@@ -544,6 +544,9 @@ - || g_ascii_strcasecmp(emfv->folder->full_name, ".") == 0) - bits |= 8; - -+ if (selected->len > 1) -+ g_string_append_printf(tmp, ngettext ("%d selected, ", "%d selected, ", selected->len), selected->len); -+ - if (bits == 1) - g_string_append_printf(tmp, ngettext ("%d draft", "%d drafts", visible), visible); - else if (bits == 2) -@@ -553,13 +556,11 @@ - else { - if (!emfv->hide_deleted) - visible += deleted; -+ if (unread && selected->len <= 1) -+ g_string_append_printf(tmp, ngettext ("%d unread, ", "%d unread, ", unread), unread); - g_string_append_printf(tmp, ngettext ("%d total", "%d total", visible), visible); -- if (unread && selected->len <=1) -- g_string_append_printf(tmp, ngettext (", %d unread", ", %d unread", unread), unread); - } - -- if (selected->len > 1) -- g_string_append_printf(tmp, ngettext (", %d selected", ", %d selected", selected->len), selected->len); - message_list_free_uids(emfv->list, selected); - } - diff --git a/evolution.spec b/evolution.spec index 982738c..c6fff1b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,7 +1,7 @@ %define bug_buddy_version 2.15.90 %define dbus_glib_version 0.70 %define dbus_version 0.90 -%define eds_version 1.9.4 +%define eds_version 1.11.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 1.3.6 %define gnome_pilot_version 2.0.13 @@ -18,7 +18,7 @@ %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.10 +%define evo_major 2.12 %define exchange_support 1 %define inline_audio_support 0 @@ -46,8 +46,8 @@ ### Abstract ### Name: evolution -Version: 2.10.1 -Release: 17%{?dist} +Version: 2.11.2 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -64,120 +64,86 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch # Fix for RH bug 164957 (was for 145552): -Patch13: evolution-2.0.2-fix-145552.patch +Patch12: evolution-2.0.2-fix-145552.patch # Part of RH bug 170799: -Patch14: evolution-2.4.1-hide-switcher-buttons-by-default.patch +Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch # Patches for conduits, based upon # rh-161817-attach-116019-conduit_pilot_link_updates.diff # (the latter patch was originally by Mark G. Adams): -# Patch15: evolution-2.5.4-fix-conduits.patch +# Patch14: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) # This patch effects other parts of evolution.spec and so is necessary # for a successful build. -Patch16: evolution-2.5.4-fix-conduit-dir.patch +Patch15: evolution-2.5.4-fix-conduit-dir.patch # Remove gnome-common macros from configure.in. # We do not ship gnome-common (or at least we're not supposed to). -Patch17: evolution-2.7.1-no-gnome-common.patch +Patch16: evolution-2.7.1-no-gnome-common.patch -#Patch18: evolution-2.7.1-notification-cleanups.patch -Patch19: evolution-2.6.0-prototypes.patch +#Patch17: evolution-2.7.1-notification-cleanups.patch # RH bug #157400 / GNOME bug #303877 -Patch20: evolution-2.7.4-candidate-window-position-task.patch +Patch18: evolution-2.7.4-candidate-window-position-task.patch # RH bug #157505 / GNOME bug #303878 -Patch21: evolution-2.7.4-candidate-window-position-calendar.patch - -# RH bug #190359 / GNOME bug #211058 -Patch22: evolution-2.7.3-filter-datespec.patch +Patch19: evolution-2.7.4-candidate-window-position-calendar.patch # RH bug #166231 / GNOME bug #264485 -Patch23: evolution-2.7.3-replicated-cjk-input.patch +Patch20: evolution-2.7.3-replicated-cjk-input.patch # RH bug #178295 / GNOME bug #348638 -Patch24: evolution-2.7.4-deleting-preedit-buffer.patch +Patch21: evolution-2.7.4-deleting-preedit-buffer.patch # RH bug #202289 -Patch25: evolution-2.7.92-fix-prgname.patch +Patch22: evolution-2.7.92-fix-prgname.patch # RH bug #161885 / GNOME bug #309166 -Patch26: evolution-2.8.0-indic-cursor-movement.patch +Patch23: evolution-2.8.0-indic-cursor-movement.patch # RH bug #202751 / GNOME bug #355766 -Patch29: evolution-2.8.0-fix-indic-printing.patch +Patch24: evolution-2.8.0-fix-indic-printing.patch # GNOME bug #362638 -Patch31: evolution-2.8.1-kill-ethread.patch +Patch25: evolution-2.8.1-kill-ethread.patch # GNOME bug #363695 -Patch32: evolution-2.9.1-kill-ememory.patch +Patch26: evolution-2.9.1-kill-ememory.patch # RH bug #176400 -Patch33: evolution-2.9.1-im-context-reset.patch +Patch27: evolution-2.9.1-im-context-reset.patch # RH bug #182247 -Patch34: evolution-2.9.1-first-ascii.patch - -# GNOME bug #373837 -Patch35: evolution-2.9.2-gtk-font-button.patch +Patch28: evolution-2.9.1-first-ascii.patch # RH bug #216537 / GNOME bug #383047 -#Patch36: evolution-2.9.3-view-attachment-uri.patch +#Patch29: evolution-2.9.3-view-attachment-uri.patch # RH bug #215478 / GNOME bug #383842 -Patch38: evolution-2.9.3-source-path-entry.patch - -# RH bug #218801 / GNOME bug #383953 -Patch39: evolution-2.9.3-unread-messages.patch +Patch30: evolution-2.9.3-source-path-entry.patch # RH bug #215467 / GNOME bug #380644 -Patch40: evolution-2.9.3-meeting-list-view.patch - -# GNOME bug #373116 -Patch41: evolution-2.9.3-gtk-color-button.patch +Patch31: evolution-2.9.3-meeting-list-view.patch # GNOME bug #218898 -Patch42: evolution-2.9.4-view-message-source.patch +Patch32: evolution-2.9.4-view-message-source.patch # GNOME bug #376991 -Patch43: evolution-2.10.0-e-passwords.patch +Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 -Patch44: evolution-2.10.0-e-source-combo-box.patch - -# GNOME bug #419469 -Patch45: evolution-2.10.0-shell-main-cleanups.patch - -# GNOME bug #419524 -Patch46: evolution-2.10.0-use-glib-i18n.patch - -# GNOME bug #418971 -Patch47: evolution-2.10.0-drop-old-glib-support.patch +Patch34: evolution-2.10.0-e-source-combo-box.patch # RH bug #235878 / GNOME bug #386503 -Patch48: evolution-2.10.1-fix-help.patch - -# RH bug #234315 / GNOME bug #423766 -Patch49: evolution-2.10.1-saving-attachments.patch - -# RH bug #236860 / GNOME bug #407104 -Patch50: evolution-2.10.1-fix-uri-handling.patch - -# RH bug #236399 / GNOME bug #434019 -Patch51: evolution-2.10.1-en_CA-attribution-format.patch - -# RH bug #238551 / GNOME bug #434981 -Patch52: evolution-2.10.1-e-attachment-bar.patch +Patch35: evolution-2.10.1-fix-help.patch # RH bug #238155 / GNOME bug #427232 -Patch53: evolution-2.10.1-check-uri-before-strcmp.patch +Patch36: evolution-2.10.1-check-uri-before-strcmp.patch # RH bug #240147 / GNOME bug #335241 -Patch54: evolution-2.10.1-send-recv-dialog.patch +Patch37: evolution-2.10.1-send-recv-dialog.patch ## Dependencies ### @@ -300,44 +266,32 @@ Development files needed for building things which link against evolution. %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch11 -p1 -b .commit-enter-on-calendar -%patch13 -p1 -b .fix-164957 -%patch14 -p1 -b .hide-switcher-buttons-by-default -#patch15 -p1 -b .fix-conduits # leave commented -%patch16 -p1 -b .fix-conduit-dir -%patch17 -p1 -b .no-gnome-common -#patch18 -p1 -b .notification-cleanups -%patch19 -p1 -b .prototypes -%patch20 -p1 -b .candidate-window-position-task -%patch21 -p1 -b .candidate-window-position-calendar -%patch22 -p1 -b .filter-datespec -%patch23 -p1 -b .replicated-cjk-input -%patch24 -p1 -b .deleting-preedit-buffer -%patch25 -p1 -b .fix-prgname -%patch26 -p1 -b .indic-cursor-movement -%patch29 -p1 -b .fix-indic-printing -%patch31 -p1 -b .kill-ethread -%patch32 -p1 -b .kill-ememory -%patch33 -p1 -b .im-context-reset -%patch34 -p1 -b .first-ascii -%patch35 -p1 -b .gtk-font-button -#%patch36 -p1 -b .view-attachment-uri -%patch38 -p1 -b .source-path-entry -%patch39 -p1 -b .unread-messages -%patch40 -p1 -b .meeting-list-view -%patch41 -p1 -b .gtk-color-button -%patch42 -p1 -b .view-message-source -%patch43 -p1 -b .e-passwords -%patch44 -p1 -b .e-source-combo-box -%patch45 -p1 -b .shell-main-cleanups -%patch46 -p1 -b .use-glib-i18n -%patch47 -p1 -b .drop-old-glib-support -%patch48 -p1 -b .fix-help -%patch49 -p1 -b .saving-attachments -%patch50 -p1 -b .fix-uri-handling -%patch51 -p1 -b .en_CA-attribution-format -%patch52 -p1 -b .e-attachment-bar -%patch53 -p1 -b .check-uri-before-strcmp -%patch54 -p1 -b .send-recv-dialog +%patch12 -p1 -b .fix-164957 +%patch13 -p1 -b .hide-switcher-buttons-by-default +#patch14 -p1 -b .fix-conduits # leave commented +%patch15 -p1 -b .fix-conduit-dir +%patch16 -p1 -b .no-gnome-common +#patch17 -p1 -b .notification-cleanups +%patch18 -p1 -b .candidate-window-position-task +%patch19 -p1 -b .candidate-window-position-calendar +%patch20 -p1 -b .replicated-cjk-input +%patch21 -p1 -b .deleting-preedit-buffer +%patch22 -p1 -b .fix-prgname +%patch23 -p1 -b .indic-cursor-movement +%patch24 -p1 -b .fix-indic-printing +%patch25 -p1 -b .kill-ethread +%patch26 -p1 -b .kill-ememory +%patch27 -p1 -b .im-context-reset +%patch28 -p1 -b .first-ascii +#%patch29 -p1 -b .view-attachment-uri +%patch30 -p1 -b .source-path-entry +%patch31 -p1 -b .meeting-list-view +%patch32 -p1 -b .view-message-source +%patch33 -p1 -b .e-passwords +%patch34 -p1 -b .e-source-combo-box +%patch35 -p1 -b .fix-help +%patch36 -p1 -b .check-uri-before-strcmp +%patch37 -p1 -b .send-recv-dialog mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -416,9 +370,9 @@ CFLAGS="$CFLAGS \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \ -DEDS_DISABLE_DEPRECATED=1 \ - -DCAMEL_DISABLE_DEPRECATED=1 \ -Wdeclaration-after-statement \ -Werror-implicit-function-declaration" +# TODO: Make -DCAMEL_DISABLE_DEPRECATED work. %endif # Temporary work-around for a bad gnome-doc-utils.make. @@ -498,6 +452,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null %postun @@ -518,6 +473,7 @@ rm -rf $RPM_BUILD_ROOT %{_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/bogo-junk-plugin-%{evo_major}.schemas %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas # The main executable and a symlink: @@ -539,6 +495,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/22x22/apps/evolution.png %{_datadir}/icons/hicolor/24x24/apps/evolution.png %{_datadir}/icons/hicolor/32x32/apps/evolution.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-autocompletion.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-calendar-and-tasks.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-certificates.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-composer.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-mail-accounts.png +%{_datadir}/icons/hicolor/48x48/apps/preferences-mail.png %{_datadir}/icons/hicolor/scalable/apps/evolution.svg # IDL files (should this be in devel subpackage?) @@ -631,6 +593,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-audio-inline.so %endif +%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug +%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so + %{evo_plugin_dir}/org-gnome-calendar-file.eplug %{evo_plugin_dir}/liborg-gnome-calendar-file.so @@ -680,6 +645,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so %{evo_plugin_dir}/org-gnome-mailing-list-actions.xml +%{evo_plugin_dir}/org-gnome-mail-notification.eplug +%{evo_plugin_dir}/liborg-gnome-mail-notification.so + %{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 @@ -759,6 +727,24 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri May 18 2007 Matthew Barnes - 2.11.2-1.fc8 +- Update to 2.11.2 +- Bump evo_major to 2.12. +- Bump eds_version to 1.11.0. +- Update files with new plugins and icons. +- Remove patch for RH bug #190359 (fixed upstream). +- Remove patch for RH bug #218801 (fixed upstream). +- Remove patch for RH bug #234315 (fixed upstream). +- Remove patch for RH bug #236399 (fixed upstream). +- Remove patch for RH bug #236860 (fixed upstream). +- Remove patch for RH bug #238551 (fixed upstream). +- Remove patch for GNOME bug #373837 (fixed upstream). +- Remove patch for GNOME bug #373116 (fixed upstream). +- Remove patch for GNOME bug #418971 (fixed upstream). +- Remove patch for GNOME bug #419469 (fixed upstream). +- Remove patch for GNOME bug #419524 (fixed upstream). +- Remove evolution-2.6.0-prototypes.patch (obsolete). + * Wed May 16 2007 Matthew Barnes - 2.10.1-17.fc7 - Revise patch for GNOME bug #362638 to fix RH bug #237206 (certificate prompt causes crash, again). diff --git a/sources b/sources index 5f86cfa..f210fd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16051c6cbb617cb04665e402566e0976 evolution-2.10.1.tar.bz2 +7f684d90627bacd6e4a7997592112484 evolution-2.11.2.tar.bz2 From 131f47b661916fef59f6fb9329ca84d913862cd8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 31 May 2007 19:21:02 +0000 Subject: [PATCH 141/844] - Evolution no longer requires libgnomeprint[ui]. --- evolution.spec | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/evolution.spec b/evolution.spec index c6fff1b..71efb8c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,8 +10,6 @@ %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonoboui_version 2.4.2 -%define libgnomeprint22_version 2.8.0 -%define libgnomeprintui22_version 2.2.1 %define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 %define redhat_menus_version 5.0.4 @@ -47,7 +45,7 @@ Name: evolution Version: 2.11.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -160,8 +158,6 @@ Requires: gnome-vfs2 >= %{gnomevfs2_version} Requires: gnutls Requires: gtk2 >= 2.4.0 Requires: libbonoboui >= %{libbonoboui_version} -Requires: libgnomeprint22 >= %{libgnomeprint22_version} -Requires: libgnomeprintui22 >= %{libgnomeprintui22_version} Requires: libsoup >= %{soup_version} Requires: redhat-menus >= %{redhat_menus_version} Requires: spamassassin @@ -196,8 +192,6 @@ BuildRequires: intltool >= %{intltool_version} BuildRequires: libbonobo-devel >= 2.0 BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libgnomecanvas-devel >= 2.0 -BuildRequires: libgnomeprint22-devel >= %{libgnomeprint22_version} -BuildRequires: libgnomeprintui22-devel >= %{libgnomeprintui22_version} BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 @@ -727,6 +721,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu May 31 2007 Matthew Barnes - 2.11.2-2.fc8 +- Evolution no longer requires libgnomeprint[ui]. + * Fri May 18 2007 Matthew Barnes - 2.11.2-1.fc8 - Update to 2.11.2 - Bump evo_major to 2.12. From 35c407f1aa7b1ce910eadef6951d29ae92151788 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 Jun 2007 20:07:28 +0000 Subject: [PATCH 142/844] - Update to 2.11.3 - Evolution no longer has versioned file names. - Remove patch for RH bug #202289 (fixed upstream). - Remove patch for RH bug #235878 (fixed upstream). - Remove patch for RH bug #238155 (fixed upstream). - Remove patch for RH bug #240147 (fixed upstream). --- .cvsignore | 2 +- ...ution-2.10.1-check-uri-before-strcmp.patch | 357 ----- evolution-2.10.1-fix-help.patch | 192 --- evolution-2.10.1-send-recv-dialog.patch | 101 -- ...2.11.3-implicit-function-declaration.patch | 10 + ...4.1-hide-switcher-buttons-by-default.patch | 4 +- evolution-2.5.4-fix-conduit-dir.patch | 72 +- evolution-2.7.92-fix-prgname.patch | 11 - evolution-2.8.1-kill-ethread.patch | 1175 ++++++++++------- evolution-2.9.1-kill-ememory.patch | 2 +- evolution.spec | 84 +- sources | 2 +- 12 files changed, 776 insertions(+), 1236 deletions(-) delete mode 100644 evolution-2.10.1-check-uri-before-strcmp.patch delete mode 100644 evolution-2.10.1-fix-help.patch delete mode 100644 evolution-2.10.1-send-recv-dialog.patch create mode 100644 evolution-2.11.3-implicit-function-declaration.patch delete mode 100644 evolution-2.7.92-fix-prgname.patch diff --git a/.cvsignore b/.cvsignore index decf6ed..3dd215b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.11.2.tar.bz2 +evolution-2.11.3.tar.bz2 diff --git a/evolution-2.10.1-check-uri-before-strcmp.patch b/evolution-2.10.1-check-uri-before-strcmp.patch deleted file mode 100644 index ff7e766..0000000 --- a/evolution-2.10.1-check-uri-before-strcmp.patch +++ /dev/null @@ -1,357 +0,0 @@ ---- evolution-2.10.1/plugins/exchange-operations/exchange-config-listener.c.check-uri-before-strcmp 2007-04-09 09:09:13.000000000 -0400 -+++ evolution-2.10.1/plugins/exchange-operations/exchange-config-listener.c 2007-05-14 13:34:13.000000000 -0400 -@@ -1250,26 +1250,30 @@ - exchange_add_autocompletion_folders (GConfClient *gc_client, ExchangeAccount *account) - { - ESourceList *sl=NULL; -- ESourceGroup *group; - ESource *source; -- GSList *groups, *sources; -+ GSList *groups; - gboolean found_group=FALSE; - - sl = e_source_list_new_for_gconf (gc_client, CONF_KEY_CONTACTS); - groups = e_source_list_peek_groups (sl); - - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { -- group = E_SOURCE_GROUP (groups->data); -+ ESourceGroup *group = E_SOURCE_GROUP (groups->data); -+ - if (strcmp (e_source_group_peek_name (group), account->account_name) == 0 - && - strcmp (e_source_group_peek_base_uri (group), EXCHANGE_URI_PREFIX) == 0) { -- -- sources = e_source_group_peek_sources (group); -+ GSList *sources = e_source_group_peek_sources (group); - - for( ; sources != NULL; sources = g_slist_next (sources)) { -- source = E_SOURCE (sources->data); -- if (g_str_has_prefix (e_source_peek_absolute_uri (source), -- "gal://")) { -+ ESource *source = E_SOURCE (sources->data); -+ const gchar *absolute_uri; -+ -+ g_assert (source != NULL); -+ absolute_uri = e_source_peek_absolute_uri (source); -+ if (absolute_uri == NULL) -+ continue; -+ if (g_str_has_prefix (absolute_uri, "gal://")) { - /* Set autocompletion on GAL alone by default */ - e_source_set_property (source, "completion", "true"); - break; ---- evolution-2.10.1/plugins/groupwise-account-setup/camel-gw-listener.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 -+++ evolution-2.10.1/plugins/groupwise-account-setup/camel-gw-listener.c 2007-05-14 13:34:13.000000000 -0400 -@@ -254,10 +254,7 @@ - remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri) - { - ESourceList *list; -- ESourceGroup *group; -- ESource *source; - GSList *groups; -- GSList *sources; - gboolean found_group; - GConfClient* client; - GSList *ids; -@@ -271,19 +268,21 @@ - found_group = FALSE; - - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { -- -- group = E_SOURCE_GROUP (groups->data); -+ ESourceGroup *group = E_SOURCE_GROUP (groups->data); - - if (strcmp (e_source_group_peek_name (group), group_name) == 0 && - strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX ) == 0) { -- -- sources = e_source_group_peek_sources (group); -+ GSList *sources = e_source_group_peek_sources (group); - - for( ; sources != NULL; sources = g_slist_next (sources)) { -- -- source = E_SOURCE (sources->data); -- -- if (strcmp (e_source_peek_relative_uri (source), relative_uri) == 0) { -+ ESource *source = E_SOURCE (sources->data); -+ const gchar *source_relative_uri; -+ -+ g_assert (source != NULL); -+ source_relative_uri = e_source_peek_relative_uri (source); -+ if (source_relative_uri == NULL) -+ continue; -+ if (strcmp (source_relative_uri, relative_uri) == 0) { - - if (!strcmp (conf_key, CALENDAR_SOURCES)) - source_selection_key = SELECTED_CALENDARS; -@@ -328,16 +327,12 @@ - modify_esource (const char* conf_key, GwAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url) - { - ESourceList *list; -- ESourceGroup *group; -- ESource *source; - GSList *groups; -- GSList *sources; - char *old_relative_uri; - CamelURL *url; - gboolean found_group; - GConfClient* client; - const char *poa_address; -- char *new_relative_uri; - const char *new_poa_address; - - url = camel_url_new (old_account_info->source_url, NULL); -@@ -354,20 +349,23 @@ - found_group = FALSE; - - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { -- -- group = E_SOURCE_GROUP (groups->data); -+ ESourceGroup *group = E_SOURCE_GROUP (groups->data); - - if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && - strcmp (e_source_group_peek_base_uri (group), GROUPWISE_URI_PREFIX) == 0) { -- -- sources = e_source_group_peek_sources (group); -+ GSList *sources = e_source_group_peek_sources (group); - - for ( ; sources != NULL; sources = g_slist_next (sources)) { -- -- source = E_SOURCE (sources->data); -- -- if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) { -- -+ ESource *source = E_SOURCE (sources->data); -+ const gchar *source_relative_uri; -+ -+ g_assert (source != NULL); -+ source_relative_uri = e_source_peek_relative_uri (source); -+ if (source_relative_uri == NULL) -+ continue; -+ if (strcmp (source_relative_uri, old_relative_uri) == 0) { -+ gchar *new_relative_uri; -+ - new_relative_uri = g_strdup_printf ("%s@%s/", new_url->user, new_poa_address); - e_source_group_set_name (group, new_group_name); - e_source_set_relative_uri (source, new_relative_uri); ---- evolution-2.10.1/plugins/hula-account-setup/camel-hula-listener.c.check-uri-before-strcmp 2007-04-09 09:09:14.000000000 -0400 -+++ evolution-2.10.1/plugins/hula-account-setup/camel-hula-listener.c 2007-05-14 13:34:13.000000000 -0400 -@@ -241,10 +241,7 @@ - remove_esource (const char *conf_key, const char *group_name, char* source_name, const char* relative_uri) - { - ESourceList *list; -- ESourceGroup *group; -- ESource *source; - GSList *groups; -- GSList *sources; - gboolean found_group; - GConfClient* client; - GSList *ids; -@@ -258,19 +255,21 @@ - found_group = FALSE; - - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { -- -- group = E_SOURCE_GROUP (groups->data); -+ ESourceGroup *group = E_SOURCE_GROUP (groups->data); - - if (strcmp (e_source_group_peek_name (group), group_name) == 0 && - strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX ) == 0) { -- -- sources = e_source_group_peek_sources (group); -+ GSList *sources = e_source_group_peek_sources (group); - - for( ; sources != NULL; sources = g_slist_next (sources)) { -- -- source = E_SOURCE (sources->data); -- -- if (strcmp (e_source_peek_relative_uri (source), relative_uri) == 0) { -+ ESource *source = E_SOURCE (sources->data); -+ const gchar *source_relative_uri; -+ -+ g_assert (source != NULL); -+ source_relative_uri = e_source_peek_relative_uri (source); -+ if (source_relative_uri == NULL) -+ continue; -+ if (strcmp (source_relative_uri, relative_uri) == 0) { - - if (!strcmp (conf_key, CALENDAR_SOURCES)) - source_selection_key = SELECTED_CALENDARS; -@@ -311,15 +310,11 @@ - modify_esource (const char* conf_key, HulaAccountInfo *old_account_info, const char* new_group_name, CamelURL *new_url) - { - ESourceList *list; -- ESourceGroup *group; -- ESource *source; - GSList *groups; -- GSList *sources; - char *old_relative_uri; - CamelURL *url; - gboolean found_group; - GConfClient* client; -- char *new_relative_uri; - - url = camel_url_new (old_account_info->source_url, NULL); - if (!url->host || strlen (url->host) ==0) -@@ -334,19 +329,23 @@ - - for ( ; groups != NULL && !found_group; groups = g_slist_next (groups)) { - -- group = E_SOURCE_GROUP (groups->data); -+ ESourceGroup *group = E_SOURCE_GROUP (groups->data); - - if (strcmp (e_source_group_peek_name (group), old_account_info->name) == 0 && - strcmp (e_source_group_peek_base_uri (group), HULA_CALDAV_URI_PREFIX) == 0) { -- -- sources = e_source_group_peek_sources (group); -+ GSList *sources = e_source_group_peek_sources (group); - - for ( ; sources != NULL; sources = g_slist_next (sources)) { -- -- source = E_SOURCE (sources->data); -- -- if (strcmp (e_source_peek_relative_uri (source), old_relative_uri) == 0) { -- -+ ESource *source = E_SOURCE (sources->data); -+ const gchar *source_relative_uri; -+ -+ g_assert (source != NULL); -+ source_relative_uri = e_source_peek_relative_uri (source); -+ if (source_relative_uri == NULL) -+ continue; -+ if (strcmp (source_relative_uri, old_relative_uri) == 0) { -+ gchar *new_relative_uri; -+ - new_relative_uri = g_strdup_printf ("%s@%s:%d/dav/%s/calendar/Personal", new_url->user, new_url->host, new_url->port, new_url->user); - e_source_group_set_name (group, new_group_name); - e_source_set_relative_uri (source, new_relative_uri); ---- evolution-2.10.1/addressbook/gui/component/addressbook-component.c.check-uri-before-strcmp 2007-04-09 09:07:42.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook-component.c 2007-05-14 13:34:13.000000000 -0400 -@@ -118,7 +118,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - personal_source = source; - break; - } ---- evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/component/addressbook-migrate.c 2007-05-14 13:34:13.000000000 -0400 -@@ -472,7 +472,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - *personal_source = g_object_ref (source); - break; - } ---- evolution-2.10.1/calendar/gui/calendar-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/calendar-component.c 2007-05-14 13:34:13.000000000 -0400 -@@ -210,7 +210,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - personal_source = source; - break; - } ---- evolution-2.10.1/calendar/gui/tasks-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/tasks-component.c 2007-05-14 13:34:13.000000000 -0400 -@@ -170,7 +170,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - personal_source = source; - break; - } ---- evolution-2.10.1/calendar/gui/memos-component.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/memos-component.c 2007-05-14 13:34:13.000000000 -0400 -@@ -174,7 +174,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - personal_source = source; - break; - } ---- evolution-2.10.1/calendar/gui/migration.c.check-uri-before-strcmp 2007-05-14 13:21:57.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/migration.c 2007-05-14 13:34:13.000000000 -0400 -@@ -466,7 +466,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - *personal_source = g_object_ref (source); - break; - } -@@ -562,7 +568,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - *personal_source = g_object_ref (source); - break; - } -@@ -1070,7 +1082,13 @@ - GSList *s; - for (s = sources; s; s = s->next) { - ESource *source = E_SOURCE (s->data); -- if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) { -+ const gchar *relative_uri; -+ -+ g_assert (source != NULL); -+ relative_uri = e_source_peek_relative_uri (source); -+ if (relative_uri == NULL) -+ continue; -+ if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) { - *personal_source = g_object_ref (source); - break; - } diff --git a/evolution-2.10.1-fix-help.patch b/evolution-2.10.1-fix-help.patch deleted file mode 100644 index caf4565..0000000 --- a/evolution-2.10.1-fix-help.patch +++ /dev/null @@ -1,192 +0,0 @@ ---- evolution-2.10.1/widgets/misc/e-multi-config-dialog.c.fix-help 2007-04-09 09:10:24.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-multi-config-dialog.c 2007-04-13 22:26:25.000000000 -0400 -@@ -192,13 +192,12 @@ - - switch (response_id) { - case GTK_RESPONSE_HELP: -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- "config-prefs", -- &error); -- if (error != NULL) -+ gnome_help_display ( -+ "evolution.xml", "config-prefs", &error); -+ if (error != NULL) { - g_warning ("%s", error->message); -+ g_error_free (error); -+ } - break; - case GTK_RESPONSE_CLOSE: - default: ---- evolution-2.10.1/widgets/misc/e-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/widgets/misc/e-send-options.c 2007-04-13 22:26:25.000000000 -0400 -@@ -588,34 +588,32 @@ - - static void e_send_options_cb (GtkDialog *dialog, gint state, gpointer func_data) - { -+ ESendOptionsDialogPrivate *priv; -+ ESendOptionsDialog *sod; -+ GError *error = NULL; - -- ESendOptionsDialogPrivate *priv; -- ESendOptionsDialog *sod; -- GError *error = NULL; -- -- sod = func_data; -- priv = sod->priv; -- -- switch (state) { -- case GTK_RESPONSE_OK: -- e_send_options_get_widgets_data (sod); -- case GTK_RESPONSE_CANCEL: -- gtk_widget_hide (priv->main); -- gtk_widget_destroy (priv->main); -- g_object_unref (priv->xml); -- break; -- case GTK_RESPONSE_HELP: -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- priv->help_section, -- &error); -- if (error != NULL) -- g_warning ("%s", error->message); -- break; -- } -- g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); -+ sod = func_data; -+ priv = sod->priv; -+ -+ switch (state) { -+ case GTK_RESPONSE_OK: -+ e_send_options_get_widgets_data (sod); -+ case GTK_RESPONSE_CANCEL: -+ gtk_widget_hide (priv->main); -+ gtk_widget_destroy (priv->main); -+ g_object_unref (priv->xml); -+ break; -+ case GTK_RESPONSE_HELP: -+ gnome_help_display ( -+ "evolution.xml", priv->help_section, &error); -+ if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } -+ break; -+ } - -+ g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); - } - - gboolean ---- evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/plugins/exchange-operations/exchange-send-options.c 2007-04-13 22:26:25.000000000 -0400 -@@ -191,21 +191,20 @@ - - switch (state) { - case GTK_RESPONSE_OK: -- exchange_send_options_get_widgets_data (sod); -+ exchange_send_options_get_widgets_data (sod); - case GTK_RESPONSE_CANCEL: -- gtk_widget_hide (priv->main); -- gtk_widget_destroy (priv->main); -- g_object_unref (priv->xml); -- break; -+ gtk_widget_hide (priv->main); -+ gtk_widget_destroy (priv->main); -+ g_object_unref (priv->xml); -+ break; - case GTK_RESPONSE_HELP: -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- priv->help_section, -- &error); -- if (error != NULL) -- g_warning ("%s", error->message); -- break; -+ gnome_help_display ( -+ "evolution.xml", priv->help_section, &error); -+ if (error != NULL) { -+ g_warning ("%s", error->message); -+ g_error_free (error); -+ } -+ break; - } - g_signal_emit (G_OBJECT (func_data), signals[SOD_RESPONSE], 0, state); - ---- evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/addressbook/gui/contact-editor/e-contact-editor.c 2007-04-13 22:26:02.000000000 -0400 -@@ -3235,13 +3235,12 @@ - { - GError *error = NULL; - -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- "usage-contact-cards", -- &error); -- if (error != NULL) -+ gnome_help_display ( -+ "evolution.xml", "usage-contact-cards", &error); -+ if (error != NULL) { - g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - static GList * ---- evolution-2.10.1/composer/e-msg-composer.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/composer/e-msg-composer.c 2007-04-13 22:26:25.000000000 -0400 -@@ -2886,13 +2886,12 @@ - GError *error = NULL; - EMsgComposerPrivate *p = composer->priv; - -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- "usage-composer", -- &error); -- if (error != NULL) -+ gnome_help_display ( -+ "evolution.xml", "usage-composer", &error); -+ if (error != NULL) { - g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - ---- evolution-2.10.1/shell/e-shell-window.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/shell/e-shell-window.c 2007-04-13 22:26:02.000000000 -0400 -@@ -1042,7 +1042,7 @@ - bonobo_ui_util_set_ui (priv->ui_component, - PREFIX, - xmlfile, -- "evolution-" BASE_VERSION, NULL); -+ "evolution", NULL); - g_free (xmlfile); - - e_shell_window_commands_setup (window); ---- evolution-2.10.1/calendar/gui/dialogs/comp-editor.c.fix-help 2007-04-13 22:25:21.000000000 -0400 -+++ evolution-2.10.1/calendar/gui/dialogs/comp-editor.c 2007-04-13 22:26:25.000000000 -0400 -@@ -1693,13 +1693,12 @@ - - priv = editor->priv; - -- gnome_help_display_desktop (NULL, -- "evolution-" BASE_VERSION, -- "evolution-" BASE_VERSION ".xml", -- priv->help_section, -- &error); -- if (error != NULL) -+ gnome_help_display ( -+ "evolution.xml", priv->help_section, &error); -+ if (error != NULL) { - g_warning ("%s", error->message); -+ g_error_free (error); -+ } - } - - diff --git a/evolution-2.10.1-send-recv-dialog.patch b/evolution-2.10.1-send-recv-dialog.patch deleted file mode 100644 index e8fb570..0000000 --- a/evolution-2.10.1-send-recv-dialog.patch +++ /dev/null @@ -1,101 +0,0 @@ ---- evolution-2.11.2/mail/mail-send-recv.c.send-recv-dialog 2007-05-18 16:03:24.000000000 -0400 -+++ evolution-2.11.2/mail/mail-send-recv.c 2007-05-18 16:08:58.000000000 -0400 -@@ -362,23 +362,6 @@ - return SEND_INVALID; - } - --static gboolean --dialog_map (GtkWidget *window, GdkEvent *event, GtkWidget *table) --{ -- int h, w; -- -- w = table->allocation.width + 30 /* Spacing around the table */; -- h = table->allocation.height + 60 /* Cancell All button and Seperator and outer spacing */; -- -- if (w > 750) -- w = 750; -- if (h > 400) -- h = 400; -- gtk_widget_set_size_request (window, w, h); -- -- return FALSE; --} -- - static struct _send_data * - build_dialog (EAccountList *accounts, CamelFolder *outbox, const char *destination) - { -@@ -444,7 +427,7 @@ - scrolled_window = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy ( - GTK_SCROLLED_WINDOW (scrolled_window), -- GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); -+ GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - - gtk_scrolled_window_add_with_viewport ( - GTK_SCROLLED_WINDOW (scrolled_window), table); -@@ -504,6 +487,8 @@ - "stock_mail-receive", E_ICON_SIZE_LARGE_TOOLBAR); - pretty_url = format_url (source->url, account->name); - label = gtk_label_new (NULL); -+ gtk_label_set_ellipsize ( -+ GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_label_set_markup (GTK_LABEL (label), pretty_url); - g_free (pretty_url); - -@@ -522,16 +507,16 @@ - - gtk_table_attach ( - GTK_TABLE (table), recv_icon, -- 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ 0, 1, row, row+2, 0, 0, 0, 0); - gtk_table_attach ( - GTK_TABLE (table), label, - 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); - gtk_table_attach ( - GTK_TABLE (table), progress_bar, -- 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ 2, 3, row, row+2, 0, 0, 0, 0); - gtk_table_attach ( - GTK_TABLE (table), cancel_button, -- 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ 3, 4, row, row+2, 0, 0, 0, 0); - gtk_table_attach ( - GTK_TABLE (table), status_label, - 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -@@ -572,6 +557,8 @@ - "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); - pretty_url = format_url (destination, NULL); - label = gtk_label_new (NULL); -+ gtk_label_set_ellipsize ( -+ GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_label_set_markup (GTK_LABEL (label), pretty_url); - - g_free (pretty_url); -@@ -587,16 +574,16 @@ - - gtk_table_attach ( - GTK_TABLE (table), send_icon, -- 0, 1, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ 0, 1, row, row+2, 0, 0, 0, 0); - gtk_table_attach ( - GTK_TABLE (table), label, - 1, 2, row, row+1, GTK_EXPAND | GTK_FILL, 0, 0, 0); - gtk_table_attach ( - GTK_TABLE (table), progress_bar, -- 2, 3, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ 2, 3, row, row+2, 0, 0, 0, 0); - gtk_table_attach ( - GTK_TABLE (table), cancel_button, -- 3, 4, row, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -+ 3, 4, row, row+2, 0, 0, 0, 0); - gtk_table_attach ( - GTK_TABLE (table), status_label, - 1, 2, row+1, row+2, GTK_EXPAND | GTK_FILL, 0, 0, 0); -@@ -615,7 +602,6 @@ - gtk_widget_show (GTK_WIDGET (gd)); - - g_signal_connect (gd, "response", G_CALLBACK (dialog_response), data); -- g_signal_connect (gd, "map-event", G_CALLBACK (dialog_map), table); - - g_object_weak_ref ((GObject *) gd, (GWeakNotify) dialog_destroy_cb, data); - diff --git a/evolution-2.11.3-implicit-function-declaration.patch b/evolution-2.11.3-implicit-function-declaration.patch new file mode 100644 index 0000000..554191a --- /dev/null +++ b/evolution-2.11.3-implicit-function-declaration.patch @@ -0,0 +1,10 @@ +--- evolution-2.11.3/mail/mail-ops.h.implicit-function-declaration 2007-06-04 13:52:57.000000000 -0400 ++++ evolution-2.11.3/mail/mail-ops.h 2007-06-04 13:53:23.000000000 -0400 +@@ -156,6 +156,7 @@ void mail_prep_offline(const char *uri, + int mail_store_set_offline(CamelStore *store, gboolean offline, + void (*done)(CamelStore *, void *data), + void *data); ++int mail_store_prepare_offline (CamelStore *store); + + /* filter driver execute shell command async callback */ + void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data); diff --git a/evolution-2.4.1-hide-switcher-buttons-by-default.patch b/evolution-2.4.1-hide-switcher-buttons-by-default.patch index bada5b5..f5ac169 100644 --- a/evolution-2.4.1-hide-switcher-buttons-by-default.patch +++ b/evolution-2.4.1-hide-switcher-buttons-by-default.patch @@ -1,5 +1,5 @@ ---- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in.hide-switcher-buttons-by-default 2005-10-26 16:21:15.000000000 -0400 -+++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in.in 2005-10-26 16:21:22.000000000 -0400 +--- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.hide-switcher-buttons-by-default 2005-10-26 16:21:15.000000000 -0400 ++++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in 2005-10-26 16:21:22.000000000 -0400 @@ -99,7 +99,7 @@ /apps/evolution/shell/view_defaults/buttons_visible evolution diff --git a/evolution-2.5.4-fix-conduit-dir.patch b/evolution-2.5.4-fix-conduit-dir.patch index cba890a..31726ab 100644 --- a/evolution-2.5.4-fix-conduit-dir.patch +++ b/evolution-2.5.4-fix-conduit-dir.patch @@ -1,88 +1,88 @@ ---- evolution-2.9.5/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-01-03 10:32:47.000000000 -0500 -+++ evolution-2.9.5/addressbook/conduit/Makefile.am 2007-01-21 22:05:23.000000000 -0500 -@@ -28,7 +28,7 @@ +--- evolution-2.11.3/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-06-03 11:07:44.000000000 -0400 ++++ evolution-2.11.3/addressbook/conduit/Makefile.am 2007-06-04 12:55:32.000000000 -0400 +@@ -28,7 +28,7 @@ e-address.conduit: e-address.conduit.in -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-address-$(BASE_VERSION).conduit + conduit_DATA = e-address.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.9.5/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-01-21 22:05:44.000000000 -0500 -+++ evolution-2.9.5/addressbook/conduit/Makefile.in 2007-01-21 22:06:04.000000000 -0500 -@@ -459,7 +459,7 @@ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +--- evolution-2.11.3/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-06-04 07:36:46.000000000 -0400 ++++ evolution-2.11.3/addressbook/conduit/Makefile.in 2007-06-04 12:55:53.000000000 -0400 +@@ -459,7 +459,7 @@ libeaddress_conduit_la_LIBADD = \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-address-$(BASE_VERSION).conduit + conduit_DATA = e-address.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.9.5/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/todo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 -@@ -24,7 +24,7 @@ +--- evolution-2.11.3/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 ++++ evolution-2.11.3/calendar/conduits/todo/Makefile.am 2007-06-04 12:56:19.000000000 -0400 +@@ -25,7 +25,7 @@ e-todo.conduit: e-todo.conduit.in -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo-$(BASE_VERSION).conduit + conduit_DATA = e-todo.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.9.5/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:31.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/todo/Makefile.in 2007-01-21 22:06:39.000000000 -0500 -@@ -454,7 +454,7 @@ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +--- evolution-2.11.3/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-06-04 07:36:51.000000000 -0400 ++++ evolution-2.11.3/calendar/conduits/todo/Makefile.in 2007-06-04 12:56:28.000000000 -0400 +@@ -456,7 +456,7 @@ libetodo_conduit_la_LIBADD = \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo-$(BASE_VERSION).conduit + conduit_DATA = e-todo.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.9.5/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/memo/Makefile.am 2007-01-21 22:05:23.000000000 -0500 -@@ -24,7 +24,7 @@ +--- evolution-2.11.3/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 ++++ evolution-2.11.3/calendar/conduits/memo/Makefile.am 2007-06-04 12:56:49.000000000 -0400 +@@ -25,7 +25,7 @@ e-memo.conduit: e-memo.conduit.in -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo-$(BASE_VERSION).conduit + conduit_DATA = e-memo.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.9.5/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-01-21 22:06:46.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/memo/Makefile.in 2007-01-21 22:06:54.000000000 -0500 -@@ -454,7 +454,7 @@ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +--- evolution-2.11.3/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-06-04 07:36:50.000000000 -0400 ++++ evolution-2.11.3/calendar/conduits/memo/Makefile.in 2007-06-04 12:56:40.000000000 -0400 +@@ -456,7 +456,7 @@ libememo_conduit_la_LIBADD = \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo-$(BASE_VERSION).conduit + conduit_DATA = e-memo.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.9.5/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-01-03 10:34:54.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/calendar/Makefile.am 2007-01-21 22:05:23.000000000 -0500 -@@ -24,7 +24,7 @@ +--- evolution-2.11.3/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 ++++ evolution-2.11.3/calendar/conduits/calendar/Makefile.am 2007-06-04 12:57:02.000000000 -0400 +@@ -25,7 +25,7 @@ e-calendar.conduit: e-calendar.conduit.i -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar-$(BASE_VERSION).conduit + conduit_DATA = e-calendar.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.9.5/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-01-21 22:06:15.000000000 -0500 -+++ evolution-2.9.5/calendar/conduits/calendar/Makefile.in 2007-01-21 22:06:23.000000000 -0500 -@@ -456,7 +456,7 @@ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +--- evolution-2.11.3/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-06-04 07:36:50.000000000 -0400 ++++ evolution-2.11.3/calendar/conduits/calendar/Makefile.in 2007-06-04 12:57:11.000000000 -0400 +@@ -458,7 +458,7 @@ libecalendar_conduit_la_LIBADD = \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ +conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar-$(BASE_VERSION).conduit + conduit_DATA = e-calendar.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) diff --git a/evolution-2.7.92-fix-prgname.patch b/evolution-2.7.92-fix-prgname.patch deleted file mode 100644 index 98689f4..0000000 --- a/evolution-2.7.92-fix-prgname.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.7.92/shell/main.c.fix-prgname 2006-08-28 11:04:44.000000000 -0400 -+++ evolution-2.7.92/shell/main.c 2006-08-28 11:04:56.000000000 -0400 -@@ -516,7 +516,7 @@ - - g_option_context_add_main_entries (context, options, GETTEXT_PACKAGE); - -- program = gnome_program_init (PACKAGE "-" BASE_VERSION, VERSION, LIBGNOMEUI_MODULE, argc, argv, -+ program = gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, argc, argv, - GNOME_PROGRAM_STANDARD_PROPERTIES, - GNOME_PARAM_GOPTION_CONTEXT, context, - GNOME_PARAM_HUMAN_READABLE_NAME, _("Evolution"), diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index be61226..1892023 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,6 +1,6 @@ ---- evolution-2.11.2/mail/mail-send-recv.c.kill-ethread 2007-04-20 00:28:22.000000000 -0400 -+++ evolution-2.11.2/mail/mail-send-recv.c 2007-05-18 15:34:09.000000000 -0400 -@@ -778,23 +778,22 @@ +--- evolution-2.11.3/mail/mail-send-recv.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/mail-send-recv.c 2007-06-04 14:25:34.000000000 -0400 +@@ -764,23 +764,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ struct _refresh_folders_msg { @@ -28,7 +28,7 @@ int i; CamelFolder *folder; CamelException ex = CAMEL_EXCEPTION_INITIALISER; -@@ -812,17 +811,14 @@ +@@ -802,17 +801,14 @@ refresh_folders_get (struct _mail_msg *m } static void @@ -48,7 +48,7 @@ int i; for (i=0;ifolders->len;i++) -@@ -831,11 +827,12 @@ +@@ -821,11 +817,12 @@ refresh_folders_free (struct _mail_msg * camel_object_unref(m->store); } @@ -66,7 +66,7 @@ }; static void -@@ -868,13 +865,13 @@ +@@ -858,13 +855,13 @@ receive_update_got_folderinfo(CamelStore get_folders(store, folders, info); @@ -82,9 +82,9 @@ } else { receive_done ("", data); } ---- evolution-2.11.2/mail/mail-component.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 -+++ evolution-2.11.2/mail/mail-component.c 2007-05-18 15:34:09.000000000 -0400 -@@ -1014,7 +1014,7 @@ +--- evolution-2.11.3/mail/mail-component.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/mail-component.c 2007-06-04 14:25:34.000000000 -0400 +@@ -1014,7 +1014,7 @@ impl_handleURI (PortableServer_Servant s if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -93,8 +93,8 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.11.2/mail/mail-ops.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/mail-ops.c 2007-05-18 15:34:09.000000000 -0400 +--- evolution-2.11.3/mail/mail-ops.c.kill-ethread 2007-06-01 03:08:56.000000000 -0400 ++++ evolution-2.11.3/mail/mail-ops.c 2007-06-04 14:25:34.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -104,7 +104,7 @@ CamelFolder *source_folder; /* where they come from */ GPtrArray *source_uids; /* uids to copy, or NULL == copy all */ -@@ -99,8 +99,8 @@ +@@ -99,8 +99,8 @@ struct _fetch_mail_msg { void *data; }; @@ -115,7 +115,7 @@ { return g_strdup (_("Filtering Selected Messages")); } -@@ -108,9 +108,8 @@ +@@ -108,9 +108,8 @@ em_filter_folder_element_describe (struc /* filter a folder, or a subset thereof, uses source_folder/source_uids */ /* this is shared with fetch_mail */ static void @@ -126,7 +126,7 @@ CamelFolder *folder; GPtrArray *uids, *folder_uids = NULL; -@@ -137,15 +136,15 @@ +@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct else folder_uids = uids = camel_folder_get_uids (folder); @@ -145,7 +145,7 @@ camel_folder_thaw (folder); if (m->destination) -@@ -161,15 +160,13 @@ +@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct } static void @@ -163,7 +163,7 @@ if (m->source_folder) camel_object_unref (m->source_folder); -@@ -188,11 +185,12 @@ +@@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m mail_session_flush_filter_log (); } @@ -181,7 +181,7 @@ }; void -@@ -202,7 +200,7 @@ +@@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_ { struct _filter_mail_msg *m; @@ -190,7 +190,7 @@ m->source_folder = source_folder; camel_object_ref (source_folder); m->source_uids = uids; -@@ -221,7 +219,7 @@ +@@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } @@ -199,7 +199,7 @@ } /* convenience functions for it */ -@@ -260,17 +258,16 @@ +@@ -260,17 +258,16 @@ uid_cachename_hack (CamelStore *store) return filename; } @@ -221,7 +221,7 @@ int i; if (m->cancel) -@@ -283,20 +280,20 @@ +@@ -283,20 +280,20 @@ fetch_mail_fetch (struct _mail_msg *mm) /* FIXME: this should support keep_on_server too, which would then perform a spool access thingy, right? problem is matching raw messages to uid's etc. */ if (!strncmp (m->source_uri, "mbox:", 5)) { @@ -247,7 +247,7 @@ if (folder) { /* this handles 'keep on server' stuff, if we have any new uid's to copy -@@ -322,17 +319,17 @@ +@@ -322,17 +319,17 @@ fetch_mail_fetch (struct _mail_msg *mm) camel_uid_cache_free_uids (cache_uids); fm->cache = cache; @@ -268,7 +268,7 @@ /* not keep on server - just delete all the actual messages on the server */ for (i=0;ilen;i++) { d(printf("force delete uid '%s'\n", (char *)folder_uids->pdata[i])); -@@ -348,7 +345,7 @@ +@@ -348,7 +345,7 @@ fetch_mail_fetch (struct _mail_msg *mm) camel_uid_cache_destroy (cache); camel_folder_free_uids (folder, folder_uids); } else { @@ -277,7 +277,7 @@ } /* we unref the source folder here since we -@@ -372,31 +369,28 @@ +@@ -372,31 +369,28 @@ fail: } static void @@ -318,7 +318,7 @@ }; /* ouch, a 'do everything' interface ... */ -@@ -409,7 +403,7 @@ +@@ -409,7 +403,7 @@ mail_fetch_mail (const char *source, int struct _fetch_mail_msg *m; struct _filter_mail_msg *fm; @@ -327,7 +327,7 @@ fm = (struct _filter_mail_msg *)m; m->source_uri = g_strdup (source); fm->delete = !keep; -@@ -426,7 +420,7 @@ +@@ -426,7 +420,7 @@ mail_fetch_mail (const char *source, int if (status) camel_filter_driver_set_status_func (fm->driver, status, status_data); @@ -336,7 +336,7 @@ } /* ********************************************************************** */ -@@ -657,7 +651,7 @@ +@@ -657,7 +651,7 @@ exit: /* ** SEND MAIL QUEUE ***************************************************** */ struct _send_queue_msg { @@ -345,7 +345,7 @@ CamelFolder *queue; char *destination; -@@ -689,9 +683,8 @@ +@@ -689,9 +683,8 @@ report_status (struct _send_queue_msg *m } static void @@ -356,7 +356,7 @@ CamelFolder *sent_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT); GPtrArray *uids, *send_uids = NULL; CamelException ex; -@@ -739,17 +732,17 @@ +@@ -739,17 +732,17 @@ send_queue_send(struct _mail_msg *mm) if (camel_exception_is_set (&ex)) { if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { /* merge exceptions into one */ @@ -378,7 +378,7 @@ break; } } -@@ -759,7 +752,7 @@ +@@ -759,7 +752,7 @@ send_queue_send(struct _mail_msg *mm) if (j > 0) report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed to send %d of %d messages"), j, send_uids->len); @@ -387,7 +387,7 @@ report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Canceled.")); else report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); -@@ -785,19 +778,15 @@ +@@ -785,19 +778,15 @@ send_queue_send(struct _mail_msg *mm) } static void @@ -409,7 +409,7 @@ if (m->driver) camel_object_unref(m->driver); camel_object_unref(m->queue); -@@ -806,11 +795,12 @@ +@@ -806,11 +795,12 @@ send_queue_free(struct _mail_msg *mm) camel_operation_unref(m->cancel); } @@ -427,7 +427,7 @@ }; /* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */ -@@ -823,7 +813,7 @@ +@@ -823,7 +813,7 @@ mail_send_queue(CamelFolder *queue, cons { struct _send_queue_msg *m; @@ -436,7 +436,7 @@ m->queue = queue; camel_object_ref(queue); m->destination = g_strdup(destination); -@@ -839,13 +829,13 @@ +@@ -839,13 +829,13 @@ mail_send_queue(CamelFolder *queue, cons m->driver = camel_session_get_filter_driver (session, type, NULL); camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); @@ -452,7 +452,7 @@ CamelFolder *folder; CamelMimeMessage *message; -@@ -856,45 +846,40 @@ +@@ -856,45 +846,40 @@ struct _append_msg { void *data; }; @@ -511,7 +511,7 @@ }; void -@@ -911,7 +896,7 @@ +@@ -911,7 +896,7 @@ mail_append_mail (CamelFolder *folder, C camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); @@ -520,7 +520,7 @@ m->folder = folder; camel_object_ref(folder); m->message = message; -@@ -921,13 +906,13 @@ +@@ -921,13 +906,13 @@ mail_append_mail (CamelFolder *folder, C m->done = done; m->data = data; @@ -536,7 +536,7 @@ CamelFolder *source; GPtrArray *uids; -@@ -939,24 +924,21 @@ +@@ -939,24 +924,21 @@ struct _transfer_msg { void *data; }; @@ -566,7 +566,7 @@ return; if (dest == m->source) { -@@ -968,7 +950,7 @@ +@@ -968,7 +950,7 @@ transfer_messages_transfer (struct _mail camel_folder_freeze (m->source); camel_folder_freeze (dest); @@ -575,7 +575,7 @@ /* make sure all deleted messages are marked as seen */ -@@ -987,29 +969,26 @@ +@@ -987,29 +969,26 @@ transfer_messages_transfer (struct _mail } static void @@ -614,7 +614,7 @@ }; void -@@ -1026,7 +1005,7 @@ +@@ -1026,7 +1005,7 @@ mail_transfer_messages (CamelFolder *sou g_assert(uids != NULL); g_assert(dest_uri != NULL); @@ -623,7 +623,7 @@ m->source = source; camel_object_ref (source); m->uids = uids; -@@ -1036,13 +1015,13 @@ +@@ -1036,13 +1015,13 @@ mail_transfer_messages (CamelFolder *sou m->done = done; m->data = data; @@ -639,7 +639,7 @@ CamelStore *store; CamelFolderInfo *info; -@@ -1050,10 +1029,9 @@ +@@ -1050,10 +1029,9 @@ struct _get_folderinfo_msg { void *data; }; @@ -652,7 +652,7 @@ char *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1063,25 +1041,22 @@ +@@ -1063,25 +1041,22 @@ get_folderinfo_desc (struct _mail_msg *m } static void @@ -683,7 +683,7 @@ g_free (url); } -@@ -1090,20 +1065,19 @@ +@@ -1090,20 +1065,19 @@ get_folderinfo_got (struct _mail_msg *mm } static void @@ -711,7 +711,7 @@ }; int -@@ -1112,19 +1086,19 @@ +@@ -1112,19 +1086,19 @@ mail_get_folderinfo (CamelStore *store, struct _get_folderinfo_msg *m; int id; @@ -736,7 +736,7 @@ return id; } -@@ -1196,7 +1170,7 @@ +@@ -1196,7 +1170,7 @@ mail_build_attachment(CamelFolder *folde presumably create a folder ... */ struct _get_folder_msg { @@ -745,7 +745,7 @@ char *uri; guint32 flags; -@@ -1205,71 +1179,64 @@ +@@ -1205,71 +1179,64 @@ struct _get_folder_msg { void *data; }; @@ -834,7 +834,7 @@ char *uri; CamelStore *store; -@@ -1277,50 +1244,43 @@ +@@ -1277,50 +1244,43 @@ struct _get_store_msg { void *data; }; @@ -897,7 +897,7 @@ }; int -@@ -1329,25 +1289,25 @@ +@@ -1329,25 +1289,25 @@ mail_get_store (const char *uri, CamelOp struct _get_store_msg *m; int id; @@ -929,7 +929,7 @@ char *uri; gboolean removed; -@@ -1355,18 +1315,15 @@ +@@ -1355,18 +1315,15 @@ struct _remove_folder_msg { void *data; }; @@ -951,7 +951,7 @@ CamelStore *store; CamelFolder *folder; GPtrArray *uids; -@@ -1374,7 +1331,7 @@ +@@ -1374,7 +1331,7 @@ remove_folder_get (struct _mail_msg *mm) m->removed = FALSE; @@ -960,7 +960,7 @@ if (!folder) return; -@@ -1394,16 +1351,14 @@ +@@ -1394,16 +1351,14 @@ remove_folder_get (struct _mail_msg *mm) camel_store_unsubscribe_folder (store, folder->full_name, NULL); /* Then delete the folder from the store */ @@ -980,7 +980,7 @@ if (m->removed) { /* FIXME: Remove this folder from the folder cache ??? */ } -@@ -1413,18 +1368,17 @@ +@@ -1413,18 +1368,17 @@ remove_folder_got (struct _mail_msg *mm) } static void @@ -1006,7 +1006,7 @@ }; void -@@ -1432,59 +1386,56 @@ +@@ -1432,59 +1386,56 @@ mail_remove_folder (const char *uri, voi { struct _remove_folder_msg *m; @@ -1084,7 +1084,7 @@ }; void -@@ -1492,19 +1443,19 @@ +@@ -1492,19 +1443,19 @@ mail_sync_folder(CamelFolder *folder, vo { struct _sync_folder_msg *m; @@ -1107,7 +1107,7 @@ CamelStore *store; int expunge; -@@ -1512,9 +1463,9 @@ +@@ -1512,9 +1463,9 @@ struct _sync_store_msg { void *data; }; @@ -1119,7 +1119,7 @@ char *uri, *res; uri = camel_url_to_string(((CamelService *)m->store)->url, CAMEL_URL_HIDE_ALL); -@@ -1527,33 +1478,31 @@ +@@ -1527,33 +1478,31 @@ static char *sync_store_desc(struct _mai return res; } @@ -1166,7 +1166,7 @@ }; void -@@ -1561,36 +1510,37 @@ +@@ -1561,36 +1510,37 @@ mail_sync_store(CamelStore *store, int e { struct _sync_store_msg *m; @@ -1216,7 +1216,7 @@ }; void -@@ -1598,35 +1548,36 @@ +@@ -1598,35 +1548,36 @@ mail_refresh_folder(CamelFolder *folder, { struct _sync_folder_msg *m; @@ -1265,7 +1265,7 @@ }; void -@@ -1634,31 +1585,30 @@ +@@ -1634,31 +1585,30 @@ mail_expunge_folder(CamelFolder *folder, { struct _sync_folder_msg *m; @@ -1302,7 +1302,7 @@ return g_strdup_printf (_("Emptying trash in \'%s\'"), m->account ? m->account->name : _("Local Folders")); #else -@@ -1666,49 +1616,48 @@ +@@ -1666,49 +1616,48 @@ static char *empty_trash_desc(struct _ma #endif } @@ -1367,7 +1367,7 @@ }; void -@@ -1716,20 +1665,20 @@ +@@ -1716,20 +1665,20 @@ mail_empty_trash(EAccount *account, void { struct _empty_trash_msg *m; @@ -1391,7 +1391,7 @@ CamelFolder *folder; char *uid; -@@ -1739,32 +1688,28 @@ +@@ -1739,32 +1688,28 @@ struct _get_message_msg { CamelOperation *cancel; }; @@ -1433,7 +1433,7 @@ g_free (m->uid); camel_object_unref (m->folder); camel_operation_unref (m->cancel); -@@ -1773,21 +1718,22 @@ +@@ -1773,21 +1718,22 @@ static void get_message_free(struct _mai camel_object_unref (m->message); } @@ -1463,7 +1463,7 @@ m->folder = folder; camel_object_ref(folder); m->uid = g_strdup(uid); -@@ -1795,37 +1741,37 @@ +@@ -1795,37 +1741,37 @@ mail_get_message(CamelFolder *folder, co m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); @@ -1513,7 +1513,7 @@ m->folder = folder; camel_object_ref(folder); m->uid = g_strdup(uid); -@@ -1833,13 +1779,13 @@ +@@ -1833,13 +1779,13 @@ mail_get_messagex(CamelFolder *folder, c m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); @@ -1529,7 +1529,7 @@ CamelFolder *folder; GPtrArray *uids; -@@ -1849,26 +1795,25 @@ +@@ -1849,26 +1795,25 @@ struct _get_messages_msg { void *data; }; @@ -1562,7 +1562,7 @@ if (message == NULL) break; -@@ -1876,17 +1821,16 @@ +@@ -1876,17 +1821,16 @@ static void get_messages_get(struct _mai } } @@ -1584,7 +1584,7 @@ int i; em_utils_uids_free (m->uids); -@@ -1898,11 +1842,12 @@ +@@ -1898,11 +1842,12 @@ static void get_messages_free(struct _ma camel_object_unref(m->folder); } @@ -1602,7 +1602,7 @@ }; void -@@ -1912,7 +1857,7 @@ +@@ -1912,7 +1857,7 @@ mail_get_messages(CamelFolder *folder, G { struct _get_messages_msg *m; @@ -1611,7 +1611,7 @@ m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -1920,13 +1865,13 @@ +@@ -1920,13 +1865,13 @@ mail_get_messages(CamelFolder *folder, G m->data = data; m->done = done; @@ -1627,7 +1627,7 @@ CamelFolder *folder; GPtrArray *uids; -@@ -1935,10 +1880,9 @@ +@@ -1935,10 +1880,9 @@ struct _save_messages_msg { void *data; }; @@ -1640,7 +1640,7 @@ return g_strdup_printf(ngettext("Saving %d message", "Saving %d messsages", m->uids->len), m->uids->len); -@@ -1977,9 +1921,8 @@ +@@ -1977,9 +1921,8 @@ save_prepare_part (CamelMimePart *mime_p } static void @@ -1651,7 +1651,7 @@ CamelStreamFilter *filtered_stream; CamelMimeFilterFrom *from_filter; CamelStream *stream; -@@ -1996,8 +1939,8 @@ +@@ -1996,8 +1939,8 @@ save_messages_save (struct _mail_msg *mm CamelMimeMessage *message; int pc = ((i+1) * 100) / m->uids->len; @@ -1662,7 +1662,7 @@ if (message == NULL) break; -@@ -2009,7 +1952,7 @@ +@@ -2009,7 +1952,7 @@ save_messages_save (struct _mail_msg *mm || camel_stream_flush(stream) == -1 || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1 || camel_stream_flush((CamelStream *)filtered_stream) == -1) { @@ -1671,7 +1671,7 @@ _("Error saving messages to: %s:\n %s"), m->path, strerror(errno)); g_free(from); camel_object_unref((CamelObject *)message); -@@ -2023,28 +1966,27 @@ +@@ -2023,28 +1966,27 @@ save_messages_save (struct _mail_msg *mm camel_object_unref(stream); } @@ -1710,7 +1710,7 @@ }; int -@@ -2054,7 +1996,7 @@ +@@ -2054,7 +1996,7 @@ mail_save_messages(CamelFolder *folder, struct _save_messages_msg *m; int id; @@ -1719,7 +1719,7 @@ m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -2062,8 +2004,8 @@ +@@ -2062,8 +2004,8 @@ mail_save_messages(CamelFolder *folder, m->data = data; m->done = done; @@ -1730,7 +1730,7 @@ return id; } -@@ -2071,7 +2013,7 @@ +@@ -2071,7 +2013,7 @@ mail_save_messages(CamelFolder *folder, /* ** SAVE PART ******************************************************* */ struct _save_part_msg { @@ -1739,7 +1739,7 @@ CamelMimePart *part; char *path; -@@ -2080,27 +2022,27 @@ +@@ -2080,27 +2022,27 @@ struct _save_part_msg { gboolean readonly; }; @@ -1772,7 +1772,7 @@ _("Cannot create output file: %s:\n %s"), m->path, g_strerror (errno)); return; -@@ -2110,7 +2052,7 @@ +@@ -2110,7 +2052,7 @@ save_part_save (struct _mail_msg *mm) if (camel_data_wrapper_decode_to_stream (content, stream) == -1 || camel_stream_flush (stream) == -1) @@ -1781,7 +1781,7 @@ _("Could not write data: %s"), g_strerror (errno)); -@@ -2118,27 +2060,25 @@ +@@ -2118,27 +2060,25 @@ save_part_save (struct _mail_msg *mm) } static void @@ -1818,7 +1818,7 @@ }; int -@@ -2147,7 +2087,7 @@ +@@ -2147,7 +2087,7 @@ mail_save_part (CamelMimePart *part, con { struct _save_part_msg *m; int id; @@ -1827,7 +1827,7 @@ m->part = part; camel_object_ref (part); m->path = g_strdup (path); -@@ -2155,8 +2095,8 @@ +@@ -2155,8 +2095,8 @@ mail_save_part (CamelMimePart *part, con m->done = done; m->readonly = readonly; @@ -1838,7 +1838,7 @@ return id; } -@@ -2165,7 +2105,7 @@ +@@ -2165,7 +2105,7 @@ mail_save_part (CamelMimePart *part, con /* ** PREPARE OFFLINE ***************************************************** */ struct _prep_offline_msg { @@ -1847,7 +1847,7 @@ CamelOperation *cancel; char *uri; -@@ -2173,22 +2113,22 @@ +@@ -2173,22 +2113,22 @@ struct _prep_offline_msg { void *data; }; @@ -1875,7 +1875,7 @@ } /* prepare_for_offline should do this? */ /* of course it should all be atomic, but ... */ -@@ -2200,28 +2140,27 @@ +@@ -2200,28 +2140,27 @@ static void prep_offline_do(struct _mail camel_operation_unregister(m->cancel); } @@ -1914,7 +1914,7 @@ }; void -@@ -2232,7 +2171,7 @@ +@@ -2232,7 +2171,7 @@ mail_prep_offline(const char *uri, { struct _prep_offline_msg *m; @@ -1923,7 +1923,7 @@ m->cancel = cancel; if (cancel) camel_operation_ref(cancel); -@@ -2240,13 +2179,13 @@ +@@ -2240,13 +2179,13 @@ mail_prep_offline(const char *uri, m->data = data; m->done = done; @@ -1939,7 +1939,7 @@ CamelStore *store; gboolean offline; -@@ -2254,9 +2193,9 @@ +@@ -2254,9 +2193,9 @@ struct _set_offline_msg { void *data; }; @@ -1951,7 +1951,7 @@ char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -2266,61 +2205,59 @@ +@@ -2266,61 +2205,59 @@ static char *set_offline_desc(struct _ma return msg; } @@ -2030,7 +2030,7 @@ }; int -@@ -2337,15 +2274,15 @@ +@@ -2337,61 +2274,59 @@ mail_store_set_offline (CamelStore *stor if (offline) camel_service_cancel_connect (CAMEL_SERVICE (store)); @@ -2049,7 +2049,89 @@ return id; } -@@ -2363,7 +2300,7 @@ + + /* ** Prepare OFFLINE ***************************************************** */ + +-static char *prepare_offline_desc(struct _mail_msg *mm, int done) ++static char * ++prepare_offline_desc (struct _set_offline_msg *m, int done) + { +- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; + char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); + char *msg; + +- msg = g_strdup_printf(_("Preparing account '%s' for offline"), service_name); ++ msg = g_strdup_printf (_("Preparing account '%s' for offline"), service_name); + g_free(service_name); + + return msg; + } + +-static void prepare_offline_do(struct _mail_msg *mm) ++static void ++prepare_offline_exec (struct _set_offline_msg *m) + { +- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; +- + camel_disco_store_prepare_for_offline (CAMEL_DISCO_STORE (m->store), +- &mm->ex); ++ &m->base.ex); + } + +-static void prepare_offline_done(struct _mail_msg *mm) ++static void ++prepare_offline_done (struct _set_offline_msg *m) + { +- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; +- + if (m->done) +- m->done(m->store, m->data); ++ m->done (m->store, m->data); + } + +-static void prepare_offline_free(struct _mail_msg *mm) ++static void ++prepare_offline_free (struct _set_offline_msg *m) + { +- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; +- +- camel_object_unref(m->store); ++ camel_object_unref (m->store); + } + +-static struct _mail_msg_op prepare_offline_op = { +- prepare_offline_desc, +- prepare_offline_do, +- prepare_offline_done, +- prepare_offline_free, ++static MailMsgInfo prepare_offline_info = { ++ sizeof (struct _set_offline_msg), ++ (MailMsgDescFunc) prepare_offline_desc, ++ (MailMsgExecFunc) prepare_offline_exec, ++ (MailMsgDoneFunc) prepare_offline_done, ++ (MailMsgFreeFunc) prepare_offline_free + }; + + int +@@ -2404,14 +2339,14 @@ mail_store_prepare_offline (CamelStore * + * thread won't get queued behind a hung connect op. + */ + +- m = mail_msg_new(&prepare_offline_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&prepare_offline_info); + m->store = store; + camel_object_ref(store); + m->data = NULL; + m->done = NULL; + +- id = m->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); + + return id; + } +@@ -2428,7 +2363,7 @@ mail_execute_shell_command (CamelFilterD /* Async service-checking/authtype-lookup code. */ struct _check_msg { @@ -2058,7 +2140,7 @@ char *url; CamelProviderType type; -@@ -2373,51 +2310,47 @@ +@@ -2438,51 +2373,47 @@ struct _check_msg { void *data; }; @@ -2124,7 +2206,7 @@ }; int -@@ -2426,14 +2359,14 @@ +@@ -2491,14 +2422,14 @@ mail_check_service(const char *url, Came struct _check_msg *m; int id; @@ -2142,9 +2224,9 @@ return id; } ---- evolution-2.11.2/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/em-folder-utils.c 2007-05-18 15:34:09.000000000 -0400 -@@ -84,7 +84,7 @@ +--- evolution-2.11.3/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-utils.c 2007-06-04 14:25:34.000000000 -0400 +@@ -84,7 +84,7 @@ emfu_is_special_local_folder (const char } struct _EMCopyFolders { @@ -2153,7 +2235,7 @@ /* input data */ CamelStore *fromstore; -@@ -96,18 +96,15 @@ +@@ -96,18 +96,15 @@ struct _EMCopyFolders { int delete; }; @@ -2175,7 +2257,7 @@ guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; GList *pending = NULL, *deleting = NULL, *l; GString *fromname, *toname; -@@ -115,7 +112,7 @@ +@@ -115,7 +112,7 @@ emft_copy_folders__copy (struct _mail_ms const char *tmp; int fromlen; @@ -2184,7 +2266,7 @@ return; pending = g_list_append (pending, fi); -@@ -155,8 +152,8 @@ +@@ -155,8 +152,8 @@ emft_copy_folders__copy (struct _mail_ms if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { d(printf ("this folder is selectable\n")); if (m->tostore == m->fromstore && m->delete) { @@ -2195,7 +2277,7 @@ goto exception; /* this folder no longer exists, unsubscribe it */ -@@ -165,16 +162,16 @@ +@@ -165,16 +162,16 @@ emft_copy_folders__copy (struct _mail_ms deleted = 1; } else { @@ -2215,7 +2297,7 @@ camel_folder_free_uids (fromfolder, uids); if (m->delete) -@@ -185,7 +182,7 @@ +@@ -185,7 +182,7 @@ emft_copy_folders__copy (struct _mail_ms } } @@ -2224,7 +2306,7 @@ goto exception; else if (m->delete && !deleted) deleting = g_list_prepend (deleting, info); -@@ -226,10 +223,8 @@ +@@ -226,10 +223,8 @@ emft_copy_folders__copy (struct _mail_ms } static void @@ -2236,7 +2318,7 @@ camel_object_unref (m->fromstore); camel_object_unref (m->tostore); -@@ -237,11 +232,12 @@ +@@ -237,11 +232,12 @@ emft_copy_folders__free (struct _mail_ms g_free (m->tobase); } @@ -2254,7 +2336,7 @@ }; int -@@ -250,7 +246,7 @@ +@@ -250,7 +246,7 @@ em_folder_utils_copy_folders(CamelStore struct _EMCopyFolders *m; int seq; @@ -2263,7 +2345,7 @@ camel_object_ref (fromstore); m->fromstore = fromstore; camel_object_ref (tostore); -@@ -258,9 +254,9 @@ +@@ -258,9 +254,9 @@ em_folder_utils_copy_folders(CamelStore m->frombase = g_strdup (frombase); m->tobase = g_strdup (tobase); m->delete = delete; @@ -2275,7 +2357,7 @@ return seq; } -@@ -557,7 +553,7 @@ +@@ -557,7 +553,7 @@ em_folder_utils_rename_folder (CamelFold } struct _EMCreateFolder { @@ -2284,7 +2366,7 @@ /* input data */ CamelStore *store; -@@ -573,41 +569,33 @@ +@@ -573,41 +569,33 @@ struct _EMCreateFolder { void *user_data; }; @@ -2333,7 +2415,7 @@ camel_store_free_folder_info (m->store, m->fi); camel_object_unref (m->store); g_free (m->full_name); -@@ -615,11 +603,12 @@ +@@ -615,11 +603,12 @@ emfu_create_folder__free (struct _mail_m g_free (m->name); } @@ -2351,7 +2433,7 @@ }; -@@ -640,7 +629,7 @@ +@@ -640,7 +629,7 @@ emfu_create_folder_real (CamelStore *sto parent = namebuf; } @@ -2360,7 +2442,7 @@ camel_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); -@@ -651,8 +640,8 @@ +@@ -651,8 +640,8 @@ emfu_create_folder_real (CamelStore *sto g_free (namebuf); @@ -2371,8 +2453,8 @@ return id; } ---- evolution-2.11.2/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.2/mail/importers/elm-importer.c 2007-05-18 15:34:09.000000000 -0400 +--- evolution-2.11.3/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.3/mail/importers/elm-importer.c 2007-06-04 14:25:34.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2382,7 +2464,7 @@ EImport *import; EImportTargetHome *target; -@@ -186,8 +186,8 @@ +@@ -186,8 +186,8 @@ elm_supported(EImport *ei, EImportTarget return mailexists; } @@ -2393,7 +2475,7 @@ { return g_strdup (_("Importing Elm data")); } -@@ -198,9 +198,8 @@ +@@ -198,9 +198,8 @@ static MailImporterSpecial elm_special_f }; static void @@ -2404,7 +2486,7 @@ const char *maildir; char *elmdir; -@@ -218,13 +217,11 @@ +@@ -218,13 +217,11 @@ elm_import_import(struct _mail_msg *mm) } static void @@ -2420,7 +2502,7 @@ GConfClient *gconf; gconf = gconf_client_get_default(); -@@ -236,10 +233,8 @@ +@@ -236,10 +233,8 @@ elm_import_imported(struct _mail_msg *mm } static void @@ -2432,7 +2514,7 @@ camel_operation_unref(m->status); g_free(m->status_what); -@@ -288,11 +283,12 @@ +@@ -288,11 +283,12 @@ elm_status_timeout(void *data) return TRUE; } @@ -2450,7 +2532,7 @@ }; static int -@@ -301,7 +297,7 @@ +@@ -301,7 +297,7 @@ mail_importer_elm_import(EImport *ei, EI struct _elm_import_msg *m; int id; @@ -2459,7 +2541,7 @@ g_datalist_set_data(&target->data, "elm-msg", m); m->import = ei; g_object_ref(m->import); -@@ -310,9 +306,9 @@ +@@ -310,9 +306,9 @@ mail_importer_elm_import(EImport *ei, EI m->status_lock = g_mutex_new(); m->status = camel_operation_new(elm_status, m); @@ -2471,9 +2553,9 @@ return id; } ---- evolution-2.11.2/mail/importers/mail-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.2/mail/importers/mail-importer.c 2007-05-18 15:34:09.000000000 -0400 -@@ -132,7 +132,7 @@ +--- evolution-2.11.3/mail/importers/mail-importer.c.kill-ethread 2007-06-03 11:08:07.000000000 -0400 ++++ evolution-2.11.3/mail/importers/mail-importer.c 2007-06-04 14:25:34.000000000 -0400 +@@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } struct _import_mbox_msg { @@ -2482,7 +2564,7 @@ char *path; char *uri; -@@ -142,8 +142,8 @@ +@@ -142,8 +142,8 @@ struct _import_mbox_msg { void *done_data; }; @@ -2493,7 +2575,7 @@ { return g_strdup (_("Importing mailbox")); } -@@ -190,9 +190,8 @@ +@@ -190,9 +190,8 @@ decode_mozilla_status(const char *tmp) } static void @@ -2504,7 +2586,7 @@ CamelFolder *folder; CamelMimeParser *mp = NULL; struct stat st; -@@ -207,7 +206,7 @@ +@@ -207,7 +206,7 @@ import_mbox_import(struct _mail_msg *mm) if (m->uri == NULL || m->uri[0] == 0) folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_INBOX); else @@ -2513,7 +2595,7 @@ if (folder == NULL) return; -@@ -262,11 +261,11 @@ +@@ -262,11 +261,11 @@ import_mbox_import(struct _mail_msg *mm) flags |= decode_status(tmp); camel_message_info_set_flags(info, flags, ~0); @@ -2527,7 +2609,7 @@ break; camel_mime_parser_step(mp, 0, 0); -@@ -286,30 +285,27 @@ +@@ -286,30 +285,27 @@ fail1: } static void @@ -2567,7 +2649,7 @@ }; int -@@ -318,7 +314,7 @@ +@@ -318,7 +314,7 @@ mail_importer_import_mbox(const char *pa struct _import_mbox_msg *m; int id; @@ -2576,7 +2658,7 @@ m->path = g_strdup(path); m->uri = g_strdup(folderuri); m->done = done; -@@ -328,8 +324,8 @@ +@@ -328,8 +324,8 @@ mail_importer_import_mbox(const char *pa camel_operation_ref(cancel); } @@ -2587,7 +2669,7 @@ return id; } -@@ -339,7 +335,7 @@ +@@ -339,7 +335,7 @@ mail_importer_import_mbox_sync(const cha { struct _import_mbox_msg *m; @@ -2596,7 +2678,7 @@ m->path = g_strdup(path); m->uri = g_strdup(folderuri); if (cancel) { -@@ -347,9 +343,9 @@ +@@ -347,9 +343,9 @@ mail_importer_import_mbox_sync(const cha camel_operation_ref(cancel); } @@ -2609,8 +2691,8 @@ } struct _import_folders_data { ---- evolution-2.11.2/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.2/mail/importers/pine-importer.c 2007-05-18 15:34:09.000000000 -0400 +--- evolution-2.11.3/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.3/mail/importers/pine-importer.c 2007-06-04 14:25:34.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2620,7 +2702,7 @@ EImport *import; EImportTarget *target; -@@ -223,8 +223,8 @@ +@@ -223,8 +223,8 @@ import_contacts(void) g_object_unref(book); } @@ -2631,7 +2713,7 @@ { return g_strdup (_("Importing Pine data")); } -@@ -236,10 +236,8 @@ +@@ -236,10 +236,8 @@ static MailImporterSpecial pine_special_ }; static void @@ -2643,7 +2725,7 @@ if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) import_contacts(); -@@ -253,13 +251,11 @@ +@@ -253,13 +251,11 @@ pine_import_import(struct _mail_msg *mm) } static void @@ -2659,7 +2741,7 @@ GConfClient *gconf; gconf = gconf_client_get_default(); -@@ -274,10 +270,8 @@ +@@ -274,10 +270,8 @@ pine_import_imported(struct _mail_msg *m } static void @@ -2671,7 +2753,7 @@ camel_operation_unref(m->status); g_free(m->status_what); -@@ -326,11 +320,12 @@ +@@ -326,11 +320,12 @@ pine_status_timeout(void *data) return TRUE; } @@ -2689,7 +2771,7 @@ }; static int -@@ -339,7 +334,7 @@ +@@ -339,7 +334,7 @@ mail_importer_pine_import(EImport *ei, E struct _pine_import_msg *m; int id; @@ -2698,7 +2780,7 @@ g_datalist_set_data(&target->data, "pine-msg", m); m->import = ei; g_object_ref(m->import); -@@ -348,9 +343,9 @@ +@@ -348,9 +343,9 @@ mail_importer_pine_import(EImport *ei, E m->status_lock = g_mutex_new(); m->status = camel_operation_new(pine_status, m); @@ -2710,8 +2792,19 @@ return id; } ---- evolution-2.11.2/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/mail-vfolder.c 2007-05-18 15:34:09.000000000 -0400 +--- evolution-2.11.3/mail/em-utils.c.kill-ethread 2007-06-04 14:25:09.000000000 -0400 ++++ evolution-2.11.3/mail/em-utils.c 2007-06-04 14:25:34.000000000 -0400 +@@ -1906,7 +1906,7 @@ em_utils_in_addressbook(CamelInternetAdd + ESource *source = s->data; + GList *contacts; + EBook *book; +- void *hook; ++ GHook *hook; + + d(printf(" checking '%s'\n", e_source_get_uri(source))); + +--- evolution-2.11.3/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/mail-vfolder.c 2007-06-04 14:25:34.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -2721,7 +2814,7 @@ #include #include -@@ -75,7 +75,7 @@ +@@ -75,7 +75,7 @@ static void rule_changed(FilterRule *rul /* ********************************************************************** */ struct _setup_msg { @@ -2730,7 +2823,7 @@ CamelFolder *folder; char *query; -@@ -83,18 +83,15 @@ +@@ -83,18 +83,15 @@ struct _setup_msg { GList *sources_folder; }; @@ -2752,7 +2845,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -105,12 +102,12 @@ +@@ -105,12 +102,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l && !shutdown) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -2767,7 +2860,7 @@ } l = l->next; } -@@ -135,17 +132,13 @@ +@@ -135,17 +132,13 @@ vfolder_setup_do(struct _mail_msg *mm) } static void @@ -2787,7 +2880,7 @@ GList *l; camel_object_unref(m->folder); -@@ -166,11 +159,12 @@ +@@ -166,11 +159,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } @@ -2805,7 +2898,7 @@ }; /* sources_uri should be camel uri's */ -@@ -180,15 +174,15 @@ +@@ -180,15 +174,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; @@ -2824,7 +2917,7 @@ return id; } -@@ -196,17 +190,16 @@ +@@ -196,17 +190,16 @@ vfolder_setup(CamelFolder *folder, const /* ********************************************************************** */ struct _adduri_msg { @@ -2845,7 +2938,7 @@ char *euri, *desc = NULL; /* Yuck yuck. Lookup the account name and use that to describe the path */ -@@ -250,9 +243,8 @@ +@@ -250,9 +243,8 @@ vfolder_adduri_desc(struct _mail_msg *mm } static void @@ -2856,7 +2949,7 @@ GList *l; CamelFolder *folder = NULL; -@@ -269,7 +261,7 @@ +@@ -269,7 +261,7 @@ vfolder_adduri_do(struct _mail_msg *mm) } if (folder == NULL) @@ -2865,7 +2958,7 @@ if (folder != NULL) { l = m->folders; -@@ -285,28 +277,24 @@ +@@ -285,28 +277,24 @@ vfolder_adduri_do(struct _mail_msg *mm) } static void @@ -2902,7 +2995,7 @@ }; -@@ -317,13 +305,13 @@ +@@ -317,13 +305,13 @@ vfolder_adduri(const char *uri, GList *f struct _adduri_msg *m; int id; @@ -2919,7 +3012,7 @@ return id; } -@@ -447,7 +435,7 @@ +@@ -447,7 +435,7 @@ mail_vfolder_add_uri(CamelStore *store, return; } @@ -2928,7 +3021,7 @@ is_ignore = uri_is_ignore(store, curi); -@@ -540,7 +528,7 @@ +@@ -540,7 +528,7 @@ mail_vfolder_delete_uri(CamelStore *stor d(printf ("Deleting uri to check: %s\n", uri)); @@ -2937,7 +3030,7 @@ changed = g_string_new (""); -@@ -615,7 +603,7 @@ +@@ -615,7 +603,7 @@ mail_vfolder_rename_uri(CamelStore *stor if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) return; @@ -2946,9 +3039,9 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.11.2/mail/em-format-html.c.kill-ethread 2007-04-20 00:28:22.000000000 -0400 -+++ evolution-2.11.2/mail/em-format-html.c 2007-05-18 15:34:09.000000000 -0400 -@@ -165,7 +165,7 @@ +--- evolution-2.11.3/mail/em-format-html.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/em-format-html.c 2007-06-04 14:25:34.000000000 -0400 +@@ -165,7 +165,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -2957,7 +3050,7 @@ efh->priv->format_timeout_msg = NULL; } -@@ -1179,7 +1179,7 @@ +@@ -1179,7 +1179,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { @@ -2966,7 +3059,7 @@ EMFormatHTML *format; EMFormat *format_source; -@@ -1189,14 +1189,15 @@ +@@ -1189,14 +1189,15 @@ struct _format_msg { CamelMimeMessage *message; }; @@ -2985,7 +3078,7 @@ struct _EMFormatHTMLJob *job; struct _EMFormatPURITree *puri_level; int cancelled = FALSE; -@@ -1281,10 +1282,9 @@ +@@ -1281,10 +1282,9 @@ static void efh_format_do(struct _mail_m ((EMFormat *)m->format)->pending_uri_level = puri_level; } @@ -2998,7 +3091,7 @@ d(printf("formatting finished\n")); m->format->load_http_now = FALSE; -@@ -1292,10 +1292,9 @@ +@@ -1292,10 +1292,9 @@ static void efh_format_done(struct _mail g_signal_emit_by_name(m->format, "complete"); } @@ -3011,7 +3104,7 @@ d(printf("formatter freed\n")); g_object_unref(m->format); if (m->estream) { -@@ -1311,11 +1310,12 @@ +@@ -1311,11 +1310,12 @@ static void efh_format_free(struct _mail g_object_unref(m->format_source); } @@ -3029,7 +3122,7 @@ }; static gboolean -@@ -1326,7 +1326,7 @@ +@@ -1326,7 +1326,7 @@ efh_format_timeout(struct _format_msg *m struct _EMFormatHTMLPrivate *p = efh->priv; if (m->format->html == NULL) { @@ -3038,7 +3131,7 @@ return FALSE; } -@@ -1354,7 +1354,7 @@ +@@ -1354,7 +1354,7 @@ efh_format_timeout(struct _format_msg *m if (m->message == NULL) { hstream = gtk_html_begin(efh->html); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); @@ -3047,7 +3140,7 @@ p->last_part = NULL; } else { hstream = NULL; -@@ -1373,8 +1373,8 @@ +@@ -1373,8 +1373,8 @@ efh_format_timeout(struct _format_msg *m p->last_part = m->message; } @@ -3058,7 +3151,7 @@ } efh->priv->format_timeout_id = 0; -@@ -1398,11 +1398,11 @@ +@@ -1398,11 +1398,11 @@ static void efh_format_clone(EMFormat *e d(printf(" timeout for last still active, removing ...\n")); g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3072,9 +3165,9 @@ m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; ---- evolution-2.11.2/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/em-folder-properties.c 2007-05-18 15:34:09.000000000 -0400 -@@ -386,7 +386,7 @@ +--- evolution-2.11.3/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-properties.c 2007-06-04 14:25:34.000000000 -0400 +@@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } if (folder == NULL) @@ -3083,9 +3176,9 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.11.2/mail/em-folder-tree.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 -+++ evolution-2.11.2/mail/em-folder-tree.c 2007-05-18 15:34:09.000000000 -0400 -@@ -834,7 +834,7 @@ +--- evolution-2.11.3/mail/em-folder-tree.c.kill-ethread 2007-06-04 01:52:58.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-tree.c 2007-06-04 14:25:34.000000000 -0400 +@@ -834,7 +834,7 @@ fail: /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ struct _DragDataReceivedAsync { @@ -3094,12 +3187,12 @@ /* input data */ GdkDragContext *context; -@@ -859,17 +859,16 @@ +@@ -859,17 +859,16 @@ emft_drop_folder(struct _DragDataReceive d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); -- if (!(src = mail_tool_uri_to_folder(m->selection->data, 0, &m->msg.ex))) -+ if (!(src = mail_tool_uri_to_folder(m->selection->data, 0, &m->base.ex))) +- if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->msg.ex))) ++ if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) return; em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); @@ -3115,7 +3208,7 @@ CamelURL *url; char *buf; -@@ -893,9 +892,8 @@ +@@ -893,9 +892,8 @@ emft_drop_async_desc (struct _mail_msg * } static void @@ -3126,7 +3219,7 @@ CamelFolder *folder; /* for types other than folder, we can't drop to the root path */ -@@ -903,14 +901,14 @@ +@@ -903,14 +901,14 @@ emft_drop_async_drop (struct _mail_msg * /* copy or move (aka rename) a folder */ emft_drop_folder(m); } else if (m->full_name == NULL) { @@ -3145,7 +3238,7 @@ break; case DND_DROP_TYPE_MESSAGE_RFC822: /* import a message/rfc822 stream */ -@@ -928,9 +926,8 @@ +@@ -928,9 +926,8 @@ emft_drop_async_drop (struct _mail_msg * } static void @@ -3156,7 +3249,7 @@ gboolean success, delete; /* ?? */ -@@ -938,7 +935,7 @@ +@@ -938,7 +935,7 @@ emft_drop_async_done (struct _mail_msg * success = FALSE; delete = FALSE; } else { @@ -3165,7 +3258,7 @@ delete = success && m->move && !m->moved; } -@@ -946,10 +943,8 @@ +@@ -946,10 +943,8 @@ emft_drop_async_done (struct _mail_msg * } static void @@ -3177,7 +3270,7 @@ g_object_unref(m->context); camel_object_unref(m->store); g_free(m->full_name); -@@ -958,18 +953,19 @@ +@@ -958,18 +953,19 @@ emft_drop_async_free (struct _mail_msg * g_free(m->selection); } @@ -3203,7 +3296,7 @@ } static void -@@ -996,7 +992,7 @@ +@@ -996,7 +992,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu struct _DragDataReceivedAsync *m = data; m->aborted = TRUE; @@ -3212,7 +3305,7 @@ } static EPopupItem emft_drop_popup_menu[] = { -@@ -1052,7 +1048,7 @@ +@@ -1052,7 +1048,7 @@ tree_drag_data_received(GtkWidget *widge return; } @@ -3221,7 +3314,7 @@ m->context = context; g_object_ref(context); m->store = store; -@@ -1686,7 +1682,7 @@ +@@ -1686,7 +1682,7 @@ dump_fi (CamelFolderInfo *fi, int depth) #endif struct _EMFolderTreeGetFolderInfo { @@ -3230,7 +3323,7 @@ /* input data */ GtkTreeRowReference *root; -@@ -1699,10 +1695,9 @@ +@@ -1699,10 +1695,9 @@ struct _EMFolderTreeGetFolderInfo { CamelFolderInfo *fi; }; @@ -3243,7 +3336,7 @@ char *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1712,18 +1707,16 @@ +@@ -1712,18 +1707,16 @@ emft_get_folder_info__desc(struct _mail_ } static void @@ -3265,7 +3358,7 @@ struct _EMFolderTreePrivate *priv = m->emft->priv; struct _EMFolderTreeModelStoreInfo *si; GtkTreeIter root, iter; -@@ -1751,7 +1744,7 @@ +@@ -1751,7 +1744,7 @@ emft_get_folder_info__got (struct _mail_ gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ @@ -3274,7 +3367,7 @@ gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); gtk_tree_view_collapse_row (priv->treeview, path); gtk_tree_path_free (path); -@@ -1806,10 +1799,8 @@ +@@ -1806,10 +1799,8 @@ emft_get_folder_info__got (struct _mail_ } static void @@ -3286,7 +3379,7 @@ camel_store_free_folder_info (m->store, m->fi); gtk_tree_row_reference_free (m->root); -@@ -1818,11 +1809,12 @@ +@@ -1818,11 +1809,12 @@ emft_get_folder_info__free (struct _mail g_free (m->top); } @@ -3304,7 +3397,7 @@ }; static void -@@ -1909,7 +1901,7 @@ +@@ -1909,7 +1901,7 @@ emft_tree_row_expanded (GtkTreeView *tre gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); @@ -3313,7 +3406,7 @@ m->root = gtk_tree_row_reference_new (model, tree_path); camel_object_ref (store); m->store = store; -@@ -1918,7 +1910,7 @@ +@@ -1918,7 +1910,7 @@ emft_tree_row_expanded (GtkTreeView *tre m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; @@ -3322,9 +3415,9 @@ } static gboolean ---- evolution-2.11.2/mail/em-folder-browser.c.kill-ethread 2007-05-13 13:41:10.000000000 -0400 -+++ evolution-2.11.2/mail/em-folder-browser.c 2007-05-18 15:34:09.000000000 -0400 -@@ -839,7 +839,7 @@ +--- evolution-2.11.3/mail/em-folder-browser.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-browser.c 2007-06-04 14:25:34.000000000 -0400 +@@ -839,7 +839,7 @@ get_view_query (ESearchBar *esb) struct _setup_msg { @@ -3333,7 +3426,7 @@ CamelFolder *folder; char *query; -@@ -847,16 +847,15 @@ +@@ -847,16 +847,15 @@ struct _setup_msg { GList *sources_folder; }; @@ -3353,7 +3446,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -867,12 +866,12 @@ +@@ -867,12 +866,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3368,7 +3461,7 @@ } l = l->next; } -@@ -896,17 +895,13 @@ +@@ -896,17 +895,13 @@ vfolder_setup_do(struct _mail_msg *mm) } static void @@ -3388,7 +3481,7 @@ GList *l; camel_object_unref(m->folder); -@@ -927,11 +922,12 @@ +@@ -927,11 +922,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } @@ -3406,7 +3499,7 @@ }; /* sources_uri should be camel uri's */ -@@ -941,15 +937,15 @@ +@@ -941,15 +937,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; @@ -3425,9 +3518,9 @@ return id; } ---- evolution-2.11.2/mail/message-list.c.kill-ethread 2007-05-10 05:27:32.000000000 -0400 -+++ evolution-2.11.2/mail/message-list.c 2007-05-18 15:34:09.000000000 -0400 -@@ -1801,7 +1801,7 @@ +--- evolution-2.11.3/mail/message-list.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/message-list.c 2007-06-04 14:25:34.000000000 -0400 +@@ -1841,7 +1841,7 @@ ml_tree_drag_data_get (ETree *tree, int /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ struct _drop_msg { @@ -3436,7 +3529,7 @@ GdkDragContext *context; -@@ -1818,11 +1818,9 @@ +@@ -1858,11 +1858,9 @@ struct _drop_msg { unsigned int aborted:1; }; @@ -3450,7 +3543,7 @@ if (m->move) return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); else -@@ -1830,13 +1828,11 @@ +@@ -1870,13 +1868,11 @@ ml_drop_async_desc (struct _mail_msg *mm } static void @@ -3466,7 +3559,7 @@ break; case DND_MESSAGE_RFC822: em_utils_selection_get_message(m->selection, m->folder); -@@ -1848,9 +1844,8 @@ +@@ -1888,9 +1884,8 @@ ml_drop_async_drop(struct _mail_msg *mm) } static void @@ -3477,7 +3570,7 @@ gboolean success, delete; /* ?? */ -@@ -1858,7 +1853,7 @@ +@@ -1898,7 +1893,7 @@ ml_drop_async_done(struct _mail_msg *mm) success = FALSE; delete = FALSE; } else { @@ -3486,7 +3579,7 @@ delete = success && m->move && !m->moved; } -@@ -1866,10 +1861,8 @@ +@@ -1906,10 +1901,8 @@ ml_drop_async_done(struct _mail_msg *mm) } static void @@ -3498,7 +3591,7 @@ g_object_unref(m->context); camel_object_unref(m->folder); -@@ -1877,18 +1870,19 @@ +@@ -1917,18 +1910,19 @@ ml_drop_async_free(struct _mail_msg *mm) g_free(m->selection); } @@ -3524,7 +3617,7 @@ } static void -@@ -1915,7 +1909,7 @@ +@@ -1955,7 +1949,7 @@ ml_drop_popup_cancel(EPopup *ep, EPopupI struct _drop_msg *m = data; m->aborted = TRUE; @@ -3533,7 +3626,7 @@ } static EPopupItem ml_drop_popup_menu[] = { -@@ -1945,7 +1939,7 @@ +@@ -1985,7 +1979,7 @@ ml_tree_drag_data_received (ETree *tree, if (data->data == NULL || data->length == -1) return; @@ -3542,7 +3635,7 @@ m->context = context; g_object_ref(context); m->folder = ml->folder; -@@ -3674,7 +3668,7 @@ +@@ -3718,7 +3712,7 @@ save_hide_state (MessageList *ml) /* ** REGENERATE MESSAGELIST ********************************************** */ struct _regen_list_msg { @@ -3551,7 +3644,7 @@ int complete; -@@ -3702,16 +3696,15 @@ +@@ -3746,16 +3740,15 @@ struct _regen_list_msg { */ @@ -3571,7 +3664,7 @@ GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; CamelMessageInfo *info; int i; -@@ -3741,7 +3734,7 @@ +@@ -3785,7 +3778,7 @@ regen_list_regen (struct _mail_msg *mm) } else expr = "(match-all (not (system-flag \"deleted\")))"; } @@ -3580,7 +3673,7 @@ } else { char *expr; -@@ -3751,23 +3744,23 @@ +@@ -3795,23 +3788,23 @@ regen_list_regen (struct _mail_msg *mm) sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); } else expr = "(match-all (not (system-flag \"junk\")))"; @@ -3609,7 +3702,7 @@ if (uidnew) { MESSAGE_LIST_LOCK(m->ml, hide_lock); -@@ -3842,7 +3835,7 @@ +@@ -3886,7 +3879,7 @@ regen_list_regen (struct _mail_msg *mm) e_profile_event_emit("list.threaduids", m->folder->full_name, 0); @@ -3618,7 +3711,7 @@ /* update/build a new tree */ if (m->dotree) { if (m->tree) -@@ -3871,17 +3864,15 @@ +@@ -3915,17 +3908,15 @@ regen_list_regen (struct _mail_msg *mm) } static void @@ -3638,7 +3731,7 @@ return; if (m->ml->folder != m->folder) -@@ -3932,9 +3923,8 @@ +@@ -3976,9 +3967,8 @@ regen_list_regened (struct _mail_msg *mm } static void @@ -3649,7 +3742,7 @@ int i; e_profile_event_emit("list.regenerated", m->folder->full_name, 0); -@@ -3962,11 +3952,12 @@ +@@ -4006,11 +3996,12 @@ regen_list_free (struct _mail_msg *mm) g_object_unref(m->ml); } @@ -3667,7 +3760,7 @@ }; static gboolean -@@ -3976,7 +3967,7 @@ +@@ -4020,7 +4011,7 @@ ml_regen_timeout(struct _regen_list_msg m->ml->regen = g_list_prepend(m->ml->regen, m); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ @@ -3676,7 +3769,7 @@ m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; -@@ -3992,7 +3983,7 @@ +@@ -4036,7 +4027,7 @@ mail_regen_cancel(MessageList *ml) GList *l = ml->regen; while (l) { @@ -3685,7 +3778,7 @@ if (mm->cancel) camel_operation_cancel(mm->cancel); -@@ -4004,7 +3995,7 @@ +@@ -4048,7 +4039,7 @@ mail_regen_cancel(MessageList *ml) if (ml->regen_timeout_id) { g_source_remove(ml->regen_timeout_id); ml->regen_timeout_id = 0; @@ -3694,7 +3787,7 @@ ml->regen_timeout_msg = NULL; } } -@@ -4039,7 +4030,7 @@ +@@ -4083,7 +4074,7 @@ mail_regen_list (MessageList *ml, const } #endif @@ -3703,9 +3796,9 @@ m->ml = ml; m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); ---- evolution-2.11.2/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/em-sync-stream.h 2007-05-18 15:34:09.000000000 -0400 -@@ -29,41 +29,45 @@ +--- evolution-2.11.3/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/em-sync-stream.h 2007-06-04 14:25:34.000000000 -0400 +@@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3781,9 +3874,9 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.11.2/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 -+++ evolution-2.11.2/mail/em-format-html-print.c 2007-05-18 15:38:28.000000000 -0400 -@@ -224,7 +224,7 @@ +--- evolution-2.11.3/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 ++++ evolution-2.11.3/mail/em-format-html-print.c 2007-06-04 14:25:34.000000000 -0400 +@@ -224,7 +224,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); mail_get_message ( @@ -3792,8 +3885,8 @@ } void ---- evolution-2.11.2/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/em-sync-stream.c 2007-05-18 15:34:09.000000000 -0400 +--- evolution-2.11.3/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/em-sync-stream.c 2007-06-04 14:25:34.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -3841,7 +3934,7 @@ enum _write_msg_t { EMSS_WRITE, EMSS_FLUSH, -@@ -68,275 +43,168 @@ +@@ -68,275 +43,168 @@ enum _write_msg_t { }; struct _write_msg { @@ -4219,9 +4312,9 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.11.2/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/em-subscribe-editor.c 2007-05-18 15:34:09.000000000 -0400 -@@ -175,7 +175,7 @@ +--- evolution-2.11.3/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/em-subscribe-editor.c 2007-06-04 14:25:34.000000000 -0400 +@@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ struct _zsubscribe_msg { @@ -4230,7 +4323,7 @@ EMSubscribe *sub; EMSubscribeNode *node; -@@ -184,20 +184,18 @@ +@@ -184,20 +184,18 @@ struct _zsubscribe_msg { }; static void @@ -4256,7 +4349,7 @@ GtkTreeIter iter; GtkTreeModel *model; EMSubscribeNode *node; -@@ -207,7 +205,7 @@ +@@ -207,7 +205,7 @@ sub_folder_subscribed (struct _mail_msg if (m->sub->cancel) return; @@ -4265,7 +4358,7 @@ if (m->subscribe) m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; else -@@ -228,8 +226,8 @@ +@@ -228,8 +226,8 @@ sub_folder_subscribed (struct _mail_msg /* queue any further ones, or if out, update the ui */ next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); if (next) { @@ -4276,7 +4369,7 @@ } else { /* should it go off the model instead? */ sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); -@@ -237,19 +235,18 @@ +@@ -237,19 +235,18 @@ sub_folder_subscribed (struct _mail_msg } static void @@ -4303,7 +4396,7 @@ }; /* spath is tree path in string form */ -@@ -259,18 +256,18 @@ +@@ -259,18 +256,18 @@ sub_subscribe_folder (EMSubscribe *sub, struct _zsubscribe_msg *m; int id; @@ -4325,7 +4418,7 @@ } else { d(printf("queueing subscribe folder '%s'\n", spath)); e_dlist_addtail(&sub->subscribe, (EDListNode *)m); -@@ -341,7 +338,7 @@ +@@ -341,7 +338,7 @@ sub_fill_level(EMSubscribe *sub, CamelFo /* async query of folderinfo */ struct _emse_folderinfo_msg { @@ -4334,7 +4427,7 @@ int seq; -@@ -351,31 +348,29 @@ +@@ -351,31 +348,29 @@ struct _emse_folderinfo_msg { }; static void @@ -4373,7 +4466,7 @@ } if (m->info) { -@@ -396,10 +391,8 @@ +@@ -396,10 +391,8 @@ sub_folderinfo_got(struct _mail_msg *mm) } static void @@ -4385,7 +4478,7 @@ if (m->info) m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); -@@ -415,11 +408,12 @@ +@@ -415,11 +408,12 @@ sub_folderinfo_free(struct _mail_msg *mm sub_unref(m->sub); } @@ -4403,7 +4496,7 @@ }; static int -@@ -431,19 +425,19 @@ +@@ -431,19 +425,19 @@ sub_queue_fill_level(EMSubscribe *sub, E d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, node?node->info->full_name:"")); @@ -4427,7 +4520,7 @@ return id; } -@@ -573,7 +567,7 @@ +@@ -573,7 +567,7 @@ sub_destroy(GtkWidget *w, EMSubscribe *s mail_msg_cancel(sub->subscribe_id); while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) @@ -4436,9 +4529,9 @@ sub_unref(sub); } ---- evolution-2.11.2/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/mail-mt.h 2007-05-18 15:34:09.000000000 -0400 -@@ -23,43 +23,60 @@ +--- evolution-2.11.3/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/mail-mt.h 2007-06-04 14:25:34.000000000 -0400 +@@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4515,9 +4608,16 @@ +void mail_msg_slow_ordered_push (gpointer msg); + /* To implement the stop button */ - void *mail_cancel_hook_add(GDestroyNotify func, void *data); - void mail_cancel_hook_remove(void *handle); -@@ -112,24 +129,6 @@ +-void *mail_cancel_hook_add(GDestroyNotify func, void *data); +-void mail_cancel_hook_remove(void *handle); +-void mail_cancel_all(void); ++GHook * mail_cancel_hook_add (GHookFunc func, gpointer data); ++void mail_cancel_hook_remove (GHook *hook); ++void mail_cancel_all (void); + + /* request a string/password */ + char *mail_get_password (CamelService *service, const char *prompt, +@@ -112,24 +129,6 @@ void *mail_call_main(mail_call_t type, M void mail_enable_stop(void); void mail_disable_stop(void); @@ -4542,9 +4642,9 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.11.2/mail/mail-ops.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/mail-ops.h 2007-05-18 15:34:09.000000000 -0400 -@@ -30,13 +30,14 @@ +--- evolution-2.11.3/mail/mail-ops.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/mail-ops.h 2007-06-04 14:25:34.000000000 -0400 +@@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ @@ -4560,7 +4660,7 @@ #include "libedataserver/e-account.h" void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, -@@ -55,12 +56,12 @@ +@@ -55,12 +56,12 @@ void mail_transfer_messages (CamelFolder void mail_get_message (CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), void *data, @@ -4575,7 +4675,7 @@ /* get several messages */ void mail_get_messages (CamelFolder *folder, GPtrArray *uids, -@@ -70,7 +71,7 @@ +@@ -70,7 +71,7 @@ void mail_get_messages (CamelFolder *fol /* same for a folder */ int mail_get_folder (const char *uri, guint32 flags, void (*done) (char *uri, CamelFolder *folder, void *data), void *data, @@ -4584,9 +4684,9 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.11.2/mail/em-composer-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/em-composer-utils.c 2007-05-18 15:34:09.000000000 -0400 -@@ -534,7 +534,7 @@ +--- evolution-2.11.3/mail/em-composer-utils.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/em-composer-utils.c 2007-06-04 14:25:34.000000000 -0400 +@@ -534,7 +534,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4595,7 +4695,7 @@ mail_msg_wait (id); if (!folder || !account->enabled) { -@@ -1085,7 +1085,7 @@ +@@ -1085,7 +1085,7 @@ em_utils_redirect_message_by_uid (CamelF g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); @@ -4604,7 +4704,7 @@ } static void -@@ -1116,7 +1116,7 @@ +@@ -1116,7 +1116,7 @@ em_utils_handle_receipt (CamelFolder *fo } if (msg == NULL) { @@ -4613,7 +4713,7 @@ camel_message_info_free(info); return; } -@@ -1916,7 +1916,7 @@ +@@ -1922,7 +1922,7 @@ em_utils_reply_to_message(CamelFolder *f rd->source = source; if (rd->source) g_object_ref(rd->source); @@ -4622,16 +4722,16 @@ return; } -@@ -2088,5 +2088,5 @@ +@@ -2094,5 +2094,5 @@ em_utils_post_reply_to_message_by_uid (C g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.11.2/mail/mail-folder-cache.c.kill-ethread 2007-05-09 00:14:42.000000000 -0400 -+++ evolution-2.11.2/mail/mail-folder-cache.c 2007-05-18 15:34:09.000000000 -0400 -@@ -844,15 +844,14 @@ +--- evolution-2.11.3/mail/mail-folder-cache.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/mail-folder-cache.c 2007-06-04 14:25:34.000000000 -0400 +@@ -860,15 +860,14 @@ update_folders(CamelStore *store, CamelF struct _ping_store_msg { @@ -4650,7 +4750,7 @@ char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -863,10 +862,9 @@ +@@ -879,10 +878,9 @@ ping_store_desc (struct _mail_msg *mm, i } static void @@ -4662,7 +4762,7 @@ if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -877,22 +875,21 @@ +@@ -893,22 +891,21 @@ ping_store_ping (struct _mail_msg *mm) online = TRUE; } if (online) @@ -4693,7 +4793,7 @@ }; static void -@@ -904,11 +901,11 @@ +@@ -920,11 +917,11 @@ ping_store (gpointer key, gpointer val, if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) return; @@ -4707,7 +4807,7 @@ } static gboolean -@@ -953,7 +950,7 @@ +@@ -969,7 +966,7 @@ mail_note_store(CamelStore *store, Camel int hook = 0; g_assert(CAMEL_IS_STORE(store)); @@ -4716,9 +4816,9 @@ LOCK(info_lock); ---- evolution-2.11.2/mail/em-folder-view.c.kill-ethread 2007-05-10 05:27:32.000000000 -0400 -+++ evolution-2.11.2/mail/em-folder-view.c 2007-05-18 15:39:28.000000000 -0400 -@@ -69,6 +69,7 @@ +--- evolution-2.11.3/mail/em-folder-view.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-view.c 2007-06-04 14:25:34.000000000 -0400 +@@ -71,6 +71,7 @@ #include #include @@ -4726,7 +4826,7 @@ #include "menus/gal-view-etable.h" #include "menus/gal-view-factory-etable.h" -@@ -693,7 +694,7 @@ +@@ -695,7 +696,7 @@ emfv_got_folder(char *uri, CamelFolder * static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) { @@ -4735,7 +4835,7 @@ } static void -@@ -1614,7 +1615,7 @@ +@@ -1632,7 +1633,7 @@ filter_type_uid (CamelFolder *folder, co data->type = type; data->source = source; @@ -4744,7 +4844,7 @@ } static void -@@ -1712,7 +1713,7 @@ +@@ -1730,7 +1731,7 @@ vfolder_type_uid (CamelFolder *folder, c data->type = type; data->uri = g_strdup (uri); @@ -4753,17 +4853,17 @@ } static void -@@ -2355,7 +2356,7 @@ - emfv->priv->selected_uid); +@@ -2373,7 +2374,7 @@ emfv_message_selected_timeout(void *data + emfv->displayed_uid); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); - + */ - mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued); + mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push); } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.11.2/mail/mail-session.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/mail-session.c 2007-05-18 15:34:09.000000000 -0400 +--- evolution-2.11.3/mail/mail-session.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.3/mail/mail-session.c 2007-06-04 14:25:34.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -4773,7 +4873,7 @@ #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -258,21 +258,22 @@ +@@ -258,21 +258,22 @@ forget_password (CamelSession *session, /* ********************************************************************** */ @@ -4800,7 +4900,7 @@ /* clicked, send back the reply */ static void -@@ -280,122 +281,116 @@ +@@ -280,122 +281,116 @@ user_message_response (GtkDialog *dialog { gtk_widget_destroy ((GtkWidget *) dialog); @@ -4980,7 +5080,7 @@ } else ret = TRUE; -@@ -535,7 +530,7 @@ +@@ -535,7 +530,7 @@ get_filter_driver (CamelSession *session /* TODO: This is very temporary, until we have a better way to do the progress reporting, we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ @@ -4989,7 +5089,7 @@ static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { -@@ -544,7 +539,7 @@ +@@ -544,7 +539,7 @@ static void *ms_thread_msg_new(CamelSess /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so we get cancellation and progress in common with hte existing mail code, for free */ if (msg) { @@ -4998,7 +5098,7 @@ msg->data = m; camel_operation_unref(msg->op); -@@ -557,7 +552,7 @@ +@@ -557,7 +552,7 @@ static void *ms_thread_msg_new(CamelSess static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { @@ -5007,7 +5107,7 @@ ms_parent_class->thread_msg_free(session, m); } -@@ -680,22 +675,23 @@ +@@ -680,22 +675,23 @@ mail_session_set_interactive (gboolean i MAIL_SESSION (session)->interactive = interactive; if (!interactive) { @@ -5037,8 +5137,8 @@ } } } ---- evolution-2.11.2/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.2/mail/mail-mt.c 2007-05-18 15:34:09.000000000 -0400 +--- evolution-2.11.3/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.3/mail/mail-mt.c 2007-06-04 14:25:34.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -5049,7 +5149,7 @@ #include #include -@@ -63,7 +63,7 @@ +@@ -63,7 +63,7 @@ static void mail_operation_status(struct #endif /* background operation status stuff */ @@ -5058,7 +5158,7 @@ int activity_state; /* sigh sigh sigh, we need to keep track of the state external to the pointer itself for locking/race conditions */ int activity_id; -@@ -82,15 +82,12 @@ +@@ -82,15 +82,12 @@ static GHashTable *mail_msg_active_table static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; @@ -5077,7 +5177,7 @@ MAIL_MT_LOCK(mail_msg_lock); -@@ -112,7 +109,6 @@ +@@ -112,7 +109,6 @@ void *mail_msg_new(mail_msg_op_t *ops, E fprintf(log, "Logging async operations\n"); if (log_locks) { @@ -5085,7 +5185,7 @@ fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -122,13 +118,13 @@ +@@ -122,14 +118,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E } } #endif @@ -5101,9 +5201,11 @@ - msg->priv = g_malloc0(sizeof(*msg->priv)); + msg->priv = g_slice_new (MailMsgPrivate); ++ g_debug ("Inserting message %u", msg->seq); g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); -@@ -143,12 +139,15 @@ + d(printf("New message %p\n", msg)); +@@ -143,12 +140,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E return msg; } @@ -5122,7 +5224,7 @@ e_activity_handler_operation_finished (activity_handler, activity_id); } -@@ -177,58 +176,84 @@ +@@ -177,58 +177,85 @@ checkmem(void *p) } #endif @@ -5185,6 +5287,7 @@ #endif - g_hash_table_remove(mail_msg_active_table, GINT_TO_POINTER(m->seq)); - pthread_cond_broadcast(&mail_msg_cond); ++ g_debug ("Removing message %u", mail_msg->seq); + g_hash_table_remove ( + mail_msg_active_table, GINT_TO_POINTER (mail_msg->seq)); + pthread_cond_broadcast (&mail_msg_cond); @@ -5233,7 +5336,7 @@ } /* hash table of ops->dialogue of active errors */ -@@ -244,9 +269,10 @@ +@@ -244,9 +271,10 @@ static void error_response(GtkObject *o, gtk_widget_destroy((GtkWidget *)o); } @@ -5246,7 +5349,7 @@ char *what; GtkDialog *gd; -@@ -271,27 +297,27 @@ +@@ -271,27 +299,27 @@ void mail_msg_check_error(void *msg) /* check to see if we have dialogue already running for this operation */ /* we key on the operation pointer, which is at least accurate enough for the operation type, although it could be on a different object. */ @@ -5281,7 +5384,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); -@@ -304,13 +330,12 @@ +@@ -304,13 +332,12 @@ void mail_msg_cancel(unsigned int msgid) /* waits for a message to be finished processing (freed) @@ -5298,7 +5401,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +372,7 @@ +@@ -347,9 +374,7 @@ int mail_msg_active(unsigned int msgid) void mail_msg_wait_all(void) { @@ -5309,8 +5412,81 @@ MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -420,241 +443,183 @@ - MAIL_MT_UNLOCK(mail_msg_lock); +@@ -367,294 +392,239 @@ void mail_msg_wait_all(void) + } + + /* **************************************** */ +-struct _cancel_hook_data { +- struct _cancel_hook_data *next; +- struct _cancel_hook_data *prev; + +- GDestroyNotify func; +- void *data; +-}; ++static GHookList cancel_hook_list; + +-static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); +- +-void *mail_cancel_hook_add(GDestroyNotify func, void *data) ++GHook * ++mail_cancel_hook_add (GHookFunc func, gpointer data) + { +- struct _cancel_hook_data *d; ++ GHook *hook; + +- d = g_malloc0(sizeof(*d)); +- d->func = func; +- d->data = data; ++ MAIL_MT_LOCK (mail_msg_lock); + +- MAIL_MT_LOCK(mail_msg_lock); +- e_dlist_addtail(&cancel_hook_list, (EDListNode *)d); +- MAIL_MT_UNLOCK(mail_msg_lock); ++ if (!cancel_hook_list.is_setup) ++ g_hook_list_init (&cancel_hook_list, sizeof (GHook)); + +- return (void *)d; +-} ++ hook = g_hook_alloc (&cancel_hook_list); ++ hook->func = func; ++ hook->data = data; + +-void mail_cancel_hook_remove(void *handle) +-{ +- struct _cancel_hook_data *d = handle; ++ g_hook_append (&cancel_hook_list, hook); + +- MAIL_MT_LOCK(mail_msg_lock); +- e_dlist_remove((EDListNode *)d); +- MAIL_MT_UNLOCK(mail_msg_lock); +- g_free(d); ++ MAIL_MT_UNLOCK (mail_msg_lock); ++ ++ return hook; + } + +-void mail_cancel_all(void) ++void ++mail_cancel_hook_remove (GHook *hook) + { +- struct _cancel_hook_data *d, *n; ++ MAIL_MT_LOCK (mail_msg_lock); + +- camel_operation_cancel(NULL); ++ g_assert (cancel_hook_list.is_setup); ++ g_hook_destroy_link (&cancel_hook_list, hook); + +- /* I can ssee a deadlock coming on ... */ +- MAIL_MT_LOCK(mail_msg_lock); +- d = (struct _cancel_hook_data *)cancel_hook_list.head; +- n = d->next; +- while (n) { +- d->func(d->data); +- d = n; +- n = n->next; +- } +- MAIL_MT_UNLOCK(mail_msg_lock); ++ MAIL_MT_UNLOCK (mail_msg_lock); } -EMsgPort *mail_gui_port; @@ -5337,39 +5513,36 @@ -#ifdef G_OS_WIN32 -EThread * -mail_win32_get_mail_thread_queued (void) -+#define PERIODIC_RATE_HZ 10 -+static guint periodic_source_id = 0; ++void ++mail_cancel_all (void) + { +- return mail_thread_queued; ++ camel_operation_cancel (NULL); ++ ++ MAIL_MT_LOCK (mail_msg_lock); ++ ++ if (cancel_hook_list.is_setup) ++ g_hook_list_invoke (&cancel_hook_list, FALSE); ++ ++ MAIL_MT_UNLOCK (mail_msg_lock); + } +-#endif ++ ++static guint idle_source_id = 0; ++G_LOCK_DEFINE_STATIC (idle_source_id); +static GAsyncQueue *main_loop_queue = NULL; +static GAsyncQueue *msg_reply_queue = NULL; +static GThread *main_thread = NULL; -+ -+static void -+periodic_cleanup (void) - { -- return mail_thread_queued; -+ periodic_source_id = 0; -+ -+ g_assert (main_loop_queue != NULL); -+ g_async_queue_unref (main_loop_queue); -+ main_loop_queue = NULL; -+ -+ g_assert (msg_reply_queue != NULL); -+ g_async_queue_unref (msg_reply_queue); -+ msg_reply_queue = NULL; - } --#endif static gboolean -mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) -+periodic_processing (void) ++mail_msg_idle_cb (void) { - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; -+ MailMsg *msg; - +- - while (( m = (mail_msg_t *)e_msgport_get(port))) { -+ g_assert (main_loop_queue != NULL); -+ g_assert (msg_reply_queue != NULL); ++ MailMsg *msg; -#ifdef MALLOC_CHECK - checkmem(m); @@ -5382,11 +5555,17 @@ - fprintf(log, "%p: Replied to GUI thread (exception `%s'\n", m, - camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); -#endif -- ++ g_assert (main_loop_queue != NULL); ++ g_assert (msg_reply_queue != NULL); + - if (m->ops->reply_msg) - m->ops->reply_msg(m); - mail_msg_check_error(m); - mail_msg_free(m); ++ G_LOCK (idle_source_id); ++ idle_source_id = 0; ++ G_UNLOCK (idle_source_id); ++ + /* check the main loop queue */ + while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { + if (msg->info->exec != NULL) @@ -5404,7 +5583,8 @@ + mail_msg_unref (msg); } - return TRUE; +- return TRUE; ++ return FALSE; } -static gboolean @@ -5414,6 +5594,28 @@ { - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; +- +- while (( m = (mail_msg_t *)e_msgport_get(port))) { +-#ifdef MALLOC_CHECK +- checkmem(m); +- checkmem(m->cancel); +- checkmem(m->priv); +-#endif +- +-#ifdef LOG_OPS +- if (log_ops) +- fprintf(log, "%p: Received at GUI thread\n", m); +-#endif +- +- if (m->ops->receive_msg) +- m->ops->receive_msg(m); +- if (m->msg.reply_port) +- e_msgport_reply((EMsg *)m); +- else { +- if (m->ops->reply_msg) +- m->ops->reply_msg(m); +- mail_msg_free(m); +- } + if (msg->info->desc != NULL) { + gchar *text = msg->info->desc (msg); + camel_operation_register (msg->cancel); @@ -5434,137 +5636,107 @@ + camel_operation_unref (msg->cancel); + msg->cancel = NULL; + MAIL_MT_UNLOCK (mail_msg_lock); -+ } - -- while (( m = (mail_msg_t *)e_msgport_get(port))) { --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -+ g_async_queue_push (msg_reply_queue, msg); -+} - --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Received at GUI thread\n", m); --#endif -+void -+mail_msg_cleanup (void) -+{ -+ GSource *source; - -- if (m->ops->receive_msg) -- m->ops->receive_msg(m); -- if (m->msg.reply_port) -- e_msgport_reply((EMsg *)m); -- else { -- if (m->ops->reply_msg) -- m->ops->reply_msg(m); -- mail_msg_free(m); -- } -- } -+ mail_msg_wait_all(); + } - return TRUE; -+ /* stop periodic processing */ -+ source = g_main_context_find_source_by_id ( -+ g_main_context_default (), periodic_source_id); -+ g_assert (source != NULL); -+ g_source_destroy (source); ++ g_async_queue_push (msg_reply_queue, msg); ++ ++ G_LOCK (idle_source_id); ++ if (idle_source_id == 0) ++ idle_source_id = g_idle_add ( ++ (GSourceFunc) mail_msg_idle_cb, NULL); ++ G_UNLOCK (idle_source_id); } -/* Test code, lighterwight, more configurable calls */ -static gboolean -mail_msgport_received2(GIOChannel *source, GIOCondition cond, void *d) +void -+mail_msg_init (void) ++mail_msg_cleanup (void) { - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; -+ main_loop_queue = g_async_queue_new (); -+ msg_reply_queue = g_async_queue_new (); ++ mail_msg_wait_all(); - while (( m = (mail_msg_t *)e_msgport_get(port))) { -#ifdef LOG_OPS - if (log_ops) - fprintf(log, "%p: Received at GUI2 thread\n", m); -#endif -+ /* start periodic processing */ -+ periodic_source_id = g_timeout_add_full ( -+ G_PRIORITY_DEFAULT, -+ 1000 / PERIODIC_RATE_HZ, -+ (GSourceFunc) periodic_processing, NULL, -+ (GDestroyNotify) periodic_cleanup); ++ G_LOCK (idle_source_id); ++ if (idle_source_id != 0) { ++ GSource *source; - if (m->ops->receive_msg) - m->ops->receive_msg(m); - else - mail_msg_free(m); -- } -+ mail_msg_active_table = g_hash_table_new (NULL, NULL); -+ main_thread = g_thread_self (); ++ /* Cancel the idle source. */ ++ source = g_main_context_find_source_by_id ( ++ g_main_context_default (), idle_source_id); ++ g_assert (source != NULL); ++ g_source_destroy (source); ++ idle_source_id = 0; + } ++ G_UNLOCK (idle_source_id); - return TRUE; -+ mail_async_event = mail_async_event_new (); - } +-} ++ g_assert (main_loop_queue != NULL); ++ g_async_queue_unref (main_loop_queue); ++ main_loop_queue = NULL; + ++ g_assert (msg_reply_queue != NULL); ++ g_async_queue_unref (msg_reply_queue); ++ msg_reply_queue = NULL; ++} -- -static void -mail_msg_destroy(EThread *e, EMsg *msg, void *data) -+static gint -+mail_msg_compare (const MailMsg *msg1, const MailMsg *msg2) ++void ++mail_msg_init (void) { - mail_msg_t *m = (mail_msg_t *)msg; -+ gint priority1 = msg1->priority; -+ gint priority2 = msg2->priority; ++ main_loop_queue = g_async_queue_new (); ++ msg_reply_queue = g_async_queue_new (); -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); - checkmem(m->priv); -#endif -+ if (priority1 == priority2) -+ return 0; ++ mail_msg_active_table = g_hash_table_new (NULL, NULL); ++ main_thread = g_thread_self (); - mail_msg_free(m); -+ return (priority1 < priority2) ? 1 : -1; ++ mail_async_event = mail_async_event_new (); } -static void -mail_msg_received(EThread *e, EMsg *msg, void *data) -+static gpointer -+create_thread_pool (gpointer data) ++static gint ++mail_msg_compare (const MailMsg *msg1, const MailMsg *msg2) { - mail_msg_t *m = (mail_msg_t *)msg; -+ GThreadPool *thread_pool; -+ gint max_threads = GPOINTER_TO_INT (data); - +- -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); - checkmem(m->priv); -#endif -+ /* once created, run forever */ -+ thread_pool = g_thread_pool_new ( -+ (GFunc) mail_msg_proxy, NULL, max_threads, FALSE, NULL); -+ g_thread_pool_set_sort_function ( -+ thread_pool, (GCompareDataFunc) mail_msg_compare, NULL); ++ gint priority1 = msg1->priority; ++ gint priority2 = msg2->priority; - if (m->ops->describe_msg) { - char *text = m->ops->describe_msg(m, FALSE); -+ return thread_pool; -+} ++ if (priority1 == priority2) ++ return 0; -#ifdef LOG_OPS - if (log_ops) - fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x: '%s'\n", m, e_util_pthread_id(pthread_self()), text); -#endif -+void -+mail_msg_main_loop_push (gpointer msg) -+{ -+ g_async_queue_push_sorted (main_loop_queue, msg, -+ (GCompareDataFunc) mail_msg_compare, NULL); ++ return (priority1 < priority2) ? 1 : -1; +} - d(printf("message received at thread\n")); @@ -5577,17 +5749,22 @@ - if (log_ops) - fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x\n", m, e_util_pthread_id(pthread_self())); -#endif -+void -+mail_msg_unordered_push (gpointer msg) ++static gpointer ++create_thread_pool (gpointer data) +{ -+ static GOnce once = G_ONCE_INIT; ++ GThreadPool *thread_pool; ++ gint max_threads = GPOINTER_TO_INT (data); - if (m->ops->receive_msg) { - mail_enable_stop(); - m->ops->receive_msg(m); - mail_disable_stop(); - } -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); ++ /* once created, run forever */ ++ thread_pool = g_thread_pool_new ( ++ (GFunc) mail_msg_proxy, NULL, max_threads, FALSE, NULL); ++ g_thread_pool_set_sort_function ( ++ thread_pool, (GCompareDataFunc) mail_msg_compare, NULL); - if (m->ops->describe_msg) { - camel_operation_end(m->cancel); @@ -5597,33 +5774,45 @@ - m->cancel = NULL; - MAIL_MT_UNLOCK(mail_msg_lock); - } -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); ++ return thread_pool; } -void mail_msg_cleanup(void) +void -+mail_msg_fast_ordered_push (gpointer msg) ++mail_msg_main_loop_push (gpointer msg) { - mail_msg_wait_all(); -- ++ g_async_queue_push_sorted (main_loop_queue, msg, ++ (GCompareDataFunc) mail_msg_compare, NULL); + - e_thread_destroy(mail_thread_queued_slow); - e_thread_destroy(mail_thread_queued); - e_thread_destroy(mail_thread_new); -+ static GOnce once = G_ONCE_INIT; ++ G_LOCK (idle_source_id); ++ if (idle_source_id == 0) ++ idle_source_id = g_idle_add ( ++ (GSourceFunc) mail_msg_idle_cb, NULL); ++ G_UNLOCK (idle_source_id); ++} - g_io_channel_unref(mail_gui_channel); - g_io_channel_unref(mail_gui_reply_channel); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); ++void ++mail_msg_unordered_push (gpointer msg) ++{ ++ static GOnce once = G_ONCE_INIT; - e_msgport_destroy(mail_gui_port); - e_msgport_destroy(mail_gui_reply_port); ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); ++ + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); } -static guint -em_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) +void -+mail_msg_slow_ordered_push (gpointer msg) ++mail_msg_fast_ordered_push (gpointer msg) { - GSource *source; - guint id; @@ -5647,8 +5836,8 @@ } -void mail_msg_init(void) -+gboolean -+mail_in_main_thread (void) ++void ++mail_msg_slow_ordered_push (gpointer msg) { - em_channel_setup(&mail_gui_reply_port, &mail_gui_reply_channel, mail_msgport_replied); - mail_gui_watch = em_channel_setup(&mail_gui_port, &mail_gui_channel, mail_msgport_received); @@ -5669,16 +5858,24 @@ - e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0); - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); -- ++ static GOnce once = G_ONCE_INIT; ++ ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); + - mail_msg_active_table = g_hash_table_new(NULL, NULL); - mail_gui_thread = pthread_self(); -- ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); ++} + - mail_async_event = mail_async_event_new(); ++gboolean ++mail_in_main_thread (void) ++{ + return (g_thread_self () == main_thread); } /* ********************************************************************** */ -@@ -665,7 +630,8 @@ +@@ -665,7 +635,8 @@ static pthread_mutex_t status_lock = PTH /* ********************************************************************** */ struct _proxy_msg { @@ -5688,7 +5885,7 @@ MailAsyncEvent *ea; mail_async_event_t type; -@@ -679,10 +645,8 @@ +@@ -679,10 +650,8 @@ struct _proxy_msg { }; static void @@ -5700,7 +5897,7 @@ m->thread = pthread_self(); m->have_thread = TRUE; m->func(m->o, m->event_data, m->data); -@@ -697,16 +661,17 @@ +@@ -697,16 +666,17 @@ static int idle_async_event(void *mm) { do_async_event(mm); @@ -5724,7 +5921,7 @@ }; MailAsyncEvent *mail_async_event_new(void) -@@ -723,10 +688,9 @@ +@@ -723,10 +693,9 @@ int mail_async_event_emit(MailAsyncEvent { struct _proxy_msg *m; int id; @@ -5736,7 +5933,7 @@ m->func = func; m->o = o; m->event_data = event_data; -@@ -735,7 +699,7 @@ +@@ -735,7 +704,7 @@ int mail_async_event_emit(MailAsyncEvent m->type = type; m->have_thread = FALSE; @@ -5745,7 +5942,7 @@ g_mutex_lock(ea->lock); ea->tasks = g_slist_prepend(ea->tasks, m); g_mutex_unlock(ea->lock); -@@ -743,12 +707,12 @@ +@@ -743,12 +712,12 @@ int mail_async_event_emit(MailAsyncEvent /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -5761,7 +5958,7 @@ return id; } -@@ -762,7 +726,7 @@ +@@ -762,7 +731,7 @@ int mail_async_event_destroy(MailAsyncEv g_mutex_lock(ea->lock); while (ea->tasks) { m = ea->tasks->data; @@ -5770,7 +5967,7 @@ if (m->have_thread && pthread_equal(m->thread, thread)) { g_warning("Destroying async event from inside an event, returning EDEADLK"); g_mutex_unlock(ea->lock); -@@ -784,17 +748,18 @@ +@@ -784,17 +753,18 @@ int mail_async_event_destroy(MailAsyncEv /* ********************************************************************** */ struct _call_msg { @@ -5792,7 +5989,7 @@ void *p1, *p2, *p3, *p4, *p5; int i1; va_list ap; -@@ -842,45 +807,48 @@ +@@ -842,45 +812,48 @@ do_call(struct _mail_msg *mm) m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } @@ -5860,7 +6057,7 @@ return ret; } -@@ -889,40 +857,42 @@ +@@ -889,40 +862,42 @@ void *mail_call_main(mail_call_t type, M /* locked via status_lock */ static int busy_state; @@ -5915,7 +6112,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -930,7 +900,7 @@ +@@ -930,7 +905,7 @@ void mail_disable_stop(void) /* ******************************************************************************** */ struct _op_status_msg { @@ -5924,7 +6121,7 @@ struct _CamelOperation *op; char *what; -@@ -938,16 +908,16 @@ +@@ -938,16 +913,16 @@ struct _op_status_msg { void *data; }; @@ -5946,7 +6143,7 @@ MAIL_MT_LOCK (mail_msg_lock); -@@ -986,8 +956,8 @@ +@@ -986,8 +961,8 @@ static void do_op_status(struct _mail_ms progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); MAIL_MT_UNLOCK (mail_msg_lock); @@ -5957,7 +6154,7 @@ /* uncommenting because message is not very useful for a user, see bug 271734*/ else { what = g_strdup(""); -@@ -1021,18 +991,17 @@ +@@ -1021,18 +996,17 @@ static void do_op_status(struct _mail_ms } static void @@ -5983,7 +6180,7 @@ }; static void -@@ -1042,7 +1011,7 @@ +@@ -1042,7 +1016,7 @@ mail_operation_status (struct _CamelOper d(printf("got operation statys: %s %d%%\n", what, pc)); @@ -5992,7 +6189,7 @@ m->op = op; m->what = g_strdup(what); switch (pc) { -@@ -1055,7 +1024,7 @@ +@@ -1055,7 +1029,7 @@ mail_operation_status (struct _CamelOper } m->pc = pc; m->data = data; @@ -6001,9 +6198,9 @@ } /* ******************** */ ---- evolution-2.11.2/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 -+++ evolution-2.11.2/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-05-18 15:34:09.000000000 -0400 -@@ -44,32 +44,30 @@ +--- evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 ++++ evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-04 14:25:34.000000000 -0400 +@@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( struct _folder_unsub_t { @@ -6044,7 +6241,7 @@ if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) path = url->fragment; else if (url->path && url->path[0]) -@@ -82,18 +80,17 @@ +@@ -82,18 +80,17 @@ folder_unsubscribe__unsub (struct _mail_ } static void @@ -6071,7 +6268,7 @@ }; -@@ -105,8 +102,8 @@ +@@ -105,8 +102,8 @@ org_gnome_mail_folder_unsubscribe (EPlug if (target->uri == NULL) return; @@ -6082,9 +6279,9 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } ---- evolution-2.11.2/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 -+++ evolution-2.11.2/plugins/mark-all-read/mark-all-read.c 2007-05-18 15:34:09.000000000 -0400 -@@ -44,7 +44,7 @@ +--- evolution-2.11.3/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 ++++ evolution-2.11.3/plugins/mark-all-read/mark-all-read.c 2007-06-04 14:25:34.000000000 -0400 +@@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } @@ -6093,9 +6290,9 @@ } static void ---- evolution-2.11.2/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 -+++ evolution-2.11.2/plugins/exchange-operations/exchange-folder.c 2007-05-18 15:34:09.000000000 -0400 -@@ -140,7 +140,7 @@ +--- evolution-2.11.3/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 ++++ evolution-2.11.3/plugins/exchange-operations/exchange-folder.c 2007-06-04 14:25:34.000000000 -0400 +@@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); /* To get the CamelStore/Folder */ @@ -6104,18 +6301,18 @@ } ---- evolution-2.11.2/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 -+++ evolution-2.11.2/plugins/save-attachments/save-attachments.c 2007-05-18 15:34:09.000000000 -0400 -@@ -403,5 +403,5 @@ +--- evolution-2.11.3/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 ++++ evolution-2.11.3/plugins/save-attachments/save-attachments.c 2007-06-04 14:25:34.000000000 -0400 +@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.11.2/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 -+++ evolution-2.11.2/plugins/mailing-list-actions/mailing-list-actions.c 2007-05-18 15:34:09.000000000 -0400 -@@ -89,7 +89,7 @@ +--- evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 ++++ evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-04 14:25:34.000000000 -0400 +@@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), @@ -6124,9 +6321,9 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.11.2/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 -+++ evolution-2.11.2/plugins/groupwise-features/share-folder-common.c 2007-05-18 15:34:09.000000000 -0400 -@@ -121,7 +121,7 @@ +--- evolution-2.11.3/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 ++++ evolution-2.11.3/plugins/groupwise-features/share-folder-common.c 2007-06-04 14:25:34.000000000 -0400 +@@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } struct _EMCreateFolder { @@ -6135,7 +6332,7 @@ /* input data */ CamelStore *store; -@@ -137,31 +137,26 @@ +@@ -137,31 +137,26 @@ struct _EMCreateFolder { void *user_data; }; @@ -6173,7 +6370,7 @@ struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; CamelStore *store = CAMEL_STORE (m->store) ; EGwConnection *ccnc; -@@ -180,10 +175,8 @@ +@@ -180,10 +175,8 @@ create_folder__created (struct _mail_msg } static void @@ -6185,7 +6382,7 @@ camel_store_free_folder_info (m->store, m->fi); camel_object_unref (m->store); g_free (m->full_name); -@@ -191,11 +184,12 @@ +@@ -191,11 +184,12 @@ create_folder__free (struct _mail_msg *m g_free (m->name); } @@ -6203,7 +6400,7 @@ }; static void -@@ -229,7 +223,7 @@ +@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const parent = namebuf; } @@ -6212,7 +6409,7 @@ camel_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); -@@ -238,8 +232,8 @@ +@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const m->user_data = (struct ShareInfo *) user_data; m->done = done; g_free (namebuf); @@ -6223,9 +6420,9 @@ return id; } ---- evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.h 2007-05-18 15:34:09.000000000 -0400 -@@ -39,19 +39,6 @@ +--- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h 2007-06-04 14:25:34.000000000 -0400 +@@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6245,9 +6442,9 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-notify.c 2007-05-18 15:34:09.000000000 -0400 -@@ -45,10 +45,6 @@ +--- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c 2007-06-04 14:25:34.000000000 -0400 +@@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; @@ -6258,7 +6455,7 @@ #define d(x) x -@@ -286,72 +282,12 @@ +@@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object) g_mutex_free (priv->mutex); g_free (priv); @@ -6331,7 +6528,7 @@ /** * alarm_notify_new: * -@@ -363,23 +299,10 @@ +@@ -363,23 +299,10 @@ alarm_msg_received(EThread *e, EMsg *msg AlarmNotify * alarm_notify_new (void) { @@ -6359,9 +6556,9 @@ } static void ---- evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-05-09 00:14:46.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/alarm-notify/alarm-queue.c 2007-05-18 15:34:09.000000000 -0400 -@@ -115,9 +115,6 @@ +--- evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-06-01 03:09:22.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c 2007-06-04 14:25:34.000000000 -0400 +@@ -97,9 +97,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; @@ -6371,7 +6568,7 @@ /* Structure that stores a client we are monitoring */ typedef struct { /* Monitored client */ -@@ -199,6 +196,40 @@ +@@ -181,6 +178,40 @@ static void on_dialog_objs_removed_cb (E static void load_alarms_for_today (ClientAlarms *ca); static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); @@ -6412,7 +6609,7 @@ /* Queues an alarm trigger for midnight so that we can load the next day's worth * of alarms. */ -@@ -237,47 +268,41 @@ +@@ -219,47 +250,41 @@ add_client_alarms_cb (gpointer key, gpoi } struct _midnight_refresh_msg { @@ -6470,7 +6667,7 @@ } /* Looks up a client in the client alarms hash table */ -@@ -636,6 +661,7 @@ +@@ -618,6 +643,7 @@ remove_comp (ClientAlarms *ca, ECalCompo * alarms. */ struct _query_msg { @@ -6478,7 +6675,7 @@ ECal *client; GList *objects; gpointer data; -@@ -669,7 +695,7 @@ +@@ -651,7 +677,7 @@ duplicate_ecal (GList *in_list) } static void @@ -6487,7 +6684,7 @@ { ClientAlarms *ca; time_t from, day_end; -@@ -678,13 +704,12 @@ +@@ -660,13 +686,12 @@ query_objects_changed_async (EThread *e, icaltimezone *zone; CompQueuedAlarms *cqa; GList *l; @@ -6504,7 +6701,7 @@ from = config_data_get_last_notification_time (); if (from == -1) -@@ -773,43 +798,38 @@ +@@ -755,43 +780,38 @@ query_objects_changed_async (EThread *e, comp = NULL; } g_list_free (objects); @@ -6561,7 +6758,7 @@ d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); -@@ -822,27 +842,22 @@ +@@ -804,27 +824,22 @@ query_objects_removed_async (EThread *e, } g_list_free (objects); @@ -6598,7 +6795,7 @@ } -@@ -989,20 +1004,19 @@ +@@ -966,20 +981,19 @@ free_tray_icon_data (TrayIconData *tray_ } static void @@ -6623,7 +6820,7 @@ e_cal_component_get_uid (tray_data->comp, &our_uid); g_return_if_fail (our_uid && *our_uid); -@@ -1020,37 +1034,33 @@ +@@ -997,37 +1011,33 @@ on_dialog_objs_removed_async (EThread *e tray_data = NULL; } } @@ -6673,7 +6870,7 @@ GList *list = tray_icons_list; d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); -@@ -1089,28 +1099,25 @@ +@@ -1066,28 +1076,25 @@ tray_list_remove_cqa_async(EThread *e, A gtk_tree_selection_select_iter (sel, &iter); } } @@ -6711,7 +6908,7 @@ { GList *list = tray_icons_list; -@@ -1140,55 +1147,50 @@ +@@ -1117,55 +1124,50 @@ tray_list_remove_async(EThread *e, Alarm } else list = list->next; } @@ -6785,7 +6982,7 @@ } static void -@@ -1412,29 +1414,24 @@ +@@ -1372,29 +1374,24 @@ tray_icon_blink_cb (gpointer data) /* Add a new data to tray list */ static void @@ -6826,7 +7023,7 @@ } /* Performs notification of a display alarm */ -@@ -1862,21 +1859,13 @@ +@@ -1791,21 +1788,13 @@ check_midnight_refresh (gpointer user_da new_midnight = time_day_end_with_zone (time (NULL), zone); if (new_midnight > midnight) { @@ -6853,7 +7050,7 @@ } return TRUE; -@@ -2007,14 +1996,15 @@ +@@ -1936,14 +1925,15 @@ hash_ids (gpointer a) } struct _alarm_client_msg { @@ -6872,7 +7069,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2045,6 +2035,8 @@ +@@ -1974,6 +1964,8 @@ static void alarm_queue_add_async (EThre G_CALLBACK (cal_opened_cb), ca); } @@ -6881,7 +7078,7 @@ } /** -@@ -2064,20 +2056,13 @@ +@@ -1993,20 +1985,13 @@ static void alarm_queue_add_async (EThre void alarm_queue_add_client (ECal *client) { @@ -6907,7 +7104,7 @@ } /* Removes a component an its alarms */ -@@ -2129,11 +2114,10 @@ +@@ -2058,11 +2043,10 @@ remove_client_alarms (ClientAlarms *ca) * Removes a calendar client from the alarm queueing system. **/ static void @@ -6921,7 +7118,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2170,24 +2154,20 @@ +@@ -2099,24 +2083,20 @@ alarm_queue_remove_async (EThread *e, Al g_free (ca); g_hash_table_remove (client_alarms_hash, client); diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index d873dba..753fe08 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -56,7 +56,7 @@ - const unsigned char *subject; - - subject = (const unsigned char *) string; -- while (!g_ascii_strncasecmp (subject, "Re:", 3)) { +- while (!g_ascii_strncasecmp ((char *)subject, "Re:", 3)) { - subject += 3; - - /* jump over any spaces */ diff --git a/evolution.spec b/evolution.spec index 71efb8c..01393f1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.11.2 -Release: 2%{?dist} +Version: 2.11.3 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -95,9 +95,6 @@ Patch20: evolution-2.7.3-replicated-cjk-input.patch # RH bug #178295 / GNOME bug #348638 Patch21: evolution-2.7.4-deleting-preedit-buffer.patch -# RH bug #202289 -Patch22: evolution-2.7.92-fix-prgname.patch - # RH bug #161885 / GNOME bug #309166 Patch23: evolution-2.8.0-indic-cursor-movement.patch @@ -134,14 +131,8 @@ Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch -# RH bug #235878 / GNOME bug #386503 -Patch35: evolution-2.10.1-fix-help.patch - -# RH bug #238155 / GNOME bug #427232 -Patch36: evolution-2.10.1-check-uri-before-strcmp.patch - -# RH bug #240147 / GNOME bug #335241 -Patch37: evolution-2.10.1-send-recv-dialog.patch +# Upstream really needs to use -Werror-implicit-function-declaration. +Patch35: evolution-2.11.3-implicit-function-declaration.patch ## Dependencies ### @@ -270,7 +261,6 @@ Development files needed for building things which link against evolution. %patch19 -p1 -b .candidate-window-position-calendar %patch20 -p1 -b .replicated-cjk-input %patch21 -p1 -b .deleting-preedit-buffer -%patch22 -p1 -b .fix-prgname %patch23 -p1 -b .indic-cursor-movement %patch24 -p1 -b .fix-indic-printing %patch25 -p1 -b .kill-ethread @@ -283,9 +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 .fix-help -%patch36 -p1 -b .check-uri-before-strcmp -%patch37 -p1 -b .send-recv-dialog +%patch35 -p1 -b .implicit-function-declaration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -428,9 +416,6 @@ rm -f $RPM_BUILD_ROOT/%{_datadir}/applications/evolution.desktop rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime -# evolution link -ln -sf ./evolution-%{evo_major} $RPM_BUILD_ROOT/%{_bindir}/evolution - for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done @@ -442,12 +427,13 @@ scrollkeeper-update -q touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault-%{evo_major}.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook-%{evo_major}.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar-%{evo_major}.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell-%{evo_major}.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin-%{evo_major}.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.schemas > /dev/null +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_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 +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null %postun /sbin/ldconfig @@ -463,15 +449,15 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog 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/bogo-junk-plugin-%{evo_major}.schemas -%{_sysconfdir}/gconf/schemas/evolution-mail-%{evo_major}.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 +%{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas +%{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas +%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas +%{_sysconfdir}/gconf/schemas/evolution-mail.schemas -# The main executable and a symlink: -%{_bindir}/evolution-%{evo_major} +# The main executable %{_bindir}/evolution # Desktop files: @@ -506,11 +492,11 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/evolution/%{evo_major} # 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 +%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook.server +%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar.server +%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server +%{_libdir}/bonobo/servers/GNOME_Evolution_Mail.server +%{_libdir}/bonobo/servers/GNOME_Evolution_Shell.server %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_major} %dir %{_libdir}/evolution/%{evo_major}/components @@ -556,16 +542,16 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/evolution/%{evo_major}/conduits %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so -%{_libdir}/gnome-pilot/conduits/e-address-%{evo_major}.conduit +%{_libdir}/gnome-pilot/conduits/e-address.conduit %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so -%{_libdir}/gnome-pilot/conduits/e-calendar-%{evo_major}.conduit +%{_libdir}/gnome-pilot/conduits/e-calendar.conduit %{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-memo-%{evo_major}.conduit +%{_libdir}/gnome-pilot/conduits/e-memo.conduit %{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-todo-%{evo_major}.conduit +%{_libdir}/gnome-pilot/conduits/e-todo.conduit %endif # The plugin directory: @@ -695,8 +681,8 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) %{_includedir}/evolution-%{evo_major} -%{_libdir}/pkgconfig/evolution-plugin-%{evo_major}.pc -%{_libdir}/pkgconfig/evolution-shell-%{evo_major}.pc +%{_libdir}/pkgconfig/evolution-plugin.pc +%{_libdir}/pkgconfig/evolution-shell.pc %{_libdir}/evolution/%{evo_major}/libeabutil.so %{_libdir}/evolution/%{evo_major}/libeconduit.so %{_libdir}/evolution/%{evo_major}/libecontacteditor.so @@ -721,6 +707,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Jun 04 2007 Matthew Barnes - 2.11.3-1.fc8 +- Update to 2.11.3 +- Evolution no longer has versioned file names. +- Remove patch for RH bug #202289 (fixed upstream). +- Remove patch for RH bug #235878 (fixed upstream). +- Remove patch for RH bug #238155 (fixed upstream). +- Remove patch for RH bug #240147 (fixed upstream). + * Thu May 31 2007 Matthew Barnes - 2.11.2-2.fc8 - Evolution no longer requires libgnomeprint[ui]. diff --git a/sources b/sources index f210fd0..5e28d1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7f684d90627bacd6e4a7997592112484 evolution-2.11.2.tar.bz2 +4aa1a1a4b4cf51d64eb259ae3769c8d0 evolution-2.11.3.tar.bz2 From 25202c5c2d0ff1e0af096256f7845185172abce5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 5 Jun 2007 19:23:55 +0000 Subject: [PATCH 143/844] - Fix an invalid g_free() that was causing lock-ups. --- evolution-2.11.3-fix-invalid-free.patch | 11 +++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 evolution-2.11.3-fix-invalid-free.patch diff --git a/evolution-2.11.3-fix-invalid-free.patch b/evolution-2.11.3-fix-invalid-free.patch new file mode 100644 index 0000000..45a7937 --- /dev/null +++ b/evolution-2.11.3-fix-invalid-free.patch @@ -0,0 +1,11 @@ +--- evolution-2.11.3/mail/em-folder-view.c.fix-invalid-free 2007-06-05 15:20:42.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-view.c 2007-06-05 15:20:51.000000000 -0400 +@@ -2930,7 +2930,7 @@ emfv_on_url_cb (GObject *emitter, const + camel_url_free(curl); + camel_object_unref(cia); + } else if (!strncmp (url, "##", 2)) { +- nice_url = _("Click to hide/unhide addresses"); ++ nice_url = g_strdup (_("Click to hide/unhide addresses")); + } else + nice_url = g_strdup_printf (_("Click to open %s"), url); + } diff --git a/evolution.spec b/evolution.spec index 01393f1..2167cef 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -134,6 +134,9 @@ Patch34: evolution-2.10.0-e-source-combo-box.patch # Upstream really needs to use -Werror-implicit-function-declaration. Patch35: evolution-2.11.3-implicit-function-declaration.patch +# Fix an invalid free in em-folder-view.c +Patch36: evolution-2.11.3-fix-invalid-free.patch + ## Dependencies ### Requires(post): GConf2 @@ -274,6 +277,7 @@ Development files needed for building things which link against evolution. %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box %patch35 -p1 -b .implicit-function-declaration +%patch36 -p1 -b .fix-invalid-free mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -707,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Jun 05 2007 Matthew Barnes - 2.11.3-2.fc8 +- Fix an invalid g_free() that was causing lock-ups. + * Mon Jun 04 2007 Matthew Barnes - 2.11.3-1.fc8 - Update to 2.11.3 - Evolution no longer has versioned file names. From 10699f07ca0daf05c95879fce46b0ca20f45c276 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 Jun 2007 16:01:29 +0000 Subject: [PATCH 144/844] - Remove some debug messages that accidentally slipped in. --- evolution-2.8.1-kill-ethread.patch | 6 ++---- evolution.spec | 5 ++++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 1892023..53f01cc 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -5185,7 +5185,7 @@ fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -122,14 +118,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -122,14 +118,14 @@ void *mail_msg_new(mail_msg_op_t *ops, E } } #endif @@ -5201,7 +5201,6 @@ - msg->priv = g_malloc0(sizeof(*msg->priv)); + msg->priv = g_slice_new (MailMsgPrivate); -+ g_debug ("Inserting message %u", msg->seq); g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); d(printf("New message %p\n", msg)); @@ -5224,7 +5223,7 @@ e_activity_handler_operation_finished (activity_handler, activity_id); } -@@ -177,58 +177,85 @@ checkmem(void *p) +@@ -177,58 +177,84 @@ checkmem(void *p) } #endif @@ -5287,7 +5286,6 @@ #endif - g_hash_table_remove(mail_msg_active_table, GINT_TO_POINTER(m->seq)); - pthread_cond_broadcast(&mail_msg_cond); -+ g_debug ("Removing message %u", mail_msg->seq); + g_hash_table_remove ( + mail_msg_active_table, GINT_TO_POINTER (mail_msg->seq)); + pthread_cond_broadcast (&mail_msg_cond); diff --git a/evolution.spec b/evolution.spec index 2167cef..c400628 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -711,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jun 06 2007 Matthew Barnes - 2.11.3-3.fc8 +- Remove some debug messages that accidentally slipped in. + * Tue Jun 05 2007 Matthew Barnes - 2.11.3-2.fc8 - Fix an invalid g_free() that was causing lock-ups. From cefbbbcbf1eab194b78e54fd45e69440b7fa4f61 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 6 Jun 2007 17:36:18 +0000 Subject: [PATCH 145/844] - Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit). --- evolution-2.8.1-kill-ethread.patch | 134 ++++++++++++++--------------- evolution.spec | 5 +- 2 files changed, 70 insertions(+), 69 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 53f01cc..0a7e15a 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,5 +1,5 @@ --- evolution-2.11.3/mail/mail-send-recv.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-send-recv.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-send-recv.c 2007-06-06 12:59:41.000000000 -0400 @@ -764,23 +764,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ @@ -83,7 +83,7 @@ receive_done ("", data); } --- evolution-2.11.3/mail/mail-component.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-component.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-component.c 2007-06-06 12:59:41.000000000 -0400 @@ -1014,7 +1014,7 @@ impl_handleURI (PortableServer_Servant s if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -94,7 +94,7 @@ } else { g_warning("email uri's must include a uid parameter"); --- evolution-2.11.3/mail/mail-ops.c.kill-ethread 2007-06-01 03:08:56.000000000 -0400 -+++ evolution-2.11.3/mail/mail-ops.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-ops.c 2007-06-06 12:59:41.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -2225,7 +2225,7 @@ return id; } --- evolution-2.11.3/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-utils.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-utils.c 2007-06-06 12:59:41.000000000 -0400 @@ -84,7 +84,7 @@ emfu_is_special_local_folder (const char } @@ -2454,7 +2454,7 @@ return id; } --- evolution-2.11.3/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.3/mail/importers/elm-importer.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/importers/elm-importer.c 2007-06-06 12:59:41.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2554,7 +2554,7 @@ return id; } --- evolution-2.11.3/mail/importers/mail-importer.c.kill-ethread 2007-06-03 11:08:07.000000000 -0400 -+++ evolution-2.11.3/mail/importers/mail-importer.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/importers/mail-importer.c 2007-06-06 12:59:41.000000000 -0400 @@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } @@ -2692,7 +2692,7 @@ struct _import_folders_data { --- evolution-2.11.3/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.3/mail/importers/pine-importer.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/importers/pine-importer.c 2007-06-06 12:59:41.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2792,8 +2792,8 @@ return id; } ---- evolution-2.11.3/mail/em-utils.c.kill-ethread 2007-06-04 14:25:09.000000000 -0400 -+++ evolution-2.11.3/mail/em-utils.c 2007-06-04 14:25:34.000000000 -0400 +--- evolution-2.11.3/mail/em-utils.c.kill-ethread 2007-06-06 12:59:27.000000000 -0400 ++++ evolution-2.11.3/mail/em-utils.c 2007-06-06 12:59:41.000000000 -0400 @@ -1906,7 +1906,7 @@ em_utils_in_addressbook(CamelInternetAdd ESource *source = s->data; GList *contacts; @@ -2804,7 +2804,7 @@ d(printf(" checking '%s'\n", e_source_get_uri(source))); --- evolution-2.11.3/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-vfolder.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-vfolder.c 2007-06-06 12:59:41.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -3040,7 +3040,7 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); --- evolution-2.11.3/mail/em-format-html.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-format-html.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-format-html.c 2007-06-06 12:59:41.000000000 -0400 @@ -165,7 +165,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); @@ -3166,7 +3166,7 @@ g_object_ref(emf); m->format_source = emfsource; --- evolution-2.11.3/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-properties.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-properties.c 2007-06-06 12:59:41.000000000 -0400 @@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } @@ -3177,7 +3177,7 @@ emfp_dialog_got_folder((char *)uri, folder, NULL); } --- evolution-2.11.3/mail/em-folder-tree.c.kill-ethread 2007-06-04 01:52:58.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-tree.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-tree.c 2007-06-06 12:59:41.000000000 -0400 @@ -834,7 +834,7 @@ fail: /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ @@ -3416,7 +3416,7 @@ static gboolean --- evolution-2.11.3/mail/em-folder-browser.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-browser.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-browser.c 2007-06-06 12:59:41.000000000 -0400 @@ -839,7 +839,7 @@ get_view_query (ESearchBar *esb) @@ -3519,7 +3519,7 @@ return id; } --- evolution-2.11.3/mail/message-list.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/message-list.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/message-list.c 2007-06-06 12:59:41.000000000 -0400 @@ -1841,7 +1841,7 @@ ml_tree_drag_data_get (ETree *tree, int /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ @@ -3797,7 +3797,7 @@ m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); --- evolution-2.11.3/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-sync-stream.h 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-sync-stream.h 2007-06-06 12:59:41.000000000 -0400 @@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3875,7 +3875,7 @@ #endif /* EM_SYNC_STREAM_H */ --- evolution-2.11.3/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-format-html-print.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-format-html-print.c 2007-06-06 12:59:41.000000000 -0400 @@ -224,7 +224,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); @@ -3886,7 +3886,7 @@ void --- evolution-2.11.3/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-sync-stream.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-sync-stream.c 2007-06-06 12:59:41.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -4313,7 +4313,7 @@ + emss->buffer = g_string_sized_new (size); } --- evolution-2.11.3/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-subscribe-editor.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-subscribe-editor.c 2007-06-06 12:59:41.000000000 -0400 @@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ @@ -4530,7 +4530,7 @@ sub_unref(sub); } --- evolution-2.11.3/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-mt.h 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-mt.h 2007-06-06 12:59:41.000000000 -0400 @@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4643,7 +4643,7 @@ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; --- evolution-2.11.3/mail/mail-ops.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-ops.h 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-ops.h 2007-06-06 12:59:41.000000000 -0400 @@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ @@ -4685,7 +4685,7 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, --- evolution-2.11.3/mail/em-composer-utils.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-composer-utils.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-composer-utils.c 2007-06-06 12:59:41.000000000 -0400 @@ -534,7 +534,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4730,7 +4730,7 @@ + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } --- evolution-2.11.3/mail/mail-folder-cache.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-folder-cache.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-folder-cache.c 2007-06-06 12:59:41.000000000 -0400 @@ -860,15 +860,14 @@ update_folders(CamelStore *store, CamelF @@ -4817,7 +4817,7 @@ LOCK(info_lock); --- evolution-2.11.3/mail/em-folder-view.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-view.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/em-folder-view.c 2007-06-06 12:59:41.000000000 -0400 @@ -71,6 +71,7 @@ #include @@ -4863,7 +4863,7 @@ e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); --- evolution-2.11.3/mail/mail-session.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-session.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-session.c 2007-06-06 12:59:41.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -5138,7 +5138,7 @@ } } --- evolution-2.11.3/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-mt.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/mail/mail-mt.c 2007-06-06 12:59:41.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -5185,7 +5185,7 @@ fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -122,14 +118,14 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -122,13 +118,13 @@ void *mail_msg_new(mail_msg_op_t *ops, E } } #endif @@ -5203,8 +5203,7 @@ g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); - d(printf("New message %p\n", msg)); -@@ -143,12 +140,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -143,12 +139,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E return msg; } @@ -5223,7 +5222,7 @@ e_activity_handler_operation_finished (activity_handler, activity_id); } -@@ -177,58 +177,84 @@ checkmem(void *p) +@@ -177,58 +176,84 @@ checkmem(void *p) } #endif @@ -5334,7 +5333,7 @@ } /* hash table of ops->dialogue of active errors */ -@@ -244,9 +271,10 @@ static void error_response(GtkObject *o, +@@ -244,9 +269,10 @@ static void error_response(GtkObject *o, gtk_widget_destroy((GtkWidget *)o); } @@ -5347,7 +5346,7 @@ char *what; GtkDialog *gd; -@@ -271,27 +299,27 @@ void mail_msg_check_error(void *msg) +@@ -271,27 +297,27 @@ void mail_msg_check_error(void *msg) /* check to see if we have dialogue already running for this operation */ /* we key on the operation pointer, which is at least accurate enough for the operation type, although it could be on a different object. */ @@ -5382,7 +5381,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); -@@ -304,13 +332,12 @@ void mail_msg_cancel(unsigned int msgid) +@@ -304,13 +330,12 @@ void mail_msg_cancel(unsigned int msgid) /* waits for a message to be finished processing (freed) @@ -5399,7 +5398,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +374,7 @@ int mail_msg_active(unsigned int msgid) +@@ -347,9 +372,7 @@ int mail_msg_active(unsigned int msgid) void mail_msg_wait_all(void) { @@ -5410,7 +5409,7 @@ MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -367,294 +392,239 @@ void mail_msg_wait_all(void) +@@ -367,294 +390,239 @@ void mail_msg_wait_all(void) } /* **************************************** */ @@ -5799,11 +5798,11 @@ +mail_msg_unordered_push (gpointer msg) +{ + static GOnce once = G_ONCE_INIT; ++ ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); - e_msgport_destroy(mail_gui_port); - e_msgport_destroy(mail_gui_reply_port); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); -+ + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); } @@ -5857,15 +5856,15 @@ - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); + static GOnce once = G_ONCE_INIT; -+ -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - mail_msg_active_table = g_hash_table_new(NULL, NULL); - mail_gui_thread = pthread_self(); -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); -+} ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - mail_async_event = mail_async_event_new(); ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); ++} ++ +gboolean +mail_in_main_thread (void) +{ @@ -5873,7 +5872,7 @@ } /* ********************************************************************** */ -@@ -665,7 +635,8 @@ static pthread_mutex_t status_lock = PTH +@@ -665,7 +633,8 @@ static pthread_mutex_t status_lock = PTH /* ********************************************************************** */ struct _proxy_msg { @@ -5883,7 +5882,7 @@ MailAsyncEvent *ea; mail_async_event_t type; -@@ -679,10 +650,8 @@ struct _proxy_msg { +@@ -679,10 +648,8 @@ struct _proxy_msg { }; static void @@ -5895,7 +5894,7 @@ m->thread = pthread_self(); m->have_thread = TRUE; m->func(m->o, m->event_data, m->data); -@@ -697,16 +666,17 @@ static int +@@ -697,16 +664,17 @@ static int idle_async_event(void *mm) { do_async_event(mm); @@ -5919,7 +5918,7 @@ }; MailAsyncEvent *mail_async_event_new(void) -@@ -723,10 +693,9 @@ int mail_async_event_emit(MailAsyncEvent +@@ -723,10 +691,9 @@ int mail_async_event_emit(MailAsyncEvent { struct _proxy_msg *m; int id; @@ -5931,7 +5930,7 @@ m->func = func; m->o = o; m->event_data = event_data; -@@ -735,7 +704,7 @@ int mail_async_event_emit(MailAsyncEvent +@@ -735,7 +702,7 @@ int mail_async_event_emit(MailAsyncEvent m->type = type; m->have_thread = FALSE; @@ -5940,7 +5939,7 @@ g_mutex_lock(ea->lock); ea->tasks = g_slist_prepend(ea->tasks, m); g_mutex_unlock(ea->lock); -@@ -743,12 +712,12 @@ int mail_async_event_emit(MailAsyncEvent +@@ -743,12 +710,12 @@ int mail_async_event_emit(MailAsyncEvent /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -5956,7 +5955,7 @@ return id; } -@@ -762,7 +731,7 @@ int mail_async_event_destroy(MailAsyncEv +@@ -762,7 +729,7 @@ int mail_async_event_destroy(MailAsyncEv g_mutex_lock(ea->lock); while (ea->tasks) { m = ea->tasks->data; @@ -5965,7 +5964,7 @@ if (m->have_thread && pthread_equal(m->thread, thread)) { g_warning("Destroying async event from inside an event, returning EDEADLK"); g_mutex_unlock(ea->lock); -@@ -784,17 +753,18 @@ int mail_async_event_destroy(MailAsyncEv +@@ -784,17 +751,18 @@ int mail_async_event_destroy(MailAsyncEv /* ********************************************************************** */ struct _call_msg { @@ -5987,7 +5986,7 @@ void *p1, *p2, *p3, *p4, *p5; int i1; va_list ap; -@@ -842,45 +812,48 @@ do_call(struct _mail_msg *mm) +@@ -842,45 +810,47 @@ do_call(struct _mail_msg *mm) m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } @@ -6036,11 +6035,10 @@ - e_msgport_destroy(reply); - } else { - do_call(&m->msg); -+ mail_msg_ref (m); -+ + if (mail_in_main_thread ()) + do_call (m); + else { ++ mail_msg_ref (m); + m->done = e_flag_new (); + mail_msg_main_loop_push (m); + e_flag_wait (m->done); @@ -6055,7 +6053,7 @@ return ret; } -@@ -889,40 +862,42 @@ void *mail_call_main(mail_call_t type, M +@@ -889,40 +859,42 @@ void *mail_call_main(mail_call_t type, M /* locked via status_lock */ static int busy_state; @@ -6110,7 +6108,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -930,7 +905,7 @@ void mail_disable_stop(void) +@@ -930,7 +902,7 @@ void mail_disable_stop(void) /* ******************************************************************************** */ struct _op_status_msg { @@ -6119,7 +6117,7 @@ struct _CamelOperation *op; char *what; -@@ -938,16 +913,16 @@ struct _op_status_msg { +@@ -938,16 +910,16 @@ struct _op_status_msg { void *data; }; @@ -6141,7 +6139,7 @@ MAIL_MT_LOCK (mail_msg_lock); -@@ -986,8 +961,8 @@ static void do_op_status(struct _mail_ms +@@ -986,8 +958,8 @@ static void do_op_status(struct _mail_ms progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); MAIL_MT_UNLOCK (mail_msg_lock); @@ -6152,7 +6150,7 @@ /* uncommenting because message is not very useful for a user, see bug 271734*/ else { what = g_strdup(""); -@@ -1021,18 +996,17 @@ static void do_op_status(struct _mail_ms +@@ -1021,18 +993,17 @@ static void do_op_status(struct _mail_ms } static void @@ -6178,7 +6176,7 @@ }; static void -@@ -1042,7 +1016,7 @@ mail_operation_status (struct _CamelOper +@@ -1042,7 +1013,7 @@ mail_operation_status (struct _CamelOper d(printf("got operation statys: %s %d%%\n", what, pc)); @@ -6187,7 +6185,7 @@ m->op = op; m->what = g_strdup(what); switch (pc) { -@@ -1055,7 +1029,7 @@ mail_operation_status (struct _CamelOper +@@ -1055,7 +1026,7 @@ mail_operation_status (struct _CamelOper } m->pc = pc; m->data = data; @@ -6197,7 +6195,7 @@ /* ******************** */ --- evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 -+++ evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-06 12:59:41.000000000 -0400 @@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( @@ -6278,7 +6276,7 @@ + mail_msg_unordered_push (unsub); } --- evolution-2.11.3/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 -+++ evolution-2.11.3/plugins/mark-all-read/mark-all-read.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/mark-all-read/mark-all-read.c 2007-06-06 12:59:41.000000000 -0400 @@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } @@ -6289,7 +6287,7 @@ static void --- evolution-2.11.3/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 -+++ evolution-2.11.3/plugins/exchange-operations/exchange-folder.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/exchange-operations/exchange-folder.c 2007-06-06 12:59:41.000000000 -0400 @@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -6300,7 +6298,7 @@ } --- evolution-2.11.3/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 -+++ evolution-2.11.3/plugins/save-attachments/save-attachments.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/save-attachments/save-attachments.c 2007-06-06 12:59:41.000000000 -0400 @@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -6309,7 +6307,7 @@ + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } --- evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 -+++ evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-06 12:59:41.000000000 -0400 @@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); @@ -6320,7 +6318,7 @@ void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) --- evolution-2.11.3/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 -+++ evolution-2.11.3/plugins/groupwise-features/share-folder-common.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/plugins/groupwise-features/share-folder-common.c 2007-06-06 12:59:41.000000000 -0400 @@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } @@ -6419,7 +6417,7 @@ return id; } --- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h 2007-06-06 12:59:41.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6441,7 +6439,7 @@ BonoboObject object; --- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c 2007-06-06 12:59:41.000000000 -0400 @@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; @@ -6555,7 +6553,7 @@ static void --- evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-06-01 03:09:22.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c 2007-06-04 14:25:34.000000000 -0400 ++++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c 2007-06-06 12:59:41.000000000 -0400 @@ -97,9 +97,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; diff --git a/evolution.spec b/evolution.spec index c400628..98d3b29 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -711,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jun 06 2007 Matthew Barnes - 2.11.3-4.fc8 +- Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit). + * Wed Jun 06 2007 Matthew Barnes - 2.11.3-3.fc8 - Remove some debug messages that accidentally slipped in. From edec9f342bb401f7aa8be0e0407b6fe06c620c26 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 15 Jun 2007 01:39:53 +0000 Subject: [PATCH 146/844] - Add patch for GNOME bug #447727 (remove EClippedLabel). --- evolution-2.11.3-e-clipped-label.patch | 377 +++++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 385 insertions(+), 1 deletion(-) create mode 100644 evolution-2.11.3-e-clipped-label.patch diff --git a/evolution-2.11.3-e-clipped-label.patch b/evolution-2.11.3-e-clipped-label.patch new file mode 100644 index 0000000..04ddc7d --- /dev/null +++ b/evolution-2.11.3-e-clipped-label.patch @@ -0,0 +1,377 @@ +--- evolution-2.11.3/mail/mail-send-recv.c.e-clipped-label 2007-06-06 13:02:07.000000000 -0400 ++++ evolution-2.11.3/mail/mail-send-recv.c 2007-06-14 21:05:16.000000000 -0400 +@@ -43,7 +43,6 @@ + + #include "libedataserver/e-account-list.h" + +-#include "misc/e-clipped-label.h" + #include "em-filter-rule.h" + #include "camel/camel-filter-driver.h" + #include "camel/camel-folder.h" +@@ -156,8 +155,8 @@ receive_cancel(GtkButton *button, struct + if (info->state == SEND_ACTIVE) { + camel_operation_cancel(info->cancel); + if (info->status_label) +- e_clipped_label_set_text ( +- E_CLIPPED_LABEL (info->status_label), ++ gtk_label_set_text ( ++ GTK_LABEL (info->status_label), + _("Canceling...")); + info->state = SEND_CANCELLED; + } +@@ -267,8 +266,8 @@ operation_status_timeout(void *data) + GTK_PROGRESS_BAR (info->progress_bar), + info->pc / 100.0); + if (info->what) +- e_clipped_label_set_text ( +- E_CLIPPED_LABEL (info->status_label), ++ gtk_label_set_text ( ++ GTK_LABEL (info->status_label), + info->what); + return TRUE; + } +@@ -496,10 +495,11 @@ build_dialog (EAccountList *accounts, Ca + + cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + +- status_label = e_clipped_label_new ( ++ status_label = gtk_label_new ( + (info->type == SEND_UPDATE) ? +- _("Updating...") : _("Waiting..."), +- PANGO_WEIGHT_NORMAL, 1.0); ++ _("Updating...") : _("Waiting...")); ++ gtk_label_set_ellipsize ( ++ GTK_LABEL (status_label), PANGO_ELLIPSIZE_END); + + /* g_object_set(data->label, "bold", TRUE, NULL); */ + gtk_misc_set_alignment (GTK_MISC (label), 0, .5); +@@ -566,8 +566,9 @@ build_dialog (EAccountList *accounts, Ca + progress_bar = gtk_progress_bar_new (); + cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); + +- status_label = e_clipped_label_new ( +- _("Waiting..."), PANGO_WEIGHT_NORMAL, 1.0); ++ status_label = gtk_label_new (_("Waiting...")); ++ gtk_label_set_ellipsize ( ++ GTK_LABEL (status_label), PANGO_ELLIPSIZE_END); + + gtk_misc_set_alignment (GTK_MISC (label), 0, .5); + gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); +@@ -692,8 +693,7 @@ receive_done (char *uri, void *data) + info->state = SEND_COMPLETE; + } + +- e_clipped_label_set_text ( +- E_CLIPPED_LABEL (info->status_label), text); ++ gtk_label_set_text (GTK_LABEL (info->status_label), text); + } + + if (info->cancel_button) +--- evolution-2.11.3/widgets/misc/e-task-bar.c.e-clipped-label 2007-04-18 06:18:34.000000000 -0400 ++++ evolution-2.11.3/widgets/misc/e-task-bar.c 2007-06-14 21:05:16.000000000 -0400 +@@ -26,11 +26,12 @@ + + #include "e-task-bar.h" + +-#include "misc/e-clipped-label.h" ++#include ++#include + + struct _ETaskBarPrivate + { +- EClippedLabel *message_label; ++ GtkWidget *message_label; + GtkHBox *hbox; + }; + +@@ -96,11 +97,12 @@ e_task_bar_init (ETaskBar *task_bar) + task_bar->priv = g_new (ETaskBarPrivate, 1); + + gtk_box_set_spacing (GTK_BOX (task_bar), 10); +- +- label = e_clipped_label_new ("", PANGO_WEIGHT_NORMAL, 1.0); ++ ++ label = gtk_label_new (NULL); ++ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); + gtk_box_pack_start (GTK_BOX (task_bar), label, TRUE, TRUE, 0); + gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); +- task_bar->priv->message_label = E_CLIPPED_LABEL (label); ++ task_bar->priv->message_label = label; + + hbox = gtk_hbox_new (FALSE, 0); + gtk_container_add (GTK_CONTAINER (task_bar), hbox); +@@ -133,9 +135,11 @@ e_task_bar_set_message (ETaskBar *task + const char *message) + { + if (message) { +- gtk_widget_show (GTK_WIDGET (task_bar->priv->message_label)); +- e_clipped_label_set_text (task_bar->priv->message_label, +- message); ++ GtkWidget *label; ++ ++ label = task_bar->priv->message_label; ++ gtk_label_set_text (GTK_LABEL (label), message); ++ gtk_widget_show (label); + } else { + e_task_bar_unset_message (task_bar); + } +@@ -144,7 +148,7 @@ e_task_bar_set_message (ETaskBar *task + void + e_task_bar_unset_message (ETaskBar *task_bar) + { +- gtk_widget_hide (GTK_WIDGET (task_bar->priv->message_label)); ++ gtk_widget_hide (task_bar->priv->message_label); + } + + void +--- evolution-2.11.3/widgets/misc/Makefile.am.e-clipped-label 2007-06-01 03:09:21.000000000 -0400 ++++ evolution-2.11.3/widgets/misc/Makefile.am 2007-06-14 21:05:16.000000000 -0400 +@@ -45,7 +45,6 @@ widgetsinclude_HEADERS = \ + e-cell-percent.h \ + e-cell-renderer-combo.h \ + e-charset-picker.h \ +- e-clipped-label.h \ + e-combo-cell-editable.h \ + e-config-page.h \ + e-combo-button.h \ +@@ -91,7 +90,6 @@ libemiscwidgets_la_SOURCES = \ + e-cell-percent.c \ + e-cell-renderer-combo.c \ + e-charset-picker.c \ +- e-clipped-label.c \ + e-combo-cell-editable.c \ + e-config-page.c \ + e-combo-button.c \ +--- evolution-2.11.3/widgets/misc/e-info-label.c.e-clipped-label 2007-04-18 06:18:34.000000000 -0400 ++++ evolution-2.11.3/widgets/misc/e-info-label.c 2007-06-14 21:05:16.000000000 -0400 +@@ -28,7 +28,6 @@ + + #include "e-info-label.h" + #include +-#include "e-clipped-label.h" + + #include + +@@ -142,29 +141,37 @@ e_info_label_new(const char *icon) + void + e_info_label_set_info(EInfoLabel *el, const char *location, const char *info) + { +- char *tmp; ++ gchar *markup; + + if (el->location == NULL) { +- el->location = e_clipped_label_new(location, PANGO_WEIGHT_BOLD, 1.0); +- el->info = gtk_label_new(NULL); ++ el->location = gtk_label_new (NULL); ++ el->info = gtk_label_new (NULL); + +- gtk_misc_set_alignment((GtkMisc *)el->location, 0.0, 0.0); +- gtk_misc_set_padding((GtkMisc *)el->location, 0, 6); +- gtk_misc_set_alignment((GtkMisc *)el->info, 0.0, 1.0); +- gtk_misc_set_padding((GtkMisc *)el->info, 0, 6); +- +- gtk_widget_show(el->location); +- gtk_widget_show(el->info); +- +- gtk_box_pack_start((GtkBox *)el, (GtkWidget *)el->location, TRUE, TRUE, 0); +- gtk_box_pack_end((GtkBox *)el, (GtkWidget *)el->info, FALSE, TRUE, 6); +- gtk_widget_set_state((GtkWidget *)el, GTK_STATE_ACTIVE); +- } else { +- e_clipped_label_set_text((EClippedLabel *)el->location, location); ++ gtk_label_set_ellipsize ( ++ GTK_LABEL (el->location), PANGO_ELLIPSIZE_END); ++ gtk_misc_set_alignment (GTK_MISC (el->location), 0.0, 0.0); ++ gtk_misc_set_padding (GTK_MISC (el->location), 0, 6); ++ gtk_misc_set_alignment (GTK_MISC (el->info), 0.0, 1.0); ++ gtk_misc_set_padding (GTK_MISC (el->info), 0, 6); ++ ++ gtk_widget_show (el->location); ++ gtk_widget_show (el->info); ++ ++ gtk_box_pack_start ( ++ GTK_BOX (el), GTK_WIDGET (el->location), ++ TRUE, TRUE, 0); ++ gtk_box_pack_end ( ++ GTK_BOX (el), GTK_WIDGET (el->info), ++ FALSE, TRUE, 6); ++ gtk_widget_set_state (GTK_WIDGET (el), GTK_STATE_ACTIVE); + } + +- tmp = g_strdup_printf("%s", info); +- gtk_label_set_markup((GtkLabel *)el->info, tmp); +- g_free(tmp); ++ markup = g_markup_printf_escaped ("%s", location); ++ gtk_label_set_markup (GTK_LABEL (el->location), markup); ++ g_free (markup); ++ ++ markup = g_markup_printf_escaped ("%s", info); ++ gtk_label_set_markup (GTK_LABEL (el->info), markup); ++ g_free (markup); + } + +--- evolution-2.11.3/widgets/misc/e-multi-config-dialog.c.e-clipped-label 2007-06-03 11:08:14.000000000 -0400 ++++ evolution-2.11.3/widgets/misc/e-multi-config-dialog.c 2007-06-14 21:05:16.000000000 -0400 +@@ -26,8 +26,6 @@ + + #include "e-multi-config-dialog.h" + +-#include "e-clipped-label.h" +- + #include
+ #include
+ #include
+@@ -87,18 +85,6 @@ create_page_container (const char *descr + + vbox = gtk_vbox_new (FALSE, 0); + +-#if 0 +- label = e_clipped_label_new (description); +- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); +- +- separator = gtk_hseparator_new (); +- gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, TRUE, 0); +- +- gtk_widget_show (label); +- gtk_widget_show (separator); +-#endif +- + gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); + + gtk_widget_show (widget); +--- evolution-2.11.3/shell/e-shell-folder-title-bar.c.e-clipped-label 2007-04-18 06:15:47.000000000 -0400 ++++ evolution-2.11.3/shell/e-shell-folder-title-bar.c 2007-06-14 21:05:16.000000000 -0400 +@@ -34,7 +34,6 @@ + #include + #include + +-#include "misc/e-clipped-label.h" + #include "e-shell-constants.h" + #include "e-shell-marshal.h" + #include "e-shell-folder-title-bar.h" +@@ -117,13 +116,15 @@ new_empty_image_widget (void) + + /* Utility functions. */ + +-static int +-get_max_clipped_label_width (EClippedLabel *clipped_label) ++static gint ++get_max_label_width (GtkWidget *label) + { +- int width; ++ PangoLayout *layout; ++ gint width; + +- pango_layout_get_pixel_size (clipped_label->layout, &width, NULL); +- width += 2 * GTK_MISC (clipped_label)->xpad; ++ layout = gtk_label_get_layout (GTK_LABEL (label)); ++ pango_layout_get_pixel_size (layout, &width, NULL); ++ width += 2 * GTK_MISC (label)->xpad; + + return width; + } +@@ -152,7 +153,7 @@ size_allocate_title_button (EShellFolder + child_allocation.height = allocation->height - 2 * border_width; + + child_allocation.width = child_requisition.width; +- child_allocation.width += get_max_clipped_label_width (E_CLIPPED_LABEL (priv->title_button_label)); ++ child_allocation.width += get_max_label_width (priv->title_button_label); + + child_allocation.width = MIN (child_allocation.width, *available_width_inout); + +@@ -218,7 +219,7 @@ size_allocate_label (EShellFolderTitleBa + child_allocation.y = allocation->y + border_width; + child_allocation.height = allocation->height - 2 * border_width; + +- child_allocation.width = MIN (get_max_clipped_label_width (E_CLIPPED_LABEL (priv->title_label)), ++ child_allocation.width = MIN (get_max_label_width (priv->title_label), + *available_width_inout); + + gtk_widget_size_allocate (priv->title_label, & child_allocation); +@@ -478,6 +479,7 @@ e_shell_folder_title_bar_construct (EShe + { + EShellFolderTitleBarPrivate *priv; + GtkWidget *title_button_hbox; ++ GtkWidget *label; + + g_return_if_fail (folder_title_bar != NULL); + g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar)); +@@ -489,18 +491,24 @@ e_shell_folder_title_bar_construct (EShe + gtk_misc_set_padding (GTK_MISC (priv->title_icon), 2, 0); + gtk_widget_show (priv->title_icon); + +- priv->title_label = e_clipped_label_new ("", PANGO_WEIGHT_BOLD, 1.2); +- gtk_misc_set_padding (GTK_MISC (priv->title_label), 0, 0); +- gtk_misc_set_alignment (GTK_MISC (priv->title_label), 0.0, 0.5); +- +- priv->title_button_label = e_clipped_label_new ("", PANGO_WEIGHT_BOLD, 1.2); +- gtk_misc_set_padding (GTK_MISC (priv->title_button_label), 2, 0); +- gtk_misc_set_alignment (GTK_MISC (priv->title_button_label), 0.0, 0.5); +- gtk_widget_show (priv->title_button_label); +- +- priv->folder_bar_label = e_clipped_label_new ("", PANGO_WEIGHT_NORMAL, 1.0); +- gtk_misc_set_alignment (GTK_MISC (priv->folder_bar_label), 1.0, 0.5); +- gtk_widget_show (priv->folder_bar_label); ++ label = gtk_label_new (""); ++ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); ++ gtk_misc_set_padding (GTK_MISC (label), 0, 0); ++ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); ++ priv->title_label = label; ++ ++ label = gtk_label_new (""); ++ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); ++ gtk_misc_set_padding (GTK_MISC (label), 2, 0); ++ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); ++ gtk_widget_show (label); ++ priv->title_button_label = label; ++ ++ label = gtk_label_new (""); ++ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); ++ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); ++ gtk_widget_show (label); ++ priv->folder_bar_label = label; + + priv->title_button_icon = new_empty_image_widget (); + gtk_widget_show (priv->title_button_icon); +@@ -574,21 +582,21 @@ e_shell_folder_title_bar_set_title (EShe + const char *title) + { + EShellFolderTitleBarPrivate *priv; ++ gchar *markup; + + g_return_if_fail (folder_title_bar != NULL); + g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar)); + + priv = folder_title_bar->priv; + +- if (title == NULL) { +- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_button_label), _("(Untitled)")); +- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_label), _("(Untitled)")); +- } else { +- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_button_label), title); +- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_label), title); +- } ++ if (title == NULL) ++ title = _("Untitled"); ++ ++ markup = g_markup_printf_escaped ("%s", title); ++ gtk_label_set_markup (GTK_LABEL (priv->title_button_label), markup); ++ gtk_label_set_markup (GTK_LABEL (priv->title_label), markup); ++ g_free (markup); + +- /* FIXME: There seems to be a bug in EClippedLabel, this is just a workaround. */ + gtk_widget_queue_resize (GTK_WIDGET (folder_title_bar)); + } + +@@ -611,10 +619,7 @@ e_shell_folder_title_bar_set_folder_bar_ + + priv = folder_title_bar->priv; + +- if (text == NULL) +- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->folder_bar_label), ""); +- else +- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->folder_bar_label), text); ++ gtk_label_set_text (GTK_LABEL (priv->folder_bar_label), text); + + /* FIXME: Might want to set the styles somewhere in here too, + black text on grey background isn't the best combination */ diff --git a/evolution.spec b/evolution.spec index 98d3b29..6732d19 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -137,6 +137,9 @@ Patch35: evolution-2.11.3-implicit-function-declaration.patch # Fix an invalid free in em-folder-view.c Patch36: evolution-2.11.3-fix-invalid-free.patch +# GNOME bug #447727 +Patch37: evolution-2.11.3-e-clipped-label.patch + ## Dependencies ### Requires(post): GConf2 @@ -278,6 +281,7 @@ Development files needed for building things which link against evolution. %patch34 -p1 -b .e-source-combo-box %patch35 -p1 -b .implicit-function-declaration %patch36 -p1 -b .fix-invalid-free +%patch37 -p1 -b .e-clipped-label mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -711,6 +715,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Jun 14 2007 Matthew Barnes - 2.11.3-5.fc8 +- Add patch for GNOME bug #447727 (remove EClippedLabel). + * Wed Jun 06 2007 Matthew Barnes - 2.11.3-4.fc8 - Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit). From 42b96a205188fbb4fdd37d3941b9576232dd43f8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 18 Jun 2007 21:10:51 +0000 Subject: [PATCH 147/844] - Update to 2.11.4 - Remove patch for GNOME bug #447727 (fixed upstream). --- .cvsignore | 2 +- evolution-2.11.3-fix-invalid-free.patch | 11 ---------- ...2.11.3-implicit-function-declaration.patch | 10 ---------- evolution.spec | 20 ++++++------------- sources | 2 +- 5 files changed, 8 insertions(+), 37 deletions(-) delete mode 100644 evolution-2.11.3-fix-invalid-free.patch delete mode 100644 evolution-2.11.3-implicit-function-declaration.patch diff --git a/.cvsignore b/.cvsignore index 3dd215b..58445a1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.11.3.tar.bz2 +evolution-2.11.4.tar.bz2 diff --git a/evolution-2.11.3-fix-invalid-free.patch b/evolution-2.11.3-fix-invalid-free.patch deleted file mode 100644 index 45a7937..0000000 --- a/evolution-2.11.3-fix-invalid-free.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.11.3/mail/em-folder-view.c.fix-invalid-free 2007-06-05 15:20:42.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-view.c 2007-06-05 15:20:51.000000000 -0400 -@@ -2930,7 +2930,7 @@ emfv_on_url_cb (GObject *emitter, const - camel_url_free(curl); - camel_object_unref(cia); - } else if (!strncmp (url, "##", 2)) { -- nice_url = _("Click to hide/unhide addresses"); -+ nice_url = g_strdup (_("Click to hide/unhide addresses")); - } else - nice_url = g_strdup_printf (_("Click to open %s"), url); - } diff --git a/evolution-2.11.3-implicit-function-declaration.patch b/evolution-2.11.3-implicit-function-declaration.patch deleted file mode 100644 index 554191a..0000000 --- a/evolution-2.11.3-implicit-function-declaration.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- evolution-2.11.3/mail/mail-ops.h.implicit-function-declaration 2007-06-04 13:52:57.000000000 -0400 -+++ evolution-2.11.3/mail/mail-ops.h 2007-06-04 13:53:23.000000000 -0400 -@@ -156,6 +156,7 @@ void mail_prep_offline(const char *uri, - int mail_store_set_offline(CamelStore *store, gboolean offline, - void (*done)(CamelStore *, void *data), - void *data); -+int mail_store_prepare_offline (CamelStore *store); - - /* filter driver execute shell command async callback */ - void mail_execute_shell_command (CamelFilterDriver *driver, int argc, char **argv, void *data); diff --git a/evolution.spec b/evolution.spec index 6732d19..fd4f60d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.11.3 -Release: 5%{?dist} +Version: 2.11.4 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -131,15 +131,6 @@ Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch -# Upstream really needs to use -Werror-implicit-function-declaration. -Patch35: evolution-2.11.3-implicit-function-declaration.patch - -# Fix an invalid free in em-folder-view.c -Patch36: evolution-2.11.3-fix-invalid-free.patch - -# GNOME bug #447727 -Patch37: evolution-2.11.3-e-clipped-label.patch - ## Dependencies ### Requires(post): GConf2 @@ -279,9 +270,6 @@ 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-declaration -%patch36 -p1 -b .fix-invalid-free -%patch37 -p1 -b .e-clipped-label mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -715,6 +703,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Jun 18 2007 Matthew Barnes - 2.11.4-1.fc8 +- Update to 2.11.4 +- Remove patch for GNOME bug #447727 (fixed upstream). + * Thu Jun 14 2007 Matthew Barnes - 2.11.3-5.fc8 - Add patch for GNOME bug #447727 (remove EClippedLabel). diff --git a/sources b/sources index 5e28d1d..d669b62 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4aa1a1a4b4cf51d64eb259ae3769c8d0 evolution-2.11.3.tar.bz2 +003da7ba7f744d13e1c6f4d4c884b2ac evolution-2.11.4.tar.bz2 From 48d450fcc3f49dda1e6d5629b59ddb066ca34307 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 27 Jun 2007 16:04:46 +0000 Subject: [PATCH 148/844] - Revise patch for GNOME bug #363695 to fix RH bug #245289 (frequent hangs). --- evolution-2.8.1-kill-ethread.patch | 320 ++++++++++++++++------------- evolution.spec | 5 +- 2 files changed, 176 insertions(+), 149 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 0a7e15a..e4cfa52 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,5 +1,5 @@ ---- evolution-2.11.3/mail/mail-send-recv.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-send-recv.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-send-recv.c.kill-ethread 2007-06-17 23:26:00.000000000 -0400 ++++ evolution-2.11.4/mail/mail-send-recv.c 2007-06-27 11:23:50.000000000 -0400 @@ -764,23 +764,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ @@ -82,8 +82,8 @@ } else { receive_done ("", data); } ---- evolution-2.11.3/mail/mail-component.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-component.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-component.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.4/mail/mail-component.c 2007-06-27 11:23:50.000000000 -0400 @@ -1014,7 +1014,7 @@ impl_handleURI (PortableServer_Servant s if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -93,8 +93,8 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.11.3/mail/mail-ops.c.kill-ethread 2007-06-01 03:08:56.000000000 -0400 -+++ evolution-2.11.3/mail/mail-ops.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-ops.c.kill-ethread 2007-06-01 03:08:56.000000000 -0400 ++++ evolution-2.11.4/mail/mail-ops.c 2007-06-27 11:23:50.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -2224,8 +2224,8 @@ return id; } ---- evolution-2.11.3/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-utils.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.4/mail/em-folder-utils.c 2007-06-27 11:23:50.000000000 -0400 @@ -84,7 +84,7 @@ emfu_is_special_local_folder (const char } @@ -2453,8 +2453,8 @@ return id; } ---- evolution-2.11.3/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.3/mail/importers/elm-importer.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.4/mail/importers/elm-importer.c 2007-06-27 11:23:50.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2553,8 +2553,8 @@ return id; } ---- evolution-2.11.3/mail/importers/mail-importer.c.kill-ethread 2007-06-03 11:08:07.000000000 -0400 -+++ evolution-2.11.3/mail/importers/mail-importer.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/importers/mail-importer.c.kill-ethread 2007-06-03 11:08:07.000000000 -0400 ++++ evolution-2.11.4/mail/importers/mail-importer.c 2007-06-27 11:23:50.000000000 -0400 @@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } @@ -2691,8 +2691,8 @@ } struct _import_folders_data { ---- evolution-2.11.3/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.3/mail/importers/pine-importer.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 ++++ evolution-2.11.4/mail/importers/pine-importer.c 2007-06-27 11:23:50.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2792,8 +2792,8 @@ return id; } ---- evolution-2.11.3/mail/em-utils.c.kill-ethread 2007-06-06 12:59:27.000000000 -0400 -+++ evolution-2.11.3/mail/em-utils.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-utils.c.kill-ethread 2007-06-27 11:23:38.000000000 -0400 ++++ evolution-2.11.4/mail/em-utils.c 2007-06-27 11:23:50.000000000 -0400 @@ -1906,7 +1906,7 @@ em_utils_in_addressbook(CamelInternetAdd ESource *source = s->data; GList *contacts; @@ -2803,8 +2803,8 @@ d(printf(" checking '%s'\n", e_source_get_uri(source))); ---- evolution-2.11.3/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-vfolder.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.4/mail/mail-vfolder.c 2007-06-27 11:23:50.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -3039,8 +3039,8 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.11.3/mail/em-format-html.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-format-html.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-format-html.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.4/mail/em-format-html.c 2007-06-27 11:23:50.000000000 -0400 @@ -165,7 +165,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); @@ -3165,8 +3165,8 @@ m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; ---- evolution-2.11.3/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-properties.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.4/mail/em-folder-properties.c 2007-06-27 11:23:50.000000000 -0400 @@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } @@ -3176,9 +3176,9 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.11.3/mail/em-folder-tree.c.kill-ethread 2007-06-04 01:52:58.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-tree.c 2007-06-06 12:59:41.000000000 -0400 -@@ -834,7 +834,7 @@ fail: +--- evolution-2.11.4/mail/em-folder-tree.c.kill-ethread 2007-06-17 23:26:00.000000000 -0400 ++++ evolution-2.11.4/mail/em-folder-tree.c 2007-06-27 11:23:50.000000000 -0400 +@@ -835,7 +835,7 @@ fail: /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ struct _DragDataReceivedAsync { @@ -3187,7 +3187,7 @@ /* input data */ GdkDragContext *context; -@@ -859,17 +859,16 @@ emft_drop_folder(struct _DragDataReceive +@@ -860,17 +860,16 @@ emft_drop_folder(struct _DragDataReceive d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); @@ -3208,7 +3208,7 @@ CamelURL *url; char *buf; -@@ -893,9 +892,8 @@ emft_drop_async_desc (struct _mail_msg * +@@ -894,9 +893,8 @@ emft_drop_async_desc (struct _mail_msg * } static void @@ -3219,7 +3219,7 @@ CamelFolder *folder; /* for types other than folder, we can't drop to the root path */ -@@ -903,14 +901,14 @@ emft_drop_async_drop (struct _mail_msg * +@@ -904,14 +902,14 @@ emft_drop_async_drop (struct _mail_msg * /* copy or move (aka rename) a folder */ emft_drop_folder(m); } else if (m->full_name == NULL) { @@ -3238,7 +3238,7 @@ break; case DND_DROP_TYPE_MESSAGE_RFC822: /* import a message/rfc822 stream */ -@@ -928,9 +926,8 @@ emft_drop_async_drop (struct _mail_msg * +@@ -929,9 +927,8 @@ emft_drop_async_drop (struct _mail_msg * } static void @@ -3249,7 +3249,7 @@ gboolean success, delete; /* ?? */ -@@ -938,7 +935,7 @@ emft_drop_async_done (struct _mail_msg * +@@ -939,7 +936,7 @@ emft_drop_async_done (struct _mail_msg * success = FALSE; delete = FALSE; } else { @@ -3258,7 +3258,7 @@ delete = success && m->move && !m->moved; } -@@ -946,10 +943,8 @@ emft_drop_async_done (struct _mail_msg * +@@ -947,10 +944,8 @@ emft_drop_async_done (struct _mail_msg * } static void @@ -3270,7 +3270,7 @@ g_object_unref(m->context); camel_object_unref(m->store); g_free(m->full_name); -@@ -958,18 +953,19 @@ emft_drop_async_free (struct _mail_msg * +@@ -959,18 +954,19 @@ emft_drop_async_free (struct _mail_msg * g_free(m->selection); } @@ -3296,7 +3296,7 @@ } static void -@@ -996,7 +992,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu +@@ -997,7 +993,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu struct _DragDataReceivedAsync *m = data; m->aborted = TRUE; @@ -3305,7 +3305,7 @@ } static EPopupItem emft_drop_popup_menu[] = { -@@ -1052,7 +1048,7 @@ tree_drag_data_received(GtkWidget *widge +@@ -1053,7 +1049,7 @@ tree_drag_data_received(GtkWidget *widge return; } @@ -3314,7 +3314,7 @@ m->context = context; g_object_ref(context); m->store = store; -@@ -1686,7 +1682,7 @@ dump_fi (CamelFolderInfo *fi, int depth) +@@ -1687,7 +1683,7 @@ dump_fi (CamelFolderInfo *fi, int depth) #endif struct _EMFolderTreeGetFolderInfo { @@ -3323,7 +3323,7 @@ /* input data */ GtkTreeRowReference *root; -@@ -1699,10 +1695,9 @@ struct _EMFolderTreeGetFolderInfo { +@@ -1700,10 +1696,9 @@ struct _EMFolderTreeGetFolderInfo { CamelFolderInfo *fi; }; @@ -3336,7 +3336,7 @@ char *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1712,18 +1707,16 @@ emft_get_folder_info__desc(struct _mail_ +@@ -1713,18 +1708,16 @@ emft_get_folder_info__desc(struct _mail_ } static void @@ -3358,7 +3358,7 @@ struct _EMFolderTreePrivate *priv = m->emft->priv; struct _EMFolderTreeModelStoreInfo *si; GtkTreeIter root, iter; -@@ -1751,7 +1744,7 @@ emft_get_folder_info__got (struct _mail_ +@@ -1752,7 +1745,7 @@ emft_get_folder_info__got (struct _mail_ gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ @@ -3367,7 +3367,7 @@ gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); gtk_tree_view_collapse_row (priv->treeview, path); gtk_tree_path_free (path); -@@ -1806,10 +1799,8 @@ emft_get_folder_info__got (struct _mail_ +@@ -1807,10 +1800,8 @@ emft_get_folder_info__got (struct _mail_ } static void @@ -3379,7 +3379,7 @@ camel_store_free_folder_info (m->store, m->fi); gtk_tree_row_reference_free (m->root); -@@ -1818,11 +1809,12 @@ emft_get_folder_info__free (struct _mail +@@ -1819,11 +1810,12 @@ emft_get_folder_info__free (struct _mail g_free (m->top); } @@ -3397,7 +3397,7 @@ }; static void -@@ -1909,7 +1901,7 @@ emft_tree_row_expanded (GtkTreeView *tre +@@ -1910,7 +1902,7 @@ emft_tree_row_expanded (GtkTreeView *tre gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); @@ -3406,7 +3406,7 @@ m->root = gtk_tree_row_reference_new (model, tree_path); camel_object_ref (store); m->store = store; -@@ -1918,7 +1910,7 @@ emft_tree_row_expanded (GtkTreeView *tre +@@ -1919,7 +1911,7 @@ emft_tree_row_expanded (GtkTreeView *tre m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; @@ -3415,9 +3415,9 @@ } static gboolean ---- evolution-2.11.3/mail/em-folder-browser.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-browser.c 2007-06-06 12:59:41.000000000 -0400 -@@ -839,7 +839,7 @@ get_view_query (ESearchBar *esb) +--- evolution-2.11.4/mail/em-folder-browser.c.kill-ethread 2007-06-18 01:24:46.000000000 -0400 ++++ evolution-2.11.4/mail/em-folder-browser.c 2007-06-27 11:23:50.000000000 -0400 +@@ -835,7 +835,7 @@ get_view_query (ESearchBar *esb) struct _setup_msg { @@ -3426,7 +3426,7 @@ CamelFolder *folder; char *query; -@@ -847,16 +847,15 @@ struct _setup_msg { +@@ -843,16 +843,15 @@ struct _setup_msg { GList *sources_folder; }; @@ -3446,7 +3446,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -867,12 +866,12 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -863,12 +862,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3461,7 +3461,7 @@ } l = l->next; } -@@ -896,17 +895,13 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -892,17 +891,13 @@ vfolder_setup_do(struct _mail_msg *mm) } static void @@ -3481,7 +3481,7 @@ GList *l; camel_object_unref(m->folder); -@@ -927,11 +922,12 @@ vfolder_setup_free (struct _mail_msg *mm +@@ -923,11 +918,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } @@ -3499,7 +3499,7 @@ }; /* sources_uri should be camel uri's */ -@@ -941,15 +937,15 @@ vfolder_setup(CamelFolder *folder, const +@@ -937,15 +933,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; @@ -3518,8 +3518,8 @@ return id; } ---- evolution-2.11.3/mail/message-list.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/message-list.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/message-list.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.4/mail/message-list.c 2007-06-27 11:23:50.000000000 -0400 @@ -1841,7 +1841,7 @@ ml_tree_drag_data_get (ETree *tree, int /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ @@ -3796,8 +3796,8 @@ m->ml = ml; m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); ---- evolution-2.11.3/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-sync-stream.h 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.4/mail/em-sync-stream.h 2007-06-27 11:23:50.000000000 -0400 @@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3874,8 +3874,8 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.11.3/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-format-html-print.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 ++++ evolution-2.11.4/mail/em-format-html-print.c 2007-06-27 11:23:50.000000000 -0400 @@ -224,7 +224,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); @@ -3885,8 +3885,8 @@ } void ---- evolution-2.11.3/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-sync-stream.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.4/mail/em-sync-stream.c 2007-06-27 11:23:50.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -4312,8 +4312,8 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.11.3/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/em-subscribe-editor.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.4/mail/em-subscribe-editor.c 2007-06-27 11:23:50.000000000 -0400 @@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ @@ -4529,8 +4529,8 @@ sub_unref(sub); } ---- evolution-2.11.3/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-mt.h 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.4/mail/mail-mt.h 2007-06-27 11:23:50.000000000 -0400 @@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4642,8 +4642,8 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.11.3/mail/mail-ops.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-ops.h 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-ops.h.kill-ethread 2007-06-14 23:48:53.000000000 -0400 ++++ evolution-2.11.4/mail/mail-ops.h 2007-06-27 11:23:50.000000000 -0400 @@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ @@ -4684,8 +4684,8 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.11.3/mail/em-composer-utils.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-composer-utils.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-composer-utils.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.4/mail/em-composer-utils.c 2007-06-27 11:23:50.000000000 -0400 @@ -534,7 +534,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4729,8 +4729,8 @@ - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.11.3/mail/mail-folder-cache.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-folder-cache.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-folder-cache.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.4/mail/mail-folder-cache.c 2007-06-27 11:23:50.000000000 -0400 @@ -860,15 +860,14 @@ update_folders(CamelStore *store, CamelF @@ -4816,8 +4816,8 @@ LOCK(info_lock); ---- evolution-2.11.3/mail/em-folder-view.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/em-folder-view.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/em-folder-view.c.kill-ethread 2007-06-18 01:20:56.000000000 -0400 ++++ evolution-2.11.4/mail/em-folder-view.c 2007-06-27 11:23:50.000000000 -0400 @@ -71,6 +71,7 @@ #include @@ -4826,7 +4826,7 @@ #include "menus/gal-view-etable.h" #include "menus/gal-view-factory-etable.h" -@@ -695,7 +696,7 @@ emfv_got_folder(char *uri, CamelFolder * +@@ -699,7 +700,7 @@ emfv_got_folder(char *uri, CamelFolder * static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) { @@ -4835,7 +4835,7 @@ } static void -@@ -1632,7 +1633,7 @@ filter_type_uid (CamelFolder *folder, co +@@ -1674,7 +1675,7 @@ filter_type_uid (CamelFolder *folder, co data->type = type; data->source = source; @@ -4844,7 +4844,7 @@ } static void -@@ -1730,7 +1731,7 @@ vfolder_type_uid (CamelFolder *folder, c +@@ -1772,7 +1773,7 @@ vfolder_type_uid (CamelFolder *folder, c data->type = type; data->uri = g_strdup (uri); @@ -4853,7 +4853,7 @@ } static void -@@ -2373,7 +2374,7 @@ emfv_message_selected_timeout(void *data +@@ -2415,7 +2416,7 @@ emfv_message_selected_timeout(void *data emfv->displayed_uid); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); */ @@ -4862,8 +4862,8 @@ } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.11.3/mail/mail-session.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.3/mail/mail-session.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-session.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 ++++ evolution-2.11.4/mail/mail-session.c 2007-06-27 11:23:50.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -5137,8 +5137,8 @@ } } } ---- evolution-2.11.3/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.3/mail/mail-mt.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 ++++ evolution-2.11.4/mail/mail-mt.c 2007-06-27 11:23:50.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -5199,7 +5199,7 @@ msg->cancel = camel_operation_new(mail_operation_status, GINT_TO_POINTER(msg->seq)); camel_exception_init(&msg->ex); - msg->priv = g_malloc0(sizeof(*msg->priv)); -+ msg->priv = g_slice_new (MailMsgPrivate); ++ msg->priv = g_slice_new0 (MailMsgPrivate); g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); @@ -5222,16 +5222,32 @@ e_activity_handler_operation_finished (activity_handler, activity_id); } -@@ -177,58 +176,84 @@ checkmem(void *p) +@@ -177,58 +176,93 @@ checkmem(void *p) } #endif -void mail_msg_free(void *msg) -+gpointer -+mail_msg_ref (gpointer msg) ++static void ++mail_msg_free (MailMsg *mail_msg) { - struct _mail_msg *m = msg; - int activity_id; ++ /* XXX This function is broken out from mail_msg_unref() ++ * only for the benefit of op_status_exec() below. */ ++ ++ if (mail_msg->cancel != NULL) { ++ camel_operation_mute (mail_msg->cancel); ++ camel_operation_unref (mail_msg->cancel); ++ } ++ ++ camel_exception_clear (&mail_msg->ex); ++ g_slice_free (MailMsgPrivate, mail_msg->priv); ++ g_slice_free1 (mail_msg->info->size, mail_msg); ++} ++ ++gpointer ++mail_msg_ref (gpointer msg) ++{ + MailMsg *mail_msg = msg; + + g_return_val_if_fail (mail_msg != NULL, msg); @@ -5310,18 +5326,13 @@ - if (m->cancel) { - camel_operation_mute(m->cancel); - camel_operation_unref(m->cancel); -+ if (mail_msg->cancel) { -+ camel_operation_mute (mail_msg->cancel); -+ camel_operation_unref (mail_msg->cancel); - } - +- } +- - camel_exception_clear(&m->ex); - /*g_free(m->priv->what);*/ - g_free(m->priv); - g_free(m); -+ camel_exception_clear (&mail_msg->ex); -+ g_slice_free (MailMsgPrivate, mail_msg->priv); -+ g_slice_free1 (mail_msg->info->size, mail_msg); ++ mail_msg_free (mail_msg); if (activity_id != 0) - mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, @@ -5333,7 +5344,7 @@ } /* hash table of ops->dialogue of active errors */ -@@ -244,9 +269,10 @@ static void error_response(GtkObject *o, +@@ -244,9 +278,10 @@ static void error_response(GtkObject *o, gtk_widget_destroy((GtkWidget *)o); } @@ -5346,7 +5357,7 @@ char *what; GtkDialog *gd; -@@ -271,27 +297,27 @@ void mail_msg_check_error(void *msg) +@@ -271,27 +306,27 @@ void mail_msg_check_error(void *msg) /* check to see if we have dialogue already running for this operation */ /* we key on the operation pointer, which is at least accurate enough for the operation type, although it could be on a different object. */ @@ -5381,7 +5392,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); -@@ -304,13 +330,12 @@ void mail_msg_cancel(unsigned int msgid) +@@ -304,13 +339,12 @@ void mail_msg_cancel(unsigned int msgid) /* waits for a message to be finished processing (freed) @@ -5398,7 +5409,7 @@ MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +372,7 @@ int mail_msg_active(unsigned int msgid) +@@ -347,9 +381,7 @@ int mail_msg_active(unsigned int msgid) void mail_msg_wait_all(void) { @@ -5409,7 +5420,7 @@ MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -367,294 +390,239 @@ void mail_msg_wait_all(void) +@@ -367,294 +399,239 @@ void mail_msg_wait_all(void) } /* **************************************** */ @@ -5420,10 +5431,10 @@ - GDestroyNotify func; - void *data; -}; +- +-static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); +static GHookList cancel_hook_list; --static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); -- -void *mail_cancel_hook_add(GDestroyNotify func, void *data) +GHook * +mail_cancel_hook_add (GHookFunc func, gpointer data) @@ -5537,10 +5548,12 @@ { - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; -- -- while (( m = (mail_msg_t *)e_msgport_get(port))) { + MailMsg *msg; +- while (( m = (mail_msg_t *)e_msgport_get(port))) { ++ g_assert (main_loop_queue != NULL); ++ g_assert (msg_reply_queue != NULL); + -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); @@ -5552,9 +5565,7 @@ - fprintf(log, "%p: Replied to GUI thread (exception `%s'\n", m, - camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); -#endif -+ g_assert (main_loop_queue != NULL); -+ g_assert (msg_reply_queue != NULL); - +- - if (m->ops->reply_msg) - m->ops->reply_msg(m); - mail_msg_check_error(m); @@ -5715,15 +5726,15 @@ +mail_msg_compare (const MailMsg *msg1, const MailMsg *msg2) { - mail_msg_t *m = (mail_msg_t *)msg; -- ++ gint priority1 = msg1->priority; ++ gint priority2 = msg2->priority; + -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); - checkmem(m->priv); -#endif -+ gint priority1 = msg1->priority; -+ gint priority2 = msg2->priority; - +- - if (m->ops->describe_msg) { - char *text = m->ops->describe_msg(m, FALSE); + if (priority1 == priority2) @@ -5791,14 +5802,14 @@ + (GSourceFunc) mail_msg_idle_cb, NULL); + G_UNLOCK (idle_source_id); +} - -- g_io_channel_unref(mail_gui_channel); -- g_io_channel_unref(mail_gui_reply_channel); ++ +void +mail_msg_unordered_push (gpointer msg) +{ + static GOnce once = G_ONCE_INIT; -+ + +- g_io_channel_unref(mail_gui_channel); +- g_io_channel_unref(mail_gui_reply_channel); + g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); - e_msgport_destroy(mail_gui_port); @@ -5856,15 +5867,15 @@ - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); + static GOnce once = G_ONCE_INIT; ++ ++ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - mail_msg_active_table = g_hash_table_new(NULL, NULL); - mail_gui_thread = pthread_self(); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - -- mail_async_event = mail_async_event_new(); + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); +} -+ + +- mail_async_event = mail_async_event_new(); +gboolean +mail_in_main_thread (void) +{ @@ -5872,7 +5883,7 @@ } /* ********************************************************************** */ -@@ -665,7 +633,8 @@ static pthread_mutex_t status_lock = PTH +@@ -665,7 +642,8 @@ static pthread_mutex_t status_lock = PTH /* ********************************************************************** */ struct _proxy_msg { @@ -5882,7 +5893,7 @@ MailAsyncEvent *ea; mail_async_event_t type; -@@ -679,10 +648,8 @@ struct _proxy_msg { +@@ -679,10 +657,8 @@ struct _proxy_msg { }; static void @@ -5894,7 +5905,7 @@ m->thread = pthread_self(); m->have_thread = TRUE; m->func(m->o, m->event_data, m->data); -@@ -697,16 +664,17 @@ static int +@@ -697,16 +673,17 @@ static int idle_async_event(void *mm) { do_async_event(mm); @@ -5918,7 +5929,7 @@ }; MailAsyncEvent *mail_async_event_new(void) -@@ -723,10 +691,9 @@ int mail_async_event_emit(MailAsyncEvent +@@ -723,10 +700,9 @@ int mail_async_event_emit(MailAsyncEvent { struct _proxy_msg *m; int id; @@ -5930,7 +5941,7 @@ m->func = func; m->o = o; m->event_data = event_data; -@@ -735,7 +702,7 @@ int mail_async_event_emit(MailAsyncEvent +@@ -735,7 +711,7 @@ int mail_async_event_emit(MailAsyncEvent m->type = type; m->have_thread = FALSE; @@ -5939,7 +5950,7 @@ g_mutex_lock(ea->lock); ea->tasks = g_slist_prepend(ea->tasks, m); g_mutex_unlock(ea->lock); -@@ -743,12 +710,12 @@ int mail_async_event_emit(MailAsyncEvent +@@ -743,12 +719,12 @@ int mail_async_event_emit(MailAsyncEvent /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -5955,7 +5966,7 @@ return id; } -@@ -762,7 +729,7 @@ int mail_async_event_destroy(MailAsyncEv +@@ -762,7 +738,7 @@ int mail_async_event_destroy(MailAsyncEv g_mutex_lock(ea->lock); while (ea->tasks) { m = ea->tasks->data; @@ -5964,7 +5975,7 @@ if (m->have_thread && pthread_equal(m->thread, thread)) { g_warning("Destroying async event from inside an event, returning EDEADLK"); g_mutex_unlock(ea->lock); -@@ -784,17 +751,18 @@ int mail_async_event_destroy(MailAsyncEv +@@ -784,17 +760,18 @@ int mail_async_event_destroy(MailAsyncEv /* ********************************************************************** */ struct _call_msg { @@ -5986,7 +5997,7 @@ void *p1, *p2, *p3, *p4, *p5; int i1; va_list ap; -@@ -842,45 +810,47 @@ do_call(struct _mail_msg *mm) +@@ -842,45 +819,47 @@ do_call(struct _mail_msg *mm) m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } @@ -6053,7 +6064,7 @@ return ret; } -@@ -889,40 +859,42 @@ void *mail_call_main(mail_call_t type, M +@@ -889,40 +868,42 @@ void *mail_call_main(mail_call_t type, M /* locked via status_lock */ static int busy_state; @@ -6108,7 +6119,7 @@ } MAIL_MT_UNLOCK(status_lock); } -@@ -930,7 +902,7 @@ void mail_disable_stop(void) +@@ -930,7 +911,7 @@ void mail_disable_stop(void) /* ******************************************************************************** */ struct _op_status_msg { @@ -6117,7 +6128,7 @@ struct _CamelOperation *op; char *what; -@@ -938,16 +910,16 @@ struct _op_status_msg { +@@ -938,16 +919,16 @@ struct _op_status_msg { void *data; }; @@ -6139,7 +6150,7 @@ MAIL_MT_LOCK (mail_msg_lock); -@@ -986,8 +958,8 @@ static void do_op_status(struct _mail_ms +@@ -986,8 +967,8 @@ static void do_op_status(struct _mail_ms progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); MAIL_MT_UNLOCK (mail_msg_lock); @@ -6150,7 +6161,20 @@ /* uncommenting because message is not very useful for a user, see bug 271734*/ else { what = g_strdup(""); -@@ -1021,18 +993,17 @@ static void do_op_status(struct _mail_ms +@@ -1001,11 +982,7 @@ static void do_op_status(struct _mail_ms + MAIL_MT_LOCK (mail_msg_lock); + if (data->activity_state == 3) { + MAIL_MT_UNLOCK (mail_msg_lock); +- if (msg->cancel) +- camel_operation_unref (msg->cancel); +- camel_exception_clear (&msg->ex); +- g_free (msg->priv); +- g_free (msg); ++ mail_msg_free (msg); + } else { + data->activity_state = 2; + MAIL_MT_UNLOCK (mail_msg_lock); +@@ -1021,18 +998,17 @@ static void do_op_status(struct _mail_ms } static void @@ -6176,7 +6200,7 @@ }; static void -@@ -1042,7 +1013,7 @@ mail_operation_status (struct _CamelOper +@@ -1042,7 +1018,7 @@ mail_operation_status (struct _CamelOper d(printf("got operation statys: %s %d%%\n", what, pc)); @@ -6185,7 +6209,7 @@ m->op = op; m->what = g_strdup(what); switch (pc) { -@@ -1055,7 +1026,7 @@ mail_operation_status (struct _CamelOper +@@ -1055,7 +1031,7 @@ mail_operation_status (struct _CamelOper } m->pc = pc; m->data = data; @@ -6194,8 +6218,8 @@ } /* ******************** */ ---- evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 -+++ evolution-2.11.3/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 ++++ evolution-2.11.4/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-27 11:23:50.000000000 -0400 @@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( @@ -6275,8 +6299,8 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } ---- evolution-2.11.3/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 -+++ evolution-2.11.3/plugins/mark-all-read/mark-all-read.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 ++++ evolution-2.11.4/plugins/mark-all-read/mark-all-read.c 2007-06-27 11:23:50.000000000 -0400 @@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } @@ -6286,8 +6310,8 @@ } static void ---- evolution-2.11.3/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 -+++ evolution-2.11.3/plugins/exchange-operations/exchange-folder.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 ++++ evolution-2.11.4/plugins/exchange-operations/exchange-folder.c 2007-06-27 11:23:50.000000000 -0400 @@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -6297,8 +6321,8 @@ } ---- evolution-2.11.3/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 -+++ evolution-2.11.3/plugins/save-attachments/save-attachments.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 ++++ evolution-2.11.4/plugins/save-attachments/save-attachments.c 2007-06-27 11:23:50.000000000 -0400 @@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -6306,8 +6330,8 @@ - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 -+++ evolution-2.11.3/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 ++++ evolution-2.11.4/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-27 11:23:50.000000000 -0400 @@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); @@ -6317,8 +6341,8 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.11.3/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 -+++ evolution-2.11.3/plugins/groupwise-features/share-folder-common.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 ++++ evolution-2.11.4/plugins/groupwise-features/share-folder-common.c 2007-06-27 11:23:50.000000000 -0400 @@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } @@ -6416,8 +6440,8 @@ return id; } ---- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.h 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 ++++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.h 2007-06-27 11:23:50.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6438,8 +6462,8 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-notify.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 ++++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.c 2007-06-27 11:23:50.000000000 -0400 @@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; @@ -6552,8 +6576,8 @@ } static void ---- evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-06-01 03:09:22.000000000 -0400 -+++ evolution-2.11.3/calendar/gui/alarm-notify/alarm-queue.c 2007-06-06 12:59:41.000000000 -0400 +--- evolution-2.11.4/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-06-01 03:09:22.000000000 -0400 ++++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-queue.c 2007-06-27 11:23:50.000000000 -0400 @@ -97,9 +97,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; diff --git a/evolution.spec b/evolution.spec index fd4f60d..1ec856c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -703,6 +703,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Jun 27 2007 Matthew Barnes - 2.11.4-2.fc8 +- Revise patch for GNOME bug #363695 to fix RH bug #245289 (frequent hangs). + * Mon Jun 18 2007 Matthew Barnes - 2.11.4-1.fc8 - Update to 2.11.4 - Remove patch for GNOME bug #447727 (fixed upstream). From 680ca0d74bd35a91a8b1eec03c08dec45f3940be Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 14 Jul 2007 17:14:43 +0000 Subject: [PATCH 149/844] - Update to 2.11.5 - Revise patch for GNOME bug #362638 to fix RH bug #245695. --- .cvsignore | 2 +- ....11.5-implicit-function-declarations.patch | 38 +++++++++++++++++++ evolution-2.8.1-kill-ethread.patch | 2 +- evolution.spec | 18 ++++++++- sources | 2 +- 5 files changed, 57 insertions(+), 5 deletions(-) create mode 100644 evolution-2.11.5-implicit-function-declarations.patch 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 From c8644d3c88b8e9b3ae334a0f3b2c3ffcd381513b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 27 Jul 2007 14:17:40 +0000 Subject: [PATCH 150/844] - Remove spamassassin requirement since it's optional. - Add patch for GNOME bug #380534 (clarify version requirements). --- evolution-2.11.5-version-checks.patch | 347 ++++++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 355 insertions(+), 1 deletion(-) create mode 100644 evolution-2.11.5-version-checks.patch diff --git a/evolution-2.11.5-version-checks.patch b/evolution-2.11.5-version-checks.patch new file mode 100644 index 0000000..3411c81 --- /dev/null +++ b/evolution-2.11.5-version-checks.patch @@ -0,0 +1,347 @@ +--- evolution-2.11.5/a11y/Makefile.am.version-checks 2007-07-05 02:11:31.000000000 -0400 ++++ evolution-2.11.5/a11y/Makefile.am 2007-07-27 09:45:51.000000000 -0400 +@@ -31,4 +31,4 @@ libevolution_a11y_la_LIBADD = \ + e-text/libgal-a11y-etext.la \ + e-table/libgal-a11y-etable.la \ + $(top_builddir)/e-util/libeutil.la \ +- $(EXTRA_GNOME_LIBS) ++ $(GNOME_PLATFORM_LIBS) +--- evolution-2.11.5/a11y/e-text/Makefile.am.version-checks 2007-07-05 02:11:30.000000000 -0400 ++++ evolution-2.11.5/a11y/e-text/Makefile.am 2007-07-27 09:45:51.000000000 -0400 +@@ -1,7 +1,7 @@ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ +- $(EXTRA_GNOME_CFLAGS) \ ++ $(GNOME_PLATFORM_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-text\" + + noinst_LTLIBRARIES = libgal-a11y-etext.la +--- evolution-2.11.5/a11y/e-table/Makefile.am.version-checks 2007-07-05 02:11:31.000000000 -0400 ++++ evolution-2.11.5/a11y/e-table/Makefile.am 2007-07-27 09:45:51.000000000 -0400 +@@ -1,7 +1,7 @@ + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ +- $(EXTRA_GNOME_CFLAGS) \ ++ $(GNOME_PLATFORM_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-table\" + + noinst_LTLIBRARIES = libgal-a11y-etable.la +--- evolution-2.11.5/configure.in.version-checks 2007-07-27 09:45:32.000000000 -0400 ++++ evolution-2.11.5/configure.in 2007-07-27 09:45:51.000000000 -0400 +@@ -4,6 +4,34 @@ AC_PREREQ(2.52) + AC_INIT(evolution, 2.11.5, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution) + AC_CONFIG_SRCDIR(README) + ++# Some requirements have versioned package names ++# XXX In the spirit of getting rid of versioned ++# files, can we drop these suffixes? ++EDS_PACKAGE=1.2 ++GTKHTML_PACKAGE=3.14 ++ ++# Required Packages ++m4_define([gtk_minimum_version], [2.10.0]) ++m4_define([eds_minimum_version], [1.9.4]) ++m4_define([gnome_icon_theme_minimum_version], [1.2.0]) ++m4_define([gnome_vfs_minimum_version], [2.4.0]) ++m4_define([libbonoboui_minimum_version], [2.4.2]) ++m4_define([libgtkhtml_minimum_version], [3.14.0]) ++m4_define([gconf_minimum_version], [2.0.0]) # XXX Just a Guess ++m4_define([libglade_minimum_version], [2.0.0]) # XXX Just a Guess ++m4_define([libgnomecanvas_minimum_version], [2.0.0]) # XXX Just a Guess ++m4_define([libgnomeui_minimum_version], [2.0.0]) # XXX Just a Guess ++m4_define([libxml_minimum_version], [2.0.0]) # XXX Just a Guess ++ ++# Optional Packages ++# ++# FIXME Minimum versions for dbus-glib-1 and libnm_glib ? ++# FIXME Move audio-inline plugin from gstreamer-0.8 to 0.10 ? ++# ++m4_define([dbus_minimum_version], [1.0.0]) ++m4_define([hal_minimum_version], [0.5.4]) ++m4_define([libnotify_minimum_version], [0.3.0]) ++m4_define([gnome_pilot_minimum_version], [2.0.0]) # XXX Just a Guess + + # GNOME Documentation + GNOME_DOC_INIT +@@ -133,6 +161,27 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 + AC_SUBST(NO_UNDEFINED) + AC_SUBST(SOEXT) + ++# Check for base dependencies early. ++PKG_CHECK_MODULES(GNOME_PLATFORM, ++ [gtk+-2.0 >= gtk_minimum_version ++ gconf-2.0 >= gconf_minimum_version ++ gnome-vfs-2.0 >= gnome_vfs_minimum_version ++ libbonoboui-2.0 >= libbonoboui_minimum_version ++ libglade-2.0 >= libglade_minimum_version ++ libgnomecanvas-2.0 >= libgnomecanvas_minimum_version ++ libgnomeui-2.0 >= libgnomeui_minimum_version ++ libxml-2.0 >= libxml_minimum_version]) ++AC_SUBST(GNOME_PLATFORM_CFLAGS) ++AC_SUBST(GNOME_PLATFORM_LIBS) ++ ++PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER, ++ [libebook-$EDS_PACKAGE >= eds_minimum_version ++ libecal-$EDS_PACKAGE >= eds_minimum_version ++ libedataserver-$EDS_PACKAGE >= eds_minimum_version ++ libedataserverui-$EDS_PACKAGE >= eds_minimum_version ++ libegroupwise-$EDS_PACKAGE >= eds_minimum_version ++ libexchange-storage-$EDS_PACKAGE >= eds_minimum_version]) ++ + dnl ****************************** + dnl iconv checking + dnl ****************************** +@@ -409,7 +458,7 @@ AC_CHECK_FUNCS(statfs) + dnl ************************************************** + dnl * Gnome Icon Theme + dnl ************************************************** +-PKG_CHECK_MODULES(GIT, gnome-icon-theme >= 1.2.0) ++PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version) + + dnl ************************************************** + dnl * Accessibility support +@@ -587,7 +636,8 @@ AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(re + [AC_MSG_ERROR([No regex library found])])]) + AC_SUBST(REGEX_LIBS) + +-PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14) ++# XXX Drop the version from the package name? ++PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 >= libgtkhtml_minimum_version) + AC_SUBST(GTKHTML_CFLAGS) + AC_SUBST(GTKHTML_LIBS) + GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.14` +@@ -604,7 +654,7 @@ dnl ****************************** + AC_ARG_ENABLE(pilot-conduits, + [ --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no) + if test "x$enable_pilot_conduits" = "xyes"; then +- PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0) ++ PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0 >= gnome_pilot_minimum_version) + + CFLAGS_save="$CFLAGS" + CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS" +@@ -1217,27 +1267,12 @@ fi + + dnl --- Required version numbers + +-GTKHTML_REQUIRED=3.14.0 +-GTKHTML_PACKAGE=3.14 +-EDS_REQUIRED=1.9.4 +-EDS_PACKAGE=1.2 +-BONOBOUI_REQUIRED=2.4.2 +-GNOME_VFS_REQUIRED=2.4 +- +-AC_SUBST(GTKHTML_REQUIRED) +-AC_SUBST(GTKHTML_PACKAGE) +-AC_SUBST(EDS_REQUIRED) +-AC_SUBST(EDS_PACKAGE) ++BONOBOUI_REQUIRED=libbonoboui_minimum_version + AC_SUBST(BONOBOUI_REQUIRED) +-AC_SUBST(GNOME_VFS_REQUIRED) + + dnl --- Flags to get all the GNOME stuff + +-FULL_GNOME_DEPS="glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0" +- +-EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS) +-AC_SUBST(GNOME_FULL_CFLAGS) +-AC_SUBST(GNOME_FULL_LIBS) ++FULL_GNOME_DEPS="libbonoboui-2.0 gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0" + + CPPFLAGS_save="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags-only-I libgnomeui-2.0`" +@@ -1245,11 +1280,7 @@ AC_CHECK_HEADERS(libgnomeui/gnome-icon-l + AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h) + CPPFLAGS="$CPPFLAGS_save" + +-PKG_CHECK_MODULES(EXTRA_GNOME, $FULL_GNOME_DEPS) +-AC_SUBST(EXTRA_GNOME_LIBS) +-AC_SUBST(EXTRA_GNOME_CFLAGS) +- +-PKG_CHECK_MODULES(HAL, hal >= 0.5.4, HAVE_HAL="yes", HAVE_HAL="no") ++PKG_CHECK_MODULES(HAL, hal >= hal_minimum_version, HAVE_HAL="yes", HAVE_HAL="no") + if test "x$HAVE_HAL" = "xyes"; then + AC_DEFINE(HAVE_HAL, 1, [hal available]) + HAL_REQUIREMENT="hal" +@@ -1279,7 +1310,7 @@ EVO_SET_COMPILE_FLAGS(CAMEL, camel-provi + AC_SUBST(CAMEL_CFLAGS) + AC_SUBST(CAMEL_LIBS) + +-EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED libegroupwise-$EDS_PACKAGE >= $EDS_REQUIRED) ++EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE) + AC_SUBST(CAMEL_GROUPWISE_CFLAGS) + AC_SUBST(CAMEL_GROUPWISE_LIBS) + +@@ -1292,33 +1323,33 @@ else + fi + fi + +-EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED libglade-2.0 gtk+-2.0 glib-2.0 gobject-2.0 gthread-2.0, ++EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, + $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, + $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS) + AC_SUBST(CERT_UI_CFLAGS) + AC_SUBST(CERT_UI_LIBS) + +-EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED) ++EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0) + AC_SUBST(E_NAME_CFLAGS) + AC_SUBST(E_NAME_LIBS) + +-EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) ++EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) + AC_SUBST(E_UTIL_CFLAGS) + AC_SUBST(E_UTIL_LIBS) + +-EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE >= $EDS_REQUIRED, $GNOME_FULL_CFLAGS, $GNOME_FULL_LIBS) ++EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE, $GNOME_PLATFORM_CFLAGS, $GNOME_PLATFORM_LIBS) + AC_SUBST(TZDIALOG_CFLAGS) + AC_SUBST(TZDIALOG_LIBS) + +-EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 gnome-vfs-module-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED) ++EVO_SET_COMPILE_FLAGS(E_WIDGETS, libbonoboui-2.0 gnome-vfs-module-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE) + AC_SUBST(E_WIDGETS_CFLAGS) + AC_SUBST(E_WIDGETS_LIBS) + +-EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED) ++EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) + AC_SUBST(IMPORTERS_CFLAGS) + AC_SUBST(IMPORTERS_LIBS) + +-EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED) ++EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE) + AC_SUBST(LIBFILTER_CFLAGS) + AC_SUBST(LIBFILTER_LIBS) + +@@ -1345,14 +1376,14 @@ AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$N + AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes) + + +-EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED $NM_SUPPORT_PACKAGES) ++EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE $NM_SUPPORT_PACKAGES) + + AC_SUBST(SHELL_CFLAGS) + AC_SUBST(SHELL_LIBS) + + dnl --- evolution-addressbook flags + +-EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-$EDS_PACKAGE" ++EVOLUTION_ADDRESSBOOK_DEPS="libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE" + + EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) + AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) +@@ -1366,7 +1397,7 @@ fi + + LIBNOTIFY_CFLAGS= + LIBNOTIFY_LIBS= +-PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.3.0, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no") ++PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= libnotify_minimum_version, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no") + if test "x$HAVE_LIBNOTIFY" = "xyes"; then + AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available]) + libnotify="libnotify" +@@ -1390,7 +1421,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP + AC_SUBST(LIBSOUP_CFLAGS) + AC_SUBST(LIBSOUP_LIBS) + +-EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $HAL_REQUIREMENT $libnotify) ++EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify) + AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) + AC_SUBST(EVOLUTION_CALENDAR_LIBS) + +@@ -1402,7 +1433,7 @@ fi + + dnl --- evolution-mail flags + +-EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED) ++EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE) + AC_SUBST(EVOLUTION_MAIL_CFLAGS) + AC_SUBST(EVOLUTION_MAIL_LIBS) + +@@ -1425,7 +1456,7 @@ fi + + dnl --- evolution-test flags + +-EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED) ++EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, libgnomeui-2.0 libbonoboui-2.0) + AC_SUBST(EVOLUTION_TEST_CFLAGS) + AC_SUBST(EVOLUTION_TEST_LIBS) + +@@ -1644,7 +1675,7 @@ if echo ${plugins_enabled} | grep "excha + dnl ************************************************** + dnl * Exchange Operations plugin + dnl ************************************************** +- EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gthread-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE) ++ EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE) + AC_SUBST(CAMEL_EXCHANGE_CFLAGS) + AC_SUBST(CAMEL_EXCHANGE_LIBS) + else +--- evolution-2.11.5/widgets/misc/Makefile.am.version-checks 2007-07-05 02:11:06.000000000 -0400 ++++ evolution-2.11.5/widgets/misc/Makefile.am 2007-07-27 09:45:51.000000000 -0400 +@@ -10,7 +10,7 @@ INCLUDES = \ + -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ + -DG_LOG_DOMAIN=__FILE__ \ + $(EVOLUTION_MAIL_CFLAGS) \ +- $(EXTRA_GNOME_CFLAGS) \ ++ $(GNOME_PLATFORM_CFLAGS) \ + $(ICONV_CFLAGS) + + +@@ -133,7 +133,7 @@ libemiscwidgets_la_LIBADD = $(top_buildd + $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(CAMEL_LIBS) \ +- $(EXTRA_GNOME_LIBS) \ ++ $(GNOME_PLATFORM_LIBS) \ + $(ICONV_LIBS) + + libefilterbar_la_SOURCES = \ +--- evolution-2.11.5/widgets/table/Makefile.am.version-checks 2007-07-05 02:11:01.000000000 -0400 ++++ evolution-2.11.5/widgets/table/Makefile.am 2007-07-27 09:45:51.000000000 -0400 +@@ -13,7 +13,7 @@ INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ + $(E_WIDGETS_CFLAGS) \ +- $(EXTRA_GNOME_CFLAGS) \ ++ $(GNOME_PLATFORM_CFLAGS) \ + -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \ + -DG_LOG_DOMAIN=\"e-table\" + +@@ -155,7 +155,7 @@ libetable_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(E_WIDGETS_LIBS) \ +- $(EXTRA_GNOME_LIBS) ++ $(GNOME_PLATFORM_LIBS) + + icons = \ + add-col.xpm \ +--- evolution-2.11.5/widgets/text/Makefile.am.version-checks 2007-07-05 02:10:57.000000000 -0400 ++++ evolution-2.11.5/widgets/text/Makefile.am 2007-07-27 09:45:51.000000000 -0400 +@@ -5,7 +5,7 @@ endif + INCLUDES = \ + -I$(top_srcdir) \ + -I$(top_srcdir)/widgets \ +- $(EXTRA_GNOME_CFLAGS) \ ++ $(GNOME_PLATFORM_CFLAGS) \ + -DG_LOG_DOMAIN=\"e-text\" + + +@@ -44,5 +44,5 @@ libetext_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/a11y/libevolution-a11y.la \ + $(top_builddir)/widgets/table/libetable.la \ +- $(EXTRA_GNOME_LIBS) \ ++ $(GNOME_PLATFORM_LIBS) \ + $(REGEX_LIBS) +--- evolution-2.11.5/tools/Makefile.am.version-checks 2007-07-05 02:06:57.000000000 -0400 ++++ evolution-2.11.5/tools/Makefile.am 2007-07-27 09:45:50.000000000 -0400 +@@ -16,7 +16,7 @@ INCLUDES = \ + -DSYSCONFDIR=\""$(sysconfdir)"\" \ + -DDATADIR=\""$(datadir)"\" \ + -DLIBDIR=\""$(libdir)"\" \ +- $(GNOME_FULL_CFLAGS) ++ $(GNOME_PLATFORM_CFLAGS) + + EXTRA_DIST = verify-evolution-install.sh + diff --git a/evolution.spec b/evolution.spec index dde5d9a..1bcd257 100644 --- a/evolution.spec +++ b/evolution.spec @@ -134,6 +134,9 @@ Patch34: evolution-2.10.0-e-source-combo-box.patch # More implicit function declarations... Patch35: evolution-2.11.5-implicit-function-declarations.patch +# GNOME bug #380534 +Patch36: evolution-2.11.5-version-checks.patch + ## Dependencies ### Requires(post): GConf2 @@ -151,7 +154,6 @@ Requires: gtk2 >= 2.4.0 Requires: libbonoboui >= %{libbonoboui_version} Requires: libsoup >= %{soup_version} Requires: redhat-menus >= %{redhat_menus_version} -Requires: spamassassin %if %{libnotify_support} Requires: libnotify >= 0.4 @@ -274,6 +276,7 @@ Development files needed for building things which link against evolution. %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box %patch35 -p1 -b .implicit-function-declarations +%patch36 -p1 -b .version-checks mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -713,6 +716,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Jul 16 2007 Matthew Barnes - 2.11.5-2.fc8 +- Remove spamassassin requirement since it's optional. +- Add patch for GNOME bug #380534 (clarify version requirements). + * 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. From 357a64628d6641588e2fc2414c91ca01d9e810bc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 27 Jul 2007 14:42:54 +0000 Subject: [PATCH 151/844] Forgot to bump release. --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 1bcd257..8854d8a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.5 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -716,9 +716,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Fri Jul 27 2007 Matthew Barnes - 2.11.5-3.fc8 +- Add patch for GNOME bug #380534 (clarify version requirements). + * Mon Jul 16 2007 Matthew Barnes - 2.11.5-2.fc8 - Remove spamassassin requirement since it's optional. -- Add patch for GNOME bug #380534 (clarify version requirements). * Fri Jul 13 2007 Matthew Barnes - 2.11.5-1.fc8 - Update to 2.11.5 From 069c33b1d8890c88907383430bcc91489e28a20d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 1 Aug 2007 18:20:35 +0000 Subject: [PATCH 152/844] - Update to 2.11.6.1 --- .cvsignore | 2 +- evolution-2.10.0-e-source-combo-box.patch | 184 ++++----- evolution-2.11.3-e-clipped-label.patch | 377 ------------------ ....11.5-implicit-function-declarations.patch | 38 -- evolution-2.11.5-version-checks.patch | 347 ---------------- evolution.spec | 23 +- sources | 2 +- 7 files changed, 109 insertions(+), 864 deletions(-) delete mode 100644 evolution-2.11.3-e-clipped-label.patch delete mode 100644 evolution-2.11.5-implicit-function-declarations.patch delete mode 100644 evolution-2.11.5-version-checks.patch diff --git a/.cvsignore b/.cvsignore index 972d3f7..eb84a4b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.11.5.tar.bz2 +evolution-2.11.6.1.tar.bz2 diff --git a/evolution-2.10.0-e-source-combo-box.patch b/evolution-2.10.0-e-source-combo-box.patch index e1d0078..58f1300 100644 --- a/evolution-2.10.0-e-source-combo-box.patch +++ b/evolution-2.10.0-e-source-combo-box.patch @@ -1,5 +1,5 @@ ---- evolution-2.11.2/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-18 06:18:34.000000000 -0400 -+++ evolution-2.11.2/widgets/misc/e-pilot-settings.c 2007-05-18 15:49:15.000000000 -0400 +--- evolution-2.11.6/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-17 12:44:06.000000000 -0400 ++++ evolution-2.11.6/widgets/misc/e-pilot-settings.c 2007-07-31 10:01:40.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -9,7 +9,7 @@ #include "e-pilot-settings.h" struct _EPilotSettingsPrivate -@@ -102,7 +102,7 @@ +@@ -102,7 +102,7 @@ build_ui (EPilotSettings *ps, ESourceLis lbl = gtk_label_new (_("Sync with:")); gtk_misc_set_alignment (GTK_MISC (lbl), 0.0, 0.5); @@ -18,7 +18,7 @@ gtk_table_attach_defaults (GTK_TABLE (ps), lbl, 0, 1, 0, 1); gtk_table_attach_defaults (GTK_TABLE (ps), priv->source, 1, 2, 0, 1); gtk_widget_show (lbl); -@@ -152,8 +152,9 @@ +@@ -152,8 +152,9 @@ e_pilot_settings_get_source (EPilotSetti g_return_val_if_fail (E_IS_PILOT_SETTINGS (ps), FALSE); priv = ps->priv; @@ -30,7 +30,7 @@ } void -@@ -166,7 +167,8 @@ +@@ -166,7 +167,8 @@ e_pilot_settings_set_source (EPilotSetti priv = ps->priv; @@ -40,9 +40,9 @@ } gboolean ---- evolution-2.11.2/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-04-18 06:17:20.000000000 -0400 -+++ evolution-2.11.2/plugins/itip-formatter/itip-formatter.c 2007-05-18 15:48:37.000000000 -0400 -@@ -39,7 +39,7 @@ +--- evolution-2.11.6/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-07-30 10:18:01.000000000 -0400 ++++ evolution-2.11.6/plugins/itip-formatter/itip-formatter.c 2007-07-31 10:01:40.000000000 -0400 +@@ -40,7 +40,7 @@ #include #include #include @@ -51,8 +51,8 @@ #include #include #include ---- evolution-2.11.2/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-05-13 13:41:08.000000000 -0400 -+++ evolution-2.11.2/plugins/itip-formatter/itip-view.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-07-30 10:18:01.000000000 -0400 ++++ evolution-2.11.6/plugins/itip-formatter/itip-view.c 2007-07-31 10:01:40.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -62,7 +62,7 @@ #include #include #include -@@ -103,8 +103,8 @@ +@@ -105,8 +105,8 @@ struct _ItipViewPrivate { char *description; GtkWidget *selector_box; @@ -73,7 +73,7 @@ ESourceList *source_list; GtkWidget *rsvp_box; -@@ -1671,10 +1671,12 @@ +@@ -1788,10 +1788,12 @@ itip_view_clear_lower_info_items (ItipVi } static void @@ -89,7 +89,7 @@ g_signal_emit (view, signals[SOURCE_SELECTED], 0, source); } -@@ -1691,40 +1693,42 @@ +@@ -1808,40 +1810,42 @@ itip_view_set_source_list (ItipView *vie if (priv->source_list) g_object_unref (priv->source_list); @@ -149,7 +149,7 @@ } ESourceList * -@@ -1750,10 +1754,11 @@ +@@ -1867,10 +1871,11 @@ itip_view_set_source (ItipView *view, ES priv = view->priv; @@ -163,7 +163,7 @@ } ESource * -@@ -1766,10 +1771,11 @@ +@@ -1883,10 +1888,11 @@ itip_view_get_source (ItipView *view) priv = view->priv; @@ -177,8 +177,8 @@ } void ---- evolution-2.11.2/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-05-13 13:41:06.000000000 -0400 -+++ evolution-2.11.2/plugins/bbdb/gaimbuddies.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-07-30 10:18:00.000000000 -0400 ++++ evolution-2.11.6/plugins/bbdb/gaimbuddies.c 2007-07-31 10:01:40.000000000 -0400 @@ -44,7 +44,7 @@ #include @@ -188,8 +188,8 @@ #include #include ---- evolution-2.11.2/plugins/bbdb/bbdb.c.e-source-combo-box 2007-04-18 06:17:14.000000000 -0400 -+++ evolution-2.11.2/plugins/bbdb/bbdb.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/plugins/bbdb/bbdb.c.e-source-combo-box 2007-07-30 10:18:00.000000000 -0400 ++++ evolution-2.11.6/plugins/bbdb/bbdb.c 2007-07-31 10:01:40.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -199,7 +199,7 @@ #include #include -@@ -341,7 +341,8 @@ +@@ -353,7 +353,8 @@ enable_toggled_cb (GtkWidget *widget, gp gtk_widget_set_sensitive (stuff->option_menu, active); if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) { @@ -209,7 +209,7 @@ gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL); } } -@@ -360,7 +361,8 @@ +@@ -372,7 +373,8 @@ enable_gaim_toggled_cb (GtkWidget *widge gtk_widget_set_sensitive (stuff->gaim_option_menu, active); if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) { @@ -219,7 +219,7 @@ gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL); } } -@@ -389,31 +391,32 @@ +@@ -401,31 +403,32 @@ gaim_source_changed_cb (GtkWidget *widge static GtkWidget * create_addressbook_option_menu (struct bbdb_stuff *stuff, int type) { @@ -259,8 +259,8 @@ } GtkWidget * ---- evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-05-14 00:24:02.000000000 -0400 -+++ evolution-2.11.2/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 ++++ evolution-2.11.6/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-07-31 10:01:40.000000000 -0400 @@ -158,9 +158,9 @@ @@ -273,8 +273,8 @@ 0 0 Tue, 01 Jun 2004 18:22:38 GMT ---- evolution-2.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-04-18 06:15:40.000000000 -0400 -+++ evolution-2.11.2/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 ++++ evolution-2.11.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-07-31 10:01:40.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -284,7 +284,7 @@ #include
#include -@@ -78,7 +78,7 @@ +@@ -78,7 +78,7 @@ static void select_cb (GtkWidget *w, ECo static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor); static void list_image_changed_cb (GtkWidget *w, EContactListEditor *editor); static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor); @@ -293,7 +293,7 @@ static gboolean email_key_pressed (GtkWidget *w, GdkEventKey *event, EContactListEditor *editor); static void email_match_selected (GtkWidget *w, EDestination *destination, EContactListEditor *editor); -@@ -233,7 +233,7 @@ +@@ -233,7 +233,7 @@ e_contact_list_editor_init (EContactList editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry"); editor->list_image = glade_xml_get_widget (gui, "list-image"); editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton"); @@ -302,7 +302,7 @@ editor->ok_button = glade_xml_get_widget (gui, "ok-button"); editor->cancel_button = glade_xml_get_widget (gui, "cancel-button"); -@@ -276,7 +276,7 @@ +@@ -276,7 +276,7 @@ e_contact_list_editor_init (EContactList "changed", G_CALLBACK(list_image_changed_cb), editor); g_signal_connect (editor->source_menu, @@ -311,7 +311,7 @@ command_state_changed (editor); -@@ -306,8 +306,9 @@ +@@ -306,8 +306,9 @@ new_target_cb (EBook *new_book, EBookSta if (status != E_BOOK_ERROR_OK || new_book == NULL) { eab_load_error_dialog (NULL, e_book_get_source (new_book), status); @@ -323,7 +323,7 @@ if (new_book) g_object_unref (new_book); -@@ -332,8 +333,12 @@ +@@ -332,8 +333,12 @@ cancel_load (EContactListEditor *editor) } static void @@ -337,7 +337,7 @@ cancel_load (editor); if (e_source_equal (e_book_get_source (editor->book), source)) -@@ -795,28 +800,28 @@ +@@ -795,28 +800,28 @@ select_cb (GtkWidget *w, EContactListEdi } GtkWidget * @@ -376,7 +376,7 @@ } GtkWidget * -@@ -1262,10 +1267,9 @@ +@@ -1262,10 +1267,9 @@ fill_in_info(EContactListEditor *editor) } if (editor->book) { @@ -390,8 +390,8 @@ gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list); gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list); } ---- evolution-2.11.2/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-04-18 06:15:34.000000000 -0400 -+++ evolution-2.11.2/addressbook/gui/contact-editor/contact-editor.glade 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 ++++ evolution-2.11.6/addressbook/gui/contact-editor/contact-editor.glade 2007-07-31 10:01:40.000000000 -0400 @@ -356,9 +356,9 @@ @@ -404,8 +404,8 @@ 0 0 Tue, 13 Apr 2004 20:47:50 GMT ---- evolution-2.11.2/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-05-09 00:14:39.000000000 -0400 -+++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-editor.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 ++++ evolution-2.11.6/addressbook/gui/contact-editor/e-contact-editor.c 2007-07-31 10:10:58.000000000 -0400 @@ -46,7 +46,7 @@ #include @@ -415,7 +415,7 @@ #include -@@ -589,15 +589,16 @@ +@@ -589,15 +589,16 @@ static void fill_in_source_field (EContactEditor *editor) { GtkWidget *source_menu; @@ -436,7 +436,7 @@ } static void -@@ -2521,13 +2522,15 @@ +@@ -2521,13 +2522,15 @@ new_target_cb (EBook *new_book, EBookSta editor->load_book = NULL; if (status != E_BOOK_ERROR_OK || new_book == NULL) { @@ -456,7 +456,7 @@ if (new_book) g_object_unref (new_book); -@@ -2551,8 +2554,12 @@ +@@ -2551,8 +2554,12 @@ cancel_load (EContactEditor *editor) } static void @@ -470,7 +470,7 @@ cancel_load (editor); if (e_source_equal (e_book_get_source (editor->target_book), source)) -@@ -3323,8 +3330,8 @@ +@@ -3373,8 +3380,8 @@ e_contact_editor_init (EContactEditor *e g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor); widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories"); g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor); @@ -481,7 +481,7 @@ label = glade_xml_get_widget (e_contact_editor->gui, "where-label"); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok"); -@@ -3775,25 +3782,25 @@ +@@ -3825,26 +3832,26 @@ e_contact_editor_create_web(gchar *name, } GtkWidget * @@ -489,16 +489,16 @@ - gchar *string1, gchar *string2, - gint int1, gint int2); +e_contact_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2); ++ gchar *string1, gchar *string2, ++ gint int1, gint int2); GtkWidget * -e_contact_editor_create_source_option_menu (gchar *name, - gchar *string1, gchar *string2, - gint int1, gint int2) +e_contact_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2) ++ gchar *string1, gchar *string2, ++ gint int1, gint int2) { - GtkWidget *menu; + GtkWidget *combo_box; @@ -511,14 +511,15 @@ - menu = e_source_option_menu_new (source_list); + combo_box = e_source_combo_box_new (source_list); g_object_unref (source_list); + g_object_unref (gconf_client); - gtk_widget_show (menu); - return menu; + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-04-18 06:15:34.000000000 -0400 -+++ evolution-2.11.2/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 ++++ evolution-2.11.6/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-07-31 10:12:50.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -528,7 +529,7 @@ #include #include #include "e-contact-editor.h" -@@ -267,8 +267,12 @@ +@@ -269,8 +269,12 @@ clicked_cb (GtkWidget *w, gint button, g } static void @@ -542,10 +543,10 @@ if (qa->book) { g_object_unref (qa->book); qa->book = NULL; -@@ -316,16 +320,20 @@ - +@@ -319,16 +323,20 @@ build_quick_add_dialog (QuickAdd *qa) gconf_client = gconf_client_get_default (); source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); + g_object_unref (gconf_client); - qa->option_menu = e_source_option_menu_new (source_list); + qa->option_menu = e_source_combo_box_new (source_list); book = e_book_new_default_addressbook (NULL); @@ -567,8 +568,8 @@ g_object_unref (source_list); ---- evolution-2.11.2/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-04-18 06:18:36.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/dialogs/memo-page.glade 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-01-03 10:27:56.000000000 -0500 ++++ evolution-2.11.6/calendar/gui/dialogs/memo-page.glade 2007-07-31 10:01:40.000000000 -0400 @@ -141,7 +141,7 @@ @@ -578,9 +579,9 @@ 0 0 Tue, 13 Jan 2004 22:00:00 GMT ---- evolution-2.11.2/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-04-18 06:18:36.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/dialogs/event-page.glade 2007-05-18 15:48:37.000000000 -0400 -@@ -774,7 +774,7 @@ +--- evolution-2.11.6/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 ++++ evolution-2.11.6/calendar/gui/dialogs/event-page.glade 2007-07-31 10:01:40.000000000 -0400 +@@ -775,7 +775,7 @@ True @@ -589,8 +590,8 @@ 0 0 Wed, 17 Dec 2003 18:20:26 GMT ---- evolution-2.11.2/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-05-09 00:14:46.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/dialogs/task-page.glade 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 ++++ evolution-2.11.6/calendar/gui/dialogs/task-page.glade 2007-07-31 10:01:40.000000000 -0400 @@ -618,7 +618,7 @@ 24 @@ -600,8 +601,8 @@ 0 0 Thu, 18 Dec 2003 01:58:48 GMT ---- evolution-2.11.2/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-04-20 00:28:26.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/dialogs/memo-page.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 ++++ evolution-2.11.6/calendar/gui/dialogs/memo-page.c 2007-07-31 10:14:31.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -611,7 +612,7 @@ #include #include #include -@@ -339,7 +339,6 @@ +@@ -339,7 +339,6 @@ memo_page_fill_widgets (CompEditorPage * ECalComponentDateTime d; GSList *l; const char *categories; @@ -619,7 +620,7 @@ mpage = MEMO_PAGE (page); priv = mpage->priv; -@@ -432,8 +431,9 @@ +@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage * } /* Source */ @@ -631,7 +632,7 @@ priv->updating = FALSE; -@@ -842,13 +842,12 @@ +@@ -840,13 +840,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -649,7 +650,7 @@ if (!priv->updating) { ECal *client; -@@ -860,8 +859,9 @@ +@@ -858,8 +857,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -661,7 +662,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -971,7 +971,7 @@ +@@ -969,7 +969,7 @@ init_widgets (MemoPage *mpage) G_CALLBACK (categories_clicked_cb), mpage); /* Source selector */ @@ -670,7 +671,7 @@ G_CALLBACK (source_changed_cb), mpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1165,21 +1165,22 @@ +@@ -1163,22 +1163,23 @@ memo_page_create_date_edit (void) return dedit; } @@ -694,14 +695,15 @@ - menu = e_source_option_menu_new (source_list); + combo_box = e_source_combo_box_new (source_list); g_object_unref (source_list); + g_object_unref (gconf_client); - gtk_widget_show (menu); - return menu; + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.11.2/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-05-09 00:14:46.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/dialogs/event-page.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 ++++ evolution-2.11.6/calendar/gui/dialogs/event-page.c 2007-07-31 10:38:26.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -711,7 +713,7 @@ #include "common/authentication.h" #include "e-util/e-categories-config.h" #include "e-util/e-dialog-widgets.h" -@@ -969,7 +969,6 @@ +@@ -978,7 +978,6 @@ event_page_fill_widgets (CompEditorPage ECalComponentDateTime start_date, end_date; const char *location, *uid = NULL; const char *categories; @@ -719,7 +721,7 @@ GSList *l; gboolean validated = TRUE; -@@ -1165,8 +1164,9 @@ +@@ -1174,8 +1173,9 @@ event_page_fill_widgets (CompEditorPage e_dialog_editable_set (priv->categories, categories); /* Source */ @@ -731,7 +733,7 @@ e_cal_component_get_uid (comp, &uid); if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) -@@ -2566,7 +2566,8 @@ +@@ -2577,7 +2577,8 @@ event_page_sendoptions_clicked_cb (Event if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); @@ -741,7 +743,7 @@ e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); priv->sod->data->initialized = TRUE; } -@@ -2595,13 +2596,12 @@ +@@ -2606,13 +2607,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -759,7 +761,7 @@ if (!priv->updating) { ECal *client; -@@ -2620,8 +2620,9 @@ +@@ -2631,8 +2631,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -771,7 +773,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -2847,7 +2848,7 @@ +@@ -2860,7 +2861,7 @@ init_widgets (EventPage *epage) G_CALLBACK (categories_clicked_cb), epage); /* Source selector */ @@ -780,7 +782,7 @@ G_CALLBACK (source_changed_cb), epage); /* Alarms */ priv->alarm_list_store = e_alarm_list_new (); -@@ -3148,23 +3149,24 @@ +@@ -3161,24 +3162,25 @@ make_timezone_entry (void) return w; } @@ -804,6 +806,7 @@ - menu = e_source_option_menu_new (source_list); + combo_box = e_source_combo_box_new (source_list); g_object_unref (source_list); + g_object_unref (gconf_client); - gtk_widget_show (menu); - return menu; @@ -812,8 +815,8 @@ } GtkWidget *make_status_icons (void); ---- evolution-2.11.2/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-04-20 00:28:26.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/dialogs/task-page.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 ++++ evolution-2.11.6/calendar/gui/dialogs/task-page.c 2007-07-31 10:39:29.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -823,7 +826,7 @@ #include #include #include "common/authentication.h" -@@ -513,7 +513,6 @@ +@@ -513,7 +513,6 @@ task_page_fill_widgets (CompEditorPage * icalcomponent *icalcomp; const char *categories, *uid; icaltimezone *zone, *default_zone; @@ -831,7 +834,7 @@ tpage = TASK_PAGE (page); priv = tpage->priv; -@@ -657,8 +656,9 @@ +@@ -657,8 +656,9 @@ task_page_fill_widgets (CompEditorPage * e_dialog_editable_set (priv->categories, categories); /* Source */ @@ -843,7 +846,7 @@ if (priv->is_assignment) { ECalComponentOrganizer organizer; -@@ -1615,13 +1615,12 @@ +@@ -1613,13 +1613,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -861,7 +864,7 @@ if (!priv->updating) { ECal *client; -@@ -1640,8 +1639,9 @@ +@@ -1638,8 +1637,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -873,7 +876,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -1653,7 +1653,7 @@ +@@ -1651,7 +1651,7 @@ source_changed_cb (GtkWidget *widget, ES comp_editor_notify_client_changed ( COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), client); @@ -882,7 +885,7 @@ if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment) task_page_show_options (tpage); else -@@ -1677,7 +1677,8 @@ +@@ -1675,7 +1675,8 @@ task_page_sendoptions_clicked_cb (TaskPa if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); priv->sod->data->initialized = TRUE; @@ -892,7 +895,7 @@ e_sendoptions_utils_set_default_data (priv->sod, source, "task"); } -@@ -1732,7 +1733,7 @@ +@@ -1730,7 +1731,7 @@ init_widgets (TaskPage *tpage) G_CALLBACK (categories_clicked_cb), tpage); /* Source selector */ @@ -901,7 +904,7 @@ G_CALLBACK (source_changed_cb), tpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1953,21 +1954,22 @@ +@@ -1951,22 +1952,23 @@ task_page_create_date_edit (void) return dedit; } @@ -925,14 +928,15 @@ - menu = e_source_option_menu_new (source_list); + combo_box = e_source_combo_box_new (source_list); g_object_unref (source_list); + g_object_unref (gconf_client); - gtk_widget_show (menu); - return menu; + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.11.2/calendar/gui/e-itip-control.c.e-source-combo-box 2007-04-20 00:28:27.000000000 -0400 -+++ evolution-2.11.2/calendar/gui/e-itip-control.c 2007-05-18 15:48:37.000000000 -0400 +--- evolution-2.11.6/calendar/gui/e-itip-control.c.e-source-combo-box 2007-07-30 10:19:22.000000000 -0400 ++++ evolution-2.11.6/calendar/gui/e-itip-control.c 2007-07-31 10:01:40.000000000 -0400 @@ -44,7 +44,7 @@ #include #include @@ -942,7 +946,7 @@ #include #include #include -@@ -226,13 +226,13 @@ +@@ -226,13 +226,13 @@ typedef struct { } EItipControlFindData; static void @@ -961,7 +965,7 @@ if (priv->ok) gtk_widget_set_sensitive (priv->ok, FALSE); -@@ -273,7 +273,7 @@ +@@ -273,7 +273,7 @@ find_cal_opened_cb (ECal *ecal, ECalenda cleanup: if (fd->count == 0) { if (fd->show_selector && !priv->current_ecal && priv->vbox) { @@ -970,7 +974,7 @@ char *uid; switch (priv->type) { -@@ -297,17 +297,17 @@ +@@ -297,17 +297,17 @@ find_cal_opened_cb (ECal *ecal, ECalenda if (!source) source = e_source_list_peek_source_any (priv->source_lists[priv->type]); diff --git a/evolution-2.11.3-e-clipped-label.patch b/evolution-2.11.3-e-clipped-label.patch deleted file mode 100644 index 04ddc7d..0000000 --- a/evolution-2.11.3-e-clipped-label.patch +++ /dev/null @@ -1,377 +0,0 @@ ---- evolution-2.11.3/mail/mail-send-recv.c.e-clipped-label 2007-06-06 13:02:07.000000000 -0400 -+++ evolution-2.11.3/mail/mail-send-recv.c 2007-06-14 21:05:16.000000000 -0400 -@@ -43,7 +43,6 @@ - - #include "libedataserver/e-account-list.h" - --#include "misc/e-clipped-label.h" - #include "em-filter-rule.h" - #include "camel/camel-filter-driver.h" - #include "camel/camel-folder.h" -@@ -156,8 +155,8 @@ receive_cancel(GtkButton *button, struct - if (info->state == SEND_ACTIVE) { - camel_operation_cancel(info->cancel); - if (info->status_label) -- e_clipped_label_set_text ( -- E_CLIPPED_LABEL (info->status_label), -+ gtk_label_set_text ( -+ GTK_LABEL (info->status_label), - _("Canceling...")); - info->state = SEND_CANCELLED; - } -@@ -267,8 +266,8 @@ operation_status_timeout(void *data) - GTK_PROGRESS_BAR (info->progress_bar), - info->pc / 100.0); - if (info->what) -- e_clipped_label_set_text ( -- E_CLIPPED_LABEL (info->status_label), -+ gtk_label_set_text ( -+ GTK_LABEL (info->status_label), - info->what); - return TRUE; - } -@@ -496,10 +495,11 @@ build_dialog (EAccountList *accounts, Ca - - cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - -- status_label = e_clipped_label_new ( -+ status_label = gtk_label_new ( - (info->type == SEND_UPDATE) ? -- _("Updating...") : _("Waiting..."), -- PANGO_WEIGHT_NORMAL, 1.0); -+ _("Updating...") : _("Waiting...")); -+ gtk_label_set_ellipsize ( -+ GTK_LABEL (status_label), PANGO_ELLIPSIZE_END); - - /* g_object_set(data->label, "bold", TRUE, NULL); */ - gtk_misc_set_alignment (GTK_MISC (label), 0, .5); -@@ -566,8 +566,9 @@ build_dialog (EAccountList *accounts, Ca - progress_bar = gtk_progress_bar_new (); - cancel_button = gtk_button_new_from_stock (GTK_STOCK_CANCEL); - -- status_label = e_clipped_label_new ( -- _("Waiting..."), PANGO_WEIGHT_NORMAL, 1.0); -+ status_label = gtk_label_new (_("Waiting...")); -+ gtk_label_set_ellipsize ( -+ GTK_LABEL (status_label), PANGO_ELLIPSIZE_END); - - gtk_misc_set_alignment (GTK_MISC (label), 0, .5); - gtk_misc_set_alignment (GTK_MISC (status_label), 0, .5); -@@ -692,8 +693,7 @@ receive_done (char *uri, void *data) - info->state = SEND_COMPLETE; - } - -- e_clipped_label_set_text ( -- E_CLIPPED_LABEL (info->status_label), text); -+ gtk_label_set_text (GTK_LABEL (info->status_label), text); - } - - if (info->cancel_button) ---- evolution-2.11.3/widgets/misc/e-task-bar.c.e-clipped-label 2007-04-18 06:18:34.000000000 -0400 -+++ evolution-2.11.3/widgets/misc/e-task-bar.c 2007-06-14 21:05:16.000000000 -0400 -@@ -26,11 +26,12 @@ - - #include "e-task-bar.h" - --#include "misc/e-clipped-label.h" -+#include -+#include - - struct _ETaskBarPrivate - { -- EClippedLabel *message_label; -+ GtkWidget *message_label; - GtkHBox *hbox; - }; - -@@ -96,11 +97,12 @@ e_task_bar_init (ETaskBar *task_bar) - task_bar->priv = g_new (ETaskBarPrivate, 1); - - gtk_box_set_spacing (GTK_BOX (task_bar), 10); -- -- label = e_clipped_label_new ("", PANGO_WEIGHT_NORMAL, 1.0); -+ -+ label = gtk_label_new (NULL); -+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_box_pack_start (GTK_BOX (task_bar), label, TRUE, TRUE, 0); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); -- task_bar->priv->message_label = E_CLIPPED_LABEL (label); -+ task_bar->priv->message_label = label; - - hbox = gtk_hbox_new (FALSE, 0); - gtk_container_add (GTK_CONTAINER (task_bar), hbox); -@@ -133,9 +135,11 @@ e_task_bar_set_message (ETaskBar *task - const char *message) - { - if (message) { -- gtk_widget_show (GTK_WIDGET (task_bar->priv->message_label)); -- e_clipped_label_set_text (task_bar->priv->message_label, -- message); -+ GtkWidget *label; -+ -+ label = task_bar->priv->message_label; -+ gtk_label_set_text (GTK_LABEL (label), message); -+ gtk_widget_show (label); - } else { - e_task_bar_unset_message (task_bar); - } -@@ -144,7 +148,7 @@ e_task_bar_set_message (ETaskBar *task - void - e_task_bar_unset_message (ETaskBar *task_bar) - { -- gtk_widget_hide (GTK_WIDGET (task_bar->priv->message_label)); -+ gtk_widget_hide (task_bar->priv->message_label); - } - - void ---- evolution-2.11.3/widgets/misc/Makefile.am.e-clipped-label 2007-06-01 03:09:21.000000000 -0400 -+++ evolution-2.11.3/widgets/misc/Makefile.am 2007-06-14 21:05:16.000000000 -0400 -@@ -45,7 +45,6 @@ widgetsinclude_HEADERS = \ - e-cell-percent.h \ - e-cell-renderer-combo.h \ - e-charset-picker.h \ -- e-clipped-label.h \ - e-combo-cell-editable.h \ - e-config-page.h \ - e-combo-button.h \ -@@ -91,7 +90,6 @@ libemiscwidgets_la_SOURCES = \ - e-cell-percent.c \ - e-cell-renderer-combo.c \ - e-charset-picker.c \ -- e-clipped-label.c \ - e-combo-cell-editable.c \ - e-config-page.c \ - e-combo-button.c \ ---- evolution-2.11.3/widgets/misc/e-info-label.c.e-clipped-label 2007-04-18 06:18:34.000000000 -0400 -+++ evolution-2.11.3/widgets/misc/e-info-label.c 2007-06-14 21:05:16.000000000 -0400 -@@ -28,7 +28,6 @@ - - #include "e-info-label.h" - #include --#include "e-clipped-label.h" - - #include - -@@ -142,29 +141,37 @@ e_info_label_new(const char *icon) - void - e_info_label_set_info(EInfoLabel *el, const char *location, const char *info) - { -- char *tmp; -+ gchar *markup; - - if (el->location == NULL) { -- el->location = e_clipped_label_new(location, PANGO_WEIGHT_BOLD, 1.0); -- el->info = gtk_label_new(NULL); -+ el->location = gtk_label_new (NULL); -+ el->info = gtk_label_new (NULL); - -- gtk_misc_set_alignment((GtkMisc *)el->location, 0.0, 0.0); -- gtk_misc_set_padding((GtkMisc *)el->location, 0, 6); -- gtk_misc_set_alignment((GtkMisc *)el->info, 0.0, 1.0); -- gtk_misc_set_padding((GtkMisc *)el->info, 0, 6); -- -- gtk_widget_show(el->location); -- gtk_widget_show(el->info); -- -- gtk_box_pack_start((GtkBox *)el, (GtkWidget *)el->location, TRUE, TRUE, 0); -- gtk_box_pack_end((GtkBox *)el, (GtkWidget *)el->info, FALSE, TRUE, 6); -- gtk_widget_set_state((GtkWidget *)el, GTK_STATE_ACTIVE); -- } else { -- e_clipped_label_set_text((EClippedLabel *)el->location, location); -+ gtk_label_set_ellipsize ( -+ GTK_LABEL (el->location), PANGO_ELLIPSIZE_END); -+ gtk_misc_set_alignment (GTK_MISC (el->location), 0.0, 0.0); -+ gtk_misc_set_padding (GTK_MISC (el->location), 0, 6); -+ gtk_misc_set_alignment (GTK_MISC (el->info), 0.0, 1.0); -+ gtk_misc_set_padding (GTK_MISC (el->info), 0, 6); -+ -+ gtk_widget_show (el->location); -+ gtk_widget_show (el->info); -+ -+ gtk_box_pack_start ( -+ GTK_BOX (el), GTK_WIDGET (el->location), -+ TRUE, TRUE, 0); -+ gtk_box_pack_end ( -+ GTK_BOX (el), GTK_WIDGET (el->info), -+ FALSE, TRUE, 6); -+ gtk_widget_set_state (GTK_WIDGET (el), GTK_STATE_ACTIVE); - } - -- tmp = g_strdup_printf("%s", info); -- gtk_label_set_markup((GtkLabel *)el->info, tmp); -- g_free(tmp); -+ markup = g_markup_printf_escaped ("%s", location); -+ gtk_label_set_markup (GTK_LABEL (el->location), markup); -+ g_free (markup); -+ -+ markup = g_markup_printf_escaped ("%s", info); -+ gtk_label_set_markup (GTK_LABEL (el->info), markup); -+ g_free (markup); - } - ---- evolution-2.11.3/widgets/misc/e-multi-config-dialog.c.e-clipped-label 2007-06-03 11:08:14.000000000 -0400 -+++ evolution-2.11.3/widgets/misc/e-multi-config-dialog.c 2007-06-14 21:05:16.000000000 -0400 -@@ -26,8 +26,6 @@ - - #include "e-multi-config-dialog.h" - --#include "e-clipped-label.h" -- - #include
- #include
- #include
-@@ -87,18 +85,6 @@ create_page_container (const char *descr - - vbox = gtk_vbox_new (FALSE, 0); - --#if 0 -- label = e_clipped_label_new (description); -- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); -- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0); -- -- separator = gtk_hseparator_new (); -- gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, TRUE, 0); -- -- gtk_widget_show (label); -- gtk_widget_show (separator); --#endif -- - gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE, 0); - - gtk_widget_show (widget); ---- evolution-2.11.3/shell/e-shell-folder-title-bar.c.e-clipped-label 2007-04-18 06:15:47.000000000 -0400 -+++ evolution-2.11.3/shell/e-shell-folder-title-bar.c 2007-06-14 21:05:16.000000000 -0400 -@@ -34,7 +34,6 @@ - #include - #include - --#include "misc/e-clipped-label.h" - #include "e-shell-constants.h" - #include "e-shell-marshal.h" - #include "e-shell-folder-title-bar.h" -@@ -117,13 +116,15 @@ new_empty_image_widget (void) - - /* Utility functions. */ - --static int --get_max_clipped_label_width (EClippedLabel *clipped_label) -+static gint -+get_max_label_width (GtkWidget *label) - { -- int width; -+ PangoLayout *layout; -+ gint width; - -- pango_layout_get_pixel_size (clipped_label->layout, &width, NULL); -- width += 2 * GTK_MISC (clipped_label)->xpad; -+ layout = gtk_label_get_layout (GTK_LABEL (label)); -+ pango_layout_get_pixel_size (layout, &width, NULL); -+ width += 2 * GTK_MISC (label)->xpad; - - return width; - } -@@ -152,7 +153,7 @@ size_allocate_title_button (EShellFolder - child_allocation.height = allocation->height - 2 * border_width; - - child_allocation.width = child_requisition.width; -- child_allocation.width += get_max_clipped_label_width (E_CLIPPED_LABEL (priv->title_button_label)); -+ child_allocation.width += get_max_label_width (priv->title_button_label); - - child_allocation.width = MIN (child_allocation.width, *available_width_inout); - -@@ -218,7 +219,7 @@ size_allocate_label (EShellFolderTitleBa - child_allocation.y = allocation->y + border_width; - child_allocation.height = allocation->height - 2 * border_width; - -- child_allocation.width = MIN (get_max_clipped_label_width (E_CLIPPED_LABEL (priv->title_label)), -+ child_allocation.width = MIN (get_max_label_width (priv->title_label), - *available_width_inout); - - gtk_widget_size_allocate (priv->title_label, & child_allocation); -@@ -478,6 +479,7 @@ e_shell_folder_title_bar_construct (EShe - { - EShellFolderTitleBarPrivate *priv; - GtkWidget *title_button_hbox; -+ GtkWidget *label; - - g_return_if_fail (folder_title_bar != NULL); - g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar)); -@@ -489,18 +491,24 @@ e_shell_folder_title_bar_construct (EShe - gtk_misc_set_padding (GTK_MISC (priv->title_icon), 2, 0); - gtk_widget_show (priv->title_icon); - -- priv->title_label = e_clipped_label_new ("", PANGO_WEIGHT_BOLD, 1.2); -- gtk_misc_set_padding (GTK_MISC (priv->title_label), 0, 0); -- gtk_misc_set_alignment (GTK_MISC (priv->title_label), 0.0, 0.5); -- -- priv->title_button_label = e_clipped_label_new ("", PANGO_WEIGHT_BOLD, 1.2); -- gtk_misc_set_padding (GTK_MISC (priv->title_button_label), 2, 0); -- gtk_misc_set_alignment (GTK_MISC (priv->title_button_label), 0.0, 0.5); -- gtk_widget_show (priv->title_button_label); -- -- priv->folder_bar_label = e_clipped_label_new ("", PANGO_WEIGHT_NORMAL, 1.0); -- gtk_misc_set_alignment (GTK_MISC (priv->folder_bar_label), 1.0, 0.5); -- gtk_widget_show (priv->folder_bar_label); -+ label = gtk_label_new (""); -+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); -+ gtk_misc_set_padding (GTK_MISC (label), 0, 0); -+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -+ priv->title_label = label; -+ -+ label = gtk_label_new (""); -+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); -+ gtk_misc_set_padding (GTK_MISC (label), 2, 0); -+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); -+ gtk_widget_show (label); -+ priv->title_button_label = label; -+ -+ label = gtk_label_new (""); -+ gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); -+ gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5); -+ gtk_widget_show (label); -+ priv->folder_bar_label = label; - - priv->title_button_icon = new_empty_image_widget (); - gtk_widget_show (priv->title_button_icon); -@@ -574,21 +582,21 @@ e_shell_folder_title_bar_set_title (EShe - const char *title) - { - EShellFolderTitleBarPrivate *priv; -+ gchar *markup; - - g_return_if_fail (folder_title_bar != NULL); - g_return_if_fail (E_IS_SHELL_FOLDER_TITLE_BAR (folder_title_bar)); - - priv = folder_title_bar->priv; - -- if (title == NULL) { -- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_button_label), _("(Untitled)")); -- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_label), _("(Untitled)")); -- } else { -- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_button_label), title); -- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->title_label), title); -- } -+ if (title == NULL) -+ title = _("Untitled"); -+ -+ markup = g_markup_printf_escaped ("%s", title); -+ gtk_label_set_markup (GTK_LABEL (priv->title_button_label), markup); -+ gtk_label_set_markup (GTK_LABEL (priv->title_label), markup); -+ g_free (markup); - -- /* FIXME: There seems to be a bug in EClippedLabel, this is just a workaround. */ - gtk_widget_queue_resize (GTK_WIDGET (folder_title_bar)); - } - -@@ -611,10 +619,7 @@ e_shell_folder_title_bar_set_folder_bar_ - - priv = folder_title_bar->priv; - -- if (text == NULL) -- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->folder_bar_label), ""); -- else -- e_clipped_label_set_text (E_CLIPPED_LABEL (priv->folder_bar_label), text); -+ gtk_label_set_text (GTK_LABEL (priv->folder_bar_label), text); - - /* FIXME: Might want to set the styles somewhere in here too, - black text on grey background isn't the best combination */ diff --git a/evolution-2.11.5-implicit-function-declarations.patch b/evolution-2.11.5-implicit-function-declarations.patch deleted file mode 100644 index e9c74a6..0000000 --- a/evolution-2.11.5-implicit-function-declarations.patch +++ /dev/null @@ -1,38 +0,0 @@ ---- 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.11.5-version-checks.patch b/evolution-2.11.5-version-checks.patch deleted file mode 100644 index 3411c81..0000000 --- a/evolution-2.11.5-version-checks.patch +++ /dev/null @@ -1,347 +0,0 @@ ---- evolution-2.11.5/a11y/Makefile.am.version-checks 2007-07-05 02:11:31.000000000 -0400 -+++ evolution-2.11.5/a11y/Makefile.am 2007-07-27 09:45:51.000000000 -0400 -@@ -31,4 +31,4 @@ libevolution_a11y_la_LIBADD = \ - e-text/libgal-a11y-etext.la \ - e-table/libgal-a11y-etable.la \ - $(top_builddir)/e-util/libeutil.la \ -- $(EXTRA_GNOME_LIBS) -+ $(GNOME_PLATFORM_LIBS) ---- evolution-2.11.5/a11y/e-text/Makefile.am.version-checks 2007-07-05 02:11:30.000000000 -0400 -+++ evolution-2.11.5/a11y/e-text/Makefile.am 2007-07-27 09:45:51.000000000 -0400 -@@ -1,7 +1,7 @@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -- $(EXTRA_GNOME_CFLAGS) \ -+ $(GNOME_PLATFORM_CFLAGS) \ - -DG_LOG_DOMAIN=\"e-text\" - - noinst_LTLIBRARIES = libgal-a11y-etext.la ---- evolution-2.11.5/a11y/e-table/Makefile.am.version-checks 2007-07-05 02:11:31.000000000 -0400 -+++ evolution-2.11.5/a11y/e-table/Makefile.am 2007-07-27 09:45:51.000000000 -0400 -@@ -1,7 +1,7 @@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -- $(EXTRA_GNOME_CFLAGS) \ -+ $(GNOME_PLATFORM_CFLAGS) \ - -DG_LOG_DOMAIN=\"e-table\" - - noinst_LTLIBRARIES = libgal-a11y-etable.la ---- evolution-2.11.5/configure.in.version-checks 2007-07-27 09:45:32.000000000 -0400 -+++ evolution-2.11.5/configure.in 2007-07-27 09:45:51.000000000 -0400 -@@ -4,6 +4,34 @@ AC_PREREQ(2.52) - AC_INIT(evolution, 2.11.5, http://bugzilla.gnome.org/enter_bug.cgi?product=Evolution) - AC_CONFIG_SRCDIR(README) - -+# Some requirements have versioned package names -+# XXX In the spirit of getting rid of versioned -+# files, can we drop these suffixes? -+EDS_PACKAGE=1.2 -+GTKHTML_PACKAGE=3.14 -+ -+# Required Packages -+m4_define([gtk_minimum_version], [2.10.0]) -+m4_define([eds_minimum_version], [1.9.4]) -+m4_define([gnome_icon_theme_minimum_version], [1.2.0]) -+m4_define([gnome_vfs_minimum_version], [2.4.0]) -+m4_define([libbonoboui_minimum_version], [2.4.2]) -+m4_define([libgtkhtml_minimum_version], [3.14.0]) -+m4_define([gconf_minimum_version], [2.0.0]) # XXX Just a Guess -+m4_define([libglade_minimum_version], [2.0.0]) # XXX Just a Guess -+m4_define([libgnomecanvas_minimum_version], [2.0.0]) # XXX Just a Guess -+m4_define([libgnomeui_minimum_version], [2.0.0]) # XXX Just a Guess -+m4_define([libxml_minimum_version], [2.0.0]) # XXX Just a Guess -+ -+# Optional Packages -+# -+# FIXME Minimum versions for dbus-glib-1 and libnm_glib ? -+# FIXME Move audio-inline plugin from gstreamer-0.8 to 0.10 ? -+# -+m4_define([dbus_minimum_version], [1.0.0]) -+m4_define([hal_minimum_version], [0.5.4]) -+m4_define([libnotify_minimum_version], [0.3.0]) -+m4_define([gnome_pilot_minimum_version], [2.0.0]) # XXX Just a Guess - - # GNOME Documentation - GNOME_DOC_INIT -@@ -133,6 +161,27 @@ AM_CONDITIONAL(OS_WIN32, [test $os_win32 - AC_SUBST(NO_UNDEFINED) - AC_SUBST(SOEXT) - -+# Check for base dependencies early. -+PKG_CHECK_MODULES(GNOME_PLATFORM, -+ [gtk+-2.0 >= gtk_minimum_version -+ gconf-2.0 >= gconf_minimum_version -+ gnome-vfs-2.0 >= gnome_vfs_minimum_version -+ libbonoboui-2.0 >= libbonoboui_minimum_version -+ libglade-2.0 >= libglade_minimum_version -+ libgnomecanvas-2.0 >= libgnomecanvas_minimum_version -+ libgnomeui-2.0 >= libgnomeui_minimum_version -+ libxml-2.0 >= libxml_minimum_version]) -+AC_SUBST(GNOME_PLATFORM_CFLAGS) -+AC_SUBST(GNOME_PLATFORM_LIBS) -+ -+PKG_CHECK_MODULES(EVOLUTION_DATA_SERVER, -+ [libebook-$EDS_PACKAGE >= eds_minimum_version -+ libecal-$EDS_PACKAGE >= eds_minimum_version -+ libedataserver-$EDS_PACKAGE >= eds_minimum_version -+ libedataserverui-$EDS_PACKAGE >= eds_minimum_version -+ libegroupwise-$EDS_PACKAGE >= eds_minimum_version -+ libexchange-storage-$EDS_PACKAGE >= eds_minimum_version]) -+ - dnl ****************************** - dnl iconv checking - dnl ****************************** -@@ -409,7 +458,7 @@ AC_CHECK_FUNCS(statfs) - dnl ************************************************** - dnl * Gnome Icon Theme - dnl ************************************************** --PKG_CHECK_MODULES(GIT, gnome-icon-theme >= 1.2.0) -+PKG_CHECK_MODULES(GIT, gnome-icon-theme >= gnome_icon_theme_minimum_version) - - dnl ************************************************** - dnl * Accessibility support -@@ -587,7 +636,8 @@ AC_CHECK_FUNCS(regexec,,[AC_CHECK_LIB(re - [AC_MSG_ERROR([No regex library found])])]) - AC_SUBST(REGEX_LIBS) - --PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14) -+# XXX Drop the version from the package name? -+PKG_CHECK_MODULES(GTKHTML, libgtkhtml-3.14 >= libgtkhtml_minimum_version) - AC_SUBST(GTKHTML_CFLAGS) - AC_SUBST(GTKHTML_LIBS) - GTKHTML_DATADIR=`$PKG_CONFIG --variable gtkhtml_datadir libgtkhtml-3.14` -@@ -604,7 +654,7 @@ dnl ****************************** - AC_ARG_ENABLE(pilot-conduits, - [ --enable-pilot-conduits=[no/yes] Enable support for building pilot conduits.],,enable_pilot_conduits=no) - if test "x$enable_pilot_conduits" = "xyes"; then -- PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0) -+ PKG_CHECK_MODULES(GNOME_PILOT, gnome-pilot-2.0 >= gnome_pilot_minimum_version) - - CFLAGS_save="$CFLAGS" - CFLAGS="$CFLAGS $GNOME_PILOT_CFLAGS" -@@ -1217,27 +1267,12 @@ fi - - dnl --- Required version numbers - --GTKHTML_REQUIRED=3.14.0 --GTKHTML_PACKAGE=3.14 --EDS_REQUIRED=1.9.4 --EDS_PACKAGE=1.2 --BONOBOUI_REQUIRED=2.4.2 --GNOME_VFS_REQUIRED=2.4 -- --AC_SUBST(GTKHTML_REQUIRED) --AC_SUBST(GTKHTML_PACKAGE) --AC_SUBST(EDS_REQUIRED) --AC_SUBST(EDS_PACKAGE) -+BONOBOUI_REQUIRED=libbonoboui_minimum_version - AC_SUBST(BONOBOUI_REQUIRED) --AC_SUBST(GNOME_VFS_REQUIRED) - - dnl --- Flags to get all the GNOME stuff - --FULL_GNOME_DEPS="glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0" -- --EVO_SET_COMPILE_FLAGS(GNOME_FULL, $FULL_GNOME_DEPS) --AC_SUBST(GNOME_FULL_CFLAGS) --AC_SUBST(GNOME_FULL_LIBS) -+FULL_GNOME_DEPS="libbonoboui-2.0 gnome-vfs-2.0 libgnomeui-2.0 libglade-2.0" - - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS `$PKG_CONFIG --cflags-only-I libgnomeui-2.0`" -@@ -1245,11 +1280,7 @@ AC_CHECK_HEADERS(libgnomeui/gnome-icon-l - AC_CHECK_HEADERS(libgnomeui/gnome-thumbnail.h) - CPPFLAGS="$CPPFLAGS_save" - --PKG_CHECK_MODULES(EXTRA_GNOME, $FULL_GNOME_DEPS) --AC_SUBST(EXTRA_GNOME_LIBS) --AC_SUBST(EXTRA_GNOME_CFLAGS) -- --PKG_CHECK_MODULES(HAL, hal >= 0.5.4, HAVE_HAL="yes", HAVE_HAL="no") -+PKG_CHECK_MODULES(HAL, hal >= hal_minimum_version, HAVE_HAL="yes", HAVE_HAL="no") - if test "x$HAVE_HAL" = "xyes"; then - AC_DEFINE(HAVE_HAL, 1, [hal available]) - HAL_REQUIREMENT="hal" -@@ -1279,7 +1310,7 @@ EVO_SET_COMPILE_FLAGS(CAMEL, camel-provi - AC_SUBST(CAMEL_CFLAGS) - AC_SUBST(CAMEL_LIBS) - --EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED libegroupwise-$EDS_PACKAGE >= $EDS_REQUIRED) -+EVO_SET_COMPILE_FLAGS(CAMEL_GROUPWISE, camel-provider-$EDS_PACKAGE libedataserver-$EDS_PACKAGE libegroupwise-$EDS_PACKAGE) - AC_SUBST(CAMEL_GROUPWISE_CFLAGS) - AC_SUBST(CAMEL_GROUPWISE_LIBS) - -@@ -1292,33 +1323,33 @@ else - fi - fi - --EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED libglade-2.0 gtk+-2.0 glib-2.0 gobject-2.0 gthread-2.0, -+EVO_SET_COMPILE_FLAGS(CERT_UI, libedataserverui-$EDS_PACKAGE libglade-2.0 gthread-2.0, - $MANUAL_NSS_CFLAGS $MOZILLA_NSS_CFLAGS, - $MOZILLA_L_DIR $MANUAL_NSS_LIBS $MOZILLA_NSS_LIBS) - AC_SUBST(CERT_UI_CFLAGS) - AC_SUBST(CERT_UI_LIBS) - --EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED) -+EVO_SET_COMPILE_FLAGS(E_NAME, libgnomeui-2.0 libbonoboui-2.0) - AC_SUBST(E_NAME_CFLAGS) - AC_SUBST(E_NAME_LIBS) - --EVO_SET_COMPILE_FLAGS(E_UTIL, gthread-2.0 gconf-2.0 libxml-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) -+EVO_SET_COMPILE_FLAGS(E_UTIL, libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 libedataserver-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE $mozilla_nspr $mono_package, $THREADS_CFLAGS $MANUAL_NSPR_CFLAGS, $THREADS_LIBS $MANUAL_NSPR_LIBS) - AC_SUBST(E_UTIL_CFLAGS) - AC_SUBST(E_UTIL_LIBS) - --EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE >= $EDS_REQUIRED, $GNOME_FULL_CFLAGS, $GNOME_FULL_LIBS) -+EVO_SET_COMPILE_FLAGS(TZDIALOG, libecal-$EDS_PACKAGE, $GNOME_PLATFORM_CFLAGS, $GNOME_PLATFORM_LIBS) - AC_SUBST(TZDIALOG_CFLAGS) - AC_SUBST(TZDIALOG_LIBS) - --EVO_SET_COMPILE_FLAGS(E_WIDGETS, glib-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED gnome-vfs-2.0 gnome-vfs-module-2.0 libgnomeui-2.0 libglade-2.0 libgnomecanvas-2.0 libxml-2.0 gconf-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED) -+EVO_SET_COMPILE_FLAGS(E_WIDGETS, libbonoboui-2.0 gnome-vfs-module-2.0 libgnomeui-2.0 libglade-2.0 libedataserverui-$EDS_PACKAGE libedataserver-$EDS_PACKAGE) - AC_SUBST(E_WIDGETS_CFLAGS) - AC_SUBST(E_WIDGETS_LIBS) - --EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE gconf-2.0 libglade-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libgnomeui-2.0 libebook-$EDS_PACKAGE >= $EDS_REQUIRED) -+EVO_SET_COMPILE_FLAGS(IMPORTERS, libedataserverui-$EDS_PACKAGE camel-provider-$EDS_PACKAGE camel-$EDS_PACKAGE libglade-2.0 libbonoboui-2.0 libgnomeui-2.0 libebook-$EDS_PACKAGE) - AC_SUBST(IMPORTERS_CFLAGS) - AC_SUBST(IMPORTERS_LIBS) - --EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnome-2.0 libgnomeui-2.0 libglade-2.0 libxml-2.0 gconf-2.0 libedataserver-$EDS_PACKAGE >= $EDS_REQUIRED) -+EVO_SET_COMPILE_FLAGS(LIBFILTER, libgnomeui-2.0 libglade-2.0 libedataserver-$EDS_PACKAGE) - AC_SUBST(LIBFILTER_CFLAGS) - AC_SUBST(LIBFILTER_LIBS) - -@@ -1345,14 +1376,14 @@ AM_CONDITIONAL(NM_SUPPORT_GLIB, test x$N - AM_CONDITIONAL(NM_SUPPORT, test x$NM_SUPPORT = xyes) - - --EVO_SET_COMPILE_FLAGS(SHELL, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED $NM_SUPPORT_PACKAGES) -+EVO_SET_COMPILE_FLAGS(SHELL, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE $NM_SUPPORT_PACKAGES) - - AC_SUBST(SHELL_CFLAGS) - AC_SUBST(SHELL_LIBS) - - dnl --- evolution-addressbook flags - --EVOLUTION_ADDRESSBOOK_DEPS="gconf-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 libgnomeui-2.0 libgnome-2.0 libgnomecanvas-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED camel-$EDS_PACKAGE" -+EVOLUTION_ADDRESSBOOK_DEPS="libbonoboui-2.0 libglade-2.0 libgnomeui-2.0 gnome-vfs-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE camel-$EDS_PACKAGE" - - EVO_SET_COMPILE_FLAGS(EVOLUTION_ADDRESSBOOK, $EVOLUTION_ADDRESSBOOK_DEPS) - AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS) -@@ -1366,7 +1397,7 @@ fi - - LIBNOTIFY_CFLAGS= - LIBNOTIFY_LIBS= --PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= 0.3.0, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no") -+PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= libnotify_minimum_version, HAVE_LIBNOTIFY="yes", HAVE_LIBNOTIFY="no") - if test "x$HAVE_LIBNOTIFY" = "xyes"; then - AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available]) - libnotify="libnotify" -@@ -1390,7 +1421,7 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, $LIBSOUP - AC_SUBST(LIBSOUP_CFLAGS) - AC_SUBST(LIBSOUP_LIBS) - --EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libebook-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED $HAL_REQUIREMENT $libnotify) -+EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE libebook-$EDS_PACKAGE libecal-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE $HAL_REQUIREMENT $libnotify) - AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) - AC_SUBST(EVOLUTION_CALENDAR_LIBS) - -@@ -1402,7 +1433,7 @@ fi - - dnl --- evolution-mail flags - --EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnome-2.0 libgnomeui-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE >= $GTKHTML_REQUIRED libxml-2.0 bonobo-activation-2.0 gthread-2.0 gconf-2.0 $mozilla_nss libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE >= $EDS_REQUIRED) -+EVO_SET_COMPILE_FLAGS(EVOLUTION_MAIL, camel-provider-$EDS_PACKAGE libgnomeui-2.0 libbonoboui-2.0 libglade-2.0 gnome-vfs-module-2.0 libgtkhtml-$GTKHTML_PACKAGE bonobo-activation-2.0 $mozilla_nss libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE) - AC_SUBST(EVOLUTION_MAIL_CFLAGS) - AC_SUBST(EVOLUTION_MAIL_LIBS) - -@@ -1425,7 +1456,7 @@ fi - - dnl --- evolution-test flags - --EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, libgnome-2.0 libgnomeui-2.0 libbonobo-2.0 libbonoboui-2.0 >= $BONOBOUI_REQUIRED) -+EVO_SET_COMPILE_FLAGS(EVOLUTION_TEST, libgnomeui-2.0 libbonoboui-2.0) - AC_SUBST(EVOLUTION_TEST_CFLAGS) - AC_SUBST(EVOLUTION_TEST_LIBS) - -@@ -1644,7 +1675,7 @@ if echo ${plugins_enabled} | grep "excha - dnl ************************************************** - dnl * Exchange Operations plugin - dnl ************************************************** -- EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 >= $BONOBOUI_REQUIRED libglade-2.0 gthread-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE >= $EDS_REQUIRED libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE >= $EDS_REQUIRED libecal-$EDS_PACKAGE) -+ EVO_SET_COMPILE_FLAGS(CAMEL_EXCHANGE, libbonoboui-2.0 libglade-2.0 gconf-2.0 camel-provider-$EDS_PACKAGE libebook-$EDS_PACKAGE libedataserverui-$EDS_PACKAGE libexchange-storage-$EDS_PACKAGE libecal-$EDS_PACKAGE) - AC_SUBST(CAMEL_EXCHANGE_CFLAGS) - AC_SUBST(CAMEL_EXCHANGE_LIBS) - else ---- evolution-2.11.5/widgets/misc/Makefile.am.version-checks 2007-07-05 02:11:06.000000000 -0400 -+++ evolution-2.11.5/widgets/misc/Makefile.am 2007-07-27 09:45:51.000000000 -0400 -@@ -10,7 +10,7 @@ INCLUDES = \ - -DEVOLUTION_GLADEDIR=\""$(gladedir)"\" \ - -DG_LOG_DOMAIN=__FILE__ \ - $(EVOLUTION_MAIL_CFLAGS) \ -- $(EXTRA_GNOME_CFLAGS) \ -+ $(GNOME_PLATFORM_CFLAGS) \ - $(ICONV_CFLAGS) - - -@@ -133,7 +133,7 @@ libemiscwidgets_la_LIBADD = $(top_buildd - $(top_builddir)/a11y/widgets/libevolution-widgets-a11y.la \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(CAMEL_LIBS) \ -- $(EXTRA_GNOME_LIBS) \ -+ $(GNOME_PLATFORM_LIBS) \ - $(ICONV_LIBS) - - libefilterbar_la_SOURCES = \ ---- evolution-2.11.5/widgets/table/Makefile.am.version-checks 2007-07-05 02:11:01.000000000 -0400 -+++ evolution-2.11.5/widgets/table/Makefile.am 2007-07-27 09:45:51.000000000 -0400 -@@ -13,7 +13,7 @@ INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ - $(E_WIDGETS_CFLAGS) \ -- $(EXTRA_GNOME_CFLAGS) \ -+ $(GNOME_PLATFORM_CFLAGS) \ - -DEVOLUTION_GLADEDIR=\"$(gladedir)\" \ - -DG_LOG_DOMAIN=\"e-table\" - -@@ -155,7 +155,7 @@ libetable_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(E_WIDGETS_LIBS) \ -- $(EXTRA_GNOME_LIBS) -+ $(GNOME_PLATFORM_LIBS) - - icons = \ - add-col.xpm \ ---- evolution-2.11.5/widgets/text/Makefile.am.version-checks 2007-07-05 02:10:57.000000000 -0400 -+++ evolution-2.11.5/widgets/text/Makefile.am 2007-07-27 09:45:51.000000000 -0400 -@@ -5,7 +5,7 @@ endif - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/widgets \ -- $(EXTRA_GNOME_CFLAGS) \ -+ $(GNOME_PLATFORM_CFLAGS) \ - -DG_LOG_DOMAIN=\"e-text\" - - -@@ -44,5 +44,5 @@ libetext_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/a11y/libevolution-a11y.la \ - $(top_builddir)/widgets/table/libetable.la \ -- $(EXTRA_GNOME_LIBS) \ -+ $(GNOME_PLATFORM_LIBS) \ - $(REGEX_LIBS) ---- evolution-2.11.5/tools/Makefile.am.version-checks 2007-07-05 02:06:57.000000000 -0400 -+++ evolution-2.11.5/tools/Makefile.am 2007-07-27 09:45:50.000000000 -0400 -@@ -16,7 +16,7 @@ INCLUDES = \ - -DSYSCONFDIR=\""$(sysconfdir)"\" \ - -DDATADIR=\""$(datadir)"\" \ - -DLIBDIR=\""$(libdir)"\" \ -- $(GNOME_FULL_CFLAGS) -+ $(GNOME_PLATFORM_CFLAGS) - - EXTRA_DIST = verify-evolution-install.sh - diff --git a/evolution.spec b/evolution.spec index 8854d8a..d2eb615 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.11.5 -Release: 3%{?dist} +Version: 2.11.6.1 +Release: 1%{?dist} License: GPL Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -131,12 +131,6 @@ 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 - -# GNOME bug #380534 -Patch36: evolution-2.11.5-version-checks.patch - ## Dependencies ### Requires(post): GConf2 @@ -275,8 +269,6 @@ 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 -%patch36 -p1 -b .version-checks mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -617,6 +609,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-folder-permissions.xml %{evo_plugin_dir}/org-gnome-folder-subscription.xml +%{evo_plugin_dir}/org-gnome-face.eplug +%{evo_plugin_dir}/liborg-gnome-face.so +%{evo_plugin_dir}/org-gnome-face-ui.xml + %{evo_plugin_dir}/org-gnome-groupwise-features.eplug %{evo_plugin_dir}/liborg-gnome-groupwise-features.so %{evo_plugin_dir}/org-gnome-compose-send-options.xml @@ -716,6 +712,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Aug 01 2007 Matthew Barnes - 2.11.6.1-1.fc8 +- Update to 2.11.6.1 + +* Tue Jul 31 2007 Matthew Barnes - 2.11.6-1.fc8 +- Update to 2.11.6 +- Remove patch for GNOME bug #380534 (fixed upstream). + * Fri Jul 27 2007 Matthew Barnes - 2.11.5-3.fc8 - Add patch for GNOME bug #380534 (clarify version requirements). diff --git a/sources b/sources index 4e51510..5ecdd52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -132ac3a9847a6588c46bd4db2743d96b evolution-2.11.5.tar.bz2 +b27f011166d16b2484f9f68992c48108 evolution-2.11.6.1.tar.bz2 From cc1656ae6bc8787aceef164b5d552dc72ec6b694 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 8 Aug 2007 05:57:33 +0000 Subject: [PATCH 153/844] update license field --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index d2eb615..475dd12 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.11.6.1 Release: 1%{?dist} -License: GPL +License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite URL: http://www.gnome.org/projects/evolution/ @@ -414,7 +414,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile done -%find_lang evolution-%{evo_major} +%find_lang evolution-%{evo_major} --all-name --with-gnome %post /sbin/ldconfig @@ -464,7 +464,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/redhat-evolution-tasks.desktop # Online help: -%{_datadir}/gnome/help/evolution %{_datadir}/omf/evolution # Icons: @@ -712,6 +711,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Aug 8 2007 Matthias Clasen - 2.11.6.1-2 +- Update the license field +- Use %%find_lang for help files + * Wed Aug 01 2007 Matthew Barnes - 2.11.6.1-1.fc8 - Update to 2.11.6.1 From b4dc82c07ab1446e53e5fba1b155382a27e7c589 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 15 Aug 2007 18:09:49 +0000 Subject: [PATCH 154/844] - Update to 2.11.90 --- .cvsignore | 2 +- evolution-2.10.0-e-source-combo-box.patch | 132 ++++---- evolution-2.8.1-kill-ethread.patch | 362 +++++++++++----------- evolution.spec | 5 +- sources | 2 +- 5 files changed, 256 insertions(+), 247 deletions(-) diff --git a/.cvsignore b/.cvsignore index eb84a4b..bbe5278 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.11.6.1.tar.bz2 +evolution-2.11.90.tar.bz2 diff --git a/evolution-2.10.0-e-source-combo-box.patch b/evolution-2.10.0-e-source-combo-box.patch index 58f1300..ae00034 100644 --- a/evolution-2.10.0-e-source-combo-box.patch +++ b/evolution-2.10.0-e-source-combo-box.patch @@ -1,5 +1,5 @@ ---- evolution-2.11.6/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-04-17 12:44:06.000000000 -0400 -+++ evolution-2.11.6/widgets/misc/e-pilot-settings.c 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-07-05 02:11:06.000000000 -0400 ++++ evolution-2.11.90/widgets/misc/e-pilot-settings.c 2007-08-15 13:42:01.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -40,8 +40,8 @@ } gboolean ---- evolution-2.11.6/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-07-30 10:18:01.000000000 -0400 -+++ evolution-2.11.6/plugins/itip-formatter/itip-formatter.c 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-08-09 02:46:59.000000000 -0400 ++++ evolution-2.11.90/plugins/itip-formatter/itip-formatter.c 2007-08-15 13:42:01.000000000 -0400 @@ -40,7 +40,7 @@ #include #include @@ -51,8 +51,8 @@ #include #include #include ---- evolution-2.11.6/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-07-30 10:18:01.000000000 -0400 -+++ evolution-2.11.6/plugins/itip-formatter/itip-view.c 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-07-28 15:37:56.000000000 -0400 ++++ evolution-2.11.90/plugins/itip-formatter/itip-view.c 2007-08-15 13:42:01.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -177,8 +177,8 @@ } void ---- evolution-2.11.6/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-07-30 10:18:00.000000000 -0400 -+++ evolution-2.11.6/plugins/bbdb/gaimbuddies.c 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400 ++++ evolution-2.11.90/plugins/bbdb/gaimbuddies.c 2007-08-15 13:42:01.000000000 -0400 @@ -44,7 +44,7 @@ #include @@ -188,8 +188,8 @@ #include #include ---- evolution-2.11.6/plugins/bbdb/bbdb.c.e-source-combo-box 2007-07-30 10:18:00.000000000 -0400 -+++ evolution-2.11.6/plugins/bbdb/bbdb.c 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/plugins/bbdb/bbdb.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400 ++++ evolution-2.11.90/plugins/bbdb/bbdb.c 2007-08-15 13:42:01.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -199,7 +199,7 @@ #include #include -@@ -353,7 +353,8 @@ enable_toggled_cb (GtkWidget *widget, gp +@@ -345,7 +345,8 @@ enable_toggled_cb (GtkWidget *widget, gp gtk_widget_set_sensitive (stuff->option_menu, active); if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) { @@ -209,7 +209,7 @@ gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL); } } -@@ -372,7 +373,8 @@ enable_gaim_toggled_cb (GtkWidget *widge +@@ -364,7 +365,8 @@ enable_gaim_toggled_cb (GtkWidget *widge gtk_widget_set_sensitive (stuff->gaim_option_menu, active); if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) { @@ -219,7 +219,7 @@ gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL); } } -@@ -401,31 +403,32 @@ gaim_source_changed_cb (GtkWidget *widge +@@ -393,31 +395,32 @@ gaim_source_changed_cb (GtkWidget *widge static GtkWidget * create_addressbook_option_menu (struct bbdb_stuff *stuff, int type) { @@ -259,8 +259,8 @@ } GtkWidget * ---- evolution-2.11.6/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 -+++ evolution-2.11.6/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-07-05 02:06:54.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-15 13:42:01.000000000 -0400 @@ -158,9 +158,9 @@ @@ -273,8 +273,8 @@ 0 0 Tue, 01 Jun 2004 18:22:38 GMT ---- evolution-2.11.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 -+++ evolution-2.11.6/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-07-05 02:06:54.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-15 13:42:01.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -390,8 +390,8 @@ gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list); gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list); } ---- evolution-2.11.6/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 -+++ evolution-2.11.6/addressbook/gui/contact-editor/contact-editor.glade 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-07-08 22:46:43.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade 2007-08-15 13:42:01.000000000 -0400 @@ -356,9 +356,9 @@ @@ -404,8 +404,8 @@ 0 0 Tue, 13 Apr 2004 20:47:50 GMT ---- evolution-2.11.6/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 -+++ evolution-2.11.6/addressbook/gui/contact-editor/e-contact-editor.c 2007-07-31 10:10:58.000000000 -0400 +--- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-15 13:42:01.000000000 -0400 @@ -46,7 +46,7 @@ #include @@ -436,7 +436,7 @@ } static void -@@ -2521,13 +2522,15 @@ new_target_cb (EBook *new_book, EBookSta +@@ -2527,13 +2528,15 @@ new_target_cb (EBook *new_book, EBookSta editor->load_book = NULL; if (status != E_BOOK_ERROR_OK || new_book == NULL) { @@ -456,7 +456,7 @@ if (new_book) g_object_unref (new_book); -@@ -2551,8 +2554,12 @@ cancel_load (EContactEditor *editor) +@@ -2557,8 +2560,12 @@ cancel_load (EContactEditor *editor) } static void @@ -470,7 +470,7 @@ cancel_load (editor); if (e_source_equal (e_book_get_source (editor->target_book), source)) -@@ -3373,8 +3380,8 @@ e_contact_editor_init (EContactEditor *e +@@ -3383,8 +3390,8 @@ e_contact_editor_init (EContactEditor *e g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor); widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories"); g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor); @@ -481,7 +481,7 @@ label = glade_xml_get_widget (e_contact_editor->gui, "where-label"); gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok"); -@@ -3825,26 +3832,26 @@ e_contact_editor_create_web(gchar *name, +@@ -3835,26 +3842,26 @@ e_contact_editor_create_web(gchar *name, } GtkWidget * @@ -518,8 +518,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.11.6/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-07-30 10:18:02.000000000 -0400 -+++ evolution-2.11.6/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-07-31 10:12:50.000000000 -0400 +--- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-07-28 15:38:05.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-15 13:42:01.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -568,9 +568,9 @@ g_object_unref (source_list); ---- evolution-2.11.6/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-01-03 10:27:56.000000000 -0500 -+++ evolution-2.11.6/calendar/gui/dialogs/memo-page.glade 2007-07-31 10:01:40.000000000 -0400 -@@ -141,7 +141,7 @@ +--- evolution-2.11.90/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/memo-page.glade 2007-08-15 13:42:01.000000000 -0400 +@@ -194,7 +194,7 @@ True @@ -579,9 +579,9 @@ 0 0 Tue, 13 Jan 2004 22:00:00 GMT ---- evolution-2.11.6/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 -+++ evolution-2.11.6/calendar/gui/dialogs/event-page.glade 2007-07-31 10:01:40.000000000 -0400 -@@ -775,7 +775,7 @@ +--- evolution-2.11.90/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/event-page.glade 2007-08-15 13:42:01.000000000 -0400 +@@ -827,7 +827,7 @@ True @@ -590,9 +590,9 @@ 0 0 Wed, 17 Dec 2003 18:20:26 GMT ---- evolution-2.11.6/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 -+++ evolution-2.11.6/calendar/gui/dialogs/task-page.glade 2007-07-31 10:01:40.000000000 -0400 -@@ -618,7 +618,7 @@ +--- evolution-2.11.90/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/task-page.glade 2007-08-15 13:42:01.000000000 -0400 +@@ -671,7 +671,7 @@ 24 True @@ -601,8 +601,8 @@ 0 0 Thu, 18 Dec 2003 01:58:48 GMT ---- evolution-2.11.6/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 -+++ evolution-2.11.6/calendar/gui/dialogs/memo-page.c 2007-07-31 10:14:31.000000000 -0400 +--- evolution-2.11.90/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/memo-page.c 2007-08-15 13:42:01.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -612,7 +612,7 @@ #include #include #include -@@ -339,7 +339,6 @@ memo_page_fill_widgets (CompEditorPage * +@@ -349,7 +349,6 @@ memo_page_fill_widgets (CompEditorPage * ECalComponentDateTime d; GSList *l; const char *categories; @@ -620,7 +620,7 @@ mpage = MEMO_PAGE (page); priv = mpage->priv; -@@ -432,8 +431,9 @@ memo_page_fill_widgets (CompEditorPage * +@@ -442,8 +441,9 @@ memo_page_fill_widgets (CompEditorPage * } /* Source */ @@ -632,7 +632,7 @@ priv->updating = FALSE; -@@ -840,13 +840,12 @@ field_changed_cb (GtkWidget *widget, gpo +@@ -885,13 +885,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -650,7 +650,7 @@ if (!priv->updating) { ECal *client; -@@ -858,8 +857,9 @@ source_changed_cb (GtkWidget *widget, ES +@@ -903,8 +902,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -662,7 +662,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -969,7 +969,7 @@ init_widgets (MemoPage *mpage) +@@ -1028,7 +1028,7 @@ init_widgets (MemoPage *mpage) G_CALLBACK (categories_clicked_cb), mpage); /* Source selector */ @@ -671,7 +671,7 @@ G_CALLBACK (source_changed_cb), mpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1163,22 +1163,23 @@ memo_page_create_date_edit (void) +@@ -1280,22 +1280,23 @@ memo_page_create_date_edit (void) return dedit; } @@ -702,8 +702,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.11.6/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 -+++ evolution-2.11.6/calendar/gui/dialogs/event-page.c 2007-07-31 10:38:26.000000000 -0400 +--- evolution-2.11.90/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/event-page.c 2007-08-15 13:42:59.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -713,15 +713,15 @@ #include "common/authentication.h" #include "e-util/e-categories-config.h" #include "e-util/e-dialog-widgets.h" -@@ -978,7 +978,6 @@ event_page_fill_widgets (CompEditorPage - ECalComponentDateTime start_date, end_date; +@@ -995,7 +995,6 @@ event_page_fill_widgets (CompEditorPage const char *location, *uid = NULL; const char *categories; + gchar *backend_addr = NULL; - ESource *source; GSList *l; gboolean validated = TRUE; -@@ -1174,8 +1173,9 @@ event_page_fill_widgets (CompEditorPage +@@ -1208,8 +1207,9 @@ event_page_fill_widgets (CompEditorPage e_dialog_editable_set (priv->categories, categories); /* Source */ @@ -733,7 +733,7 @@ e_cal_component_get_uid (comp, &uid); if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) -@@ -2577,7 +2577,8 @@ event_page_sendoptions_clicked_cb (Event +@@ -2655,7 +2655,8 @@ event_page_sendoptions_clicked_cb (Event if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); @@ -743,7 +743,7 @@ e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); priv->sod->data->initialized = TRUE; } -@@ -2606,13 +2607,12 @@ field_changed_cb (GtkWidget *widget, gpo +@@ -2684,13 +2685,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -761,7 +761,7 @@ if (!priv->updating) { ECal *client; -@@ -2631,8 +2631,9 @@ source_changed_cb (GtkWidget *widget, ES +@@ -2709,8 +2709,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -773,7 +773,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -2860,7 +2861,7 @@ init_widgets (EventPage *epage) +@@ -2975,7 +2976,7 @@ init_widgets (EventPage *epage) G_CALLBACK (categories_clicked_cb), epage); /* Source selector */ @@ -782,7 +782,7 @@ G_CALLBACK (source_changed_cb), epage); /* Alarms */ priv->alarm_list_store = e_alarm_list_new (); -@@ -3161,24 +3162,25 @@ make_timezone_entry (void) +@@ -3315,24 +3316,25 @@ make_timezone_entry (void) return w; } @@ -815,8 +815,8 @@ } GtkWidget *make_status_icons (void); ---- evolution-2.11.6/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-07-30 10:19:21.000000000 -0400 -+++ evolution-2.11.6/calendar/gui/dialogs/task-page.c 2007-07-31 10:39:29.000000000 -0400 +--- evolution-2.11.90/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/task-page.c 2007-08-15 13:42:01.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -826,7 +826,7 @@ #include #include #include "common/authentication.h" -@@ -513,7 +513,6 @@ task_page_fill_widgets (CompEditorPage * +@@ -528,7 +528,6 @@ task_page_fill_widgets (CompEditorPage * icalcomponent *icalcomp; const char *categories, *uid; icaltimezone *zone, *default_zone; @@ -834,7 +834,7 @@ tpage = TASK_PAGE (page); priv = tpage->priv; -@@ -657,8 +656,9 @@ task_page_fill_widgets (CompEditorPage * +@@ -672,8 +671,9 @@ task_page_fill_widgets (CompEditorPage * e_dialog_editable_set (priv->categories, categories); /* Source */ @@ -846,7 +846,7 @@ if (priv->is_assignment) { ECalComponentOrganizer organizer; -@@ -1613,13 +1613,12 @@ field_changed_cb (GtkWidget *widget, gpo +@@ -1686,13 +1686,12 @@ field_changed_cb (GtkWidget *widget, gpo } static void @@ -864,7 +864,7 @@ if (!priv->updating) { ECal *client; -@@ -1638,8 +1637,9 @@ source_changed_cb (GtkWidget *widget, ES +@@ -1711,8 +1710,9 @@ source_changed_cb (GtkWidget *widget, ES if (client) g_object_unref (client); @@ -876,7 +876,7 @@ dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -1651,7 +1651,7 @@ source_changed_cb (GtkWidget *widget, ES +@@ -1724,7 +1724,7 @@ source_changed_cb (GtkWidget *widget, ES comp_editor_notify_client_changed ( COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), client); @@ -885,7 +885,7 @@ if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment) task_page_show_options (tpage); else -@@ -1675,7 +1675,8 @@ task_page_sendoptions_clicked_cb (TaskPa +@@ -1758,7 +1758,8 @@ task_page_sendoptions_clicked_cb (TaskPa if (!priv->sod) { priv->sod = e_sendoptions_dialog_new (); priv->sod->data->initialized = TRUE; @@ -895,7 +895,7 @@ e_sendoptions_utils_set_default_data (priv->sod, source, "task"); } -@@ -1730,7 +1731,7 @@ init_widgets (TaskPage *tpage) +@@ -1816,7 +1817,7 @@ init_widgets (TaskPage *tpage) G_CALLBACK (categories_clicked_cb), tpage); /* Source selector */ @@ -904,7 +904,7 @@ G_CALLBACK (source_changed_cb), tpage); /* Connect the default signal handler to use to make sure the "changed" -@@ -1951,22 +1952,23 @@ task_page_create_date_edit (void) +@@ -2093,22 +2094,23 @@ task_page_create_date_edit (void) return dedit; } @@ -935,8 +935,8 @@ + gtk_widget_show (combo_box); + return combo_box; } ---- evolution-2.11.6/calendar/gui/e-itip-control.c.e-source-combo-box 2007-07-30 10:19:22.000000000 -0400 -+++ evolution-2.11.6/calendar/gui/e-itip-control.c 2007-07-31 10:01:40.000000000 -0400 +--- evolution-2.11.90/calendar/gui/e-itip-control.c.e-source-combo-box 2007-07-05 02:11:20.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/e-itip-control.c 2007-08-15 13:42:01.000000000 -0400 @@ -44,7 +44,7 @@ #include #include diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index bab59c2..8bbd0be 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,6 +1,6 @@ ---- evolution-2.11.4/mail/mail-send-recv.c.kill-ethread 2007-06-17 23:26:00.000000000 -0400 -+++ evolution-2.11.4/mail/mail-send-recv.c 2007-06-27 11:23:50.000000000 -0400 -@@ -764,23 +764,22 @@ receive_get_folder(CamelFilterDriver *d, +--- evolution-2.11.90/mail/mail-send-recv.c.kill-ethread 2007-07-28 17:08:12.000000000 -0400 ++++ evolution-2.11.90/mail/mail-send-recv.c 2007-08-15 13:37:37.000000000 -0400 +@@ -770,23 +770,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ struct _refresh_folders_msg { @@ -28,7 +28,7 @@ int i; CamelFolder *folder; CamelException ex = CAMEL_EXCEPTION_INITIALISER; -@@ -802,17 +801,14 @@ refresh_folders_get (struct _mail_msg *m +@@ -808,17 +807,14 @@ refresh_folders_get (struct _mail_msg *m } static void @@ -48,7 +48,7 @@ int i; for (i=0;ifolders->len;i++) -@@ -821,11 +817,12 @@ refresh_folders_free (struct _mail_msg * +@@ -827,11 +823,12 @@ refresh_folders_free (struct _mail_msg * camel_object_unref(m->store); } @@ -66,7 +66,7 @@ }; static void -@@ -858,13 +855,13 @@ receive_update_got_folderinfo(CamelStore +@@ -864,13 +861,13 @@ receive_update_got_folderinfo(CamelStore get_folders(store, folders, info); @@ -82,9 +82,9 @@ } else { receive_done ("", data); } ---- evolution-2.11.4/mail/mail-component.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/mail-component.c 2007-06-27 11:23:50.000000000 -0400 -@@ -1014,7 +1014,7 @@ impl_handleURI (PortableServer_Servant s +--- evolution-2.11.90/mail/mail-component.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.90/mail/mail-component.c 2007-08-15 13:37:37.000000000 -0400 +@@ -1001,7 +1001,7 @@ impl_handleURI (PortableServer_Servant s if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -93,8 +93,8 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.11.4/mail/mail-ops.c.kill-ethread 2007-06-01 03:08:56.000000000 -0400 -+++ evolution-2.11.4/mail/mail-ops.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-ops.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/mail-ops.c 2007-08-15 13:37:37.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -2224,9 +2224,9 @@ return id; } ---- evolution-2.11.4/mail/em-folder-utils.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-utils.c 2007-06-27 11:23:50.000000000 -0400 -@@ -84,7 +84,7 @@ emfu_is_special_local_folder (const char +--- evolution-2.11.90/mail/em-folder-utils.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-utils.c 2007-08-15 13:37:37.000000000 -0400 +@@ -85,7 +85,7 @@ emfu_is_special_local_folder (const char } struct _EMCopyFolders { @@ -2235,7 +2235,7 @@ /* input data */ CamelStore *fromstore; -@@ -96,18 +96,15 @@ struct _EMCopyFolders { +@@ -97,18 +97,15 @@ struct _EMCopyFolders { int delete; }; @@ -2257,7 +2257,7 @@ guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; GList *pending = NULL, *deleting = NULL, *l; GString *fromname, *toname; -@@ -115,7 +112,7 @@ emft_copy_folders__copy (struct _mail_ms +@@ -116,7 +113,7 @@ emft_copy_folders__copy (struct _mail_ms const char *tmp; int fromlen; @@ -2266,7 +2266,7 @@ return; pending = g_list_append (pending, fi); -@@ -155,8 +152,8 @@ emft_copy_folders__copy (struct _mail_ms +@@ -156,8 +153,8 @@ emft_copy_folders__copy (struct _mail_ms if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { d(printf ("this folder is selectable\n")); if (m->tostore == m->fromstore && m->delete) { @@ -2277,7 +2277,7 @@ goto exception; /* this folder no longer exists, unsubscribe it */ -@@ -165,16 +162,16 @@ emft_copy_folders__copy (struct _mail_ms +@@ -166,16 +163,16 @@ emft_copy_folders__copy (struct _mail_ms deleted = 1; } else { @@ -2297,7 +2297,7 @@ camel_folder_free_uids (fromfolder, uids); if (m->delete) -@@ -185,7 +182,7 @@ emft_copy_folders__copy (struct _mail_ms +@@ -186,7 +183,7 @@ emft_copy_folders__copy (struct _mail_ms } } @@ -2306,7 +2306,7 @@ goto exception; else if (m->delete && !deleted) deleting = g_list_prepend (deleting, info); -@@ -226,10 +223,8 @@ emft_copy_folders__copy (struct _mail_ms +@@ -227,10 +224,8 @@ emft_copy_folders__copy (struct _mail_ms } static void @@ -2318,7 +2318,7 @@ camel_object_unref (m->fromstore); camel_object_unref (m->tostore); -@@ -237,11 +232,12 @@ emft_copy_folders__free (struct _mail_ms +@@ -238,11 +233,12 @@ emft_copy_folders__free (struct _mail_ms g_free (m->tobase); } @@ -2336,7 +2336,7 @@ }; int -@@ -250,7 +246,7 @@ em_folder_utils_copy_folders(CamelStore +@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore struct _EMCopyFolders *m; int seq; @@ -2345,7 +2345,7 @@ camel_object_ref (fromstore); m->fromstore = fromstore; camel_object_ref (tostore); -@@ -258,9 +254,9 @@ em_folder_utils_copy_folders(CamelStore +@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore m->frombase = g_strdup (frombase); m->tobase = g_strdup (tobase); m->delete = delete; @@ -2357,7 +2357,7 @@ return seq; } -@@ -557,7 +553,7 @@ em_folder_utils_rename_folder (CamelFold +@@ -558,7 +554,7 @@ em_folder_utils_rename_folder (CamelFold } struct _EMCreateFolder { @@ -2366,8 +2366,8 @@ /* input data */ CamelStore *store; -@@ -573,41 +569,33 @@ struct _EMCreateFolder { - void *user_data; +@@ -582,41 +578,33 @@ struct _EMCreateFolderTempData + char *uri; }; -static char * @@ -2415,7 +2415,7 @@ camel_store_free_folder_info (m->store, m->fi); camel_object_unref (m->store); g_free (m->full_name); -@@ -615,11 +603,12 @@ emfu_create_folder__free (struct _mail_m +@@ -624,11 +612,12 @@ emfu_create_folder__free (struct _mail_m g_free (m->name); } @@ -2433,7 +2433,7 @@ }; -@@ -640,7 +629,7 @@ emfu_create_folder_real (CamelStore *sto +@@ -649,7 +638,7 @@ emfu_create_folder_real (CamelStore *sto parent = namebuf; } @@ -2442,7 +2442,7 @@ camel_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); -@@ -651,8 +640,8 @@ emfu_create_folder_real (CamelStore *sto +@@ -660,8 +649,8 @@ emfu_create_folder_real (CamelStore *sto g_free (namebuf); @@ -2453,8 +2453,8 @@ return id; } ---- evolution-2.11.4/mail/importers/elm-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.4/mail/importers/elm-importer.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/importers/elm-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.90/mail/importers/elm-importer.c 2007-08-15 13:37:37.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2553,8 +2553,8 @@ return id; } ---- evolution-2.11.4/mail/importers/mail-importer.c.kill-ethread 2007-06-03 11:08:07.000000000 -0400 -+++ evolution-2.11.4/mail/importers/mail-importer.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/importers/mail-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.90/mail/importers/mail-importer.c 2007-08-15 13:37:37.000000000 -0400 @@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } @@ -2691,8 +2691,8 @@ } struct _import_folders_data { ---- evolution-2.11.4/mail/importers/pine-importer.c.kill-ethread 2007-04-18 06:17:29.000000000 -0400 -+++ evolution-2.11.4/mail/importers/pine-importer.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/importers/pine-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.90/mail/importers/pine-importer.c 2007-08-15 13:37:37.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2792,9 +2792,9 @@ return id; } ---- evolution-2.11.4/mail/em-utils.c.kill-ethread 2007-06-27 11:23:38.000000000 -0400 -+++ evolution-2.11.4/mail/em-utils.c 2007-06-27 11:23:50.000000000 -0400 -@@ -1906,7 +1906,7 @@ em_utils_in_addressbook(CamelInternetAdd +--- evolution-2.11.90/mail/em-utils.c.kill-ethread 2007-08-15 13:37:37.000000000 -0400 ++++ evolution-2.11.90/mail/em-utils.c 2007-08-15 13:37:37.000000000 -0400 +@@ -1908,7 +1908,7 @@ em_utils_in_addressbook(CamelInternetAdd ESource *source = s->data; GList *contacts; EBook *book; @@ -2803,8 +2803,8 @@ d(printf(" checking '%s'\n", e_source_get_uri(source))); ---- evolution-2.11.4/mail/mail-vfolder.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/mail-vfolder.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-vfolder.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 ++++ evolution-2.11.90/mail/mail-vfolder.c 2007-08-15 13:37:37.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -3039,8 +3039,8 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.11.4/mail/em-format-html.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/em-format-html.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-format-html.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.90/mail/em-format-html.c 2007-08-15 13:37:37.000000000 -0400 @@ -165,7 +165,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); @@ -3050,7 +3050,7 @@ efh->priv->format_timeout_msg = NULL; } -@@ -1179,7 +1179,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc +@@ -1193,7 +1193,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { @@ -3059,7 +3059,7 @@ EMFormatHTML *format; EMFormat *format_source; -@@ -1189,14 +1189,15 @@ struct _format_msg { +@@ -1203,14 +1203,15 @@ struct _format_msg { CamelMimeMessage *message; }; @@ -3078,7 +3078,7 @@ struct _EMFormatHTMLJob *job; struct _EMFormatPURITree *puri_level; int cancelled = FALSE; -@@ -1281,10 +1282,9 @@ static void efh_format_do(struct _mail_m +@@ -1295,10 +1296,9 @@ static void efh_format_do(struct _mail_m ((EMFormat *)m->format)->pending_uri_level = puri_level; } @@ -3091,7 +3091,7 @@ d(printf("formatting finished\n")); m->format->load_http_now = FALSE; -@@ -1292,10 +1292,9 @@ static void efh_format_done(struct _mail +@@ -1306,10 +1306,9 @@ static void efh_format_done(struct _mail g_signal_emit_by_name(m->format, "complete"); } @@ -3104,7 +3104,7 @@ d(printf("formatter freed\n")); g_object_unref(m->format); if (m->estream) { -@@ -1311,11 +1310,12 @@ static void efh_format_free(struct _mail +@@ -1325,11 +1324,12 @@ static void efh_format_free(struct _mail g_object_unref(m->format_source); } @@ -3122,7 +3122,7 @@ }; static gboolean -@@ -1326,7 +1326,7 @@ efh_format_timeout(struct _format_msg *m +@@ -1340,7 +1340,7 @@ efh_format_timeout(struct _format_msg *m struct _EMFormatHTMLPrivate *p = efh->priv; if (m->format->html == NULL) { @@ -3131,7 +3131,7 @@ return FALSE; } -@@ -1354,7 +1354,7 @@ efh_format_timeout(struct _format_msg *m +@@ -1368,7 +1368,7 @@ efh_format_timeout(struct _format_msg *m if (m->message == NULL) { hstream = gtk_html_begin(efh->html); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); @@ -3139,8 +3139,8 @@ + mail_msg_unref(m); p->last_part = NULL; } else { - hstream = NULL; -@@ -1373,8 +1373,8 @@ efh_format_timeout(struct _format_msg *m + hstream = gtk_html_begin(efh->html); +@@ -1392,8 +1392,8 @@ efh_format_timeout(struct _format_msg *m p->last_part = m->message; } @@ -3151,7 +3151,7 @@ } efh->priv->format_timeout_id = 0; -@@ -1398,11 +1398,11 @@ static void efh_format_clone(EMFormat *e +@@ -1417,11 +1417,11 @@ static void efh_format_clone(EMFormat *e d(printf(" timeout for last still active, removing ...\n")); g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3165,8 +3165,8 @@ m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; ---- evolution-2.11.4/mail/em-folder-properties.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-properties.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-folder-properties.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-properties.c 2007-08-15 13:37:37.000000000 -0400 @@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } @@ -3176,8 +3176,8 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.11.4/mail/em-folder-tree.c.kill-ethread 2007-06-17 23:26:00.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-tree.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-folder-tree.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-tree.c 2007-08-15 13:37:37.000000000 -0400 @@ -835,7 +835,7 @@ fail: /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ @@ -3314,7 +3314,7 @@ m->context = context; g_object_ref(context); m->store = store; -@@ -1687,7 +1683,7 @@ dump_fi (CamelFolderInfo *fi, int depth) +@@ -1692,7 +1688,7 @@ dump_fi (CamelFolderInfo *fi, int depth) #endif struct _EMFolderTreeGetFolderInfo { @@ -3323,7 +3323,7 @@ /* input data */ GtkTreeRowReference *root; -@@ -1700,10 +1696,9 @@ struct _EMFolderTreeGetFolderInfo { +@@ -1705,10 +1701,9 @@ struct _EMFolderTreeGetFolderInfo { CamelFolderInfo *fi; }; @@ -3336,7 +3336,7 @@ char *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1713,18 +1708,16 @@ emft_get_folder_info__desc(struct _mail_ +@@ -1718,18 +1713,16 @@ emft_get_folder_info__desc(struct _mail_ } static void @@ -3358,7 +3358,7 @@ struct _EMFolderTreePrivate *priv = m->emft->priv; struct _EMFolderTreeModelStoreInfo *si; GtkTreeIter root, iter; -@@ -1752,7 +1745,7 @@ emft_get_folder_info__got (struct _mail_ +@@ -1757,7 +1750,7 @@ emft_get_folder_info__got (struct _mail_ gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ @@ -3367,7 +3367,7 @@ gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); gtk_tree_view_collapse_row (priv->treeview, path); gtk_tree_path_free (path); -@@ -1807,10 +1800,8 @@ emft_get_folder_info__got (struct _mail_ +@@ -1812,10 +1805,8 @@ emft_get_folder_info__got (struct _mail_ } static void @@ -3379,7 +3379,7 @@ camel_store_free_folder_info (m->store, m->fi); gtk_tree_row_reference_free (m->root); -@@ -1819,11 +1810,12 @@ emft_get_folder_info__free (struct _mail +@@ -1824,11 +1815,12 @@ emft_get_folder_info__free (struct _mail g_free (m->top); } @@ -3397,7 +3397,7 @@ }; static void -@@ -1910,7 +1902,7 @@ emft_tree_row_expanded (GtkTreeView *tre +@@ -1915,7 +1907,7 @@ emft_tree_row_expanded (GtkTreeView *tre gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); @@ -3406,7 +3406,7 @@ m->root = gtk_tree_row_reference_new (model, tree_path); camel_object_ref (store); m->store = store; -@@ -1919,7 +1911,7 @@ emft_tree_row_expanded (GtkTreeView *tre +@@ -1924,7 +1916,7 @@ emft_tree_row_expanded (GtkTreeView *tre m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; @@ -3415,9 +3415,9 @@ } static gboolean ---- evolution-2.11.4/mail/em-folder-browser.c.kill-ethread 2007-06-18 01:24:46.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-browser.c 2007-06-27 11:23:50.000000000 -0400 -@@ -835,7 +835,7 @@ get_view_query (ESearchBar *esb) +--- evolution-2.11.90/mail/em-folder-browser.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-browser.c 2007-08-15 13:37:37.000000000 -0400 +@@ -836,7 +836,7 @@ get_view_query (ESearchBar *esb) struct _setup_msg { @@ -3426,7 +3426,7 @@ CamelFolder *folder; char *query; -@@ -843,16 +843,15 @@ struct _setup_msg { +@@ -844,16 +844,15 @@ struct _setup_msg { GList *sources_folder; }; @@ -3446,7 +3446,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -863,12 +862,12 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -864,12 +863,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3461,7 +3461,7 @@ } l = l->next; } -@@ -892,17 +891,13 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -893,17 +892,13 @@ vfolder_setup_do(struct _mail_msg *mm) } static void @@ -3481,7 +3481,7 @@ GList *l; camel_object_unref(m->folder); -@@ -923,11 +918,12 @@ vfolder_setup_free (struct _mail_msg *mm +@@ -924,11 +919,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } @@ -3499,7 +3499,7 @@ }; /* sources_uri should be camel uri's */ -@@ -937,15 +933,15 @@ vfolder_setup(CamelFolder *folder, const +@@ -938,15 +934,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; @@ -3518,8 +3518,8 @@ return id; } ---- evolution-2.11.4/mail/message-list.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/message-list.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/message-list.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.90/mail/message-list.c 2007-08-15 13:37:37.000000000 -0400 @@ -1841,7 +1841,7 @@ ml_tree_drag_data_get (ETree *tree, int /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ @@ -3627,7 +3627,7 @@ static EPopupItem ml_drop_popup_menu[] = { @@ -1985,7 +1979,7 @@ ml_tree_drag_data_received (ETree *tree, - if (data->data == NULL || data->length == -1) + if (!ml->folder || data->data == NULL || data->length == -1) return; - m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); @@ -3796,8 +3796,8 @@ m->ml = ml; m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); ---- evolution-2.11.4/mail/em-sync-stream.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-sync-stream.h 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-sync-stream.h.kill-ethread 2007-07-05 02:09:39.000000000 -0400 ++++ evolution-2.11.90/mail/em-sync-stream.h 2007-08-15 13:37:37.000000000 -0400 @@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3874,9 +3874,9 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.11.4/mail/em-format-html-print.c.kill-ethread 2007-04-22 13:20:08.000000000 -0400 -+++ evolution-2.11.4/mail/em-format-html-print.c 2007-06-27 11:23:50.000000000 -0400 -@@ -224,7 +224,7 @@ em_format_html_print_message (EMFormatHT +--- evolution-2.11.90/mail/em-format-html-print.c.kill-ethread 2007-07-08 22:46:50.000000000 -0400 ++++ evolution-2.11.90/mail/em-format-html-print.c 2007-08-15 13:37:37.000000000 -0400 +@@ -228,7 +228,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); mail_get_message ( @@ -3885,8 +3885,8 @@ } void ---- evolution-2.11.4/mail/em-sync-stream.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-sync-stream.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-sync-stream.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/em-sync-stream.c 2007-08-15 13:37:37.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -4312,8 +4312,8 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.11.4/mail/em-subscribe-editor.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/em-subscribe-editor.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-subscribe-editor.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 ++++ evolution-2.11.90/mail/em-subscribe-editor.c 2007-08-15 13:37:37.000000000 -0400 @@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ @@ -4529,8 +4529,8 @@ sub_unref(sub); } ---- evolution-2.11.4/mail/mail-mt.h.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/mail-mt.h 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-mt.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/mail-mt.h 2007-08-15 13:37:37.000000000 -0400 @@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4642,8 +4642,8 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.11.4/mail/mail-ops.h.kill-ethread 2007-06-14 23:48:53.000000000 -0400 -+++ evolution-2.11.4/mail/mail-ops.h 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-ops.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/mail-ops.h 2007-08-15 13:37:37.000000000 -0400 @@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ @@ -4684,9 +4684,9 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.11.4/mail/em-composer-utils.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/em-composer-utils.c 2007-06-27 11:23:50.000000000 -0400 -@@ -534,7 +534,7 @@ em_utils_composer_save_draft_cb (EMsgCom +--- evolution-2.11.90/mail/em-composer-utils.c.kill-ethread 2007-07-28 15:37:58.000000000 -0400 ++++ evolution-2.11.90/mail/em-composer-utils.c 2007-08-15 13:37:37.000000000 -0400 +@@ -553,7 +553,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4695,7 +4695,7 @@ mail_msg_wait (id); if (!folder || !account->enabled) { -@@ -1085,7 +1085,7 @@ em_utils_redirect_message_by_uid (CamelF +@@ -1104,7 +1104,7 @@ em_utils_redirect_message_by_uid (CamelF g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); @@ -4704,7 +4704,7 @@ } static void -@@ -1116,7 +1116,7 @@ em_utils_handle_receipt (CamelFolder *fo +@@ -1135,7 +1135,7 @@ em_utils_handle_receipt (CamelFolder *fo } if (msg == NULL) { @@ -4713,7 +4713,7 @@ camel_message_info_free(info); return; } -@@ -1922,7 +1922,7 @@ em_utils_reply_to_message(CamelFolder *f +@@ -1949,7 +1949,7 @@ em_utils_reply_to_message(CamelFolder *f rd->source = source; if (rd->source) g_object_ref(rd->source); @@ -4722,16 +4722,16 @@ return; } -@@ -2094,5 +2094,5 @@ em_utils_post_reply_to_message_by_uid (C +@@ -2121,5 +2121,5 @@ em_utils_post_reply_to_message_by_uid (C g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.11.4/mail/mail-folder-cache.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/mail-folder-cache.c 2007-06-27 11:23:50.000000000 -0400 -@@ -860,15 +860,14 @@ update_folders(CamelStore *store, CamelF +--- evolution-2.11.90/mail/mail-folder-cache.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/mail-folder-cache.c 2007-08-15 13:37:37.000000000 -0400 +@@ -862,15 +862,14 @@ update_folders(CamelStore *store, CamelF struct _ping_store_msg { @@ -4750,7 +4750,7 @@ char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -879,10 +878,9 @@ ping_store_desc (struct _mail_msg *mm, i +@@ -881,10 +880,9 @@ ping_store_desc (struct _mail_msg *mm, i } static void @@ -4762,7 +4762,7 @@ if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -893,22 +891,21 @@ ping_store_ping (struct _mail_msg *mm) +@@ -895,22 +893,21 @@ ping_store_ping (struct _mail_msg *mm) online = TRUE; } if (online) @@ -4793,7 +4793,7 @@ }; static void -@@ -920,11 +917,11 @@ ping_store (gpointer key, gpointer val, +@@ -922,11 +919,11 @@ ping_store (gpointer key, gpointer val, if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) return; @@ -4807,7 +4807,7 @@ } static gboolean -@@ -969,7 +966,7 @@ mail_note_store(CamelStore *store, Camel +@@ -971,7 +968,7 @@ mail_note_store(CamelStore *store, Camel int hook = 0; g_assert(CAMEL_IS_STORE(store)); @@ -4816,8 +4816,8 @@ LOCK(info_lock); ---- evolution-2.11.4/mail/em-folder-view.c.kill-ethread 2007-06-18 01:20:56.000000000 -0400 -+++ evolution-2.11.4/mail/em-folder-view.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/em-folder-view.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.90/mail/em-folder-view.c 2007-08-15 13:37:37.000000000 -0400 @@ -71,6 +71,7 @@ #include @@ -4826,7 +4826,7 @@ #include "menus/gal-view-etable.h" #include "menus/gal-view-factory-etable.h" -@@ -699,7 +700,7 @@ emfv_got_folder(char *uri, CamelFolder * +@@ -701,7 +702,7 @@ emfv_got_folder(char *uri, CamelFolder * static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) { @@ -4835,7 +4835,7 @@ } static void -@@ -1674,7 +1675,7 @@ filter_type_uid (CamelFolder *folder, co +@@ -1676,7 +1677,7 @@ filter_type_uid (CamelFolder *folder, co data->type = type; data->source = source; @@ -4844,7 +4844,7 @@ } static void -@@ -1772,7 +1773,7 @@ vfolder_type_uid (CamelFolder *folder, c +@@ -1774,7 +1775,7 @@ vfolder_type_uid (CamelFolder *folder, c data->type = type; data->uri = g_strdup (uri); @@ -4853,7 +4853,7 @@ } static void -@@ -2415,7 +2416,7 @@ emfv_message_selected_timeout(void *data +@@ -2419,7 +2420,7 @@ emfv_message_selected_timeout(void *data emfv->displayed_uid); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); */ @@ -4862,8 +4862,8 @@ } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.11.4/mail/mail-session.c.kill-ethread 2007-06-03 11:08:08.000000000 -0400 -+++ evolution-2.11.4/mail/mail-session.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-session.c.kill-ethread 2007-07-09 01:14:13.000000000 -0400 ++++ evolution-2.11.90/mail/mail-session.c 2007-08-15 13:37:37.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -4873,7 +4873,7 @@ #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -258,21 +258,22 @@ forget_password (CamelSession *session, +@@ -264,21 +264,22 @@ forget_password (CamelSession *session, /* ********************************************************************** */ @@ -4900,7 +4900,7 @@ /* clicked, send back the reply */ static void -@@ -280,122 +281,116 @@ user_message_response (GtkDialog *dialog +@@ -286,122 +287,116 @@ user_message_response (GtkDialog *dialog { gtk_widget_destroy ((GtkWidget *) dialog); @@ -5080,7 +5080,7 @@ } else ret = TRUE; -@@ -535,7 +530,7 @@ get_filter_driver (CamelSession *session +@@ -541,7 +536,7 @@ get_filter_driver (CamelSession *session /* TODO: This is very temporary, until we have a better way to do the progress reporting, we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ @@ -5089,7 +5089,7 @@ static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { -@@ -544,7 +539,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -550,7 +545,7 @@ static void *ms_thread_msg_new(CamelSess /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so we get cancellation and progress in common with hte existing mail code, for free */ if (msg) { @@ -5098,7 +5098,7 @@ msg->data = m; camel_operation_unref(msg->op); -@@ -557,7 +552,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -563,7 +558,7 @@ static void *ms_thread_msg_new(CamelSess static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { @@ -5107,7 +5107,7 @@ ms_parent_class->thread_msg_free(session, m); } -@@ -680,22 +675,23 @@ mail_session_set_interactive (gboolean i +@@ -686,22 +681,23 @@ mail_session_set_interactive (gboolean i MAIL_SESSION (session)->interactive = interactive; if (!interactive) { @@ -5137,8 +5137,8 @@ } } } ---- evolution-2.11.4/mail/mail-mt.c.kill-ethread 2007-04-18 06:17:32.000000000 -0400 -+++ evolution-2.11.4/mail/mail-mt.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/mail/mail-mt.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.90/mail/mail-mt.c 2007-08-15 13:37:37.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -5431,10 +5431,10 @@ - GDestroyNotify func; - void *data; -}; -- --static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); +static GHookList cancel_hook_list; +-static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); +- -void *mail_cancel_hook_add(GDestroyNotify func, void *data) +GHook * +mail_cancel_hook_add (GHookFunc func, gpointer data) @@ -6218,8 +6218,8 @@ } /* ******************** */ ---- evolution-2.11.4/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-04-18 06:17:14.000000000 -0400 -+++ evolution-2.11.4/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-07-05 02:09:19.000000000 -0400 ++++ evolution-2.11.90/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-08-15 13:37:37.000000000 -0400 @@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( @@ -6299,8 +6299,8 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } ---- evolution-2.11.4/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-05-14 00:24:02.000000000 -0400 -+++ evolution-2.11.4/plugins/mark-all-read/mark-all-read.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-07-05 02:09:23.000000000 -0400 ++++ evolution-2.11.90/plugins/mark-all-read/mark-all-read.c 2007-08-15 13:37:37.000000000 -0400 @@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } @@ -6310,8 +6310,8 @@ } static void ---- evolution-2.11.4/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-05-13 13:41:07.000000000 -0400 -+++ evolution-2.11.4/plugins/exchange-operations/exchange-folder.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-07-05 02:09:22.000000000 -0400 ++++ evolution-2.11.90/plugins/exchange-operations/exchange-folder.c 2007-08-15 13:37:37.000000000 -0400 @@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); @@ -6321,8 +6321,8 @@ } ---- evolution-2.11.4/plugins/save-attachments/save-attachments.c.kill-ethread 2007-04-18 06:17:20.000000000 -0400 -+++ evolution-2.11.4/plugins/save-attachments/save-attachments.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/save-attachments/save-attachments.c.kill-ethread 2007-07-05 02:09:25.000000000 -0400 ++++ evolution-2.11.90/plugins/save-attachments/save-attachments.c 2007-08-15 13:37:37.000000000 -0400 @@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -6330,8 +6330,8 @@ - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.11.4/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-04-18 06:17:17.000000000 -0400 -+++ evolution-2.11.4/plugins/mailing-list-actions/mailing-list-actions.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-07-05 02:09:24.000000000 -0400 ++++ evolution-2.11.90/plugins/mailing-list-actions/mailing-list-actions.c 2007-08-15 13:37:37.000000000 -0400 @@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); @@ -6341,8 +6341,8 @@ } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.11.4/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-04-18 06:17:15.000000000 -0400 -+++ evolution-2.11.4/plugins/groupwise-features/share-folder-common.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-07-05 02:09:21.000000000 -0400 ++++ evolution-2.11.90/plugins/groupwise-features/share-folder-common.c 2007-08-15 13:37:37.000000000 -0400 @@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } @@ -6440,8 +6440,8 @@ return id; } ---- evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.h 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-07-05 02:11:11.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.h 2007-08-15 13:37:37.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6462,8 +6462,8 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-04-18 06:18:37.000000000 -0400 -+++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-notify.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.c 2007-08-15 13:37:37.000000000 -0400 @@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; @@ -6576,8 +6576,8 @@ } static void ---- evolution-2.11.4/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-06-01 03:09:22.000000000 -0400 -+++ evolution-2.11.4/calendar/gui/alarm-notify/alarm-queue.c 2007-06-27 11:23:50.000000000 -0400 +--- evolution-2.11.90/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-queue.c 2007-08-15 13:41:19.000000000 -0400 @@ -97,9 +97,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; @@ -6671,23 +6671,23 @@ - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); + struct _midnight_refresh_msg *msg; -- list->remove = TRUE; -- msg->data = list; +- list = malloc (sizeof (struct _midnight_refresh_msg)); + msg = g_slice_new (struct _midnight_refresh_msg); + msg->header.func = (MessageFunc) midnight_refresh_async; + msg->remove = TRUE; +- list->remove = TRUE; +- msg->data = list; +- - d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } /* Looks up a client in the client alarms hash table */ -@@ -618,6 +643,7 @@ remove_comp (ClientAlarms *ca, ECalCompo +@@ -658,6 +683,7 @@ remove_comp (ClientAlarms *ca, ECalCompo * alarms. */ struct _query_msg { @@ -6695,7 +6695,7 @@ ECal *client; GList *objects; gpointer data; -@@ -651,7 +677,7 @@ duplicate_ecal (GList *in_list) +@@ -691,7 +717,7 @@ duplicate_ecal (GList *in_list) } static void @@ -6704,7 +6704,7 @@ { ClientAlarms *ca; time_t from, day_end; -@@ -660,13 +686,12 @@ query_objects_changed_async (EThread *e, +@@ -700,13 +726,12 @@ query_objects_changed_async (EThread *e, icaltimezone *zone; CompQueuedAlarms *cqa; GList *l; @@ -6721,7 +6721,7 @@ from = config_data_get_last_notification_time (); if (from == -1) -@@ -755,43 +780,38 @@ query_objects_changed_async (EThread *e, +@@ -800,43 +825,38 @@ query_objects_changed_async (EThread *e, comp = NULL; } g_list_free (objects); @@ -6734,8 +6734,7 @@ { - AlarmMsg *msg; - struct _query_msg *list; -+ struct _query_msg *msg; - +- - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = query_objects_changed_async; @@ -6744,7 +6743,8 @@ - list->objects = duplicate_ical (objects); - list->data = data; - msg->data = list; -- ++ struct _query_msg *msg; + - d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _query_msg); @@ -6778,7 +6778,7 @@ d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); -@@ -804,27 +824,22 @@ query_objects_removed_async (EThread *e, +@@ -849,27 +869,22 @@ query_objects_removed_async (EThread *e, } g_list_free (objects); @@ -6815,7 +6815,7 @@ } -@@ -966,20 +981,19 @@ free_tray_icon_data (TrayIconData *tray_ +@@ -1011,20 +1026,19 @@ free_tray_icon_data (TrayIconData *tray_ } static void @@ -6840,7 +6840,7 @@ e_cal_component_get_uid (tray_data->comp, &our_uid); g_return_if_fail (our_uid && *our_uid); -@@ -997,37 +1011,33 @@ on_dialog_objs_removed_async (EThread *e +@@ -1042,37 +1056,33 @@ on_dialog_objs_removed_async (EThread *e tray_data = NULL; } } @@ -6890,7 +6890,7 @@ GList *list = tray_icons_list; d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); -@@ -1066,28 +1076,25 @@ tray_list_remove_cqa_async(EThread *e, A +@@ -1111,28 +1121,25 @@ tray_list_remove_cqa_async(EThread *e, A gtk_tree_selection_select_iter (sel, &iter); } } @@ -6928,7 +6928,7 @@ { GList *list = tray_icons_list; -@@ -1117,55 +1124,50 @@ tray_list_remove_async(EThread *e, Alarm +@@ -1162,55 +1169,50 @@ tray_list_remove_async(EThread *e, Alarm } else list = list->next; } @@ -6941,16 +6941,16 @@ +tray_list_remove_icons (void) { - AlarmMsg *msg; -- ++ Message *msg; + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = tray_list_remove_async; -+ Message *msg; - -- msg->data = NULL; + msg = g_slice_new (Message); + msg->func = tray_list_remove_async; +- msg->data = NULL; +- - d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push (msg); @@ -6991,18 +6991,18 @@ - list->data = data; - msg->data = list; + struct _tray_msg *msg; -+ -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_data_async; -+ msg->data = data; - d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _tray_msg); ++ msg->header.func = (MessageFunc) tray_list_remove_data_async; ++ msg->data = data; ++ + message_push ((Message *) msg); } static void -@@ -1372,29 +1374,24 @@ tray_icon_blink_cb (gpointer data) +@@ -1417,29 +1419,24 @@ tray_icon_blink_cb (gpointer data) /* Add a new data to tray list */ static void @@ -7043,7 +7043,7 @@ } /* Performs notification of a display alarm */ -@@ -1791,21 +1788,13 @@ check_midnight_refresh (gpointer user_da +@@ -1836,21 +1833,13 @@ check_midnight_refresh (gpointer user_da new_midnight = time_day_end_with_zone (time (NULL), zone); if (new_midnight > midnight) { @@ -7070,7 +7070,7 @@ } return TRUE; -@@ -1936,14 +1925,15 @@ hash_ids (gpointer a) +@@ -1981,14 +1970,15 @@ hash_ids (gpointer a) } struct _alarm_client_msg { @@ -7089,7 +7089,7 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -1974,6 +1964,8 @@ static void alarm_queue_add_async (EThre +@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre G_CALLBACK (cal_opened_cb), ca); } @@ -7098,7 +7098,7 @@ } /** -@@ -1993,20 +1985,13 @@ static void alarm_queue_add_async (EThre +@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre void alarm_queue_add_client (ECal *client) { @@ -7124,7 +7124,7 @@ } /* Removes a component an its alarms */ -@@ -2058,11 +2043,10 @@ remove_client_alarms (ClientAlarms *ca) +@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca) * Removes a calendar client from the alarm queueing system. **/ static void @@ -7138,20 +7138,22 @@ g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2099,24 +2083,20 @@ alarm_queue_remove_async (EThread *e, Al +@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al g_free (ca); g_hash_table_remove (client_alarms_hash, client); + -+ g_slice_free (struct _alarm_client_msg, msg); ++ g_slice_free (struct _alarm_client_msg, msg); } + /** alarm_queue_remove_client +@@ -2156,22 +2142,13 @@ alarm_queue_remove_async (EThread *e, Al void - alarm_queue_remove_client (ECal *client) + alarm_queue_remove_client (ECal *client, gboolean immediately) { - AlarmMsg *msg; - struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; ++ struct _alarm_client_msg *msg; - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); @@ -7160,13 +7162,17 @@ - list = malloc (sizeof (struct _alarm_client_msg)); - list->client = client; - msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_remove_async; -+ msg->client = client; - +- - d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); +- if (immediately) +- alarm_queue_remove_async (NULL, msg, NULL); +- else +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_remove_async; ++ msg->client = client; ++ ++ message_push ((Message *) msg); } /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution.spec b/evolution.spec index 475dd12..adb0fe0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.11.6.1 +Version: 2.11.90 Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity @@ -711,6 +711,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Aug 15 2007 Matthew Barnes - 2.11.90-1.fc8 +- Update to 2.11.90 + * Wed Aug 8 2007 Matthias Clasen - 2.11.6.1-2 - Update the license field - Use %%find_lang for help files diff --git a/sources b/sources index 5ecdd52..db4ea2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b27f011166d16b2484f9f68992c48108 evolution-2.11.6.1.tar.bz2 +50b811f8799ef4e7143a53ffd1709c2b evolution-2.11.90.tar.bz2 From d72a1441ed73edee11df3bf2008ee31f12723b4c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 18 Aug 2007 07:29:43 +0000 Subject: [PATCH 155/844] - Add patch for RH bug #253348 (crash on startup). --- evolution-2.11.90-enable-folder-tree.patch | 48 ++++++++++++++++++++++ evolution.spec | 9 +++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 evolution-2.11.90-enable-folder-tree.patch diff --git a/evolution-2.11.90-enable-folder-tree.patch b/evolution-2.11.90-enable-folder-tree.patch new file mode 100644 index 0000000..05c6dfe --- /dev/null +++ b/evolution-2.11.90-enable-folder-tree.patch @@ -0,0 +1,48 @@ +--- evolution-2.11.90/mail/mail-component.c.enable-folder-tree 2007-08-18 02:21:45.000000000 -0400 ++++ evolution-2.11.90/mail/mail-component.c 2007-08-18 02:23:54.000000000 -0400 +@@ -652,30 +652,33 @@ enable_folder_tree (GtkWidget *emfb, Gtk + { + char *uri; + CamelURL *selected_curl, *current_curl; +- CamelFolder *folder; +- CamelException ex; + EMFolderView *emfv = (EMFolderView *)emfb; + + /* Currently displayed folder */ +- MessageList *ml = emfv->list; +- folder = ml->folder; +- uri = mail_tools_folder_to_url (folder); +- current_curl = camel_url_new (uri, NULL); ++ uri = mail_tools_folder_to_url (emfv->list->folder); ++ current_curl = uri ? camel_url_new (uri, NULL) : NULL; ++ g_free (uri); + +- /* Selected folder in emft*/ ++ /* Selected folder in emft */ + uri = em_folder_tree_get_selected_uri ((EMFolderTree *) emft); +- folder = mail_tool_uri_to_folder (uri, 0, &ex); +- selected_curl = camel_url_new (uri, NULL); ++ selected_curl = uri ? camel_url_new (uri, NULL) : NULL; + +- if (!camel_url_equal (selected_curl, current_curl)) +- g_signal_emit_by_name (emft, "folder-selected", emft, uri, folder->full_name, uri, folder->folder_flags); ++ if (current_curl && selected_curl && !camel_url_equal (selected_curl, current_curl)) { ++ CamelFolder *folder; ++ CamelException ex; ++ ++ camel_exception_init (&ex); ++ folder = mail_tool_uri_to_folder (uri, 0, &ex); ++ g_signal_emit_by_name ( ++ emft, "folder-selected", emft, uri, ++ folder->full_name, uri, folder->folder_flags); ++ } + + gtk_widget_set_sensitive (emft, TRUE); + + camel_url_free (current_curl); + camel_url_free (selected_curl); + g_free (uri); +- + } + + /* Evolution::Component CORBA methods. */ diff --git a/evolution.spec b/evolution.spec index adb0fe0..babc445 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -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 +# RH bug #253348 / GNOME bug #467883 +Patch35: evolution-2.11.90-enable-folder-tree.patch + ## Dependencies ### Requires(post): GConf2 @@ -269,6 +272,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 .enable-folder-tree mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -711,6 +715,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Sat Aug 18 2007 Matthew Barnes - 2.11.90-2.fc8 +- Add patch for RH bug #253348 (crash on startup). + * Wed Aug 15 2007 Matthew Barnes - 2.11.90-1.fc8 - Update to 2.11.90 From 32042447a8dacb265004db4b2a301d320fcf3855 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 21 Aug 2007 02:45:51 +0000 Subject: [PATCH 156/844] - Revise patch for GNOME bug #417999 to fix GNOME bug #447591 (Automatic Contacts combo boxes don't work). --- evolution-2.10.0-e-source-combo-box.patch | 207 +++++++++++++++++++--- evolution.spec | 6 +- 2 files changed, 183 insertions(+), 30 deletions(-) diff --git a/evolution-2.10.0-e-source-combo-box.patch b/evolution-2.10.0-e-source-combo-box.patch index ae00034..77e8e11 100644 --- a/evolution-2.10.0-e-source-combo-box.patch +++ b/evolution-2.10.0-e-source-combo-box.patch @@ -1,5 +1,5 @@ --- evolution-2.11.90/widgets/misc/e-pilot-settings.c.e-source-combo-box 2007-07-05 02:11:06.000000000 -0400 -+++ evolution-2.11.90/widgets/misc/e-pilot-settings.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/widgets/misc/e-pilot-settings.c 2007-08-20 21:59:26.000000000 -0400 @@ -27,7 +27,7 @@ #include @@ -41,7 +41,7 @@ gboolean --- evolution-2.11.90/plugins/itip-formatter/itip-formatter.c.e-source-combo-box 2007-08-09 02:46:59.000000000 -0400 -+++ evolution-2.11.90/plugins/itip-formatter/itip-formatter.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/plugins/itip-formatter/itip-formatter.c 2007-08-20 21:59:26.000000000 -0400 @@ -40,7 +40,7 @@ #include #include @@ -52,7 +52,7 @@ #include #include --- evolution-2.11.90/plugins/itip-formatter/itip-view.c.e-source-combo-box 2007-07-28 15:37:56.000000000 -0400 -+++ evolution-2.11.90/plugins/itip-formatter/itip-view.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/plugins/itip-formatter/itip-view.c 2007-08-20 21:59:26.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -178,7 +178,7 @@ void --- evolution-2.11.90/plugins/bbdb/gaimbuddies.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400 -+++ evolution-2.11.90/plugins/bbdb/gaimbuddies.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/plugins/bbdb/gaimbuddies.c 2007-08-20 21:59:26.000000000 -0400 @@ -44,7 +44,7 @@ #include @@ -189,7 +189,7 @@ #include #include --- evolution-2.11.90/plugins/bbdb/bbdb.c.e-source-combo-box 2007-08-09 02:46:58.000000000 -0400 -+++ evolution-2.11.90/plugins/bbdb/bbdb.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/plugins/bbdb/bbdb.c 2007-08-20 21:59:26.000000000 -0400 @@ -40,7 +40,7 @@ #include @@ -199,17 +199,93 @@ #include #include -@@ -345,7 +345,8 @@ enable_toggled_cb (GtkWidget *widget, gp +@@ -71,10 +71,49 @@ static gboolean bbdb_timeout (gpointer d + static void bbdb_do_it (EBook *book, const char *name, const char *email); + static void add_email_to_contact (EContact *contact, const char *email); + static void enable_toggled_cb (GtkWidget *widget, gpointer data); +-static void source_changed_cb (GtkWidget *widget, ESource *source, gpointer data); ++static void source_changed_cb (ESourceComboBox *source_combo_box, struct bbdb_stuff *stuff); + static GtkWidget *create_addressbook_option_menu (struct bbdb_stuff *stuff, int type); + static void cleanup_cb (GObject *o, gpointer data); + ++static ESource * ++find_esource_by_uri (ESourceList *source_list, const gchar *target_uri) ++{ ++ GSList *groups; ++ ++ /* XXX This would be unnecessary if the plugin had stored ++ * the addressbook's UID instead of the URI in GConf. ++ * Too late to change it now, I suppose. */ ++ ++ if (source_list == NULL || target_uri == NULL) ++ return NULL; ++ ++ groups = e_source_list_peek_groups (source_list); ++ ++ while (groups != NULL) { ++ GSList *sources; ++ ++ sources = e_source_group_peek_sources (groups->data); ++ ++ while (sources != NULL) { ++ gchar *uri; ++ gboolean match; ++ ++ uri = e_source_get_uri (sources->data); ++ match = (strcmp (uri, target_uri) == 0); ++ g_free (uri); ++ ++ if (match) ++ return sources->data; ++ ++ sources = g_slist_next (sources); ++ } ++ ++ groups = g_slist_next (groups); ++ } ++ ++ return NULL; ++} ++ + int + e_plugin_lib_enable (EPluginLib *ep, int enable) + { +@@ -266,8 +305,6 @@ bbdb_open_addressbook (int type) + char *uri; + EBook *book = NULL; + +- gboolean enable; +- + gboolean status; + GError *error = NULL; + +@@ -345,8 +382,23 @@ enable_toggled_cb (GtkWidget *widget, gp gtk_widget_set_sensitive (stuff->option_menu, active); if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL)) { - selected_source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (stuff->option_menu)); +- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL); ++ const gchar *uri = NULL; ++ GError *error = NULL; ++ + selected_source = e_source_combo_box_get_active ( + E_SOURCE_COMBO_BOX (stuff->option_menu)); - gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (selected_source), NULL); ++ if (selected_source != NULL) ++ uri = e_source_get_uri (selected_source); ++ ++ gconf_client_set_string ( ++ stuff->target->gconf, ++ GCONF_KEY_WHICH_ADDRESSBOOK, ++ uri, &error); ++ ++ if (error != NULL) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } } } -@@ -364,7 +365,8 @@ enable_gaim_toggled_cb (GtkWidget *widge + +@@ -364,7 +416,8 @@ enable_gaim_toggled_cb (GtkWidget *widge gtk_widget_set_sensitive (stuff->gaim_option_menu, active); if (active && !gconf_client_get_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL)) { @@ -219,15 +295,67 @@ gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (selected_source), NULL); } } -@@ -393,31 +395,32 @@ gaim_source_changed_cb (GtkWidget *widge +@@ -376,48 +429,77 @@ synchronize_button_clicked_cb (GtkWidget + } + + static void +-source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) ++source_changed_cb (ESourceComboBox *source_combo_box, ++ struct bbdb_stuff *stuff) + { +- struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; +- +- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK, e_source_get_uri (source), NULL); ++ ESource *source; ++ GError *error = NULL; ++ ++ source = e_source_combo_box_get_active (source_combo_box); ++ g_return_if_fail (source != NULL); ++ ++ gconf_client_set_string ( ++ stuff->target->gconf, ++ GCONF_KEY_WHICH_ADDRESSBOOK, ++ e_source_get_uri (source), &error); ++ ++ if (error != NULL) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } + } + + static void +-gaim_source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) ++gaim_source_changed_cb (ESourceComboBox *source_combo_box, ++ struct bbdb_stuff *stuff) + { +- struct bbdb_stuff *stuff = (struct bbdb_stuff *) data; +- gconf_client_set_string (stuff->target->gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, e_source_get_uri (source), NULL); ++ ESource *source; ++ GError *error = NULL; ++ ++ source = e_source_combo_box_get_active (source_combo_box); ++ g_return_if_fail (source != NULL); ++ ++ gconf_client_set_string ( ++ stuff->target->gconf, ++ GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, ++ e_source_get_uri (source), &error); ++ ++ if (error != NULL) { ++ g_warning ("%s", error->message); ++ g_error_free (error); ++ } + } + static GtkWidget * create_addressbook_option_menu (struct bbdb_stuff *stuff, int type) { - GtkWidget *menu; + GtkWidget *combo_box; ESourceList *source_list; - char *selected_source_uri; -- ESource *selected_source; +- char *selected_source_uri; + ESource *selected_source; ++ char *selected_source_uri; GConfClient *gconf = stuff->target->gconf; @@ -239,15 +367,18 @@ selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK_GAIM, NULL); else selected_source_uri = gconf_client_get_string (gconf, GCONF_KEY_WHICH_ADDRESSBOOK, NULL); - if (selected_source_uri != NULL) { +- if (selected_source_uri != NULL) { - selected_source = e_source_new_with_absolute_uri ("", selected_source_uri); - e_source_option_menu_select (E_SOURCE_OPTION_MENU (menu), selected_source); +- g_free (selected_source_uri); +- } ++ selected_source = find_esource_by_uri ( ++ source_list, selected_source_uri); ++ g_free (selected_source_uri); ++ ++ if (selected_source != NULL) + e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (combo_box), -+ e_source_new_with_absolute_uri ( -+ "", selected_source_uri)); - g_free (selected_source_uri); - } ++ E_SOURCE_COMBO_BOX (combo_box), selected_source); - gtk_widget_show (menu); + gtk_widget_show (combo_box); @@ -259,8 +390,26 @@ } GtkWidget * +@@ -483,7 +565,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH + + /* Source selection option menu */ + option = create_addressbook_option_menu (stuff, AUTOMATIC_CONTACTS_ADDRESSBOOK); +- g_signal_connect (option, "source_selected", G_CALLBACK (source_changed_cb), stuff); ++ g_signal_connect (option, "changed", G_CALLBACK (source_changed_cb), stuff); + gtk_widget_set_sensitive (option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE, NULL)); + gtk_box_pack_start (GTK_BOX (inner_vbox), option, FALSE, FALSE, 0); + stuff->option_menu = option; +@@ -519,7 +601,7 @@ bbdb_page_factory (EPlugin *ep, EConfigH + + /* Gaim Source Selection Option Menu */ + gaim_option = create_addressbook_option_menu (stuff, GAIM_ADDRESSBOOK); +- g_signal_connect (gaim_option, "source_selected", G_CALLBACK (gaim_source_changed_cb), stuff); ++ g_signal_connect (gaim_option, "changed", G_CALLBACK (gaim_source_changed_cb), stuff); + gtk_widget_set_sensitive (gaim_option, gconf_client_get_bool (target->gconf, GCONF_KEY_ENABLE_GAIM, NULL)); + gtk_box_pack_start (GTK_BOX (inner_vbox), gaim_option, FALSE, FALSE, 0); + stuff->gaim_option_menu = gaim_option; --- evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade.e-source-combo-box 2007-07-05 02:06:54.000000000 -0400 -+++ evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-list-editor/contact-list-editor.glade 2007-08-20 21:59:26.000000000 -0400 @@ -158,9 +158,9 @@ @@ -274,7 +423,7 @@ 0 Tue, 01 Jun 2004 18:22:38 GMT --- evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c.e-source-combo-box 2007-07-05 02:06:54.000000000 -0400 -+++ evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-list-editor/e-contact-list-editor.c 2007-08-20 21:59:26.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -391,7 +540,7 @@ gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list); } --- evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-07-08 22:46:43.000000000 -0400 -+++ evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/contact-editor.glade 2007-08-20 21:59:26.000000000 -0400 @@ -356,9 +356,9 @@ @@ -405,7 +554,7 @@ 0 Tue, 13 Apr 2004 20:47:50 GMT --- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-08-09 02:46:47.000000000 -0400 -+++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-editor.c 2007-08-20 21:59:26.000000000 -0400 @@ -46,7 +46,7 @@ #include @@ -519,7 +668,7 @@ + return combo_box; } --- evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-07-28 15:38:05.000000000 -0400 -+++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-08-20 21:59:26.000000000 -0400 @@ -37,7 +37,7 @@ #include #include @@ -569,7 +718,7 @@ g_object_unref (source_list); --- evolution-2.11.90/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/dialogs/memo-page.glade 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/memo-page.glade 2007-08-20 21:59:26.000000000 -0400 @@ -194,7 +194,7 @@ @@ -580,7 +729,7 @@ 0 Tue, 13 Jan 2004 22:00:00 GMT --- evolution-2.11.90/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/dialogs/event-page.glade 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/event-page.glade 2007-08-20 21:59:26.000000000 -0400 @@ -827,7 +827,7 @@ @@ -591,7 +740,7 @@ 0 Wed, 17 Dec 2003 18:20:26 GMT --- evolution-2.11.90/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/dialogs/task-page.glade 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/task-page.glade 2007-08-20 21:59:26.000000000 -0400 @@ -671,7 +671,7 @@ 24 @@ -602,7 +751,7 @@ 0 Thu, 18 Dec 2003 01:58:48 GMT --- evolution-2.11.90/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/dialogs/memo-page.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/memo-page.c 2007-08-20 21:59:26.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -703,7 +852,7 @@ + return combo_box; } --- evolution-2.11.90/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/dialogs/event-page.c 2007-08-15 13:42:59.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/event-page.c 2007-08-20 21:59:26.000000000 -0400 @@ -33,7 +33,7 @@ #include #include @@ -816,7 +965,7 @@ GtkWidget *make_status_icons (void); --- evolution-2.11.90/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-08-13 06:41:54.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/dialogs/task-page.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/dialogs/task-page.c 2007-08-20 21:59:26.000000000 -0400 @@ -35,7 +35,7 @@ #include #include @@ -936,7 +1085,7 @@ + return combo_box; } --- evolution-2.11.90/calendar/gui/e-itip-control.c.e-source-combo-box 2007-07-05 02:11:20.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/e-itip-control.c 2007-08-15 13:42:01.000000000 -0400 ++++ evolution-2.11.90/calendar/gui/e-itip-control.c 2007-08-20 21:59:26.000000000 -0400 @@ -44,7 +44,7 @@ #include #include diff --git a/evolution.spec b/evolution.spec index babc445..295d15d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.90 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -715,6 +715,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Aug 20 2007 Matthew Barnes - 2.11.90-3.fc8 +- Revise patch for GNOME bug #417999 to fix GNOME bug #447591 + (Automatic Contacts combo boxes don't work). + * Sat Aug 18 2007 Matthew Barnes - 2.11.90-2.fc8 - Add patch for RH bug #253348 (crash on startup). From e80ca7a9aa40af66b78646911ddd77f8ff905994 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 23 Aug 2007 16:28:02 +0000 Subject: [PATCH 157/844] - Obsolete the evolution-bogofilter package. --- evolution.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 295d15d..07d3b9a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.90 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -53,6 +53,11 @@ URL: http://www.gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: evolution-%{version}.tar.bz2 +Obsoletes: libgal2 <= %{last_libgal2_version} + +Provides: evolution-bogofilter = %{version}-%{release} +Obsoletes: evolution-bogofilter <= 0.2.0-5 + ### Patches ### # bad hack @@ -156,8 +161,6 @@ Requires: redhat-menus >= %{redhat_menus_version} Requires: libnotify >= 0.4 %endif -Obsoletes: libgal2 <= %{last_libgal2_version} - ### Build Dependencies ### BuildRequires: GConf2-devel @@ -715,6 +718,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Thu Aug 23 2007 Matthew Barnes - 2.11.90-4.fc8 +- Obsolete the evolution-bogofilter package. + * Mon Aug 20 2007 Matthew Barnes - 2.11.90-3.fc8 - Revise patch for GNOME bug #417999 to fix GNOME bug #447591 (Automatic Contacts combo boxes don't work). From a5950633c24a3e3ddafebb32751a510d241d5684 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 28 Aug 2007 16:00:34 +0000 Subject: [PATCH 158/844] - Update to 2.11.91 - Removed patch for RH bug #157400 / GNOME bug #303877 (fixed upstream). - Removed patch for RH bug #157505 / GNOME bug #303878 (fixed upstream). - Removed patch for RH bug #161885 / GNOME bug #309166 (fixed upstream). - Removed patch for RH bug #202751 / GNOME bug #355766 (fixed upstream). - Removed patch for RH bug #218898 / GNOME bug #385414 (fixed upstream). - Removed patch for RH bug #253348 / GNOME bug #467883 (fixed upstream). --- .cvsignore | 2 +- evolution-2.11.90-enable-folder-tree.patch | 48 ------- ...4-candidate-window-position-calendar.patch | 112 ----------------- ...2.7.4-candidate-window-position-task.patch | 110 ---------------- evolution-2.8.0-fix-indic-printing.patch | 74 ----------- evolution-2.8.0-indic-cursor-movement.patch | 117 ------------------ evolution-2.9.4-view-message-source.patch | 11 -- evolution.spec | 37 ++---- sources | 2 +- 9 files changed, 13 insertions(+), 500 deletions(-) delete mode 100644 evolution-2.11.90-enable-folder-tree.patch delete mode 100644 evolution-2.7.4-candidate-window-position-calendar.patch delete mode 100644 evolution-2.7.4-candidate-window-position-task.patch delete mode 100644 evolution-2.8.0-fix-indic-printing.patch delete mode 100644 evolution-2.8.0-indic-cursor-movement.patch delete mode 100644 evolution-2.9.4-view-message-source.patch diff --git a/.cvsignore b/.cvsignore index bbe5278..c0ac320 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.11.90.tar.bz2 +evolution-2.11.91.tar.bz2 diff --git a/evolution-2.11.90-enable-folder-tree.patch b/evolution-2.11.90-enable-folder-tree.patch deleted file mode 100644 index 05c6dfe..0000000 --- a/evolution-2.11.90-enable-folder-tree.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- evolution-2.11.90/mail/mail-component.c.enable-folder-tree 2007-08-18 02:21:45.000000000 -0400 -+++ evolution-2.11.90/mail/mail-component.c 2007-08-18 02:23:54.000000000 -0400 -@@ -652,30 +652,33 @@ enable_folder_tree (GtkWidget *emfb, Gtk - { - char *uri; - CamelURL *selected_curl, *current_curl; -- CamelFolder *folder; -- CamelException ex; - EMFolderView *emfv = (EMFolderView *)emfb; - - /* Currently displayed folder */ -- MessageList *ml = emfv->list; -- folder = ml->folder; -- uri = mail_tools_folder_to_url (folder); -- current_curl = camel_url_new (uri, NULL); -+ uri = mail_tools_folder_to_url (emfv->list->folder); -+ current_curl = uri ? camel_url_new (uri, NULL) : NULL; -+ g_free (uri); - -- /* Selected folder in emft*/ -+ /* Selected folder in emft */ - uri = em_folder_tree_get_selected_uri ((EMFolderTree *) emft); -- folder = mail_tool_uri_to_folder (uri, 0, &ex); -- selected_curl = camel_url_new (uri, NULL); -+ selected_curl = uri ? camel_url_new (uri, NULL) : NULL; - -- if (!camel_url_equal (selected_curl, current_curl)) -- g_signal_emit_by_name (emft, "folder-selected", emft, uri, folder->full_name, uri, folder->folder_flags); -+ if (current_curl && selected_curl && !camel_url_equal (selected_curl, current_curl)) { -+ CamelFolder *folder; -+ CamelException ex; -+ -+ camel_exception_init (&ex); -+ folder = mail_tool_uri_to_folder (uri, 0, &ex); -+ g_signal_emit_by_name ( -+ emft, "folder-selected", emft, uri, -+ folder->full_name, uri, folder->folder_flags); -+ } - - gtk_widget_set_sensitive (emft, TRUE); - - camel_url_free (current_curl); - camel_url_free (selected_curl); - g_free (uri); -- - } - - /* Evolution::Component CORBA methods. */ diff --git a/evolution-2.7.4-candidate-window-position-calendar.patch b/evolution-2.7.4-candidate-window-position-calendar.patch deleted file mode 100644 index f8f4e59..0000000 --- a/evolution-2.7.4-candidate-window-position-calendar.patch +++ /dev/null @@ -1,112 +0,0 @@ ---- evolution-2.7.4/widgets/text/e-text.h.cal 2006-07-13 10:15:56.000000000 -0400 -+++ evolution-2.7.4/widgets/text/e-text.h 2006-07-13 10:18:20.000000000 -0400 -@@ -109,6 +109,7 @@ - - const gchar *text; /* Text to display --- from the ETextModel */ - gint preedit_len; /* preedit length to display */ -+ gint preedit_pos; /* preedit cursor position */ - PangoLayout *layout; - int num_lines; /* Number of lines of text */ - ---- evolution-2.7.4/widgets/text/e-text.c.cal 2006-07-13 10:15:51.000000000 -0400 -+++ evolution-2.7.4/widgets/text/e-text.c 2006-07-13 10:18:20.000000000 -0400 -@@ -132,6 +132,7 @@ - - static void reset_layout_attrs (EText *text); - -+static void update_im_cursor_position (EText *text); - #if 0 - /* GtkEditable Methods */ - static void e_text_editable_do_insert_text (GtkEditable *editable, -@@ -325,6 +326,8 @@ - pango_layout_set_attributes (text->layout, attrs); - pango_attr_list_unref (attrs); - } -+ -+ update_im_cursor_position (text); - } - - if (preedit_string) -@@ -3723,6 +3726,7 @@ - text->model = e_text_model_new (); - text->text = e_text_model_get_text (text->model); - text->preedit_len = 0; -+ text->preedit_pos = 0; - text->layout = NULL; - - text->revert = NULL; -@@ -3840,17 +3844,71 @@ - } - } - -+/* -+ * Fetch cursor location into Strong or Weak positions so as to -+ * display the preedit candidate selection window in the right place -+ */ -+static void -+e_text_get_cursor_locations (EText *text, -+ GdkRectangle *strong_pos, -+ GdkRectangle *weak_pos) -+{ -+ double x1, y1; -+ PangoRectangle pango_strong_pos; -+ PangoRectangle pango_weak_pos; -+ int cx, cy; -+ gint index; -+ -+ gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, NULL, NULL); -+ -+ gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (text)->canvas), &cx, &cy); -+ -+ index = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; -+ -+ pango_layout_get_cursor_pos (text->layout, index + text->preedit_pos, -+ strong_pos ? &pango_strong_pos : NULL, -+ weak_pos ? &pango_weak_pos : NULL); -+ -+ if (strong_pos) { -+ strong_pos->x = x1 - cx - text->xofs_edit + pango_strong_pos.x / PANGO_SCALE; -+ strong_pos->y = y1 - cy - text->yofs_edit + pango_strong_pos.y / PANGO_SCALE; -+ strong_pos->width = 0; -+ strong_pos->height = pango_strong_pos.height / PANGO_SCALE; -+ } -+ -+ if (weak_pos) { -+ weak_pos->x = x1 - cx - text->xofs_edit + pango_weak_pos.x / PANGO_SCALE; -+ weak_pos->y = y1 - cy - text->yofs_edit + pango_weak_pos.y / PANGO_SCALE; -+ weak_pos->width = 0; -+ weak_pos->height = pango_weak_pos.height / PANGO_SCALE; -+ } -+} -+ -+/* Update IM's cursor position to display candidate selection window */ -+static void -+update_im_cursor_position (EText *text) -+{ -+ GdkRectangle area; -+ -+ e_text_get_cursor_locations (text, &area, NULL); -+ -+ gtk_im_context_set_cursor_location (text->im_context, &area); -+} -+ - static void - e_text_preedit_changed_cb (GtkIMContext *context, -- EText *etext) -+ EText *etext) - { - gchar *preedit_string = NULL; -+ gint cursor_pos; - - gtk_im_context_get_preedit_string (context, &preedit_string, -- NULL, NULL); -+ NULL, &cursor_pos); - -+ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); - etext->preedit_len = strlen (preedit_string); -- g_free (preedit_string); -+ etext->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; -+ g_free (preedit_string); - - g_signal_emit (etext, e_text_signals[E_TEXT_KEYPRESS], 0, 0, 0); - } diff --git a/evolution-2.7.4-candidate-window-position-task.patch b/evolution-2.7.4-candidate-window-position-task.patch deleted file mode 100644 index 4ccaa5f..0000000 --- a/evolution-2.7.4-candidate-window-position-task.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- evolution-2.7.4/widgets/table/e-cell-text.c.task 2006-07-13 10:56:19.000000000 -0400 -+++ evolution-2.7.4/widgets/table/e-cell-text.c 2006-07-13 10:56:27.000000000 -0400 -@@ -199,6 +199,7 @@ - gboolean im_context_signals_registered; - - guint16 preedit_length; /* length of preedit string, in bytes */ -+ gint preedit_pos; /* position of preedit cursor */ - - ECellActions actions; - }; -@@ -222,6 +223,7 @@ - static void _insert (ECellTextView *text_view, char *string, int value); - static void _delete_selection (ECellTextView *text_view); - static PangoAttrList* build_attr_list (ECellTextView *text_view, int row, int text_length); -+static void update_im_cursor_location (ECellTextView *tv); - - static ECellClass *parent_class; - -@@ -560,6 +562,9 @@ - if (preedit_attrs) - pango_attr_list_unref (preedit_attrs); - pango_attr_list_unref (attrs); -+ -+ update_im_cursor_location (text_view); -+ - return layout; - } - -@@ -1863,6 +1868,66 @@ - /* IM Context Callbacks */ - - static void -+e_cell_text_get_cursor_locations (ECellTextView *tv, -+ GdkRectangle *strong_pos, -+ GdkRectangle *weak_pos) -+{ -+ GdkRectangle area; -+ CellEdit *edit=tv->edit; -+ ECellView *cell_view = (ECellView *)tv; -+ ETableItem *item = E_TABLE_ITEM ((cell_view)->e_table_item_view); -+ GnomeCanvasItem *parent_item = GNOME_CANVAS_ITEM (item)->parent; -+ PangoRectangle pango_strong_pos; -+ PangoRectangle pango_weak_pos; -+ gint x, y, col, row; -+ gdouble x1,y1; -+ gint cx, cy; -+ gint index; -+ -+ row = edit->row; -+ col = edit->view_col; -+ -+ e_table_item_get_cell_geometry (item, &row, &col, -+ &x, &y, NULL, &area.height); -+ -+ gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (parent_item), &x1, &y1, NULL, NULL); -+ -+ gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (parent_item)->canvas), &cx, &cy); -+ -+ index = edit->selection_end + edit->preedit_pos; -+ -+ pango_layout_get_cursor_pos (edit->layout, -+ index, -+ strong_pos ? &pango_strong_pos : NULL, -+ weak_pos ? &pango_weak_pos : NULL); -+ -+ if (strong_pos) { -+ strong_pos->x = x + x1 - cx - edit->xofs_edit + pango_strong_pos.x / PANGO_SCALE; -+ strong_pos->y = y + y1 - cy - edit->yofs_edit + pango_strong_pos.y / PANGO_SCALE; -+ strong_pos->width = 0; -+ strong_pos->height = pango_strong_pos.height / PANGO_SCALE; -+ } -+ -+ if (weak_pos) { -+ weak_pos->x = x + x1 - cx - edit->xofs_edit + pango_weak_pos.x / PANGO_SCALE; -+ weak_pos->y = y + y1 - cy - edit->yofs_edit + pango_weak_pos.y / PANGO_SCALE; -+ weak_pos->width = 0; -+ weak_pos->height = pango_weak_pos.height / PANGO_SCALE; -+ } -+} -+ -+static void -+update_im_cursor_location (ECellTextView *tv) -+{ -+ CellEdit *edit=tv->edit; -+ GdkRectangle area; -+ -+ e_cell_text_get_cursor_locations (tv, &area, NULL); -+ -+ gtk_im_context_set_cursor_location (edit->im_context, &area); -+} -+ -+static void - e_cell_text_preedit_changed_cb (GtkIMContext *context, - ECellTextView *tv) - { -@@ -1871,10 +1936,12 @@ - CellEdit *edit=tv->edit; - gtk_im_context_get_preedit_string (edit->im_context, &preedit_string, - NULL, &cursor_pos); -- -+ - edit->preedit_length = strlen (preedit_string); -- cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); -+ cursor_pos = CLAMP (cursor_pos, 0, g_utf8_strlen (preedit_string, -1)); -+ edit->preedit_pos = g_utf8_offset_to_pointer (preedit_string, cursor_pos) - preedit_string; - g_free (preedit_string); -+ - ect_queue_redraw (tv, edit->view_col, edit->row); - } - diff --git a/evolution-2.8.0-fix-indic-printing.patch b/evolution-2.8.0-fix-indic-printing.patch deleted file mode 100644 index 7eb8585..0000000 --- a/evolution-2.8.0-fix-indic-printing.patch +++ /dev/null @@ -1,74 +0,0 @@ ---- evolution-2.11.2/plugins/print-message/print-message.c.fix-indic-printing 2007-05-13 13:41:09.000000000 -0400 -+++ evolution-2.11.2/plugins/print-message/print-message.c 2007-05-18 15:32:12.000000000 -0400 -@@ -65,7 +65,7 @@ - EMFormatHTMLPrint *efhp; - - action = GTK_PRINT_OPERATION_ACTION_PREVIEW; -- message = e_msg_composer_get_message (composer, 1); -+ message = e_msg_composer_get_message_print (composer, 1); - - efhp = em_format_html_print_new (NULL, action); - em_format_html_print_raw_message (efhp, message); ---- evolution-2.11.2/composer/e-msg-composer.h.fix-indic-printing 2007-04-18 06:17:34.000000000 -0400 -+++ evolution-2.11.2/composer/e-msg-composer.h 2007-05-18 15:30:56.000000000 -0400 -@@ -101,6 +101,8 @@ - CamelMimePart *part); - CamelMimeMessage *e_msg_composer_get_message (EMsgComposer *composer, - gboolean save_html_object_data); -+CamelMimeMessage *e_msg_composer_get_message_print (EMsgComposer *composer, -+ gboolean save_html_object_data); - CamelMimeMessage *e_msg_composer_get_message_draft (EMsgComposer *composer); - void e_msg_composer_show_sig_file (EMsgComposer *composer); - gboolean e_msg_composer_get_send_html (EMsgComposer *composer); ---- evolution-2.11.2/composer/e-msg-composer.c.fix-indic-printing 2007-04-18 06:17:34.000000000 -0400 -+++ evolution-2.11.2/composer/e-msg-composer.c 2007-05-18 15:30:56.000000000 -0400 -@@ -5273,6 +5273,49 @@ - } - - CamelMimeMessage * -+e_msg_composer_get_message_print (EMsgComposer *composer, gboolean save_html_object_data) -+{ -+ EMsgComposer *temp_composer; -+ CamelMimeMessage *msg; -+ GString *flags; -+ -+ msg = build_message (composer, save_html_object_data); -+ temp_composer = e_msg_composer_new_with_message (msg); -+ camel_object_unref (msg); -+ -+ /* build flags string */ -+ flags = g_string_sized_new (128); -+ if (temp_composer->priv->send_html) -+ g_string_append (flags, "text/html"); -+ else -+ g_string_append (flags, "text/plain"); -+ if (temp_composer->priv->pgp_sign) -+ g_string_append (flags, ", pgp-sign"); -+ if (temp_composer->priv->pgp_encrypt) -+ g_string_append (flags, ", pgp-encrypt"); -+ if (temp_composer->priv->smime_sign) -+ g_string_append (flags, ", smime-sign"); -+ if (temp_composer->priv->smime_encrypt) -+ g_string_append (flags, ", smime-encrypt"); -+ -+ /* override composer flags */ -+ temp_composer->priv->send_html = TRUE; -+ temp_composer->priv->pgp_sign = FALSE; -+ temp_composer->priv->pgp_encrypt = FALSE; -+ temp_composer->priv->smime_sign = FALSE; -+ temp_composer->priv->smime_encrypt = FALSE; -+ -+ msg = build_message (temp_composer, save_html_object_data); -+ camel_medium_set_header (CAMEL_MEDIUM (msg), -+ "X-Evolution-Format", flags->str); -+ -+ e_msg_composer_delete (temp_composer); -+ g_string_free (flags, TRUE); -+ -+ return msg; -+} -+ -+CamelMimeMessage * - e_msg_composer_get_message_draft (EMsgComposer *composer) - { - CamelMimeMessage *msg; diff --git a/evolution-2.8.0-indic-cursor-movement.patch b/evolution-2.8.0-indic-cursor-movement.patch deleted file mode 100644 index 6e5a95f..0000000 --- a/evolution-2.8.0-indic-cursor-movement.patch +++ /dev/null @@ -1,117 +0,0 @@ ---- evolution-2.8.0/widgets/text/e-text.c.indic-cursor-movement 2006-09-13 14:53:39.000000000 -0400 -+++ evolution-2.8.0/widgets/text/e-text.c 2006-09-13 14:53:48.000000000 -0400 -@@ -2876,6 +2876,76 @@ - } - } - -+ -+ -+/* direction = TRUE (move forward), FALSE (move backward) -+ Any error shall return length(text->text) or 0 or text->selection_end (as deemed fit) */ -+static int -+_get_updated_position (EText *text, gboolean direction) -+{ -+ PangoLogAttr *log_attrs = NULL; -+ gint n_attrs; -+ char *p = NULL; -+ gint new_pos = 0; -+ gint length = 0; -+ -+ /* Basic sanity test, return whatever position we are currently at. */ -+ g_return_val_if_fail (text->layout != NULL, text->selection_end); -+ -+ length = g_utf8_strlen (text->text, -1); -+ -+ /* length checks to make sure we are not wandering off into nonexistant memory... */ -+ if((text->selection_end >= length) && (TRUE == direction)) /* forward */ -+ return length; -+ /* checking for -ve value wont hurt! */ -+ if((text->selection_end <= 0) && (FALSE == direction)) /* backward */ -+ return 0; -+ -+ /* check for validness of full text->text */ -+ if(!g_utf8_validate(text->text, -1, NULL)) -+ return text->selection_end; -+ -+ /* get layout's PangoLogAttr to facilitate moving when moving across grapheme cluster as in indic langs */ -+ pango_layout_get_log_attrs (text->layout, &log_attrs, &n_attrs); -+ -+ /* Fetch the current char index in the line & keep moving -+ forward until we can display cursor */ -+ p = g_utf8_offset_to_pointer (text->text, text->selection_end); -+ -+ new_pos = text->selection_end; -+ while(1) -+ { -+ /* check before moving forward/backwards if we have more chars to move or not */ -+ if(TRUE == direction) -+ p = g_utf8_next_char (p); -+ else -+ p = g_utf8_prev_char (p); -+ -+ /* validate the new string & return with original position if check fails */ -+ if(!g_utf8_validate (p, -1, NULL)) -+ break; /* will return old value of new_pos */ -+ -+ new_pos = g_utf8_pointer_to_offset (text->text, p); -+ -+ /* if is_cursor_position is set, cursor can appear in front of character. -+ i.e. this is a grapheme boundary AND make some sanity checks */ -+ if((new_pos >=0) && (new_pos < n_attrs) && (log_attrs[new_pos].is_cursor_position)) -+ break; -+ else if((new_pos < 0) || (new_pos >= n_attrs)) -+ { -+ new_pos = text->selection_end; -+ break; -+ } -+ } -+ -+ if(log_attrs) -+ g_free(log_attrs); -+ -+ return new_pos; -+} -+ -+ -+ - static int - _get_position(EText *text, ETextEventProcessorCommand *command) - { -@@ -2951,15 +3021,14 @@ - if (text->selection_end >= length) - new_pos = length; - else -- new_pos = text->selection_end + 1; -- -+ new_pos = _get_updated_position(text, TRUE); /* get updated position to display cursor */ -+ - break; - - case E_TEP_BACKWARD_CHARACTER: - new_pos = 0; -- if (text->selection_end >= 1) { -- new_pos = text->selection_end - 1; -- } -+ if (text->selection_end >= 1) -+ new_pos = _get_updated_position(text, FALSE); /* get updated position to display cursor */ - - break; - -@@ -3341,6 +3410,7 @@ - if (!text->layout) - create_layout (text); - -+ /* We move cursor only if scroll is TRUE */ - if (scroll && !text->button_down) { - /* XXX do we really need the @trailing logic here? if - we don't we can scrap the loop and just use -@@ -3349,7 +3419,9 @@ - int selection_index; - PangoLayoutIter *iter = pango_layout_get_iter (text->layout); - -+ /* check if we are using selection_start or selection_end for moving? */ - selection_index = use_start ? text->selection_start : text->selection_end; -+ - /* convert to a byte index */ - selection_index = g_utf8_offset_to_pointer (text->text, selection_index) - text->text; - diff --git a/evolution-2.9.4-view-message-source.patch b/evolution-2.9.4-view-message-source.patch deleted file mode 100644 index bd0ed6d..0000000 --- a/evolution-2.9.4-view-message-source.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.9.4/mail/em-format-html.c.view-message-source 2006-12-20 10:51:00.000000000 -0500 -+++ evolution-2.9.4/mail/em-format-html.c 2006-12-21 10:08:02.000000000 -0500 -@@ -1872,7 +1872,7 @@ - filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream); - html_filter = camel_mime_filter_tohtml_new (CAMEL_MIME_FILTER_TOHTML_CONVERT_NL - | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES -- | CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT, 0); -+ | CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0); - camel_stream_filter_add(filtered_stream, html_filter); - camel_object_unref(html_filter); - diff --git a/evolution.spec b/evolution.spec index 07d3b9a..45eb7e1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.11.90 -Release: 4%{?dist} +Version: 2.11.91 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -88,24 +88,12 @@ Patch16: evolution-2.7.1-no-gnome-common.patch #Patch17: evolution-2.7.1-notification-cleanups.patch -# RH bug #157400 / GNOME bug #303877 -Patch18: evolution-2.7.4-candidate-window-position-task.patch - -# RH bug #157505 / GNOME bug #303878 -Patch19: evolution-2.7.4-candidate-window-position-calendar.patch - # RH bug #166231 / GNOME bug #264485 Patch20: evolution-2.7.3-replicated-cjk-input.patch # RH bug #178295 / GNOME bug #348638 Patch21: evolution-2.7.4-deleting-preedit-buffer.patch -# RH bug #161885 / GNOME bug #309166 -Patch23: evolution-2.8.0-indic-cursor-movement.patch - -# RH bug #202751 / GNOME bug #355766 -Patch24: evolution-2.8.0-fix-indic-printing.patch - # GNOME bug #362638 Patch25: evolution-2.8.1-kill-ethread.patch @@ -127,18 +115,12 @@ Patch30: evolution-2.9.3-source-path-entry.patch # RH bug #215467 / GNOME bug #380644 Patch31: evolution-2.9.3-meeting-list-view.patch -# GNOME bug #218898 -Patch32: evolution-2.9.4-view-message-source.patch - # GNOME bug #376991 Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch -# RH bug #253348 / GNOME bug #467883 -Patch35: evolution-2.11.90-enable-folder-tree.patch - ## Dependencies ### Requires(post): GConf2 @@ -259,12 +241,8 @@ Development files needed for building things which link against evolution. %patch15 -p1 -b .fix-conduit-dir %patch16 -p1 -b .no-gnome-common #patch17 -p1 -b .notification-cleanups -%patch18 -p1 -b .candidate-window-position-task -%patch19 -p1 -b .candidate-window-position-calendar %patch20 -p1 -b .replicated-cjk-input %patch21 -p1 -b .deleting-preedit-buffer -%patch23 -p1 -b .indic-cursor-movement -%patch24 -p1 -b .fix-indic-printing %patch25 -p1 -b .kill-ethread %patch26 -p1 -b .kill-ememory %patch27 -p1 -b .im-context-reset @@ -272,10 +250,8 @@ Development files needed for building things which link against evolution. #%patch29 -p1 -b .view-attachment-uri %patch30 -p1 -b .source-path-entry %patch31 -p1 -b .meeting-list-view -%patch32 -p1 -b .view-message-source %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box -%patch35 -p1 -b .enable-folder-tree mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -718,6 +694,15 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Aug 28 2007 Milan Crha - 2.11.91-1.fc8 +- Update to 2.11.91 +- Removed patch for RH bug #157400 / GNOME bug #303877 (fixed upstream). +- Removed patch for RH bug #157505 / GNOME bug #303878 (fixed upstream). +- Removed patch for RH bug #161885 / GNOME bug #309166 (fixed upstream). +- Removed patch for RH bug #202751 / GNOME bug #355766 (fixed upstream). +- Removed patch for RH bug #218898 / GNOME bug #385414 (fixed upstream). +- Removed patch for RH bug #253348 / GNOME bug #467883 (fixed upstream). + * Thu Aug 23 2007 Matthew Barnes - 2.11.90-4.fc8 - Obsolete the evolution-bogofilter package. diff --git a/sources b/sources index db4ea2d..42b4b0a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50b811f8799ef4e7143a53ffd1709c2b evolution-2.11.90.tar.bz2 +aeeedfac1769b5d24a61fb76d40f4b5f evolution-2.11.91.tar.bz2 From 2a124734f1d81e3881378f4d9f1ad7d89b8bb0f8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Aug 2007 19:02:58 +0000 Subject: [PATCH 159/844] - Fix compilation breakage caused by our strict build settings. --- evolution-2.11.91-compilation-breakage.patch | 11 +++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) create mode 100644 evolution-2.11.91-compilation-breakage.patch diff --git a/evolution-2.11.91-compilation-breakage.patch b/evolution-2.11.91-compilation-breakage.patch new file mode 100644 index 0000000..9c3e4f1 --- /dev/null +++ b/evolution-2.11.91-compilation-breakage.patch @@ -0,0 +1,11 @@ +--- evolution-2.11.91/calendar/gui/e-cal-popup.c.compilation-breakage 2007-08-24 02:50:09.000000000 -0400 ++++ evolution-2.11.91/calendar/gui/e-cal-popup.c 2007-08-28 15:01:22.000000000 -0400 +@@ -693,7 +693,7 @@ + + source = e_source_selector_peek_primary_selection (selector); + uri = e_source_get_uri (source); +- if (!uri || (g_strncasecmp (uri, "file://", 7) && g_strncasecmp (uri, "contacts://", 11))) { ++ if (!uri || (g_ascii_strncasecmp (uri, "file://", 7) && g_ascii_strncasecmp (uri, "contacts://", 11))) { + /* check for e_target_selector's offline_status property here */ + offline = e_source_get_property (source, "offline"); + diff --git a/evolution.spec b/evolution.spec index 45eb7e1..33e06ad 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.91 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -121,6 +121,9 @@ Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch +# The usual compilation breakage... +Patch35: evolution-2.11.91-compilation-breakage.patch + ## Dependencies ### Requires(post): GConf2 @@ -252,6 +255,7 @@ Development files needed for building things which link against evolution. %patch31 -p1 -b .meeting-list-view %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box +%patch35 -p1 -b .compilation-breakage mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -694,6 +698,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Tue Aug 28 2007 Matthew Barnes - 2.11.91-2.fc8 +- Fix compilation breakage caused by our strict build settings. + * Tue Aug 28 2007 Milan Crha - 2.11.91-1.fc8 - Update to 2.11.91 - Removed patch for RH bug #157400 / GNOME bug #303877 (fixed upstream). From 516b80a3c332087880a16dbbd3b20837ad3ccf46 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Aug 2007 20:14:30 +0000 Subject: [PATCH 160/844] - Fix compilation breakage caused by our strict build settings. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 33e06ad..1d1c838 100644 --- a/evolution.spec +++ b/evolution.spec @@ -412,7 +412,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-attachment-reminder.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 @@ -432,7 +432,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-attachment-reminder.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 From 5bb8f2a27c3b082ec87819ae188d4a5aef761d6d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 29 Aug 2007 22:40:09 +0000 Subject: [PATCH 161/844] - Revise patch for GNOME bug #362638 to fix GNOME bug #357175 (Evolution fails to close after IMAP alert has been displayed). --- evolution-2.8.1-kill-ethread.patch | 391 +++++++++++++++++------------ evolution.spec | 6 +- 2 files changed, 229 insertions(+), 168 deletions(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 8bbd0be..c4efbc8 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,5 +1,6 @@ ---- evolution-2.11.90/mail/mail-send-recv.c.kill-ethread 2007-07-28 17:08:12.000000000 -0400 -+++ evolution-2.11.90/mail/mail-send-recv.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/mail-send-recv.c.kill-ethread evolution-2.11.91/mail/mail-send-recv.c +--- evolution-2.11.91/mail/mail-send-recv.c.kill-ethread 2007-07-28 17:08:12.000000000 -0400 ++++ evolution-2.11.91/mail/mail-send-recv.c 2007-08-29 17:39:34.000000000 -0400 @@ -770,23 +770,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ @@ -82,9 +83,10 @@ } else { receive_done ("", data); } ---- evolution-2.11.90/mail/mail-component.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 -+++ evolution-2.11.90/mail/mail-component.c 2007-08-15 13:37:37.000000000 -0400 -@@ -1001,7 +1001,7 @@ impl_handleURI (PortableServer_Servant s +diff -up evolution-2.11.91/mail/mail-component.c.kill-ethread evolution-2.11.91/mail/mail-component.c +--- evolution-2.11.91/mail/mail-component.c.kill-ethread 2007-08-24 02:49:43.000000000 -0400 ++++ evolution-2.11.91/mail/mail-component.c 2007-08-29 17:39:34.000000000 -0400 +@@ -1005,7 +1005,7 @@ impl_handleURI (PortableServer_Servant s if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); @@ -93,8 +95,9 @@ g_free(curi); } else { g_warning("email uri's must include a uid parameter"); ---- evolution-2.11.90/mail/mail-ops.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.90/mail/mail-ops.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/mail-ops.c +--- evolution-2.11.91/mail/mail-ops.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.91/mail/mail-ops.c 2007-08-29 17:39:34.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -2224,8 +2227,9 @@ return id; } ---- evolution-2.11.90/mail/em-folder-utils.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 -+++ evolution-2.11.90/mail/em-folder-utils.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-folder-utils.c.kill-ethread evolution-2.11.91/mail/em-folder-utils.c +--- evolution-2.11.91/mail/em-folder-utils.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.91/mail/em-folder-utils.c 2007-08-29 17:39:34.000000000 -0400 @@ -85,7 +85,7 @@ emfu_is_special_local_folder (const char } @@ -2453,8 +2457,9 @@ return id; } ---- evolution-2.11.90/mail/importers/elm-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 -+++ evolution-2.11.90/mail/importers/elm-importer.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/importers/elm-importer.c.kill-ethread evolution-2.11.91/mail/importers/elm-importer.c +--- evolution-2.11.91/mail/importers/elm-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.91/mail/importers/elm-importer.c 2007-08-29 17:39:34.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x @@ -2553,8 +2558,9 @@ return id; } ---- evolution-2.11.90/mail/importers/mail-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 -+++ evolution-2.11.90/mail/importers/mail-importer.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/importers/mail-importer.c.kill-ethread evolution-2.11.91/mail/importers/mail-importer.c +--- evolution-2.11.91/mail/importers/mail-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.91/mail/importers/mail-importer.c 2007-08-29 17:39:34.000000000 -0400 @@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } @@ -2691,8 +2697,9 @@ } struct _import_folders_data { ---- evolution-2.11.90/mail/importers/pine-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 -+++ evolution-2.11.90/mail/importers/pine-importer.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/importers/pine-importer.c.kill-ethread evolution-2.11.91/mail/importers/pine-importer.c +--- evolution-2.11.91/mail/importers/pine-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 ++++ evolution-2.11.91/mail/importers/pine-importer.c 2007-08-29 17:39:34.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x @@ -2792,9 +2799,10 @@ return id; } ---- evolution-2.11.90/mail/em-utils.c.kill-ethread 2007-08-15 13:37:37.000000000 -0400 -+++ evolution-2.11.90/mail/em-utils.c 2007-08-15 13:37:37.000000000 -0400 -@@ -1908,7 +1908,7 @@ em_utils_in_addressbook(CamelInternetAdd +diff -up evolution-2.11.91/mail/em-utils.c.kill-ethread evolution-2.11.91/mail/em-utils.c +--- evolution-2.11.91/mail/em-utils.c.kill-ethread 2007-08-29 17:39:34.000000000 -0400 ++++ evolution-2.11.91/mail/em-utils.c 2007-08-29 17:39:34.000000000 -0400 +@@ -1912,7 +1912,7 @@ em_utils_in_addressbook(CamelInternetAdd ESource *source = s->data; GList *contacts; EBook *book; @@ -2803,8 +2811,9 @@ d(printf(" checking '%s'\n", e_source_get_uri(source))); ---- evolution-2.11.90/mail/mail-vfolder.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 -+++ evolution-2.11.90/mail/mail-vfolder.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/mail-vfolder.c.kill-ethread evolution-2.11.91/mail/mail-vfolder.c +--- evolution-2.11.91/mail/mail-vfolder.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 ++++ evolution-2.11.91/mail/mail-vfolder.c 2007-08-29 17:39:34.000000000 -0400 @@ -21,7 +21,7 @@ */ @@ -3039,8 +3048,9 @@ from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); ---- evolution-2.11.90/mail/em-format-html.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 -+++ evolution-2.11.90/mail/em-format-html.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-format-html.c.kill-ethread evolution-2.11.91/mail/em-format-html.c +--- evolution-2.11.91/mail/em-format-html.c.kill-ethread 2007-08-27 02:14:40.000000000 -0400 ++++ evolution-2.11.91/mail/em-format-html.c 2007-08-29 17:39:34.000000000 -0400 @@ -165,7 +165,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); @@ -3050,7 +3060,7 @@ efh->priv->format_timeout_msg = NULL; } -@@ -1193,7 +1193,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc +@@ -1202,7 +1202,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { @@ -3059,7 +3069,7 @@ EMFormatHTML *format; EMFormat *format_source; -@@ -1203,14 +1203,15 @@ struct _format_msg { +@@ -1212,14 +1212,15 @@ struct _format_msg { CamelMimeMessage *message; }; @@ -3078,7 +3088,7 @@ struct _EMFormatHTMLJob *job; struct _EMFormatPURITree *puri_level; int cancelled = FALSE; -@@ -1295,10 +1296,9 @@ static void efh_format_do(struct _mail_m +@@ -1304,10 +1305,9 @@ static void efh_format_do(struct _mail_m ((EMFormat *)m->format)->pending_uri_level = puri_level; } @@ -3091,7 +3101,7 @@ d(printf("formatting finished\n")); m->format->load_http_now = FALSE; -@@ -1306,10 +1306,9 @@ static void efh_format_done(struct _mail +@@ -1315,10 +1315,9 @@ static void efh_format_done(struct _mail g_signal_emit_by_name(m->format, "complete"); } @@ -3104,7 +3114,7 @@ d(printf("formatter freed\n")); g_object_unref(m->format); if (m->estream) { -@@ -1325,11 +1324,12 @@ static void efh_format_free(struct _mail +@@ -1334,11 +1333,12 @@ static void efh_format_free(struct _mail g_object_unref(m->format_source); } @@ -3122,7 +3132,7 @@ }; static gboolean -@@ -1340,7 +1340,7 @@ efh_format_timeout(struct _format_msg *m +@@ -1349,7 +1349,7 @@ efh_format_timeout(struct _format_msg *m struct _EMFormatHTMLPrivate *p = efh->priv; if (m->format->html == NULL) { @@ -3131,7 +3141,7 @@ return FALSE; } -@@ -1368,7 +1368,7 @@ efh_format_timeout(struct _format_msg *m +@@ -1377,7 +1377,7 @@ efh_format_timeout(struct _format_msg *m if (m->message == NULL) { hstream = gtk_html_begin(efh->html); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); @@ -3140,7 +3150,7 @@ p->last_part = NULL; } else { hstream = gtk_html_begin(efh->html); -@@ -1392,8 +1392,8 @@ efh_format_timeout(struct _format_msg *m +@@ -1401,8 +1401,8 @@ efh_format_timeout(struct _format_msg *m p->last_part = m->message; } @@ -3151,7 +3161,7 @@ } efh->priv->format_timeout_id = 0; -@@ -1417,11 +1417,11 @@ static void efh_format_clone(EMFormat *e +@@ -1426,11 +1426,11 @@ static void efh_format_clone(EMFormat *e d(printf(" timeout for last still active, removing ...\n")); g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3165,8 +3175,9 @@ m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; ---- evolution-2.11.90/mail/em-folder-properties.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 -+++ evolution-2.11.90/mail/em-folder-properties.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-folder-properties.c.kill-ethread evolution-2.11.91/mail/em-folder-properties.c +--- evolution-2.11.91/mail/em-folder-properties.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 ++++ evolution-2.11.91/mail/em-folder-properties.c 2007-08-29 17:39:34.000000000 -0400 @@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } @@ -3176,8 +3187,9 @@ else emfp_dialog_got_folder((char *)uri, folder, NULL); } ---- evolution-2.11.90/mail/em-folder-tree.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 -+++ evolution-2.11.90/mail/em-folder-tree.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-folder-tree.c.kill-ethread evolution-2.11.91/mail/em-folder-tree.c +--- evolution-2.11.91/mail/em-folder-tree.c.kill-ethread 2007-08-24 02:49:43.000000000 -0400 ++++ evolution-2.11.91/mail/em-folder-tree.c 2007-08-29 17:39:34.000000000 -0400 @@ -835,7 +835,7 @@ fail: /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ @@ -3415,9 +3427,10 @@ } static gboolean ---- evolution-2.11.90/mail/em-folder-browser.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 -+++ evolution-2.11.90/mail/em-folder-browser.c 2007-08-15 13:37:37.000000000 -0400 -@@ -836,7 +836,7 @@ get_view_query (ESearchBar *esb) +diff -up evolution-2.11.91/mail/em-folder-browser.c.kill-ethread evolution-2.11.91/mail/em-folder-browser.c +--- evolution-2.11.91/mail/em-folder-browser.c.kill-ethread 2007-08-27 01:55:18.000000000 -0400 ++++ evolution-2.11.91/mail/em-folder-browser.c 2007-08-29 17:39:34.000000000 -0400 +@@ -851,7 +851,7 @@ get_view_query (ESearchBar *esb) struct _setup_msg { @@ -3426,7 +3439,7 @@ CamelFolder *folder; char *query; -@@ -844,16 +844,15 @@ struct _setup_msg { +@@ -859,16 +859,15 @@ struct _setup_msg { GList *sources_folder; }; @@ -3446,7 +3459,7 @@ GList *l, *list = NULL; CamelFolder *folder; -@@ -864,12 +863,12 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -879,12 +878,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3461,7 +3474,7 @@ } l = l->next; } -@@ -893,17 +892,13 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -908,17 +907,13 @@ vfolder_setup_do(struct _mail_msg *mm) } static void @@ -3481,7 +3494,7 @@ GList *l; camel_object_unref(m->folder); -@@ -924,11 +919,12 @@ vfolder_setup_free (struct _mail_msg *mm +@@ -939,11 +934,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } @@ -3499,7 +3512,7 @@ }; /* sources_uri should be camel uri's */ -@@ -938,15 +934,15 @@ vfolder_setup(CamelFolder *folder, const +@@ -953,15 +949,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; @@ -3518,8 +3531,9 @@ return id; } ---- evolution-2.11.90/mail/message-list.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 -+++ evolution-2.11.90/mail/message-list.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/message-list.c.kill-ethread evolution-2.11.91/mail/message-list.c +--- evolution-2.11.91/mail/message-list.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 ++++ evolution-2.11.91/mail/message-list.c 2007-08-29 17:39:34.000000000 -0400 @@ -1841,7 +1841,7 @@ ml_tree_drag_data_get (ETree *tree, int /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ @@ -3796,8 +3810,9 @@ m->ml = ml; m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); ---- evolution-2.11.90/mail/em-sync-stream.h.kill-ethread 2007-07-05 02:09:39.000000000 -0400 -+++ evolution-2.11.90/mail/em-sync-stream.h 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-sync-stream.h.kill-ethread evolution-2.11.91/mail/em-sync-stream.h +--- evolution-2.11.91/mail/em-sync-stream.h.kill-ethread 2007-07-05 02:09:39.000000000 -0400 ++++ evolution-2.11.91/mail/em-sync-stream.h 2007-08-29 17:39:34.000000000 -0400 @@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H @@ -3874,8 +3889,9 @@ +G_END_DECLS #endif /* EM_SYNC_STREAM_H */ ---- evolution-2.11.90/mail/em-format-html-print.c.kill-ethread 2007-07-08 22:46:50.000000000 -0400 -+++ evolution-2.11.90/mail/em-format-html-print.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-format-html-print.c.kill-ethread evolution-2.11.91/mail/em-format-html-print.c +--- evolution-2.11.91/mail/em-format-html-print.c.kill-ethread 2007-07-08 22:46:50.000000000 -0400 ++++ evolution-2.11.91/mail/em-format-html-print.c 2007-08-29 17:39:34.000000000 -0400 @@ -228,7 +228,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); @@ -3885,8 +3901,9 @@ } void ---- evolution-2.11.90/mail/em-sync-stream.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.90/mail/em-sync-stream.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-sync-stream.c.kill-ethread evolution-2.11.91/mail/em-sync-stream.c +--- evolution-2.11.91/mail/em-sync-stream.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.91/mail/em-sync-stream.c 2007-08-29 17:39:34.000000000 -0400 @@ -25,42 +25,17 @@ #include #endif @@ -4109,7 +4126,7 @@ static void -sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) +emss_sync_op (EMSyncStream *emss, enum _write_msg_t op, -+ const gchar *string, gsize len) ++ const gchar *string, gsize len) { - struct _EMSyncStreamPrivate *p = emss->priv; struct _write_msg msg; @@ -4312,8 +4329,9 @@ + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } ---- evolution-2.11.90/mail/em-subscribe-editor.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 -+++ evolution-2.11.90/mail/em-subscribe-editor.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-subscribe-editor.c.kill-ethread evolution-2.11.91/mail/em-subscribe-editor.c +--- evolution-2.11.91/mail/em-subscribe-editor.c.kill-ethread 2007-08-24 02:49:43.000000000 -0400 ++++ evolution-2.11.91/mail/em-subscribe-editor.c 2007-08-29 17:39:34.000000000 -0400 @@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ @@ -4529,8 +4547,9 @@ sub_unref(sub); } ---- evolution-2.11.90/mail/mail-mt.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.90/mail/mail-mt.h 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/mail-mt.h.kill-ethread evolution-2.11.91/mail/mail-mt.h +--- evolution-2.11.91/mail/mail-mt.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.91/mail/mail-mt.h 2007-08-29 17:39:34.000000000 -0400 @@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4642,8 +4661,9 @@ /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; ---- evolution-2.11.90/mail/mail-ops.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.90/mail/mail-ops.h 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/mail-ops.h.kill-ethread evolution-2.11.91/mail/mail-ops.h +--- evolution-2.11.91/mail/mail-ops.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.91/mail/mail-ops.h 2007-08-29 17:39:34.000000000 -0400 @@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ @@ -4684,8 +4704,9 @@ /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, ---- evolution-2.11.90/mail/em-composer-utils.c.kill-ethread 2007-07-28 15:37:58.000000000 -0400 -+++ evolution-2.11.90/mail/em-composer-utils.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-composer-utils.c.kill-ethread evolution-2.11.91/mail/em-composer-utils.c +--- evolution-2.11.91/mail/em-composer-utils.c.kill-ethread 2007-08-24 02:49:43.000000000 -0400 ++++ evolution-2.11.91/mail/em-composer-utils.c 2007-08-29 17:39:34.000000000 -0400 @@ -553,7 +553,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; @@ -4729,8 +4750,9 @@ - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } ---- evolution-2.11.90/mail/mail-folder-cache.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 -+++ evolution-2.11.90/mail/mail-folder-cache.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/mail-folder-cache.c.kill-ethread evolution-2.11.91/mail/mail-folder-cache.c +--- evolution-2.11.91/mail/mail-folder-cache.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 ++++ evolution-2.11.91/mail/mail-folder-cache.c 2007-08-29 17:39:34.000000000 -0400 @@ -862,15 +862,14 @@ update_folders(CamelStore *store, CamelF @@ -4816,8 +4838,9 @@ LOCK(info_lock); ---- evolution-2.11.90/mail/em-folder-view.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 -+++ evolution-2.11.90/mail/em-folder-view.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/em-folder-view.c.kill-ethread evolution-2.11.91/mail/em-folder-view.c +--- evolution-2.11.91/mail/em-folder-view.c.kill-ethread 2007-08-27 01:55:18.000000000 -0400 ++++ evolution-2.11.91/mail/em-folder-view.c 2007-08-29 17:39:34.000000000 -0400 @@ -71,6 +71,7 @@ #include @@ -4826,7 +4849,7 @@ #include "menus/gal-view-etable.h" #include "menus/gal-view-factory-etable.h" -@@ -701,7 +702,7 @@ emfv_got_folder(char *uri, CamelFolder * +@@ -777,7 +778,7 @@ emfv_got_folder(char *uri, CamelFolder * static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) { @@ -4835,7 +4858,7 @@ } static void -@@ -1676,7 +1677,7 @@ filter_type_uid (CamelFolder *folder, co +@@ -1752,7 +1753,7 @@ filter_type_uid (CamelFolder *folder, co data->type = type; data->source = source; @@ -4844,7 +4867,7 @@ } static void -@@ -1774,7 +1775,7 @@ vfolder_type_uid (CamelFolder *folder, c +@@ -1850,7 +1851,7 @@ vfolder_type_uid (CamelFolder *folder, c data->type = type; data->uri = g_strdup (uri); @@ -4853,7 +4876,7 @@ } static void -@@ -2419,7 +2420,7 @@ emfv_message_selected_timeout(void *data +@@ -2418,7 +2419,7 @@ emfv_message_selected_timeout(void *data emfv->displayed_uid); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); */ @@ -4862,8 +4885,9 @@ } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); ---- evolution-2.11.90/mail/mail-session.c.kill-ethread 2007-07-09 01:14:13.000000000 -0400 -+++ evolution-2.11.90/mail/mail-session.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/mail/mail-session.c +--- evolution-2.11.91/mail/mail-session.c.kill-ethread 2007-08-27 01:55:18.000000000 -0400 ++++ evolution-2.11.91/mail/mail-session.c 2007-08-29 17:39:34.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -4873,7 +4897,7 @@ #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -264,21 +264,22 @@ forget_password (CamelSession *session, +@@ -264,148 +264,145 @@ forget_password (CamelSession *session, /* ********************************************************************** */ @@ -4900,13 +4924,15 @@ /* clicked, send back the reply */ static void -@@ -286,122 +287,116 @@ user_message_response (GtkDialog *dialog + user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m) { gtk_widget_destroy ((GtkWidget *) dialog); - +- - message_dialog = NULL; +- ++ + user_message_dialog = NULL; - ++ /* if !allow_cancel, then we've already replied */ if (m->allow_cancel) { m->result = button == GTK_RESPONSE_OK; @@ -4963,6 +4989,22 @@ - break; - default: - type = 0; +- } +- +- if (m->allow_cancel) +- type += 3; +- +- message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL); +- g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); +- +- /* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */ +- if (m->allow_cancel) { +- if (m->ismain) { +- user_message_response(message_dialog, gtk_dialog_run (message_dialog), m); +- } else { +- g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m); +- gtk_widget_show ((GtkWidget *) message_dialog); +- } + case CAMEL_SESSION_ALERT_INFO: + error_type = m->allow_cancel ? + "mail:session-message-info-cancel" : @@ -4980,36 +5022,27 @@ + break; + default: + g_assert_not_reached (); - } - -- if (m->allow_cancel) -- type += 3; -- -- message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL); -- g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); -+ user_message_dialog = e_error_new(NULL, error_type, m->prompt, NULL); -+ g_object_set (user_message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); - - /* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */ - if (m->allow_cancel) { - if (m->ismain) { -- user_message_response(message_dialog, gtk_dialog_run (message_dialog), m); -+ user_message_response(user_message_dialog, gtk_dialog_run (user_message_dialog), m); - } else { -- g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m); -- gtk_widget_show ((GtkWidget *) message_dialog); -+ g_signal_connect (user_message_dialog, "response", G_CALLBACK (user_message_response), m); -+ gtk_widget_show (user_message_dialog); - } ++ } ++ ++ user_message_dialog = e_error_new (NULL, error_type, m->prompt, NULL); ++ g_object_set ( ++ user_message_dialog, "allow_shrink", TRUE, ++ "allow_grow", TRUE, NULL); ++ ++ /* We only need to wait for the result if we allow cancel ++ * otherwise show but send result back instantly */ ++ if (m->allow_cancel && m->ismain) { ++ gint response = gtk_dialog_run (user_message_dialog); ++ user_message_response (user_message_dialog, response, m); } else { - g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog); - g_object_weak_ref ((GObject *) message_dialog, (GWeakNotify) user_message_destroy_notify, m); - gtk_widget_show ((GtkWidget *) message_dialog); - mail_msg_free(m); -+ g_signal_connect (user_message_dialog, "response", G_CALLBACK (gtk_widget_destroy), user_message_dialog); -+ g_object_add_weak_pointer (user_message_dialog, &user_message_dialog); ++ g_signal_connect ( ++ user_message_dialog, "response", ++ G_CALLBACK (user_message_response), m); + gtk_widget_show (user_message_dialog); -+ mail_msg_unref(m); } } @@ -5038,8 +5071,9 @@ MailSession *mail_session = MAIL_SESSION (session); - struct _user_message_msg *m, *r; - EMsgPort *user_message_reply = NULL; +- gboolean ret; + struct _user_message_msg *m; - gboolean ret; ++ gboolean result = TRUE; if (!mail_session->interactive) return FALSE; @@ -5049,38 +5083,51 @@ - m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); - m->ismain = pthread_equal(pthread_self(), mail_gui_thread); + m = mail_msg_new (&user_message_info); -+ m->ismain = mail_in_main_thread(); ++ m->ismain = mail_in_main_thread (); m->type = type; - m->prompt = g_strdup(prompt); +- m->prompt = g_strdup(prompt); ++ m->prompt = g_strdup (prompt); + m->done = e_flag_new (); m->allow_cancel = cancel; +- if (m->ismain) +- do_user_message((struct _mail_msg *)m); +- else { +- extern EMsgPort *mail_gui_port2; + if (cancel) + mail_msg_ref (m); -+ - if (m->ismain) -- do_user_message((struct _mail_msg *)m); -+ user_message_exec(m); - else { -- extern EMsgPort *mail_gui_port2; -- + - e_msgport_put(mail_gui_port2, (EMsg *)m); -+ mail_msg_main_loop_push(mail_msg_ref (m)); - } +- } ++ if (m->ismain) ++ user_message_exec (m); ++ else ++ mail_msg_main_loop_push (m); if (cancel) { - r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); - g_assert(m == r); -- + e_flag_wait (m->done); - ret = m->result; ++ result = m->result; ++ mail_msg_unref (m); ++ } + +- ret = m->result; - mail_msg_free(m); - e_msgport_destroy(user_message_reply); -+ mail_msg_unref(m); - } else - ret = TRUE; +- } else +- ret = TRUE; ++ if (m->ismain) { ++ user_message_free (m); ++ mail_msg_unref (m); ++ } -@@ -541,7 +536,7 @@ get_filter_driver (CamelSession *session +- return ret; ++ return result; + } + + static CamelFolder * +@@ -541,7 +538,7 @@ get_filter_driver (CamelSession *session /* TODO: This is very temporary, until we have a better way to do the progress reporting, we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ @@ -5089,7 +5136,7 @@ static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { -@@ -550,7 +545,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -550,7 +547,7 @@ static void *ms_thread_msg_new(CamelSess /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so we get cancellation and progress in common with hte existing mail code, for free */ if (msg) { @@ -5098,7 +5145,7 @@ msg->data = m; camel_operation_unref(msg->op); -@@ -563,7 +558,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -563,7 +560,7 @@ static void *ms_thread_msg_new(CamelSess static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { @@ -5107,7 +5154,7 @@ ms_parent_class->thread_msg_free(session, m); } -@@ -686,22 +681,23 @@ mail_session_set_interactive (gboolean i +@@ -686,22 +683,23 @@ mail_session_set_interactive (gboolean i MAIL_SESSION (session)->interactive = interactive; if (!interactive) { @@ -5137,8 +5184,9 @@ } } } ---- evolution-2.11.90/mail/mail-mt.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.90/mail/mail-mt.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/mail-mt.c +--- evolution-2.11.91/mail/mail-mt.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 ++++ evolution-2.11.91/mail/mail-mt.c 2007-08-29 17:39:34.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -6218,8 +6266,9 @@ } /* ******************** */ ---- evolution-2.11.90/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-07-05 02:09:19.000000000 -0400 -+++ evolution-2.11.90/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread evolution-2.11.91/plugins/folder-unsubscribe/folder-unsubscribe.c +--- evolution-2.11.91/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-07-05 02:09:19.000000000 -0400 ++++ evolution-2.11.91/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-08-29 17:39:34.000000000 -0400 @@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( @@ -6299,8 +6348,9 @@ - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } ---- evolution-2.11.90/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-07-05 02:09:23.000000000 -0400 -+++ evolution-2.11.90/plugins/mark-all-read/mark-all-read.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/plugins/mark-all-read/mark-all-read.c.kill-ethread evolution-2.11.91/plugins/mark-all-read/mark-all-read.c +--- evolution-2.11.91/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-07-05 02:09:23.000000000 -0400 ++++ evolution-2.11.91/plugins/mark-all-read/mark-all-read.c 2007-08-29 17:39:34.000000000 -0400 @@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } @@ -6310,19 +6360,21 @@ } static void ---- evolution-2.11.90/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-07-05 02:09:22.000000000 -0400 -+++ evolution-2.11.90/plugins/exchange-operations/exchange-folder.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/plugins/exchange-operations/exchange-folder.c.kill-ethread evolution-2.11.91/plugins/exchange-operations/exchange-folder.c +--- evolution-2.11.91/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-07-05 02:09:22.000000000 -0400 ++++ evolution-2.11.91/plugins/exchange-operations/exchange-folder.c 2007-08-29 17:39:34.000000000 -0400 @@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); /* To get the CamelStore/Folder */ - mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); -+ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); ++ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); } ---- evolution-2.11.90/plugins/save-attachments/save-attachments.c.kill-ethread 2007-07-05 02:09:25.000000000 -0400 -+++ evolution-2.11.90/plugins/save-attachments/save-attachments.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/plugins/save-attachments/save-attachments.c.kill-ethread evolution-2.11.91/plugins/save-attachments/save-attachments.c +--- evolution-2.11.91/plugins/save-attachments/save-attachments.c.kill-ethread 2007-07-05 02:09:25.000000000 -0400 ++++ evolution-2.11.91/plugins/save-attachments/save-attachments.c 2007-08-29 17:39:34.000000000 -0400 @@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); @@ -6330,19 +6382,21 @@ - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } ---- evolution-2.11.90/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-07-05 02:09:24.000000000 -0400 -+++ evolution-2.11.90/plugins/mailing-list-actions/mailing-list-actions.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread evolution-2.11.91/plugins/mailing-list-actions/mailing-list-actions.c +--- evolution-2.11.91/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-07-05 02:09:24.000000000 -0400 ++++ evolution-2.11.91/plugins/mailing-list-actions/mailing-list-actions.c 2007-08-29 17:39:34.000000000 -0400 @@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), - emla_list_action_do, data, mail_thread_new); -+ emla_list_action_do, data, mail_msg_unordered_push); ++ emla_list_action_do, data, mail_msg_unordered_push); } void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) ---- evolution-2.11.90/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-07-05 02:09:21.000000000 -0400 -+++ evolution-2.11.90/plugins/groupwise-features/share-folder-common.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/plugins/groupwise-features/share-folder-common.c.kill-ethread evolution-2.11.91/plugins/groupwise-features/share-folder-common.c +--- evolution-2.11.91/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-07-05 02:09:21.000000000 -0400 ++++ evolution-2.11.91/plugins/groupwise-features/share-folder-common.c 2007-08-29 17:39:34.000000000 -0400 @@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } @@ -6440,8 +6494,9 @@ return id; } ---- evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-07-05 02:11:11.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.h 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.h +--- evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-07-05 02:11:11.000000000 -0400 ++++ evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.h 2007-08-29 17:39:34.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; @@ -6462,8 +6517,9 @@ struct _AlarmNotify { BonoboObject object; ---- evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-notify.c 2007-08-15 13:37:37.000000000 -0400 +diff -up evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.c +--- evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 ++++ evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.c 2007-08-29 17:39:34.000000000 -0400 @@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; @@ -6576,8 +6632,9 @@ } static void ---- evolution-2.11.90/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 -+++ evolution-2.11.90/calendar/gui/alarm-notify/alarm-queue.c 2007-08-15 13:41:19.000000000 -0400 +diff -up evolution-2.11.91/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread evolution-2.11.91/calendar/gui/alarm-notify/alarm-queue.c +--- evolution-2.11.91/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 ++++ evolution-2.11.91/calendar/gui/alarm-notify/alarm-queue.c 2007-08-29 17:39:34.000000000 -0400 @@ -97,9 +97,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; @@ -6671,16 +6728,16 @@ - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = midnight_refresh_async; +- +- list = malloc (sizeof (struct _midnight_refresh_msg)); + struct _midnight_refresh_msg *msg; -- list = malloc (sizeof (struct _midnight_refresh_msg)); +- list->remove = TRUE; +- msg->data = list; + msg = g_slice_new (struct _midnight_refresh_msg); + msg->header.func = (MessageFunc) midnight_refresh_async; + msg->remove = TRUE; -- list->remove = TRUE; -- msg->data = list; -- - d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); @@ -6734,7 +6791,8 @@ { - AlarmMsg *msg; - struct _query_msg *list; -- ++ struct _query_msg *msg; + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = query_objects_changed_async; @@ -6743,8 +6801,7 @@ - list->objects = duplicate_ical (objects); - list->data = data; - msg->data = list; -+ struct _query_msg *msg; - +- - d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _query_msg); @@ -6941,16 +6998,16 @@ +tray_list_remove_icons (void) { - AlarmMsg *msg; -+ Message *msg; - +- - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = tray_list_remove_async; ++ Message *msg; + +- msg->data = NULL; + msg = g_slice_new (Message); + msg->func = tray_list_remove_async; -- msg->data = NULL; -- - d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push (msg); @@ -6991,13 +7048,13 @@ - list->data = data; - msg->data = list; + struct _tray_msg *msg; - -- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ + msg = g_slice_new (struct _tray_msg); + msg->header.func = (MessageFunc) tray_list_remove_data_async; + msg->data = data; -+ + +- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } @@ -7143,17 +7200,17 @@ g_hash_table_remove (client_alarms_hash, client); + -+ g_slice_free (struct _alarm_client_msg, msg); ++ g_slice_free (struct _alarm_client_msg, msg); } /** alarm_queue_remove_client -@@ -2156,22 +2142,13 @@ alarm_queue_remove_async (EThread *e, Al +@@ -2156,22 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al void alarm_queue_remove_client (ECal *client, gboolean immediately) { - AlarmMsg *msg; - struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; ++ struct _alarm_client_msg *msg; - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); @@ -7162,17 +7219,17 @@ - list = malloc (sizeof (struct _alarm_client_msg)); - list->client = client; - msg->data = list; -- ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_remove_async; ++ msg->client = client; + - d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); -- if (immediately) + if (immediately) - alarm_queue_remove_async (NULL, msg, NULL); -- else ++ alarm_queue_remove_async (msg); + else - e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_remove_async; -+ msg->client = client; -+ -+ message_push ((Message *) msg); ++ message_push ((Message *) msg); } /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution.spec b/evolution.spec index 1d1c838..6090912 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.91 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -698,6 +698,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Wed Aug 29 2007 Matthew Barnes - 2.11.91-3.fc8 +- Revise patch for GNOME bug #362638 to fix GNOME bug #357175 + (Evolution fails to close after IMAP alert has been displayed). + * Tue Aug 28 2007 Matthew Barnes - 2.11.91-2.fc8 - Fix compilation breakage caused by our strict build settings. From d5f9318feac93ac6c87de4645f52acc3b17d4849 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Sep 2007 03:23:24 +0000 Subject: [PATCH 162/844] - Update to 2.11.92 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index c0ac320..ca3893e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.11.91.tar.bz2 +evolution-2.11.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 6090912..df16d04 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.11.91 -Release: 3%{?dist} +Version: 2.11.92 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -698,6 +698,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %changelog +* Mon Sep 03 2007 Matthew Barnes - 2.11.92-1.fc8 +- Update to 2.11.92 + * Wed Aug 29 2007 Matthew Barnes - 2.11.91-3.fc8 - Revise patch for GNOME bug #362638 to fix GNOME bug #357175 (Evolution fails to close after IMAP alert has been displayed). diff --git a/sources b/sources index 42b4b0a..cdd477a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aeeedfac1769b5d24a61fb76d40f4b5f evolution-2.11.91.tar.bz2 +4149faf2ee5f0b0ed10114b076fb0ade evolution-2.11.92.tar.bz2 From dff5604e972d38db722410050fd68bc711f1e70b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Sep 2007 04:39:01 +0000 Subject: [PATCH 163/844] - Update to 2.11.92 --- evolution.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index df16d04..1f7b15f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -121,9 +121,6 @@ Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch -# The usual compilation breakage... -Patch35: evolution-2.11.91-compilation-breakage.patch - ## Dependencies ### Requires(post): GConf2 @@ -255,7 +252,6 @@ Development files needed for building things which link against evolution. %patch31 -p1 -b .meeting-list-view %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box -%patch35 -p1 -b .compilation-breakage mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From e7ca2b93c64a5540b25cf1b99a2d67b0555dc1a2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Sep 2007 05:05:26 +0000 Subject: [PATCH 164/844] - Update to 2.11.92 --- evolution-2.11.91-compilation-breakage.patch | 11 - evolution-2.8.1-kill-ethread.patch | 7252 +++++++++--------- evolution-2.9.1-kill-ememory.patch | 2 +- evolution.spec | 1 + 4 files changed, 3609 insertions(+), 3657 deletions(-) delete mode 100644 evolution-2.11.91-compilation-breakage.patch diff --git a/evolution-2.11.91-compilation-breakage.patch b/evolution-2.11.91-compilation-breakage.patch deleted file mode 100644 index 9c3e4f1..0000000 --- a/evolution-2.11.91-compilation-breakage.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.11.91/calendar/gui/e-cal-popup.c.compilation-breakage 2007-08-24 02:50:09.000000000 -0400 -+++ evolution-2.11.91/calendar/gui/e-cal-popup.c 2007-08-28 15:01:22.000000000 -0400 -@@ -693,7 +693,7 @@ - - source = e_source_selector_peek_primary_selection (selector); - uri = e_source_get_uri (source); -- if (!uri || (g_strncasecmp (uri, "file://", 7) && g_strncasecmp (uri, "contacts://", 11))) { -+ if (!uri || (g_ascii_strncasecmp (uri, "file://", 7) && g_ascii_strncasecmp (uri, "contacts://", 11))) { - /* check for e_target_selector's offline_status property here */ - offline = e_source_get_property (source, "offline"); - diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index c4efbc8..e77c44c 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,103 +1,1192 @@ -diff -up evolution-2.11.91/mail/mail-send-recv.c.kill-ethread evolution-2.11.91/mail/mail-send-recv.c ---- evolution-2.11.91/mail/mail-send-recv.c.kill-ethread 2007-07-28 17:08:12.000000000 -0400 -+++ evolution-2.11.91/mail/mail-send-recv.c 2007-08-29 17:39:34.000000000 -0400 -@@ -770,23 +770,22 @@ receive_get_folder(CamelFilterDriver *d, - /* ********************************************************************** */ +--- evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-09-02 14:56:38.000000000 -0400 ++++ evolution-2.11.92/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-09-04 00:19:08.000000000 -0400 +@@ -44,32 +44,30 @@ - struct _refresh_folders_msg { + + struct _folder_unsub_t { - struct _mail_msg msg; + MailMsg base; - - struct _send_info *info; - GPtrArray *folders; - CamelStore *store; + + char *uri; }; -static char * --refresh_folders_desc (struct _mail_msg *mm, int done) +-folder_unsubscribe__desc (struct _mail_msg *mm, int done) +static gchar * -+refresh_folders_desc (struct _refresh_folders_msg *m) ++folder_unsubscribe_desc (struct _folder_unsub_t *msg) { - return g_strdup_printf(_("Checking for new mail")); +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; +- +- return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri); ++ return g_strdup_printf ( ++ _("Unsubscribing from folder \"%s\""), msg->uri); } static void --refresh_folders_get (struct _mail_msg *mm) -+refresh_folders_exec (struct _refresh_folders_msg *m) +-folder_unsubscribe__unsub (struct _mail_msg *mm) ++folder_unsubscribe_exec (struct _folder_unsub_t *msg) { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; - int i; - CamelFolder *folder; - CamelException ex = CAMEL_EXCEPTION_INITIALISER; -@@ -808,17 +807,14 @@ refresh_folders_get (struct _mail_msg *m +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; + extern CamelSession *session; + const char *path = NULL; + CamelStore *store; + CamelURL *url; + +- if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex))) ++ if (!(store = camel_session_get_store (session, msg->uri, &mm->ex))) + return; + +- url = camel_url_new (unsub->uri, NULL); ++ url = camel_url_new (msg->uri, NULL); + if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) + path = url->fragment; + else if (url->path && url->path[0]) +@@ -82,18 +80,17 @@ } static void --refresh_folders_got (struct _mail_msg *mm) -+refresh_folders_done (struct _refresh_folders_msg *m) +-folder_unsubscribe__free (struct _mail_msg *mm) ++folder_unsubscribe_free (struct _folder_unsub_t *msg) { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; -- - receive_done("", m->info); +- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; +- +- g_free (unsub->uri); ++ g_free (msg->uri); + } + +-static struct _mail_msg_op unsubscribe_op = { +- folder_unsubscribe__desc, +- folder_unsubscribe__unsub, +- NULL, +- folder_unsubscribe__free, ++static MailMsgInfo unsubscribe_info = { ++ sizeof (struct _folder_unsub_t), ++ (MailMsgDescFunc) folder_unsubscribe_desc, ++ (MailMsgExecFunc) folder_unsubscribe_exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) folder_unsubscribe_free + }; + + +@@ -105,8 +102,8 @@ + if (target->uri == NULL) + return; + +- unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); ++ unsub = mail_msg_new (&unsubscribe_info); + unsub->uri = g_strdup (target->uri); + +- e_thread_put (mail_thread_new, (EMsg *) unsub); ++ mail_msg_unordered_push (unsub); + } +--- evolution-2.11.92/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-09-02 14:56:39.000000000 -0400 ++++ evolution-2.11.92/plugins/mark-all-read/mark-all-read.c 2007-09-04 00:19:08.000000000 -0400 +@@ -44,7 +44,7 @@ + return; + } + +- mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); ++ mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); } static void --refresh_folders_free (struct _mail_msg *mm) -+refresh_folders_free (struct _refresh_folders_msg *m) - { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; - int i; +--- evolution-2.11.92/plugins/save-attachments/save-attachments.c.kill-ethread 2007-09-02 14:56:45.000000000 -0400 ++++ evolution-2.11.92/plugins/save-attachments/save-attachments.c 2007-09-04 00:19:08.000000000 -0400 +@@ -403,5 +403,5 @@ + camel_object_ref(data->folder); + data->uid = g_strdup(target->uids->pdata[0]); - for (i=0;ifolders->len;i++) -@@ -827,11 +823,12 @@ refresh_folders_free (struct _mail_msg * - camel_object_unref(m->store); +- mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); ++ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); + } +--- evolution-2.11.92/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-09-02 14:56:38.000000000 -0400 ++++ evolution-2.11.92/plugins/groupwise-features/share-folder-common.c 2007-09-04 00:19:08.000000000 -0400 +@@ -121,7 +121,7 @@ } --static struct _mail_msg_op refresh_folders_op = { -- refresh_folders_desc, -- refresh_folders_get, -- refresh_folders_got, -- refresh_folders_free, -+static MailMsgInfo refresh_folders_info = { -+ sizeof (struct _refresh_folders_msg), -+ (MailMsgDescFunc) refresh_folders_desc, -+ (MailMsgExecFunc) refresh_folders_exec, -+ (MailMsgDoneFunc) refresh_folders_done, -+ (MailMsgFreeFunc) refresh_folders_free + struct _EMCreateFolder { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *store; +@@ -137,31 +137,26 @@ + void *user_data; + }; + +-static char * +-create_folder__desc (struct _mail_msg *mm, int done) ++static gchar * ++create_folder_desc (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + return g_strdup_printf (_("Creating folder `%s'"), m->full_name); + } + + static void +-create_folder__create (struct _mail_msg *mm) ++create_folder_exec (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); + +- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { ++ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { + if (camel_store_supports_subscriptions (m->store)) +- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); + } + } + + static void +-create_folder__created (struct _mail_msg *mm) ++create_folder_done (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; + struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; + CamelStore *store = CAMEL_STORE (m->store) ; + EGwConnection *ccnc; +@@ -180,10 +175,8 @@ + } + + static void +-create_folder__free (struct _mail_msg *mm) ++create_folder_free (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + camel_object_unref (m->store); + g_free (m->full_name); +@@ -191,11 +184,12 @@ + g_free (m->name); + } + +-static struct _mail_msg_op create_folder_op = { +- create_folder__desc, +- create_folder__create, +- create_folder__created, +- create_folder__free, ++static MailMsgInfo create_folder_info = { ++ sizeof (struct _EMCreateFolder), ++ (MailMsgDescFunc) create_folder_desc, ++ (MailMsgExecFunc) create_folder_exec, ++ (MailMsgDoneFunc) create_folder_done, ++ (MailMsgFreeFunc) create_folder_free }; static void -@@ -864,13 +861,13 @@ receive_update_got_folderinfo(CamelStore - - get_folders(store, folders, info); - -- m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&refresh_folders_info); - m->store = store; - camel_object_ref(store); - m->folders = folders; - m->info = sinfo; - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } else { - receive_done ("", data); +@@ -229,7 +223,7 @@ + parent = namebuf; } -diff -up evolution-2.11.91/mail/mail-component.c.kill-ethread evolution-2.11.91/mail/mail-component.c ---- evolution-2.11.91/mail/mail-component.c.kill-ethread 2007-08-24 02:49:43.000000000 -0400 -+++ evolution-2.11.91/mail/mail-component.c 2007-08-29 17:39:34.000000000 -0400 -@@ -1005,7 +1005,7 @@ impl_handleURI (PortableServer_Servant s - if (camel_url_get_param(url, "uid") != NULL) { - char *curi = em_uri_to_camel(uri); + +- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); ++ m = mail_msg_new (&create_folder_info); + camel_object_ref (store); + m->store = store; + m->full_name = g_strdup (full_name); +@@ -238,8 +232,8 @@ + m->user_data = (struct ShareInfo *) user_data; + m->done = done; + g_free (namebuf); +- id = m->msg.seq; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); + + return id; + } +--- evolution-2.11.92/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-07-05 02:09:24.000000000 -0400 ++++ evolution-2.11.92/plugins/mailing-list-actions/mailing-list-actions.c 2007-09-04 00:19:08.000000000 -0400 +@@ -89,7 +89,7 @@ + data->uri = strdup (sel->uri); -- mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); -+ mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); - g_free(curi); - } else { - g_warning("email uri's must include a uid parameter"); -diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/mail-ops.c ---- evolution-2.11.91/mail/mail-ops.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.91/mail/mail-ops.c 2007-08-29 17:39:34.000000000 -0400 + mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), +- emla_list_action_do, data, mail_thread_new); ++ emla_list_action_do, data, mail_msg_unordered_push); + } + + void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) +--- evolution-2.11.92/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-09-02 14:56:39.000000000 -0400 ++++ evolution-2.11.92/plugins/exchange-operations/exchange-folder.c 2007-09-04 00:19:08.000000000 -0400 +@@ -140,7 +140,7 @@ + inbox_physical_uri = e_folder_get_physical_uri (inbox); + + /* To get the CamelStore/Folder */ +- mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); ++ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); + + + } +--- evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-09-02 14:57:09.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.c 2007-09-04 00:19:08.000000000 -0400 +@@ -45,10 +45,6 @@ + GMutex *mutex; + }; + +-EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ +-EMsgPort *alarm_reply_port; +-static GIOChannel *alarm_reply_channel; +- + #define d(x) x + + +@@ -286,72 +282,12 @@ + g_mutex_free (priv->mutex); + g_free (priv); + +- e_thread_destroy(alarm_operation_thread); +- g_io_channel_unref(alarm_reply_channel); +- e_msgport_destroy(alarm_reply_port); + if (G_OBJECT_CLASS (parent_class)->finalize) + (* G_OBJECT_CLASS (parent_class)->finalize) (object); + } + + + +-static guint +-alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) +-{ +- GSource *source; +- guint id; +- +- d (printf("%s:%d (alarm_channel_setup) - Channel Setup\n ", __FILE__, __LINE__)); +- *port = e_msgport_new(); +-#ifndef G_OS_WIN32 +- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); +-#else +- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); +-#endif +- source = g_io_create_watch(*channel, G_IO_IN); +- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); +- g_source_set_can_recurse(source, FALSE); +- id = g_source_attach(source, NULL); +- g_source_unref(source); +- +- return id; +-} +- +-static void +-alarm_msg_destroy(EThread *e, EMsg *msg, void *data) +-{ +- AlarmMsg *m = (AlarmMsg *)msg; +- +- /* Free the private */ +- g_free (m->data); /* Mostly it is a structure allocated as a carrier*/ +- g_free (m); +-} +- +-static gboolean +-alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) +-{ +- EMsgPort *port = (EMsgPort *)d; +- EMsg *m; +- +- while (( m = e_msgport_get(port))) { +- d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m)); +- alarm_msg_destroy(NULL, m, NULL); +- } +- +- return TRUE; +-} +- +-static void +-alarm_msg_received(EThread *e, EMsg *msg, void *data) +-{ +- AlarmMsg *m = (AlarmMsg *)msg; +- +- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); +- if (m->receive_msg) { +- m->receive_msg (e, m, data); +- } +-} +- + /** + * alarm_notify_new: + * +@@ -363,23 +299,10 @@ + AlarmNotify * + alarm_notify_new (void) + { +- AlarmNotify *an; +- +- d (printf("%s:%d (alarm_notify_new) - Alarm Notify New \n ", __FILE__, __LINE__)); +- +- /* Create a thread for alarm queue operation*/ +- alarm_channel_setup(&alarm_reply_port, &alarm_reply_channel, alarm_msgport_replied); +- +- alarm_operation_thread = e_thread_new(E_THREAD_QUEUE); +- e_thread_set_msg_destroy(alarm_operation_thread, alarm_msg_destroy, 0); +- e_thread_set_msg_received(alarm_operation_thread, alarm_msg_received, 0); +- e_thread_set_reply_port(alarm_operation_thread, alarm_reply_port); +- +- an = g_object_new (TYPE_ALARM_NOTIFY, +- "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL), +- NULL); +- +- return an; ++ return g_object_new (TYPE_ALARM_NOTIFY, ++ "poa", bonobo_poa_get_threaded ( ++ ORBIT_THREAD_HINT_PER_REQUEST, NULL), ++ NULL); + } + + static void +--- evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-09-02 14:57:09.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-notify.h 2007-09-04 00:19:08.000000000 -0400 +@@ -39,19 +39,6 @@ + + typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; + +-typedef struct _AlarmMsg AlarmMsg; +-typedef struct _AlarmMsgPrivate AlarmMsgPrivate; +- +-struct _AlarmMsg { +- EMsg msg; +- +- void (*receive_msg)(EThread *e, struct _AlarmMsg *msg, void *data); /* message received */ +- void *data; +- +- /* Private Usage */ +- struct _AlarmMsgPrivate *priv; +-}; +- + struct _AlarmNotify { + BonoboObject object; + +--- evolution-2.11.92/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-09-02 14:57:09.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/alarm-notify/alarm-queue.c 2007-09-04 00:19:08.000000000 -0400 +@@ -97,9 +97,6 @@ + static int tray_blink_state = FALSE; + static AlarmNotify *an; + +-/* Main Tasks thread for dealing with the global structures */ +-extern EThread *alarm_operation_thread; +- + /* Structure that stores a client we are monitoring */ + typedef struct { + /* Monitored client */ +@@ -181,6 +178,40 @@ + static void load_alarms_for_today (ClientAlarms *ca); + static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); + ++/* Simple asynchronous message dispatcher */ ++ ++typedef struct _Message Message; ++typedef void (*MessageFunc) (Message *msg); ++ ++struct _Message { ++ MessageFunc func; ++}; ++ ++static void ++message_proxy (Message *msg) ++{ ++ g_return_if_fail (msg->func != NULL); ++ ++ msg->func (msg); ++} ++ ++static gpointer ++create_thread_pool (void) ++{ ++ /* once created, run forever */ ++ return g_thread_pool_new ((GFunc) message_proxy, NULL, 1, FALSE, NULL); ++} ++ ++static void ++message_push (Message *msg) ++{ ++ static GOnce once = G_ONCE_INIT; ++ ++ g_once (&once, (GThreadFunc) create_thread_pool, NULL); ++ ++ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); ++} ++ + /* Queues an alarm trigger for midnight so that we can load the next day's worth + * of alarms. + */ +@@ -219,47 +250,41 @@ + } + + struct _midnight_refresh_msg { ++ Message header; + gboolean remove; + }; + + /* Loads the alarms for the new day every midnight */ + static void +-midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) ++midnight_refresh_async (struct _midnight_refresh_msg *msg) + { +- struct _midnight_refresh_msg *list = msg->data; +- + d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); + + /* Re-load the alarms for all clients */ + g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); + + /* Re-schedule the midnight update */ +- if (list->remove && midnight_refresh_id != NULL) { ++ if (msg->remove && midnight_refresh_id != NULL) { + d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); + alarm_remove (midnight_refresh_id); + midnight_refresh_id = NULL; + } + + queue_midnight_refresh (); ++ ++ g_slice_free (struct _midnight_refresh_msg, msg); + } + + static void + midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) + { +- AlarmMsg *msg; +- struct _midnight_refresh_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = midnight_refresh_async; +- +- list = malloc (sizeof (struct _midnight_refresh_msg)); ++ struct _midnight_refresh_msg *msg; + +- list->remove = TRUE; +- msg->data = list; ++ msg = g_slice_new (struct _midnight_refresh_msg); ++ msg->header.func = (MessageFunc) midnight_refresh_async; ++ msg->remove = TRUE; + +- d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Looks up a client in the client alarms hash table */ +@@ -657,6 +682,7 @@ + * alarms. + */ + struct _query_msg { ++ Message header; + ECal *client; + GList *objects; + gpointer data; +@@ -690,7 +716,7 @@ + } + + static void +-query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) ++query_objects_changed_async (struct _query_msg *msg) + { + ClientAlarms *ca; + time_t from, day_end; +@@ -699,13 +725,12 @@ + icaltimezone *zone; + CompQueuedAlarms *cqa; + GList *l; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + +- client = list->client; +- ca = list->data; +- objects = list->objects; ++ client = msg->client; ++ ca = msg->data; ++ objects = msg->objects; + + from = config_data_get_last_notification_time (); + if (from == -1) +@@ -799,43 +824,38 @@ + comp = NULL; + } + g_list_free (objects); ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + query_objects_changed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; ++ struct _query_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = query_objects_changed_async; +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = duplicate_ical (objects); +- list->data = data; +- msg->data = list; +- +- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) query_objects_changed_async; ++ msg->client = client; ++ msg->objects = duplicate_ical (objects); ++ msg->data = data; + ++ message_push ((Message *) msg); + } + + /* Called when a calendar component is removed; we must delete its corresponding + * alarms. + */ + static void +-query_objects_removed_async (EThread *e, AlarmMsg *msg, void *data) ++query_objects_removed_async (struct _query_msg *msg) + { + ClientAlarms *ca; + GList *l; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + +- client = list->client; +- ca = list->data; +- objects = list->objects; ++ client = msg->client; ++ ca = msg->data; ++ objects = msg->objects; + + d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); + +@@ -848,27 +868,22 @@ + } + + g_list_free (objects); ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + query_objects_removed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = query_objects_removed_async; +- +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = duplicate_ecal (objects); +- list->data = data; +- msg->data = list; ++ struct _query_msg *msg; + +- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) query_objects_removed_async; ++ msg->client = client; ++ msg->objects = duplicate_ecal (objects); ++ msg->data = data; + ++ message_push ((Message *) msg); + } + + +@@ -1010,20 +1025,19 @@ + } + + static void +-on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) ++on_dialog_objs_removed_async (struct _query_msg *msg) + { + const char *our_uid; + GList *l; + TrayIconData *tray_data; +- struct _query_msg *list = msg->data; + ECal *client; + GList *objects; + + d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); + +- client = list->client; +- tray_data = list->data; +- objects = list->objects; ++ client = msg->client; ++ tray_data = msg->data; ++ objects = msg->objects; + + e_cal_component_get_uid (tray_data->comp, &our_uid); + g_return_if_fail (our_uid && *our_uid); +@@ -1041,37 +1055,33 @@ + tray_data = NULL; + } + } ++ ++ g_slice_free (struct _query_msg, msg); + } + + static void + on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) + { +- AlarmMsg *msg; +- struct _query_msg *list; ++ struct _query_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = on_dialog_objs_removed_async; +- +- list = malloc (sizeof (struct _query_msg)); +- list->client = client; +- list->objects = objects; +- list->data = data; +- msg->data = list; ++ msg = g_slice_new (struct _query_msg); ++ msg->header.func = (MessageFunc) on_dialog_objs_removed_async; ++ msg->client = client; ++ msg->objects = objects; ++ msg->data = data; + +- d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + struct _tray_cqa_msg { ++ Message header; + CompQueuedAlarms *cqa; + }; + + static void +-tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) + { +- struct _tray_cqa_msg *tmsg = msg->data; +- CompQueuedAlarms *cqa = tmsg->cqa; ++ CompQueuedAlarms *cqa = msg->cqa; + GList *list = tray_icons_list; + + d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); +@@ -1110,28 +1120,25 @@ + gtk_tree_selection_select_iter (sel, &iter); + } + } ++ ++ g_slice_free (struct _tray_cqa_msg, msg); + } + + static void + tray_list_remove_cqa (CompQueuedAlarms *cqa) + { +- AlarmMsg *msg; +- struct _tray_cqa_msg *list; +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_cqa_async; +- +- list = malloc (sizeof (struct _tray_cqa_msg)); +- list->cqa = cqa; +- msg->data = list; ++ struct _tray_cqa_msg *msg; ++ ++ msg = g_slice_new (struct _tray_cqa_msg); ++ msg->header.func = (MessageFunc) tray_list_remove_cqa_async; ++ msg->cqa = cqa; + +- d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Callback used from the alarm notify dialog */ + static void +-tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_async (Message *msg) + { + GList *list = tray_icons_list; + +@@ -1161,55 +1168,50 @@ + } else + list = list->next; + } ++ ++ g_slice_free (Message, msg); + } + + static void +-tray_list_remove_icons () ++tray_list_remove_icons (void) + { +- AlarmMsg *msg; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_async; ++ Message *msg; + +- msg->data = NULL; ++ msg = g_slice_new (Message); ++ msg->func = tray_list_remove_async; + +- d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push (msg); + } + + struct _tray_msg { ++ Message header; + TrayIconData *data; + }; + + static void +-tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) ++tray_list_remove_data_async (struct _tray_msg *msg) + { +- struct _tray_msg *tmsg = msg->data; +- TrayIconData *tray_data = tmsg->data; ++ TrayIconData *tray_data = msg->data; + + d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); + + tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); + free_tray_icon_data (tray_data); + tray_data = NULL; ++ ++ g_slice_free (struct _tray_msg, msg); + } + + static void + tray_list_remove_data (TrayIconData *data) + { +- AlarmMsg *msg; +- struct _tray_msg *list; +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_remove_data_async; +- +- list = malloc (sizeof (struct _tray_msg)); +- list->data = data; +- msg->data = list; ++ struct _tray_msg *msg; ++ ++ msg = g_slice_new (struct _tray_msg); ++ msg->header.func = (MessageFunc) tray_list_remove_data_async; ++ msg->data = data; + +- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + static void +@@ -1416,29 +1418,24 @@ + /* Add a new data to tray list */ + + static void +-tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) ++tray_list_add_async (struct _tray_msg *msg) + { +- struct _tray_msg *list = msg->data; +- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); +- tray_icons_list = g_list_prepend (tray_icons_list, list->data); ++ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); ++ tray_icons_list = g_list_prepend (tray_icons_list, msg->data); ++ ++ g_slice_free (struct _tray_msg, msg); + } + + static void + tray_list_add_new (TrayIconData *data) + { +- AlarmMsg *msg; +- struct _tray_msg *list; ++ struct _tray_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = tray_list_add_async; +- +- list = malloc (sizeof (struct _tray_msg)); +- list->data = data; +- msg->data = list; +- +- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ msg = g_slice_new (struct _tray_msg); ++ msg->header.func = (MessageFunc) tray_list_add_async; ++ msg->data = data; ++ ++ message_push ((Message *) msg); + } + + /* Performs notification of a display alarm */ +@@ -1835,21 +1832,13 @@ + new_midnight = time_day_end_with_zone (time (NULL), zone); + + if (new_midnight > midnight) { +- AlarmMsg *msg; +- struct _midnight_refresh_msg *list; +- +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = midnight_refresh_async; +- +- list = malloc (sizeof (struct _midnight_refresh_msg)); ++ struct _midnight_refresh_msg *msg; + +- list->remove = FALSE; +- /* We dont need it. So set it to NULL */ +- msg->data = list; ++ msg = g_slice_new (struct _midnight_refresh_msg); ++ msg->header.func = (MessageFunc) midnight_refresh_async; ++ msg->remove = FALSE; + +- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + return TRUE; +@@ -1980,14 +1969,15 @@ + } + + struct _alarm_client_msg { ++ Message header; + ECal *client; + }; + +-static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) ++static void ++alarm_queue_add_async (struct _alarm_client_msg *msg) + { + ClientAlarms *ca; +- struct _alarm_client_msg *list = msg->data; +- ECal *client = list->client; ++ ECal *client = msg->client; + + g_return_if_fail (alarm_queue_inited); + g_return_if_fail (client != NULL); +@@ -2018,6 +2008,8 @@ + G_CALLBACK (cal_opened_cb), + ca); + } ++ ++ g_slice_free (struct _alarm_client_msg, msg); + } + + /** +@@ -2037,20 +2029,13 @@ + void + alarm_queue_add_client (ECal *client) + { +- AlarmMsg *msg; +- struct _alarm_client_msg *list; ++ struct _alarm_client_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = alarm_queue_add_async; +- +- list = malloc (sizeof (struct _alarm_client_msg)); +- list->client = client; +- g_object_ref (client); +- msg->data = list; ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_add_async; ++ msg->client = g_object_ref (client); + +- d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Removes a component an its alarms */ +@@ -2102,11 +2087,10 @@ + * Removes a calendar client from the alarm queueing system. + **/ + static void +-alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data) ++alarm_queue_remove_async (struct _alarm_client_msg *msg) + { + ClientAlarms *ca; +- struct _alarm_client_msg *list = msg->data; +- ECal *client = list->client; ++ ECal *client = msg->client; + + g_return_if_fail (alarm_queue_inited); + g_return_if_fail (client != NULL); +@@ -2143,6 +2127,8 @@ + g_free (ca); + + g_hash_table_remove (client_alarms_hash, client); ++ ++ g_slice_free (struct _alarm_client_msg, msg); + } + + /** alarm_queue_remove_client +@@ -2155,22 +2141,16 @@ + void + alarm_queue_remove_client (ECal *client, gboolean immediately) + { +- AlarmMsg *msg; +- struct _alarm_client_msg *list; ++ struct _alarm_client_msg *msg; + +- /* These two structures will be freed by the msg destroy function*/ +- msg = malloc (sizeof (AlarmMsg)); +- msg->receive_msg = alarm_queue_remove_async; +- +- list = malloc (sizeof (struct _alarm_client_msg)); +- list->client = client; +- msg->data = list; ++ msg = g_slice_new (struct _alarm_client_msg); ++ msg->header.func = (MessageFunc) alarm_queue_remove_async; ++ msg->client = client; + +- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); + if (immediately) +- alarm_queue_remove_async (NULL, msg, NULL); ++ alarm_queue_remove_async (msg); + else +- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ message_push ((Message *) msg); + } + + /* Update non-time related variables for various structures on modification of an existing component +--- evolution-2.11.92/mail/em-folder-utils.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-utils.c 2007-09-04 00:19:08.000000000 -0400 +@@ -85,7 +85,7 @@ + } + + struct _EMCopyFolders { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *fromstore; +@@ -97,18 +97,15 @@ + int delete; + }; + +-static char * +-emft_copy_folders__desc (struct _mail_msg *mm, int complete) ++static gchar * ++emft_copy_folders__desc (struct _EMCopyFolders *m, gint complete) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; +- + return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); + } + + static void +-emft_copy_folders__copy (struct _mail_msg *mm) ++emft_copy_folders__exec (struct _EMCopyFolders *m) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; + guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; + GList *pending = NULL, *deleting = NULL, *l; + GString *fromname, *toname; +@@ -116,7 +113,7 @@ + const char *tmp; + int fromlen; + +- if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &mm->ex))) ++ if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) + return; + + pending = g_list_append (pending, fi); +@@ -156,8 +153,8 @@ + if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { + d(printf ("this folder is selectable\n")); + if (m->tostore == m->fromstore && m->delete) { +- camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &mm->ex); +- if (camel_exception_is_set (&mm->ex)) ++ camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex); ++ if (camel_exception_is_set (&m->base.ex)) + goto exception; + + /* this folder no longer exists, unsubscribe it */ +@@ -166,16 +163,16 @@ + + deleted = 1; + } else { +- if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &mm->ex))) ++ if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex))) + goto exception; + +- if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &mm->ex))) { ++ if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) { + camel_object_unref (fromfolder); + goto exception; + } + + uids = camel_folder_get_uids (fromfolder); +- camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &mm->ex); ++ camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex); + camel_folder_free_uids (fromfolder, uids); + + if (m->delete) +@@ -186,7 +183,7 @@ + } + } + +- if (camel_exception_is_set (&mm->ex)) ++ if (camel_exception_is_set (&m->base.ex)) + goto exception; + else if (m->delete && !deleted) + deleting = g_list_prepend (deleting, info); +@@ -227,10 +224,8 @@ + } + + static void +-emft_copy_folders__free (struct _mail_msg *mm) ++emft_copy_folders__free (struct _EMCopyFolders *m) + { +- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; +- + camel_object_unref (m->fromstore); + camel_object_unref (m->tostore); + +@@ -238,11 +233,12 @@ + g_free (m->tobase); + } + +-static struct _mail_msg_op copy_folders_op = { +- emft_copy_folders__desc, +- emft_copy_folders__copy, +- NULL, +- emft_copy_folders__free, ++static MailMsgInfo copy_folders_info = { ++ sizeof (struct _EMCopyFolders), ++ (MailMsgDescFunc) emft_copy_folders__desc, ++ (MailMsgExecFunc) emft_copy_folders__exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) emft_copy_folders__free + }; + + int +@@ -251,7 +247,7 @@ + struct _EMCopyFolders *m; + int seq; + +- m = mail_msg_new (©_folders_op, NULL, sizeof (struct _EMCopyFolders)); ++ m = mail_msg_new (©_folders_info); + camel_object_ref (fromstore); + m->fromstore = fromstore; + camel_object_ref (tostore); +@@ -259,9 +255,9 @@ + m->frombase = g_strdup (frombase); + m->tobase = g_strdup (tobase); + m->delete = delete; +- seq = m->msg.seq; ++ seq = m->base.seq; + +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push (m); + + return seq; + } +@@ -558,7 +554,7 @@ + } + + struct _EMCreateFolder { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + CamelStore *store; +@@ -582,41 +578,33 @@ + char *uri; + }; + +-static char * +-emfu_create_folder__desc (struct _mail_msg *mm, int done) ++static gchar * ++emfu_create_folder__desc (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + return g_strdup_printf (_("Creating folder `%s'"), m->full_name); + } + + static void +-emfu_create_folder__create (struct _mail_msg *mm) ++emfu_create_folder__exec (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); + +- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { ++ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { + if (camel_store_supports_subscriptions (m->store)) +- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); + } + } + + static void +-emfu_create_folder__created (struct _mail_msg *mm) ++emfu_create_folder__done (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + if (m->done) + m->done (m->fi, m->user_data); + } + + static void +-emfu_create_folder__free (struct _mail_msg *mm) ++emfu_create_folder__free (struct _EMCreateFolder *m) + { +- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + camel_object_unref (m->store); + g_free (m->full_name); +@@ -624,11 +612,12 @@ + g_free (m->name); + } + +-static struct _mail_msg_op create_folder_op = { +- emfu_create_folder__desc, +- emfu_create_folder__create, +- emfu_create_folder__created, +- emfu_create_folder__free, ++static MailMsgInfo create_folder_info = { ++ sizeof (struct _EMCreateFolder), ++ (MailMsgDescFunc) emfu_create_folder__desc, ++ (MailMsgExecFunc) emfu_create_folder__exec, ++ (MailMsgDoneFunc) emfu_create_folder__done, ++ (MailMsgFreeFunc) emfu_create_folder__free + }; + + +@@ -649,7 +638,7 @@ + parent = namebuf; + } + +- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); ++ m = mail_msg_new (&create_folder_info); + camel_object_ref (store); + m->store = store; + m->full_name = g_strdup (full_name); +@@ -660,8 +649,8 @@ + + g_free (namebuf); + +- id = m->msg.seq; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ id = m->base.seq; ++ mail_msg_unordered_push (m); + + return id; + } +--- evolution-2.11.92/mail/mail-ops.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-ops.c 2007-09-04 00:19:08.000000000 -0400 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ @@ -107,7 +1196,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *source_folder; /* where they come from */ GPtrArray *source_uids; /* uids to copy, or NULL == copy all */ -@@ -99,8 +99,8 @@ struct _fetch_mail_msg { +@@ -99,8 +99,8 @@ void *data; }; @@ -118,7 +1207,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m { return g_strdup (_("Filtering Selected Messages")); } -@@ -108,9 +108,8 @@ em_filter_folder_element_describe (struc +@@ -108,9 +108,8 @@ /* filter a folder, or a subset thereof, uses source_folder/source_uids */ /* this is shared with fetch_mail */ static void @@ -129,7 +1218,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *folder; GPtrArray *uids, *folder_uids = NULL; -@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct +@@ -137,15 +136,15 @@ else folder_uids = uids = camel_folder_get_uids (folder); @@ -148,7 +1237,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m camel_folder_thaw (folder); if (m->destination) -@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct +@@ -161,15 +160,13 @@ } static void @@ -166,7 +1255,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m if (m->source_folder) camel_object_unref (m->source_folder); -@@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m +@@ -188,11 +185,12 @@ mail_session_flush_filter_log (); } @@ -184,7 +1273,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_ +@@ -202,7 +200,7 @@ { struct _filter_mail_msg *m; @@ -193,7 +1282,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->source_folder = source_folder; camel_object_ref (source_folder); m->source_uids = uids; -@@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_ +@@ -221,7 +219,7 @@ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } @@ -202,7 +1291,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m } /* convenience functions for it */ -@@ -260,17 +258,16 @@ uid_cachename_hack (CamelStore *store) +@@ -260,17 +258,16 @@ return filename; } @@ -224,7 +1313,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m int i; if (m->cancel) -@@ -283,20 +280,20 @@ fetch_mail_fetch (struct _mail_msg *mm) +@@ -283,20 +280,20 @@ /* FIXME: this should support keep_on_server too, which would then perform a spool access thingy, right? problem is matching raw messages to uid's etc. */ if (!strncmp (m->source_uri, "mbox:", 5)) { @@ -250,7 +1339,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m if (folder) { /* this handles 'keep on server' stuff, if we have any new uid's to copy -@@ -322,17 +319,17 @@ fetch_mail_fetch (struct _mail_msg *mm) +@@ -322,17 +319,17 @@ camel_uid_cache_free_uids (cache_uids); fm->cache = cache; @@ -271,7 +1360,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m /* not keep on server - just delete all the actual messages on the server */ for (i=0;ilen;i++) { d(printf("force delete uid '%s'\n", (char *)folder_uids->pdata[i])); -@@ -348,7 +345,7 @@ fetch_mail_fetch (struct _mail_msg *mm) +@@ -348,7 +345,7 @@ camel_uid_cache_destroy (cache); camel_folder_free_uids (folder, folder_uids); } else { @@ -280,7 +1369,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m } /* we unref the source folder here since we -@@ -372,31 +369,28 @@ fail: +@@ -372,31 +369,28 @@ } static void @@ -321,7 +1410,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; /* ouch, a 'do everything' interface ... */ -@@ -409,7 +403,7 @@ mail_fetch_mail (const char *source, int +@@ -409,7 +403,7 @@ struct _fetch_mail_msg *m; struct _filter_mail_msg *fm; @@ -330,7 +1419,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m fm = (struct _filter_mail_msg *)m; m->source_uri = g_strdup (source); fm->delete = !keep; -@@ -426,7 +420,7 @@ mail_fetch_mail (const char *source, int +@@ -426,7 +420,7 @@ if (status) camel_filter_driver_set_status_func (fm->driver, status, status_data); @@ -339,7 +1428,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m } /* ********************************************************************** */ -@@ -657,7 +651,7 @@ exit: +@@ -657,7 +651,7 @@ /* ** SEND MAIL QUEUE ***************************************************** */ struct _send_queue_msg { @@ -348,7 +1437,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *queue; char *destination; -@@ -689,9 +683,8 @@ report_status (struct _send_queue_msg *m +@@ -689,9 +683,8 @@ } static void @@ -359,7 +1448,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *sent_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT); GPtrArray *uids, *send_uids = NULL; CamelException ex; -@@ -739,17 +732,17 @@ send_queue_send(struct _mail_msg *mm) +@@ -739,17 +732,17 @@ if (camel_exception_is_set (&ex)) { if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { /* merge exceptions into one */ @@ -381,7 +1470,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m break; } } -@@ -759,7 +752,7 @@ send_queue_send(struct _mail_msg *mm) +@@ -759,7 +752,7 @@ if (j > 0) report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed to send %d of %d messages"), j, send_uids->len); @@ -390,7 +1479,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Canceled.")); else report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); -@@ -785,19 +778,15 @@ send_queue_send(struct _mail_msg *mm) +@@ -785,19 +778,15 @@ } static void @@ -412,7 +1501,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m if (m->driver) camel_object_unref(m->driver); camel_object_unref(m->queue); -@@ -806,11 +795,12 @@ send_queue_free(struct _mail_msg *mm) +@@ -806,11 +795,12 @@ camel_operation_unref(m->cancel); } @@ -430,7 +1519,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; /* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */ -@@ -823,7 +813,7 @@ mail_send_queue(CamelFolder *queue, cons +@@ -823,7 +813,7 @@ { struct _send_queue_msg *m; @@ -439,7 +1528,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->queue = queue; camel_object_ref(queue); m->destination = g_strdup(destination); -@@ -839,13 +829,13 @@ mail_send_queue(CamelFolder *queue, cons +@@ -839,13 +829,13 @@ m->driver = camel_session_get_filter_driver (session, type, NULL); camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); @@ -455,7 +1544,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *folder; CamelMimeMessage *message; -@@ -856,45 +846,40 @@ struct _append_msg { +@@ -856,45 +846,40 @@ void *data; }; @@ -514,7 +1603,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -911,7 +896,7 @@ mail_append_mail (CamelFolder *folder, C +@@ -911,7 +896,7 @@ camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); @@ -523,7 +1612,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->folder = folder; camel_object_ref(folder); m->message = message; -@@ -921,13 +906,13 @@ mail_append_mail (CamelFolder *folder, C +@@ -921,13 +906,13 @@ m->done = done; m->data = data; @@ -539,7 +1628,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *source; GPtrArray *uids; -@@ -939,24 +924,21 @@ struct _transfer_msg { +@@ -939,24 +924,21 @@ void *data; }; @@ -569,7 +1658,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m return; if (dest == m->source) { -@@ -968,7 +950,7 @@ transfer_messages_transfer (struct _mail +@@ -968,7 +950,7 @@ camel_folder_freeze (m->source); camel_folder_freeze (dest); @@ -578,7 +1667,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m /* make sure all deleted messages are marked as seen */ -@@ -987,29 +969,26 @@ transfer_messages_transfer (struct _mail +@@ -987,29 +969,26 @@ } static void @@ -617,16 +1706,16 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -1026,7 +1005,7 @@ mail_transfer_messages (CamelFolder *sou - g_assert(uids != NULL); - g_assert(dest_uri != NULL); +@@ -1026,7 +1005,7 @@ + g_return_if_fail (uids != NULL); + g_return_if_fail (dest_uri != NULL); - m = mail_msg_new(&transfer_messages_op, NULL, sizeof(*m)); + m = mail_msg_new(&transfer_messages_info); m->source = source; camel_object_ref (source); m->uids = uids; -@@ -1036,13 +1015,13 @@ mail_transfer_messages (CamelFolder *sou +@@ -1036,13 +1015,13 @@ m->done = done; m->data = data; @@ -642,7 +1731,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelStore *store; CamelFolderInfo *info; -@@ -1050,10 +1029,9 @@ struct _get_folderinfo_msg { +@@ -1050,10 +1029,9 @@ void *data; }; @@ -655,7 +1744,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m char *ret, *name; name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1063,25 +1041,22 @@ get_folderinfo_desc (struct _mail_msg *m +@@ -1063,25 +1041,22 @@ } static void @@ -686,7 +1775,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m g_free (url); } -@@ -1090,20 +1065,19 @@ get_folderinfo_got (struct _mail_msg *mm +@@ -1090,20 +1065,19 @@ } static void @@ -714,7 +1803,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; int -@@ -1112,19 +1086,19 @@ mail_get_folderinfo (CamelStore *store, +@@ -1112,19 +1086,19 @@ struct _get_folderinfo_msg *m; int id; @@ -739,7 +1828,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m return id; } -@@ -1196,7 +1170,7 @@ mail_build_attachment(CamelFolder *folde +@@ -1196,7 +1170,7 @@ presumably create a folder ... */ struct _get_folder_msg { @@ -748,7 +1837,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m char *uri; guint32 flags; -@@ -1205,71 +1179,64 @@ struct _get_folder_msg { +@@ -1205,71 +1179,64 @@ void *data; }; @@ -837,7 +1926,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m char *uri; CamelStore *store; -@@ -1277,50 +1244,43 @@ struct _get_store_msg { +@@ -1277,50 +1244,43 @@ void *data; }; @@ -900,7 +1989,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; int -@@ -1329,25 +1289,25 @@ mail_get_store (const char *uri, CamelOp +@@ -1329,25 +1289,25 @@ struct _get_store_msg *m; int id; @@ -932,7 +2021,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m char *uri; gboolean removed; -@@ -1355,18 +1315,15 @@ struct _remove_folder_msg { +@@ -1355,18 +1315,15 @@ void *data; }; @@ -954,7 +2043,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelStore *store; CamelFolder *folder; GPtrArray *uids; -@@ -1374,7 +1331,7 @@ remove_folder_get (struct _mail_msg *mm) +@@ -1374,7 +1331,7 @@ m->removed = FALSE; @@ -963,7 +2052,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m if (!folder) return; -@@ -1394,16 +1351,14 @@ remove_folder_get (struct _mail_msg *mm) +@@ -1394,16 +1351,14 @@ camel_store_unsubscribe_folder (store, folder->full_name, NULL); /* Then delete the folder from the store */ @@ -983,7 +2072,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m if (m->removed) { /* FIXME: Remove this folder from the folder cache ??? */ } -@@ -1413,18 +1368,17 @@ remove_folder_got (struct _mail_msg *mm) +@@ -1413,18 +1368,17 @@ } static void @@ -1009,7 +2098,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -1432,59 +1386,56 @@ mail_remove_folder (const char *uri, voi +@@ -1432,59 +1386,56 @@ { struct _remove_folder_msg *m; @@ -1087,7 +2176,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -1492,19 +1443,19 @@ mail_sync_folder(CamelFolder *folder, vo +@@ -1492,19 +1443,19 @@ { struct _sync_folder_msg *m; @@ -1110,7 +2199,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelStore *store; int expunge; -@@ -1512,9 +1463,9 @@ struct _sync_store_msg { +@@ -1512,9 +1463,9 @@ void *data; }; @@ -1122,7 +2211,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m char *uri, *res; uri = camel_url_to_string(((CamelService *)m->store)->url, CAMEL_URL_HIDE_ALL); -@@ -1527,33 +1478,31 @@ static char *sync_store_desc(struct _mai +@@ -1527,33 +1478,31 @@ return res; } @@ -1169,7 +2258,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -1561,36 +1510,37 @@ mail_sync_store(CamelStore *store, int e +@@ -1561,36 +1510,37 @@ { struct _sync_store_msg *m; @@ -1219,7 +2308,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -1598,35 +1548,36 @@ mail_refresh_folder(CamelFolder *folder, +@@ -1598,35 +1548,36 @@ { struct _sync_folder_msg *m; @@ -1268,7 +2357,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -1634,31 +1585,30 @@ mail_expunge_folder(CamelFolder *folder, +@@ -1634,31 +1585,30 @@ { struct _sync_folder_msg *m; @@ -1305,7 +2394,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m return g_strdup_printf (_("Emptying trash in \'%s\'"), m->account ? m->account->name : _("Local Folders")); #else -@@ -1666,49 +1616,48 @@ static char *empty_trash_desc(struct _ma +@@ -1666,49 +1616,48 @@ #endif } @@ -1370,7 +2459,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -1716,20 +1665,20 @@ mail_empty_trash(EAccount *account, void +@@ -1716,20 +1665,20 @@ { struct _empty_trash_msg *m; @@ -1394,7 +2483,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *folder; char *uid; -@@ -1739,32 +1688,28 @@ struct _get_message_msg { +@@ -1739,32 +1688,28 @@ CamelOperation *cancel; }; @@ -1436,7 +2525,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m g_free (m->uid); camel_object_unref (m->folder); camel_operation_unref (m->cancel); -@@ -1773,21 +1718,22 @@ static void get_message_free(struct _mai +@@ -1773,21 +1718,22 @@ camel_object_unref (m->message); } @@ -1466,7 +2555,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->folder = folder; camel_object_ref(folder); m->uid = g_strdup(uid); -@@ -1795,37 +1741,37 @@ mail_get_message(CamelFolder *folder, co +@@ -1795,37 +1741,37 @@ m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); @@ -1516,7 +2605,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->folder = folder; camel_object_ref(folder); m->uid = g_strdup(uid); -@@ -1833,13 +1779,13 @@ mail_get_messagex(CamelFolder *folder, c +@@ -1833,13 +1779,13 @@ m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); @@ -1532,7 +2621,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *folder; GPtrArray *uids; -@@ -1849,26 +1795,25 @@ struct _get_messages_msg { +@@ -1849,26 +1795,25 @@ void *data; }; @@ -1565,7 +2654,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m if (message == NULL) break; -@@ -1876,17 +1821,16 @@ static void get_messages_get(struct _mai +@@ -1876,17 +1821,16 @@ } } @@ -1587,7 +2676,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m int i; em_utils_uids_free (m->uids); -@@ -1898,11 +1842,12 @@ static void get_messages_free(struct _ma +@@ -1898,11 +1842,12 @@ camel_object_unref(m->folder); } @@ -1605,7 +2694,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -1912,7 +1857,7 @@ mail_get_messages(CamelFolder *folder, G +@@ -1912,7 +1857,7 @@ { struct _get_messages_msg *m; @@ -1614,7 +2703,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -1920,13 +1865,13 @@ mail_get_messages(CamelFolder *folder, G +@@ -1920,13 +1865,13 @@ m->data = data; m->done = done; @@ -1630,7 +2719,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelFolder *folder; GPtrArray *uids; -@@ -1935,10 +1880,9 @@ struct _save_messages_msg { +@@ -1935,10 +1880,9 @@ void *data; }; @@ -1643,7 +2732,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m return g_strdup_printf(ngettext("Saving %d message", "Saving %d messsages", m->uids->len), m->uids->len); -@@ -1977,9 +1921,8 @@ save_prepare_part (CamelMimePart *mime_p +@@ -1977,9 +1921,8 @@ } static void @@ -1654,7 +2743,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelStreamFilter *filtered_stream; CamelMimeFilterFrom *from_filter; CamelStream *stream; -@@ -1996,8 +1939,8 @@ save_messages_save (struct _mail_msg *mm +@@ -1996,8 +1939,8 @@ CamelMimeMessage *message; int pc = ((i+1) * 100) / m->uids->len; @@ -1665,7 +2754,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m if (message == NULL) break; -@@ -2009,7 +1952,7 @@ save_messages_save (struct _mail_msg *mm +@@ -2009,7 +1952,7 @@ || camel_stream_flush(stream) == -1 || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1 || camel_stream_flush((CamelStream *)filtered_stream) == -1) { @@ -1674,7 +2763,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m _("Error saving messages to: %s:\n %s"), m->path, strerror(errno)); g_free(from); camel_object_unref((CamelObject *)message); -@@ -2023,28 +1966,27 @@ save_messages_save (struct _mail_msg *mm +@@ -2023,28 +1966,27 @@ camel_object_unref(stream); } @@ -1713,7 +2802,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; int -@@ -2054,7 +1996,7 @@ mail_save_messages(CamelFolder *folder, +@@ -2054,7 +1996,7 @@ struct _save_messages_msg *m; int id; @@ -1722,7 +2811,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -2062,8 +2004,8 @@ mail_save_messages(CamelFolder *folder, +@@ -2062,8 +2004,8 @@ m->data = data; m->done = done; @@ -1733,7 +2822,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m return id; } -@@ -2071,7 +2013,7 @@ mail_save_messages(CamelFolder *folder, +@@ -2071,7 +2013,7 @@ /* ** SAVE PART ******************************************************* */ struct _save_part_msg { @@ -1742,7 +2831,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelMimePart *part; char *path; -@@ -2080,27 +2022,27 @@ struct _save_part_msg { +@@ -2080,27 +2022,27 @@ gboolean readonly; }; @@ -1775,7 +2864,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m _("Cannot create output file: %s:\n %s"), m->path, g_strerror (errno)); return; -@@ -2110,7 +2052,7 @@ save_part_save (struct _mail_msg *mm) +@@ -2110,7 +2052,7 @@ if (camel_data_wrapper_decode_to_stream (content, stream) == -1 || camel_stream_flush (stream) == -1) @@ -1784,7 +2873,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m _("Could not write data: %s"), g_strerror (errno)); -@@ -2118,27 +2060,25 @@ save_part_save (struct _mail_msg *mm) +@@ -2118,27 +2060,25 @@ } static void @@ -1821,7 +2910,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; int -@@ -2147,7 +2087,7 @@ mail_save_part (CamelMimePart *part, con +@@ -2147,7 +2087,7 @@ { struct _save_part_msg *m; int id; @@ -1830,7 +2919,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->part = part; camel_object_ref (part); m->path = g_strdup (path); -@@ -2155,8 +2095,8 @@ mail_save_part (CamelMimePart *part, con +@@ -2155,8 +2095,8 @@ m->done = done; m->readonly = readonly; @@ -1841,7 +2930,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m return id; } -@@ -2165,7 +2105,7 @@ mail_save_part (CamelMimePart *part, con +@@ -2165,7 +2105,7 @@ /* ** PREPARE OFFLINE ***************************************************** */ struct _prep_offline_msg { @@ -1850,7 +2939,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelOperation *cancel; char *uri; -@@ -2173,22 +2113,22 @@ struct _prep_offline_msg { +@@ -2173,22 +2113,22 @@ void *data; }; @@ -1878,7 +2967,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m } /* prepare_for_offline should do this? */ /* of course it should all be atomic, but ... */ -@@ -2200,28 +2140,27 @@ static void prep_offline_do(struct _mail +@@ -2200,28 +2140,27 @@ camel_operation_unregister(m->cancel); } @@ -1917,7 +3006,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; void -@@ -2232,7 +2171,7 @@ mail_prep_offline(const char *uri, +@@ -2232,7 +2171,7 @@ { struct _prep_offline_msg *m; @@ -1926,7 +3015,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m m->cancel = cancel; if (cancel) camel_operation_ref(cancel); -@@ -2240,13 +2179,13 @@ mail_prep_offline(const char *uri, +@@ -2240,13 +2179,13 @@ m->data = data; m->done = done; @@ -1942,7 +3031,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m CamelStore *store; gboolean offline; -@@ -2254,9 +2193,9 @@ struct _set_offline_msg { +@@ -2254,9 +2193,9 @@ void *data; }; @@ -1954,7 +3043,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; -@@ -2266,61 +2205,59 @@ static char *set_offline_desc(struct _ma +@@ -2266,61 +2205,59 @@ return msg; } @@ -2033,7 +3122,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; int -@@ -2337,61 +2274,59 @@ mail_store_set_offline (CamelStore *stor +@@ -2337,61 +2274,59 @@ if (offline) camel_service_cancel_connect (CAMEL_SERVICE (store)); @@ -2116,7 +3205,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; int -@@ -2404,14 +2339,14 @@ mail_store_prepare_offline (CamelStore * +@@ -2404,14 +2339,14 @@ * thread won't get queued behind a hung connect op. */ @@ -2134,7 +3223,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m return id; } -@@ -2428,7 +2363,7 @@ mail_execute_shell_command (CamelFilterD +@@ -2428,7 +2363,7 @@ /* Async service-checking/authtype-lookup code. */ struct _check_msg { @@ -2143,7 +3232,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m char *url; CamelProviderType type; -@@ -2438,51 +2373,47 @@ struct _check_msg { +@@ -2438,51 +2373,47 @@ void *data; }; @@ -2209,7 +3298,7 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m }; int -@@ -2491,14 +2422,14 @@ mail_check_service(const char *url, Came +@@ -2491,14 +2422,14 @@ struct _check_msg *m; int id; @@ -2227,2329 +3316,8 @@ diff -up evolution-2.11.91/mail/mail-ops.c.kill-ethread evolution-2.11.91/mail/m return id; } -diff -up evolution-2.11.91/mail/em-folder-utils.c.kill-ethread evolution-2.11.91/mail/em-folder-utils.c ---- evolution-2.11.91/mail/em-folder-utils.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 -+++ evolution-2.11.91/mail/em-folder-utils.c 2007-08-29 17:39:34.000000000 -0400 -@@ -85,7 +85,7 @@ emfu_is_special_local_folder (const char - } - - struct _EMCopyFolders { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *fromstore; -@@ -97,18 +97,15 @@ struct _EMCopyFolders { - int delete; - }; - --static char * --emft_copy_folders__desc (struct _mail_msg *mm, int complete) -+static gchar * -+emft_copy_folders__desc (struct _EMCopyFolders *m, gint complete) - { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; -- - return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); - } - - static void --emft_copy_folders__copy (struct _mail_msg *mm) -+emft_copy_folders__exec (struct _EMCopyFolders *m) - { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; - guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - GList *pending = NULL, *deleting = NULL, *l; - GString *fromname, *toname; -@@ -116,7 +113,7 @@ emft_copy_folders__copy (struct _mail_ms - const char *tmp; - int fromlen; - -- if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &mm->ex))) -+ if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) - return; - - pending = g_list_append (pending, fi); -@@ -156,8 +153,8 @@ emft_copy_folders__copy (struct _mail_ms - if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { - d(printf ("this folder is selectable\n")); - if (m->tostore == m->fromstore && m->delete) { -- camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &mm->ex); -- if (camel_exception_is_set (&mm->ex)) -+ camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex); -+ if (camel_exception_is_set (&m->base.ex)) - goto exception; - - /* this folder no longer exists, unsubscribe it */ -@@ -166,16 +163,16 @@ emft_copy_folders__copy (struct _mail_ms - - deleted = 1; - } else { -- if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &mm->ex))) -+ if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex))) - goto exception; - -- if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &mm->ex))) { -+ if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) { - camel_object_unref (fromfolder); - goto exception; - } - - uids = camel_folder_get_uids (fromfolder); -- camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &mm->ex); -+ camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex); - camel_folder_free_uids (fromfolder, uids); - - if (m->delete) -@@ -186,7 +183,7 @@ emft_copy_folders__copy (struct _mail_ms - } - } - -- if (camel_exception_is_set (&mm->ex)) -+ if (camel_exception_is_set (&m->base.ex)) - goto exception; - else if (m->delete && !deleted) - deleting = g_list_prepend (deleting, info); -@@ -227,10 +224,8 @@ emft_copy_folders__copy (struct _mail_ms - } - - static void --emft_copy_folders__free (struct _mail_msg *mm) -+emft_copy_folders__free (struct _EMCopyFolders *m) - { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; -- - camel_object_unref (m->fromstore); - camel_object_unref (m->tostore); - -@@ -238,11 +233,12 @@ emft_copy_folders__free (struct _mail_ms - g_free (m->tobase); - } - --static struct _mail_msg_op copy_folders_op = { -- emft_copy_folders__desc, -- emft_copy_folders__copy, -- NULL, -- emft_copy_folders__free, -+static MailMsgInfo copy_folders_info = { -+ sizeof (struct _EMCopyFolders), -+ (MailMsgDescFunc) emft_copy_folders__desc, -+ (MailMsgExecFunc) emft_copy_folders__exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) emft_copy_folders__free - }; - - int -@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore - struct _EMCopyFolders *m; - int seq; - -- m = mail_msg_new (©_folders_op, NULL, sizeof (struct _EMCopyFolders)); -+ m = mail_msg_new (©_folders_info); - camel_object_ref (fromstore); - m->fromstore = fromstore; - camel_object_ref (tostore); -@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore - m->frombase = g_strdup (frombase); - m->tobase = g_strdup (tobase); - m->delete = delete; -- seq = m->msg.seq; -+ seq = m->base.seq; - -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - - return seq; - } -@@ -558,7 +554,7 @@ em_folder_utils_rename_folder (CamelFold - } - - struct _EMCreateFolder { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *store; -@@ -582,41 +578,33 @@ struct _EMCreateFolderTempData - char *uri; - }; - --static char * --emfu_create_folder__desc (struct _mail_msg *mm, int done) -+static gchar * -+emfu_create_folder__desc (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); - } - - static void --emfu_create_folder__create (struct _mail_msg *mm) -+emfu_create_folder__exec (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - -- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { -+ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { - if (camel_store_supports_subscriptions (m->store)) -- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); - } - } - - static void --emfu_create_folder__created (struct _mail_msg *mm) -+emfu_create_folder__done (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - if (m->done) - m->done (m->fi, m->user_data); - } - - static void --emfu_create_folder__free (struct _mail_msg *mm) -+emfu_create_folder__free (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - camel_object_unref (m->store); - g_free (m->full_name); -@@ -624,11 +612,12 @@ emfu_create_folder__free (struct _mail_m - g_free (m->name); - } - --static struct _mail_msg_op create_folder_op = { -- emfu_create_folder__desc, -- emfu_create_folder__create, -- emfu_create_folder__created, -- emfu_create_folder__free, -+static MailMsgInfo create_folder_info = { -+ sizeof (struct _EMCreateFolder), -+ (MailMsgDescFunc) emfu_create_folder__desc, -+ (MailMsgExecFunc) emfu_create_folder__exec, -+ (MailMsgDoneFunc) emfu_create_folder__done, -+ (MailMsgFreeFunc) emfu_create_folder__free - }; - - -@@ -649,7 +638,7 @@ emfu_create_folder_real (CamelStore *sto - parent = namebuf; - } - -- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); -+ m = mail_msg_new (&create_folder_info); - camel_object_ref (store); - m->store = store; - m->full_name = g_strdup (full_name); -@@ -660,8 +649,8 @@ emfu_create_folder_real (CamelStore *sto - - g_free (namebuf); - -- id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } -diff -up evolution-2.11.91/mail/importers/elm-importer.c.kill-ethread evolution-2.11.91/mail/importers/elm-importer.c ---- evolution-2.11.91/mail/importers/elm-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 -+++ evolution-2.11.91/mail/importers/elm-importer.c 2007-08-29 17:39:34.000000000 -0400 -@@ -51,7 +51,7 @@ - #define d(x) x - - struct _elm_import_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EImport *import; - EImportTargetHome *target; -@@ -186,8 +186,8 @@ elm_supported(EImport *ei, EImportTarget - return mailexists; - } - --static char * --elm_import_describe (struct _mail_msg *mm, int complete) -+static gchar * -+elm_import_desc (struct _elm_import_msg *m) - { - return g_strdup (_("Importing Elm data")); - } -@@ -198,9 +198,8 @@ static MailImporterSpecial elm_special_f - }; - - static void --elm_import_import(struct _mail_msg *mm) -+elm_import_exec (struct _elm_import_msg *m) - { -- struct _elm_import_msg *m = (struct _elm_import_msg *) mm; - const char *maildir; - char *elmdir; - -@@ -218,13 +217,11 @@ elm_import_import(struct _mail_msg *mm) - } - - static void --elm_import_imported(struct _mail_msg *mm) -+elm_import_done(struct _elm_import_msg *m) - { -- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; -- - printf("importing complete\n"); - -- if (!camel_exception_is_set(&mm->ex)) { -+ if (!camel_exception_is_set(&m->base.ex)) { - GConfClient *gconf; - - gconf = gconf_client_get_default(); -@@ -236,10 +233,8 @@ elm_import_imported(struct _mail_msg *mm - } - - static void --elm_import_free(struct _mail_msg *mm) -+elm_import_free(struct _elm_import_msg *m) - { -- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; -- - camel_operation_unref(m->status); - - g_free(m->status_what); -@@ -288,11 +283,12 @@ elm_status_timeout(void *data) - return TRUE; - } - --static struct _mail_msg_op elm_import_op = { -- elm_import_describe, -- elm_import_import, -- elm_import_imported, -- elm_import_free, -+static MailMsgInfo elm_import_info = { -+ sizeof (struct _elm_import_msg), -+ (MailMsgDescFunc) elm_import_desc, -+ (MailMsgExecFunc) elm_import_exec, -+ (MailMsgDoneFunc) elm_import_done, -+ (MailMsgFreeFunc) elm_import_free - }; - - static int -@@ -301,7 +297,7 @@ mail_importer_elm_import(EImport *ei, EI - struct _elm_import_msg *m; - int id; - -- m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&elm_import_info); - g_datalist_set_data(&target->data, "elm-msg", m); - m->import = ei; - g_object_ref(m->import); -@@ -310,9 +306,9 @@ mail_importer_elm_import(EImport *ei, EI - m->status_lock = g_mutex_new(); - m->status = camel_operation_new(elm_status, m); - -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - return id; - } -diff -up evolution-2.11.91/mail/importers/mail-importer.c.kill-ethread evolution-2.11.91/mail/importers/mail-importer.c ---- evolution-2.11.91/mail/importers/mail-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 -+++ evolution-2.11.91/mail/importers/mail-importer.c 2007-08-29 17:39:34.000000000 -0400 -@@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact - } - - struct _import_mbox_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *path; - char *uri; -@@ -142,8 +142,8 @@ struct _import_mbox_msg { - void *done_data; - }; - --static char * --import_mbox_describe(struct _mail_msg *mm, int complete) -+static gchar * -+import_mbox_desc (struct _import_mbox_msg *m) - { - return g_strdup (_("Importing mailbox")); - } -@@ -190,9 +190,8 @@ decode_mozilla_status(const char *tmp) - } - - static void --import_mbox_import(struct _mail_msg *mm) -+import_mbox_exec (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *) mm; - CamelFolder *folder; - CamelMimeParser *mp = NULL; - struct stat st; -@@ -207,7 +206,7 @@ import_mbox_import(struct _mail_msg *mm) - if (m->uri == NULL || m->uri[0] == 0) - folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_INBOX); - else -- folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &mm->ex); -+ folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); - - if (folder == NULL) - return; -@@ -262,11 +261,11 @@ import_mbox_import(struct _mail_msg *mm) - flags |= decode_status(tmp); - - camel_message_info_set_flags(info, flags, ~0); -- camel_folder_append_message(folder, msg, info, NULL, &mm->ex); -+ camel_folder_append_message(folder, msg, info, NULL, &m->base.ex); - camel_message_info_free(info); - camel_object_unref(msg); - -- if (camel_exception_is_set(&mm->ex)) -+ if (camel_exception_is_set(&m->base.ex)) - break; - - camel_mime_parser_step(mp, 0, 0); -@@ -286,30 +285,27 @@ fail1: - } - - static void --import_mbox_done(struct _mail_msg *mm) -+import_mbox_done (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; -- - if (m->done) -- m->done(m->done_data, &mm->ex); -+ m->done(m->done_data, &m->base.ex); - } - - static void --import_mbox_free (struct _mail_msg *mm) -+import_mbox_free (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; -- - if (m->cancel) - camel_operation_unref(m->cancel); - g_free(m->uri); - g_free(m->path); - } - --static struct _mail_msg_op import_mbox_op = { -- import_mbox_describe, -- import_mbox_import, -- import_mbox_done, -- import_mbox_free, -+static MailMsgInfo import_mbox_info = { -+ sizeof (struct _import_mbox_msg), -+ (MailMsgDescFunc) import_mbox_desc, -+ (MailMsgExecFunc) import_mbox_exec, -+ (MailMsgDoneFunc) import_mbox_done, -+ (MailMsgFreeFunc) import_mbox_free - }; - - int -@@ -318,7 +314,7 @@ mail_importer_import_mbox(const char *pa - struct _import_mbox_msg *m; - int id; - -- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&import_mbox_info); - m->path = g_strdup(path); - m->uri = g_strdup(folderuri); - m->done = done; -@@ -328,8 +324,8 @@ mail_importer_import_mbox(const char *pa - camel_operation_ref(cancel); - } - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_fast_ordered_push (m); - - return id; - } -@@ -339,7 +335,7 @@ mail_importer_import_mbox_sync(const cha - { - struct _import_mbox_msg *m; - -- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&import_mbox_info); - m->path = g_strdup(path); - m->uri = g_strdup(folderuri); - if (cancel) { -@@ -347,9 +343,9 @@ mail_importer_import_mbox_sync(const cha - camel_operation_ref(cancel); - } - -- import_mbox_import(&m->msg); -- import_mbox_done(&m->msg); -- mail_msg_free(&m->msg); -+ import_mbox_exec(&m->base); -+ import_mbox_done(&m->base); -+ mail_msg_unref(m); - } - - struct _import_folders_data { -diff -up evolution-2.11.91/mail/importers/pine-importer.c.kill-ethread evolution-2.11.91/mail/importers/pine-importer.c ---- evolution-2.11.91/mail/importers/pine-importer.c.kill-ethread 2007-07-05 02:09:35.000000000 -0400 -+++ evolution-2.11.91/mail/importers/pine-importer.c 2007-08-29 17:39:34.000000000 -0400 -@@ -56,7 +56,7 @@ - #define d(x) x - - struct _pine_import_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EImport *import; - EImportTarget *target; -@@ -223,8 +223,8 @@ import_contacts(void) - g_object_unref(book); - } - --static char * --pine_import_describe (struct _mail_msg *mm, int complete) -+static gchar * -+pine_import_desc (struct _pine_import_msg *m) - { - return g_strdup (_("Importing Pine data")); - } -@@ -236,10 +236,8 @@ static MailImporterSpecial pine_special_ - }; - - static void --pine_import_import(struct _mail_msg *mm) -+pine_import_exec(struct _pine_import_msg *m) - { -- struct _pine_import_msg *m = (struct _pine_import_msg *) mm; -- - if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) - import_contacts(); - -@@ -253,13 +251,11 @@ pine_import_import(struct _mail_msg *mm) - } - - static void --pine_import_imported(struct _mail_msg *mm) -+pine_import_done(struct _pine_import_msg *m) - { -- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; -- - printf("importing complete\n"); - -- if (!camel_exception_is_set(&mm->ex)) { -+ if (!camel_exception_is_set(&m->base.ex)) { - GConfClient *gconf; - - gconf = gconf_client_get_default(); -@@ -274,10 +270,8 @@ pine_import_imported(struct _mail_msg *m - } - - static void --pine_import_free(struct _mail_msg *mm) -+pine_import_free(struct _pine_import_msg *m) - { -- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; -- - camel_operation_unref(m->status); - - g_free(m->status_what); -@@ -326,11 +320,12 @@ pine_status_timeout(void *data) - return TRUE; - } - --static struct _mail_msg_op pine_import_op = { -- pine_import_describe, -- pine_import_import, -- pine_import_imported, -- pine_import_free, -+static MailMsgInfo pine_import_info = { -+ sizeof (struct _pine_import_msg), -+ (MailMsgDescFunc) pine_import_desc, -+ (MailMsgExecFunc) pine_import_exec, -+ (MailMsgDoneFunc) pine_import_done, -+ (MailMsgFreeFunc) pine_import_free - }; - - static int -@@ -339,7 +334,7 @@ mail_importer_pine_import(EImport *ei, E - struct _pine_import_msg *m; - int id; - -- m = mail_msg_new(&pine_import_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&pine_import_info); - g_datalist_set_data(&target->data, "pine-msg", m); - m->import = ei; - g_object_ref(m->import); -@@ -348,9 +343,9 @@ mail_importer_pine_import(EImport *ei, E - m->status_lock = g_mutex_new(); - m->status = camel_operation_new(pine_status, m); - -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - return id; - } -diff -up evolution-2.11.91/mail/em-utils.c.kill-ethread evolution-2.11.91/mail/em-utils.c ---- evolution-2.11.91/mail/em-utils.c.kill-ethread 2007-08-29 17:39:34.000000000 -0400 -+++ evolution-2.11.91/mail/em-utils.c 2007-08-29 17:39:34.000000000 -0400 -@@ -1912,7 +1912,7 @@ em_utils_in_addressbook(CamelInternetAdd - ESource *source = s->data; - GList *contacts; - EBook *book; -- void *hook; -+ GHook *hook; - - d(printf(" checking '%s'\n", e_source_get_uri(source))); - -diff -up evolution-2.11.91/mail/mail-vfolder.c.kill-ethread evolution-2.11.91/mail/mail-vfolder.c ---- evolution-2.11.91/mail/mail-vfolder.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 -+++ evolution-2.11.91/mail/mail-vfolder.c 2007-08-29 17:39:34.000000000 -0400 -@@ -21,7 +21,7 @@ - */ - - #include -- -+#include - #include - - #include -@@ -75,7 +75,7 @@ static void rule_changed(FilterRule *rul - /* ********************************************************************** */ - - struct _setup_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - char *query; -@@ -83,18 +83,15 @@ struct _setup_msg { - GList *sources_folder; - }; - --static char * --vfolder_setup_desc(struct _mail_msg *mm, int done) -+static gchar * -+vfolder_setup_desc (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; -- - return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name); - } - - static void --vfolder_setup_do(struct _mail_msg *mm) -+vfolder_setup_exec (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l, *list = NULL; - CamelFolder *folder; - -@@ -105,12 +102,12 @@ vfolder_setup_do(struct _mail_msg *mm) - l = m->sources_uri; - while (l && !shutdown) { - d(printf(" Adding uri: %s\n", (char *)l->data)); -- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); - if (folder) { - list = g_list_append(list, folder); - } else { - g_warning("Could not open vfolder source: %s", (char *)l->data); -- camel_exception_clear(&mm->ex); -+ camel_exception_clear(&m->base.ex); - } - l = l->next; - } -@@ -135,17 +132,13 @@ vfolder_setup_do(struct _mail_msg *mm) - } - - static void --vfolder_setup_done(struct _mail_msg *mm) -+vfolder_setup_done (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; -- -- m = m; - } - - static void --vfolder_setup_free (struct _mail_msg *mm) -+vfolder_setup_free (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l; - - camel_object_unref(m->folder); -@@ -166,11 +159,12 @@ vfolder_setup_free (struct _mail_msg *mm - g_list_free(m->sources_folder); - } - --static struct _mail_msg_op vfolder_setup_op = { -- vfolder_setup_desc, -- vfolder_setup_do, -- vfolder_setup_done, -- vfolder_setup_free, -+static MailMsgInfo vfolder_setup_info = { -+ sizeof (struct _setup_msg), -+ (MailMsgDescFunc) vfolder_setup_desc, -+ (MailMsgExecFunc) vfolder_setup_exec, -+ (MailMsgDoneFunc) vfolder_setup_done, -+ (MailMsgFreeFunc) vfolder_setup_free - }; - - /* sources_uri should be camel uri's */ -@@ -180,15 +174,15 @@ vfolder_setup(CamelFolder *folder, const - struct _setup_msg *m; - int id; - -- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&vfolder_setup_info); - m->folder = folder; - camel_object_ref(folder); - m->query = g_strdup(query); - m->sources_uri = sources_uri; - m->sources_folder = sources_folder; - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_slow_ordered_push (m); - - return id; - } -@@ -196,17 +190,16 @@ vfolder_setup(CamelFolder *folder, const - /* ********************************************************************** */ - - struct _adduri_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *uri; - GList *folders; - int remove; - }; - --static char * --vfolder_adduri_desc(struct _mail_msg *mm, int done) -+static gchar * -+vfolder_adduri_desc (struct _adduri_msg *m) - { -- struct _adduri_msg *m = (struct _adduri_msg *)mm; - char *euri, *desc = NULL; - - /* Yuck yuck. Lookup the account name and use that to describe the path */ -@@ -250,9 +243,8 @@ vfolder_adduri_desc(struct _mail_msg *mm - } - - static void --vfolder_adduri_do(struct _mail_msg *mm) -+vfolder_adduri_exec (struct _adduri_msg *m) - { -- struct _adduri_msg *m = (struct _adduri_msg *)mm; - GList *l; - CamelFolder *folder = NULL; - -@@ -269,7 +261,7 @@ vfolder_adduri_do(struct _mail_msg *mm) - } - - if (folder == NULL) -- folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); - - if (folder != NULL) { - l = m->folders; -@@ -285,28 +277,24 @@ vfolder_adduri_do(struct _mail_msg *mm) - } - - static void --vfolder_adduri_done(struct _mail_msg *mm) -+vfolder_adduri_done(struct _adduri_msg *m) - { -- struct _adduri_msg *m = (struct _adduri_msg *)mm; -- -- m = m; - } - - static void --vfolder_adduri_free (struct _mail_msg *mm) -+vfolder_adduri_free (struct _adduri_msg *m) - { -- struct _adduri_msg *m = (struct _adduri_msg *)mm; -- - g_list_foreach(m->folders, (GFunc)camel_object_unref, NULL); - g_list_free(m->folders); - g_free(m->uri); - } - --static struct _mail_msg_op vfolder_adduri_op = { -- vfolder_adduri_desc, -- vfolder_adduri_do, -- vfolder_adduri_done, -- vfolder_adduri_free, -+static MailMsgInfo vfolder_adduri_info = { -+ sizeof (struct _adduri_msg), -+ (MailMsgDescFunc) vfolder_adduri_desc, -+ (MailMsgExecFunc) vfolder_adduri_exec, -+ (MailMsgDoneFunc) vfolder_adduri_done, -+ (MailMsgFreeFunc) vfolder_adduri_free - }; - - -@@ -317,13 +305,13 @@ vfolder_adduri(const char *uri, GList *f - struct _adduri_msg *m; - int id; - -- m = mail_msg_new(&vfolder_adduri_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&vfolder_adduri_info); - m->folders = folders; - m->uri = g_strdup(uri); - m->remove = remove; - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_slow_ordered_push (m); - - return id; - } -@@ -447,7 +435,7 @@ mail_vfolder_add_uri(CamelStore *store, - return; - } - -- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); -+ g_assert(mail_in_main_thread()); - - is_ignore = uri_is_ignore(store, curi); - -@@ -540,7 +528,7 @@ mail_vfolder_delete_uri(CamelStore *stor - - d(printf ("Deleting uri to check: %s\n", uri)); - -- g_assert (pthread_equal(pthread_self(), mail_gui_thread)); -+ g_assert (mail_in_main_thread()); - - changed = g_string_new (""); - -@@ -615,7 +603,7 @@ mail_vfolder_rename_uri(CamelStore *stor - if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) - return; - -- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); -+ g_assert(mail_in_main_thread()); - - from = em_uri_from_camel(cfrom); - to = em_uri_from_camel(cto); -diff -up evolution-2.11.91/mail/em-format-html.c.kill-ethread evolution-2.11.91/mail/em-format-html.c ---- evolution-2.11.91/mail/em-format-html.c.kill-ethread 2007-08-27 02:14:40.000000000 -0400 -+++ evolution-2.11.91/mail/em-format-html.c 2007-08-29 17:39:34.000000000 -0400 -@@ -165,7 +165,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor - if (efh->priv->format_timeout_id != 0) { - g_source_remove(efh->priv->format_timeout_id); - efh->priv->format_timeout_id = 0; -- mail_msg_free(efh->priv->format_timeout_msg); -+ mail_msg_unref(efh->priv->format_timeout_msg); - efh->priv->format_timeout_msg = NULL; - } - -@@ -1202,7 +1202,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc - - /* Sigh, this is so we have a cancellable, async rendering thread */ - struct _format_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EMFormatHTML *format; - EMFormat *format_source; -@@ -1212,14 +1212,15 @@ struct _format_msg { - CamelMimeMessage *message; - }; - --static char *efh_format_desc(struct _mail_msg *mm, int done) -+static gchar * -+efh_format_desc (struct _format_msg *m) - { - return g_strdup(_("Formatting message")); - } - --static void efh_format_do(struct _mail_msg *mm) -+static void -+efh_format_exec (struct _format_msg *m) - { -- struct _format_msg *m = (struct _format_msg *)mm; - struct _EMFormatHTMLJob *job; - struct _EMFormatPURITree *puri_level; - int cancelled = FALSE; -@@ -1304,10 +1305,9 @@ static void efh_format_do(struct _mail_m - ((EMFormat *)m->format)->pending_uri_level = puri_level; - } - --static void efh_format_done(struct _mail_msg *mm) -+static void -+efh_format_done (struct _format_msg *m) - { -- struct _format_msg *m = (struct _format_msg *)mm; -- - d(printf("formatting finished\n")); - - m->format->load_http_now = FALSE; -@@ -1315,10 +1315,9 @@ static void efh_format_done(struct _mail - g_signal_emit_by_name(m->format, "complete"); - } - --static void efh_format_free(struct _mail_msg *mm) -+static void -+efh_format_free (struct _format_msg *m) - { -- struct _format_msg *m = (struct _format_msg *)mm; -- - d(printf("formatter freed\n")); - g_object_unref(m->format); - if (m->estream) { -@@ -1334,11 +1333,12 @@ static void efh_format_free(struct _mail - g_object_unref(m->format_source); - } - --static struct _mail_msg_op efh_format_op = { -- efh_format_desc, -- efh_format_do, -- efh_format_done, -- efh_format_free, -+static MailMsgInfo efh_format_info = { -+ sizeof (struct _format_msg), -+ (MailMsgDescFunc) efh_format_desc, -+ (MailMsgExecFunc) efh_format_exec, -+ (MailMsgDoneFunc) efh_format_done, -+ (MailMsgFreeFunc) efh_format_free - }; - - static gboolean -@@ -1349,7 +1349,7 @@ efh_format_timeout(struct _format_msg *m - struct _EMFormatHTMLPrivate *p = efh->priv; - - if (m->format->html == NULL) { -- mail_msg_free(m); -+ mail_msg_unref(m); - return FALSE; - } - -@@ -1377,7 +1377,7 @@ efh_format_timeout(struct _format_msg *m - if (m->message == NULL) { - hstream = gtk_html_begin(efh->html); - gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); -- mail_msg_free(m); -+ mail_msg_unref(m); - p->last_part = NULL; - } else { - hstream = gtk_html_begin(efh->html); -@@ -1401,8 +1401,8 @@ efh_format_timeout(struct _format_msg *m - p->last_part = m->message; - } - -- efh->priv->format_id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ efh->priv->format_id = m->base.seq; -+ mail_msg_unordered_push (m); - } - - efh->priv->format_timeout_id = 0; -@@ -1426,11 +1426,11 @@ static void efh_format_clone(EMFormat *e - d(printf(" timeout for last still active, removing ...\n")); - g_source_remove(efh->priv->format_timeout_id); - efh->priv->format_timeout_id = 0; -- mail_msg_free(efh->priv->format_timeout_msg); -+ mail_msg_unref(efh->priv->format_timeout_msg); - efh->priv->format_timeout_msg = NULL; - } - -- m = mail_msg_new(&efh_format_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&efh_format_info); - m->format = (EMFormatHTML *)emf; - g_object_ref(emf); - m->format_source = emfsource; -diff -up evolution-2.11.91/mail/em-folder-properties.c.kill-ethread evolution-2.11.91/mail/em-folder-properties.c ---- evolution-2.11.91/mail/em-folder-properties.c.kill-ethread 2007-07-05 02:09:37.000000000 -0400 -+++ evolution-2.11.91/mail/em-folder-properties.c 2007-08-29 17:39:34.000000000 -0400 -@@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par - } - - if (folder == NULL) -- mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); -+ mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); - else - emfp_dialog_got_folder((char *)uri, folder, NULL); - } -diff -up evolution-2.11.91/mail/em-folder-tree.c.kill-ethread evolution-2.11.91/mail/em-folder-tree.c ---- evolution-2.11.91/mail/em-folder-tree.c.kill-ethread 2007-08-24 02:49:43.000000000 -0400 -+++ evolution-2.11.91/mail/em-folder-tree.c 2007-08-29 17:39:34.000000000 -0400 -@@ -835,7 +835,7 @@ fail: - /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ - /* Drop handling */ - struct _DragDataReceivedAsync { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - GdkDragContext *context; -@@ -860,17 +860,16 @@ emft_drop_folder(struct _DragDataReceive - - d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); - -- if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->msg.ex))) -+ if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) - return; - - em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); - camel_object_unref(src); - } - --static char * --emft_drop_async_desc (struct _mail_msg *mm, int done) -+static gchar * -+emft_drop_async__desc (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; - CamelURL *url; - char *buf; - -@@ -894,9 +893,8 @@ emft_drop_async_desc (struct _mail_msg * - } - - static void --emft_drop_async_drop (struct _mail_msg *mm) -+emft_drop_async__exec (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; - CamelFolder *folder; - - /* for types other than folder, we can't drop to the root path */ -@@ -904,14 +902,14 @@ emft_drop_async_drop (struct _mail_msg * - /* copy or move (aka rename) a folder */ - emft_drop_folder(m); - } else if (m->full_name == NULL) { -- camel_exception_set (&mm->ex, CAMEL_EXCEPTION_SYSTEM, -+ camel_exception_set (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, - _("Cannot drop message(s) into toplevel store")); -- } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &mm->ex))) { -+ } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &m->base.ex))) { - switch (m->info) { - case DND_DROP_TYPE_UID_LIST: - /* import a list of uids from another evo folder */ -- em_utils_selection_get_uidlist(m->selection, folder, m->move, &mm->ex); -- m->moved = m->move && !camel_exception_is_set(&mm->ex); -+ em_utils_selection_get_uidlist(m->selection, folder, m->move, &m->base.ex); -+ m->moved = m->move && !camel_exception_is_set(&m->base.ex); - break; - case DND_DROP_TYPE_MESSAGE_RFC822: - /* import a message/rfc822 stream */ -@@ -929,9 +927,8 @@ emft_drop_async_drop (struct _mail_msg * - } - - static void --emft_drop_async_done (struct _mail_msg *mm) -+emft_drop_async__done (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; - gboolean success, delete; - - /* ?? */ -@@ -939,7 +936,7 @@ emft_drop_async_done (struct _mail_msg * - success = FALSE; - delete = FALSE; - } else { -- success = !camel_exception_is_set (&mm->ex); -+ success = !camel_exception_is_set (&m->base.ex); - delete = success && m->move && !m->moved; - } - -@@ -947,10 +944,8 @@ emft_drop_async_done (struct _mail_msg * - } - - static void --emft_drop_async_free (struct _mail_msg *mm) -+emft_drop_async__free (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; -- - g_object_unref(m->context); - camel_object_unref(m->store); - g_free(m->full_name); -@@ -959,18 +954,19 @@ emft_drop_async_free (struct _mail_msg * - g_free(m->selection); - } - --static struct _mail_msg_op emft_drop_async_op = { -- emft_drop_async_desc, -- emft_drop_async_drop, -- emft_drop_async_done, -- emft_drop_async_free, -+static MailMsgInfo emft_drop_async_info = { -+ sizeof (struct _DragDataReceivedAsync), -+ (MailMsgDescFunc) emft_drop_async__desc, -+ (MailMsgExecFunc) emft_drop_async__exec, -+ (MailMsgDoneFunc) emft_drop_async__done, -+ (MailMsgFreeFunc) emft_drop_async__free - }; - - static void - tree_drag_data_action(struct _DragDataReceivedAsync *m) - { - m->move = m->action == GDK_ACTION_MOVE; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static void -@@ -997,7 +993,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu - struct _DragDataReceivedAsync *m = data; - - m->aborted = TRUE; -- mail_msg_free(&m->msg); -+ mail_msg_unref(m); - } - - static EPopupItem emft_drop_popup_menu[] = { -@@ -1053,7 +1049,7 @@ tree_drag_data_received(GtkWidget *widge - return; - } - -- m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync)); -+ m = mail_msg_new (&emft_drop_async_info); - m->context = context; - g_object_ref(context); - m->store = store; -@@ -1692,7 +1688,7 @@ dump_fi (CamelFolderInfo *fi, int depth) - #endif - - struct _EMFolderTreeGetFolderInfo { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - GtkTreeRowReference *root; -@@ -1705,10 +1701,9 @@ struct _EMFolderTreeGetFolderInfo { - CamelFolderInfo *fi; - }; - --static char * --emft_get_folder_info__desc(struct _mail_msg *mm, int done) -+static gchar * -+emft_get_folder_info__desc (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm; - char *ret, *name; - - name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1718,18 +1713,16 @@ emft_get_folder_info__desc(struct _mail_ - } - - static void --emft_get_folder_info__get (struct _mail_msg *mm) -+emft_get_folder_info__exec (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; - guint32 flags = m->flags | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - -- m->fi = camel_store_get_folder_info (m->store, m->top, flags, &mm->ex); -+ m->fi = camel_store_get_folder_info (m->store, m->top, flags, &m->base.ex); - } - - static void --emft_get_folder_info__got (struct _mail_msg *mm) -+emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; - struct _EMFolderTreePrivate *priv = m->emft->priv; - struct _EMFolderTreeModelStoreInfo *si; - GtkTreeIter root, iter; -@@ -1757,7 +1750,7 @@ emft_get_folder_info__got (struct _mail_ - gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); - - /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ -- if (!m->fi && camel_exception_is_set(&mm->ex)) { -+ if (!m->fi && camel_exception_is_set(&m->base.ex)) { - gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); - gtk_tree_view_collapse_row (priv->treeview, path); - gtk_tree_path_free (path); -@@ -1812,10 +1805,8 @@ emft_get_folder_info__got (struct _mail_ - } - - static void --emft_get_folder_info__free (struct _mail_msg *mm) -+emft_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - - gtk_tree_row_reference_free (m->root); -@@ -1824,11 +1815,12 @@ emft_get_folder_info__free (struct _mail - g_free (m->top); - } - --static struct _mail_msg_op get_folder_info_op = { -- emft_get_folder_info__desc, -- emft_get_folder_info__get, -- emft_get_folder_info__got, -- emft_get_folder_info__free, -+static MailMsgInfo get_folder_info_info = { -+ sizeof (struct _EMFolderTreeGetFolderInfo), -+ (MailMsgDescFunc) emft_get_folder_info__desc, -+ (MailMsgExecFunc) emft_get_folder_info__exec, -+ (MailMsgDoneFunc) emft_get_folder_info__done, -+ (MailMsgFreeFunc) emft_get_folder_info__free - }; - - static void -@@ -1915,7 +1907,7 @@ emft_tree_row_expanded (GtkTreeView *tre - - gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); - -- m = mail_msg_new (&get_folder_info_op, NULL, sizeof (struct _EMFolderTreeGetFolderInfo)); -+ m = mail_msg_new (&get_folder_info_info); - m->root = gtk_tree_row_reference_new (model, tree_path); - camel_object_ref (store); - m->store = store; -@@ -1924,7 +1916,7 @@ emft_tree_row_expanded (GtkTreeView *tre - m->top = full_name; - m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; - -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static gboolean -diff -up evolution-2.11.91/mail/em-folder-browser.c.kill-ethread evolution-2.11.91/mail/em-folder-browser.c ---- evolution-2.11.91/mail/em-folder-browser.c.kill-ethread 2007-08-27 01:55:18.000000000 -0400 -+++ evolution-2.11.91/mail/em-folder-browser.c 2007-08-29 17:39:34.000000000 -0400 -@@ -851,7 +851,7 @@ get_view_query (ESearchBar *esb) - - - struct _setup_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - char *query; -@@ -859,16 +859,15 @@ struct _setup_msg { - GList *sources_folder; - }; - --static char * --vfolder_setup_desc(struct _mail_msg *mm, int done) -+static gchar * -+vfolder_setup_desc(struct _setup_msg *m) - { - return g_strdup(_("Searching")); - } - - static void --vfolder_setup_do(struct _mail_msg *mm) -+vfolder_setup_exec(struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l, *list = NULL; - CamelFolder *folder; - -@@ -879,12 +878,12 @@ vfolder_setup_do(struct _mail_msg *mm) - l = m->sources_uri; - while (l) { - d(printf(" Adding uri: %s\n", (char *)l->data)); -- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); - if (folder) { - list = g_list_append(list, folder); - } else { - g_warning("Could not open vfolder source: %s", (char *)l->data); -- camel_exception_clear(&mm->ex); -+ camel_exception_clear(&m->base.ex); - } - l = l->next; - } -@@ -908,17 +907,13 @@ vfolder_setup_do(struct _mail_msg *mm) - } - - static void --vfolder_setup_done(struct _mail_msg *mm) -+vfolder_setup_done(struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; -- -- m = m; - } - - static void --vfolder_setup_free (struct _mail_msg *mm) -+vfolder_setup_free (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l; - - camel_object_unref(m->folder); -@@ -939,11 +934,12 @@ vfolder_setup_free (struct _mail_msg *mm - g_list_free(m->sources_folder); - } - --static struct _mail_msg_op vfolder_setup_op = { -- vfolder_setup_desc, -- vfolder_setup_do, -- vfolder_setup_done, -- vfolder_setup_free, -+static MailMsgInfo vfolder_setup_info = { -+ sizeof (struct _setup_msg), -+ (MailMsgDescFunc) vfolder_setup_desc, -+ (MailMsgExecFunc) vfolder_setup_exec, -+ (MailMsgDoneFunc) vfolder_setup_done, -+ (MailMsgFreeFunc) vfolder_setup_free - }; - - /* sources_uri should be camel uri's */ -@@ -953,15 +949,15 @@ vfolder_setup(CamelFolder *folder, const - struct _setup_msg *m; - int id; - -- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&vfolder_setup_info); - m->folder = folder; - camel_object_ref(folder); - m->query = g_strdup(query); - m->sources_uri = sources_uri; - m->sources_folder = sources_folder; - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_slow_ordered_push (m); - - return id; - } -diff -up evolution-2.11.91/mail/message-list.c.kill-ethread evolution-2.11.91/mail/message-list.c ---- evolution-2.11.91/mail/message-list.c.kill-ethread 2007-08-09 02:46:47.000000000 -0400 -+++ evolution-2.11.91/mail/message-list.c 2007-08-29 17:39:34.000000000 -0400 -@@ -1841,7 +1841,7 @@ ml_tree_drag_data_get (ETree *tree, int - /* TODO: merge this with the folder tree stuff via empopup targets */ - /* Drop handling */ - struct _drop_msg { -- struct _mail_msg msg; -+ MailMsg base; - - GdkDragContext *context; - -@@ -1858,11 +1858,9 @@ struct _drop_msg { - unsigned int aborted:1; - }; - --static char * --ml_drop_async_desc (struct _mail_msg *mm, int done) -+static gchar * -+ml_drop_async_desc (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *) mm; -- - if (m->move) - return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); - else -@@ -1870,13 +1868,11 @@ ml_drop_async_desc (struct _mail_msg *mm - } - - static void --ml_drop_async_drop(struct _mail_msg *mm) -+ml_drop_async_exec (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; -- - switch (m->info) { - case DND_X_UID_LIST: -- em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &mm->ex); -+ em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &m->base.ex); - break; - case DND_MESSAGE_RFC822: - em_utils_selection_get_message(m->selection, m->folder); -@@ -1888,9 +1884,8 @@ ml_drop_async_drop(struct _mail_msg *mm) - } - - static void --ml_drop_async_done(struct _mail_msg *mm) -+ml_drop_async_done (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; - gboolean success, delete; - - /* ?? */ -@@ -1898,7 +1893,7 @@ ml_drop_async_done(struct _mail_msg *mm) - success = FALSE; - delete = FALSE; - } else { -- success = !camel_exception_is_set (&mm->ex); -+ success = !camel_exception_is_set (&m->base.ex); - delete = success && m->move && !m->moved; - } - -@@ -1906,10 +1901,8 @@ ml_drop_async_done(struct _mail_msg *mm) - } - - static void --ml_drop_async_free(struct _mail_msg *mm) -+ml_drop_async_free (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; -- - g_object_unref(m->context); - camel_object_unref(m->folder); - -@@ -1917,18 +1910,19 @@ ml_drop_async_free(struct _mail_msg *mm) - g_free(m->selection); - } - --static struct _mail_msg_op ml_drop_async_op = { -- ml_drop_async_desc, -- ml_drop_async_drop, -- ml_drop_async_done, -- ml_drop_async_free, -+static MailMsgInfo ml_drop_async_info = { -+ sizeof (struct _drop_msg), -+ (MailMsgDescFunc) ml_drop_async_desc, -+ (MailMsgExecFunc) ml_drop_async_exec, -+ (MailMsgDoneFunc) ml_drop_async_done, -+ (MailMsgFreeFunc) ml_drop_async_free - }; - - static void - ml_drop_action(struct _drop_msg *m) - { - m->move = m->action == GDK_ACTION_MOVE; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static void -@@ -1955,7 +1949,7 @@ ml_drop_popup_cancel(EPopup *ep, EPopupI - struct _drop_msg *m = data; - - m->aborted = TRUE; -- mail_msg_free(&m->msg); -+ mail_msg_unref(m); - } - - static EPopupItem ml_drop_popup_menu[] = { -@@ -1985,7 +1979,7 @@ ml_tree_drag_data_received (ETree *tree, - if (!ml->folder || data->data == NULL || data->length == -1) - return; - -- m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&ml_drop_async_info); - m->context = context; - g_object_ref(context); - m->folder = ml->folder; -@@ -3718,7 +3712,7 @@ save_hide_state (MessageList *ml) - - /* ** REGENERATE MESSAGELIST ********************************************** */ - struct _regen_list_msg { -- struct _mail_msg msg; -+ MailMsg base; - - int complete; - -@@ -3746,16 +3740,15 @@ struct _regen_list_msg { - - */ - --static char * --regen_list_describe (struct _mail_msg *mm, gint complete) -+static gchar * -+regen_list_desc (struct _regen_list_msg *m) - { - return g_strdup (_("Generating message list")); - } - - static void --regen_list_regen (struct _mail_msg *mm) -+regen_list_exec (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; - GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; - CamelMessageInfo *info; - int i; -@@ -3785,7 +3778,7 @@ regen_list_regen (struct _mail_msg *mm) - } else - expr = "(match-all (not (system-flag \"deleted\")))"; - } -- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); - } else { - char *expr; - -@@ -3795,23 +3788,23 @@ regen_list_regen (struct _mail_msg *mm) - sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); - } else - expr = "(match-all (not (system-flag \"junk\")))"; -- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); - } else { - if (m->search) -- searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &m->base.ex); - else - uids = camel_folder_get_uids (m->folder); - } - } - -- if (camel_exception_is_set (&mm->ex)) -+ if (camel_exception_is_set (&m->base.ex)) - return; - - /* perform hiding */ - if (m->hideexpr && camel_folder_has_search_capability(m->folder)) { -- uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex); -+ uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &m->base.ex); - /* well, lets not abort just because this faileld ... */ -- camel_exception_clear (&mm->ex); -+ camel_exception_clear (&m->base.ex); - - if (uidnew) { - MESSAGE_LIST_LOCK(m->ml, hide_lock); -@@ -3886,7 +3879,7 @@ regen_list_regen (struct _mail_msg *mm) - - e_profile_event_emit("list.threaduids", m->folder->full_name, 0); - -- if (!camel_operation_cancel_check(mm->cancel)) { -+ if (!camel_operation_cancel_check(m->base.cancel)) { - /* update/build a new tree */ - if (m->dotree) { - if (m->tree) -@@ -3915,17 +3908,15 @@ regen_list_regen (struct _mail_msg *mm) - } - - static void --regen_list_regened (struct _mail_msg *mm) -+regen_list_done (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; -- - if (m->ml->priv->destroyed) - return; - - if (!m->complete) - return; - -- if (camel_operation_cancel_check(mm->cancel)) -+ if (camel_operation_cancel_check(m->base.cancel)) - return; - - if (m->ml->folder != m->folder) -@@ -3976,9 +3967,8 @@ regen_list_regened (struct _mail_msg *mm - } - - static void --regen_list_free (struct _mail_msg *mm) -+regen_list_free (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; - int i; - - e_profile_event_emit("list.regenerated", m->folder->full_name, 0); -@@ -4006,11 +3996,12 @@ regen_list_free (struct _mail_msg *mm) - g_object_unref(m->ml); - } - --static struct _mail_msg_op regen_list_op = { -- regen_list_describe, -- regen_list_regen, -- regen_list_regened, -- regen_list_free, -+static MailMsgInfo regen_list_info = { -+ sizeof (struct _regen_list_msg), -+ (MailMsgDescFunc) regen_list_desc, -+ (MailMsgExecFunc) regen_list_exec, -+ (MailMsgDoneFunc) regen_list_done, -+ (MailMsgFreeFunc) regen_list_free - }; - - static gboolean -@@ -4020,7 +4011,7 @@ ml_regen_timeout(struct _regen_list_msg - - m->ml->regen = g_list_prepend(m->ml->regen, m); - /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ -- e_thread_put (mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - m->ml->regen_timeout_msg = NULL; - m->ml->regen_timeout_id = 0; -@@ -4036,7 +4027,7 @@ mail_regen_cancel(MessageList *ml) - GList *l = ml->regen; - - while (l) { -- struct _mail_msg *mm = l->data; -+ MailMsg *mm = l->data; - - if (mm->cancel) - camel_operation_cancel(mm->cancel); -@@ -4048,7 +4039,7 @@ mail_regen_cancel(MessageList *ml) - if (ml->regen_timeout_id) { - g_source_remove(ml->regen_timeout_id); - ml->regen_timeout_id = 0; -- mail_msg_free((struct _mail_msg *)ml->regen_timeout_msg); -+ mail_msg_unref(ml->regen_timeout_msg); - ml->regen_timeout_msg = NULL; - } - } -@@ -4083,7 +4074,7 @@ mail_regen_list (MessageList *ml, const - } - #endif - -- m = mail_msg_new (®en_list_op, NULL, sizeof (*m)); -+ m = mail_msg_new (®en_list_info); - m->ml = ml; - m->search = g_strdup (search); - m->hideexpr = g_strdup (hideexpr); -diff -up evolution-2.11.91/mail/em-sync-stream.h.kill-ethread evolution-2.11.91/mail/em-sync-stream.h ---- evolution-2.11.91/mail/em-sync-stream.h.kill-ethread 2007-07-05 02:09:39.000000000 -0400 -+++ evolution-2.11.91/mail/em-sync-stream.h 2007-08-29 17:39:34.000000000 -0400 -@@ -29,41 +29,45 @@ requests are always handled in the main - #ifndef EM_SYNC_STREAM_H - #define EM_SYNC_STREAM_H - --#ifdef __cplusplus --extern "C" { --#pragma } --#endif /* __cplusplus */ -- --#define EM_SYNC_STREAM_TYPE (em_sync_stream_get_type ()) --#define EM_SYNC_STREAM(obj) (CAMEL_CHECK_CAST((obj), EM_SYNC_STREAM_TYPE, EMSyncStream)) --#define EM_SYNC_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_SYNC_STREAM_TYPE, EMSyncStreamClass)) --#define EM_IS_SYNC_STREAM(o) (CAMEL_CHECK_TYPE((o), EM_SYNC_STREAM_TYPE)) -- - #include - #include - --typedef struct _EMSyncStream { -- CamelStream parent_stream; -- -- struct _EMSyncStreamPrivate *priv; -+#define EM_SYNC_STREAM_TYPE \ -+ (em_sync_stream_get_type ()) -+#define EM_SYNC_STREAM(obj) \ -+ (CAMEL_CHECK_CAST \ -+ ((obj), EM_SYNC_STREAM_TYPE, EMSyncStream)) -+#define EM_SYNC_STREAM_CLASS(cls) \ -+ (CAMEL_CHECK_CLASS_CAST \ -+ ((cls), EM_SYNC_STREAM_TYPE, EMSyncStreamClass)) -+#define EM_IS_SYNC_STREAM(obj) \ -+ (CAMEL_CHECK_TYPE ((obj), EM_SYNC_STREAM_TYPE)) -+ -+G_BEGIN_DECLS -+ -+typedef struct _EMSyncStream EMSyncStream; -+typedef struct _EMSyncStreamClass EMSyncStreamClass; -+ -+struct _EMSyncStream { -+ CamelStream parent; -+ GString *buffer; -+ gboolean cancel; -+}; - -- int cancel; --} EMSyncStream; -- --typedef struct { -+struct _EMSyncStreamClass { - CamelStreamClass parent_class; - -- ssize_t (*sync_write) (CamelStream *stream, const char *buffer, size_t n); -- int (*sync_close) (CamelStream *stream); -- int (*sync_flush) (CamelStream *stream); -- --} EMSyncStreamClass; -- --CamelType em_sync_stream_get_type (void); --void em_sync_stream_set_buffer_size(EMSyncStream *, size_t size); -- --#ifdef __cplusplus --} --#endif /* __cplusplus */ -+ gssize (*sync_write) (CamelStream *stream, -+ const gchar *string, -+ gsize len); -+ int (*sync_close) (CamelStream *stream); -+ int (*sync_flush) (CamelStream *stream); -+}; -+ -+CamelType em_sync_stream_get_type (void); -+void em_sync_stream_set_buffer_size (EMSyncStream *stream, -+ gsize size); -+ -+G_END_DECLS - - #endif /* EM_SYNC_STREAM_H */ -diff -up evolution-2.11.91/mail/em-format-html-print.c.kill-ethread evolution-2.11.91/mail/em-format-html-print.c ---- evolution-2.11.91/mail/em-format-html-print.c.kill-ethread 2007-07-08 22:46:50.000000000 -0400 -+++ evolution-2.11.91/mail/em-format-html-print.c 2007-08-29 17:39:34.000000000 -0400 -@@ -228,7 +228,7 @@ em_format_html_print_message (EMFormatHT - g_object_ref (efhp); - - mail_get_message ( -- folder, uid, emfhp_got_message, efhp, mail_thread_new); -+ folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); - } - - void -diff -up evolution-2.11.91/mail/em-sync-stream.c.kill-ethread evolution-2.11.91/mail/em-sync-stream.c ---- evolution-2.11.91/mail/em-sync-stream.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.91/mail/em-sync-stream.c 2007-08-29 17:39:34.000000000 -0400 -@@ -25,42 +25,17 @@ - #include - #endif - --#include -+#include "em-sync-stream.h" -+ - #include --#include -+#include - #include --#include --#include "em-sync-stream.h" -+#include - - #include "mail-mt.h" - --#define LOG_STREAM -- --#define d(x) -- - #define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass)) - --struct _EMSyncStreamPrivate { -- /* FIXME: use a single data port/gui channel for all instances */ -- /* TODO: possibly just use one of the mail-mt ports ... */ -- struct _EMsgPort *data_port, *reply_port; -- struct _GIOChannel *gui_channel; -- guint gui_watch; -- -- char *buf_data; -- int buf_used; -- int buf_size; -- --#ifdef LOG_STREAM -- FILE *logfd; --#endif --}; -- --#ifdef LOG_STREAM --int dolog; --#endif -- --/* Should probably expose messages to outside world ... so subclasses can extend */ - enum _write_msg_t { - EMSS_WRITE, - EMSS_FLUSH, -@@ -68,275 +43,168 @@ enum _write_msg_t { - }; - - struct _write_msg { -- EMsg msg; -+ EMSyncStream *emss; -+ EFlag *done; - - enum _write_msg_t op; - -- const char *data; -- size_t n; -+ const gchar *string; -+ gsize len; - }; - --static void em_sync_stream_class_init (EMSyncStreamClass *klass); --static void em_sync_stream_init (CamelObject *object); --static void em_sync_stream_finalize (CamelObject *object); -- --static ssize_t stream_write(CamelStream *stream, const char *buffer, size_t n); --static int stream_close(CamelStream *stream); --static int stream_flush(CamelStream *stream); -- - static CamelStreamClass *parent_class = NULL; - --CamelType --em_sync_stream_get_type (void) --{ -- static CamelType type = CAMEL_INVALID_TYPE; -- -- if (type == CAMEL_INVALID_TYPE) { --#ifdef LOG_STREAM -- dolog = getenv("EVOLUTION_MAIL_LOG_HTML") != NULL; --#endif -- type = camel_type_register (CAMEL_STREAM_TYPE, -- "EMSyncStream", -- sizeof (EMSyncStream), -- sizeof (EMSyncStreamClass), -- (CamelObjectClassInitFunc) em_sync_stream_class_init, -- NULL, -- (CamelObjectInitFunc) em_sync_stream_init, -- (CamelObjectFinalizeFunc) em_sync_stream_finalize); -- } -- -- return type; --} -- --static void --em_sync_stream_class_init (EMSyncStreamClass *klass) --{ -- CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (klass); -- -- parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; -- -- /* virtual method overload */ -- stream_class->write = stream_write; -- stream_class->flush = stream_flush; -- stream_class->close = stream_close; --} -- - static gboolean --emcs_gui_received(GIOChannel *source, GIOCondition cond, void *data) -+emss_process_message (struct _write_msg *msg) - { -- EMSyncStream *emss = data; -- struct _EMSyncStreamPrivate *p = emss->priv; -- struct _write_msg *msg; -- -- d(printf("%p: gui sync op job waiting\n", emss)); -- -- msg = (struct _write_msg *)e_msgport_get(p->data_port); -- /* Should never happen ... */ -- if (msg == NULL) -- return TRUE; -- -- d(printf("%p: running sync op %d\n", emss, msg->op)); -- -- /* force out any pending data before doing anything else */ -- if (p->buf_used > 0) { -- EMSS_CLASS(emss)->sync_write((CamelStream *)emss, p->buf_data, p->buf_used); --#ifdef LOG_STREAM -- if (p->logfd) -- fwrite(p->buf_data, 1, p->buf_used, p->logfd); --#endif -- p->buf_used = 0; -- } -+ struct _EMSyncStream *emss = msg->emss; - -- /* FIXME: need to handle return values */ -+ /* Force out any pending data before doing anything else. */ -+ if (emss->buffer != NULL && emss->buffer->len > 0) { -+ EMSS_CLASS (emss)->sync_write ( -+ CAMEL_STREAM (emss), emss->buffer->str, -+ emss->buffer->len); -+ g_string_set_size (emss->buffer, 0); -+ } - - switch (msg->op) { -- case EMSS_WRITE: -- EMSS_CLASS(emss)->sync_write((CamelStream *)emss, msg->data, msg->n); --#ifdef LOG_STREAM -- if (p->logfd) -- fwrite(msg->data, 1, msg->n, p->logfd); --#endif -- break; -- case EMSS_FLUSH: -- EMSS_CLASS(emss)->sync_flush((CamelStream *)emss); -- break; -- case EMSS_CLOSE: -- EMSS_CLASS(emss)->sync_close((CamelStream *)emss); --#ifdef LOG_STREAM -- if (p->logfd) { -- fclose(p->logfd); -- p->logfd = NULL; -- } --#endif -- break; -+ case EMSS_WRITE: -+ EMSS_CLASS (emss)->sync_write ( -+ CAMEL_STREAM (emss), msg->string, msg->len); -+ break; -+ case EMSS_FLUSH: -+ EMSS_CLASS (emss)->sync_flush ( -+ CAMEL_STREAM (emss)); -+ break; -+ case EMSS_CLOSE: -+ EMSS_CLASS (emss)->sync_close ( -+ CAMEL_STREAM (emss)); -+ break; - } -- -- e_msgport_reply((EMsg *)msg); -- d(printf("%p: gui sync op jobs done\n", emss)); -- -- return TRUE; --} -- --static void --em_sync_stream_init (CamelObject *object) --{ -- EMSyncStream *emss = (EMSyncStream *)object; -- struct _EMSyncStreamPrivate *p; -- -- p = emss->priv = g_malloc0(sizeof(*p)); - -- p->data_port = e_msgport_new(); -- p->reply_port = e_msgport_new(); -+ e_flag_set (msg->done); - --#ifndef G_OS_WIN32 -- p->gui_channel = g_io_channel_unix_new(e_msgport_fd(p->data_port)); --#else -- p->gui_channel = g_io_channel_win32_new_socket(e_msgport_fd(p->data_port)); --#endif -- p->gui_watch = g_io_add_watch(p->gui_channel, G_IO_IN, emcs_gui_received, emss); -- --#ifdef LOG_STREAM -- if (dolog) { -- char name[32]; -- static int count; -- -- sprintf(name, "sync-stream.%d.html", count++); -- printf("Saving raw data stream to '%s'\n", name); -- p->logfd = fopen(name, "w"); -- } --#endif -- -- d(printf("%p: new emss\n", emss)); -+ return FALSE; - } - - static void --sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) -+emss_sync_op (EMSyncStream *emss, enum _write_msg_t op, -+ const gchar *string, gsize len) - { -- struct _EMSyncStreamPrivate *p = emss->priv; - struct _write_msg msg; -- EMsg *reply_msg; -- -- d(printf("%p: launching sync op %d\n", emss, op)); - -- /* we do everything synchronous, we should never have any locks, and -- this prevents overflow from banked up data */ -- -- msg.msg.reply_port = p->reply_port; -+ msg.done = e_flag_new (); -+ msg.emss = emss; - msg.op = op; -- msg.data = data; -- msg.n = n; -- -- e_msgport_put(p->data_port, &msg.msg); -- reply_msg = e_msgport_wait(p->reply_port); -- g_assert(reply_msg == &msg.msg); -- -- d(printf("%p: returned sync op %d\n", emss, op)); --} -- --static void --em_sync_stream_finalize (CamelObject *object) --{ -- EMSyncStream *emss = (EMSyncStream *)object; -- struct _EMSyncStreamPrivate *p = emss->priv; -- -- /* TODO: is this stuff safe to do in another thread? */ -- g_source_remove(p->gui_watch); -- g_io_channel_unref(p->gui_channel); -+ msg.string = string; -+ msg.len = len; - -- e_msgport_destroy(p->data_port); -- e_msgport_destroy(p->reply_port); -+ camel_object_ref (emss); - -- p->data_port = NULL; -- p->reply_port = NULL; -+ g_idle_add ((GSourceFunc) emss_process_message, &msg); - -- g_free(p->buf_data); -+ e_flag_wait (msg.done); -+ e_flag_free (msg.done); - --#ifdef LOG_STREAM -- if (p->logfd) -- fclose(p->logfd); --#endif -- -- g_free(p); -+ camel_object_unref (emss); - } - --static ssize_t --stream_write (CamelStream *stream, const char *buffer, size_t n) -+static gssize -+emss_stream_write (CamelStream *stream, const gchar *string, gsize len) - { - EMSyncStream *emss = EM_SYNC_STREAM (stream); -- struct _EMSyncStreamPrivate *p = emss->priv; - - if (emss->cancel) - return -1; - -- if (pthread_equal(pthread_self(), mail_gui_thread)) { -- EMSS_CLASS(emss)->sync_write(stream, buffer, n); --#ifdef LOG_STREAM -- if (p->logfd) -- fwrite(buffer, 1, n, p->logfd); --#endif -- } else if (p->buf_size > 0) { -- size_t left = p->buf_size-p->buf_used; -- -- if (n >= left) { -- sync_op(emss, EMSS_WRITE, buffer, n); -- } else { -- memcpy(p->buf_data + p->buf_used, buffer, n); -- p->buf_used += n; -- } -+ if (mail_in_main_thread ()) { -+ EMSS_CLASS (emss)->sync_write (stream, string, len); -+ } else if (emss->buffer != NULL) { -+ if (len < (emss->buffer->allocated_len - emss->buffer->len)) -+ g_string_append_len (emss->buffer, string, len); -+ else -+ emss_sync_op (emss, EMSS_WRITE, string, len); - } else { -- sync_op(emss, EMSS_WRITE, buffer, n); -+ emss_sync_op(emss, EMSS_WRITE, string, len); - } - -- return (ssize_t) n; -+ return (gssize) len; - } - - static int --stream_flush(CamelStream *stream) -+emss_stream_flush (CamelStream *stream) - { -- EMSyncStream *emss = (EMSyncStream *)stream; -+ EMSyncStream *emss = EM_SYNC_STREAM (stream); - - if (emss->cancel) - return -1; - -- if (pthread_equal(pthread_self(), mail_gui_thread)) -- return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); -+ if (mail_in_main_thread ()) -+ return EMSS_CLASS (emss)->sync_flush (stream); - else -- sync_op(emss, EMSS_FLUSH, NULL, 0); -+ emss_sync_op (emss, EMSS_FLUSH, NULL, 0); - - return 0; - } - - static int --stream_close(CamelStream *stream) -+emss_stream_close (CamelStream *stream) - { -- EMSyncStream *emss = (EMSyncStream *)stream; -+ EMSyncStream *emss = EM_SYNC_STREAM (stream); - - if (emss->cancel) - return -1; - -- d(printf("%p: closing stream\n", stream)); -- -- if (pthread_equal(pthread_self(), mail_gui_thread)) { --#ifdef LOG_STREAM -- if (emss->priv->logfd) { -- fclose(emss->priv->logfd); -- emss->priv->logfd = NULL; -- } --#endif -- return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_close(stream); -- } else -- sync_op(emss, EMSS_CLOSE, NULL, 0); -+ if (mail_in_main_thread ()) -+ return EMSS_CLASS (emss)->sync_close (stream); -+ else -+ emss_sync_op (emss, EMSS_CLOSE, NULL, 0); - - return 0; - } - --void --em_sync_stream_set_buffer_size(EMSyncStream *emss, size_t size) -+static void -+em_sync_stream_class_init (EMSyncStreamClass *class) -+{ -+ CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (class); -+ -+ parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; -+ -+ stream_class->write = emss_stream_write; -+ stream_class->flush = emss_stream_flush; -+ stream_class->close = emss_stream_close; -+} -+ -+static void -+em_sync_stream_finalize (EMSyncStream *emss) -+{ -+ if (emss->buffer != NULL) -+ g_string_free (emss->buffer, TRUE); -+} -+ -+CamelType -+em_sync_stream_get_type (void) - { -- struct _EMSyncStreamPrivate *p = emss->priv; -+ static CamelType type = CAMEL_INVALID_TYPE; -+ -+ if (G_UNLIKELY (type == CAMEL_INVALID_TYPE)) -+ type = camel_type_register ( -+ CAMEL_STREAM_TYPE, -+ "EMSyncStream", -+ sizeof (EMSyncStream), -+ sizeof (EMSyncStreamClass), -+ (CamelObjectClassInitFunc) em_sync_stream_class_init, -+ NULL, -+ (CamelObjectInitFunc) NULL, -+ (CamelObjectFinalizeFunc) em_sync_stream_finalize); - -- g_free(p->buf_data); -- p->buf_data = g_malloc(size); -- p->buf_size = size; -- p->buf_used = 0; -+ return type; -+} -+ -+void -+em_sync_stream_set_buffer_size (EMSyncStream *emss, gsize size) -+{ -+ if (emss->buffer != NULL) -+ g_string_free (emss->buffer, TRUE); -+ emss->buffer = g_string_sized_new (size); - } -diff -up evolution-2.11.91/mail/em-subscribe-editor.c.kill-ethread evolution-2.11.91/mail/em-subscribe-editor.c ---- evolution-2.11.91/mail/em-subscribe-editor.c.kill-ethread 2007-08-24 02:49:43.000000000 -0400 -+++ evolution-2.11.91/mail/em-subscribe-editor.c 2007-08-29 17:39:34.000000000 -0400 -@@ -175,7 +175,7 @@ sub_unref(EMSubscribe *sub) - /* ** Subscribe folder operation **************************************** */ - - struct _zsubscribe_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EMSubscribe *sub; - EMSubscribeNode *node; -@@ -184,20 +184,18 @@ struct _zsubscribe_msg { - }; - - static void --sub_folder_subscribe (struct _mail_msg *mm) -+sub_folder_exec (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; -- - if (m->subscribe) -- camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); - else -- camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); -+ camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); - } - - static void --sub_folder_subscribed (struct _mail_msg *mm) -+sub_folder_done (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *)mm, *next; -+ struct _zsubscribe_msg *next; - GtkTreeIter iter; - GtkTreeModel *model; - EMSubscribeNode *node; -@@ -207,7 +205,7 @@ sub_folder_subscribed (struct _mail_msg - if (m->sub->cancel) - return; - -- if (!camel_exception_is_set(&mm->ex)) { -+ if (!camel_exception_is_set(&m->base.ex)) { - if (m->subscribe) - m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; - else -@@ -228,8 +226,8 @@ sub_folder_subscribed (struct _mail_msg - /* queue any further ones, or if out, update the ui */ - next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); - if (next) { -- next->sub->subscribe_id = next->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)next); -+ next->sub->subscribe_id = next->base.seq; -+ mail_msg_unordered_push (next); - } else { - /* should it go off the model instead? */ - sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); -@@ -237,19 +235,18 @@ sub_folder_subscribed (struct _mail_msg - } - - static void --sub_folder_free (struct _mail_msg *mm) -+sub_folder_free (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; -- - g_free(m->path); - sub_unref(m->sub); - } - --static struct _mail_msg_op sub_subscribe_folder_op = { -- NULL, /*subscribe_folder_desc,*/ -- sub_folder_subscribe, -- sub_folder_subscribed, -- sub_folder_free, -+static MailMsgInfo sub_subscribe_folder_info = { -+ sizeof (struct _zsubscribe_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) sub_folder_exec, -+ (MailMsgDoneFunc) sub_folder_done, -+ (MailMsgFreeFunc) sub_folder_free - }; - - /* spath is tree path in string form */ -@@ -259,18 +256,18 @@ sub_subscribe_folder (EMSubscribe *sub, - struct _zsubscribe_msg *m; - int id; - -- m = mail_msg_new (&sub_subscribe_folder_op, NULL, sizeof(*m)); -+ m = mail_msg_new (&sub_subscribe_folder_info); - m->sub = sub; - sub_ref(sub); - m->node = node; - m->subscribe = state; - m->path = g_strdup(spath); - -- id = m->msg.seq; -+ id = m->base.seq; - if (sub->subscribe_id == -1) { - sub->subscribe_id = id; - d(printf("running subscribe folder '%s'\n", spath)); -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } else { - d(printf("queueing subscribe folder '%s'\n", spath)); - e_dlist_addtail(&sub->subscribe, (EDListNode *)m); -@@ -341,7 +338,7 @@ sub_fill_level(EMSubscribe *sub, CamelFo - /* async query of folderinfo */ - - struct _emse_folderinfo_msg { -- struct _mail_msg msg; -+ MailMsg base; - - int seq; - -@@ -351,31 +348,29 @@ struct _emse_folderinfo_msg { - }; - - static void --sub_folderinfo_get (struct _mail_msg *mm) -+sub_folderinfo_exec (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; - char *pub_full_name=NULL; - - if (m->seq == m->sub->seq) { -- camel_operation_register(mm->cancel); -- m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex); -- camel_operation_unregister(mm->cancel); -+ camel_operation_register(m->base.cancel); -+ m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &m->base.ex); -+ camel_operation_unregister(m->base.cancel); - } - } - - static void --sub_folderinfo_got(struct _mail_msg *mm) -+sub_folderinfo_done (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; - EMSubscribeNode *node; - - m->sub->pending_id = -1; - if (m->sub->cancel || m->seq != m->sub->seq) - return; - -- if (camel_exception_is_set (&mm->ex)) { -+ if (camel_exception_is_set (&m->base.ex)) { - g_warning ("Error getting folder info from store: %s", -- camel_exception_get_description (&mm->ex)); -+ camel_exception_get_description (&m->base.ex)); - } - - if (m->info) { -@@ -396,10 +391,8 @@ sub_folderinfo_got(struct _mail_msg *mm) - } - - static void --sub_folderinfo_free(struct _mail_msg *mm) -+sub_folderinfo_free (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; -- - if (m->info) - m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); - -@@ -415,11 +408,12 @@ sub_folderinfo_free(struct _mail_msg *mm - sub_unref(m->sub); - } - --static struct _mail_msg_op sub_folderinfo_op = { -- NULL, /*sub_folderinfo_desc, we do our own progress reporting/cancellation */ -- sub_folderinfo_get, -- sub_folderinfo_got, -- sub_folderinfo_free, -+static MailMsgInfo sub_folderinfo_info = { -+ sizeof (struct _emse_folderinfo_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) sub_folderinfo_exec, -+ (MailMsgDoneFunc) sub_folderinfo_done, -+ (MailMsgFreeFunc) sub_folderinfo_free - }; - - static int -@@ -431,19 +425,19 @@ sub_queue_fill_level(EMSubscribe *sub, E - d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, - node?node->info->full_name:"")); - -- m = mail_msg_new (&sub_folderinfo_op, NULL, sizeof(*m)); -+ m = mail_msg_new (&sub_folderinfo_info); - sub_ref(sub); - m->sub = sub; - m->node = node; - m->seq = sub->seq; - -- sub->pending_id = m->msg.seq; -+ sub->pending_id = m->base.seq; - - sub_editor_busy(sub->editor, 1); - -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - return id; - } - -@@ -573,7 +567,7 @@ sub_destroy(GtkWidget *w, EMSubscribe *s - mail_msg_cancel(sub->subscribe_id); - - while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) -- mail_msg_free(m); -+ mail_msg_unref(m); - - sub_unref(sub); - } -diff -up evolution-2.11.91/mail/mail-mt.h.kill-ethread evolution-2.11.91/mail/mail-mt.h ---- evolution-2.11.91/mail/mail-mt.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.91/mail/mail-mt.h 2007-08-29 17:39:34.000000000 -0400 +--- evolution-2.11.92/mail/mail-mt.h.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-mt.h 2007-09-04 00:19:08.000000000 -0400 @@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT @@ -4636,7 +3404,7 @@ diff -up evolution-2.11.91/mail/mail-mt.h.kill-ethread evolution-2.11.91/mail/ma /* request a string/password */ char *mail_get_password (CamelService *service, const char *prompt, -@@ -112,24 +129,6 @@ void *mail_call_main(mail_call_t type, M +@@ -112,24 +129,6 @@ void mail_enable_stop(void); void mail_disable_stop(void); @@ -4661,186 +3429,255 @@ diff -up evolution-2.11.91/mail/mail-mt.h.kill-ethread evolution-2.11.91/mail/ma /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; -diff -up evolution-2.11.91/mail/mail-ops.h.kill-ethread evolution-2.11.91/mail/mail-ops.h ---- evolution-2.11.91/mail/mail-ops.h.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.91/mail/mail-ops.h 2007-08-29 17:39:34.000000000 -0400 -@@ -30,13 +30,14 @@ extern "C" { - #pragma } - #endif /* __cplusplus */ +--- evolution-2.11.92/mail/mail-component.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-component.c 2007-09-04 00:19:08.000000000 -0400 +@@ -1005,7 +1005,7 @@ + if (camel_url_get_param(url, "uid") != NULL) { + char *curi = em_uri_to_camel(uri); -+#include "mail-mt.h" -+ - #include "camel/camel-store.h" - #include "camel/camel-folder.h" - #include "camel/camel-filter-driver.h" - #include "camel/camel-mime-message.h" - #include "camel/camel-operation.h" +- mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); ++ mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); + g_free(curi); + } else { + g_warning("email uri's must include a uid parameter"); +--- evolution-2.11.92/mail/mail-vfolder.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-vfolder.c 2007-09-04 00:19:08.000000000 -0400 +@@ -21,7 +21,7 @@ + */ --#include "libedataserver/e-msgport.h" - #include "libedataserver/e-account.h" + #include +- ++#include + #include - void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, -@@ -55,12 +56,12 @@ void mail_transfer_messages (CamelFolder - void mail_get_message (CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), - void *data, -- EThread *thread); -+ MailMsgDispatchFunc dispatch); + #include +@@ -75,7 +75,7 @@ + /* ********************************************************************** */ - void - mail_get_messagex(CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), -- void *data, EThread *thread); -+ void *data, MailMsgDispatchFunc dispatch); - - /* get several messages */ - void mail_get_messages (CamelFolder *folder, GPtrArray *uids, -@@ -70,7 +71,7 @@ void mail_get_messages (CamelFolder *fol - /* same for a folder */ - int mail_get_folder (const char *uri, guint32 flags, - void (*done) (char *uri, CamelFolder *folder, void *data), void *data, -- EThread *thread); -+ MailMsgDispatchFunc dispatch); - - /* and for a store */ - int mail_get_store (const char *uri, CamelOperation *op, -diff -up evolution-2.11.91/mail/em-composer-utils.c.kill-ethread evolution-2.11.91/mail/em-composer-utils.c ---- evolution-2.11.91/mail/em-composer-utils.c.kill-ethread 2007-08-24 02:49:43.000000000 -0400 -+++ evolution-2.11.91/mail/em-composer-utils.c 2007-08-29 17:39:34.000000000 -0400 -@@ -553,7 +553,7 @@ em_utils_composer_save_draft_cb (EMsgCom - strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { - int id; - -- id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); -+ id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); - mail_msg_wait (id); - - if (!folder || !account->enabled) { -@@ -1104,7 +1104,7 @@ em_utils_redirect_message_by_uid (CamelF - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - -- mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); -+ mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); - } - - static void -@@ -1135,7 +1135,7 @@ em_utils_handle_receipt (CamelFolder *fo - } - - if (msg == NULL) { -- mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); -+ mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); - camel_message_info_free(info); - return; - } -@@ -1949,7 +1949,7 @@ em_utils_reply_to_message(CamelFolder *f - rd->source = source; - if (rd->source) - g_object_ref(rd->source); -- mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); -+ mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); - - return; - } -@@ -2121,5 +2121,5 @@ em_utils_post_reply_to_message_by_uid (C - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - -- mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); -+ mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); - } -diff -up evolution-2.11.91/mail/mail-folder-cache.c.kill-ethread evolution-2.11.91/mail/mail-folder-cache.c ---- evolution-2.11.91/mail/mail-folder-cache.c.kill-ethread 2007-08-09 02:46:46.000000000 -0400 -+++ evolution-2.11.91/mail/mail-folder-cache.c 2007-08-29 17:39:34.000000000 -0400 -@@ -862,15 +862,14 @@ update_folders(CamelStore *store, CamelF - - - struct _ping_store_msg { + struct _setup_msg { - struct _mail_msg msg; + MailMsg base; - - CamelStore *store; + + CamelFolder *folder; + char *query; +@@ -83,18 +83,15 @@ + GList *sources_folder; }; -static char * --ping_store_desc (struct _mail_msg *mm, int done) +-vfolder_setup_desc(struct _mail_msg *mm, int done) +static gchar * -+ping_store_desc (struct _ping_store_msg *m) ++vfolder_setup_desc (struct _setup_msg *m) { -- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; - char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); - char *msg; - -@@ -881,10 +880,9 @@ ping_store_desc (struct _mail_msg *mm, i +- struct _setup_msg *m = (struct _setup_msg *)mm; +- + return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name); } static void --ping_store_ping (struct _mail_msg *mm) -+ping_store_exec (struct _ping_store_msg *m) +-vfolder_setup_do(struct _mail_msg *mm) ++vfolder_setup_exec (struct _setup_msg *m) { - gboolean online = FALSE; -- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; - - if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { - if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -895,22 +893,21 @@ ping_store_ping (struct _mail_msg *mm) - online = TRUE; +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l, *list = NULL; + CamelFolder *folder; + +@@ -105,12 +102,12 @@ + l = m->sources_uri; + while (l && !shutdown) { + d(printf(" Adding uri: %s\n", (char *)l->data)); +- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); + if (folder) { + list = g_list_append(list, folder); + } else { + g_warning("Could not open vfolder source: %s", (char *)l->data); +- camel_exception_clear(&mm->ex); ++ camel_exception_clear(&m->base.ex); + } + l = l->next; } - if (online) -- camel_store_noop (m->store, &mm->ex); -+ camel_store_noop (m->store, &m->base.ex); +@@ -135,17 +132,13 @@ } static void --ping_store_free (struct _mail_msg *mm) -+ping_store_free (struct _ping_store_msg *m) +-vfolder_setup_done(struct _mail_msg *mm) ++vfolder_setup_done (struct _setup_msg *m) { -- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; -- - camel_object_unref (m->store); +- struct _setup_msg *m = (struct _setup_msg *)mm; +- +- m = m; } --static struct _mail_msg_op ping_store_op = { -- ping_store_desc, -- ping_store_ping, -- NULL, -- ping_store_free -+static MailMsgInfo ping_store_info = { -+ sizeof (struct _ping_store_msg), -+ (MailMsgDescFunc) ping_store_desc, -+ (MailMsgExecFunc) ping_store_exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) ping_store_free + static void +-vfolder_setup_free (struct _mail_msg *mm) ++vfolder_setup_free (struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l; + + camel_object_unref(m->folder); +@@ -166,11 +159,12 @@ + g_list_free(m->sources_folder); + } + +-static struct _mail_msg_op vfolder_setup_op = { +- vfolder_setup_desc, +- vfolder_setup_do, +- vfolder_setup_done, +- vfolder_setup_free, ++static MailMsgInfo vfolder_setup_info = { ++ sizeof (struct _setup_msg), ++ (MailMsgDescFunc) vfolder_setup_desc, ++ (MailMsgExecFunc) vfolder_setup_exec, ++ (MailMsgDoneFunc) vfolder_setup_done, ++ (MailMsgFreeFunc) vfolder_setup_free }; - static void -@@ -922,11 +919,11 @@ ping_store (gpointer key, gpointer val, - if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) - return; + /* sources_uri should be camel uri's */ +@@ -180,15 +174,15 @@ + struct _setup_msg *m; + int id; -- m = mail_msg_new (&ping_store_op, NULL, sizeof (struct _ping_store_msg)); -+ m = mail_msg_new (&ping_store_info); - m->store = store; - camel_object_ref (store); +- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&vfolder_setup_info); + m->folder = folder; + camel_object_ref(folder); + m->query = g_strdup(query); + m->sources_uri = sources_uri; + m->sources_folder = sources_folder; -- e_thread_put (mail_thread_queued_slow, (EMsg *) m); +- id = m->msg.seq; +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ id = m->base.seq; + mail_msg_slow_ordered_push (m); + + return id; + } +@@ -196,17 +190,16 @@ + /* ********************************************************************** */ + + struct _adduri_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *uri; + GList *folders; + int remove; + }; + +-static char * +-vfolder_adduri_desc(struct _mail_msg *mm, int done) ++static gchar * ++vfolder_adduri_desc (struct _adduri_msg *m) + { +- struct _adduri_msg *m = (struct _adduri_msg *)mm; + char *euri, *desc = NULL; + + /* Yuck yuck. Lookup the account name and use that to describe the path */ +@@ -250,9 +243,8 @@ } - static gboolean -@@ -971,7 +968,7 @@ mail_note_store(CamelStore *store, Camel - int hook = 0; + static void +-vfolder_adduri_do(struct _mail_msg *mm) ++vfolder_adduri_exec (struct _adduri_msg *m) + { +- struct _adduri_msg *m = (struct _adduri_msg *)mm; + GList *l; + CamelFolder *folder = NULL; + +@@ -269,7 +261,7 @@ + } + + if (folder == NULL) +- folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); + + if (folder != NULL) { + l = m->folders; +@@ -285,28 +277,24 @@ + } + + static void +-vfolder_adduri_done(struct _mail_msg *mm) ++vfolder_adduri_done(struct _adduri_msg *m) + { +- struct _adduri_msg *m = (struct _adduri_msg *)mm; +- +- m = m; + } + + static void +-vfolder_adduri_free (struct _mail_msg *mm) ++vfolder_adduri_free (struct _adduri_msg *m) + { +- struct _adduri_msg *m = (struct _adduri_msg *)mm; +- + g_list_foreach(m->folders, (GFunc)camel_object_unref, NULL); + g_list_free(m->folders); + g_free(m->uri); + } + +-static struct _mail_msg_op vfolder_adduri_op = { +- vfolder_adduri_desc, +- vfolder_adduri_do, +- vfolder_adduri_done, +- vfolder_adduri_free, ++static MailMsgInfo vfolder_adduri_info = { ++ sizeof (struct _adduri_msg), ++ (MailMsgDescFunc) vfolder_adduri_desc, ++ (MailMsgExecFunc) vfolder_adduri_exec, ++ (MailMsgDoneFunc) vfolder_adduri_done, ++ (MailMsgFreeFunc) vfolder_adduri_free + }; + + +@@ -317,13 +305,13 @@ + struct _adduri_msg *m; + int id; - g_assert(CAMEL_IS_STORE(store)); -- g_assert(pthread_equal(pthread_self(), mail_gui_thread)); -+ g_assert(mail_in_main_thread()); +- m = mail_msg_new(&vfolder_adduri_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&vfolder_adduri_info); + m->folders = folders; + m->uri = g_strdup(uri); + m->remove = remove; + +- id = m->msg.seq; +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ id = m->base.seq; ++ mail_msg_slow_ordered_push (m); - LOCK(info_lock); + return id; + } +@@ -447,7 +435,7 @@ + return; + } -diff -up evolution-2.11.91/mail/em-folder-view.c.kill-ethread evolution-2.11.91/mail/em-folder-view.c ---- evolution-2.11.91/mail/em-folder-view.c.kill-ethread 2007-08-27 01:55:18.000000000 -0400 -+++ evolution-2.11.91/mail/em-folder-view.c 2007-08-29 17:39:34.000000000 -0400 +- g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); ++ g_return_if_fail (mail_in_main_thread()); + + is_ignore = uri_is_ignore(store, curi); + +@@ -543,7 +531,7 @@ + + d(printf ("Deleting uri to check: %s\n", uri)); + +- g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); ++ g_return_if_fail (mail_in_main_thread()); + + changed = g_string_new (""); + +@@ -627,7 +615,7 @@ + if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) + return; + +- g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); ++ g_return_if_fail (mail_in_main_thread()); + + from = em_uri_from_camel(cfrom); + to = em_uri_from_camel(cto); +--- evolution-2.11.92/mail/em-folder-view.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-view.c 2007-09-04 00:19:08.000000000 -0400 @@ -71,6 +71,7 @@ #include @@ -4849,7 +3686,7 @@ diff -up evolution-2.11.91/mail/em-folder-view.c.kill-ethread evolution-2.11.91/ #include "menus/gal-view-etable.h" #include "menus/gal-view-factory-etable.h" -@@ -777,7 +778,7 @@ emfv_got_folder(char *uri, CamelFolder * +@@ -777,7 +778,7 @@ static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) { @@ -4858,7 +3695,7 @@ diff -up evolution-2.11.91/mail/em-folder-view.c.kill-ethread evolution-2.11.91/ } static void -@@ -1752,7 +1753,7 @@ filter_type_uid (CamelFolder *folder, co +@@ -1752,7 +1753,7 @@ data->type = type; data->source = source; @@ -4867,7 +3704,7 @@ diff -up evolution-2.11.91/mail/em-folder-view.c.kill-ethread evolution-2.11.91/ } static void -@@ -1850,7 +1851,7 @@ vfolder_type_uid (CamelFolder *folder, c +@@ -1850,7 +1851,7 @@ data->type = type; data->uri = g_strdup (uri); @@ -4876,7 +3713,7 @@ diff -up evolution-2.11.91/mail/em-folder-view.c.kill-ethread evolution-2.11.91/ } static void -@@ -2418,7 +2419,7 @@ emfv_message_selected_timeout(void *data +@@ -2418,7 +2419,7 @@ emfv->displayed_uid); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); */ @@ -4885,9 +3722,535 @@ diff -up evolution-2.11.91/mail/em-folder-view.c.kill-ethread evolution-2.11.91/ } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); -diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/mail/mail-session.c ---- evolution-2.11.91/mail/mail-session.c.kill-ethread 2007-08-27 01:55:18.000000000 -0400 -+++ evolution-2.11.91/mail/mail-session.c 2007-08-29 17:39:34.000000000 -0400 +--- evolution-2.11.92/mail/em-folder-properties.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-properties.c 2007-09-04 00:19:08.000000000 -0400 +@@ -386,7 +386,7 @@ + } + + if (folder == NULL) +- mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); ++ mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); + else + emfp_dialog_got_folder((char *)uri, folder, NULL); + } +--- evolution-2.11.92/mail/mail-send-recv.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-send-recv.c 2007-09-04 00:19:08.000000000 -0400 +@@ -770,23 +770,22 @@ + /* ********************************************************************** */ + + struct _refresh_folders_msg { +- struct _mail_msg msg; ++ MailMsg base; + + struct _send_info *info; + GPtrArray *folders; + CamelStore *store; + }; + +-static char * +-refresh_folders_desc (struct _mail_msg *mm, int done) ++static gchar * ++refresh_folders_desc (struct _refresh_folders_msg *m) + { + return g_strdup_printf(_("Checking for new mail")); + } + + static void +-refresh_folders_get (struct _mail_msg *mm) ++refresh_folders_exec (struct _refresh_folders_msg *m) + { +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; + int i; + CamelFolder *folder; + CamelException ex = CAMEL_EXCEPTION_INITIALISER; +@@ -808,17 +807,14 @@ + } + + static void +-refresh_folders_got (struct _mail_msg *mm) ++refresh_folders_done (struct _refresh_folders_msg *m) + { +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; +- + receive_done("", m->info); + } + + static void +-refresh_folders_free (struct _mail_msg *mm) ++refresh_folders_free (struct _refresh_folders_msg *m) + { +- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; + int i; + + for (i=0;ifolders->len;i++) +@@ -827,11 +823,12 @@ + camel_object_unref(m->store); + } + +-static struct _mail_msg_op refresh_folders_op = { +- refresh_folders_desc, +- refresh_folders_get, +- refresh_folders_got, +- refresh_folders_free, ++static MailMsgInfo refresh_folders_info = { ++ sizeof (struct _refresh_folders_msg), ++ (MailMsgDescFunc) refresh_folders_desc, ++ (MailMsgExecFunc) refresh_folders_exec, ++ (MailMsgDoneFunc) refresh_folders_done, ++ (MailMsgFreeFunc) refresh_folders_free + }; + + static void +@@ -864,13 +861,13 @@ + + get_folders(store, folders, info); + +- m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&refresh_folders_info); + m->store = store; + camel_object_ref(store); + m->folders = folders; + m->info = sinfo; + +- e_thread_put(mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push (m); + } else { + receive_done ("", data); + } +--- evolution-2.11.92/mail/em-format-html.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-format-html.c 2007-09-04 00:19:08.000000000 -0400 +@@ -165,7 +165,7 @@ + if (efh->priv->format_timeout_id != 0) { + g_source_remove(efh->priv->format_timeout_id); + efh->priv->format_timeout_id = 0; +- mail_msg_free(efh->priv->format_timeout_msg); ++ mail_msg_unref(efh->priv->format_timeout_msg); + efh->priv->format_timeout_msg = NULL; + } + +@@ -1205,7 +1205,7 @@ + + /* Sigh, this is so we have a cancellable, async rendering thread */ + struct _format_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EMFormatHTML *format; + EMFormat *format_source; +@@ -1215,14 +1215,15 @@ + CamelMimeMessage *message; + }; + +-static char *efh_format_desc(struct _mail_msg *mm, int done) ++static gchar * ++efh_format_desc (struct _format_msg *m) + { + return g_strdup(_("Formatting message")); + } + +-static void efh_format_do(struct _mail_msg *mm) ++static void ++efh_format_exec (struct _format_msg *m) + { +- struct _format_msg *m = (struct _format_msg *)mm; + struct _EMFormatHTMLJob *job; + struct _EMFormatPURITree *puri_level; + int cancelled = FALSE; +@@ -1307,10 +1308,9 @@ + ((EMFormat *)m->format)->pending_uri_level = puri_level; + } + +-static void efh_format_done(struct _mail_msg *mm) ++static void ++efh_format_done (struct _format_msg *m) + { +- struct _format_msg *m = (struct _format_msg *)mm; +- + d(printf("formatting finished\n")); + + m->format->load_http_now = FALSE; +@@ -1318,10 +1318,9 @@ + g_signal_emit_by_name(m->format, "complete"); + } + +-static void efh_format_free(struct _mail_msg *mm) ++static void ++efh_format_free (struct _format_msg *m) + { +- struct _format_msg *m = (struct _format_msg *)mm; +- + d(printf("formatter freed\n")); + g_object_unref(m->format); + if (m->estream) { +@@ -1337,11 +1336,12 @@ + g_object_unref(m->format_source); + } + +-static struct _mail_msg_op efh_format_op = { +- efh_format_desc, +- efh_format_do, +- efh_format_done, +- efh_format_free, ++static MailMsgInfo efh_format_info = { ++ sizeof (struct _format_msg), ++ (MailMsgDescFunc) efh_format_desc, ++ (MailMsgExecFunc) efh_format_exec, ++ (MailMsgDoneFunc) efh_format_done, ++ (MailMsgFreeFunc) efh_format_free + }; + + static gboolean +@@ -1352,7 +1352,7 @@ + struct _EMFormatHTMLPrivate *p = efh->priv; + + if (m->format->html == NULL) { +- mail_msg_free(m); ++ mail_msg_unref(m); + return FALSE; + } + +@@ -1380,7 +1380,7 @@ + if (m->message == NULL) { + hstream = gtk_html_begin(efh->html); + gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); +- mail_msg_free(m); ++ mail_msg_unref(m); + p->last_part = NULL; + } else { + hstream = gtk_html_begin(efh->html); +@@ -1404,8 +1404,8 @@ + p->last_part = m->message; + } + +- efh->priv->format_id = m->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)m); ++ efh->priv->format_id = m->base.seq; ++ mail_msg_unordered_push (m); + } + + efh->priv->format_timeout_id = 0; +@@ -1429,11 +1429,11 @@ + d(printf(" timeout for last still active, removing ...\n")); + g_source_remove(efh->priv->format_timeout_id); + efh->priv->format_timeout_id = 0; +- mail_msg_free(efh->priv->format_timeout_msg); ++ mail_msg_unref(efh->priv->format_timeout_msg); + efh->priv->format_timeout_msg = NULL; + } + +- m = mail_msg_new(&efh_format_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&efh_format_info); + m->format = (EMFormatHTML *)emf; + g_object_ref(emf); + m->format_source = emfsource; +--- evolution-2.11.92/mail/em-sync-stream.h.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-sync-stream.h 2007-09-04 00:19:08.000000000 -0400 +@@ -29,41 +29,45 @@ + #ifndef EM_SYNC_STREAM_H + #define EM_SYNC_STREAM_H + +-#ifdef __cplusplus +-extern "C" { +-#pragma } +-#endif /* __cplusplus */ +- +-#define EM_SYNC_STREAM_TYPE (em_sync_stream_get_type ()) +-#define EM_SYNC_STREAM(obj) (CAMEL_CHECK_CAST((obj), EM_SYNC_STREAM_TYPE, EMSyncStream)) +-#define EM_SYNC_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_SYNC_STREAM_TYPE, EMSyncStreamClass)) +-#define EM_IS_SYNC_STREAM(o) (CAMEL_CHECK_TYPE((o), EM_SYNC_STREAM_TYPE)) +- + #include + #include + +-typedef struct _EMSyncStream { +- CamelStream parent_stream; +- +- struct _EMSyncStreamPrivate *priv; ++#define EM_SYNC_STREAM_TYPE \ ++ (em_sync_stream_get_type ()) ++#define EM_SYNC_STREAM(obj) \ ++ (CAMEL_CHECK_CAST \ ++ ((obj), EM_SYNC_STREAM_TYPE, EMSyncStream)) ++#define EM_SYNC_STREAM_CLASS(cls) \ ++ (CAMEL_CHECK_CLASS_CAST \ ++ ((cls), EM_SYNC_STREAM_TYPE, EMSyncStreamClass)) ++#define EM_IS_SYNC_STREAM(obj) \ ++ (CAMEL_CHECK_TYPE ((obj), EM_SYNC_STREAM_TYPE)) ++ ++G_BEGIN_DECLS ++ ++typedef struct _EMSyncStream EMSyncStream; ++typedef struct _EMSyncStreamClass EMSyncStreamClass; ++ ++struct _EMSyncStream { ++ CamelStream parent; ++ GString *buffer; ++ gboolean cancel; ++}; + +- int cancel; +-} EMSyncStream; +- +-typedef struct { ++struct _EMSyncStreamClass { + CamelStreamClass parent_class; + +- ssize_t (*sync_write) (CamelStream *stream, const char *buffer, size_t n); +- int (*sync_close) (CamelStream *stream); +- int (*sync_flush) (CamelStream *stream); +- +-} EMSyncStreamClass; +- +-CamelType em_sync_stream_get_type (void); +-void em_sync_stream_set_buffer_size(EMSyncStream *, size_t size); +- +-#ifdef __cplusplus +-} +-#endif /* __cplusplus */ ++ gssize (*sync_write) (CamelStream *stream, ++ const gchar *string, ++ gsize len); ++ int (*sync_close) (CamelStream *stream); ++ int (*sync_flush) (CamelStream *stream); ++}; ++ ++CamelType em_sync_stream_get_type (void); ++void em_sync_stream_set_buffer_size (EMSyncStream *stream, ++ gsize size); ++ ++G_END_DECLS + + #endif /* EM_SYNC_STREAM_H */ +--- evolution-2.11.92/mail/em-subscribe-editor.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-subscribe-editor.c 2007-09-04 00:19:08.000000000 -0400 +@@ -175,7 +175,7 @@ + /* ** Subscribe folder operation **************************************** */ + + struct _zsubscribe_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EMSubscribe *sub; + EMSubscribeNode *node; +@@ -184,20 +184,18 @@ + }; + + static void +-sub_folder_subscribe (struct _mail_msg *mm) ++sub_folder_exec (struct _zsubscribe_msg *m) + { +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; +- + if (m->subscribe) +- camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); ++ camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); + else +- camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); ++ camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); + } + + static void +-sub_folder_subscribed (struct _mail_msg *mm) ++sub_folder_done (struct _zsubscribe_msg *m) + { +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *)mm, *next; ++ struct _zsubscribe_msg *next; + GtkTreeIter iter; + GtkTreeModel *model; + EMSubscribeNode *node; +@@ -207,7 +205,7 @@ + if (m->sub->cancel) + return; + +- if (!camel_exception_is_set(&mm->ex)) { ++ if (!camel_exception_is_set(&m->base.ex)) { + if (m->subscribe) + m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; + else +@@ -228,8 +226,8 @@ + /* queue any further ones, or if out, update the ui */ + next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); + if (next) { +- next->sub->subscribe_id = next->msg.seq; +- e_thread_put(mail_thread_new, (EMsg *)next); ++ next->sub->subscribe_id = next->base.seq; ++ mail_msg_unordered_push (next); + } else { + /* should it go off the model instead? */ + sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); +@@ -237,19 +235,18 @@ + } + + static void +-sub_folder_free (struct _mail_msg *mm) ++sub_folder_free (struct _zsubscribe_msg *m) + { +- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; +- + g_free(m->path); + sub_unref(m->sub); + } + +-static struct _mail_msg_op sub_subscribe_folder_op = { +- NULL, /*subscribe_folder_desc,*/ +- sub_folder_subscribe, +- sub_folder_subscribed, +- sub_folder_free, ++static MailMsgInfo sub_subscribe_folder_info = { ++ sizeof (struct _zsubscribe_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) sub_folder_exec, ++ (MailMsgDoneFunc) sub_folder_done, ++ (MailMsgFreeFunc) sub_folder_free + }; + + /* spath is tree path in string form */ +@@ -259,18 +256,18 @@ + struct _zsubscribe_msg *m; + int id; + +- m = mail_msg_new (&sub_subscribe_folder_op, NULL, sizeof(*m)); ++ m = mail_msg_new (&sub_subscribe_folder_info); + m->sub = sub; + sub_ref(sub); + m->node = node; + m->subscribe = state; + m->path = g_strdup(spath); + +- id = m->msg.seq; ++ id = m->base.seq; + if (sub->subscribe_id == -1) { + sub->subscribe_id = id; + d(printf("running subscribe folder '%s'\n", spath)); +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push (m); + } else { + d(printf("queueing subscribe folder '%s'\n", spath)); + e_dlist_addtail(&sub->subscribe, (EDListNode *)m); +@@ -341,7 +338,7 @@ + /* async query of folderinfo */ + + struct _emse_folderinfo_msg { +- struct _mail_msg msg; ++ MailMsg base; + + int seq; + +@@ -351,31 +348,29 @@ + }; + + static void +-sub_folderinfo_get (struct _mail_msg *mm) ++sub_folderinfo_exec (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; + char *pub_full_name=NULL; + + if (m->seq == m->sub->seq) { +- camel_operation_register(mm->cancel); +- m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex); +- camel_operation_unregister(mm->cancel); ++ camel_operation_register(m->base.cancel); ++ m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &m->base.ex); ++ camel_operation_unregister(m->base.cancel); + } + } + + static void +-sub_folderinfo_got(struct _mail_msg *mm) ++sub_folderinfo_done (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; + EMSubscribeNode *node; + + m->sub->pending_id = -1; + if (m->sub->cancel || m->seq != m->sub->seq) + return; + +- if (camel_exception_is_set (&mm->ex)) { ++ if (camel_exception_is_set (&m->base.ex)) { + g_warning ("Error getting folder info from store: %s", +- camel_exception_get_description (&mm->ex)); ++ camel_exception_get_description (&m->base.ex)); + } + + if (m->info) { +@@ -396,10 +391,8 @@ + } + + static void +-sub_folderinfo_free(struct _mail_msg *mm) ++sub_folderinfo_free (struct _emse_folderinfo_msg *m) + { +- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; +- + if (m->info) + m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); + +@@ -415,11 +408,12 @@ + sub_unref(m->sub); + } + +-static struct _mail_msg_op sub_folderinfo_op = { +- NULL, /*sub_folderinfo_desc, we do our own progress reporting/cancellation */ +- sub_folderinfo_get, +- sub_folderinfo_got, +- sub_folderinfo_free, ++static MailMsgInfo sub_folderinfo_info = { ++ sizeof (struct _emse_folderinfo_msg), ++ (MailMsgDescFunc) NULL, ++ (MailMsgExecFunc) sub_folderinfo_exec, ++ (MailMsgDoneFunc) sub_folderinfo_done, ++ (MailMsgFreeFunc) sub_folderinfo_free + }; + + static int +@@ -431,19 +425,19 @@ + d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, + node?node->info->full_name:"")); + +- m = mail_msg_new (&sub_folderinfo_op, NULL, sizeof(*m)); ++ m = mail_msg_new (&sub_folderinfo_info); + sub_ref(sub); + m->sub = sub; + m->node = node; + m->seq = sub->seq; + +- sub->pending_id = m->msg.seq; ++ sub->pending_id = m->base.seq; + + sub_editor_busy(sub->editor, 1); + +- id = m->msg.seq; ++ id = m->base.seq; + +- e_thread_put (mail_thread_new, (EMsg *)m); ++ mail_msg_unordered_push (m); + return id; + } + +@@ -573,7 +567,7 @@ + mail_msg_cancel(sub->subscribe_id); + + while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) +- mail_msg_free(m); ++ mail_msg_unref(m); + + sub_unref(sub); + } +--- evolution-2.11.92/mail/em-format-html-print.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-format-html-print.c 2007-09-04 00:19:08.000000000 -0400 +@@ -228,7 +228,7 @@ + g_object_ref (efhp); + + mail_get_message ( +- folder, uid, emfhp_got_message, efhp, mail_thread_new); ++ folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); + } + + void +--- evolution-2.11.92/mail/mail-session.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-session.c 2007-09-04 00:19:08.000000000 -0400 @@ -35,7 +35,7 @@ #include @@ -4897,7 +4260,7 @@ diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/ma #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -264,148 +264,145 @@ forget_password (CamelSession *session, +@@ -264,148 +264,145 @@ /* ********************************************************************** */ @@ -5106,7 +4469,7 @@ diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/ma if (cancel) { - r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); -- g_assert(m == r); +- g_return_val_if_fail (m == r, FALSE); + e_flag_wait (m->done); + result = m->result; + mail_msg_unref (m); @@ -5127,7 +4490,7 @@ diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/ma } static CamelFolder * -@@ -541,7 +538,7 @@ get_filter_driver (CamelSession *session +@@ -541,7 +538,7 @@ /* TODO: This is very temporary, until we have a better way to do the progress reporting, we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ @@ -5136,7 +4499,7 @@ diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/ma static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { -@@ -550,7 +547,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -550,7 +547,7 @@ /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so we get cancellation and progress in common with hte existing mail code, for free */ if (msg) { @@ -5145,7 +4508,7 @@ diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/ma msg->data = m; camel_operation_unref(msg->op); -@@ -563,7 +560,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -563,7 +560,7 @@ static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { @@ -5154,7 +4517,7 @@ diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/ma ms_parent_class->thread_msg_free(session, m); } -@@ -686,22 +683,23 @@ mail_session_set_interactive (gboolean i +@@ -686,22 +683,23 @@ MAIL_SESSION (session)->interactive = interactive; if (!interactive) { @@ -5184,9 +4547,1575 @@ diff -up evolution-2.11.91/mail/mail-session.c.kill-ethread evolution-2.11.91/ma } } } -diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/mail-mt.c ---- evolution-2.11.91/mail/mail-mt.c.kill-ethread 2007-07-05 02:09:38.000000000 -0400 -+++ evolution-2.11.91/mail/mail-mt.c 2007-08-29 17:39:34.000000000 -0400 +--- evolution-2.11.92/mail/message-list.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/message-list.c 2007-09-04 00:19:08.000000000 -0400 +@@ -1841,7 +1841,7 @@ + /* TODO: merge this with the folder tree stuff via empopup targets */ + /* Drop handling */ + struct _drop_msg { +- struct _mail_msg msg; ++ MailMsg base; + + GdkDragContext *context; + +@@ -1858,11 +1858,9 @@ + unsigned int aborted:1; + }; + +-static char * +-ml_drop_async_desc (struct _mail_msg *mm, int done) ++static gchar * ++ml_drop_async_desc (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *) mm; +- + if (m->move) + return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); + else +@@ -1870,13 +1868,11 @@ + } + + static void +-ml_drop_async_drop(struct _mail_msg *mm) ++ml_drop_async_exec (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; +- + switch (m->info) { + case DND_X_UID_LIST: +- em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &mm->ex); ++ em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &m->base.ex); + break; + case DND_MESSAGE_RFC822: + em_utils_selection_get_message(m->selection, m->folder); +@@ -1888,9 +1884,8 @@ + } + + static void +-ml_drop_async_done(struct _mail_msg *mm) ++ml_drop_async_done (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; + gboolean success, delete; + + /* ?? */ +@@ -1898,7 +1893,7 @@ + success = FALSE; + delete = FALSE; + } else { +- success = !camel_exception_is_set (&mm->ex); ++ success = !camel_exception_is_set (&m->base.ex); + delete = success && m->move && !m->moved; + } + +@@ -1906,10 +1901,8 @@ + } + + static void +-ml_drop_async_free(struct _mail_msg *mm) ++ml_drop_async_free (struct _drop_msg *m) + { +- struct _drop_msg *m = (struct _drop_msg *)mm; +- + g_object_unref(m->context); + camel_object_unref(m->folder); + +@@ -1917,18 +1910,19 @@ + g_free(m->selection); + } + +-static struct _mail_msg_op ml_drop_async_op = { +- ml_drop_async_desc, +- ml_drop_async_drop, +- ml_drop_async_done, +- ml_drop_async_free, ++static MailMsgInfo ml_drop_async_info = { ++ sizeof (struct _drop_msg), ++ (MailMsgDescFunc) ml_drop_async_desc, ++ (MailMsgExecFunc) ml_drop_async_exec, ++ (MailMsgDoneFunc) ml_drop_async_done, ++ (MailMsgFreeFunc) ml_drop_async_free + }; + + static void + ml_drop_action(struct _drop_msg *m) + { + m->move = m->action == GDK_ACTION_MOVE; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push (m); + } + + static void +@@ -1955,7 +1949,7 @@ + struct _drop_msg *m = data; + + m->aborted = TRUE; +- mail_msg_free(&m->msg); ++ mail_msg_unref(m); + } + + static EPopupItem ml_drop_popup_menu[] = { +@@ -1985,7 +1979,7 @@ + if (!ml->folder || data->data == NULL || data->length == -1) + return; + +- m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); ++ m = mail_msg_new(&ml_drop_async_info); + m->context = context; + g_object_ref(context); + m->folder = ml->folder; +@@ -3721,7 +3715,7 @@ + + /* ** REGENERATE MESSAGELIST ********************************************** */ + struct _regen_list_msg { +- struct _mail_msg msg; ++ MailMsg base; + + int complete; + +@@ -3749,16 +3743,15 @@ + + */ + +-static char * +-regen_list_describe (struct _mail_msg *mm, gint complete) ++static gchar * ++regen_list_desc (struct _regen_list_msg *m) + { + return g_strdup (_("Generating message list")); + } + + static void +-regen_list_regen (struct _mail_msg *mm) ++regen_list_exec (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; + GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; + CamelMessageInfo *info; + int i; +@@ -3788,7 +3781,7 @@ + } else + expr = "(match-all (not (system-flag \"deleted\")))"; + } +- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); + } else { + char *expr; + +@@ -3798,23 +3791,23 @@ + sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); + } else + expr = "(match-all (not (system-flag \"junk\")))"; +- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); + } else { + if (m->search) +- searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &mm->ex); ++ searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &m->base.ex); + else + uids = camel_folder_get_uids (m->folder); + } + } + +- if (camel_exception_is_set (&mm->ex)) ++ if (camel_exception_is_set (&m->base.ex)) + return; + + /* perform hiding */ + if (m->hideexpr && camel_folder_has_search_capability(m->folder)) { +- uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex); ++ uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &m->base.ex); + /* well, lets not abort just because this faileld ... */ +- camel_exception_clear (&mm->ex); ++ camel_exception_clear (&m->base.ex); + + if (uidnew) { + MESSAGE_LIST_LOCK(m->ml, hide_lock); +@@ -3889,7 +3882,7 @@ + + e_profile_event_emit("list.threaduids", m->folder->full_name, 0); + +- if (!camel_operation_cancel_check(mm->cancel)) { ++ if (!camel_operation_cancel_check(m->base.cancel)) { + /* update/build a new tree */ + if (m->dotree) { + if (m->tree) +@@ -3918,17 +3911,15 @@ + } + + static void +-regen_list_regened (struct _mail_msg *mm) ++regen_list_done (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; +- + if (m->ml->priv->destroyed) + return; + + if (!m->complete) + return; + +- if (camel_operation_cancel_check(mm->cancel)) ++ if (camel_operation_cancel_check(m->base.cancel)) + return; + + if (m->ml->folder != m->folder) +@@ -3979,9 +3970,8 @@ + } + + static void +-regen_list_free (struct _mail_msg *mm) ++regen_list_free (struct _regen_list_msg *m) + { +- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; + int i; + + e_profile_event_emit("list.regenerated", m->folder->full_name, 0); +@@ -4009,11 +3999,12 @@ + g_object_unref(m->ml); + } + +-static struct _mail_msg_op regen_list_op = { +- regen_list_describe, +- regen_list_regen, +- regen_list_regened, +- regen_list_free, ++static MailMsgInfo regen_list_info = { ++ sizeof (struct _regen_list_msg), ++ (MailMsgDescFunc) regen_list_desc, ++ (MailMsgExecFunc) regen_list_exec, ++ (MailMsgDoneFunc) regen_list_done, ++ (MailMsgFreeFunc) regen_list_free + }; + + static gboolean +@@ -4023,7 +4014,7 @@ + + m->ml->regen = g_list_prepend(m->ml->regen, m); + /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ +- e_thread_put (mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push (m); + + m->ml->regen_timeout_msg = NULL; + m->ml->regen_timeout_id = 0; +@@ -4039,7 +4030,7 @@ + GList *l = ml->regen; + + while (l) { +- struct _mail_msg *mm = l->data; ++ MailMsg *mm = l->data; + + if (mm->cancel) + camel_operation_cancel(mm->cancel); +@@ -4051,7 +4042,7 @@ + if (ml->regen_timeout_id) { + g_source_remove(ml->regen_timeout_id); + ml->regen_timeout_id = 0; +- mail_msg_free((struct _mail_msg *)ml->regen_timeout_msg); ++ mail_msg_unref(ml->regen_timeout_msg); + ml->regen_timeout_msg = NULL; + } + } +@@ -4086,7 +4077,7 @@ + } + #endif + +- m = mail_msg_new (®en_list_op, NULL, sizeof (*m)); ++ m = mail_msg_new (®en_list_info); + m->ml = ml; + m->search = g_strdup (search); + m->hideexpr = g_strdup (hideexpr); +--- evolution-2.11.92/mail/em-folder-tree.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-tree.c 2007-09-04 00:19:08.000000000 -0400 +@@ -835,7 +835,7 @@ + /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ + /* Drop handling */ + struct _DragDataReceivedAsync { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + GdkDragContext *context; +@@ -860,17 +860,16 @@ + + d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); + +- if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->msg.ex))) ++ if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) + return; + + em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); + camel_object_unref(src); + } + +-static char * +-emft_drop_async_desc (struct _mail_msg *mm, int done) ++static gchar * ++emft_drop_async__desc (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + CamelURL *url; + char *buf; + +@@ -894,9 +893,8 @@ + } + + static void +-emft_drop_async_drop (struct _mail_msg *mm) ++emft_drop_async__exec (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + CamelFolder *folder; + + /* for types other than folder, we can't drop to the root path */ +@@ -904,14 +902,14 @@ + /* copy or move (aka rename) a folder */ + emft_drop_folder(m); + } else if (m->full_name == NULL) { +- camel_exception_set (&mm->ex, CAMEL_EXCEPTION_SYSTEM, ++ camel_exception_set (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, + _("Cannot drop message(s) into toplevel store")); +- } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &mm->ex))) { ++ } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &m->base.ex))) { + switch (m->info) { + case DND_DROP_TYPE_UID_LIST: + /* import a list of uids from another evo folder */ +- em_utils_selection_get_uidlist(m->selection, folder, m->move, &mm->ex); +- m->moved = m->move && !camel_exception_is_set(&mm->ex); ++ em_utils_selection_get_uidlist(m->selection, folder, m->move, &m->base.ex); ++ m->moved = m->move && !camel_exception_is_set(&m->base.ex); + break; + case DND_DROP_TYPE_MESSAGE_RFC822: + /* import a message/rfc822 stream */ +@@ -929,10 +927,25 @@ + } + + static void +-emft_drop_async_free (struct _mail_msg *mm) ++emft_drop_async__done (struct _DragDataReceivedAsync *m) + { +- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; ++ gboolean success, delete; + ++ /* ?? */ ++ if (m->aborted) { ++ success = FALSE; ++ delete = FALSE; ++ } else { ++ success = !camel_exception_is_set (&m->base.ex); ++ delete = success && m->move && !m->moved; ++ } ++ ++ gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME); ++} ++ ++static void ++emft_drop_async__free (struct _DragDataReceivedAsync *m) ++{ + g_object_unref(m->context); + camel_object_unref(m->store); + g_free(m->full_name); +@@ -941,18 +954,19 @@ + g_free(m->selection); + } + +-static struct _mail_msg_op emft_drop_async_op = { +- emft_drop_async_desc, +- emft_drop_async_drop, +- NULL, +- emft_drop_async_free, ++static MailMsgInfo emft_drop_async_info = { ++ sizeof (struct _DragDataReceivedAsync), ++ (MailMsgDescFunc) emft_drop_async__desc, ++ (MailMsgExecFunc) emft_drop_async__exec, ++ (MailMsgDoneFunc) emft_drop_async__done, ++ (MailMsgFreeFunc) emft_drop_async__free + }; + + static void + tree_drag_data_action(struct _DragDataReceivedAsync *m) + { + m->move = m->action == GDK_ACTION_MOVE; +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push (m); + } + + static void +@@ -979,7 +993,7 @@ + struct _DragDataReceivedAsync *m = data; + + m->aborted = TRUE; +- mail_msg_free(&m->msg); ++ mail_msg_unref(m); + } + + static EPopupItem emft_drop_popup_menu[] = { +@@ -1035,7 +1049,7 @@ + return; + } + +- m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync)); ++ m = mail_msg_new (&emft_drop_async_info); + m->context = context; + g_object_ref(context); + m->store = store; +@@ -1674,7 +1688,7 @@ + #endif + + struct _EMFolderTreeGetFolderInfo { +- struct _mail_msg msg; ++ MailMsg base; + + /* input data */ + GtkTreeRowReference *root; +@@ -1687,10 +1701,9 @@ + CamelFolderInfo *fi; + }; + +-static char * +-emft_get_folder_info__desc(struct _mail_msg *mm, int done) ++static gchar * ++emft_get_folder_info__desc (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm; + char *ret, *name; + + name = camel_service_get_name((CamelService *)m->store, TRUE); +@@ -1700,18 +1713,16 @@ + } + + static void +-emft_get_folder_info__get (struct _mail_msg *mm) ++emft_get_folder_info__exec (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; + guint32 flags = m->flags | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; + +- m->fi = camel_store_get_folder_info (m->store, m->top, flags, &mm->ex); ++ m->fi = camel_store_get_folder_info (m->store, m->top, flags, &m->base.ex); + } + + static void +-emft_get_folder_info__got (struct _mail_msg *mm) ++emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; + struct _EMFolderTreePrivate *priv = m->emft->priv; + struct _EMFolderTreeModelStoreInfo *si; + GtkTreeIter root, iter; +@@ -1739,7 +1750,7 @@ + gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); + + /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ +- if (!m->fi && camel_exception_is_set(&mm->ex)) { ++ if (!m->fi && camel_exception_is_set(&m->base.ex)) { + gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); + gtk_tree_view_collapse_row (priv->treeview, path); + gtk_tree_path_free (path); +@@ -1794,10 +1805,8 @@ + } + + static void +-emft_get_folder_info__free (struct _mail_msg *mm) ++emft_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m) + { +- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; +- + camel_store_free_folder_info (m->store, m->fi); + + gtk_tree_row_reference_free (m->root); +@@ -1806,11 +1815,12 @@ + g_free (m->top); + } + +-static struct _mail_msg_op get_folder_info_op = { +- emft_get_folder_info__desc, +- emft_get_folder_info__get, +- emft_get_folder_info__got, +- emft_get_folder_info__free, ++static MailMsgInfo get_folder_info_info = { ++ sizeof (struct _EMFolderTreeGetFolderInfo), ++ (MailMsgDescFunc) emft_get_folder_info__desc, ++ (MailMsgExecFunc) emft_get_folder_info__exec, ++ (MailMsgDoneFunc) emft_get_folder_info__done, ++ (MailMsgFreeFunc) emft_get_folder_info__free + }; + + static void +@@ -1897,7 +1907,7 @@ + + gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); + +- m = mail_msg_new (&get_folder_info_op, NULL, sizeof (struct _EMFolderTreeGetFolderInfo)); ++ m = mail_msg_new (&get_folder_info_info); + m->root = gtk_tree_row_reference_new (model, tree_path); + camel_object_ref (store); + m->store = store; +@@ -1906,7 +1916,7 @@ + m->top = full_name; + m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; + +- e_thread_put (mail_thread_new, (EMsg *) m); ++ mail_msg_unordered_push (m); + } + + static gboolean +--- evolution-2.11.92/mail/em-folder-browser.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-04 00:19:08.000000000 -0400 +@@ -851,7 +851,7 @@ + + + struct _setup_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelFolder *folder; + char *query; +@@ -859,16 +859,15 @@ + GList *sources_folder; + }; + +-static char * +-vfolder_setup_desc(struct _mail_msg *mm, int done) ++static gchar * ++vfolder_setup_desc(struct _setup_msg *m) + { + return g_strdup(_("Searching")); + } + + static void +-vfolder_setup_do(struct _mail_msg *mm) ++vfolder_setup_exec(struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l, *list = NULL; + CamelFolder *folder; + +@@ -879,12 +878,12 @@ + l = m->sources_uri; + while (l) { + d(printf(" Adding uri: %s\n", (char *)l->data)); +- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); ++ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); + if (folder) { + list = g_list_append(list, folder); + } else { + g_warning("Could not open vfolder source: %s", (char *)l->data); +- camel_exception_clear(&mm->ex); ++ camel_exception_clear(&m->base.ex); + } + l = l->next; + } +@@ -908,17 +907,13 @@ + } + + static void +-vfolder_setup_done(struct _mail_msg *mm) ++vfolder_setup_done(struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; +- +- m = m; + } + + static void +-vfolder_setup_free (struct _mail_msg *mm) ++vfolder_setup_free (struct _setup_msg *m) + { +- struct _setup_msg *m = (struct _setup_msg *)mm; + GList *l; + + camel_object_unref(m->folder); +@@ -939,11 +934,12 @@ + g_list_free(m->sources_folder); + } + +-static struct _mail_msg_op vfolder_setup_op = { +- vfolder_setup_desc, +- vfolder_setup_do, +- vfolder_setup_done, +- vfolder_setup_free, ++static MailMsgInfo vfolder_setup_info = { ++ sizeof (struct _setup_msg), ++ (MailMsgDescFunc) vfolder_setup_desc, ++ (MailMsgExecFunc) vfolder_setup_exec, ++ (MailMsgDoneFunc) vfolder_setup_done, ++ (MailMsgFreeFunc) vfolder_setup_free + }; + + /* sources_uri should be camel uri's */ +@@ -953,15 +949,15 @@ + struct _setup_msg *m; + int id; + +- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&vfolder_setup_info); + m->folder = folder; + camel_object_ref(folder); + m->query = g_strdup(query); + m->sources_uri = sources_uri; + m->sources_folder = sources_folder; + +- id = m->msg.seq; +- e_thread_put(mail_thread_queued_slow, (EMsg *)m); ++ id = m->base.seq; ++ mail_msg_slow_ordered_push (m); + + return id; + } +--- evolution-2.11.92/mail/em-sync-stream.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-sync-stream.c 2007-09-04 00:19:08.000000000 -0400 +@@ -25,42 +25,17 @@ + #include + #endif + +-#include ++#include "em-sync-stream.h" ++ + #include +-#include ++#include + #include +-#include +-#include "em-sync-stream.h" ++#include + + #include "mail-mt.h" + +-#define LOG_STREAM +- +-#define d(x) +- + #define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass)) + +-struct _EMSyncStreamPrivate { +- /* FIXME: use a single data port/gui channel for all instances */ +- /* TODO: possibly just use one of the mail-mt ports ... */ +- struct _EMsgPort *data_port, *reply_port; +- struct _GIOChannel *gui_channel; +- guint gui_watch; +- +- char *buf_data; +- int buf_used; +- int buf_size; +- +-#ifdef LOG_STREAM +- FILE *logfd; +-#endif +-}; +- +-#ifdef LOG_STREAM +-int dolog; +-#endif +- +-/* Should probably expose messages to outside world ... so subclasses can extend */ + enum _write_msg_t { + EMSS_WRITE, + EMSS_FLUSH, +@@ -68,275 +43,168 @@ + }; + + struct _write_msg { +- EMsg msg; ++ EMSyncStream *emss; ++ EFlag *done; + + enum _write_msg_t op; + +- const char *data; +- size_t n; ++ const gchar *string; ++ gsize len; + }; + +-static void em_sync_stream_class_init (EMSyncStreamClass *klass); +-static void em_sync_stream_init (CamelObject *object); +-static void em_sync_stream_finalize (CamelObject *object); +- +-static ssize_t stream_write(CamelStream *stream, const char *buffer, size_t n); +-static int stream_close(CamelStream *stream); +-static int stream_flush(CamelStream *stream); +- + static CamelStreamClass *parent_class = NULL; + +-CamelType +-em_sync_stream_get_type (void) +-{ +- static CamelType type = CAMEL_INVALID_TYPE; +- +- if (type == CAMEL_INVALID_TYPE) { +-#ifdef LOG_STREAM +- dolog = getenv("EVOLUTION_MAIL_LOG_HTML") != NULL; +-#endif +- type = camel_type_register (CAMEL_STREAM_TYPE, +- "EMSyncStream", +- sizeof (EMSyncStream), +- sizeof (EMSyncStreamClass), +- (CamelObjectClassInitFunc) em_sync_stream_class_init, +- NULL, +- (CamelObjectInitFunc) em_sync_stream_init, +- (CamelObjectFinalizeFunc) em_sync_stream_finalize); +- } +- +- return type; +-} +- +-static void +-em_sync_stream_class_init (EMSyncStreamClass *klass) +-{ +- CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (klass); +- +- parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; +- +- /* virtual method overload */ +- stream_class->write = stream_write; +- stream_class->flush = stream_flush; +- stream_class->close = stream_close; +-} +- + static gboolean +-emcs_gui_received(GIOChannel *source, GIOCondition cond, void *data) ++emss_process_message (struct _write_msg *msg) + { +- EMSyncStream *emss = data; +- struct _EMSyncStreamPrivate *p = emss->priv; +- struct _write_msg *msg; +- +- d(printf("%p: gui sync op job waiting\n", emss)); +- +- msg = (struct _write_msg *)e_msgport_get(p->data_port); +- /* Should never happen ... */ +- if (msg == NULL) +- return TRUE; +- +- d(printf("%p: running sync op %d\n", emss, msg->op)); +- +- /* force out any pending data before doing anything else */ +- if (p->buf_used > 0) { +- EMSS_CLASS(emss)->sync_write((CamelStream *)emss, p->buf_data, p->buf_used); +-#ifdef LOG_STREAM +- if (p->logfd) +- fwrite(p->buf_data, 1, p->buf_used, p->logfd); +-#endif +- p->buf_used = 0; +- } ++ struct _EMSyncStream *emss = msg->emss; + +- /* FIXME: need to handle return values */ ++ /* Force out any pending data before doing anything else. */ ++ if (emss->buffer != NULL && emss->buffer->len > 0) { ++ EMSS_CLASS (emss)->sync_write ( ++ CAMEL_STREAM (emss), emss->buffer->str, ++ emss->buffer->len); ++ g_string_set_size (emss->buffer, 0); ++ } + + switch (msg->op) { +- case EMSS_WRITE: +- EMSS_CLASS(emss)->sync_write((CamelStream *)emss, msg->data, msg->n); +-#ifdef LOG_STREAM +- if (p->logfd) +- fwrite(msg->data, 1, msg->n, p->logfd); +-#endif +- break; +- case EMSS_FLUSH: +- EMSS_CLASS(emss)->sync_flush((CamelStream *)emss); +- break; +- case EMSS_CLOSE: +- EMSS_CLASS(emss)->sync_close((CamelStream *)emss); +-#ifdef LOG_STREAM +- if (p->logfd) { +- fclose(p->logfd); +- p->logfd = NULL; +- } +-#endif +- break; ++ case EMSS_WRITE: ++ EMSS_CLASS (emss)->sync_write ( ++ CAMEL_STREAM (emss), msg->string, msg->len); ++ break; ++ case EMSS_FLUSH: ++ EMSS_CLASS (emss)->sync_flush ( ++ CAMEL_STREAM (emss)); ++ break; ++ case EMSS_CLOSE: ++ EMSS_CLASS (emss)->sync_close ( ++ CAMEL_STREAM (emss)); ++ break; + } +- +- e_msgport_reply((EMsg *)msg); +- d(printf("%p: gui sync op jobs done\n", emss)); +- +- return TRUE; +-} +- +-static void +-em_sync_stream_init (CamelObject *object) +-{ +- EMSyncStream *emss = (EMSyncStream *)object; +- struct _EMSyncStreamPrivate *p; +- +- p = emss->priv = g_malloc0(sizeof(*p)); + +- p->data_port = e_msgport_new(); +- p->reply_port = e_msgport_new(); ++ e_flag_set (msg->done); + +-#ifndef G_OS_WIN32 +- p->gui_channel = g_io_channel_unix_new(e_msgport_fd(p->data_port)); +-#else +- p->gui_channel = g_io_channel_win32_new_socket(e_msgport_fd(p->data_port)); +-#endif +- p->gui_watch = g_io_add_watch(p->gui_channel, G_IO_IN, emcs_gui_received, emss); +- +-#ifdef LOG_STREAM +- if (dolog) { +- char name[32]; +- static int count; +- +- sprintf(name, "sync-stream.%d.html", count++); +- printf("Saving raw data stream to '%s'\n", name); +- p->logfd = fopen(name, "w"); +- } +-#endif +- +- d(printf("%p: new emss\n", emss)); ++ return FALSE; + } + + static void +-sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) ++emss_sync_op (EMSyncStream *emss, enum _write_msg_t op, ++ const gchar *string, gsize len) + { +- struct _EMSyncStreamPrivate *p = emss->priv; + struct _write_msg msg; +- EMsg *reply_msg; +- +- d(printf("%p: launching sync op %d\n", emss, op)); + +- /* we do everything synchronous, we should never have any locks, and +- this prevents overflow from banked up data */ +- +- msg.msg.reply_port = p->reply_port; ++ msg.done = e_flag_new (); ++ msg.emss = emss; + msg.op = op; +- msg.data = data; +- msg.n = n; +- +- e_msgport_put(p->data_port, &msg.msg); +- reply_msg = e_msgport_wait(p->reply_port); +- g_return_if_fail (reply_msg == &msg.msg); +- +- d(printf("%p: returned sync op %d\n", emss, op)); +-} +- +-static void +-em_sync_stream_finalize (CamelObject *object) +-{ +- EMSyncStream *emss = (EMSyncStream *)object; +- struct _EMSyncStreamPrivate *p = emss->priv; +- +- /* TODO: is this stuff safe to do in another thread? */ +- g_source_remove(p->gui_watch); +- g_io_channel_unref(p->gui_channel); ++ msg.string = string; ++ msg.len = len; + +- e_msgport_destroy(p->data_port); +- e_msgport_destroy(p->reply_port); ++ camel_object_ref (emss); + +- p->data_port = NULL; +- p->reply_port = NULL; ++ g_idle_add ((GSourceFunc) emss_process_message, &msg); + +- g_free(p->buf_data); ++ e_flag_wait (msg.done); ++ e_flag_free (msg.done); + +-#ifdef LOG_STREAM +- if (p->logfd) +- fclose(p->logfd); +-#endif +- +- g_free(p); ++ camel_object_unref (emss); + } + +-static ssize_t +-stream_write (CamelStream *stream, const char *buffer, size_t n) ++static gssize ++emss_stream_write (CamelStream *stream, const gchar *string, gsize len) + { + EMSyncStream *emss = EM_SYNC_STREAM (stream); +- struct _EMSyncStreamPrivate *p = emss->priv; + + if (emss->cancel) + return -1; + +- if (pthread_equal(pthread_self(), mail_gui_thread)) { +- EMSS_CLASS(emss)->sync_write(stream, buffer, n); +-#ifdef LOG_STREAM +- if (p->logfd) +- fwrite(buffer, 1, n, p->logfd); +-#endif +- } else if (p->buf_size > 0) { +- size_t left = p->buf_size-p->buf_used; +- +- if (n >= left) { +- sync_op(emss, EMSS_WRITE, buffer, n); +- } else { +- memcpy(p->buf_data + p->buf_used, buffer, n); +- p->buf_used += n; +- } ++ if (mail_in_main_thread ()) { ++ EMSS_CLASS (emss)->sync_write (stream, string, len); ++ } else if (emss->buffer != NULL) { ++ if (len < (emss->buffer->allocated_len - emss->buffer->len)) ++ g_string_append_len (emss->buffer, string, len); ++ else ++ emss_sync_op (emss, EMSS_WRITE, string, len); + } else { +- sync_op(emss, EMSS_WRITE, buffer, n); ++ emss_sync_op(emss, EMSS_WRITE, string, len); + } + +- return (ssize_t) n; ++ return (gssize) len; + } + + static int +-stream_flush(CamelStream *stream) ++emss_stream_flush (CamelStream *stream) + { +- EMSyncStream *emss = (EMSyncStream *)stream; ++ EMSyncStream *emss = EM_SYNC_STREAM (stream); + + if (emss->cancel) + return -1; + +- if (pthread_equal(pthread_self(), mail_gui_thread)) +- return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); ++ if (mail_in_main_thread ()) ++ return EMSS_CLASS (emss)->sync_flush (stream); + else +- sync_op(emss, EMSS_FLUSH, NULL, 0); ++ emss_sync_op (emss, EMSS_FLUSH, NULL, 0); + + return 0; + } + + static int +-stream_close(CamelStream *stream) ++emss_stream_close (CamelStream *stream) + { +- EMSyncStream *emss = (EMSyncStream *)stream; ++ EMSyncStream *emss = EM_SYNC_STREAM (stream); + + if (emss->cancel) + return -1; + +- d(printf("%p: closing stream\n", stream)); +- +- if (pthread_equal(pthread_self(), mail_gui_thread)) { +-#ifdef LOG_STREAM +- if (emss->priv->logfd) { +- fclose(emss->priv->logfd); +- emss->priv->logfd = NULL; +- } +-#endif +- return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_close(stream); +- } else +- sync_op(emss, EMSS_CLOSE, NULL, 0); ++ if (mail_in_main_thread ()) ++ return EMSS_CLASS (emss)->sync_close (stream); ++ else ++ emss_sync_op (emss, EMSS_CLOSE, NULL, 0); + + return 0; + } + +-void +-em_sync_stream_set_buffer_size(EMSyncStream *emss, size_t size) ++static void ++em_sync_stream_class_init (EMSyncStreamClass *class) ++{ ++ CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (class); ++ ++ parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; ++ ++ stream_class->write = emss_stream_write; ++ stream_class->flush = emss_stream_flush; ++ stream_class->close = emss_stream_close; ++} ++ ++static void ++em_sync_stream_finalize (EMSyncStream *emss) ++{ ++ if (emss->buffer != NULL) ++ g_string_free (emss->buffer, TRUE); ++} ++ ++CamelType ++em_sync_stream_get_type (void) + { +- struct _EMSyncStreamPrivate *p = emss->priv; ++ static CamelType type = CAMEL_INVALID_TYPE; ++ ++ if (G_UNLIKELY (type == CAMEL_INVALID_TYPE)) ++ type = camel_type_register ( ++ CAMEL_STREAM_TYPE, ++ "EMSyncStream", ++ sizeof (EMSyncStream), ++ sizeof (EMSyncStreamClass), ++ (CamelObjectClassInitFunc) em_sync_stream_class_init, ++ NULL, ++ (CamelObjectInitFunc) NULL, ++ (CamelObjectFinalizeFunc) em_sync_stream_finalize); + +- g_free(p->buf_data); +- p->buf_data = g_malloc(size); +- p->buf_size = size; +- p->buf_used = 0; ++ return type; ++} ++ ++void ++em_sync_stream_set_buffer_size (EMSyncStream *emss, gsize size) ++{ ++ if (emss->buffer != NULL) ++ g_string_free (emss->buffer, TRUE); ++ emss->buffer = g_string_sized_new (size); + } +--- evolution-2.11.92/mail/importers/pine-importer.c.kill-ethread 2007-09-02 14:56:47.000000000 -0400 ++++ evolution-2.11.92/mail/importers/pine-importer.c 2007-09-04 00:19:08.000000000 -0400 +@@ -56,7 +56,7 @@ + #define d(x) x + + struct _pine_import_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EImport *import; + EImportTarget *target; +@@ -223,8 +223,8 @@ + g_object_unref(book); + } + +-static char * +-pine_import_describe (struct _mail_msg *mm, int complete) ++static gchar * ++pine_import_desc (struct _pine_import_msg *m) + { + return g_strdup (_("Importing Pine data")); + } +@@ -236,10 +236,8 @@ + }; + + static void +-pine_import_import(struct _mail_msg *mm) ++pine_import_exec(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *) mm; +- + if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) + import_contacts(); + +@@ -253,13 +251,11 @@ + } + + static void +-pine_import_imported(struct _mail_msg *mm) ++pine_import_done(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; +- + printf("importing complete\n"); + +- if (!camel_exception_is_set(&mm->ex)) { ++ if (!camel_exception_is_set(&m->base.ex)) { + GConfClient *gconf; + + gconf = gconf_client_get_default(); +@@ -274,10 +270,8 @@ + } + + static void +-pine_import_free(struct _mail_msg *mm) ++pine_import_free(struct _pine_import_msg *m) + { +- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; +- + camel_operation_unref(m->status); + + g_free(m->status_what); +@@ -326,11 +320,12 @@ + return TRUE; + } + +-static struct _mail_msg_op pine_import_op = { +- pine_import_describe, +- pine_import_import, +- pine_import_imported, +- pine_import_free, ++static MailMsgInfo pine_import_info = { ++ sizeof (struct _pine_import_msg), ++ (MailMsgDescFunc) pine_import_desc, ++ (MailMsgExecFunc) pine_import_exec, ++ (MailMsgDoneFunc) pine_import_done, ++ (MailMsgFreeFunc) pine_import_free + }; + + static int +@@ -339,7 +334,7 @@ + struct _pine_import_msg *m; + int id; + +- m = mail_msg_new(&pine_import_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&pine_import_info); + g_datalist_set_data(&target->data, "pine-msg", m); + m->import = ei; + g_object_ref(m->import); +@@ -348,9 +343,9 @@ + m->status_lock = g_mutex_new(); + m->status = camel_operation_new(pine_status, m); + +- id = m->msg.seq; ++ id = m->base.seq; + +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push (m); + + return id; + } +--- evolution-2.11.92/mail/importers/mail-importer.c.kill-ethread 2007-09-02 14:56:47.000000000 -0400 ++++ evolution-2.11.92/mail/importers/mail-importer.c 2007-09-04 00:19:08.000000000 -0400 +@@ -132,7 +132,7 @@ + } + + struct _import_mbox_msg { +- struct _mail_msg msg; ++ MailMsg base; + + char *path; + char *uri; +@@ -142,8 +142,8 @@ + void *done_data; + }; + +-static char * +-import_mbox_describe(struct _mail_msg *mm, int complete) ++static gchar * ++import_mbox_desc (struct _import_mbox_msg *m) + { + return g_strdup (_("Importing mailbox")); + } +@@ -190,9 +190,8 @@ + } + + static void +-import_mbox_import(struct _mail_msg *mm) ++import_mbox_exec (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *) mm; + CamelFolder *folder; + CamelMimeParser *mp = NULL; + struct stat st; +@@ -207,7 +206,7 @@ + if (m->uri == NULL || m->uri[0] == 0) + folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_INBOX); + else +- folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &mm->ex); ++ folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); + + if (folder == NULL) + return; +@@ -262,11 +261,11 @@ + flags |= decode_status(tmp); + + camel_message_info_set_flags(info, flags, ~0); +- camel_folder_append_message(folder, msg, info, NULL, &mm->ex); ++ camel_folder_append_message(folder, msg, info, NULL, &m->base.ex); + camel_message_info_free(info); + camel_object_unref(msg); + +- if (camel_exception_is_set(&mm->ex)) ++ if (camel_exception_is_set(&m->base.ex)) + break; + + camel_mime_parser_step(mp, 0, 0); +@@ -286,30 +285,27 @@ + } + + static void +-import_mbox_done(struct _mail_msg *mm) ++import_mbox_done (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; +- + if (m->done) +- m->done(m->done_data, &mm->ex); ++ m->done(m->done_data, &m->base.ex); + } + + static void +-import_mbox_free (struct _mail_msg *mm) ++import_mbox_free (struct _import_mbox_msg *m) + { +- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; +- + if (m->cancel) + camel_operation_unref(m->cancel); + g_free(m->uri); + g_free(m->path); + } + +-static struct _mail_msg_op import_mbox_op = { +- import_mbox_describe, +- import_mbox_import, +- import_mbox_done, +- import_mbox_free, ++static MailMsgInfo import_mbox_info = { ++ sizeof (struct _import_mbox_msg), ++ (MailMsgDescFunc) import_mbox_desc, ++ (MailMsgExecFunc) import_mbox_exec, ++ (MailMsgDoneFunc) import_mbox_done, ++ (MailMsgFreeFunc) import_mbox_free + }; + + int +@@ -318,7 +314,7 @@ + struct _import_mbox_msg *m; + int id; + +- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&import_mbox_info); + m->path = g_strdup(path); + m->uri = g_strdup(folderuri); + m->done = done; +@@ -328,8 +324,8 @@ + camel_operation_ref(cancel); + } + +- id = m->msg.seq; +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ id = m->base.seq; ++ mail_msg_fast_ordered_push (m); + + return id; + } +@@ -339,7 +335,7 @@ + { + struct _import_mbox_msg *m; + +- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&import_mbox_info); + m->path = g_strdup(path); + m->uri = g_strdup(folderuri); + if (cancel) { +@@ -347,9 +343,9 @@ + camel_operation_ref(cancel); + } + +- import_mbox_import(&m->msg); +- import_mbox_done(&m->msg); +- mail_msg_free(&m->msg); ++ import_mbox_exec(&m->base); ++ import_mbox_done(&m->base); ++ mail_msg_unref(m); + } + + struct _import_folders_data { +--- evolution-2.11.92/mail/importers/elm-importer.c.kill-ethread 2007-09-02 14:56:47.000000000 -0400 ++++ evolution-2.11.92/mail/importers/elm-importer.c 2007-09-04 00:19:08.000000000 -0400 +@@ -51,7 +51,7 @@ + #define d(x) x + + struct _elm_import_msg { +- struct _mail_msg msg; ++ MailMsg base; + + EImport *import; + EImportTargetHome *target; +@@ -186,8 +186,8 @@ + return mailexists; + } + +-static char * +-elm_import_describe (struct _mail_msg *mm, int complete) ++static gchar * ++elm_import_desc (struct _elm_import_msg *m) + { + return g_strdup (_("Importing Elm data")); + } +@@ -198,9 +198,8 @@ + }; + + static void +-elm_import_import(struct _mail_msg *mm) ++elm_import_exec (struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *) mm; + const char *maildir; + char *elmdir; + +@@ -218,13 +217,11 @@ + } + + static void +-elm_import_imported(struct _mail_msg *mm) ++elm_import_done(struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; +- + printf("importing complete\n"); + +- if (!camel_exception_is_set(&mm->ex)) { ++ if (!camel_exception_is_set(&m->base.ex)) { + GConfClient *gconf; + + gconf = gconf_client_get_default(); +@@ -236,10 +233,8 @@ + } + + static void +-elm_import_free(struct _mail_msg *mm) ++elm_import_free(struct _elm_import_msg *m) + { +- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; +- + camel_operation_unref(m->status); + + g_free(m->status_what); +@@ -288,11 +283,12 @@ + return TRUE; + } + +-static struct _mail_msg_op elm_import_op = { +- elm_import_describe, +- elm_import_import, +- elm_import_imported, +- elm_import_free, ++static MailMsgInfo elm_import_info = { ++ sizeof (struct _elm_import_msg), ++ (MailMsgDescFunc) elm_import_desc, ++ (MailMsgExecFunc) elm_import_exec, ++ (MailMsgDoneFunc) elm_import_done, ++ (MailMsgFreeFunc) elm_import_free + }; + + static int +@@ -301,7 +297,7 @@ + struct _elm_import_msg *m; + int id; + +- m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); ++ m = mail_msg_new(&elm_import_info); + g_datalist_set_data(&target->data, "elm-msg", m); + m->import = ei; + g_object_ref(m->import); +@@ -310,9 +306,9 @@ + m->status_lock = g_mutex_new(); + m->status = camel_operation_new(elm_status, m); + +- id = m->msg.seq; ++ id = m->base.seq; + +- e_thread_put(mail_thread_queued, (EMsg *)m); ++ mail_msg_fast_ordered_push (m); + + return id; + } +--- evolution-2.11.92/mail/mail-ops.h.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-ops.h 2007-09-04 00:19:08.000000000 -0400 +@@ -30,13 +30,14 @@ + #pragma } + #endif /* __cplusplus */ + ++#include "mail-mt.h" ++ + #include "camel/camel-store.h" + #include "camel/camel-folder.h" + #include "camel/camel-filter-driver.h" + #include "camel/camel-mime-message.h" + #include "camel/camel-operation.h" + +-#include "libedataserver/e-msgport.h" + #include "libedataserver/e-account.h" + + void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, +@@ -55,12 +56,12 @@ + void mail_get_message (CamelFolder *folder, const char *uid, + void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), + void *data, +- EThread *thread); ++ MailMsgDispatchFunc dispatch); + + void + mail_get_messagex(CamelFolder *folder, const char *uid, + void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), +- void *data, EThread *thread); ++ void *data, MailMsgDispatchFunc dispatch); + + /* get several messages */ + void mail_get_messages (CamelFolder *folder, GPtrArray *uids, +@@ -70,7 +71,7 @@ + /* same for a folder */ + int mail_get_folder (const char *uri, guint32 flags, + void (*done) (char *uri, CamelFolder *folder, void *data), void *data, +- EThread *thread); ++ MailMsgDispatchFunc dispatch); + + /* and for a store */ + int mail_get_store (const char *uri, CamelOperation *op, +--- evolution-2.11.92/mail/em-utils.c.kill-ethread 2007-09-04 00:19:00.000000000 -0400 ++++ evolution-2.11.92/mail/em-utils.c 2007-09-04 00:19:08.000000000 -0400 +@@ -1912,7 +1912,7 @@ + ESource *source = s->data; + GList *contacts; + EBook *book; +- void *hook; ++ GHook *hook; + + d(printf(" checking '%s'\n", e_source_get_uri(source))); + +--- evolution-2.11.92/mail/mail-folder-cache.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-folder-cache.c 2007-09-04 00:19:08.000000000 -0400 +@@ -862,15 +862,14 @@ + + + struct _ping_store_msg { +- struct _mail_msg msg; ++ MailMsg base; + + CamelStore *store; + }; + +-static char * +-ping_store_desc (struct _mail_msg *mm, int done) ++static gchar * ++ping_store_desc (struct _ping_store_msg *m) + { +- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; + char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); + char *msg; + +@@ -881,10 +880,9 @@ + } + + static void +-ping_store_ping (struct _mail_msg *mm) ++ping_store_exec (struct _ping_store_msg *m) + { + gboolean online = FALSE; +- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; + + if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { + if (CAMEL_IS_DISCO_STORE (m->store) && +@@ -895,22 +893,21 @@ + online = TRUE; + } + if (online) +- camel_store_noop (m->store, &mm->ex); ++ camel_store_noop (m->store, &m->base.ex); + } + + static void +-ping_store_free (struct _mail_msg *mm) ++ping_store_free (struct _ping_store_msg *m) + { +- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; +- + camel_object_unref (m->store); + } + +-static struct _mail_msg_op ping_store_op = { +- ping_store_desc, +- ping_store_ping, +- NULL, +- ping_store_free ++static MailMsgInfo ping_store_info = { ++ sizeof (struct _ping_store_msg), ++ (MailMsgDescFunc) ping_store_desc, ++ (MailMsgExecFunc) ping_store_exec, ++ (MailMsgDoneFunc) NULL, ++ (MailMsgFreeFunc) ping_store_free + }; + + static void +@@ -922,11 +919,11 @@ + if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) + return; + +- m = mail_msg_new (&ping_store_op, NULL, sizeof (struct _ping_store_msg)); ++ m = mail_msg_new (&ping_store_info); + m->store = store; + camel_object_ref (store); + +- e_thread_put (mail_thread_queued_slow, (EMsg *) m); ++ mail_msg_slow_ordered_push (m); + } + + static gboolean +@@ -971,7 +968,7 @@ + int hook = 0; + + g_return_if_fail (CAMEL_IS_STORE(store)); +- g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); ++ g_return_if_fail (mail_in_main_thread()); + + LOCK(info_lock); + +--- evolution-2.11.92/mail/em-composer-utils.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/em-composer-utils.c 2007-09-04 00:19:08.000000000 -0400 +@@ -553,7 +553,7 @@ + strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { + int id; + +- id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); ++ id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); + mail_msg_wait (id); + + if (!folder || !account->enabled) { +@@ -1104,7 +1104,7 @@ + g_return_if_fail (CAMEL_IS_FOLDER (folder)); + g_return_if_fail (uid != NULL); + +- mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); ++ mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); + } + + static void +@@ -1135,7 +1135,7 @@ + } + + if (msg == NULL) { +- mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); ++ mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); + camel_message_info_free(info); + return; + } +@@ -1949,7 +1949,7 @@ + rd->source = source; + if (rd->source) + g_object_ref(rd->source); +- mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); ++ mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); + + return; + } +@@ -2121,5 +2121,5 @@ + g_return_if_fail (CAMEL_IS_FOLDER (folder)); + g_return_if_fail (uid != NULL); + +- mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); ++ mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); + } +--- evolution-2.11.92/mail/mail-mt.c.kill-ethread 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/mail/mail-mt.c 2007-09-04 00:19:08.000000000 -0400 @@ -29,8 +29,8 @@ #include #include @@ -5197,7 +6126,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma #include #include -@@ -63,7 +63,7 @@ static void mail_operation_status(struct +@@ -63,7 +63,7 @@ #endif /* background operation status stuff */ @@ -5206,7 +6135,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma int activity_state; /* sigh sigh sigh, we need to keep track of the state external to the pointer itself for locking/race conditions */ int activity_id; -@@ -82,15 +82,12 @@ static GHashTable *mail_msg_active_table +@@ -82,15 +82,12 @@ static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; @@ -5225,7 +6154,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma MAIL_MT_LOCK(mail_msg_lock); -@@ -112,7 +109,6 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -112,7 +109,6 @@ fprintf(log, "Logging async operations\n"); if (log_locks) { @@ -5233,7 +6162,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -122,13 +118,13 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -122,13 +118,13 @@ } } #endif @@ -5251,7 +6180,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); -@@ -143,12 +139,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -143,12 +139,15 @@ return msg; } @@ -5270,7 +6199,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma e_activity_handler_operation_finished (activity_handler, activity_id); } -@@ -177,58 +176,93 @@ checkmem(void *p) +@@ -177,58 +176,93 @@ } #endif @@ -5392,7 +6321,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma } /* hash table of ops->dialogue of active errors */ -@@ -244,9 +278,10 @@ static void error_response(GtkObject *o, +@@ -244,9 +278,10 @@ gtk_widget_destroy((GtkWidget *)o); } @@ -5405,7 +6334,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma char *what; GtkDialog *gd; -@@ -271,27 +306,27 @@ void mail_msg_check_error(void *msg) +@@ -271,27 +306,27 @@ /* check to see if we have dialogue already running for this operation */ /* we key on the operation pointer, which is at least accurate enough for the operation type, although it could be on a different object. */ @@ -5440,7 +6369,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); -@@ -304,13 +339,12 @@ void mail_msg_cancel(unsigned int msgid) +@@ -304,13 +339,12 @@ /* waits for a message to be finished processing (freed) @@ -5457,7 +6386,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +381,7 @@ int mail_msg_active(unsigned int msgid) +@@ -347,9 +381,7 @@ void mail_msg_wait_all(void) { @@ -5468,7 +6397,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -367,294 +399,239 @@ void mail_msg_wait_all(void) +@@ -367,294 +399,239 @@ } /* **************************************** */ @@ -5931,7 +6860,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma } /* ********************************************************************** */ -@@ -665,7 +642,8 @@ static pthread_mutex_t status_lock = PTH +@@ -665,7 +642,8 @@ /* ********************************************************************** */ struct _proxy_msg { @@ -5941,7 +6870,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma MailAsyncEvent *ea; mail_async_event_t type; -@@ -679,10 +657,8 @@ struct _proxy_msg { +@@ -679,10 +657,8 @@ }; static void @@ -5953,7 +6882,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma m->thread = pthread_self(); m->have_thread = TRUE; m->func(m->o, m->event_data, m->data); -@@ -697,16 +673,17 @@ static int +@@ -697,16 +673,17 @@ idle_async_event(void *mm) { do_async_event(mm); @@ -5977,7 +6906,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma }; MailAsyncEvent *mail_async_event_new(void) -@@ -723,10 +700,9 @@ int mail_async_event_emit(MailAsyncEvent +@@ -723,10 +700,9 @@ { struct _proxy_msg *m; int id; @@ -5989,7 +6918,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma m->func = func; m->o = o; m->event_data = event_data; -@@ -735,7 +711,7 @@ int mail_async_event_emit(MailAsyncEvent +@@ -735,7 +711,7 @@ m->type = type; m->have_thread = FALSE; @@ -5998,7 +6927,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma g_mutex_lock(ea->lock); ea->tasks = g_slist_prepend(ea->tasks, m); g_mutex_unlock(ea->lock); -@@ -743,12 +719,12 @@ int mail_async_event_emit(MailAsyncEvent +@@ -743,12 +719,12 @@ /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -6014,7 +6943,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma return id; } -@@ -762,7 +738,7 @@ int mail_async_event_destroy(MailAsyncEv +@@ -762,7 +738,7 @@ g_mutex_lock(ea->lock); while (ea->tasks) { m = ea->tasks->data; @@ -6023,7 +6952,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma if (m->have_thread && pthread_equal(m->thread, thread)) { g_warning("Destroying async event from inside an event, returning EDEADLK"); g_mutex_unlock(ea->lock); -@@ -784,17 +760,18 @@ int mail_async_event_destroy(MailAsyncEv +@@ -784,17 +760,18 @@ /* ********************************************************************** */ struct _call_msg { @@ -6045,7 +6974,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma void *p1, *p2, *p3, *p4, *p5; int i1; va_list ap; -@@ -842,45 +819,47 @@ do_call(struct _mail_msg *mm) +@@ -842,45 +819,47 @@ m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } @@ -6112,7 +7041,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma return ret; } -@@ -889,40 +868,42 @@ void *mail_call_main(mail_call_t type, M +@@ -889,40 +868,42 @@ /* locked via status_lock */ static int busy_state; @@ -6167,7 +7096,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma } MAIL_MT_UNLOCK(status_lock); } -@@ -930,7 +911,7 @@ void mail_disable_stop(void) +@@ -930,7 +911,7 @@ /* ******************************************************************************** */ struct _op_status_msg { @@ -6176,7 +7105,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma struct _CamelOperation *op; char *what; -@@ -938,16 +919,16 @@ struct _op_status_msg { +@@ -938,16 +919,16 @@ void *data; }; @@ -6193,12 +7122,12 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma char *out, *p, *o, c; int pc; -- g_assert (pthread_equal(mail_gui_thread, pthread_self ())); -+ g_assert (mail_in_main_thread ()); +- g_return_if_fail (pthread_equal(mail_gui_thread, pthread_self ())); ++ g_return_if_fail (mail_in_main_thread ()); MAIL_MT_LOCK (mail_msg_lock); -@@ -986,8 +967,8 @@ static void do_op_status(struct _mail_ms +@@ -986,8 +967,8 @@ progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); MAIL_MT_UNLOCK (mail_msg_lock); @@ -6209,7 +7138,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma /* uncommenting because message is not very useful for a user, see bug 271734*/ else { what = g_strdup(""); -@@ -1001,11 +982,7 @@ static void do_op_status(struct _mail_ms +@@ -1001,11 +982,7 @@ MAIL_MT_LOCK (mail_msg_lock); if (data->activity_state == 3) { MAIL_MT_UNLOCK (mail_msg_lock); @@ -6222,7 +7151,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma } else { data->activity_state = 2; MAIL_MT_UNLOCK (mail_msg_lock); -@@ -1021,18 +998,17 @@ static void do_op_status(struct _mail_ms +@@ -1021,18 +998,17 @@ } static void @@ -6248,7 +7177,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma }; static void -@@ -1042,7 +1018,7 @@ mail_operation_status (struct _CamelOper +@@ -1042,7 +1018,7 @@ d(printf("got operation statys: %s %d%%\n", what, pc)); @@ -6257,7 +7186,7 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma m->op = op; m->what = g_strdup(what); switch (pc) { -@@ -1055,7 +1031,7 @@ mail_operation_status (struct _CamelOper +@@ -1055,7 +1031,7 @@ } m->pc = pc; m->data = data; @@ -6266,970 +7195,3 @@ diff -up evolution-2.11.91/mail/mail-mt.c.kill-ethread evolution-2.11.91/mail/ma } /* ******************** */ -diff -up evolution-2.11.91/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread evolution-2.11.91/plugins/folder-unsubscribe/folder-unsubscribe.c ---- evolution-2.11.91/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-07-05 02:09:19.000000000 -0400 -+++ evolution-2.11.91/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-08-29 17:39:34.000000000 -0400 -@@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( - - - struct _folder_unsub_t { -- struct _mail_msg msg; -+ MailMsg base; - - char *uri; - }; - --static char * --folder_unsubscribe__desc (struct _mail_msg *mm, int done) -+static gchar * -+folder_unsubscribe_desc (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; -- -- return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri); -+ return g_strdup_printf ( -+ _("Unsubscribing from folder \"%s\""), msg->uri); - } - - static void --folder_unsubscribe__unsub (struct _mail_msg *mm) -+folder_unsubscribe_exec (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; - extern CamelSession *session; - const char *path = NULL; - CamelStore *store; - CamelURL *url; - -- if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex))) -+ if (!(store = camel_session_get_store (session, msg->uri, &mm->ex))) - return; - -- url = camel_url_new (unsub->uri, NULL); -+ url = camel_url_new (msg->uri, NULL); - if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) - path = url->fragment; - else if (url->path && url->path[0]) -@@ -82,18 +80,17 @@ folder_unsubscribe__unsub (struct _mail_ - } - - static void --folder_unsubscribe__free (struct _mail_msg *mm) -+folder_unsubscribe_free (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; -- -- g_free (unsub->uri); -+ g_free (msg->uri); - } - --static struct _mail_msg_op unsubscribe_op = { -- folder_unsubscribe__desc, -- folder_unsubscribe__unsub, -- NULL, -- folder_unsubscribe__free, -+static MailMsgInfo unsubscribe_info = { -+ sizeof (struct _folder_unsub_t), -+ (MailMsgDescFunc) folder_unsubscribe_desc, -+ (MailMsgExecFunc) folder_unsubscribe_exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) folder_unsubscribe_free - }; - - -@@ -105,8 +102,8 @@ org_gnome_mail_folder_unsubscribe (EPlug - if (target->uri == NULL) - return; - -- unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); -+ unsub = mail_msg_new (&unsubscribe_info); - unsub->uri = g_strdup (target->uri); - -- e_thread_put (mail_thread_new, (EMsg *) unsub); -+ mail_msg_unordered_push (unsub); - } -diff -up evolution-2.11.91/plugins/mark-all-read/mark-all-read.c.kill-ethread evolution-2.11.91/plugins/mark-all-read/mark-all-read.c ---- evolution-2.11.91/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-07-05 02:09:23.000000000 -0400 -+++ evolution-2.11.91/plugins/mark-all-read/mark-all-read.c 2007-08-29 17:39:34.000000000 -0400 -@@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM - return; - } - -- mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); -+ mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); - } - - static void -diff -up evolution-2.11.91/plugins/exchange-operations/exchange-folder.c.kill-ethread evolution-2.11.91/plugins/exchange-operations/exchange-folder.c ---- evolution-2.11.91/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-07-05 02:09:22.000000000 -0400 -+++ evolution-2.11.91/plugins/exchange-operations/exchange-folder.c 2007-08-29 17:39:34.000000000 -0400 -@@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr - inbox_physical_uri = e_folder_get_physical_uri (inbox); - - /* To get the CamelStore/Folder */ -- mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); -+ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); - - - } -diff -up evolution-2.11.91/plugins/save-attachments/save-attachments.c.kill-ethread evolution-2.11.91/plugins/save-attachments/save-attachments.c ---- evolution-2.11.91/plugins/save-attachments/save-attachments.c.kill-ethread 2007-07-05 02:09:25.000000000 -0400 -+++ evolution-2.11.91/plugins/save-attachments/save-attachments.c 2007-08-29 17:39:34.000000000 -0400 -@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin - camel_object_ref(data->folder); - data->uid = g_strdup(target->uids->pdata[0]); - -- mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); -+ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); - } -diff -up evolution-2.11.91/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread evolution-2.11.91/plugins/mailing-list-actions/mailing-list-actions.c ---- evolution-2.11.91/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-07-05 02:09:24.000000000 -0400 -+++ evolution-2.11.91/plugins/mailing-list-actions/mailing-list-actions.c 2007-08-29 17:39:34.000000000 -0400 -@@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM - data->uri = strdup (sel->uri); - - mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), -- emla_list_action_do, data, mail_thread_new); -+ emla_list_action_do, data, mail_msg_unordered_push); - } - - void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) -diff -up evolution-2.11.91/plugins/groupwise-features/share-folder-common.c.kill-ethread evolution-2.11.91/plugins/groupwise-features/share-folder-common.c ---- evolution-2.11.91/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-07-05 02:09:21.000000000 -0400 -+++ evolution-2.11.91/plugins/groupwise-features/share-folder-common.c 2007-08-29 17:39:34.000000000 -0400 -@@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi - } - - struct _EMCreateFolder { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *store; -@@ -137,31 +137,26 @@ struct _EMCreateFolder { - void *user_data; - }; - --static char * --create_folder__desc (struct _mail_msg *mm, int done) -+static gchar * -+create_folder_desc (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); - } - - static void --create_folder__create (struct _mail_msg *mm) -+create_folder_exec (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - -- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { -+ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { - if (camel_store_supports_subscriptions (m->store)) -- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); - } - } - - static void --create_folder__created (struct _mail_msg *mm) -+create_folder_done (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; - struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; - CamelStore *store = CAMEL_STORE (m->store) ; - EGwConnection *ccnc; -@@ -180,10 +175,8 @@ create_folder__created (struct _mail_msg - } - - static void --create_folder__free (struct _mail_msg *mm) -+create_folder_free (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - camel_object_unref (m->store); - g_free (m->full_name); -@@ -191,11 +184,12 @@ create_folder__free (struct _mail_msg *m - g_free (m->name); - } - --static struct _mail_msg_op create_folder_op = { -- create_folder__desc, -- create_folder__create, -- create_folder__created, -- create_folder__free, -+static MailMsgInfo create_folder_info = { -+ sizeof (struct _EMCreateFolder), -+ (MailMsgDescFunc) create_folder_desc, -+ (MailMsgExecFunc) create_folder_exec, -+ (MailMsgDoneFunc) create_folder_done, -+ (MailMsgFreeFunc) create_folder_free - }; - - static void -@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const - parent = namebuf; - } - -- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); -+ m = mail_msg_new (&create_folder_info); - camel_object_ref (store); - m->store = store; - m->full_name = g_strdup (full_name); -@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const - m->user_data = (struct ShareInfo *) user_data; - m->done = done; - g_free (namebuf); -- id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } -diff -up evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.h ---- evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-07-05 02:11:11.000000000 -0400 -+++ evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.h 2007-08-29 17:39:34.000000000 -0400 -@@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo - - typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; - --typedef struct _AlarmMsg AlarmMsg; --typedef struct _AlarmMsgPrivate AlarmMsgPrivate; -- --struct _AlarmMsg { -- EMsg msg; -- -- void (*receive_msg)(EThread *e, struct _AlarmMsg *msg, void *data); /* message received */ -- void *data; -- -- /* Private Usage */ -- struct _AlarmMsgPrivate *priv; --}; -- - struct _AlarmNotify { - BonoboObject object; - -diff -up evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.c ---- evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 -+++ evolution-2.11.91/calendar/gui/alarm-notify/alarm-notify.c 2007-08-29 17:39:34.000000000 -0400 -@@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { - GMutex *mutex; - }; - --EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ --EMsgPort *alarm_reply_port; --static GIOChannel *alarm_reply_channel; -- - #define d(x) x - - -@@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object) - g_mutex_free (priv->mutex); - g_free (priv); - -- e_thread_destroy(alarm_operation_thread); -- g_io_channel_unref(alarm_reply_channel); -- e_msgport_destroy(alarm_reply_port); - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); - } - - - --static guint --alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) --{ -- GSource *source; -- guint id; -- -- d (printf("%s:%d (alarm_channel_setup) - Channel Setup\n ", __FILE__, __LINE__)); -- *port = e_msgport_new(); --#ifndef G_OS_WIN32 -- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); --#else -- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); --#endif -- source = g_io_create_watch(*channel, G_IO_IN); -- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); -- g_source_set_can_recurse(source, FALSE); -- id = g_source_attach(source, NULL); -- g_source_unref(source); -- -- return id; --} -- --static void --alarm_msg_destroy(EThread *e, EMsg *msg, void *data) --{ -- AlarmMsg *m = (AlarmMsg *)msg; -- -- /* Free the private */ -- g_free (m->data); /* Mostly it is a structure allocated as a carrier*/ -- g_free (m); --} -- --static gboolean --alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) --{ -- EMsgPort *port = (EMsgPort *)d; -- EMsg *m; -- -- while (( m = e_msgport_get(port))) { -- d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m)); -- alarm_msg_destroy(NULL, m, NULL); -- } -- -- return TRUE; --} -- --static void --alarm_msg_received(EThread *e, EMsg *msg, void *data) --{ -- AlarmMsg *m = (AlarmMsg *)msg; -- -- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); -- if (m->receive_msg) { -- m->receive_msg (e, m, data); -- } --} -- - /** - * alarm_notify_new: - * -@@ -363,23 +299,10 @@ alarm_msg_received(EThread *e, EMsg *msg - AlarmNotify * - alarm_notify_new (void) - { -- AlarmNotify *an; -- -- d (printf("%s:%d (alarm_notify_new) - Alarm Notify New \n ", __FILE__, __LINE__)); -- -- /* Create a thread for alarm queue operation*/ -- alarm_channel_setup(&alarm_reply_port, &alarm_reply_channel, alarm_msgport_replied); -- -- alarm_operation_thread = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(alarm_operation_thread, alarm_msg_destroy, 0); -- e_thread_set_msg_received(alarm_operation_thread, alarm_msg_received, 0); -- e_thread_set_reply_port(alarm_operation_thread, alarm_reply_port); -- -- an = g_object_new (TYPE_ALARM_NOTIFY, -- "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL), -- NULL); -- -- return an; -+ return g_object_new (TYPE_ALARM_NOTIFY, -+ "poa", bonobo_poa_get_threaded ( -+ ORBIT_THREAD_HINT_PER_REQUEST, NULL), -+ NULL); - } - - static void -diff -up evolution-2.11.91/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread evolution-2.11.91/calendar/gui/alarm-notify/alarm-queue.c ---- evolution-2.11.91/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-08-13 00:00:08.000000000 -0400 -+++ evolution-2.11.91/calendar/gui/alarm-notify/alarm-queue.c 2007-08-29 17:39:34.000000000 -0400 -@@ -97,9 +97,6 @@ static int tray_blink_id = -1; - static int tray_blink_state = FALSE; - static AlarmNotify *an; - --/* Main Tasks thread for dealing with the global structures */ --extern EThread *alarm_operation_thread; -- - /* Structure that stores a client we are monitoring */ - typedef struct { - /* Monitored client */ -@@ -181,6 +178,40 @@ static void on_dialog_objs_removed_cb (E - static void load_alarms_for_today (ClientAlarms *ca); - static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); - -+/* Simple asynchronous message dispatcher */ -+ -+typedef struct _Message Message; -+typedef void (*MessageFunc) (Message *msg); -+ -+struct _Message { -+ MessageFunc func; -+}; -+ -+static void -+message_proxy (Message *msg) -+{ -+ g_return_if_fail (msg->func != NULL); -+ -+ msg->func (msg); -+} -+ -+static gpointer -+create_thread_pool (void) -+{ -+ /* once created, run forever */ -+ return g_thread_pool_new ((GFunc) message_proxy, NULL, 1, FALSE, NULL); -+} -+ -+static void -+message_push (Message *msg) -+{ -+ static GOnce once = G_ONCE_INIT; -+ -+ g_once (&once, (GThreadFunc) create_thread_pool, NULL); -+ -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); -+} -+ - /* Queues an alarm trigger for midnight so that we can load the next day's worth - * of alarms. - */ -@@ -219,47 +250,41 @@ add_client_alarms_cb (gpointer key, gpoi - } - - struct _midnight_refresh_msg { -+ Message header; - gboolean remove; - }; - - /* Loads the alarms for the new day every midnight */ - static void --midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) -+midnight_refresh_async (struct _midnight_refresh_msg *msg) - { -- struct _midnight_refresh_msg *list = msg->data; -- - d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); - - /* Re-load the alarms for all clients */ - g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); - - /* Re-schedule the midnight update */ -- if (list->remove && midnight_refresh_id != NULL) { -+ if (msg->remove && midnight_refresh_id != NULL) { - d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); - alarm_remove (midnight_refresh_id); - midnight_refresh_id = NULL; - } - - queue_midnight_refresh (); -+ -+ g_slice_free (struct _midnight_refresh_msg, msg); - } - - static void - midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) - { -- AlarmMsg *msg; -- struct _midnight_refresh_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); -+ struct _midnight_refresh_msg *msg; - -- list->remove = TRUE; -- msg->data = list; -+ msg = g_slice_new (struct _midnight_refresh_msg); -+ msg->header.func = (MessageFunc) midnight_refresh_async; -+ msg->remove = TRUE; - -- d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Looks up a client in the client alarms hash table */ -@@ -658,6 +683,7 @@ remove_comp (ClientAlarms *ca, ECalCompo - * alarms. - */ - struct _query_msg { -+ Message header; - ECal *client; - GList *objects; - gpointer data; -@@ -691,7 +717,7 @@ duplicate_ecal (GList *in_list) - } - - static void --query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) -+query_objects_changed_async (struct _query_msg *msg) - { - ClientAlarms *ca; - time_t from, day_end; -@@ -700,13 +726,12 @@ query_objects_changed_async (EThread *e, - icaltimezone *zone; - CompQueuedAlarms *cqa; - GList *l; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - -- client = list->client; -- ca = list->data; -- objects = list->objects; -+ client = msg->client; -+ ca = msg->data; -+ objects = msg->objects; - - from = config_data_get_last_notification_time (); - if (from == -1) -@@ -800,43 +825,38 @@ query_objects_changed_async (EThread *e, - comp = NULL; - } - g_list_free (objects); -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - query_objects_changed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -+ struct _query_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = query_objects_changed_async; -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = duplicate_ical (objects); -- list->data = data; -- msg->data = list; -- -- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) query_objects_changed_async; -+ msg->client = client; -+ msg->objects = duplicate_ical (objects); -+ msg->data = data; - -+ message_push ((Message *) msg); - } - - /* Called when a calendar component is removed; we must delete its corresponding - * alarms. - */ - static void --query_objects_removed_async (EThread *e, AlarmMsg *msg, void *data) -+query_objects_removed_async (struct _query_msg *msg) - { - ClientAlarms *ca; - GList *l; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - -- client = list->client; -- ca = list->data; -- objects = list->objects; -+ client = msg->client; -+ ca = msg->data; -+ objects = msg->objects; - - d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); - -@@ -849,27 +869,22 @@ query_objects_removed_async (EThread *e, - } - - g_list_free (objects); -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - query_objects_removed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = query_objects_removed_async; -- -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = duplicate_ecal (objects); -- list->data = data; -- msg->data = list; -+ struct _query_msg *msg; - -- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) query_objects_removed_async; -+ msg->client = client; -+ msg->objects = duplicate_ecal (objects); -+ msg->data = data; - -+ message_push ((Message *) msg); - } - - -@@ -1011,20 +1026,19 @@ free_tray_icon_data (TrayIconData *tray_ - } - - static void --on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) -+on_dialog_objs_removed_async (struct _query_msg *msg) - { - const char *our_uid; - GList *l; - TrayIconData *tray_data; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - - d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); - -- client = list->client; -- tray_data = list->data; -- objects = list->objects; -+ client = msg->client; -+ tray_data = msg->data; -+ objects = msg->objects; - - e_cal_component_get_uid (tray_data->comp, &our_uid); - g_return_if_fail (our_uid && *our_uid); -@@ -1042,37 +1056,33 @@ on_dialog_objs_removed_async (EThread *e - tray_data = NULL; - } - } -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -+ struct _query_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = on_dialog_objs_removed_async; -- -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = objects; -- list->data = data; -- msg->data = list; -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) on_dialog_objs_removed_async; -+ msg->client = client; -+ msg->objects = objects; -+ msg->data = data; - -- d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - struct _tray_cqa_msg { -+ Message header; - CompQueuedAlarms *cqa; - }; - - static void --tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) - { -- struct _tray_cqa_msg *tmsg = msg->data; -- CompQueuedAlarms *cqa = tmsg->cqa; -+ CompQueuedAlarms *cqa = msg->cqa; - GList *list = tray_icons_list; - - d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); -@@ -1111,28 +1121,25 @@ tray_list_remove_cqa_async(EThread *e, A - gtk_tree_selection_select_iter (sel, &iter); - } - } -+ -+ g_slice_free (struct _tray_cqa_msg, msg); - } - - static void - tray_list_remove_cqa (CompQueuedAlarms *cqa) - { -- AlarmMsg *msg; -- struct _tray_cqa_msg *list; -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_cqa_async; -- -- list = malloc (sizeof (struct _tray_cqa_msg)); -- list->cqa = cqa; -- msg->data = list; -+ struct _tray_cqa_msg *msg; -+ -+ msg = g_slice_new (struct _tray_cqa_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_cqa_async; -+ msg->cqa = cqa; - -- d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Callback used from the alarm notify dialog */ - static void --tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_async (Message *msg) - { - GList *list = tray_icons_list; - -@@ -1162,55 +1169,50 @@ tray_list_remove_async(EThread *e, Alarm - } else - list = list->next; - } -+ -+ g_slice_free (Message, msg); - } - - static void --tray_list_remove_icons () -+tray_list_remove_icons (void) - { -- AlarmMsg *msg; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_async; -+ Message *msg; - -- msg->data = NULL; -+ msg = g_slice_new (Message); -+ msg->func = tray_list_remove_async; - -- d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push (msg); - } - - struct _tray_msg { -+ Message header; - TrayIconData *data; - }; - - static void --tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_data_async (struct _tray_msg *msg) - { -- struct _tray_msg *tmsg = msg->data; -- TrayIconData *tray_data = tmsg->data; -+ TrayIconData *tray_data = msg->data; - - d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); - - tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); - free_tray_icon_data (tray_data); - tray_data = NULL; -+ -+ g_slice_free (struct _tray_msg, msg); - } - - static void - tray_list_remove_data (TrayIconData *data) - { -- AlarmMsg *msg; -- struct _tray_msg *list; -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_data_async; -- -- list = malloc (sizeof (struct _tray_msg)); -- list->data = data; -- msg->data = list; -+ struct _tray_msg *msg; -+ -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_data_async; -+ msg->data = data; - -- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - static void -@@ -1417,29 +1419,24 @@ tray_icon_blink_cb (gpointer data) - /* Add a new data to tray list */ - - static void --tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) -+tray_list_add_async (struct _tray_msg *msg) - { -- struct _tray_msg *list = msg->data; -- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); -- tray_icons_list = g_list_prepend (tray_icons_list, list->data); -+ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); -+ tray_icons_list = g_list_prepend (tray_icons_list, msg->data); -+ -+ g_slice_free (struct _tray_msg, msg); - } - - static void - tray_list_add_new (TrayIconData *data) - { -- AlarmMsg *msg; -- struct _tray_msg *list; -+ struct _tray_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_add_async; -- -- list = malloc (sizeof (struct _tray_msg)); -- list->data = data; -- msg->data = list; -- -- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_add_async; -+ msg->data = data; -+ -+ message_push ((Message *) msg); - } - - /* Performs notification of a display alarm */ -@@ -1836,21 +1833,13 @@ check_midnight_refresh (gpointer user_da - new_midnight = time_day_end_with_zone (time (NULL), zone); - - if (new_midnight > midnight) { -- AlarmMsg *msg; -- struct _midnight_refresh_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); -+ struct _midnight_refresh_msg *msg; - -- list->remove = FALSE; -- /* We dont need it. So set it to NULL */ -- msg->data = list; -+ msg = g_slice_new (struct _midnight_refresh_msg); -+ msg->header.func = (MessageFunc) midnight_refresh_async; -+ msg->remove = FALSE; - -- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - return TRUE; -@@ -1981,14 +1970,15 @@ hash_ids (gpointer a) - } - - struct _alarm_client_msg { -+ Message header; - ECal *client; - }; - --static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) -+static void -+alarm_queue_add_async (struct _alarm_client_msg *msg) - { - ClientAlarms *ca; -- struct _alarm_client_msg *list = msg->data; -- ECal *client = list->client; -+ ECal *client = msg->client; - - g_return_if_fail (alarm_queue_inited); - g_return_if_fail (client != NULL); -@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre - G_CALLBACK (cal_opened_cb), - ca); - } -+ -+ g_slice_free (struct _alarm_client_msg, msg); - } - - /** -@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre - void - alarm_queue_add_client (ECal *client) - { -- AlarmMsg *msg; -- struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = alarm_queue_add_async; -- -- list = malloc (sizeof (struct _alarm_client_msg)); -- list->client = client; -- g_object_ref (client); -- msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_add_async; -+ msg->client = g_object_ref (client); - -- d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Removes a component an its alarms */ -@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca) - * Removes a calendar client from the alarm queueing system. - **/ - static void --alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data) -+alarm_queue_remove_async (struct _alarm_client_msg *msg) - { - ClientAlarms *ca; -- struct _alarm_client_msg *list = msg->data; -- ECal *client = list->client; -+ ECal *client = msg->client; - - g_return_if_fail (alarm_queue_inited); - g_return_if_fail (client != NULL); -@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al - g_free (ca); - - g_hash_table_remove (client_alarms_hash, client); -+ -+ g_slice_free (struct _alarm_client_msg, msg); - } - - /** alarm_queue_remove_client -@@ -2156,22 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al - void - alarm_queue_remove_client (ECal *client, gboolean immediately) - { -- AlarmMsg *msg; -- struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = alarm_queue_remove_async; -- -- list = malloc (sizeof (struct _alarm_client_msg)); -- list->client = client; -- msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_remove_async; -+ msg->client = client; - -- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); - if (immediately) -- alarm_queue_remove_async (NULL, msg, NULL); -+ alarm_queue_remove_async (msg); - else -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index 753fe08..04f5d2a 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -30,7 +30,7 @@ - default: - string = NULL; - index = NORMALISED_LAST; -- g_assert_not_reached (); +- g_warning ("Should not be reached\n"); - } - - /* slight optimisation */ diff --git a/evolution.spec b/evolution.spec index 1f7b15f..ce00486 100644 --- a/evolution.spec +++ b/evolution.spec @@ -523,6 +523,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so %{_libdir}/gnome-pilot/conduits/e-address.conduit +%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so %{_libdir}/gnome-pilot/conduits/e-calendar.conduit From d2f959da1036e034b5ad7113caefae800cdfff5b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 5 Sep 2007 14:49:49 +0000 Subject: [PATCH 165/844] Add a reminder comment for myself. --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index ce00486..0a5699c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -694,6 +694,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libfilter.so %{_libdir}/evolution/%{evo_major}/libmenus.so +# Look into re-enabling the inline-audio plugin once 2.12 ships. +# It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629). + %changelog * Mon Sep 03 2007 Matthew Barnes - 2.11.92-1.fc8 - Update to 2.11.92 From 5679cfbc2a4cfd2a69a74bb139ad2cb9824d308a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 11 Sep 2007 21:20:45 +0000 Subject: [PATCH 166/844] - Split off an evolution-help package --- evolution.spec | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0a5699c..7fb349e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -231,6 +231,14 @@ Obsoletes: libgal2-devel <= %{last_libgal2_version} %description devel Development files needed for building things which link against evolution. +%package help +Group: Applications/Productivity +Summary: Help files for Evolution +Requires: %{name} = %{version}-%{release} + +%description help +This package contains the help for Evolution. + %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack @@ -399,6 +407,9 @@ for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do done %find_lang evolution-%{evo_major} --all-name --with-gnome +grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang +grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang + %post /sbin/ldconfig scrollkeeper-update -q @@ -423,7 +434,7 @@ touch --no-create %{_datadir}/icons/hicolor || : %clean rm -rf $RPM_BUILD_ROOT -%files -f evolution-%{evo_major}.lang +%files -f translations.lang %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README @@ -446,9 +457,6 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/redhat-evolution-contacts.desktop %{_datadir}/applications/redhat-evolution-tasks.desktop -# Online help: -%{_datadir}/omf/evolution - # Icons: %{_datadir}/icons/hicolor/16x16/apps/evolution.png %{_datadir}/icons/hicolor/22x22/apps/evolution.png @@ -694,10 +702,16 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libfilter.so %{_libdir}/evolution/%{evo_major}/libmenus.so +%files help -f help.lang +%dir %{_datadir}/omf/evolution + # Look into re-enabling the inline-audio plugin once 2.12 ships. # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629). %changelog +* Sat Sep 8 2007 Matthias Clasen - 2.11.92-2.fc8 +- Split off an evolution-help package + * Mon Sep 03 2007 Matthew Barnes - 2.11.92-1.fc8 - Update to 2.11.92 From d32203d9e18f0f2547ddc9eaa679a964221df6c5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 12 Sep 2007 01:14:37 +0000 Subject: [PATCH 167/844] - Add patch for GNOME bug #476040 (fix attachment icon). --- evolution-2.11.92-mail-attachment.patch | 129 ++++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 137 insertions(+), 1 deletion(-) create mode 100644 evolution-2.11.92-mail-attachment.patch diff --git a/evolution-2.11.92-mail-attachment.patch b/evolution-2.11.92-mail-attachment.patch new file mode 100644 index 0000000..6197ee7 --- /dev/null +++ b/evolution-2.11.92-mail-attachment.patch @@ -0,0 +1,129 @@ +diff -up evolution-2.11.92/mail/em-folder-browser.c.mail-attachment evolution-2.11.92/mail/em-folder-browser.c +--- evolution-2.11.92/mail/em-folder-browser.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-11 18:58:15.000000000 -0400 +@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items + {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"}, + {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, + {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, +- {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"}, ++ {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, + {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, + {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, + /* { NULL, 0, NULL }, */ +diff -up evolution-2.11.92/mail/message-list.c.mail-attachment evolution-2.11.92/mail/message-list.c +--- evolution-2.11.92/mail/message-list.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 ++++ evolution-2.11.92/mail/message-list.c 2007-09-11 18:58:15.000000000 -0400 +@@ -223,7 +223,7 @@ static struct { + { "stock_mail-unread-multiple", NULL }, + { "stock_mail-open-multiple", NULL }, + { NULL, NULL }, +- { "stock_attach", NULL }, ++ { "mail-attachment", NULL }, + { "emblem-important", NULL }, + { "stock_score-lowest", NULL }, + { "stock_score-lower", NULL }, +diff -up evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment evolution-2.11.92/widgets/misc/e-attachment-bar.c +--- evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment 2007-09-02 14:57:07.000000000 -0400 ++++ evolution-2.11.92/widgets/misc/e-attachment-bar.c 2007-09-11 18:58:15.000000000 -0400 +@@ -281,8 +281,7 @@ update (EAttachmentBar *bar) + attachment = priv->attachments->pdata[i]; + + if (!attachment->is_available_local || !attachment->body) { +- /* stock_attach would be better, but its fugly scaled up */ +- if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) { ++ if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) { + attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, ""); + g_object_unref (pixbuf); + } +@@ -373,8 +372,7 @@ update (EAttachmentBar *bar) + pixbuf = e_icon_for_mime_type (mime_type, 48); + if (pixbuf == NULL) { + g_warning("cannot find icon for mime type %s (installation problem?)", mime_type); +- /* stock_attach would be better, but its fugly scaled up */ +- pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG); ++ pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG); + } + g_free (mime_type); + } +diff -up evolution-2.11.92/composer/e-msg-composer.c.mail-attachment evolution-2.11.92/composer/e-msg-composer.c +--- evolution-2.11.92/composer/e-msg-composer.c.mail-attachment 2007-09-02 14:56:48.000000000 -0400 ++++ evolution-2.11.92/composer/e-msg-composer.c 2007-09-11 18:58:15.000000000 -0400 +@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = { + }; + + static EPixmap pixcache [] = { +- E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), ++ E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), + E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) , + +-/* E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */ ++/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */ + E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU), + E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU), +@@ -3989,7 +3989,7 @@ create_composer (int visible_mask) + gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5); + expander_hbox = gtk_hbox_new (FALSE, 0); + +- p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU); ++ p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU); + gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5); + gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1); + +diff -up evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-week-view.c +--- evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/e-week-view.c 2007-09-11 18:58:16.000000000 -0400 +@@ -697,7 +697,7 @@ e_week_view_realize (GtkWidget *widget) + week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); + week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); +- week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); ++ week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); + } + +diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment evolution-2.11.92/calendar/gui/dialogs/comp-editor.c +--- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment 2007-09-02 14:57:08.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c 2007-09-11 18:58:15.000000000 -0400 +@@ -1486,8 +1486,8 @@ static BonoboUIVerb verbs [] = { + }; + + static EPixmap pixmaps[] = { +- E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), +- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU), ++ E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), ++ E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), + + E_PIXMAP_END + }; +@@ -1546,7 +1546,7 @@ setup_widgets (CompEditor *editor) + gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5); + expander_hbox = gtk_hbox_new (FALSE, 0); + +- attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); ++ attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf); + gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5); + gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1); +diff -up evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-day-view.c +--- evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 ++++ evolution-2.11.92/calendar/gui/e-day-view.c 2007-09-11 18:58:16.000000000 -0400 +@@ -1423,7 +1423,7 @@ e_day_view_realize (GtkWidget *widget) + day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); + day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); +- day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); ++ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + + + /* Set the canvas item colors. */ +@@ -1497,7 +1497,7 @@ e_day_view_realize (GtkWidget *widget) + day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); + day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); + day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); +- day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); ++ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); + + + /* Set the canvas item colors. */ diff --git a/evolution.spec b/evolution.spec index 7fb349e..3406c69 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.11.92 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -121,6 +121,9 @@ Patch33: evolution-2.10.0-e-passwords.patch # GNOME bug #417999 Patch34: evolution-2.10.0-e-source-combo-box.patch +# GNOME bug #476040 +Patch35: evolution-2.11.92-mail-attachment.patch + ## Dependencies ### Requires(post): GConf2 @@ -260,6 +263,7 @@ This package contains the help for Evolution. %patch31 -p1 -b .meeting-list-view %patch33 -p1 -b .e-passwords %patch34 -p1 -b .e-source-combo-box +%patch35 -p1 -b .mail-attachment mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -709,6 +713,9 @@ rm -rf $RPM_BUILD_ROOT # It uses gstreamer 0.10 now instead of 0.8 (GNOME bug #329629). %changelog +* Tue Sep 11 2007 Matthew Barnes - 2.11.92-3.fc8 +- Add patch for GNOME bug #476040 (fix attachment icon). + * Sat Sep 8 2007 Matthias Clasen - 2.11.92-2.fc8 - Split off an evolution-help package From ce45da96798f99e7368836fe664ff85abad1bcb0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 15 Sep 2007 21:38:15 +0000 Subject: [PATCH 168/844] - Add patch for GNOME bug #477045 (use standard icon names). --- evolution-2.11.92-icon-names.patch | 2479 ++++++++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 2487 insertions(+), 1 deletion(-) create mode 100644 evolution-2.11.92-icon-names.patch diff --git a/evolution-2.11.92-icon-names.patch b/evolution-2.11.92-icon-names.patch new file mode 100644 index 0000000..25e1b23 --- /dev/null +++ b/evolution-2.11.92-icon-names.patch @@ -0,0 +1,2479 @@ +diff -up evolution-2.11.92/mail/em-folder-browser.c.icon-names evolution-2.11.92/mail/em-folder-browser.c +--- evolution-2.11.92/mail/em-folder-browser.c.icon-names 2007-09-15 16:53:46.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-15 16:53:46.000000000 -0400 +@@ -206,7 +206,7 @@ enum { + /* Options for View */ + static EMFBSearchBarItem emfb_view_items[] = { + {{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL}, +- {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"}, ++ {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"}, + {{ NULL, 0, 0 }, NULL}, + {{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL}, + {{ NULL, -1, 0 }, NULL} +@@ -215,12 +215,12 @@ static EMFBSearchBarItem emfb_view_items + /* TODO: Following options should be customizable */ + static EMFBSearchBarItem temp_view_items[] = { + {{ NULL, 0, 0 }, NULL}, +- {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"}, ++ {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"}, + {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, + {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, + {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, + {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, +- {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, ++ {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"}, + /* { NULL, 0, NULL }, */ + /* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */ + {{ NULL, -1, 0 }, NULL} +diff -up evolution-2.11.92/mail/em-folder-tree.c.icon-names evolution-2.11.92/mail/em-folder-tree.c +--- evolution-2.11.92/mail/em-folder-tree.c.icon-names 2007-09-15 16:53:46.000000000 -0400 ++++ evolution-2.11.92/mail/em-folder-tree.c 2007-09-15 16:53:46.000000000 -0400 +@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column + guint32 flags; + + if (!initialised) { +- folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU); ++ folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU); +- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU); +- folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU); ++ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU); ++ folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU); + folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU); +@@ -1002,7 +1002,7 @@ static EPopupItem emft_drop_popup_menu[] + { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 }, + { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 }, + { E_POPUP_BAR, "10.emc" }, +- { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 }, ++ { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 }, + }; + + static void +@@ -2114,12 +2114,12 @@ static EPopupItem emft_popup_items[] = { + + { E_POPUP_BAR, "20.emc" }, + /* FIXME: need to disable for nochildren folders */ +- { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }, ++ { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, + /* FIXME: need to disable for undeletable folders */ +- { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, ++ { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, + { E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, +- { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, +- { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, ++ { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, ++ { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, + + + { E_POPUP_BAR, "80.emc" }, +diff -up evolution-2.11.92/mail/mail.error.xml.icon-names evolution-2.11.92/mail/mail.error.xml +--- evolution-2.11.92/mail/mail.error.xml.icon-names 2007-07-28 17:08:12.000000000 -0400 ++++ evolution-2.11.92/mail/mail.error.xml 2007-09-15 16:53:46.000000000 -0400 +@@ -16,14 +16,14 @@ + <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email: + {0} + Send anyway? +- + + +diff -up evolution-2.11.92/e-util/e-error.c.icon-names evolution-2.11.92/e-util/e-error.c +--- evolution-2.11.92/e-util/e-error.c.icon-names 2007-09-02 14:56:59.000000000 -0400 ++++ evolution-2.11.92/e-util/e-error.c 2007-09-15 16:53:46.000000000 -0400 +@@ -79,7 +79,7 @@ static GSList *ee_parent_list; + /* ********************************************************************** */ + + static struct _e_error_button default_ok_button = { +- NULL, "gtk-ok", NULL, GTK_RESPONSE_OK ++ NULL, "dialog-ok", NULL, GTK_RESPONSE_OK + }; + + static struct _e_error default_errors[] = { +diff -up evolution-2.11.92/e-util/e-system.error.xml.icon-names evolution-2.11.92/e-util/e-system.error.xml +--- evolution-2.11.92/e-util/e-system.error.xml.icon-names 2007-07-05 02:10:56.000000000 -0400 ++++ evolution-2.11.92/e-util/e-system.error.xml 2007-09-15 16:53:46.000000000 -0400 +@@ -5,7 +5,7 @@ + <_title>Overwrite file? + <_primary>File exists "{0}". + <_secondary>Do you wish to overwrite it? +- - - -diff -up evolution-2.11.92/e-util/e-error.c.icon-names evolution-2.11.92/e-util/e-error.c ---- evolution-2.11.92/e-util/e-error.c.icon-names 2007-09-02 14:56:59.000000000 -0400 -+++ evolution-2.11.92/e-util/e-error.c 2007-09-15 16:53:46.000000000 -0400 -@@ -79,7 +79,7 @@ static GSList *ee_parent_list; - /* ********************************************************************** */ - - static struct _e_error_button default_ok_button = { -- NULL, "gtk-ok", NULL, GTK_RESPONSE_OK -+ NULL, "dialog-ok", NULL, GTK_RESPONSE_OK - }; - - static struct _e_error default_errors[] = { -diff -up evolution-2.11.92/e-util/e-system.error.xml.icon-names evolution-2.11.92/e-util/e-system.error.xml ---- evolution-2.11.92/e-util/e-system.error.xml.icon-names 2007-07-05 02:10:56.000000000 -0400 -+++ evolution-2.11.92/e-util/e-system.error.xml 2007-09-15 16:53:46.000000000 -0400 -@@ -5,7 +5,7 @@ - <_title>Overwrite file? - <_primary>File exists "{0}". - <_secondary>Do you wish to overwrite it? --
- #include -@@ -78,7 +78,7 @@ static void select_cb (GtkWidget *w, ECo - static void list_name_changed_cb (GtkWidget *w, EContactListEditor *editor); - static void list_image_changed_cb (GtkWidget *w, EContactListEditor *editor); - static void visible_addrs_toggled_cb (GtkWidget *w, EContactListEditor *editor); --static void source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor); -+static void source_changed_cb (ESourceComboBox *source_combo_box, EContactListEditor *editor); - static gboolean email_key_pressed (GtkWidget *w, GdkEventKey *event, EContactListEditor *editor); - static void email_match_selected (GtkWidget *w, EDestination *destination, EContactListEditor *editor); - -@@ -233,7 +233,7 @@ e_contact_list_editor_init (EContactList - editor->list_name_entry = glade_xml_get_widget (gui, "list-name-entry"); - editor->list_image = glade_xml_get_widget (gui, "list-image"); - editor->visible_addrs_checkbutton = glade_xml_get_widget (gui, "visible-addrs-checkbutton"); -- editor->source_menu = glade_xml_get_widget (gui, "source-option-menu-source"); -+ editor->source_menu = glade_xml_get_widget (gui, "source-combo-box-source"); - - editor->ok_button = glade_xml_get_widget (gui, "ok-button"); - editor->cancel_button = glade_xml_get_widget (gui, "cancel-button"); -@@ -276,7 +276,7 @@ e_contact_list_editor_init (EContactList - "changed", G_CALLBACK(list_image_changed_cb), editor); - - g_signal_connect (editor->source_menu, -- "source_selected", G_CALLBACK (source_selected), editor); -+ "changed", G_CALLBACK (source_changed_cb), editor); - - command_state_changed (editor); - -@@ -306,8 +306,9 @@ new_target_cb (EBook *new_book, EBookSta - if (status != E_BOOK_ERROR_OK || new_book == NULL) { - eab_load_error_dialog (NULL, e_book_get_source (new_book), status); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu), -- e_book_get_source (editor->book)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (editor->source_menu), -+ e_book_get_source (editor->book)); - - if (new_book) - g_object_unref (new_book); -@@ -332,8 +333,12 @@ cancel_load (EContactListEditor *editor) - } - - static void --source_selected (GtkWidget *source_option_menu, ESource *source, EContactListEditor *editor) -+source_changed_cb (ESourceComboBox *source_combo_box, EContactListEditor *editor) - { -+ ESource *source; -+ -+ source = e_source_combo_box_get_active (source_combo_box); -+ - cancel_load (editor); - - if (e_source_equal (e_book_get_source (editor->book), source)) -@@ -795,28 +800,28 @@ select_cb (GtkWidget *w, EContactListEdi - } - - GtkWidget * --e_contact_list_editor_create_source_option_menu (gchar *name, -- gchar *string1, gchar *string2, -- gint int1, gint int2); -+e_contact_list_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2); - - GtkWidget * --e_contact_list_editor_create_source_option_menu (gchar *name, -- gchar *string1, gchar *string2, -- gint int1, gint int2) -+e_contact_list_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2) - { - -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } - - GtkWidget * -@@ -1262,10 +1267,9 @@ fill_in_info(EContactListEditor *editor) - } - - if (editor->book) { -- ESource *source; -- -- source = e_book_get_source (editor->book); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (editor->source_menu), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (editor->source_menu), -+ e_book_get_source (editor->book)); - gtk_widget_set_sensitive (editor->source_menu, editor->is_new_list); - gtk_widget_set_sensitive (glade_xml_get_widget (editor->gui, "source-label"), editor->is_new_list); - } -diff -up evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade ---- evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400 -+++ evolution-2.12.0/addressbook/gui/contact-editor/contact-editor.glade 2007-09-17 14:31:05.000000000 -0400 -@@ -356,9 +356,9 @@ - - - -- -+ - True -- e_contact_editor_create_source_option_menu -+ e_contact_editor_create_source_combo_box - 0 - 0 - Tue, 13 Apr 2004 20:47:50 GMT -diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400 -+++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-editor.c 2007-09-17 14:31:05.000000000 -0400 -@@ -46,7 +46,7 @@ - #include - - #include --#include -+#include - - #include - -@@ -589,15 +589,16 @@ static void - fill_in_source_field (EContactEditor *editor) - { - GtkWidget *source_menu; -- ESource *source; - - if (!editor->target_book) - return; - -- source_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source"); -- source = e_book_get_source (editor->target_book); -+ source_menu = glade_xml_get_widget ( -+ editor->gui, "source-combo-box-source"); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_menu), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (source_menu), -+ e_book_get_source (editor->target_book)); - } - - static void -@@ -2527,13 +2528,15 @@ new_target_cb (EBook *new_book, EBookSta - editor->load_book = NULL; - - if (status != E_BOOK_ERROR_OK || new_book == NULL) { -- GtkWidget *source_option_menu; -+ GtkWidget *source_combo_box; - - eab_load_error_dialog (NULL, e_book_get_source (new_book), status); - -- source_option_menu = glade_xml_get_widget (editor->gui, "source-option-menu-source"); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (source_option_menu), -- e_book_get_source (editor->target_book)); -+ source_combo_box = glade_xml_get_widget ( -+ editor->gui, "source-combo-box-source"); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (source_combo_box), -+ e_book_get_source (editor->target_book)); - - if (new_book) - g_object_unref (new_book); -@@ -2557,8 +2560,12 @@ cancel_load (EContactEditor *editor) - } - - static void --source_selected (GtkWidget *source_option_menu, ESource *source, EContactEditor *editor) -+source_changed (ESourceComboBox *source_combo_box, EContactEditor *editor) - { -+ ESource *source; -+ -+ source = e_source_combo_box_get_active (source_combo_box); -+ - cancel_load (editor); - - if (e_source_equal (e_book_get_source (editor->target_book), source)) -@@ -3383,8 +3390,8 @@ e_contact_editor_init (EContactEditor *e - g_signal_connect (widget, "clicked", G_CALLBACK (full_name_clicked), e_contact_editor); - widget = glade_xml_get_widget(e_contact_editor->gui, "button-categories"); - g_signal_connect (widget, "clicked", G_CALLBACK (categories_clicked), e_contact_editor); -- widget = glade_xml_get_widget (e_contact_editor->gui, "source-option-menu-source"); -- g_signal_connect (widget, "source_selected", G_CALLBACK (source_selected), e_contact_editor); -+ widget = glade_xml_get_widget (e_contact_editor->gui, "source-combo-box-source"); -+ g_signal_connect (widget, "changed", G_CALLBACK (source_changed), e_contact_editor); - label = glade_xml_get_widget (e_contact_editor->gui, "where-label"); - gtk_label_set_mnemonic_widget (GTK_LABEL (label), widget); - widget = glade_xml_get_widget (e_contact_editor->gui, "button-ok"); -@@ -3835,26 +3842,26 @@ e_contact_editor_create_web(gchar *name, - } - - GtkWidget * --e_contact_editor_create_source_option_menu (gchar *name, -- gchar *string1, gchar *string2, -- gint int1, gint int2); -+e_contact_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2); - - GtkWidget * --e_contact_editor_create_source_option_menu (gchar *name, -- gchar *string1, gchar *string2, -- gint int1, gint int2) -+e_contact_editor_create_source_combo_box (gchar *name, -+ gchar *string1, gchar *string2, -+ gint int1, gint int2) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - g_object_unref (gconf_client); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } -diff -up evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c ---- evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c.e-source-combo-box 2007-09-16 14:52:39.000000000 -0400 -+++ evolution-2.12.0/addressbook/gui/contact-editor/e-contact-quick-add.c 2007-09-17 14:31:05.000000000 -0400 -@@ -37,7 +37,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "e-contact-editor.h" -@@ -269,8 +269,12 @@ clicked_cb (GtkWidget *w, gint button, g - } - - static void --source_selected (GtkWidget *source_option_menu, ESource *source, QuickAdd *qa) -+source_changed (ESourceComboBox *source_combo_box, QuickAdd *qa) - { -+ ESource *source; -+ -+ source = e_source_combo_box_get_active (source_combo_box); -+ - if (qa->book) { - g_object_unref (qa->book); - qa->book = NULL; -@@ -319,16 +323,20 @@ build_quick_add_dialog (QuickAdd *qa) - gconf_client = gconf_client_get_default (); - source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/addressbook/sources"); - g_object_unref (gconf_client); -- qa->option_menu = e_source_option_menu_new (source_list); -+ qa->option_menu = e_source_combo_box_new (source_list); - book = e_book_new_default_addressbook (NULL); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (qa->option_menu), e_book_get_source(book)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (qa->option_menu), -+ e_book_get_source (book)); - if (qa->book) { - g_object_unref (qa->book); - qa->book = NULL; - } - qa->book = book ; -- source_selected(qa->option_menu, e_source_option_menu_peek_selected ((ESourceOptionMenu *)qa->option_menu), qa); -- g_signal_connect (qa->option_menu, "source_selected", G_CALLBACK (source_selected), qa); -+ source_changed (E_SOURCE_COMBO_BOX (qa->option_menu), qa); -+ g_signal_connect ( -+ qa->option_menu, "changed", -+ G_CALLBACK (source_changed), qa); - - g_object_unref (source_list); - -diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.glade ---- evolution-2.12.0/calendar/gui/dialogs/memo-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/memo-page.glade 2007-09-17 14:31:05.000000000 -0400 -@@ -194,7 +194,7 @@ - - - True -- memo_page_create_source_option_menu -+ memo_page_create_source_combo_box - 0 - 0 - Tue, 13 Jan 2004 22:00:00 GMT -diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.glade ---- evolution-2.12.0/calendar/gui/dialogs/event-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/event-page.glade 2007-09-17 14:31:05.000000000 -0400 -@@ -827,7 +827,7 @@ - - - True -- event_page_create_source_option_menu -+ event_page_create_source_combo_box - 0 - 0 - Wed, 17 Dec 2003 18:20:26 GMT -diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.glade ---- evolution-2.12.0/calendar/gui/dialogs/task-page.glade.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/task-page.glade 2007-09-17 14:31:05.000000000 -0400 -@@ -671,7 +671,7 @@ - - 24 - True -- task_page_create_source_option_menu -+ task_page_create_source_combo_box - 0 - 0 - Thu, 18 Dec 2003 01:58:48 GMT -diff -up evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/memo-page.c ---- evolution-2.12.0/calendar/gui/dialogs/memo-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/memo-page.c 2007-09-17 14:31:44.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -352,7 +352,6 @@ memo_page_fill_widgets (CompEditorPage * - GSList *l; - const char *categories; - gchar *backend_addr = NULL; -- ESource *source; - - mpage = MEMO_PAGE (page); - priv = mpage->priv; -@@ -451,8 +450,9 @@ memo_page_fill_widgets (CompEditorPage * - g_free (backend_addr); - - /* Source */ -- source = e_cal_get_source (page->client); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (page->client)); - - priv->updating = FALSE; - -@@ -893,13 +893,12 @@ field_changed_cb (GtkWidget *widget, gpo - } - - static void --source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *source_combo_box, MemoPage *mpage) - { -- MemoPage *mpage; -- MemoPagePrivate *priv; -+ MemoPagePrivate *priv = mpage->priv; -+ ESource *source; - -- mpage = MEMO_PAGE (data); -- priv = mpage->priv; -+ source = e_source_combo_box_get_active (source_combo_box); - - if (!priv->updating) { - ECal *client; -@@ -911,8 +910,9 @@ source_changed_cb (GtkWidget *widget, ES - if (client) - g_object_unref (client); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), -- e_cal_get_source (COMP_EDITOR_PAGE (mpage)->client)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (COMP_EDITOR_PAGE (mpage)->client)); - - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -1055,7 +1055,7 @@ init_widgets (MemoPage *mpage) - G_CALLBACK (categories_clicked_cb), mpage); - - /* Source selector */ -- g_signal_connect((priv->source_selector), "source_selected", -+ g_signal_connect((priv->source_selector), "changed", - G_CALLBACK (source_changed_cb), mpage); - - /* Connect the default signal handler to use to make sure the "changed" -@@ -1271,22 +1271,23 @@ memo_page_create_date_edit (void) - return dedit; - } - --GtkWidget *memo_page_create_source_option_menu (void); -+GtkWidget *memo_page_create_source_combo_box (void); - - GtkWidget * --memo_page_create_source_option_menu (void) -+memo_page_create_source_combo_box (void) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); -- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/memos/sources"); -+ source_list = e_source_list_new_for_gconf ( -+ gconf_client, "/apps/evolution/memos/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - g_object_unref (gconf_client); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } -diff -up evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/event-page.c ---- evolution-2.12.0/calendar/gui/dialogs/event-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/event-page.c 2007-09-17 14:31:05.000000000 -0400 -@@ -33,7 +33,7 @@ - #include - #include - #include --#include -+#include - #include "common/authentication.h" - #include "e-util/e-categories-config.h" - #include "e-util/e-dialog-widgets.h" -@@ -1000,7 +1000,6 @@ event_page_fill_widgets (CompEditorPage - const char *location, *uid = NULL; - const char *categories; - gchar *backend_addr = NULL; -- ESource *source; - GSList *l; - gboolean validated = TRUE; - -@@ -1215,8 +1214,9 @@ event_page_fill_widgets (CompEditorPage - e_dialog_editable_set (priv->categories, categories); - - /* Source */ -- source = e_cal_get_source (page->client); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (page->client)); - - e_cal_component_get_uid (comp, &uid); - if (!(COMP_EDITOR_PAGE (epage)->flags & COMP_EDITOR_PAGE_DELEGATE) -@@ -2662,7 +2662,8 @@ event_page_sendoptions_clicked_cb (Event - - if (!priv->sod) { - priv->sod = e_sendoptions_dialog_new (); -- source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector)); -+ source = e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector)); - e_sendoptions_utils_set_default_data (priv->sod, source, "calendar"); - priv->sod->data->initialized = TRUE; - } -@@ -2691,13 +2692,12 @@ field_changed_cb (GtkWidget *widget, gpo - } - - static void --source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *source_combo_box, EventPage *epage) - { -- EventPage *epage; -- EventPagePrivate *priv; -+ EventPagePrivate *priv = epage->priv; -+ ESource *source; - -- epage = EVENT_PAGE (data); -- priv = epage->priv; -+ source = e_source_combo_box_get_active (source_combo_box); - - if (!priv->updating) { - ECal *client; -@@ -2716,8 +2716,9 @@ source_changed_cb (GtkWidget *widget, ES - if (client) - g_object_unref (client); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), -- e_cal_get_source (COMP_EDITOR_PAGE (epage)->client)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (COMP_EDITOR_PAGE (epage)->client)); - - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -2980,7 +2981,7 @@ init_widgets (EventPage *epage) - G_CALLBACK (categories_clicked_cb), epage); - - /* Source selector */ -- g_signal_connect((priv->source_selector), "source_selected", -+ g_signal_connect((priv->source_selector), "changed", - G_CALLBACK (source_changed_cb), epage); - /* Alarms */ - priv->alarm_list_store = e_alarm_list_new (); -@@ -3306,24 +3307,25 @@ make_timezone_entry (void) - return w; - } - --GtkWidget *event_page_create_source_option_menu (void); -+GtkWidget *event_page_create_source_combo_box (void); - - GtkWidget * --event_page_create_source_option_menu (void) -+event_page_create_source_combo_box (void) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); -- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/calendar/sources"); -+ source_list = e_source_list_new_for_gconf ( -+ gconf_client, "/apps/evolution/calendar/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - g_object_unref (gconf_client); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } - - GtkWidget *make_status_icons (void); -diff -up evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box evolution-2.12.0/calendar/gui/dialogs/task-page.c ---- evolution-2.12.0/calendar/gui/dialogs/task-page.c.e-source-combo-box 2007-09-16 15:33:57.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/dialogs/task-page.c 2007-09-17 14:31:58.000000000 -0400 -@@ -35,7 +35,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include "common/authentication.h" -@@ -533,7 +533,6 @@ task_page_fill_widgets (CompEditorPage * - const char *categories, *uid; - icaltimezone *zone, *default_zone; - gchar *backend_addr = NULL; -- ESource *source; - - tpage = TASK_PAGE (page); - priv = tpage->priv; -@@ -677,8 +676,9 @@ task_page_fill_widgets (CompEditorPage * - e_dialog_editable_set (priv->categories, categories); - - /* Source */ -- source = e_cal_get_source (page->client); -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), source); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (page->client)); - - e_cal_get_cal_address (COMP_EDITOR_PAGE (tpage)->client, &backend_addr, NULL); - set_subscriber_info_string (tpage, backend_addr); -@@ -1688,13 +1688,12 @@ field_changed_cb (GtkWidget *widget, gpo - } - - static void --source_changed_cb (GtkWidget *widget, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *source_combo_box, TaskPage *tpage) - { -- TaskPage *tpage; -- TaskPagePrivate *priv; -+ TaskPagePrivate *priv = tpage->priv; -+ ESource *source; - -- tpage = TASK_PAGE (data); -- priv = tpage->priv; -+ source = e_source_combo_box_get_active (source_combo_box); - - if (!priv->updating) { - ECal *client; -@@ -1713,8 +1712,9 @@ source_changed_cb (GtkWidget *widget, ES - if (client) - g_object_unref (client); - -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (priv->source_selector), -- e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client)); -+ e_source_combo_box_set_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector), -+ e_cal_get_source (COMP_EDITOR_PAGE (tpage)->client)); - - dialog = gtk_message_dialog_new (NULL, GTK_DIALOG_MODAL, - GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, -@@ -1726,7 +1726,7 @@ source_changed_cb (GtkWidget *widget, ES - comp_editor_notify_client_changed ( - COMP_EDITOR (gtk_widget_get_toplevel (priv->main)), - client); -- field_changed_cb (widget, data); -+ field_changed_cb (GTK_WIDGET (source_combo_box), tpage); - if (e_cal_get_static_capability (client, CAL_STATIC_CAPABILITY_REQ_SEND_OPTIONS) && priv->is_assignment) - task_page_show_options (tpage); - else -@@ -1778,7 +1778,8 @@ task_page_sendoptions_clicked_cb (TaskPa - if (!priv->sod) { - priv->sod = e_sendoptions_dialog_new (); - priv->sod->data->initialized = TRUE; -- source = e_source_option_menu_peek_selected (E_SOURCE_OPTION_MENU (priv->source_selector)); -+ source = e_source_combo_box_get_active ( -+ E_SOURCE_COMBO_BOX (priv->source_selector)); - e_sendoptions_utils_set_default_data (priv->sod, source, "task"); - } - -@@ -1836,7 +1837,7 @@ init_widgets (TaskPage *tpage) - G_CALLBACK (categories_clicked_cb), tpage); - - /* Source selector */ -- g_signal_connect((priv->source_selector), "source_selected", -+ g_signal_connect((priv->source_selector), "source_changed", - G_CALLBACK (source_changed_cb), tpage); - - /* Connect the default signal handler to use to make sure the "changed" -@@ -2081,22 +2082,23 @@ task_page_create_date_edit (void) - return dedit; - } - --GtkWidget *task_page_create_source_option_menu (void); -+GtkWidget *task_page_create_source_combo_box (void); - - GtkWidget * --task_page_create_source_option_menu (void) -+task_page_create_source_combo_box (void) - { -- GtkWidget *menu; -+ GtkWidget *combo_box; - GConfClient *gconf_client; - ESourceList *source_list; - - gconf_client = gconf_client_get_default (); -- source_list = e_source_list_new_for_gconf (gconf_client, "/apps/evolution/tasks/sources"); -+ source_list = e_source_list_new_for_gconf ( -+ gconf_client, "/apps/evolution/tasks/sources"); - -- menu = e_source_option_menu_new (source_list); -+ combo_box = e_source_combo_box_new (source_list); - g_object_unref (source_list); - g_object_unref (gconf_client); - -- gtk_widget_show (menu); -- return menu; -+ gtk_widget_show (combo_box); -+ return combo_box; - } -diff -up evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box evolution-2.12.0/calendar/gui/e-itip-control.c ---- evolution-2.12.0/calendar/gui/e-itip-control.c.e-source-combo-box 2007-09-16 15:34:45.000000000 -0400 -+++ evolution-2.12.0/calendar/gui/e-itip-control.c 2007-09-17 14:31:05.000000000 -0400 -@@ -44,7 +44,7 @@ - #include - #include - #include --#include -+#include - #include - #include - #include -@@ -226,13 +226,13 @@ typedef struct { - } EItipControlFindData; - - static void --source_selected_cb (ESourceOptionMenu *esom, ESource *source, gpointer data) -+source_changed_cb (ESourceComboBox *escb, EItipControl *itip) - { -- EItipControl *itip = data; -- EItipControlPrivate *priv; -- -- priv = itip->priv; -+ EItipControlPrivate *priv = itip->priv; -+ ESource *source; - -+ source = e_source_combo_box_get_active (escb); -+ - if (priv->ok) - gtk_widget_set_sensitive (priv->ok, FALSE); - -@@ -273,7 +273,7 @@ find_cal_opened_cb (ECal *ecal, ECalenda - cleanup: - if (fd->count == 0) { - if (fd->show_selector && !priv->current_ecal && priv->vbox) { -- GtkWidget *esom; -+ GtkWidget *escb; - char *uid; - - switch (priv->type) { -@@ -297,17 +297,17 @@ find_cal_opened_cb (ECal *ecal, ECalenda - if (!source) - source = e_source_list_peek_source_any (priv->source_lists[priv->type]); - -- esom = e_source_option_menu_new (priv->source_lists[priv->type]); -- g_signal_connect_object (esom, "source_selected", -- G_CALLBACK (source_selected_cb), -- fd->itip, 0); -+ escb = e_source_combo_box_new (priv->source_lists[priv->type]); -+ g_signal_connect_object ( -+ escb, "changed", -+ G_CALLBACK (source_changed_cb), fd->itip, 0); - -- gtk_box_pack_start (GTK_BOX (priv->vbox), esom, FALSE, TRUE, 0); -- gtk_widget_show (esom); -+ gtk_box_pack_start (GTK_BOX (priv->vbox), escb, FALSE, TRUE, 0); -+ gtk_widget_show (escb); - - /* FIXME What if there is no source? */ - if (source) -- e_source_option_menu_select (E_SOURCE_OPTION_MENU (esom), source); -+ e_source_combo_box_set_active (E_SOURCE_COMBO_BOX (escb), source); - } else { - /* FIXME Display error message to user */ - } diff --git a/evolution-2.11.92-icon-names.patch b/evolution-2.11.92-icon-names.patch deleted file mode 100644 index 5e82648..0000000 --- a/evolution-2.11.92-icon-names.patch +++ /dev/null @@ -1,1788 +0,0 @@ -diff -up evolution-2.12.1/mail/em-folder-browser.c.icon-names evolution-2.12.1/mail/em-folder-browser.c ---- evolution-2.12.1/mail/em-folder-browser.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/em-folder-browser.c 2007-10-15 22:34:23.000000000 -0400 -@@ -206,7 +206,7 @@ enum { - /* Options for View */ - static EMFBSearchBarItem emfb_view_items[] = { - {{ N_("All Messages"), VIEW_ALL_MESSAGES, 0 }, NULL}, -- {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "stock_mail-unread"}, -+ {{ N_("Unread Messages"), VIEW_UNREAD_MESSAGES, 0 }, "mail-unread"}, - {{ NULL, 0, 0 }, NULL}, - {{ N_("No Label"),VIEW_NO_LABEL, 0 }, NULL}, - {{ NULL, -1, 0 }, NULL} -@@ -215,12 +215,12 @@ static EMFBSearchBarItem emfb_view_items - /* TODO: Following options should be customizable */ - static EMFBSearchBarItem temp_view_items[] = { - {{ NULL, 0, 0 }, NULL}, -- {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"}, -+ {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "mail-read"}, - {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, - {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, - {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, - {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, -- {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, -+ {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "mail-mark-notjunk"}, - /* { NULL, 0, NULL }, */ - /* { N_("Customize"), NOT_IMPLEMENTED, NULL }, */ - {{ NULL, -1, 0 }, NULL} -@@ -1603,7 +1603,7 @@ static BonoboUIVerb emfb_verbs[] = { - }; - - static EPixmap emfb_pixmaps[] = { -- E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ChangeFolderProperties", "document-properties", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), - -diff -up evolution-2.12.1/mail/em-folder-tree.c.icon-names evolution-2.12.1/mail/em-folder-tree.c ---- evolution-2.12.1/mail/em-folder-tree.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/em-folder-tree.c 2007-10-15 22:34:23.000000000 -0400 -@@ -288,11 +288,11 @@ render_pixbuf (GtkTreeViewColumn *column - guint32 flags; - - if (!initialised) { -- folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("stock_folder", E_ICON_SIZE_MENU); -+ folder_icons[FOLDER_ICON_NORMAL] = e_icon_factory_get_icon ("folder", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_INBOX] = e_icon_factory_get_icon ("stock_inbox", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_OUTBOX] = e_icon_factory_get_icon ("stock_outbox", E_ICON_SIZE_MENU); -- folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("gnome-fs-trash-empty", E_ICON_SIZE_MENU); -- folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("stock_spam", E_ICON_SIZE_MENU); -+ folder_icons[FOLDER_ICON_TRASH] = e_icon_factory_get_icon ("user-trash", E_ICON_SIZE_MENU); -+ folder_icons[FOLDER_ICON_JUNK] = e_icon_factory_get_icon ("mail-mark-junk", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SHARED_TO_ME] = e_icon_factory_get_icon ("stock_shared-to-me", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SHARED_BY_ME] = e_icon_factory_get_icon ("stock_shared-by-me", E_ICON_SIZE_MENU); - folder_icons[FOLDER_ICON_SENT] = e_icon_factory_get_icon ("stock_sent-mail", E_ICON_SIZE_MENU); -@@ -1002,7 +1002,7 @@ static EPopupItem emft_drop_popup_menu[] - { E_POPUP_ITEM, "00.emc.02", N_("_Copy"), emft_drop_popup_copy, NULL, "stock_folder-copy", 2 }, - { E_POPUP_ITEM, "00.emc.03", N_("_Move"), emft_drop_popup_move, NULL, "stock_folder-move", 2 }, - { E_POPUP_BAR, "10.emc" }, -- { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "stock_cancel", 0 }, -+ { E_POPUP_ITEM, "99.emc.00", N_("Cancel _Drag"), emft_drop_popup_cancel, NULL, "dialog-cancel", 0 }, - }; - - static void -@@ -2114,16 +2114,16 @@ static EPopupItem emft_popup_items[] = { - - { E_POPUP_BAR, "20.emc" }, - /* FIXME: need to disable for nochildren folders */ -- { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS }, -+ { E_POPUP_ITEM, "20.emc.00", N_("_New Folder..."), emft_popup_new_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS }, - /* FIXME: need to disable for undeletable folders */ -- { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "stock_delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, -+ { E_POPUP_ITEM, "20.emc.01", N_("_Delete"), emft_popup_delete_folder, NULL, "edit-delete", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, - { E_POPUP_ITEM, "20.emc.02", N_("_Rename..."), emft_popup_rename_folder, NULL, NULL, 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_DELETE }, -- { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "stock_refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, -- { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "stock_mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, -+ { E_POPUP_ITEM, "20.emc.03", N_("Re_fresh"), emft_popup_refresh_folder, NULL, "view-refresh", EM_POPUP_FOLDER_NONSTATIC, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}, -+ { E_POPUP_ITEM, "20.emc.04", N_("Fl_ush Outbox"), emft_popup_flush_outbox, NULL, "mail-send", EM_POPUP_FOLDER_OUTBOX, 0 }, - - - { E_POPUP_BAR, "80.emc" }, -- { E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "stock_folder-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } -+ { E_POPUP_ITEM, "80.emc.00", N_("_Properties"), emft_popup_properties, NULL, "document-properties", 0, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT } - }; - static EPopupItem trash_popup_item = {E_POPUP_ITEM, "20.emc.03", N_("_Empty Trash"), emft_popup_empty_trash,NULL,NULL, 1, EM_POPUP_FOLDER_FOLDER|EM_POPUP_FOLDER_SELECT}; - -diff -up evolution-2.12.1/mail/message-list.c.icon-names evolution-2.12.1/mail/message-list.c ---- evolution-2.12.1/mail/message-list.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/message-list.c 2007-10-15 22:34:23.000000000 -0400 -@@ -217,9 +217,9 @@ static struct { - char *icon_name; - GdkPixbuf *pixbuf; - } states_pixmaps[] = { -- { "stock_mail-unread", NULL }, -- { "stock_mail-open", NULL }, -- { "stock_mail-replied", NULL }, -+ { "mail-unread", NULL }, -+ { "mail-read", NULL }, -+ { "mail-replied", NULL }, - { "stock_mail-unread-multiple", NULL }, - { "stock_mail-open-multiple", NULL }, - { NULL, NULL }, -diff -up evolution-2.12.1/mail/mail-mt.c.icon-names evolution-2.12.1/mail/mail-mt.c ---- evolution-2.12.1/mail/mail-mt.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/mail-mt.c 2007-10-15 22:34:23.000000000 -0400 -@@ -964,7 +964,7 @@ op_status_exec (struct _op_status_msg *m - data->activity_state = 1; - - if (progress_icon == NULL) -- progress_icon = e_icon_factory_get_icon ("stock_mail-unread", E_ICON_SIZE_MENU); -+ progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); - - MAIL_MT_UNLOCK (mail_msg_lock); - if (msg->info->desc) -diff -up evolution-2.12.1/mail/em-folder-view.c.icon-names evolution-2.12.1/mail/em-folder-view.c ---- evolution-2.12.1/mail/em-folder-view.c.icon-names 2007-10-15 22:34:21.000000000 -0400 -+++ evolution-2.12.1/mail/em-folder-view.c 2007-10-15 22:36:38.000000000 -0400 -@@ -1216,29 +1216,29 @@ EMFV_POPUP_AUTO_TYPE(filter_type_current - /* TODO: Move some of these to be 'standard' menu's */ - - static EPopupItem emfv_popup_items[] = { -- { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "stock_copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, -+ { E_POPUP_ITEM, "00.emfv.00", N_("_Copy"), emfv_popup_copy_text, NULL, "edit-copy", EM_FOLDER_VIEW_SELECT_DISPLAY|EM_FOLDER_VIEW_SELECT_SELECTION }, - - { E_POPUP_BAR, "10.emfv", NULL, NULL, NULL, NULL }, - -- { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "stock_mail-reply", EM_POPUP_SELECT_ONE }, -- { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_SELECT_ONE }, -- { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "stock_mail-forward", EM_POPUP_SELECT_MANY }, -+ { E_POPUP_ITEM, "10.emfv.00", N_("_Reply to Sender"), emfv_popup_reply_sender, NULL, "mail-reply-sender", EM_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "10.emfv.01", N_("Reply to _All"), emfv_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "10.emfv.02", N_("_Forward"), emfv_popup_forward, NULL, "mail-forward", EM_POPUP_SELECT_MANY }, - - { E_POPUP_BAR, "20.emfv", NULL, NULL, NULL, NULL }, - /* EM_POPUP_EDIT was used here. This is changed to EM_POPUP_SELECT_ONE as Edit-as-new-messaeg need not be restricted to Sent-Items folder alone */ - { E_POPUP_ITEM, "20.emfv.00", N_("_Edit as New Message..."), emfv_popup_edit, NULL, NULL, EM_POPUP_SELECT_ONE }, -- { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "stock_save-as", EM_POPUP_SELECT_MANY }, -- { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "stock_print", EM_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "20.emfv.01", N_("_Save As..."), emfv_popup_saveas, NULL, "document-save-as", EM_POPUP_SELECT_MANY }, -+ { E_POPUP_ITEM, "20.emfv.02", N_("_Print..."), emfv_popup_print, NULL, "document-print", EM_POPUP_SELECT_ONE }, - - { E_POPUP_BAR, "40.emfv", NULL, NULL, NULL, NULL }, -- { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "stock_delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, -+ { E_POPUP_ITEM, "40.emfv.00", N_("_Delete"), emfv_popup_delete, NULL, "edit-delete", EM_POPUP_SELECT_DELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.01", N_("U_ndelete"), emfv_popup_undelete, NULL, NULL, EM_POPUP_SELECT_UNDELETE|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.02", N_("_Move to Folder..."), emfv_popup_move, NULL, "stock_mail-move", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "40.emfv.03", N_("_Copy to Folder..."), emfv_popup_copy, NULL, "stock_mail-copy", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY }, - - { E_POPUP_BAR, "50.emfv", NULL, NULL, NULL, NULL }, -- { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "stock_mail-open", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, -- { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "stock_mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, -+ { E_POPUP_ITEM, "50.emfv.00", N_("Mar_k as Read"), emfv_popup_mark_read, NULL, "mail-read", EM_POPUP_SELECT_MARK_READ|EM_FOLDER_VIEW_SELECT_LISTONLY }, -+ { E_POPUP_ITEM, "50.emfv.01", N_("Mark as _Unread"), emfv_popup_mark_unread, NULL, "mail-unread", EM_POPUP_SELECT_MARK_UNREAD|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.02", N_("Mark as _Important"), emfv_popup_mark_important, NULL, "emblem-important", EM_POPUP_SELECT_MARK_IMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.03", N_("Mark as Un_important"), emfv_popup_mark_unimportant, NULL, NULL, EM_POPUP_SELECT_MARK_UNIMPORTANT|EM_FOLDER_VIEW_SELECT_LISTONLY }, - { E_POPUP_ITEM, "50.emfv.04", N_("Mark as _Junk"), emfv_popup_mark_junk, NULL, "mail-mark-junk", EM_POPUP_SELECT_MANY|EM_FOLDER_VIEW_SELECT_LISTONLY|EM_POPUP_SELECT_JUNK }, -@@ -1950,43 +1950,47 @@ static BonoboUIVerb emfv_message_verbs[] - BONOBO_UI_VERB_END - }; - static EPixmap emfv_message_pixmaps[] = { -- E_PIXMAP ("/commands/EditCut", "stock_cut", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/EditCopy", "stock_copy", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/EditPaste", "stock_paste", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/commands/PrintMessage", "stock_print", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/PrintPreviewMessage", "stock_print-preview", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageDelete", "gnome-fs-trash-empty", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageForward", "stock_mail-forward", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MailCompose", "mail-message-new", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageApplyFilters", "stock_mail-filters-apply", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageCopy", "stock_mail-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageDelete", "user-trash", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageFilterJunk", "mail-mark-junk", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageSearch", "stock_search", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageSaveAs", "stock_save-as", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageMarkAsRead", "stock_mail-open", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageMarkAsUnRead", "stock_mail-unread", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageForward", "mail-forward", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsImportant", "emblem-important", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MessageFollowUpFlag", "stock_mail-flag-for-followup", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/ViewLoadImages", "stock_insert_image", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/MailCompose", "stock_mail-compose", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "stock_mail-reply", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "stock_mail-reply-to-all", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "stock_mail-forward", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/commands/MessageMarkAsRead", "mail-read", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageMarkAsUnRead", "mail-unread", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageMove", "stock_mail-move", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageSaveAs", "document-save-as", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MessageSearch", "edit-find", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/PrintMessage", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/PrintPreviewMessage", "document-print-preview", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TextZoomIn", "zoom-in", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TextZoomOut", "zoom-out", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TextZoomReset", "zoom-original", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ViewLoadImages", "insert-image", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/menu/MessagePlaceholder/Message/MessageNavigation/GoTo", "go-jump", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "mail-reply-sender", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "mail-reply-all", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageForward", "mail-forward", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/PrintMessage", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMove", "stock_mail-move", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageCopy", "stock_mail-copy", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsJunk", "mail-mark-junk", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageMarkAsNotJunk", "mail-mark-notjunk", E_ICON_SIZE_LARGE_TOOLBAR), -- -- E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailNextButtons/MailNext", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MailNextButtons/MailPrevious", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -@@ -2604,7 +2608,7 @@ emp_uri_popup_link_copy(EPopup *ep, EPop - - static EPopupItem emfv_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.11", N_("C_all To..."), emp_uri_popup_link_copy, NULL, NULL, EM_POPUP_URI_CALLTO }, -- { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "gtk-copy", EM_POPUP_URI_NOT_MAILTO }, -+ { E_POPUP_ITEM, "00.uri.15", N_("_Copy Link Location"), emp_uri_popup_link_copy, NULL, "edit-copy", EM_POPUP_URI_NOT_MAILTO }, - - { E_POPUP_SUBMENU, "99.uri.00", N_("Create _Search Folder"), NULL, NULL, NULL, EM_POPUP_URI_MAILTO }, - { E_POPUP_ITEM, "99.uri.00/00.10", N_("_From this Address"), emp_uri_popup_vfolder_sender, NULL, NULL, EM_POPUP_URI_MAILTO }, -diff -up evolution-2.12.1/mail/em-popup.c.icon-names evolution-2.12.1/mail/em-popup.c ---- evolution-2.12.1/mail/em-popup.c.icon-names 2007-10-12 02:56:01.000000000 -0400 -+++ evolution-2.12.1/mail/em-popup.c 2007-10-15 22:34:23.000000000 -0400 -@@ -564,25 +564,25 @@ emp_part_popup_forward (EPopup *ep, EPop - } - - static EMPopupItem emp_standard_object_popups[] = { -- { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 }, -+ { E_POPUP_ITEM, "00.part.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 }, - { E_POPUP_ITEM, "00.part.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_PART_IMAGE }, - { E_POPUP_BAR, "10.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, -- { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_PART_MESSAGE }, -+ { E_POPUP_ITEM, "10.part.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_PART_MESSAGE }, - { E_POPUP_ITEM, "10.part.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_PART_MESSAGE}, -- { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_PART_MESSAGE}, -+ { E_POPUP_ITEM, "10.part.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_PART_MESSAGE}, - { E_POPUP_BAR, "20.part", NULL, NULL, NULL, NULL, EM_POPUP_PART_MESSAGE }, -- { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_PART_MESSAGE }, -+ { E_POPUP_ITEM, "20.part.00", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_PART_MESSAGE }, - }; - - static EMPopupItem emp_attachment_object_popups[] = { -- { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "stock_save-as", 0 }, -+ { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), emp_part_popup_saveas, NULL, "document-save-as", 0 }, - { E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), emp_part_popup_set_background, NULL, NULL, EM_POPUP_ATTACHMENTS_IMAGE }, - { E_POPUP_BAR, "05.attach", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE }, -- { E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "stock_mail-reply" , EM_POPUP_ATTACHMENTS_MESSAGE }, -+ { E_POPUP_ITEM, "05.attach.00", N_("_Reply to sender"), emp_part_popup_reply_sender, NULL, "mail-reply-sender" , EM_POPUP_ATTACHMENTS_MESSAGE }, - { E_POPUP_ITEM, "05.attach.01", N_("Reply to _List"), emp_part_popup_reply_list, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE}, -- { E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "stock_mail-reply-to-all", EM_POPUP_ATTACHMENTS_MESSAGE}, -+ { E_POPUP_ITEM, "05.attach.03", N_("Reply to _All"), emp_part_popup_reply_all, NULL, "mail-reply-all", EM_POPUP_ATTACHMENTS_MESSAGE}, - { E_POPUP_BAR, "05.attach.10", NULL, NULL, NULL, NULL, EM_POPUP_ATTACHMENTS_MESSAGE }, -- { E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "stock_mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE }, -+ { E_POPUP_ITEM, "05.attach.15", N_("_Forward"), emp_part_popup_forward, NULL, "mail-forward", EM_POPUP_ATTACHMENTS_MESSAGE }, - }; - - static const EPopupItem emp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" }; -@@ -631,8 +631,8 @@ emp_uri_popup_address_add(EPopup *ep, EP - - static EPopupItem emp_standard_uri_popups[] = { - { E_POPUP_ITEM, "00.uri.00", N_("_Open Link in Browser"), emp_uri_popup_link_open, NULL, NULL, EM_POPUP_URI_HTTP }, -- { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "stock_mail-compose", EM_POPUP_URI_MAILTO }, -- { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "gtk-add", EM_POPUP_URI_MAILTO }, -+ { E_POPUP_ITEM, "00.uri.10", N_("_Send New Message To..."), emp_uri_popup_address_send, NULL, "mail-message-new", EM_POPUP_URI_MAILTO }, -+ { E_POPUP_ITEM, "00.uri.20", N_("_Add to Address Book"), emp_uri_popup_address_add, NULL, "contact-new", EM_POPUP_URI_MAILTO }, - }; - - /* ********************************************************************** */ -diff -up evolution-2.12.1/mail/mail-send-recv.c.icon-names evolution-2.12.1/mail/mail-send-recv.c ---- evolution-2.12.1/mail/mail-send-recv.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/mail/mail-send-recv.c 2007-10-15 22:34:23.000000000 -0400 -@@ -399,7 +399,7 @@ build_dialog (EAccountList *accounts, Ca - gtk_widget_show (cancel_button); - gtk_dialog_add_action_widget (gd, cancel_button, GTK_RESPONSE_CANCEL); - -- icon_list = e_icon_factory_get_icon_list ("stock_mail-send-receive"); -+ icon_list = e_icon_factory_get_icon_list ("mail-send-receive"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (gd), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -@@ -560,7 +560,7 @@ build_dialog (EAccountList *accounts, Ca - info->timeout_id = g_timeout_add (STATUS_TIMEOUT, operation_status_timeout, info); - - send_icon = e_icon_factory_get_image ( -- "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR); -+ "mail-send", E_ICON_SIZE_LARGE_TOOLBAR); - pretty_url = format_url (destination, NULL); - label = gtk_label_new (NULL); - gtk_label_set_ellipsize ( -diff -up evolution-2.12.1/mail/mail-component.c.icon-names evolution-2.12.1/mail/mail-component.c ---- evolution-2.12.1/mail/mail-component.c.icon-names 2007-10-15 22:34:21.000000000 -0400 -+++ evolution-2.12.1/mail/mail-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -878,7 +878,7 @@ impl__get_userCreatableItems (PortableSe - list->_buffer[0].menuDescription = _("_Mail Message"); - list->_buffer[0].tooltip = _("Compose a new mail message"); - list->_buffer[0].menuShortcut = 'm'; -- list->_buffer[0].iconName = "stock_mail-compose"; -+ list->_buffer[0].iconName = "mail-message-new"; - list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - - list->_buffer[1].id = "folder"; -@@ -886,7 +886,7 @@ impl__get_userCreatableItems (PortableSe - list->_buffer[1].menuDescription = _("Mail _Folder"); - list->_buffer[1].tooltip = _("Create a new mail folder"); - list->_buffer[1].menuShortcut = '\0'; -- list->_buffer[1].iconName = "stock_new-dir"; -+ list->_buffer[1].iconName = "folder-new"; - list->_buffer[1].type = GNOME_Evolution_CREATABLE_FOLDER; - - return list; -diff -up evolution-2.12.1/plugins/exchange-operations/exchange-folder.c.icon-names evolution-2.12.1/plugins/exchange-operations/exchange-folder.c ---- evolution-2.12.1/plugins/exchange-operations/exchange-folder.c.icon-names 2007-10-15 22:34:21.000000000 -0400 -+++ evolution-2.12.1/plugins/exchange-operations/exchange-folder.c 2007-10-15 22:34:23.000000000 -0400 -@@ -63,7 +63,7 @@ static void exchange_get_folder (char *u - - - static EPopupItem popup_inbox_items[] = { -- { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+ { E_POPUP_ITEM, "29.inbox_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_inbox_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - void -@@ -232,7 +232,7 @@ org_gnome_exchange_check_inbox_subscribe - } - - static EPopupItem popup_items[] = { -- { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+ { E_POPUP_ITEM, "29.calendar_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - void -@@ -242,7 +242,7 @@ popup_free (EPopup *ep, GSList *items, v - } - - static EPopupItem popup_ab_items[] = { -- { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+ { E_POPUP_ITEM, "29.address_book_unsubscribe", N_("Unsubscribe Folder..."), org_gnome_exchange_folder_ab_unsubscribe, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - void -diff -up evolution-2.12.1/plugins/exchange-operations/exchange-folder-permission.c.icon-names evolution-2.12.1/plugins/exchange-operations/exchange-folder-permission.c ---- evolution-2.12.1/plugins/exchange-operations/exchange-folder-permission.c.icon-names 2007-10-12 02:55:27.000000000 -0400 -+++ evolution-2.12.1/plugins/exchange-operations/exchange-folder-permission.c 2007-10-15 22:34:23.000000000 -0400 -@@ -58,7 +58,7 @@ void org_gnome_exchange_menu_cal_permiss - gchar *selected_exchange_folder_uri = NULL; - - static EPopupItem popup_items[] = { -- { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+ { E_POPUP_ITEM, "30.emc.10", N_("Permissions..."), org_folder_permissions_cb, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - static void -diff -up evolution-2.12.1/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names evolution-2.12.1/plugins/save-calendar/org-gnome-save-calendar.eplug.xml ---- evolution-2.12.1/plugins/save-calendar/org-gnome-save-calendar.eplug.xml.icon-names 2007-10-12 02:55:29.000000000 -0400 -+++ evolution-2.12.1/plugins/save-calendar/org-gnome-save-calendar.eplug.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -8,10 +8,10 @@ - - - -- -+ - - -- -+ - - - -diff -up evolution-2.12.1/plugins/groupwise-features/share-folder-common.c.icon-names evolution-2.12.1/plugins/groupwise-features/share-folder-common.c ---- evolution-2.12.1/plugins/groupwise-features/share-folder-common.c.icon-names 2007-10-15 22:34:21.000000000 -0400 -+++ evolution-2.12.1/plugins/groupwise-features/share-folder-common.c 2007-10-15 22:34:23.000000000 -0400 -@@ -333,7 +333,7 @@ new_folder_response (EMFolderSelector *e - } - - static EPopupItem popup_items[] = { --{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "stock_new-dir", 0, EM_POPUP_FOLDER_INFERIORS } -+{ E_POPUP_ITEM, "20.emc.001", N_("New _Shared Folder..."), create_shared_folder, NULL, "folder-new", 0, EM_POPUP_FOLDER_INFERIORS } - }; - - static void -diff -up evolution-2.12.1/addressbook/gui/component/addressbook-component.c.icon-names evolution-2.12.1/addressbook/gui/component/addressbook-component.c ---- evolution-2.12.1/addressbook/gui/component/addressbook-component.c.icon-names 2007-10-12 02:39:01.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/component/addressbook-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -229,7 +229,7 @@ impl__get_userCreatableItems (PortableSe - list->_buffer[0].menuDescription = _("_Contact"); - list->_buffer[0].tooltip = _("Create a new contact"); - list->_buffer[0].menuShortcut = 'c'; -- list->_buffer[0].iconName = "stock_contact"; -+ list->_buffer[0].iconName = "contact-new"; - list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - - list->_buffer[1].id = "contact_list"; -diff -up evolution-2.12.1/addressbook/gui/component/addressbook-view.c.icon-names evolution-2.12.1/addressbook/gui/component/addressbook-view.c ---- evolution-2.12.1/addressbook/gui/component/addressbook-view.c.icon-names 2007-10-12 02:39:01.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/component/addressbook-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -71,7 +71,7 @@ - static GObjectClass *parent_class = NULL; - - /* This is used for the addressbook status bar */ --#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "stock_contact" -+#define EVOLUTION_CONTACTS_PROGRESS_IMAGE "contact-new" - static GdkPixbuf *progress_icon = NULL; - - #define d(x) -@@ -614,26 +614,24 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps [] = { -- E_PIXMAP ("/menu/File/FileOps/ContactsSaveAsVCard", "stock_save-as", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/File/Print/ContactsPrint", "stock_print", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/File/Print/ContactsPrintPreview", "stock_print-preview", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCut", "stock_cut", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsCopy", "stock_copy", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactsPaste", "stock_paste", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/EditPlaceholder/Edit/ContactDelete", "stock_delete", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendContactToOther", "stock_mail-forward", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/ActionsPlaceholder/Actions/ContactsSendMessageToContact", "stock_mail-send", E_ICON_SIZE_MENU), -- -- E_PIXMAP ("/Toolbar/ContactsPrint", "stock_print", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/ContactDelete", "stock_delete", E_ICON_SIZE_LARGE_TOOLBAR), -- -- E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderCopy", "stock_folder-copy", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/FolderPlaceholder/Folder/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/FolderPlaceholder/Folder/FolderSave", "stock_save-as", E_ICON_SIZE_MENU), -- -+ E_PIXMAP ("/commands/ChangeFolderProperties", "stock_folder-properties", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactDelete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsPrint", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsSaveAsVCard", "document-save-as", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsSendContactToOther", "mail-forward", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ContactsSendMessageToContact", "mail-send", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FolderCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FolderDelete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FolderMove", "stock_folder-move", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FolderSave", "document-save-as", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/ContactsPrint", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/ContactDelete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), -+ - E_PIXMAP_END - }; - -@@ -953,10 +951,10 @@ primary_source_selection_changed_callbac - } - - static EPopupItem abv_source_popups[] = { -- { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "stock_contact", 0, 0 }, -- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "stock_delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "10.new", N_("_New Address Book"), new_addressbook_cb, NULL, "contact-new", 0, 0 }, -+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_addressbook_cb, NULL, "edit-delete", 0, EAB_POPUP_SOURCE_USER|EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "40.bar"}, -- { E_POPUP_ITEM, "40.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"stock_save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "40.saveasvcard", N_("Save As Vcard..."), save_addressbook_cb, NULL,"document-save-as", 0, EAB_POPUP_SOURCE_PRIMARY }, - { E_POPUP_BAR, "30.bar"}, - { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_addressbook_cb, NULL,"stock_folder-properties", 0, EAB_POPUP_SOURCE_PRIMARY }, - }; -@@ -1334,7 +1332,7 @@ addressbook_view_init (AddressbookView * - e_activity_handler_attach_task_bar (priv->activity_handler, - E_TASK_BAR (priv->statusbar_widget)); - -- priv->info_widget = e_info_label_new("stock_contact"); -+ priv->info_widget = e_info_label_new("contact-new"); - e_info_label_set_info((EInfoLabel*)priv->info_widget, _("Contacts"), ""); - gtk_widget_show (priv->info_widget); - -diff -up evolution-2.12.1/addressbook/gui/widgets/e-addressbook-view.c.icon-names evolution-2.12.1/addressbook/gui/widgets/e-addressbook-view.c ---- evolution-2.12.1/addressbook/gui/widgets/e-addressbook-view.c.icon-names 2007-10-12 02:39:06.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/widgets/e-addressbook-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -958,27 +958,27 @@ new_list (EPopup *ep, EPopupItem *pitem, - static EPopupItem eabv_popup_items[] = { - { E_POPUP_ITEM, "05.open", N_("_Open"), open_contact, NULL, NULL, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, - { E_POPUP_BAR, "10.bar" }, -- { E_POPUP_ITEM, "10.new", N_("_New Contact..."), new_card, NULL, "stock_contact", 0, EAB_POPUP_SELECT_EDITABLE}, -+ { E_POPUP_ITEM, "10.new", N_("_New Contact..."), new_card, NULL, "contact-new", 0, EAB_POPUP_SELECT_EDITABLE}, - { E_POPUP_ITEM, "15.newlist", N_("New Contact _List..."), new_list, NULL, "stock_contact-list", 0, EAB_POPUP_SELECT_EDITABLE }, - - { E_POPUP_BAR, "20.bar" }, -- { E_POPUP_ITEM, "30.saveas", N_("_Save as VCard..."), save_as, NULL, "stock_save-as", 0, EAB_POPUP_SELECT_ANY }, -- { E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_ONE }, -- { E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "stock_mail-forward", EAB_POPUP_SELECT_MANY }, -- { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT }, -- { E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST }, -- { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "stock_mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL }, -- { E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "stock_print", 0, EAB_POPUP_SELECT_ANY }, -+ { E_POPUP_ITEM, "30.saveas", N_("_Save as VCard..."), save_as, NULL, "document-save-as", 0, EAB_POPUP_SELECT_ANY }, -+ { E_POPUP_ITEM, "40.forward", N_("_Forward Contact"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "40.forward", N_("_Forward Contacts"), send_as, NULL, "mail-forward", EAB_POPUP_SELECT_MANY }, -+ { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contact"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_CONTACT }, -+ { E_POPUP_ITEM, "50.mailto", N_("Send _Message to List"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_ONE|EAB_POPUP_SELECT_EMAIL|EAB_POPUP_LIST }, -+ { E_POPUP_ITEM, "50.mailto", N_("Send _Message to Contacts"), send_to, NULL, "mail-send", EAB_POPUP_SELECT_MANY|EAB_POPUP_SELECT_EMAIL }, -+ { E_POPUP_ITEM, "60.print", N_("_Print"), print, NULL, "document-print", 0, EAB_POPUP_SELECT_ANY }, - - { E_POPUP_BAR, "70.bar" }, - { E_POPUP_ITEM, "80.copyto", N_("Cop_y to Address Book..."), copy_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY }, - { E_POPUP_ITEM, "90.moveto", N_("Mo_ve to Address Book..."), move_to_folder, NULL, NULL, 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, - - { E_POPUP_BAR, "a0.bar" }, -- { E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "stock_cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, -- { E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "stock_copy", 0, EAB_POPUP_SELECT_ANY }, -- { E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "stock_paste", 0, EAB_POPUP_SELECT_EDITABLE }, -- { E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "stock_delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY }, -+ { E_POPUP_ITEM, "b0.cut", N_("Cu_t"), cut, NULL, "edit-cut", 0, EAB_POPUP_SELECT_ANY|EAB_POPUP_SELECT_EDITABLE }, -+ { E_POPUP_ITEM, "c0.copy", N_("_Copy"), copy, NULL, "edit-copy", 0, EAB_POPUP_SELECT_ANY }, -+ { E_POPUP_ITEM, "d0.paste", N_("P_aste"), paste, NULL, "edit-paste", 0, EAB_POPUP_SELECT_EDITABLE }, -+ { E_POPUP_ITEM, "e0.delete", N_("_Delete"), delete, NULL, "edit-delete", 0, EAB_POPUP_SELECT_EDITABLE|EAB_POPUP_SELECT_ANY }, - }; - - static void -diff -up evolution-2.12.1/addressbook/gui/widgets/eab-contact-display.c.icon-names evolution-2.12.1/addressbook/gui/widgets/eab-contact-display.c ---- evolution-2.12.1/addressbook/gui/widgets/eab-contact-display.c.icon-names 2007-10-12 02:39:06.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/widgets/eab-contact-display.c 2007-10-15 22:34:23.000000000 -0400 -@@ -170,9 +170,9 @@ eab_selection_clear_event(GtkWidget *wid - - static EPopupItem eab_uri_popups[] = { - { E_POPUP_ITEM, "05.open", N_("_Open Link in Browser"), eab_uri_popup_link_open, NULL, NULL, EAB_POPUP_URI_NOT_MAILTO }, -- { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "gtk-copy", EAB_POPUP_URI_NOT_MAILTO }, -- { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "stock_mail-compose", EAB_POPUP_URI_MAILTO}, -- { E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "gtk-copy", EAB_POPUP_URI_MAILTO}, -+ { E_POPUP_ITEM, "10.copy", N_("_Copy Link Location"), eab_uri_popup_link_copy, NULL, "edit-copy", EAB_POPUP_URI_NOT_MAILTO }, -+ { E_POPUP_ITEM, "15.send", N_("_Send New Message To..."), eab_uri_popup_address_send, NULL, "mail-message-new", EAB_POPUP_URI_MAILTO}, -+ { E_POPUP_ITEM, "20.copy", N_("Copy _Email Address"), eab_uri_popup_email_address_copy, NULL, "edit-copy", EAB_POPUP_URI_MAILTO}, - }; - - -diff -up evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c ---- evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c.icon-names 2007-10-12 02:38:53.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-fullname.c 2007-10-15 22:34:23.000000000 -0400 -@@ -140,7 +140,7 @@ e_contact_editor_fullname_init (EContact - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_fullname)->vbox), widget, TRUE, TRUE, 0); - g_object_unref(widget); - -- icon_list = e_icon_factory_get_icon_list ("stock_contact"); -+ icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_fullname), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-address.c ---- evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-address.c.icon-names 2007-10-12 02:38:53.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-address.c 2007-10-15 22:34:23.000000000 -0400 -@@ -455,7 +455,7 @@ e_contact_editor_address_init (EContactE - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (e_contact_editor_address)->vbox), widget, TRUE, TRUE, 0); - g_object_unref(widget); - -- icon_list = e_icon_factory_get_icon_list ("stock_contact"); -+ icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_address), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-im.c ---- evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-im.c.icon-names 2007-10-12 02:38:53.000000000 -0400 -+++ evolution-2.12.1/addressbook/gui/contact-editor/e-contact-editor-im.c 2007-10-15 22:34:23.000000000 -0400 -@@ -289,7 +289,7 @@ e_contact_editor_im_init (EContactEditor - gtk_widget_grab_focus(glade_xml_get_widget(gui, "entry-username")); - - /* set the icon */ -- icon_list = e_icon_factory_get_icon_list ("stock_contact"); -+ icon_list = e_icon_factory_get_icon_list ("contact-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (e_contact_editor_im), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/ui/evolution.xml.icon-names evolution-2.12.1/ui/evolution.xml ---- evolution-2.12.1/ui/evolution.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -7,10 +7,10 @@ - - - -+ accel="*Control*w"/> - - -+ accel="*Control*q"/> - - -@@ -67,7 +67,8 @@ - - - -- -+ - - - -@@ -98,9 +99,11 @@ - pixtype="pixbuf"/> - - -+ _label="_Close Window" -+ pixtype="pixbuf"/> - -- -+ - - - -diff -up evolution-2.12.1/ui/evolution-event-editor.xml.icon-names evolution-2.12.1/ui/evolution-event-editor.xml ---- evolution-2.12.1/ui/evolution-event-editor.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-event-editor.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -45,13 +45,15 @@ - _tip="Make this a recurring event" pixtype="pixbuf"/> - - -+ _tip="Query free / busy information for the attendees" -+ pixtype="pixbuf"/> - - - - -+ _tip="Click here to set or unset alarms for this event" -+ pixtype="pixbuf"/> - - - -@@ -71,7 +73,7 @@ - - - -- -+ - - - -@@ -79,8 +81,8 @@ - - - -- -- -+ -+ - - - -diff -up evolution-2.12.1/ui/evolution-memos.xml.icon-names evolution-2.12.1/ui/evolution-memos.xml ---- evolution-2.12.1/ui/evolution-memos.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-memos.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,15 +1,15 @@ - - - -- -- -+ - -- -- -- -+ -+ -+ - -+ pixtype="pixbuf"/> - - - -@@ -41,15 +41,15 @@ - - - -- -- -- -+ -+ -+ - - - -- -+ - -- -+ - - - -diff -up evolution-2.12.1/ui/evolution-composer-entries.xml.icon-names evolution-2.12.1/ui/evolution-composer-entries.xml ---- evolution-2.12.1/ui/evolution-composer-entries.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-composer-entries.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -3,15 +3,15 @@ - - -+ accel="*Control*x" pixtype="pixbuf"/> - - -+ accel="*Control*c" pixtype="pixbuf"/> - - -+ accel="*Control*v" pixtype="pixbuf"/> - - - - -- -\ No newline at end of file -+ -diff -up evolution-2.12.1/ui/evolution-mail-list.xml.icon-names evolution-2.12.1/ui/evolution-mail-list.xml ---- evolution-2.12.1/ui/evolution-mail-list.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-mail-list.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -4,15 +4,15 @@ - - -+ accel="*Control*x" pixtype="pixbuf"/> - - -+ accel="*Control*c" pixtype="pixbuf"/> - - -+ accel="*Control*v" pixtype="pixbuf"/> - - - -- -- -+ -+ - - - -diff -up evolution-2.12.1/ui/evolution-subscribe.xml.icon-names evolution-2.12.1/ui/evolution-subscribe.xml ---- evolution-2.12.1/ui/evolution-subscribe.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-subscribe.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -3,7 +3,7 @@ - - - -+ pixtype="pixbuf" _label="_Close" accel="*Control*w"/> - - - -diff -up evolution-2.12.1/ui/evolution-tasks.xml.icon-names evolution-2.12.1/ui/evolution-tasks.xml ---- evolution-2.12.1/ui/evolution-tasks.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-tasks.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,20 +1,20 @@ - - - -- -- -+ - -- -- -- -+ -+ -+ - -+ pixtype="pixbuf"/> - - - - -- -+ - - - -@@ -59,22 +59,22 @@ - - - -- -+ - - - - - - -- -- -- -+ -+ -+ - - - -- -+ - -- -+ - - - -diff -up evolution-2.12.1/ui/evolution-addressbook.xml.icon-names evolution-2.12.1/ui/evolution-addressbook.xml ---- evolution-2.12.1/ui/evolution-addressbook.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-addressbook.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,18 +1,17 @@ - - -+ - -+ accel="*Control*d" pixtype="pixbuf"/> - - -+ accel="*Control*p" pixtype="pixbuf"/> - - -+ pixtype="pixbuf"/> - - - -- -+ - - -+ accel="*Control*c" pixtype="pixbuf"/> - - -+ accel="*Control*v" pixtype="pixbuf"/> - - -+ accel="*Control*s" pixtype="pixbuf"/> - - -+ _tip="Send selected contacts to another person." -+ pixtype="pixbuf"/> - - -+ _tip="Send a message to the selected contacts." -+ pixtype="pixbuf"/> - - -+ - -+ - -+ pixtype="pixbuf"/> -+ - -+ - -+ - - - -@@ -98,14 +101,12 @@ - - -+ verb="" _label="S_ave Address Book As VCard"/> - - - -- -- -+ -+ - - - -@@ -130,7 +131,7 @@ - - - -- -+ - - - -@@ -140,10 +141,10 @@ - - - -+ _label="_Forward Contact..." verb=""/> - - -+ _label="_Send Message to Contact..." verb=""/> - - - -@@ -153,13 +154,13 @@ - - - -- -+ - -- -+ - - - -- -+ - - - -@@ -168,10 +169,10 @@ - - - -+ _label="Print" pixtype="pixbuf"/> - - -+ _label="Delete" pixtype="pixbuf"/> - - -diff -up evolution-2.12.1/ui/evolution-editor.xml.icon-names evolution-2.12.1/ui/evolution-editor.xml ---- evolution-2.12.1/ui/evolution-editor.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-editor.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,15 +1,15 @@ - - -- -- -+ -+ - -- -- -- -+ -+ -+ - - - -- -+ - - - -@@ -39,7 +39,7 @@ - - - -- -+ - - - -@@ -53,8 +53,8 @@ - - - -- -- -+ -+ - - - -diff -up evolution-2.12.1/ui/evolution-mail-message.xml.icon-names evolution-2.12.1/ui/evolution-mail-message.xml ---- evolution-2.12.1/ui/evolution-mail-message.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-mail-message.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -11,15 +11,15 @@ - - -+ accel="*Control*x" pixtype="pixbuf"/> - - -+ accel="*Control*c" pixtype="pixbuf"/> - - -+ accel="*Control*v" pixtype="pixbuf"/> - - -+ accel="*Control*o"/> - - -@@ -157,12 +156,12 @@ - -+ pixtype="pixbuf"/> - - -+ pixtype="pixbuf"/> - - -+ pixtype="pixbuf"/> - - -+ pixtype="pixbuf"/> - - -+ _tip="Set up the page settings for your current printer"/> - - -+ accel="*Control*plus" pixtype="pixbuf"/> - - -+ accel="*Control*minus" pixtype="pixbuf"/> - - -+ accel="*Control*0" pixtype="pixbuf"/> - - - -@@ -287,13 +285,9 @@ - - - -- -- -- -- -+ -+ -+ - - - -@@ -318,7 +312,7 @@ - - - -- -+ - - - -@@ -370,7 +364,7 @@ - - - -- -+ - - - -@@ -416,7 +410,7 @@ - - -+ pixtype="pixbuf"/> - - - - -- -+ - - - -diff -up evolution-2.12.1/ui/evolution-message-composer.xml.icon-names evolution-2.12.1/ui/evolution-message-composer.xml ---- evolution-2.12.1/ui/evolution-message-composer.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-message-composer.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -2,22 +2,22 @@ - - - - -@@ -101,8 +100,8 @@ - - - -- -- -+ -+ - - - -@@ -134,7 +133,7 @@ - - - -+ _label="_Attachment..."/> - - - -diff -up evolution-2.12.1/ui/evolution-calendar.xml.icon-names evolution-2.12.1/ui/evolution-calendar.xml ---- evolution-2.12.1/ui/evolution-calendar.xml.icon-names 2007-10-12 03:04:30.000000000 -0400 -+++ evolution-2.12.1/ui/evolution-calendar.xml 2007-10-15 22:34:23.000000000 -0400 -@@ -1,14 +1,14 @@ - - - -- -- -+ - - - - -- -+ - - - -@@ -16,13 +16,13 @@ - - - -- -- -- -- -- -- -- -+ -+ -+ -+ -+ -+ -+ - - - -@@ -75,8 +75,8 @@ - - - -- -- -+ -+ - - - -@@ -86,7 +86,7 @@ - - - -- -+ - - - -diff -up evolution-2.12.1/composer/e-msg-composer.c.icon-names evolution-2.12.1/composer/e-msg-composer.c ---- evolution-2.12.1/composer/e-msg-composer.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/composer/e-msg-composer.c 2007-10-15 22:34:23.000000000 -0400 -@@ -2208,14 +2208,17 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixcache [] = { -- E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) , -+ E_PIXMAP ("/commands/DeleteAll", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileAttach", "mail-attachment", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileOpen", "document-open", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileSaveAs", "document-save-as", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileSend", "mail-send", E_ICON_SIZE_MENU), - --/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */ -- E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/Toolbar/FileSend", "mail-send", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/FileSaveDraft", "document-save", E_ICON_SIZE_LARGE_TOOLBAR) , -+ E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -@@ -3614,7 +3617,7 @@ composer_entry_focus_in_event_cb (GtkWid - xmlfile, - "evolution-composer-entries", NULL); - g_free (xmlfile); -- -+ - bonobo_ui_component_thaw (p->entry_uic, NULL); - - return FALSE; -@@ -3879,7 +3882,7 @@ create_composer (int visible_mask) - G_CALLBACK (msg_composer_destroy_notify), - NULL); - -- icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); -+ icon_list = e_icon_factory_get_icon_list ("mail-message-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (composer), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/composer/e-msg-composer-select-file.c.icon-names evolution-2.12.1/composer/e-msg-composer-select-file.c ---- evolution-2.12.1/composer/e-msg-composer-select-file.c.icon-names 2007-10-12 02:56:12.000000000 -0400 -+++ evolution-2.12.1/composer/e-msg-composer-select-file.c 2007-10-15 22:34:23.000000000 -0400 -@@ -126,7 +126,7 @@ get_selector(struct _EMsgComposer *compo - gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:composer"); - gtk_window_set_modal ((GtkWindow *) selection, FALSE); - -- icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); -+ icon_list = e_icon_factory_get_icon_list ("mail-message-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/shell/e-shell-window-commands.c.icon-names evolution-2.12.1/shell/e-shell-window-commands.c ---- evolution-2.12.1/shell/e-shell-window-commands.c.icon-names 2007-10-12 02:39:26.000000000 -0400 -+++ evolution-2.12.1/shell/e-shell-window-commands.c 2007-10-15 22:34:23.000000000 -0400 -@@ -844,12 +844,14 @@ static BonoboUIVerb help_verbs [] = { - }; - - static EPixmap pixmaps [] = { -- E_PIXMAP ("/commands/SendReceive", "stock_mail-send-receive", E_ICON_SIZE_MENU), -- E_PIXMAP ("/Toolbar/SendReceive", "stock_mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/File/OpenNewWindow", "stock_new-window", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/Toolbar/SendReceive", "mail-send-receive", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/menu/File/OpenNewWindow", "window-new", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/menu/File/SendReceive", "mail-send-receive", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/FileImporter", "stock_mail-import", E_ICON_SIZE_MENU), - E_PIXMAP ("/menu/File/ToggleOffline", "stock_disconnect", E_ICON_SIZE_MENU), -- E_PIXMAP ("/menu/Edit/Settings", "gnome-settings", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/menu/File/FileClose", "window-close", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/menu/File/FileExit", "application-exit", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/menu/Edit/Settings", "preferences-desktop", E_ICON_SIZE_MENU), - - E_PIXMAP_END - }; -diff -up evolution-2.12.1/calendar/gui/e-memo-table.c.icon-names evolution-2.12.1/calendar/gui/e-memo-table.c ---- evolution-2.12.1/calendar/gui/e-memo-table.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-memo-table.c 2007-10-15 22:34:23.000000000 -0400 -@@ -985,7 +985,7 @@ static EPopupItem memos_popup_items [] = - - { E_POPUP_BAR, "70.bar" }, - -- { E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "80.forward", N_("_Forward as iCalendar"), e_memo_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE }, - - { E_POPUP_BAR, "90.bar" }, - -diff -up evolution-2.12.1/calendar/gui/memos-component.c.icon-names evolution-2.12.1/calendar/gui/memos-component.c ---- evolution-2.12.1/calendar/gui/memos-component.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/memos-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -462,9 +462,9 @@ edit_memo_list_cb (EPopup *ep, EPopupIte - - static EPopupItem emc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Memo List"), new_memo_list_cb, NULL, "stock_notes", 0, 0 }, -- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_memo_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_memo_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_memo_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - }; - - static void -diff -up evolution-2.12.1/calendar/gui/dialogs/event-editor.c.icon-names evolution-2.12.1/calendar/gui/dialogs/event-editor.c ---- evolution-2.12.1/calendar/gui/dialogs/event-editor.c.icon-names 2007-10-12 03:04:06.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/dialogs/event-editor.c 2007-10-15 22:34:23.000000000 -0400 -@@ -428,18 +428,19 @@ static EPixmap pixmaps[] = { - * icons is filled in at run-time in event_editor_init() are - * updated, too. - */ -+ E_PIXMAP ("/commands/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU), -+ - E_PIXMAP ("/Toolbar/ActionAlarm", "stock_alarm", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Options/ActionAlarm", "stock_alarm", E_ICON_SIZE_MENU), - E_PIXMAP ("/Toolbar/ActionAllDayEvent", "stock_new-24h-appointment", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Options/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_MENU), -- E_PIXMAP ("/commands/ActionRecurrence", "stock_task-recurring", E_ICON_SIZE_LARGE_TOOLBAR), -+ - /* These two will have an absolute path to the png file filled - * in at run-time, see event_editor_init(). - */ - E_PIXMAP ("/Toolbar/ActionFreeBusy", NULL, E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Options/ActionFreeBusy", NULL, E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ActionFreeBusy", NULL, E_ICON_SIZE_MENU), - E_PIXMAP_END - }; - -@@ -561,12 +562,12 @@ event_editor_init (EventEditor *ee) - editor->uic, "ActionFreeBusy", - menu_action_freebusy_cb, editor); - -- /* NOTE: Make sure the 7 and 8 below correspond to the correct -+ /* NOTE: Make sure the 6 and 7 below correspond to the correct - * elements in the pixmaps array. - */ -- if (!pixmaps[7].name) { -+ if (!pixmaps[6].name) { -+ pixmaps[6].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); - pixmaps[7].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); -- pixmaps[8].name = g_build_filename (EVOLUTION_ICONSDIR, "query-free-busy.png", NULL); - } - e_pixmaps_update (editor->uic, pixmaps); - -diff -up evolution-2.12.1/calendar/gui/dialogs/task-editor.c.icon-names evolution-2.12.1/calendar/gui/dialogs/task-editor.c ---- evolution-2.12.1/calendar/gui/dialogs/task-editor.c.icon-names 2007-10-12 03:04:06.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/dialogs/task-editor.c 2007-10-15 22:34:23.000000000 -0400 -@@ -294,9 +294,11 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps[] = { -+ E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/ViewTimeZone", "stock_timezone", E_ICON_SIZE_MENU), -+ - E_PIXMAP ("/Toolbar/ViewTimeZone", "stock_timezone", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/commands/OptionStatus", "stock_view-details", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -diff -up evolution-2.12.1/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names evolution-2.12.1/calendar/gui/dialogs/cal-attachment-select-file.c ---- evolution-2.12.1/calendar/gui/dialogs/cal-attachment-select-file.c.icon-names 2007-10-12 03:04:06.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/dialogs/cal-attachment-select-file.c 2007-10-15 22:34:23.000000000 -0400 -@@ -123,7 +123,7 @@ run_selector(CompEditor *editor, const c - gtk_window_set_wmclass ((GtkWindow *) selection, "fileselection", "Evolution:editor"); - gtk_window_set_modal ((GtkWindow *) selection, TRUE); - -- icon_list = e_icon_factory_get_icon_list ("stock_mail-compose"); -+ icon_list = e_icon_factory_get_icon_list ("mail-message-new"); - if (icon_list) { - gtk_window_set_icon_list (GTK_WINDOW (selection), icon_list); - g_list_foreach (icon_list, (GFunc) g_object_unref, NULL); -diff -up evolution-2.12.1/calendar/gui/dialogs/comp-editor.c.icon-names evolution-2.12.1/calendar/gui/dialogs/comp-editor.c ---- evolution-2.12.1/calendar/gui/dialogs/comp-editor.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/dialogs/comp-editor.c 2007-10-15 22:34:23.000000000 -0400 -@@ -1486,8 +1486,17 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps[] = { -+ E_PIXMAP ("/commands/FileSave", "document-save", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/FileClose", "window-close", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/EditPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Help", "help-contents", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/FileSave", "document-save", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/FileClose", "window-close", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), - - E_PIXMAP_END - }; -@@ -2257,7 +2266,7 @@ make_icon_from_comp (ECalComponent *comp - type = e_cal_component_get_vtype (comp); - switch (type) { - case E_CAL_COMPONENT_EVENT: -- return "stock_new-appointment"; -+ return "appointment-new"; - case E_CAL_COMPONENT_TODO: - return "stock_task"; - case E_CAL_COMPONENT_JOURNAL: -diff -up evolution-2.12.1/calendar/gui/calendar-component.c.icon-names evolution-2.12.1/calendar/gui/calendar-component.c ---- evolution-2.12.1/calendar/gui/calendar-component.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/calendar-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -603,9 +603,9 @@ edit_calendar_cb (EPopup *ep, EPopupItem - - static EPopupItem ecc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Calendar"), new_calendar_cb, NULL, "stock_calendar", 0, 0 }, -- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "stock_delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, -- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_calendar_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_calendar_cb, NULL, "edit-delete", 0,E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY|E_CAL_POPUP_SOURCE_DELETE }, -+ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_calendar_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - }; - - static void -@@ -1582,7 +1582,7 @@ impl__get_userCreatableItems (PortableSe - list->_buffer[0].menuDescription = _("_Appointment"); - list->_buffer[0].tooltip = _("Create a new appointment"); - list->_buffer[0].menuShortcut = 'a'; -- list->_buffer[0].iconName = "stock_new-appointment"; -+ list->_buffer[0].iconName = "appointment-new"; - list->_buffer[0].type = GNOME_Evolution_CREATABLE_OBJECT; - - list->_buffer[1].id = CREATE_MEETING_ID; -diff -up evolution-2.12.1/calendar/gui/tasks-control.c.icon-names evolution-2.12.1/calendar/gui/tasks-control.c ---- evolution-2.12.1/calendar/gui/tasks-control.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/tasks-control.c 2007-10-15 22:34:23.000000000 -0400 -@@ -38,7 +38,7 @@ - #include - #include - #include --#include "e-util/e-icon-factory.h" -+#include - #include - #include "dialogs/cal-prefs-dialog.h" - #include "calendar-config.h" -@@ -253,7 +253,19 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps [] = { -- E_PIXMAP ("/menu/ActionsPlaceholder/Actions/TasksForward", "stock_mail-forward", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksDelete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksForward", "mail-forward", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksPrint", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/TasksPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -diff -up evolution-2.12.1/calendar/gui/e-calendar-table.c.icon-names evolution-2.12.1/calendar/gui/e-calendar-table.c ---- evolution-2.12.1/calendar/gui/e-calendar-table.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-calendar-table.c 2007-10-15 22:34:23.000000000 -0400 -@@ -1414,7 +1414,7 @@ static EPopupItem tasks_popup_items [] = - { E_POPUP_BAR, "70.bar" }, - - { E_POPUP_ITEM, "80.assign", N_("_Assign Task"), e_calendar_table_on_assign, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_ASSIGNABLE }, -- { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "stock_mail-forward", E_CAL_POPUP_SELECT_ONE }, -+ { E_POPUP_ITEM, "90.forward", N_("_Forward as iCalendar"), e_calendar_table_on_forward, NULL, "mail-forward", E_CAL_POPUP_SELECT_ONE }, - { E_POPUP_ITEM, "a0.markonecomplete", N_("_Mark as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE}, - { E_POPUP_ITEM, "b0.markmanycomplete", N_("_Mark Selected Tasks as Complete"), mark_as_complete_cb, NULL, NULL, E_CAL_POPUP_SELECT_MANY, E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTCOMPLETE }, - { E_POPUP_ITEM, "c0.markoneincomplete", N_("_Mark as Incomplete"), mark_as_incomplete_cb, NULL, NULL, E_CAL_POPUP_SELECT_ONE, E_CAL_POPUP_SELECT_EDITABLE|E_CAL_POPUP_SELECT_COMPLETE}, -diff -up evolution-2.12.1/calendar/gui/e-day-view.c.icon-names evolution-2.12.1/calendar/gui/e-day-view.c ---- evolution-2.12.1/calendar/gui/e-day-view.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-day-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -1420,7 +1420,7 @@ e_day_view_realize (GtkWidget *widget) - - /* Create the pixmaps. */ - day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); -- day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); -+ day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); - day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); -@@ -1494,7 +1494,7 @@ e_day_view_realize (GtkWidget *widget) - - /* Create the pixmaps. */ - day_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); -- day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); -+ day_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); - day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); -diff -up evolution-2.12.1/calendar/gui/e-calendar-view.c.icon-names evolution-2.12.1/calendar/gui/e-calendar-view.c ---- evolution-2.12.1/calendar/gui/e-calendar-view.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-calendar-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -1655,7 +1655,7 @@ on_paste (EPopup *ep, EPopupItem *pitem, - } - - static EPopupItem ecv_main_items [] = { -- { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "stock_new-appointment", 0, 0 }, -+ { E_POPUP_ITEM, "00.new", N_("New _Appointment..."), on_new_appointment, NULL, "appointment-new", 0, 0 }, - { E_POPUP_ITEM, "10.newallday", N_("New All Day _Event"), on_new_event, NULL, "stock_new-24h-appointment", 0, 0}, - { E_POPUP_ITEM, "20.meeting", N_("New _Meeting"), on_new_meeting, NULL, "stock_new-meeting", 0, 0}, - { E_POPUP_ITEM, "30.task", N_("New _Task"), on_new_task, NULL, "stock_task", 0, 0}, -@@ -1691,9 +1691,9 @@ static EPopupItem ecv_child_items [] = { - { E_POPUP_ITEM, "44.moveto", N_("Mo_ve to Calendar..."), on_move_to, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE }, - { E_POPUP_ITEM, "45.delegate", N_("_Delegate Meeting..."), on_delegate, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_DELEGATABLE | E_CAL_POPUP_SELECT_MEETING}, - { E_POPUP_ITEM, "46.schedule", N_("_Schedule Meeting..."), on_meeting, NULL, NULL, 0, E_CAL_POPUP_SELECT_NOTEDITING | E_CAL_POPUP_SELECT_EDITABLE | E_CAL_POPUP_SELECT_NOTMEETING }, -- { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "stock_mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING }, -- { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "stock_mail-reply", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, -- { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "stock_mail-reply-to-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, -+ { E_POPUP_ITEM, "47.forward", N_("_Forward as iCalendar..."), on_forward, NULL, "mail-forward", 0, E_CAL_POPUP_SELECT_NOTEDITING }, -+ { E_POPUP_ITEM, "48.reply", N_("_Reply"), on_reply, NULL, "mail-reply-sender", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, -+ { E_POPUP_ITEM, "49.reply-all", N_("Reply to _All"), on_reply_all, NULL, "mail-reply-all", E_CAL_POPUP_SELECT_MEETING | E_CAL_POPUP_SELECT_NOSAVESCHEDULES, E_CAL_POPUP_SELECT_NOTEDITING }, - - { E_POPUP_BAR, "50." }, - -diff -up evolution-2.12.1/calendar/gui/tasks-component.c.icon-names evolution-2.12.1/calendar/gui/tasks-component.c ---- evolution-2.12.1/calendar/gui/tasks-component.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/tasks-component.c 2007-10-15 22:34:23.000000000 -0400 -@@ -453,9 +453,9 @@ edit_task_list_cb (EPopup *ep, EPopupIte - - static EPopupItem etc_source_popups[] = { - { E_POPUP_ITEM, "10.new", N_("_New Task List"), new_task_list_cb, NULL, "stock_todo", 0, 0 }, -- { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "stock_folder-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "stock_delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, -- { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "stock_folder-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "15.copy", N_("_Copy"), copy_task_list_cb, NULL, "edit-copy", 0, E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "20.delete", N_("_Delete"), delete_task_list_cb, NULL, "edit-delete", 0, E_CAL_POPUP_SOURCE_USER|E_CAL_POPUP_SOURCE_PRIMARY }, -+ { E_POPUP_ITEM, "30.properties", N_("_Properties..."), edit_task_list_cb, NULL, "document-properties", 0, E_CAL_POPUP_SOURCE_PRIMARY }, - }; - - static void -diff -up evolution-2.12.1/calendar/gui/calendar-commands.c.icon-names evolution-2.12.1/calendar/gui/calendar-commands.c ---- evolution-2.12.1/calendar/gui/calendar-commands.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/calendar-commands.c 2007-10-15 22:34:23.000000000 -0400 -@@ -593,15 +593,29 @@ static BonoboUIVerb verbs [] = { - BONOBO_UI_VERB_END - }; - --static EPixmap pixmaps [] = --{ -- E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/Prev", "stock_previous", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/Toolbar/Next", "stock_next", E_ICON_SIZE_LARGE_TOOLBAR), -+static EPixmap pixmaps [] = { -+ E_PIXMAP ("/commands/CalendarPrev", "go-previous", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/CalendarPrint", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/DeleteAllOccurrences", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/DeleteOccurrence", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/CalendarGoto", "go-jump", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/CalendarNext", "go-next", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/CalendarPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Copy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Cut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Delete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/Paste", "edit-paste", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Prev", "go-previous", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Next", "go-next", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Goto", "go-jump", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/DayView", "stock_calendar-view-day", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/WorkWeekView", "stock_calendar-view-work-week", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/WeekView", "stock_calendar-view-week", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/MonthView", "stock_calendar-view-month", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/ListView", "stock_calendar-view-list", E_ICON_SIZE_LARGE_TOOLBAR), - - E_PIXMAP_END - }; -diff -up evolution-2.12.1/calendar/gui/memos-control.c.icon-names evolution-2.12.1/calendar/gui/memos-control.c ---- evolution-2.12.1/calendar/gui/memos-control.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/memos-control.c 2007-10-15 22:34:23.000000000 -0400 -@@ -39,6 +39,7 @@ - #include - #include - #include -+#include - #include - - #include "calendar-config.h" -@@ -183,6 +184,23 @@ static BonoboUIVerb verbs [] = { - BONOBO_UI_VERB_END - }; - -+static EPixmap pixmaps [] = { -+ E_PIXMAP ("/commands/MemosCopy", "edit-copy", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosCut", "edit-cut", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosDelete", "edit-delete", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosPaste", "edit-paste", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosPrint", "document-print", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/commands/MemosPrintPreview", "document-print-preview", E_ICON_SIZE_MENU), -+ -+ E_PIXMAP ("/Toolbar/Cut", "edit-cut", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Copy", "edit-copy", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Paste", "edit-paste", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Print", "document-print", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/Delete", "edit-delete", E_ICON_SIZE_LARGE_TOOLBAR), -+ -+ E_PIXMAP_END -+}; -+ - void - memos_control_activate (BonoboControl *control, EMemos *memos) - { -@@ -215,6 +233,8 @@ memos_control_activate (BonoboControl *c - NULL); - g_free (xmlfile); - -+ e_pixmaps_update (uic, pixmaps); -+ - e_memos_setup_view_menus (memos, uic); - - /* Signals from the memos widget; also sensitize the menu items as appropriate */ -diff -up evolution-2.12.1/calendar/gui/e-cal-popup.c.icon-names evolution-2.12.1/calendar/gui/e-cal-popup.c ---- evolution-2.12.1/calendar/gui/e-cal-popup.c.icon-names 2007-10-12 03:04:17.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-cal-popup.c 2007-10-15 22:34:23.000000000 -0400 -@@ -276,9 +276,9 @@ ecalp_part_popup_set_background(EPopup * - static const EPopupItem ecalp_standard_part_apps_bar = { E_POPUP_BAR, "99.object" }; - - static ECalPopupItem ecalp_attachment_object_popups[] = { -- { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_ONE }, -+ { E_POPUP_ITEM, "00.attach.00", N_("_Save As..."), ecalp_part_popup_saveas, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_ONE }, - { E_POPUP_ITEM, "00.attach.10", N_("Set as _Background"), ecalp_part_popup_set_background, NULL, NULL, E_CAL_POPUP_ATTACHMENTS_IMAGE }, -- { E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "stock_save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE }, -+ { E_POPUP_ITEM, "00.attach.20", N_("_Save Selected"), ecalp_part_popup_save_selected, NULL, "document-save-as", E_CAL_POPUP_ATTACHMENTS_MULTIPLE }, - { E_POPUP_BAR, "05.attach", }, - }; - -diff -up evolution-2.12.1/calendar/gui/e-week-view.c.icon-names evolution-2.12.1/calendar/gui/e-week-view.c ---- evolution-2.12.1/calendar/gui/e-week-view.c.icon-names 2007-10-15 22:34:22.000000000 -0400 -+++ evolution-2.12.1/calendar/gui/e-week-view.c 2007-10-15 22:34:23.000000000 -0400 -@@ -695,7 +695,7 @@ e_week_view_realize (GtkWidget *widget) - - /* Create the pixmaps. */ - week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); -- week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); -+ week_view->recurrence_icon = e_icon_factory_get_icon ("view-refresh", E_ICON_SIZE_MENU); - week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); diff --git a/evolution-2.11.92-mail-attachment.patch b/evolution-2.11.92-mail-attachment.patch deleted file mode 100644 index 6197ee7..0000000 --- a/evolution-2.11.92-mail-attachment.patch +++ /dev/null @@ -1,129 +0,0 @@ -diff -up evolution-2.11.92/mail/em-folder-browser.c.mail-attachment evolution-2.11.92/mail/em-folder-browser.c ---- evolution-2.11.92/mail/em-folder-browser.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 -+++ evolution-2.11.92/mail/em-folder-browser.c 2007-09-11 18:58:15.000000000 -0400 -@@ -218,7 +218,7 @@ static EMFBSearchBarItem temp_view_items - {{ N_("Read Messages"), VIEW_READ_MESSAGES, 0 }, "stock_mail-open"}, - {{ N_("Recent Messages"), VIEW_RECENT_MESSAGES, 0 }, NULL}, - {{ N_("Last 5 Days' Messages"), VIEW_LAST_FIVE_DAYS, 0 }, NULL}, -- {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "stock_attach"}, -+ {{ N_("Messages with Attachments"), VIEW_WITH_ATTACHMENTS, 0 }, "mail-attachment"}, - {{ N_("Important Messages"), VIEW_MESSAGES_MARKED_AS_IMPORTANT, 0}, "emblem-important"}, - {{ N_("Messages Not Junk"), VIEW_NOT_JUNK, 0 }, "stock_not-spam"}, - /* { NULL, 0, NULL }, */ -diff -up evolution-2.11.92/mail/message-list.c.mail-attachment evolution-2.11.92/mail/message-list.c ---- evolution-2.11.92/mail/message-list.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 -+++ evolution-2.11.92/mail/message-list.c 2007-09-11 18:58:15.000000000 -0400 -@@ -223,7 +223,7 @@ static struct { - { "stock_mail-unread-multiple", NULL }, - { "stock_mail-open-multiple", NULL }, - { NULL, NULL }, -- { "stock_attach", NULL }, -+ { "mail-attachment", NULL }, - { "emblem-important", NULL }, - { "stock_score-lowest", NULL }, - { "stock_score-lower", NULL }, -diff -up evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment evolution-2.11.92/widgets/misc/e-attachment-bar.c ---- evolution-2.11.92/widgets/misc/e-attachment-bar.c.mail-attachment 2007-09-02 14:57:07.000000000 -0400 -+++ evolution-2.11.92/widgets/misc/e-attachment-bar.c 2007-09-11 18:58:15.000000000 -0400 -@@ -281,8 +281,7 @@ update (EAttachmentBar *bar) - attachment = priv->attachments->pdata[i]; - - if (!attachment->is_available_local || !attachment->body) { -- /* stock_attach would be better, but its fugly scaled up */ -- if ((pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG))) { -+ if ((pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG))) { - attachment->index = gnome_icon_list_append_pixbuf (icon_list, pixbuf, NULL, ""); - g_object_unref (pixbuf); - } -@@ -373,8 +372,7 @@ update (EAttachmentBar *bar) - pixbuf = e_icon_for_mime_type (mime_type, 48); - if (pixbuf == NULL) { - g_warning("cannot find icon for mime type %s (installation problem?)", mime_type); -- /* stock_attach would be better, but its fugly scaled up */ -- pixbuf = e_icon_factory_get_icon("stock_unknown", E_ICON_SIZE_DIALOG); -+ pixbuf = e_icon_factory_get_icon("mail-attachment", E_ICON_SIZE_DIALOG); - } - g_free (mime_type); - } -diff -up evolution-2.11.92/composer/e-msg-composer.c.mail-attachment evolution-2.11.92/composer/e-msg-composer.c ---- evolution-2.11.92/composer/e-msg-composer.c.mail-attachment 2007-09-02 14:56:48.000000000 -0400 -+++ evolution-2.11.92/composer/e-msg-composer.c 2007-09-11 18:58:15.000000000 -0400 -@@ -2208,11 +2208,11 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixcache [] = { -- E_PIXMAP ("/Toolbar/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/Toolbar/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/FileSend", "stock_mail-send", E_ICON_SIZE_LARGE_TOOLBAR), - E_PIXMAP ("/Toolbar/FileSaveDraft", "stock_save", E_ICON_SIZE_LARGE_TOOLBAR) , - --/* E_PIXMAP ("/menu/Insert/FileAttach", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), */ -+/* E_PIXMAP ("/menu/Insert/FileAttach", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), */ - E_PIXMAP ("/commands/FileSend", "stock_mail-send", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FileSave", "stock_save", E_ICON_SIZE_MENU), - E_PIXMAP ("/commands/FileSaveAs", "stock_save-as", E_ICON_SIZE_MENU), -@@ -3989,7 +3989,7 @@ create_composer (int visible_mask) - gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_num), 1.0, 0.5); - expander_hbox = gtk_hbox_new (FALSE, 0); - -- p->attachment_expander_icon = e_icon_factory_get_image ("stock_attach", E_ICON_SIZE_MENU); -+ p->attachment_expander_icon = e_icon_factory_get_image ("mail-attachment", E_ICON_SIZE_MENU); - gtk_misc_set_alignment (GTK_MISC (p->attachment_expander_icon), 1, 0.5); - gtk_widget_set_size_request (p->attachment_expander_icon, 100, -1); - -diff -up evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-week-view.c ---- evolution-2.11.92/calendar/gui/e-week-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/e-week-view.c 2007-09-11 18:58:16.000000000 -0400 -@@ -697,7 +697,7 @@ e_week_view_realize (GtkWidget *widget) - week_view->reminder_icon = e_icon_factory_get_icon ("stock_bell", E_ICON_SIZE_MENU); - week_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); - week_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); -- week_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); -+ week_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - week_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); - } - -diff -up evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment evolution-2.11.92/calendar/gui/dialogs/comp-editor.c ---- evolution-2.11.92/calendar/gui/dialogs/comp-editor.c.mail-attachment 2007-09-02 14:57:08.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/dialogs/comp-editor.c 2007-09-11 18:58:15.000000000 -0400 -@@ -1486,8 +1486,8 @@ static BonoboUIVerb verbs [] = { - }; - - static EPixmap pixmaps[] = { -- E_PIXMAP ("/Toolbar/InsertAttachments", "stock_attach", E_ICON_SIZE_LARGE_TOOLBAR), -- E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "stock_attach", E_ICON_SIZE_MENU), -+ E_PIXMAP ("/Toolbar/InsertAttachments", "mail-attachment", E_ICON_SIZE_LARGE_TOOLBAR), -+ E_PIXMAP ("/menu/Insert/Attachments/InsertAttachments", "mail-attachment", E_ICON_SIZE_MENU), - - E_PIXMAP_END - }; -@@ -1546,7 +1546,7 @@ setup_widgets (CompEditor *editor) - gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_num), 1.0, 0.5); - expander_hbox = gtk_hbox_new (FALSE, 0); - -- attachment_pixbuf = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); -+ attachment_pixbuf = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - priv->attachment_expander_icon = gtk_image_new_from_pixbuf (attachment_pixbuf); - gtk_misc_set_alignment (GTK_MISC (priv->attachment_expander_icon), 1, 0.5); - gtk_widget_set_size_request (priv->attachment_expander_icon, 100, -1); -diff -up evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment evolution-2.11.92/calendar/gui/e-day-view.c ---- evolution-2.11.92/calendar/gui/e-day-view.c.mail-attachment 2007-09-11 18:57:27.000000000 -0400 -+++ evolution-2.11.92/calendar/gui/e-day-view.c 2007-09-11 18:58:16.000000000 -0400 -@@ -1423,7 +1423,7 @@ e_day_view_realize (GtkWidget *widget) - day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); -- day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); -+ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - - - /* Set the canvas item colors. */ -@@ -1497,7 +1497,7 @@ e_day_view_realize (GtkWidget *widget) - day_view->recurrence_icon = e_icon_factory_get_icon ("stock_refresh", E_ICON_SIZE_MENU); - day_view->timezone_icon = e_icon_factory_get_icon ("stock_timezone", E_ICON_SIZE_MENU); - day_view->meeting_icon = e_icon_factory_get_icon ("stock_people", E_ICON_SIZE_MENU); -- day_view->attach_icon = e_icon_factory_get_icon ("stock_attach", E_ICON_SIZE_MENU); -+ day_view->attach_icon = e_icon_factory_get_icon ("mail-attachment", E_ICON_SIZE_MENU); - - - /* Set the canvas item colors. */ diff --git a/evolution-2.6.0-prototypes.patch b/evolution-2.6.0-prototypes.patch deleted file mode 100644 index 16fe7ab..0000000 --- a/evolution-2.6.0-prototypes.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- evolution-2.6.0/calendar/gui/dialogs/event-page.c.prototypes 2006-03-14 01:00:04.000000000 -0500 -+++ evolution-2.6.0/calendar/gui/dialogs/event-page.c 2006-03-14 01:00:21.000000000 -0500 -@@ -59,6 +59,8 @@ - #include "event-page.h" - #include "e-send-options-utils.h" - -+GtkWidget *alarm_list_dialog_peek (ECal *ecal, EAlarmList *list_store); -+ - - - /* Private part of the EventPage structure */ ---- evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c.prototypes 2006-03-13 14:14:07.000000000 -0500 -+++ evolution-2.6.0/calendar/gui/dialogs/cal-prefs-dialog.c 2006-03-13 14:14:24.000000000 -0500 -@@ -32,6 +32,7 @@ - #include "../calendar-config.h" - #include "cal-prefs-dialog.h" - #include -+#include - #include - #include - #include diff --git a/evolution.spec b/evolution.spec index 04260c8..4ef405c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,9 +30,9 @@ %define nm_support 0 %endif %ifarch s390 s390x -%define pilot_support 0 +%define build_conduits 0 %else -%define pilot_support 1 +%define build_conduits 1 %endif %define use_mozilla_nss 1 @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -174,7 +174,7 @@ BuildRequires: gstreamer-devel BuildRequires: openldap-devel >= 2.0.11 %endif -%if %{pilot_support} +%if %{build_conduits} BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} # bleah, gnome-pilot really sucks this in, but then I have to have an explicit # versioning for gnome-pilot when it changes less than pilot-link itself @@ -199,13 +199,13 @@ BuildRequires: libnotify-devel %description Evolution is the GNOME mailer, calendar, contact manager and -communications tool. The tools which make up Evolution will -be tightly integrated with one another and act as a seamless +communications tool. The components which make up Evolution +are tightly integrated with one another and act as a seamless personal information-management tool. %package devel Group: Development/Libraries -Summary: Development files for building against evolution +Summary: Development files for building against %{name} Requires: %{name} = %{version} Requires: evolution-data-server-devel >= %{eds_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} @@ -214,15 +214,27 @@ Requires: libxml2-devel Obsoletes: libgal2-devel <= %{last_libgal2_version} %description devel -Development files needed for building things which link against evolution. +Development files needed for building things which link against %{name}. %package help Group: Applications/Productivity -Summary: Help files for Evolution +Summary: Help files for %{name} Requires: %{name} = %{version}-%{release} %description help -This package contains the help for Evolution. +This package contains user documentation for %{name}. + +%if %{build_conduits} +%package conduits +Group: Applictions/Communications +Summary: gnome-pilot conduits for %{name} +Requires: %{name} = %{version}-%{release} +Requires: gnome-pilot >= %{gnome_pilot_version} + +%description conduits +The package contains conduits for synchronizing PalmPilot or other +PalmOS devices with %{name}. +%endif %prep %setup -q -n evolution-%{version} @@ -261,10 +273,10 @@ done %define ldap_flags --without-openldap %endif -%if %{pilot_support} -%define pilot_flags --enable-pilot-conduits=yes +%if %{build_conduits} +%define pilot_flags --enable-pilot-conduits %else -%define pilot_flags --enable-pilot-conduits=no +%define pilot_flags --disable-pilot-conduits %endif %if %{krb5_support} @@ -274,9 +286,9 @@ done %endif %if %{nntp_support} -%define nntp_flags --enable-nntp=yes +%define nntp_flags --enable-nntp %else -%define nntp_flags --enable-nntp=no +%define nntp_flags --disable-nntp %endif %if %{use_mozilla_nss} @@ -293,9 +305,9 @@ fi %endif %if %{exchange_support} -%define exchange_flags --enable-exchange=yes +%define exchange_flags --enable-exchange %else -%define exchange_flags --enable-exchange=no +%define exchange_flags --disable-exchange %endif CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS @@ -486,24 +498,6 @@ rm -rf $RPM_BUILD_ROOT %{_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/libeaddress_conduit.so -%{_libdir}/gnome-pilot/conduits/e-address.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so -%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so -%{_libdir}/gnome-pilot/conduits/e-calendar.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-memo.conduit - -%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-todo.conduit -%endif - # The plugin directory: %dir %{evo_plugin_dir} @@ -667,10 +661,30 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_major}/libmenus.so %files help -f help.lang +%defattr(-, root, root) %dir %{_datadir}/omf/evolution +%if %{build_conduits} +%files conduits +%defattr(-, root, root) +%dir %{_libdir}/evolution/%{evo_major}/conduits +%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so +%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so +%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so +%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so +%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so +%{_libdir}/gnome-pilot/conduits/e-address.conduit +%{_libdir}/gnome-pilot/conduits/e-calendar.conduit +%{_libdir}/gnome-pilot/conduits/e-memo.conduit +%{_libdir}/gnome-pilot/conduits/e-todo.conduit +%endif + %changelog -* Mon Oct 29 2007 Matthew Barnes - 2.12.1-2.fc9 +* Tue Oct 30 2007 Matthew Barnes - 2.12.1-2.fc9 +- Attempt to split the gnome-pilot stuff into a separate + evolution-conduits subpackage (RH bug #178155). + +* Mon Oct 29 2007 Matthew Barnes - 2.21.1-1.fc9 - Update to 2.21.1 - Remove redundant requirements. - Bump EDS requirement to 2.21.1. From c95264f58bdf6e43da469c5422c02800b5535297 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 30 Oct 2007 16:43:27 +0000 Subject: [PATCH 182/844] Forgot to remove gnome-pilot requirement on main package. --- evolution.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 4ef405c..efa1446 100644 --- a/evolution.spec +++ b/evolution.spec @@ -176,10 +176,6 @@ BuildRequires: openldap-devel >= 2.0.11 %if %{build_conduits} BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} -# bleah, gnome-pilot really sucks this in, but then I have to have an explicit -# versioning for gnome-pilot when it changes less than pilot-link itself -BuildRequires: pilot-link-devel >= %{pilot_link_version} -Requires: gnome-pilot >= %{gnome_pilot_version} %endif %if %{krb5_support} From c5a13c22888606628f80cb93c42a932fd290a12e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 Nov 2007 22:09:25 +0000 Subject: [PATCH 183/844] - Update to 2.21.2 --- .cvsignore | 2 +- evolution-2.8.1-kill-ethread.patch | 14 +++++++------- evolution-2.9.1-kill-ememory.patch | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 5 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.cvsignore b/.cvsignore index 583e3b1..0951394 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.1.tar.bz2 +evolution-2.21.2.tar.bz2 diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index ee76394..30b4b49 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -3940,7 +3940,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma -}; - -#ifdef LOG_STREAM --int dolog; +-static int dolog; -#endif - -/* Should probably expose messages to outside world ... so subclasses can extend */ @@ -5927,18 +5927,18 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2); - - mail_thread_queued = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_queued, mail_msg_received, 0); +- e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, NULL); +- e_thread_set_msg_received(mail_thread_queued, mail_msg_received, NULL); - e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port); - - mail_thread_queued_slow = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, 0); +- e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, NULL); +- e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, NULL); - e_thread_set_reply_port(mail_thread_queued_slow, mail_gui_reply_port); - - mail_thread_new = e_thread_new(E_THREAD_NEW); -- e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, 0); -- e_thread_set_msg_received(mail_thread_new, mail_msg_received, 0); +- e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, NULL); +- e_thread_set_msg_received(mail_thread_new, mail_msg_received, NULL); - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); + static GOnce once = G_ONCE_INIT; diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index 700d85e..5f27b0a 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -239,7 +239,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail } for (i = 0; i < uidnew->len; i++) { - if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == 0) { + if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == NULL) { - char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]); + char *uid = g_string_chunk_insert (m->ml->hidden_string_chunk, uidnew->pdata[i]); g_hash_table_insert (m->ml->hidden, uid, uid); diff --git a/evolution.spec b/evolution.spec index efa1446..08e8e33 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.21.1 -Release: 2%{?dist} +Version: 2.21.2 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -676,7 +676,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Tue Oct 30 2007 Matthew Barnes - 2.12.1-2.fc9 +* Mon Nov 12 2007 Matthew Barnes - 2.21.2-1.fc9 +- Update to 2.21.2 + +* Tue Oct 30 2007 Matthew Barnes - 2.21.1-2.fc9 - Attempt to split the gnome-pilot stuff into a separate evolution-conduits subpackage (RH bug #178155). diff --git a/sources b/sources index fb67034..b630403 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53e5927ac3e8a0f1426b010c42ff49f3 evolution-2.21.1.tar.bz2 +833cf5f76ec30170d22f04948fba9997 evolution-2.21.2.tar.bz2 From 414fc0283167c4243add6393ea3b0b43b0ea8597 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 23 Nov 2007 14:37:53 +0000 Subject: [PATCH 184/844] - Rebuild against newer libpisync.so. --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 08e8e33..d921883 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -676,6 +676,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Nov 23 2007 Matthew Barnes - 2.21.2-2.fc9 +- Rebuild against newer libpisync.so. + * Mon Nov 12 2007 Matthew Barnes - 2.21.2-1.fc9 - Update to 2.21.2 From ba8861e012e012acac6551ccf761848437682c1c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 29 Nov 2007 20:43:29 +0000 Subject: [PATCH 185/844] - Add patch for GNOME bug #499920 (invalid #include). --- evolution-2.21.2-invalid-include.patch | 48 ++++++++++++++++++++++++++ evolution.spec | 9 ++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 evolution-2.21.2-invalid-include.patch diff --git a/evolution-2.21.2-invalid-include.patch b/evolution-2.21.2-invalid-include.patch new file mode 100644 index 0000000..c4b9061 --- /dev/null +++ b/evolution-2.21.2-invalid-include.patch @@ -0,0 +1,48 @@ +diff -up evolution-2.21.2/shell/es-event.c.invalid-include evolution-2.21.2/shell/es-event.c +--- evolution-2.21.2/shell/es-event.c.invalid-include 2007-10-28 22:02:14.000000000 -0400 ++++ evolution-2.21.2/shell/es-event.c 2007-11-29 15:01:31.000000000 -0500 +@@ -30,6 +30,7 @@ + #include + + #include "es-event.h" ++#include "e-shell.h" + + static GObjectClass *eme_parent; + static ESEvent *es_event; +diff -up evolution-2.21.2/shell/es-event.h.invalid-include evolution-2.21.2/shell/es-event.h +--- evolution-2.21.2/shell/es-event.h.invalid-include 2007-10-23 06:03:16.000000000 -0400 ++++ evolution-2.21.2/shell/es-event.h 2007-11-29 15:01:31.000000000 -0500 +@@ -26,13 +26,14 @@ + #include + + #include "e-util/e-event.h" +-#include "e-shell.h" + + #ifdef __cplusplus + extern "C" { + #pragma } + #endif /* __cplusplus */ + ++struct _EShell; /* Avoid including "e-shell.h" */ ++ + typedef struct _ESEvent ESEvent; + typedef struct _ESEventClass ESEventClass; + +@@ -56,7 +57,7 @@ typedef struct _ESEventTargetShell ESEve + struct _ESEventTargetShell { + EEventTarget target; + +- EShell *shell; ++ struct _EShell *shell; + }; + + struct _ESEventTargetState { +@@ -91,7 +92,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); ++ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, struct _EShell *shell); + ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision); + + /* ********************************************************************** */ diff --git a/evolution.spec b/evolution.spec index d921883..205ea6a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.2 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -117,6 +117,9 @@ Patch31: evolution-2.9.3-meeting-list-view.patch # XXX Disabled due to outstanding issues. #Patch33: evolution-2.10.0-e-passwords.patch +# GNOME bug #499920 +Patch34: evolution-2.21.2-invalid-include.patch + ## Dependencies ### Requires(post): GConf2 @@ -251,6 +254,7 @@ PalmOS devices with %{name}. %patch30 -p1 -b .source-path-entry %patch31 -p1 -b .meeting-list-view #%patch33 -p1 -b .e-passwords +%patch34 -p1 -b .invalid-include mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -676,6 +680,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Nov 29 2007 Matthew Barnes - 2.21.2-3.fc9 +- Add patch for GNOME bug #499920 (invalid #include). + * Fri Nov 23 2007 Matthew Barnes - 2.21.2-2.fc9 - Rebuild against newer libpisync.so. From d58a834b7f8497a3edb642cdcb4ca795cf68bc77 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 1 Dec 2007 15:58:47 +0000 Subject: [PATCH 186/844] - Fix a corrupted patch that caused GNOME bug #499291. --- evolution-2.9.1-kill-ememory.patch | 42 +++++++++++++++++------------- evolution.spec | 5 +++- 2 files changed, 28 insertions(+), 19 deletions(-) diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index 5f27b0a..10f93f2 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -1,6 +1,6 @@ -diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail/message-list.c ---- evolution-2.21.1/mail/message-list.c.kill-ememory 2007-10-29 10:44:57.000000000 -0400 -+++ evolution-2.21.1/mail/message-list.c 2007-10-29 10:48:44.000000000 -0400 +diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail/message-list.c +--- evolution-2.21.2/mail/message-list.c.kill-ememory 2007-12-01 10:22:46.000000000 -0500 ++++ evolution-2.21.2/mail/message-list.c 2007-12-01 10:23:43.000000000 -0500 @@ -416,70 +416,28 @@ get_message_info (MessageList *message_l return info; } @@ -128,10 +128,16 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail case COL_SIZE: return GINT_TO_POINTER (camel_message_info_size(msg_info)); case COL_DELETED: -@@ -2070,9 +2040,11 @@ message_list_init (MessageList *message_ - g_str_hash, g_str_equal, - (GDestroyNotify) NULL, - (GDestroyNotify) e_poolv_destroy); +@@ -2066,13 +2036,13 @@ message_list_init (MessageList *message_ + gtk_scrolled_window_set_vadjustment ((GtkScrolledWindow *) message_list, adjustment); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); + +- message_list->normalised_hash = g_hash_table_new_full ( +- g_str_hash, g_str_equal, +- (GDestroyNotify) NULL, +- (GDestroyNotify) e_poolv_destroy); ++ message_list->normalised_hash = ++ g_hash_table_new (g_str_hash, g_str_equal); + + message_list->string_chunk = g_string_chunk_new (1024); @@ -141,7 +147,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail message_list->hide_before = ML_HIDE_NONE_START; message_list->hide_after = ML_HIDE_NONE_END; -@@ -2166,15 +2138,16 @@ message_list_finalise (GObject *object) +@@ -2166,15 +2136,16 @@ message_list_finalise (GObject *object) struct _MessageListPrivate *p = message_list->priv; g_hash_table_destroy (message_list->normalised_hash); @@ -160,7 +166,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail } g_free(message_list->search); -@@ -3124,6 +3097,9 @@ message_list_set_folder (MessageList *me +@@ -3124,6 +3095,9 @@ message_list_set_folder (MessageList *me /* reset the normalised sort performance hack */ g_hash_table_remove_all (message_list->normalised_hash); @@ -170,7 +176,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail mail_regen_cancel(message_list); -@@ -3574,14 +3550,14 @@ message_list_hide_uids (MessageList *ml, +@@ -3574,14 +3548,14 @@ message_list_hide_uids (MessageList *ml, MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden == NULL) { ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); @@ -188,7 +194,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail g_hash_table_insert (ml->hidden, uid, uid); } } -@@ -3602,9 +3578,9 @@ message_list_hide_clear (MessageList *ml +@@ -3602,9 +3576,9 @@ message_list_hide_clear (MessageList *ml MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden) { g_hash_table_destroy (ml->hidden); @@ -200,7 +206,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail } ml->hide_before = ML_HIDE_NONE_START; ml->hide_after = ML_HIDE_NONE_END; -@@ -3640,9 +3616,9 @@ load_hide_state (MessageList *ml) +@@ -3640,9 +3614,9 @@ load_hide_state (MessageList *ml) MESSAGE_LIST_LOCK(ml, hide_lock); if (ml->hidden) { g_hash_table_destroy (ml->hidden); @@ -212,7 +218,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail } ml->hide_before = ML_HIDE_NONE_START; ml->hide_after = ML_HIDE_NONE_END; -@@ -3653,7 +3629,7 @@ load_hide_state (MessageList *ml) +@@ -3653,7 +3627,7 @@ load_hide_state (MessageList *ml) camel_file_util_decode_fixed_int32 (in, &version); if (version == HIDE_STATE_VERSION) { ml->hidden = g_hash_table_new(g_str_hash, g_str_equal); @@ -221,7 +227,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail camel_file_util_decode_fixed_int32 (in, &lower); ml->hide_before = lower; camel_file_util_decode_fixed_int32 (in, &upper); -@@ -3662,7 +3638,7 @@ load_hide_state (MessageList *ml) +@@ -3662,7 +3636,7 @@ load_hide_state (MessageList *ml) char *olduid, *uid; if (camel_file_util_decode_string (in, &olduid) != -1) { @@ -230,7 +236,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail g_free (olduid); g_hash_table_insert(ml->hidden, uid, uid); } -@@ -3811,12 +3787,12 @@ regen_list_exec (struct _regen_list_msg +@@ -3811,12 +3785,12 @@ regen_list_exec (struct _regen_list_msg if (m->ml->hidden == NULL) { m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); @@ -245,9 +251,9 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ememory evolution-2.21.1/mail g_hash_table_insert (m->ml->hidden, uid, uid); } } -diff -up evolution-2.21.1/mail/message-list.h.kill-ememory evolution-2.21.1/mail/message-list.h ---- evolution-2.21.1/mail/message-list.h.kill-ememory 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/message-list.h 2007-10-29 10:44:57.000000000 -0400 +diff -up evolution-2.21.2/mail/message-list.h.kill-ememory evolution-2.21.2/mail/message-list.h +--- evolution-2.21.2/mail/message-list.h.kill-ememory 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.2/mail/message-list.h 2007-12-01 10:22:46.000000000 -0500 @@ -102,11 +102,12 @@ struct _MessageList { GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ diff --git a/evolution.spec b/evolution.spec index 205ea6a..7031709 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -680,6 +680,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Dec 01 2007 Matthew Barnes - 2.21.2-4.fc9 +- Fix a corrupted patch that caused GNOME bug #499291. + * Thu Nov 29 2007 Matthew Barnes - 2.21.2-3.fc9 - Add patch for GNOME bug #499920 (invalid #include). From d93c79add4898e00fc292efeba6ab3a18be29def Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 4 Dec 2007 01:22:06 +0000 Subject: [PATCH 187/844] - Update to 2.21.3 - Remove patch for RH bug #215467 (fixed upstream). - Remove patch for GNOME bug #499920 (fixed upstream). --- .cvsignore | 2 +- evolution-2.0.2-fix-145552.patch | 4 +- evolution-2.21.2-invalid-include.patch | 48 - evolution-2.7.3-replicated-cjk-input.patch | 2 +- evolution-2.7.4-deleting-preedit-buffer.patch | 40 +- evolution-2.8.1-kill-ethread.patch | 2030 ++++++++--------- evolution-2.9.1-kill-ememory.patch | 62 +- evolution-2.9.3-meeting-list-view.patch | 86 - evolution.spec | 17 +- sources | 2 +- 10 files changed, 1078 insertions(+), 1215 deletions(-) delete mode 100644 evolution-2.21.2-invalid-include.patch delete mode 100644 evolution-2.9.3-meeting-list-view.patch diff --git a/.cvsignore b/.cvsignore index 0951394..271665a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.2.tar.bz2 +evolution-2.21.3.tar.bz2 diff --git a/evolution-2.0.2-fix-145552.patch b/evolution-2.0.2-fix-145552.patch index ad2edf0..30972e2 100644 --- a/evolution-2.0.2-fix-145552.patch +++ b/evolution-2.0.2-fix-145552.patch @@ -1,9 +1,9 @@ --- evolution-2.0.2/mail/em-utils.c.fix-145552 2004-09-24 11:49:29.000000000 -0400 +++ evolution-2.0.2/mail/em-utils.c 2005-08-02 22:42:04.000000000 -0400 -@@ -1919,10 +1919,22 @@ +@@ -2176,10 +2176,22 @@ * try to do better with the filename check. */ - + + /* RH bug 145552: code based on _gnome_vfs_get_mime_type_internal: + * So many file types come compressed by gzip + * that extensions are more reliable than magic diff --git a/evolution-2.21.2-invalid-include.patch b/evolution-2.21.2-invalid-include.patch deleted file mode 100644 index c4b9061..0000000 --- a/evolution-2.21.2-invalid-include.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up evolution-2.21.2/shell/es-event.c.invalid-include evolution-2.21.2/shell/es-event.c ---- evolution-2.21.2/shell/es-event.c.invalid-include 2007-10-28 22:02:14.000000000 -0400 -+++ evolution-2.21.2/shell/es-event.c 2007-11-29 15:01:31.000000000 -0500 -@@ -30,6 +30,7 @@ - #include - - #include "es-event.h" -+#include "e-shell.h" - - static GObjectClass *eme_parent; - static ESEvent *es_event; -diff -up evolution-2.21.2/shell/es-event.h.invalid-include evolution-2.21.2/shell/es-event.h ---- evolution-2.21.2/shell/es-event.h.invalid-include 2007-10-23 06:03:16.000000000 -0400 -+++ evolution-2.21.2/shell/es-event.h 2007-11-29 15:01:31.000000000 -0500 -@@ -26,13 +26,14 @@ - #include - - #include "e-util/e-event.h" --#include "e-shell.h" - - #ifdef __cplusplus - extern "C" { - #pragma } - #endif /* __cplusplus */ - -+struct _EShell; /* Avoid including "e-shell.h" */ -+ - typedef struct _ESEvent ESEvent; - typedef struct _ESEventClass ESEventClass; - -@@ -56,7 +57,7 @@ typedef struct _ESEventTargetShell ESEve - struct _ESEventTargetShell { - EEventTarget target; - -- EShell *shell; -+ struct _EShell *shell; - }; - - struct _ESEventTargetState { -@@ -91,7 +92,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); -+ESEventTargetShell *es_event_target_new_shell(ESEvent *eme, struct _EShell *shell); - ESEventTargetUpgrade *es_event_target_new_upgrade(ESEvent *emp, int major, int minor, int revision); - - /* ********************************************************************** */ diff --git a/evolution-2.7.3-replicated-cjk-input.patch b/evolution-2.7.3-replicated-cjk-input.patch index 5501bae..9dabf33 100644 --- a/evolution-2.7.3-replicated-cjk-input.patch +++ b/evolution-2.7.3-replicated-cjk-input.patch @@ -4,7 +4,7 @@ } -- insert_preedit_text (text); +- insert_preedit_text (text); + if (text->im_context_signals_registered) + insert_preedit_text (text); diff --git a/evolution-2.7.4-deleting-preedit-buffer.patch b/evolution-2.7.4-deleting-preedit-buffer.patch index 17e1945..8a82df0 100644 --- a/evolution-2.7.4-deleting-preedit-buffer.patch +++ b/evolution-2.7.4-deleting-preedit-buffer.patch @@ -7,12 +7,12 @@ - gint length = 0, cpos = 0, preedit_length = 0; + gint length = 0, cpos = 0; gboolean new_attrs = FALSE; - + if (text->layout == NULL || !GTK_IS_IM_CONTEXT (text->im_context)) @@ -295,19 +295,15 @@ - - g_string_prepend_len (tmp_string, text->text,length); - + + g_string_prepend_len (tmp_string, text->text,length); + - if (text->preedit_len) - gtk_im_context_get_preedit_string (text->im_context, - &preedit_string, &preedit_attrs, @@ -20,39 +20,39 @@ + /* we came into this function only when text->preedit_len was not 0 + so we can saftely fetch the preedit string */ + gtk_im_context_get_preedit_string (text->im_context, &preedit_string, &preedit_attrs, NULL); - + if (preedit_string && g_utf8_validate (preedit_string, -1, NULL)) - text->preedit_len = preedit_length = strlen (preedit_string); - else - text->preedit_len = preedit_length = 0; - -- cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; +- cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; + { + text->preedit_len = strlen (preedit_string); + cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; - + - if (preedit_length) { g_string_insert (tmp_string, cpos, preedit_string); - + reset_layout_attrs (text); @@ -320,15 +316,17 @@ - + pango_layout_set_text (text->layout, tmp_string->str, tmp_string->len); - + - pango_attr_list_splice (attrs, preedit_attrs, cpos, preedit_length); + pango_attr_list_splice (attrs, preedit_attrs, cpos, text->preedit_len); - + if (new_attrs) { pango_layout_set_attributes (text->layout, attrs); pango_attr_list_unref (attrs); - } + } - + update_im_cursor_position (text); } + else + text->preedit_len = 0; - + if (preedit_string) g_free (preedit_string); @@ -385,9 +383,12 @@ @@ -61,17 +61,17 @@ } + pango_layout_set_attributes (text->layout, attrs); -+ ++ if (attrs) pango_attr_list_unref (attrs); -+ ++ calc_height (text); } - + @@ -1510,9 +1511,14 @@ } } - + - - if (text->im_context_signals_registered) - insert_preedit_text (text); @@ -83,12 +83,12 @@ + * when typing in CJK & using backspace on the preedit */ + if(!text->preedit_len) + reset_layout (text); - + if (!pango_layout_get_text (text->layout)) return; @@ -2220,11 +2226,12 @@ */ - + if (save_text && save_text->im_context) { + gtk_im_context_focus_out(save_text->im_context); g_signal_handlers_disconnect_matched (save_text->im_context, @@ -99,7 +99,7 @@ + save_text->im_context_signals_registered = FALSE; reset_layout (save_text); } - + @@ -2240,6 +2247,7 @@ G_CALLBACK (e_text_delete_surrounding_cb), text); text->im_context_signals_registered = TRUE; diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 30b4b49..4c9f486 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -3,16 +3,16 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma +++ evolution-2.21.1/mail/mail-send-recv.c 2007-10-29 14:47:20.000000000 -0400 @@ -775,23 +775,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ - + struct _refresh_folders_msg { - struct _mail_msg msg; + MailMsg base; - + struct _send_info *info; GPtrArray *folders; CamelStore *store; }; - + -static char * -refresh_folders_desc (struct _mail_msg *mm, int done) +static gchar * @@ -20,7 +20,7 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma { return g_strdup_printf(_("Checking for new mail")); } - + static void -refresh_folders_get (struct _mail_msg *mm) +refresh_folders_exec (struct _refresh_folders_msg *m) @@ -31,7 +31,7 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma CamelException ex = CAMEL_EXCEPTION_INITIALISER; @@ -813,17 +812,14 @@ refresh_folders_get (struct _mail_msg *m } - + static void -refresh_folders_got (struct _mail_msg *mm) +refresh_folders_done (struct _refresh_folders_msg *m) @@ -40,19 +40,19 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma - receive_done("", m->info); } - + static void -refresh_folders_free (struct _mail_msg *mm) +refresh_folders_free (struct _refresh_folders_msg *m) { - struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; int i; - + for (i=0;ifolders->len;i++) @@ -832,11 +828,12 @@ refresh_folders_free (struct _mail_msg * camel_object_unref(m->store); } - + -static struct _mail_msg_op refresh_folders_op = { - refresh_folders_desc, - refresh_folders_get, @@ -65,19 +65,19 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma + (MailMsgDoneFunc) refresh_folders_done, + (MailMsgFreeFunc) refresh_folders_free }; - + static void @@ -869,13 +866,13 @@ receive_update_got_folderinfo(CamelStore - + get_folders(store, folders, info); - + - m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m)); + m = mail_msg_new(&refresh_folders_info); m->store = store; camel_object_ref(store); m->folders = folders; m->info = sinfo; - + - e_thread_put(mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } else { @@ -89,7 +89,7 @@ diff -up evolution-2.21.1/mail/mail-component.c.kill-ethread evolution-2.21.1/ma @@ -1000,7 +1000,7 @@ impl_handleURI (PortableServer_Servant s if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); - + - mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); + mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); g_free(curi); @@ -104,13 +104,13 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai struct _filter_mail_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *source_folder; /* where they come from */ GPtrArray *source_uids; /* uids to copy, or NULL == copy all */ @@ -99,8 +99,8 @@ struct _fetch_mail_msg { void *data; }; - + -static char * -em_filter_folder_element_describe (struct _mail_msg *mm, int complete) +static gchar * @@ -128,48 +128,48 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm; CamelFolder *folder; GPtrArray *uids, *folder_uids = NULL; - -@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct + +@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct else folder_uids = uids = camel_folder_get_uids (folder); - + - camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &mm->ex); - camel_filter_driver_flush (m->driver, &mm->ex); + camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &m->base.ex); + camel_filter_driver_flush (m->driver, &m->base.ex); - + if (folder_uids) camel_folder_free_uids (folder, folder_uids); - + /* sync our source folder */ if (!m->cache) - camel_folder_sync (folder, FALSE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex); + camel_folder_sync (folder, FALSE, camel_exception_is_set (&m->base.ex) ? NULL : &m->base.ex); camel_folder_thaw (folder); - + if (m->destination) -@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct +@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct } - + static void -em_filter_folder_element_filtered (struct _mail_msg *mm) +em_filter_folder_element_done (struct _filter_mail_msg *m) { } - + static void -em_filter_folder_element_free (struct _mail_msg *mm) +em_filter_folder_element_free (struct _filter_mail_msg *m) { - struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm; -- +- if (m->source_folder) camel_object_unref (m->source_folder); - + @@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m mail_session_flush_filter_log (); } - + -static struct _mail_msg_op em_filter_folder_element_op = { - em_filter_folder_element_describe, /* we do our own progress reporting? */ - em_filter_folder_element_filter, @@ -182,12 +182,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) em_filter_folder_element_done, + (MailMsgFreeFunc) em_filter_folder_element_free }; - + void @@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_ { struct _filter_mail_msg *m; - + - m = mail_msg_new (&em_filter_folder_element_op, NULL, sizeof (*m)); + m = mail_msg_new (&em_filter_folder_element_info); m->source_folder = source_folder; @@ -196,16 +196,16 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* convenience functions for it */ @@ -260,17 +258,16 @@ uid_cachename_hack (CamelStore *store) return filename; } - + -static char * -fetch_mail_describe (struct _mail_msg *mm, int complete) +static gchar * @@ -213,7 +213,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { return g_strdup (_("Fetching Mail")); } - + static void -fetch_mail_fetch (struct _mail_msg *mm) +fetch_mail_exec (struct _fetch_mail_msg *m) @@ -222,7 +222,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _filter_mail_msg *fm = (struct _filter_mail_msg *)mm; + struct _filter_mail_msg *fm = (struct _filter_mail_msg *)m; int i; - + if (m->cancel) @@ -283,20 +280,20 @@ fetch_mail_fetch (struct _mail_msg *mm) /* FIXME: this should support keep_on_server too, which would then perform a spool @@ -230,7 +230,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (!strncmp (m->source_uri, "mbox:", 5)) { - char *path = mail_tool_do_movemail (m->source_uri, &mm->ex); + char *path = mail_tool_do_movemail (m->source_uri, &fm->base.ex); - + - if (path && !camel_exception_is_set (&mm->ex)) { + if (path && !camel_exception_is_set (&fm->base.ex)) { camel_folder_freeze (fm->destination); @@ -238,7 +238,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &mm->ex); + camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &fm->base.ex); camel_folder_thaw (fm->destination); - + - if (!camel_exception_is_set (&mm->ex)) + if (!camel_exception_is_set (&fm->base.ex)) g_unlink (path); @@ -247,25 +247,25 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai } else { - CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &mm->ex); + CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &fm->base.ex); - + if (folder) { /* this handles 'keep on server' stuff, if we have any new uid's to copy @@ -322,17 +319,17 @@ fetch_mail_fetch (struct _mail_msg *mm) camel_uid_cache_free_uids (cache_uids); - + fm->cache = cache; - em_filter_folder_element_filter (mm); + em_filter_folder_element_exec (fm); - + /* need to uncancel so writes/etc. don't fail */ - if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) + if (fm->base.ex.id == CAMEL_EXCEPTION_USER_CANCEL) camel_operation_uncancel(NULL); - + /* save the cache of uids that we've just downloaded */ camel_uid_cache_save (cache); } - + - if (fm->delete && mm->ex.id == CAMEL_EXCEPTION_NONE) { + if (fm->delete && fm->base.ex.id == CAMEL_EXCEPTION_NONE) { /* not keep on server - just delete all the actual messages on the server */ @@ -278,11 +278,11 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - em_filter_folder_element_filter (mm); + em_filter_folder_element_exec (fm); } - + /* we unref the source folder here since we -@@ -372,31 +369,28 @@ fail: +@@ -372,31 +369,28 @@ fail: } - + static void -fetch_mail_fetched (struct _mail_msg *mm) +fetch_mail_done (struct _fetch_mail_msg *m) @@ -292,21 +292,21 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done (m->source_uri, m->data); } - + static void -fetch_mail_free (struct _mail_msg *mm) +fetch_mail_free (struct _fetch_mail_msg *m) { - struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm; -- +- g_free (m->source_uri); if (m->cancel) camel_operation_unref (m->cancel); - + - em_filter_folder_element_free (mm); + em_filter_folder_element_free ((struct _filter_mail_msg *) m); } - + -static struct _mail_msg_op fetch_mail_op = { - fetch_mail_describe, /* we do our own progress reporting */ - fetch_mail_fetch, @@ -319,12 +319,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) fetch_mail_done, + (MailMsgFreeFunc) fetch_mail_free }; - + /* ouch, a 'do everything' interface ... */ @@ -409,7 +403,7 @@ mail_fetch_mail (const char *source, int struct _fetch_mail_msg *m; struct _filter_mail_msg *fm; - + - m = mail_msg_new (&fetch_mail_op, NULL, sizeof (*m)); + m = mail_msg_new (&fetch_mail_info); fm = (struct _filter_mail_msg *)m; @@ -333,24 +333,24 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -426,7 +420,7 @@ mail_fetch_mail (const char *source, int if (status) camel_filter_driver_set_status_func (fm->driver, status, status_data); - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ********************************************************************** */ @@ -657,7 +651,7 @@ exit: /* ** SEND MAIL QUEUE ***************************************************** */ - + struct _send_queue_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *queue; char *destination; @@ -689,9 +683,8 @@ report_status (struct _send_queue_msg *m } - + static void -send_queue_send(struct _mail_msg *mm) +send_queue_exec (struct _send_queue_msg *m) @@ -371,7 +371,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_exception_xfer (&mm->ex, &ex); + camel_exception_xfer (&m->base.ex, &ex); camel_exception_clear (&ex); - + /* keep track of the number of failures */ j++; } else { @@ -382,7 +382,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai } } @@ -759,7 +752,7 @@ send_queue_send(struct _mail_msg *mm) - + if (j > 0) report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed to send %d of %d messages"), j, send_uids->len); - else if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) @@ -392,7 +392,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); @@ -785,19 +778,15 @@ send_queue_send(struct _mail_msg *mm) } - + static void -send_queue_sent(struct _mail_msg *mm) +send_queue_done (struct _send_queue_msg *m) @@ -402,20 +402,20 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->destination, m->data); } - + static void -send_queue_free(struct _mail_msg *mm) +send_queue_free (struct _send_queue_msg *m) { - struct _send_queue_msg *m = (struct _send_queue_msg *)mm; -- +- if (m->driver) camel_object_unref(m->driver); camel_object_unref(m->queue); @@ -806,11 +795,12 @@ send_queue_free(struct _mail_msg *mm) camel_operation_unref(m->cancel); } - + -static struct _mail_msg_op send_queue_op = { - NULL, /* do our own reporting, as with fetch mail */ - send_queue_send, @@ -428,12 +428,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) send_queue_done, + (MailMsgFreeFunc) send_queue_free }; - + /* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */ @@ -823,7 +813,7 @@ mail_send_queue(CamelFolder *queue, cons { struct _send_queue_msg *m; - + - m = mail_msg_new(&send_queue_op, NULL, sizeof(*m)); + m = mail_msg_new(&send_queue_info); m->queue = queue; @@ -442,23 +442,23 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -839,13 +829,13 @@ mail_send_queue(CamelFolder *queue, cons m->driver = camel_session_get_filter_driver (session, type, NULL); camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); - + - e_thread_put(mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ** APPEND MESSAGE TO FOLDER ******************************************** */ - + struct _append_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; CamelMimeMessage *message; @@ -856,45 +846,40 @@ struct _append_msg { void *data; }; - + -static char * -append_mail_desc (struct _mail_msg *mm, int done) +static gchar * @@ -466,7 +466,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { return g_strdup (_("Saving message to folder")); } - + static void -append_mail_append (struct _mail_msg *mm) +append_mail_exec (struct _append_msg *m) @@ -477,7 +477,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &mm->ex); + camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &m->base.ex); } - + static void -append_mail_appended (struct _mail_msg *mm) +append_mail_done (struct _append_msg *m) @@ -488,7 +488,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->done(m->folder, m->message, m->info, !camel_exception_is_set(&mm->ex), m->appended_uid, m->data); + m->done(m->folder, m->message, m->info, !camel_exception_is_set(&m->base.ex), m->appended_uid, m->data); } - + static void -append_mail_free (struct _mail_msg *mm) +append_mail_free (struct _append_msg *m) @@ -499,7 +499,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_object_unref(m->folder); g_free (m->appended_uid); } - + -static struct _mail_msg_op append_mail_op = { - append_mail_desc, - append_mail_append, @@ -512,12 +512,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) append_mail_done, + (MailMsgFreeFunc) append_mail_free }; - + void @@ -911,7 +896,7 @@ mail_append_mail (CamelFolder *folder, C camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); - + - m = mail_msg_new (&append_mail_op, NULL, sizeof (*m)); + m = mail_msg_new (&append_mail_info); m->folder = folder; @@ -526,23 +526,23 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -921,13 +906,13 @@ mail_append_mail (CamelFolder *folder, C m->done = done; m->data = data; - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ** TRANSFER MESSAGES **************************************************** */ - + struct _transfer_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *source; GPtrArray *uids; @@ -939,24 +924,21 @@ struct _transfer_msg { void *data; }; - + -static char * -transfer_messages_desc (struct _mail_msg *mm, int done) +static gchar * @@ -552,57 +552,57 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - return g_strdup_printf(m->delete?_("Moving messages to %s"):_("Copying messages to %s"), m->dest_uri); - + } - + static void -transfer_messages_transfer (struct _mail_msg *mm) +transfer_messages_exec (struct _transfer_msg *m) { - struct _transfer_msg *m = (struct _transfer_msg *)mm; CamelFolder *dest; - + - dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &mm->ex); - if (camel_exception_is_set (&mm->ex)) + dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &m->base.ex); + if (camel_exception_is_set (&m->base.ex)) return; - + if (dest == m->source) { @@ -968,7 +950,7 @@ transfer_messages_transfer (struct _mail camel_folder_freeze (m->source); camel_folder_freeze (dest); - + - camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &mm->ex); + camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &m->base.ex); - + /* make sure all deleted messages are marked as seen */ - + @@ -987,29 +969,26 @@ transfer_messages_transfer (struct _mail } - + static void -transfer_messages_transferred (struct _mail_msg *mm) +transfer_messages_done (struct _transfer_msg *m) { - struct _transfer_msg *m = (struct _transfer_msg *)mm; -- +- if (m->done) - m->done (!camel_exception_is_set (&mm->ex), m->data); + m->done (!camel_exception_is_set (&m->base.ex), m->data); } - + static void -transfer_messages_free (struct _mail_msg *mm) +transfer_messages_free (struct _transfer_msg *m) { - struct _transfer_msg *m = (struct _transfer_msg *)mm; -- +- camel_object_unref (m->source); g_free (m->dest_uri); em_utils_uids_free (m->uids); } - + -static struct _mail_msg_op transfer_messages_op = { - transfer_messages_desc, - transfer_messages_transfer, @@ -615,12 +615,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) transfer_messages_done, + (MailMsgFreeFunc) transfer_messages_free }; - + void @@ -1026,7 +1005,7 @@ mail_transfer_messages (CamelFolder *sou g_return_if_fail (uids != NULL); g_return_if_fail (dest_uri != NULL); - + - m = mail_msg_new(&transfer_messages_op, NULL, sizeof(*m)); + m = mail_msg_new(&transfer_messages_info); m->source = source; @@ -629,23 +629,23 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -1036,13 +1015,13 @@ mail_transfer_messages (CamelFolder *sou m->done = done; m->data = data; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ** SCAN SUBFOLDERS ***************************************************** */ - + struct _get_folderinfo_msg { - struct _mail_msg msg; + MailMsg base; - + CamelStore *store; CamelFolderInfo *info; @@ -1050,10 +1029,9 @@ struct _get_folderinfo_msg { void *data; }; - + -static char * -get_folderinfo_desc (struct _mail_msg *mm, int done) +static gchar * @@ -653,42 +653,42 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { - struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; char *ret, *name; - + name = camel_service_get_name((CamelService *)m->store, TRUE); @@ -1063,25 +1041,22 @@ get_folderinfo_desc (struct _mail_msg *m } - + static void -get_folderinfo_get (struct _mail_msg *mm) +get_folderinfo_exec (struct _get_folderinfo_msg *m) { - struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - + - m->info = camel_store_get_folder_info (m->store, NULL, flags, &mm->ex); + m->info = camel_store_get_folder_info (m->store, NULL, flags, &m->base.ex); } - + static void -get_folderinfo_got (struct _mail_msg *mm) +get_folderinfo_done (struct _get_folderinfo_msg *m) { - struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; -- +- - if (!m->info && camel_exception_is_set (&mm->ex)) { + if (!m->info && camel_exception_is_set (&m->base.ex)) { char *url; - + url = camel_service_get_url (CAMEL_SERVICE (m->store)); w(g_warning ("Error getting folder info from store at %s: %s", - url, camel_exception_get_description (&mm->ex))); + url, camel_exception_get_description (&m->base.ex))); g_free (url); } - + @@ -1090,20 +1065,19 @@ get_folderinfo_got (struct _mail_msg *mm } - + static void -get_folderinfo_free (struct _mail_msg *mm) +get_folderinfo_free (struct _get_folderinfo_msg *m) @@ -699,7 +699,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_store_free_folder_info(m->store, m->info); camel_object_unref(m->store); } - + -static struct _mail_msg_op get_folderinfo_op = { - get_folderinfo_desc, - get_folderinfo_get, @@ -712,12 +712,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_folderinfo_done, + (MailMsgFreeFunc) get_folderinfo_free }; - + int -@@ -1112,19 +1086,19 @@ mail_get_folderinfo (CamelStore *store, +@@ -1112,19 +1086,19 @@ mail_get_folderinfo (CamelStore *store, struct _get_folderinfo_msg *m; int id; - + - m = mail_msg_new(&get_folderinfo_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_folderinfo_info); if (op) { @@ -733,66 +733,66 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai m->data = data; - id = m->msg.seq; + id = m->base.seq; - + - e_thread_put(mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); - + return id; } @@ -1196,7 +1170,7 @@ mail_build_attachment(CamelFolder *folde presumably create a folder ... */ - + struct _get_folder_msg { - struct _mail_msg msg; + MailMsg base; - + char *uri; guint32 flags; @@ -1205,71 +1179,64 @@ struct _get_folder_msg { void *data; }; - + -static char * -get_folder_desc (struct _mail_msg *mm, int done) +static gchar * +get_folder_desc (struct _get_folder_msg *m) { - struct _get_folder_msg *m = (struct _get_folder_msg *)mm; -- +- return g_strdup_printf(_("Opening folder %s"), m->uri); } - + static void -get_folder_get (struct _mail_msg *mm) +get_folder_exec (struct _get_folder_msg *m) { - struct _get_folder_msg *m = (struct _get_folder_msg *)mm; -- +- - m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &mm->ex); + m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &m->base.ex); } - + static void -get_folder_got (struct _mail_msg *mm) +get_folder_done (struct _get_folder_msg *m) { - struct _get_folder_msg *m = (struct _get_folder_msg *)mm; -- +- if (m->done) m->done (m->uri, m->folder, m->data); } - + static void -get_folder_free (struct _mail_msg *mm) +get_folder_free (struct _get_folder_msg *m) { - struct _get_folder_msg *m = (struct _get_folder_msg *)mm; -- +- g_free (m->uri); if (m->folder) camel_object_unref (m->folder); } - + -static struct _mail_msg_op get_folder_op = { - get_folder_desc, - get_folder_get, @@ -805,7 +805,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_folder_done, + (MailMsgFreeFunc) get_folder_free }; - + int mail_get_folder (const char *uri, guint32 flags, void (*done)(char *uri, CamelFolder *folder, void *data), @@ -814,57 +814,57 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { struct _get_folder_msg *m; int id; - + - m = mail_msg_new(&get_folder_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_folder_info); m->uri = g_strdup (uri); m->flags = flags; m->data = data; m->done = done; - + - id = m->msg.seq; - e_thread_put(thread, (EMsg *)m); + id = m->base.seq; + dispatch (m); return id; } - + /* ** GET STORE ******************************************************* */ - + struct _get_store_msg { - struct _mail_msg msg; + MailMsg base; - + char *uri; CamelStore *store; @@ -1277,50 +1244,43 @@ struct _get_store_msg { void *data; }; - + -static char * -get_store_desc (struct _mail_msg *mm, int done) +static gchar * +get_store_desc (struct _get_store_msg *m) { - struct _get_store_msg *m = (struct _get_store_msg *)mm; -- +- return g_strdup_printf(_("Opening store %s"), m->uri); } - + static void -get_store_get (struct _mail_msg *mm) +get_store_exec (struct _get_store_msg *m) { - struct _get_store_msg *m = (struct _get_store_msg *)mm; -- +- /*camel_session_get_store connects us, which we don't want to do on startup. */ - + m->store = (CamelStore *) camel_session_get_service (session, m->uri, CAMEL_PROVIDER_STORE, - &mm->ex); + &m->base.ex); } - + static void -get_store_got (struct _mail_msg *mm) +get_store_done (struct _get_store_msg *m) @@ -874,18 +874,18 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done (m->uri, m->store, m->data); } - + static void -get_store_free (struct _mail_msg *mm) +get_store_free (struct _get_store_msg *m) { - struct _get_store_msg *m = (struct _get_store_msg *)mm; -- +- g_free (m->uri); if (m->store) camel_object_unref (m->store); } - + -static struct _mail_msg_op get_store_op = { - get_store_desc, - get_store_get, @@ -898,12 +898,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_store_done, + (MailMsgFreeFunc) get_store_free }; - + int @@ -1329,25 +1289,25 @@ mail_get_store (const char *uri, CamelOp struct _get_store_msg *m; int id; - + - m = mail_msg_new (&get_store_op, NULL, sizeof (*m)); + m = mail_msg_new (&get_store_info); if (op) { @@ -916,36 +916,36 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai m->uri = g_strdup (uri); m->data = data; m->done = done; - + - id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); return id; } - + /* ** REMOVE FOLDER ******************************************************* */ - + struct _remove_folder_msg { - struct _mail_msg msg; + MailMsg base; - + char *uri; gboolean removed; @@ -1355,18 +1315,15 @@ struct _remove_folder_msg { void *data; }; - + -static char * -remove_folder_desc (struct _mail_msg *mm, int done) +static gchar * +remove_folder_desc (struct _remove_folder_msg *m) { - struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; -- +- return g_strdup_printf (_("Removing folder %s"), m->uri); } - + static void -remove_folder_get (struct _mail_msg *mm) +remove_folder_exec (struct _remove_folder_msg *m) @@ -955,17 +955,17 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai CamelFolder *folder; GPtrArray *uids; @@ -1374,7 +1331,7 @@ remove_folder_get (struct _mail_msg *mm) - + m->removed = FALSE; - + - folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); + folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); if (!folder) return; - + @@ -1394,16 +1351,14 @@ remove_folder_get (struct _mail_msg *mm) camel_store_unsubscribe_folder (store, folder->full_name, NULL); - + /* Then delete the folder from the store */ - camel_store_delete_folder (store, folder->full_name, &mm->ex); - m->removed = !camel_exception_is_set (&mm->ex); @@ -973,7 +973,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + m->removed = !camel_exception_is_set (&m->base.ex); camel_object_unref (folder); } - + static void -remove_folder_got (struct _mail_msg *mm) +remove_folder_done (struct _remove_folder_msg *m) @@ -985,16 +985,16 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai } @@ -1413,18 +1368,17 @@ remove_folder_got (struct _mail_msg *mm) } - + static void -remove_folder_free (struct _mail_msg *mm) +remove_folder_free (struct _remove_folder_msg *m) { - struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; -- +- g_free (m->uri); } - + -static struct _mail_msg_op remove_folder_op = { - remove_folder_desc, - remove_folder_get, @@ -1007,43 +1007,43 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) remove_folder_done, + (MailMsgFreeFunc) remove_folder_free }; - + void @@ -1432,59 +1386,56 @@ mail_remove_folder (const char *uri, voi { struct _remove_folder_msg *m; - + - m = mail_msg_new (&remove_folder_op, NULL, sizeof (*m)); + m = mail_msg_new (&remove_folder_info); m->uri = g_strdup (uri); m->data = data; m->done = done; - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ** SYNC FOLDER ********************************************************* */ - + struct _sync_folder_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; void (*done) (CamelFolder *folder, void *data); void *data; }; - + -static char *sync_folder_desc(struct _mail_msg *mm, int done) +static gchar * +sync_folder_desc (struct _sync_folder_msg *m) { - struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; - - return g_strdup_printf (_("Storing folder \'%s\'"), + return g_strdup_printf (_("Storing folder \'%s\'"), camel_folder_get_full_name (m->folder)); } - + -static void sync_folder_sync(struct _mail_msg *mm) +static void +sync_folder_exec (struct _sync_folder_msg *m) @@ -1053,7 +1053,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_folder_sync(m->folder, FALSE, &mm->ex); + camel_folder_sync(m->folder, FALSE, &m->base.ex); } - + -static void sync_folder_synced(struct _mail_msg *mm) +static void +sync_folder_done (struct _sync_folder_msg *m) @@ -1063,7 +1063,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->folder, m->data); } - + -static void sync_folder_free(struct _mail_msg *mm) +static void +sync_folder_free (struct _sync_folder_msg *m) @@ -1072,7 +1072,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_object_unref((CamelObject *)m->folder); } - + -static struct _mail_msg_op sync_folder_op = { - sync_folder_desc, - sync_folder_sync, @@ -1085,47 +1085,47 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) sync_folder_done, + (MailMsgFreeFunc) sync_folder_free }; - + void @@ -1492,19 +1443,19 @@ mail_sync_folder(CamelFolder *folder, vo { struct _sync_folder_msg *m; - + - m = mail_msg_new(&sync_folder_op, NULL, sizeof(*m)); + m = mail_msg_new(&sync_folder_info); m->folder = folder; camel_object_ref(folder); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ** SYNC STORE ********************************************************* */ - + struct _sync_store_msg { - struct _mail_msg msg; + MailMsg base; - + CamelStore *store; int expunge; @@ -1512,9 +1463,9 @@ struct _sync_store_msg { void *data; }; - + -static char *sync_store_desc(struct _mail_msg *mm, int done) +static gchar * +sync_store_desc (struct _sync_store_msg *m) { - struct _sync_store_msg *m = (struct _sync_store_msg *)mm; char *uri, *res; - + uri = camel_url_to_string(((CamelService *)m->store)->url, CAMEL_URL_HIDE_ALL); @@ -1527,33 +1478,31 @@ static char *sync_store_desc(struct _mai return res; } - + -static void sync_store_sync(struct _mail_msg *mm) +static void +sync_store_exec (struct _sync_store_msg *m) @@ -1135,7 +1135,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_store_sync(m->store, m->expunge, &mm->ex); + camel_store_sync(m->store, m->expunge, &m->base.ex); } - + -static void sync_store_synced(struct _mail_msg *mm) +static void +sync_store_done (struct _sync_store_msg *m) @@ -1145,7 +1145,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->store, m->data); } - + -static void sync_store_free(struct _mail_msg *mm) +static void +sync_store_free (struct _sync_store_msg *m) @@ -1154,7 +1154,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_object_unref(m->store); } - + -static struct _mail_msg_op sync_store_op = { - sync_store_desc, - sync_store_sync, @@ -1167,12 +1167,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) sync_store_done, + (MailMsgFreeFunc) sync_store_free }; - + void @@ -1561,36 +1510,37 @@ mail_sync_store(CamelStore *store, int e { struct _sync_store_msg *m; - + - m = mail_msg_new(&sync_store_op, NULL, sizeof(*m)); + m = mail_msg_new(&sync_store_info); m->store = store; @@ -1180,20 +1180,20 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_object_ref(store); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ******************************************************************************** */ - + -static char *refresh_folder_desc(struct _mail_msg *mm, int done) +static gchar * +refresh_folder_desc (struct _sync_folder_msg *m) { return g_strdup(_("Refreshing folder")); } - + -static void refresh_folder_refresh(struct _mail_msg *mm) +static void +refresh_folder_exec (struct _sync_folder_msg *m) @@ -1203,7 +1203,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_folder_refresh_info(m->folder, &mm->ex); + camel_folder_refresh_info(m->folder, &m->base.ex); } - + /* we just use the sync stuff where we can, since it would be the same */ -static struct _mail_msg_op refresh_folder_op = { - refresh_folder_desc, @@ -1217,32 +1217,32 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) sync_folder_done, + (MailMsgFreeFunc) sync_folder_free }; - + void @@ -1598,35 +1548,36 @@ mail_refresh_folder(CamelFolder *folder, { struct _sync_folder_msg *m; - + - m = mail_msg_new(&refresh_folder_op, NULL, sizeof(*m)); + m = mail_msg_new(&refresh_folder_info); m->folder = folder; camel_object_ref(folder); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ******************************************************************************** */ - + -static char *expunge_folder_desc(struct _mail_msg *mm, int done) +static gchar * +expunge_folder_desc (struct _sync_folder_msg *m) { return g_strdup(_("Expunging folder")); } - + -static void expunge_folder_expunge(struct _mail_msg *mm) +static void +expunge_folder_exec (struct _sync_folder_msg *m) @@ -1252,7 +1252,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_folder_expunge(m->folder, &mm->ex); + camel_folder_expunge(m->folder, &m->base.ex); } - + /* we just use the sync stuff where we can, since it would be the same */ -static struct _mail_msg_op expunge_folder_op = { - expunge_folder_desc, @@ -1266,34 +1266,34 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) sync_folder_done, + (MailMsgFreeFunc) sync_folder_free }; - + void @@ -1634,31 +1585,30 @@ mail_expunge_folder(CamelFolder *folder, { struct _sync_folder_msg *m; - + - m = mail_msg_new(&expunge_folder_op, NULL, sizeof(*m)); + m = mail_msg_new(&expunge_folder_info); m->folder = folder; camel_object_ref(folder); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ******************************************************************************** */ - + struct _empty_trash_msg { - struct _mail_msg msg; + MailMsg base; - + EAccount *account; void (*done) (EAccount *account, void *data); void *data; }; - + -static char *empty_trash_desc(struct _mail_msg *mm, int done) +static gchar * +empty_trash_desc (struct _empty_trash_msg *m) @@ -1302,13 +1302,13 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai #if 0 - struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; - - return g_strdup_printf (_("Emptying trash in \'%s\'"), + return g_strdup_printf (_("Emptying trash in \'%s\'"), m->account ? m->account->name : _("Local Folders")); #else @@ -1666,49 +1616,48 @@ static char *empty_trash_desc(struct _ma #endif } - + -static void empty_trash_empty(struct _mail_msg *mm) +static void +empty_trash_exec (struct _empty_trash_msg *m) @@ -1317,7 +1317,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai const char *evolution_dir; CamelFolder *trash; char *uri; - + if (m->account) { - trash = mail_tool_get_trash (m->account->source->url, FALSE, &mm->ex); + trash = mail_tool_get_trash (m->account->source->url, FALSE, &m->base.ex); @@ -1328,14 +1328,14 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + trash = mail_tool_get_trash (uri, TRUE, &m->base.ex); g_free (uri); } - + if (trash) - camel_folder_expunge (trash, &mm->ex); + camel_folder_expunge (trash, &m->base.ex); - + camel_object_unref (trash); } - + -static void empty_trash_emptied(struct _mail_msg *mm) +static void +empty_trash_done (struct _empty_trash_msg *m) @@ -1345,7 +1345,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->account, m->data); } - + -static void empty_trash_free(struct _mail_msg *mm) +static void +empty_trash_free (struct _empty_trash_msg *m) @@ -1355,7 +1355,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->account) g_object_unref(m->account); } - + -static struct _mail_msg_op empty_trash_op = { - empty_trash_desc, - empty_trash_empty, @@ -1368,12 +1368,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) empty_trash_done, + (MailMsgFreeFunc) empty_trash_free }; - + void @@ -1716,20 +1665,20 @@ mail_empty_trash(EAccount *account, void { struct _empty_trash_msg *m; - + - m = mail_msg_new(&empty_trash_op, NULL, sizeof(*m)); + m = mail_msg_new(&empty_trash_info); m->account = account; @@ -1381,23 +1381,23 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai g_object_ref(account); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ** GET MESSAGE(s) ***************************************************** */ - + struct _get_message_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; char *uid; @@ -1739,32 +1688,28 @@ struct _get_message_msg { CamelOperation *cancel; }; - + -static char *get_message_desc(struct _mail_msg *mm, int done) +static gchar * +get_message_desc (struct _get_message_msg *m) @@ -1406,7 +1406,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - return g_strdup_printf(_("Retrieving message %s"), m->uid); } - + -static void get_message_get(struct _mail_msg *mm) +static void +get_message_exec (struct _get_message_msg *m) @@ -1416,7 +1416,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->message = camel_folder_get_message(m->folder, m->uid, &mm->ex); + m->message = camel_folder_get_message(m->folder, m->uid, &m->base.ex); } - + -static void get_message_got(struct _mail_msg *mm) +static void +get_message_done (struct _get_message_msg *m) @@ -1426,20 +1426,20 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->folder, m->uid, m->message, m->data); } - + -static void get_message_free(struct _mail_msg *mm) +static void +get_message_free (struct _get_message_msg *m) { - struct _get_message_msg *m = (struct _get_message_msg *)mm; -- +- g_free (m->uid); camel_object_unref (m->folder); camel_operation_unref (m->cancel); @@ -1773,21 +1718,22 @@ static void get_message_free(struct _mai camel_object_unref (m->message); } - + -static struct _mail_msg_op get_message_op = { - get_message_desc, - get_message_get, @@ -1452,7 +1452,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_message_done, + (MailMsgFreeFunc) get_message_free }; - + void mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), @@ -1460,7 +1460,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + void *data, MailMsgDispatchFunc dispatch) { struct _get_message_msg *m; - + - m = mail_msg_new(&get_message_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_message_info); m->folder = folder; @@ -1469,13 +1469,13 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -1795,37 +1741,37 @@ mail_get_message(CamelFolder *folder, co m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); - + - e_thread_put(thread, (EMsg *)m); + dispatch (m); } - + typedef void (*get_done)(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *); - + -static void get_messagex_got(struct _mail_msg *mm) +static void +get_messagex_done (struct _get_message_msg *m) @@ -1488,7 +1488,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + done(m->folder, m->uid, m->message, m->data, &m->base.ex); } } - + -static struct _mail_msg_op get_messagex_op = { - get_message_desc, - get_message_get, @@ -1501,7 +1501,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_messagex_done, + (MailMsgFreeFunc) get_message_free }; - + /* This is temporary, to avoid having to rewrite everything that uses mail_get_message; it adds an exception argument to the callback */ void @@ -1510,7 +1510,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + void *data, MailMsgDispatchFunc dispatch) { struct _get_message_msg *m; - + - m = mail_msg_new(&get_messagex_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_messagex_info); m->folder = folder; @@ -1519,23 +1519,23 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -1833,13 +1779,13 @@ mail_get_messagex(CamelFolder *folder, c m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); - + - e_thread_put(thread, (EMsg *)m); + dispatch (m); } - + /* ********************************************************************** */ - + struct _get_messages_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; GPtrArray *uids; @@ -1849,26 +1795,25 @@ struct _get_messages_msg { void *data; }; - + -static char * get_messages_desc(struct _mail_msg *mm, int done) +static gchar * +get_messages_desc (struct _get_messages_msg *m) @@ -1543,10 +1543,10 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _get_messages_msg *m = (struct _get_messages_msg *)mm; - return g_strdup_printf(ngettext("Retrieving %d message", - "Retrieving %d messages", m->uids->len), + "Retrieving %d messages", m->uids->len), m->uids->len); } - + -static void get_messages_get(struct _mail_msg *mm) +static void +get_messages_exec (struct _get_messages_msg *m) @@ -1554,21 +1554,21 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _get_messages_msg *m = (struct _get_messages_msg *)mm; int i; CamelMimeMessage *message; - + for (i=0; iuids->len; i++) { int pc = ((i+1) * 100) / m->uids->len; - + - message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex); - camel_operation_progress(mm->cancel, pc); + message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); + camel_operation_progress(m->base.cancel, pc); if (message == NULL) break; - + @@ -1876,17 +1821,16 @@ static void get_messages_get(struct _mai } } - + -static void get_messages_got(struct _mail_msg *mm) +static void +get_messages_done (struct _get_messages_msg *m) @@ -1578,19 +1578,19 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->folder, m->uids, m->messages, m->data); } - + -static void get_messages_free(struct _mail_msg *mm) +static void +get_messages_free (struct _get_messages_msg *m) { - struct _get_messages_msg *m = (struct _get_messages_msg *)mm; int i; - + em_utils_uids_free (m->uids); @@ -1898,11 +1842,12 @@ static void get_messages_free(struct _ma camel_object_unref(m->folder); } - + -static struct _mail_msg_op get_messages_op = { - get_messages_desc, - get_messages_get, @@ -1603,12 +1603,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_messages_done, + (MailMsgFreeFunc) get_messages_free }; - + void @@ -1912,7 +1857,7 @@ mail_get_messages(CamelFolder *folder, G { struct _get_messages_msg *m; - + - m = mail_msg_new(&get_messages_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_messages_info); m->folder = folder; @@ -1617,35 +1617,35 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -1920,13 +1865,13 @@ mail_get_messages(CamelFolder *folder, G m->data = data; m->done = done; - + - e_thread_put(mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ** SAVE MESSAGES ******************************************************* */ - + struct _save_messages_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; GPtrArray *uids; @@ -1935,10 +1880,9 @@ struct _save_messages_msg { void *data; }; - + -static char *save_messages_desc(struct _mail_msg *mm, int done) +static gchar * +save_messages_desc (struct _save_messages_msg *m) { - struct _save_messages_msg *m = (struct _save_messages_msg *)mm; - - return g_strdup_printf(ngettext("Saving %d message", - "Saving %d messsages", m->uids->len), + return g_strdup_printf(ngettext("Saving %d message", + "Saving %d messsages", m->uids->len), m->uids->len); @@ -1977,9 +1921,8 @@ save_prepare_part (CamelMimePart *mime_p } - + static void -save_messages_save (struct _mail_msg *mm) +save_messages_exec (struct _save_messages_msg *m) @@ -1657,14 +1657,14 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -1996,8 +1939,8 @@ save_messages_save (struct _mail_msg *mm CamelMimeMessage *message; int pc = ((i+1) * 100) / m->uids->len; - + - message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex); - camel_operation_progress(mm->cancel, pc); + message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); + camel_operation_progress(m->base.cancel, pc); if (message == NULL) break; - + @@ -2009,7 +1952,7 @@ save_messages_save (struct _mail_msg *mm || camel_stream_flush(stream) == -1 || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1 @@ -1677,7 +1677,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -2023,28 +1966,27 @@ save_messages_save (struct _mail_msg *mm camel_object_unref(stream); } - + -static void save_messages_saved(struct _mail_msg *mm) +static void +save_messages_done (struct _save_messages_msg *m) @@ -1687,18 +1687,18 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->folder, m->uids, m->path, m->data); } - + -static void save_messages_free(struct _mail_msg *mm) +static void +save_messages_free (struct _save_messages_msg *m) { - struct _save_messages_msg *m = (struct _save_messages_msg *)mm; -- +- em_utils_uids_free (m->uids); camel_object_unref(m->folder); g_free(m->path); } - + -static struct _mail_msg_op save_messages_op = { - save_messages_desc, - save_messages_save, @@ -1711,48 +1711,48 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) save_messages_done, + (MailMsgFreeFunc) save_messages_free }; - + int -@@ -2054,7 +1996,7 @@ mail_save_messages(CamelFolder *folder, +@@ -2054,7 +1996,7 @@ mail_save_messages(CamelFolder *folder, struct _save_messages_msg *m; int id; - + - m = mail_msg_new(&save_messages_op, NULL, sizeof(*m)); + m = mail_msg_new(&save_messages_info); m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -2062,8 +2004,8 @@ mail_save_messages(CamelFolder *folder, +@@ -2062,8 +2004,8 @@ mail_save_messages(CamelFolder *folder, m->data = data; m->done = done; - + - id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } -@@ -2071,7 +2013,7 @@ mail_save_messages(CamelFolder *folder, +@@ -2071,7 +2013,7 @@ mail_save_messages(CamelFolder *folder, /* ** SAVE PART ******************************************************* */ - + struct _save_part_msg { - struct _mail_msg msg; + MailMsg base; - + CamelMimePart *part; char *path; @@ -2080,27 +2022,27 @@ struct _save_part_msg { gboolean readonly; }; - + -static char *save_part_desc(struct _mail_msg *mm, int done) +static gchar * +save_part_desc (struct _save_part_msg *m) { return g_strdup(_("Saving attachment")); } - + static void -save_part_save (struct _mail_msg *mm) +save_part_exec (struct _save_part_msg *m) @@ -1760,7 +1760,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _save_part_msg *m = (struct _save_part_msg *)mm; CamelDataWrapper *content; CamelStream *stream; - + if(!m->readonly){ if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { - camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, @@ -1776,28 +1776,28 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai m->path, g_strerror (errno)); return; @@ -2110,7 +2052,7 @@ save_part_save (struct _mail_msg *mm) - + if (camel_data_wrapper_decode_to_stream (content, stream) == -1 || camel_stream_flush (stream) == -1) - camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, + camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, _("Could not write data: %s"), g_strerror (errno)); - + @@ -2118,27 +2060,25 @@ save_part_save (struct _mail_msg *mm) } - + static void -save_part_saved (struct _mail_msg *mm) +save_part_done (struct _save_part_msg *m) { - struct _save_part_msg *m = (struct _save_part_msg *)mm; -- +- if (m->done) - m->done (m->part, m->path, !camel_exception_is_set (&mm->ex), m->data); + m->done (m->part, m->path, !camel_exception_is_set (&m->base.ex), m->data); } - + static void -save_part_free (struct _mail_msg *mm) +save_part_free (struct _save_part_msg *m) @@ -1806,7 +1806,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_object_unref (m->part); g_free (m->path); } - + -static struct _mail_msg_op save_part_op = { - save_part_desc, - save_part_save, @@ -1819,7 +1819,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) save_part_done, + (MailMsgFreeFunc) save_part_free }; - + int @@ -2147,7 +2087,7 @@ mail_save_part (CamelMimePart *part, con { @@ -1833,37 +1833,37 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -2155,8 +2095,8 @@ mail_save_part (CamelMimePart *part, con m->done = done; m->readonly = readonly; - + - id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } @@ -2165,7 +2105,7 @@ mail_save_part (CamelMimePart *part, con /* ** PREPARE OFFLINE ***************************************************** */ - + struct _prep_offline_msg { - struct _mail_msg msg; + MailMsg base; - + CamelOperation *cancel; char *uri; @@ -2173,22 +2113,22 @@ struct _prep_offline_msg { void *data; }; - + -static void prep_offline_do(struct _mail_msg *mm) +static void +prep_offline_exec (struct _prep_offline_msg *m) { - struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm; CamelFolder *folder; - + if (m->cancel) camel_operation_register(m->cancel); - + - folder = mail_tool_uri_to_folder(m->uri, 0, &mm->ex); + folder = mail_tool_uri_to_folder(m->uri, 0, &m->base.ex); if (folder) { @@ -1881,7 +1881,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -2200,28 +2140,27 @@ static void prep_offline_do(struct _mail camel_operation_unregister(m->cancel); } - + -static void prep_offline_done(struct _mail_msg *mm) +static void +prep_offline_done (struct _prep_offline_msg *m) @@ -1891,7 +1891,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->uri, m->data); } - + -static void prep_offline_free(struct _mail_msg *mm) +static void +prep_offline_free (struct _prep_offline_msg *m) @@ -1902,7 +1902,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_operation_unref(m->cancel); g_free(m->uri); } - + -static struct _mail_msg_op prep_offline_op = { - NULL, /* DO NOT CHANGE THIS, IT MUST BE NULL FOR CANCELLATION TO WORK */ - prep_offline_do, @@ -1915,12 +1915,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) prep_offline_done, + (MailMsgFreeFunc) prep_offline_free }; - + void @@ -2232,7 +2171,7 @@ mail_prep_offline(const char *uri, { struct _prep_offline_msg *m; - + - m = mail_msg_new(&prep_offline_op, NULL, sizeof(*m)); + m = mail_msg_new(&prep_offline_info); m->cancel = cancel; @@ -1929,23 +1929,23 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -2240,13 +2179,13 @@ mail_prep_offline(const char *uri, m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ** GO OFFLINE ***************************************************** */ - + struct _set_offline_msg { - struct _mail_msg msg; + MailMsg base; - + CamelStore *store; gboolean offline; @@ -2254,9 +2193,9 @@ struct _set_offline_msg { void *data; }; - + -static char *set_offline_desc(struct _mail_msg *mm, int done) +static gchar * +set_offline_desc (struct _set_offline_msg *m) @@ -1953,11 +1953,11 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _set_offline_msg *m = (struct _set_offline_msg *)mm; char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; - + @@ -2266,61 +2205,59 @@ static char *set_offline_desc(struct _ma return msg; } - + -static void set_offline_do(struct _mail_msg *mm) +static void +set_offline_exec (struct _set_offline_msg *m) @@ -1993,13 +1993,13 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai return; } } - + if (m->offline) camel_service_disconnect (CAMEL_SERVICE (m->store), - TRUE, &mm->ex); + TRUE, &m->base.ex); } - + -static void set_offline_done(struct _mail_msg *mm) +static void +set_offline_done (struct _set_offline_msg *m) @@ -2009,7 +2009,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->store, m->data); } - + -static void set_offline_free(struct _mail_msg *mm) +static void +set_offline_free (struct _set_offline_msg *m) @@ -2018,7 +2018,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_object_unref(m->store); } - + -static struct _mail_msg_op set_offline_op = { - set_offline_desc, - set_offline_do, @@ -2031,12 +2031,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) set_offline_done, + (MailMsgFreeFunc) set_offline_free }; - + int @@ -2337,61 +2274,59 @@ mail_store_set_offline (CamelStore *stor if (offline) camel_service_cancel_connect (CAMEL_SERVICE (store)); - + - m = mail_msg_new(&set_offline_op, NULL, sizeof(*m)); + m = mail_msg_new(&set_offline_info); m->store = store; @@ -2044,17 +2044,17 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai m->offline = offline; m->data = data; m->done = done; - + - id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } - + /* ** Prepare OFFLINE ***************************************************** */ - + -static char *prepare_offline_desc(struct _mail_msg *mm, int done) +static char * +prepare_offline_desc (struct _set_offline_msg *m, int done) @@ -2062,14 +2062,14 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _set_offline_msg *m = (struct _set_offline_msg *)mm; char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; - + - msg = g_strdup_printf(_("Preparing account '%s' for offline"), service_name); + msg = g_strdup_printf (_("Preparing account '%s' for offline"), service_name); g_free(service_name); - + return msg; } - + -static void prepare_offline_do(struct _mail_msg *mm) +static void +prepare_offline_exec (struct _set_offline_msg *m) @@ -2080,7 +2080,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - &mm->ex); + &m->base.ex); } - + -static void prepare_offline_done(struct _mail_msg *mm) +static void +prepare_offline_done (struct _set_offline_msg *m) @@ -2091,7 +2091,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->done(m->store, m->data); + m->done (m->store, m->data); } - + -static void prepare_offline_free(struct _mail_msg *mm) +static void +prepare_offline_free (struct _set_offline_msg *m) @@ -2101,7 +2101,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_object_unref(m->store); + camel_object_unref (m->store); } - + -static struct _mail_msg_op prepare_offline_op = { - prepare_offline_desc, - prepare_offline_do, @@ -2114,39 +2114,39 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) prepare_offline_done, + (MailMsgFreeFunc) prepare_offline_free }; - + int @@ -2404,14 +2339,14 @@ mail_store_prepare_offline (CamelStore * * thread won't get queued behind a hung connect op. */ - + - m = mail_msg_new(&prepare_offline_op, NULL, sizeof(*m)); + m = mail_msg_new(&prepare_offline_info); m->store = store; camel_object_ref(store); m->data = NULL; m->done = NULL; - + - id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } @@ -2428,7 +2363,7 @@ mail_execute_shell_command (CamelFilterD - + /* Async service-checking/authtype-lookup code. */ struct _check_msg { - struct _mail_msg msg; + MailMsg base; - + char *url; CamelProviderType type; @@ -2438,51 +2373,47 @@ struct _check_msg { void *data; }; - + -static char * -check_service_describe(struct _mail_msg *mm, int complete) +static gchar * @@ -2154,14 +2154,14 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { return g_strdup(_("Checking Service")); } - + static void -check_service_check(struct _mail_msg *mm) +check_service_exec (struct _check_msg *m) { - struct _check_msg *m = (struct _check_msg *)mm; CamelService *service; - + - service = camel_session_get_service(session, m->url, m->type, &mm->ex); + service = camel_session_get_service(session, m->url, m->type, &m->base.ex); if (!service) { @@ -2169,12 +2169,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + camel_operation_unregister(m->base.cancel); return; } - + - m->authtypes = camel_service_query_auth_types(service, &mm->ex); + m->authtypes = camel_service_query_auth_types(service, &m->base.ex); camel_object_unref(service); } - + static void -check_service_done(struct _mail_msg *mm) +check_service_done (struct _check_msg *m) @@ -2184,7 +2184,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->url, m->type, m->authtypes, m->data); } - + static void -check_service_free(struct _mail_msg *mm) +check_service_free (struct _check_msg *m) @@ -2194,7 +2194,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai g_free(m->url); g_list_free(m->authtypes); } - + -static struct _mail_msg_op check_service_op = { - check_service_describe, - check_service_check, @@ -2207,24 +2207,24 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) check_service_done, + (MailMsgFreeFunc) check_service_free }; - + int @@ -2491,14 +2422,14 @@ mail_check_service(const char *url, Came struct _check_msg *m; int id; - + - m = mail_msg_new (&check_service_op, NULL, sizeof(*m)); + m = mail_msg_new (&check_service_info); m->url = g_strdup(url); m->type = type; m->done = done; m->data = data; - + - id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/mail/em-folder-utils.c @@ -2232,27 +2232,27 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m +++ evolution-2.21.1/mail/em-folder-utils.c 2007-10-29 14:47:20.000000000 -0400 @@ -85,7 +85,7 @@ emfu_is_special_local_folder (const char } - + struct _EMCopyFolders { - struct _mail_msg msg; + MailMsg base; - + /* input data */ CamelStore *fromstore; @@ -97,18 +97,15 @@ struct _EMCopyFolders { int delete; }; - + -static char * -emft_copy_folders__desc (struct _mail_msg *mm, int complete) +static gchar * +emft_copy_folders__desc (struct _EMCopyFolders *m, gint complete) { - struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; -- +- return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); } - + static void -emft_copy_folders__copy (struct _mail_msg *mm) +emft_copy_folders__exec (struct _EMCopyFolders *m) @@ -2264,11 +2264,11 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m @@ -116,7 +113,7 @@ emft_copy_folders__copy (struct _mail_ms const char *tmp; int fromlen; - + - if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &mm->ex))) + if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) return; - + pending = g_list_append (pending, fi); @@ -156,8 +153,8 @@ emft_copy_folders__copy (struct _mail_ms if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { @@ -2279,32 +2279,32 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m + camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex); + if (camel_exception_is_set (&m->base.ex)) goto exception; - + /* this folder no longer exists, unsubscribe it */ @@ -166,16 +163,16 @@ emft_copy_folders__copy (struct _mail_ms - + deleted = 1; } else { - if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &mm->ex))) + if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex))) goto exception; - + - if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &mm->ex))) { + if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) { camel_object_unref (fromfolder); goto exception; } - + uids = camel_folder_get_uids (fromfolder); - camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &mm->ex); + camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex); camel_folder_free_uids (fromfolder, uids); - + if (m->delete) @@ -186,7 +183,7 @@ emft_copy_folders__copy (struct _mail_ms } } - + - if (camel_exception_is_set (&mm->ex)) + if (camel_exception_is_set (&m->base.ex)) goto exception; @@ -2312,20 +2312,20 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m deleting = g_list_prepend (deleting, info); @@ -227,10 +224,8 @@ emft_copy_folders__copy (struct _mail_ms } - + static void -emft_copy_folders__free (struct _mail_msg *mm) +emft_copy_folders__free (struct _EMCopyFolders *m) { - struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; -- +- camel_object_unref (m->fromstore); camel_object_unref (m->tostore); - + @@ -238,11 +233,12 @@ emft_copy_folders__free (struct _mail_ms g_free (m->tobase); } - + -static struct _mail_msg_op copy_folders_op = { - emft_copy_folders__desc, - emft_copy_folders__copy, @@ -2338,60 +2338,60 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) emft_copy_folders__free }; - + int -@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore +@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore struct _EMCopyFolders *m; int seq; - + - m = mail_msg_new (©_folders_op, NULL, sizeof (struct _EMCopyFolders)); + m = mail_msg_new (©_folders_info); camel_object_ref (fromstore); m->fromstore = fromstore; camel_object_ref (tostore); -@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore +@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore m->frombase = g_strdup (frombase); m->tobase = g_strdup (tobase); m->delete = delete; - seq = m->msg.seq; + seq = m->base.seq; - + - e_thread_put (mail_thread_new, (EMsg *) m); + mail_msg_unordered_push (m); - + return seq; } @@ -558,7 +554,7 @@ em_folder_utils_rename_folder (CamelFold } - + struct _EMCreateFolder { - struct _mail_msg msg; + MailMsg base; - + /* input data */ CamelStore *store; -@@ -582,41 +578,33 @@ struct _EMCreateFolderTempData +@@ -582,41 +578,33 @@ struct _EMCreateFolderTempData char *uri; }; - + -static char * -emfu_create_folder__desc (struct _mail_msg *mm, int done) +static gchar * +emfu_create_folder__desc (struct _EMCreateFolder *m) { - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- +- return g_strdup_printf (_("Creating folder `%s'"), m->full_name); } - + static void -emfu_create_folder__create (struct _mail_msg *mm) +emfu_create_folder__exec (struct _EMCreateFolder *m) { - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- +- d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - + - if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { + if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { if (camel_store_supports_subscriptions (m->store)) @@ -2399,30 +2399,30 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m + camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); } } - + static void -emfu_create_folder__created (struct _mail_msg *mm) +emfu_create_folder__done (struct _EMCreateFolder *m) { - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- +- if (m->done) m->done (m->fi, m->user_data); } - + static void -emfu_create_folder__free (struct _mail_msg *mm) +emfu_create_folder__free (struct _EMCreateFolder *m) { - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- +- camel_store_free_folder_info (m->store, m->fi); camel_object_unref (m->store); g_free (m->full_name); @@ -624,11 +612,12 @@ emfu_create_folder__free (struct _mail_m g_free (m->name); } - + -static struct _mail_msg_op create_folder_op = { - emfu_create_folder__desc, - emfu_create_folder__create, @@ -2435,26 +2435,26 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m + (MailMsgDoneFunc) emfu_create_folder__done, + (MailMsgFreeFunc) emfu_create_folder__free }; - - + + @@ -649,7 +638,7 @@ emfu_create_folder_real (CamelStore *sto parent = namebuf; } - + - m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); + m = mail_msg_new (&create_folder_info); camel_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); @@ -660,8 +649,8 @@ emfu_create_folder_real (CamelStore *sto - + g_free (namebuf); - + - id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *) m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2.21.1/mail/importers/elm-importer.c @@ -2462,17 +2462,17 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 +++ evolution-2.21.1/mail/importers/elm-importer.c 2007-10-29 14:47:20.000000000 -0400 @@ -51,7 +51,7 @@ #define d(x) x - + struct _elm_import_msg { - struct _mail_msg msg; + MailMsg base; - + EImport *import; EImportTargetHome *target; @@ -178,8 +178,8 @@ elm_supported(EImport *ei, EImportTarget return mailexists; } - + -static char * -elm_import_describe (struct _mail_msg *mm, int complete) +static gchar * @@ -2482,7 +2482,7 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 } @@ -190,9 +190,8 @@ static MailImporterSpecial elm_special_f }; - + static void -elm_import_import(struct _mail_msg *mm) +elm_import_exec (struct _elm_import_msg *m) @@ -2490,10 +2490,10 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 - struct _elm_import_msg *m = (struct _elm_import_msg *) mm; const char *maildir; char *elmdir; - + @@ -210,13 +209,11 @@ elm_import_import(struct _mail_msg *mm) } - + static void -elm_import_imported(struct _mail_msg *mm) +elm_import_done(struct _elm_import_msg *m) @@ -2501,15 +2501,15 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 - struct _elm_import_msg *m = (struct _elm_import_msg *)mm; - printf("importing complete\n"); - + - if (!camel_exception_is_set(&mm->ex)) { + if (!camel_exception_is_set(&m->base.ex)) { GConfClient *gconf; - + gconf = gconf_client_get_default(); @@ -228,10 +225,8 @@ elm_import_imported(struct _mail_msg *mm } - + static void -elm_import_free(struct _mail_msg *mm) +elm_import_free(struct _elm_import_msg *m) @@ -2517,12 +2517,12 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 - struct _elm_import_msg *m = (struct _elm_import_msg *)mm; - camel_operation_unref(m->status); - + g_free(m->status_what); @@ -280,11 +275,12 @@ elm_status_timeout(void *data) return TRUE; } - + -static struct _mail_msg_op elm_import_op = { - elm_import_describe, - elm_import_import, @@ -2535,12 +2535,12 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 + (MailMsgDoneFunc) elm_import_done, + (MailMsgFreeFunc) elm_import_free }; - + static int @@ -293,7 +289,7 @@ mail_importer_elm_import(EImport *ei, EI struct _elm_import_msg *m; int id; - + - m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); + m = mail_msg_new(&elm_import_info); g_datalist_set_data(&target->data, "elm-msg", m); @@ -2549,13 +2549,13 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 @@ -302,9 +298,9 @@ mail_importer_elm_import(EImport *ei, EI m->status_lock = g_mutex_new(); m->status = camel_operation_new(elm_status, m); - + - id = m->msg.seq; + id = m->base.seq; - + - e_thread_put(mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); - + return id; } diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution-2.21.1/mail/importers/mail-importer.c @@ -2563,17 +2563,17 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- +++ evolution-2.21.1/mail/importers/mail-importer.c 2007-10-29 14:47:50.000000000 -0400 @@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } - + struct _import_mbox_msg { - struct _mail_msg msg; + MailMsg base; - + char *path; char *uri; @@ -142,8 +142,8 @@ struct _import_mbox_msg { void *done_data; }; - + -static char * -import_mbox_describe(struct _mail_msg *mm, int complete) +static gchar * @@ -2583,7 +2583,7 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- } @@ -190,9 +190,8 @@ decode_mozilla_status(const char *tmp) } - + static void -import_mbox_import(struct _mail_msg *mm) +import_mbox_exec (struct _import_mbox_msg *m) @@ -2598,26 +2598,26 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- else - folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &mm->ex); + folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); - + if (folder == NULL) return; @@ -262,11 +261,11 @@ import_mbox_import(struct _mail_msg *mm) flags |= decode_status(tmp); - + camel_message_info_set_flags(info, flags, ~0); - camel_folder_append_message(folder, msg, info, NULL, &mm->ex); + camel_folder_append_message(folder, msg, info, NULL, &m->base.ex); camel_message_info_free(info); camel_object_unref(msg); - + - if (camel_exception_is_set(&mm->ex)) + if (camel_exception_is_set(&m->base.ex)) break; - + camel_mime_parser_step(mp, 0, 0); @@ -286,30 +285,27 @@ fail1: } - + static void -import_mbox_done(struct _mail_msg *mm) +import_mbox_done (struct _import_mbox_msg *m) @@ -2628,19 +2628,19 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- - m->done(m->done_data, &mm->ex); + m->done(m->done_data, &m->base.ex); } - + static void -import_mbox_free (struct _mail_msg *mm) +import_mbox_free (struct _import_mbox_msg *m) { - struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; -- +- if (m->cancel) camel_operation_unref(m->cancel); g_free(m->uri); g_free(m->path); } - + -static struct _mail_msg_op import_mbox_op = { - import_mbox_describe, - import_mbox_import, @@ -2653,12 +2653,12 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- + (MailMsgDoneFunc) import_mbox_done, + (MailMsgFreeFunc) import_mbox_free }; - + int @@ -318,7 +314,7 @@ mail_importer_import_mbox(const char *pa struct _import_mbox_msg *m; int id; - + - m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); + m = mail_msg_new(&import_mbox_info); m->path = g_strdup(path); @@ -2667,18 +2667,18 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- @@ -328,8 +324,8 @@ mail_importer_import_mbox(const char *pa camel_operation_ref(cancel); } - + - id = m->msg.seq; - e_thread_put(mail_thread_queued, (EMsg *)m); + id = m->base.seq; + mail_msg_fast_ordered_push (m); - + return id; } @@ -339,7 +335,7 @@ mail_importer_import_mbox_sync(const cha { struct _import_mbox_msg *m; - + - m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); + m = mail_msg_new(&import_mbox_info); m->path = g_strdup(path); @@ -2687,7 +2687,7 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- @@ -347,9 +343,9 @@ mail_importer_import_mbox_sync(const cha camel_operation_ref(cancel); } - + - import_mbox_import(&m->msg); - import_mbox_done(&m->msg); - mail_msg_free(&m->msg); @@ -2695,24 +2695,24 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- + import_mbox_done(m); + mail_msg_unref(m); } - + struct _import_folders_data { diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution-2.21.1/mail/importers/pine-importer.c --- evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread 2007-10-23 06:06:23.000000000 -0400 +++ evolution-2.21.1/mail/importers/pine-importer.c 2007-10-29 14:47:20.000000000 -0400 @@ -56,7 +56,7 @@ #define d(x) x - + struct _pine_import_msg { - struct _mail_msg msg; + MailMsg base; - + EImport *import; EImportTarget *target; @@ -223,8 +223,8 @@ import_contacts(void) g_object_unref(book); } - + -static char * -pine_import_describe (struct _mail_msg *mm, int complete) +static gchar * @@ -2722,7 +2722,7 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- } @@ -236,10 +236,8 @@ static MailImporterSpecial pine_special_ }; - + static void -pine_import_import(struct _mail_msg *mm) +pine_import_exec(struct _pine_import_msg *m) @@ -2731,10 +2731,10 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- - if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) import_contacts(); - + @@ -253,13 +251,11 @@ pine_import_import(struct _mail_msg *mm) } - + static void -pine_import_imported(struct _mail_msg *mm) +pine_import_done(struct _pine_import_msg *m) @@ -2742,15 +2742,15 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- - struct _pine_import_msg *m = (struct _pine_import_msg *)mm; - printf("importing complete\n"); - + - if (!camel_exception_is_set(&mm->ex)) { + if (!camel_exception_is_set(&m->base.ex)) { GConfClient *gconf; - + gconf = gconf_client_get_default(); @@ -274,10 +270,8 @@ pine_import_imported(struct _mail_msg *m } - + static void -pine_import_free(struct _mail_msg *mm) +pine_import_free(struct _pine_import_msg *m) @@ -2758,12 +2758,12 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- - struct _pine_import_msg *m = (struct _pine_import_msg *)mm; - camel_operation_unref(m->status); - + g_free(m->status_what); @@ -326,11 +320,12 @@ pine_status_timeout(void *data) return TRUE; } - + -static struct _mail_msg_op pine_import_op = { - pine_import_describe, - pine_import_import, @@ -2776,12 +2776,12 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- + (MailMsgDoneFunc) pine_import_done, + (MailMsgFreeFunc) pine_import_free }; - + static int @@ -339,7 +334,7 @@ mail_importer_pine_import(EImport *ei, E struct _pine_import_msg *m; int id; - + - m = mail_msg_new(&pine_import_op, NULL, sizeof (*m)); + m = mail_msg_new(&pine_import_info); g_datalist_set_data(&target->data, "pine-msg", m); @@ -2790,13 +2790,13 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- @@ -348,9 +343,9 @@ mail_importer_pine_import(EImport *ei, E m->status_lock = g_mutex_new(); m->status = camel_operation_new(pine_status, m); - + - id = m->msg.seq; + id = m->base.seq; - + - e_thread_put(mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); - + return id; } diff -up evolution-2.21.1/mail/em-utils.c.kill-ethread evolution-2.21.1/mail/em-utils.c @@ -2808,34 +2808,34 @@ diff -up evolution-2.21.1/mail/em-utils.c.kill-ethread evolution-2.21.1/mail/em- EBook *book; - void *hook; + GHook *hook; - + d(printf(" checking '%s'\n", e_source_get_uri(source))); - + diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail/mail-vfolder.c --- evolution-2.21.1/mail/mail-vfolder.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 +++ evolution-2.21.1/mail/mail-vfolder.c 2007-10-29 14:47:20.000000000 -0400 @@ -21,7 +21,7 @@ */ - + #include - +#include #include - + #include @@ -75,7 +75,7 @@ static void rule_changed(FilterRule *rul /* ********************************************************************** */ - + struct _setup_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; char *query; @@ -83,18 +83,15 @@ struct _setup_msg { GList *sources_folder; }; - + -static char * -vfolder_setup_desc(struct _mail_msg *mm, int done) +static gchar * @@ -2845,7 +2845,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name); } - + static void -vfolder_setup_do(struct _mail_msg *mm) +vfolder_setup_exec (struct _setup_msg *m) @@ -2853,7 +2853,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - struct _setup_msg *m = (struct _setup_msg *)mm; GList *l, *list = NULL; CamelFolder *folder; - + @@ -105,12 +102,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l && !shutdown) { @@ -2871,7 +2871,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail } @@ -135,17 +132,13 @@ vfolder_setup_do(struct _mail_msg *mm) } - + static void -vfolder_setup_done(struct _mail_msg *mm) +vfolder_setup_done (struct _setup_msg *m) @@ -2880,19 +2880,19 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - - m = m; } - + static void -vfolder_setup_free (struct _mail_msg *mm) +vfolder_setup_free (struct _setup_msg *m) { - struct _setup_msg *m = (struct _setup_msg *)mm; GList *l; - + camel_object_unref(m->folder); @@ -166,11 +159,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } - + -static struct _mail_msg_op vfolder_setup_op = { - vfolder_setup_desc, - vfolder_setup_do, @@ -2905,12 +2905,12 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) vfolder_setup_done, + (MailMsgFreeFunc) vfolder_setup_free }; - + /* sources_uri should be camel uri's */ @@ -180,15 +174,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; - + - m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); + m = mail_msg_new(&vfolder_setup_info); m->folder = folder; @@ -2918,26 +2918,26 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail m->query = g_strdup(query); m->sources_uri = sources_uri; m->sources_folder = sources_folder; - + - id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + id = m->base.seq; + mail_msg_slow_ordered_push (m); - + return id; } @@ -196,17 +190,16 @@ vfolder_setup(CamelFolder *folder, const /* ********************************************************************** */ - + struct _adduri_msg { - struct _mail_msg msg; + MailMsg base; - + char *uri; GList *folders; int remove; }; - + -static char * -vfolder_adduri_desc(struct _mail_msg *mm, int done) +static gchar * @@ -2945,11 +2945,11 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail { - struct _adduri_msg *m = (struct _adduri_msg *)mm; char *euri, *desc = NULL; - + /* Yuck yuck. Lookup the account name and use that to describe the path */ @@ -250,9 +243,8 @@ vfolder_adduri_desc(struct _mail_msg *mm } - + static void -vfolder_adduri_do(struct _mail_msg *mm) +vfolder_adduri_exec (struct _adduri_msg *m) @@ -2957,19 +2957,19 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - struct _adduri_msg *m = (struct _adduri_msg *)mm; GList *l; CamelFolder *folder = NULL; - + @@ -269,7 +261,7 @@ vfolder_adduri_do(struct _mail_msg *mm) } - + if (folder == NULL) - folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); + folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); - + if (folder != NULL) { l = m->folders; @@ -285,28 +277,24 @@ vfolder_adduri_do(struct _mail_msg *mm) } - + static void -vfolder_adduri_done(struct _mail_msg *mm) +vfolder_adduri_done(struct _adduri_msg *m) @@ -2978,7 +2978,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - - m = m; } - + static void -vfolder_adduri_free (struct _mail_msg *mm) +vfolder_adduri_free (struct _adduri_msg *m) @@ -2989,7 +2989,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail g_list_free(m->folders); g_free(m->uri); } - + -static struct _mail_msg_op vfolder_adduri_op = { - vfolder_adduri_desc, - vfolder_adduri_do, @@ -3002,50 +3002,50 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) vfolder_adduri_done, + (MailMsgFreeFunc) vfolder_adduri_free }; - - + + @@ -317,13 +305,13 @@ vfolder_adduri(const char *uri, GList *f struct _adduri_msg *m; int id; - + - m = mail_msg_new(&vfolder_adduri_op, NULL, sizeof (*m)); + m = mail_msg_new(&vfolder_adduri_info); m->folders = folders; m->uri = g_strdup(uri); m->remove = remove; - + - id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + id = m->base.seq; + mail_msg_slow_ordered_push (m); - + return id; } -@@ -447,7 +435,7 @@ mail_vfolder_add_uri(CamelStore *store, +@@ -447,7 +435,7 @@ mail_vfolder_add_uri(CamelStore *store, return; } - + - g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); + g_return_if_fail (mail_in_main_thread()); - + is_ignore = uri_is_ignore(store, curi); - + @@ -543,7 +531,7 @@ mail_vfolder_delete_uri(CamelStore *stor - + d(printf ("Deleting uri to check: %s\n", uri)); - + - g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); + g_return_if_fail (mail_in_main_thread()); - + changed = g_string_new (""); - + @@ -627,7 +615,7 @@ mail_vfolder_rename_uri(CamelStore *stor if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) return; - + - g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); + g_return_if_fail (mail_in_main_thread()); - + from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/mail/em-format-html.c @@ -3059,27 +3059,27 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma + mail_msg_unref(efh->priv->format_timeout_msg); efh->priv->format_timeout_msg = NULL; } - + @@ -1205,7 +1205,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc - + /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { - struct _mail_msg msg; + MailMsg base; - + EMFormatHTML *format; EMFormat *format_source; @@ -1215,14 +1215,15 @@ struct _format_msg { CamelMimeMessage *message; }; - + -static char *efh_format_desc(struct _mail_msg *mm, int done) +static gchar * +efh_format_desc (struct _format_msg *m) { return g_strdup(_("Formatting message")); } - + -static void efh_format_do(struct _mail_msg *mm) +static void +efh_format_exec (struct _format_msg *m) @@ -3091,7 +3091,7 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma @@ -1307,10 +1308,9 @@ static void efh_format_do(struct _mail_m ((EMFormat *)m->format)->pending_uri_level = puri_level; } - + -static void efh_format_done(struct _mail_msg *mm) +static void +efh_format_done (struct _format_msg *m) @@ -3099,12 +3099,12 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma - struct _format_msg *m = (struct _format_msg *)mm; - d(printf("formatting finished\n")); - + m->format->load_http_now = FALSE; @@ -1318,10 +1318,9 @@ static void efh_format_done(struct _mail g_signal_emit_by_name(m->format, "complete"); } - + -static void efh_format_free(struct _mail_msg *mm) +static void +efh_format_free (struct _format_msg *m) @@ -3117,7 +3117,7 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma @@ -1337,11 +1336,12 @@ static void efh_format_free(struct _mail g_object_unref(m->format_source); } - + -static struct _mail_msg_op efh_format_op = { - efh_format_desc, - efh_format_do, @@ -3130,17 +3130,17 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma + (MailMsgDoneFunc) efh_format_done, + (MailMsgFreeFunc) efh_format_free }; - + static gboolean @@ -1352,7 +1352,7 @@ efh_format_timeout(struct _format_msg *m struct _EMFormatHTMLPrivate *p = efh->priv; - + if (m->format->html == NULL) { - mail_msg_free(m); + mail_msg_unref(m); return FALSE; } - + @@ -1380,7 +1380,7 @@ efh_format_timeout(struct _format_msg *m if (m->message == NULL) { hstream = gtk_html_begin(efh->html); @@ -3153,13 +3153,13 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma @@ -1402,8 +1402,8 @@ efh_format_timeout(struct _format_msg *m p->last_part = m->message; } - + - efh->priv->format_id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + efh->priv->format_id = m->base.seq; + mail_msg_unordered_push (m); } - + efh->priv->format_timeout_id = 0; @@ -1427,11 +1427,11 @@ static void efh_format_clone(EMFormat *e d(printf(" timeout for last still active, removing ...\n")); @@ -3169,7 +3169,7 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma + mail_msg_unref(efh->priv->format_timeout_msg); efh->priv->format_timeout_msg = NULL; } - + - m = mail_msg_new(&efh_format_op, NULL, sizeof(*m)); + m = mail_msg_new(&efh_format_info); m->format = (EMFormatHTML *)emf; @@ -3180,7 +3180,7 @@ diff -up evolution-2.21.1/mail/em-folder-properties.c.kill-ethread evolution-2.2 +++ evolution-2.21.1/mail/em-folder-properties.c 2007-10-29 14:47:20.000000000 -0400 @@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } - + if (folder == NULL) - mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); + mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); @@ -3196,21 +3196,21 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma struct _DragDataReceivedAsync { - struct _mail_msg msg; + MailMsg base; - + /* input data */ GdkDragContext *context; @@ -860,17 +860,16 @@ emft_drop_folder(struct _DragDataReceive - + d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); - + - if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->msg.ex))) + if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) return; - + em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); camel_object_unref(src); } - + -static char * -emft_drop_async_desc (struct _mail_msg *mm, int done) +static gchar * @@ -3219,17 +3219,17 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma - struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; CamelURL *url; char *buf; - + @@ -894,9 +893,8 @@ emft_drop_async_desc (struct _mail_msg * } - + static void -emft_drop_async_drop (struct _mail_msg *mm) +emft_drop_async__exec (struct _DragDataReceivedAsync *m) { - struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; CamelFolder *folder; - + /* for types other than folder, we can't drop to the root path */ @@ -904,14 +902,14 @@ emft_drop_async_drop (struct _mail_msg * /* copy or move (aka rename) a folder */ @@ -3252,14 +3252,14 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma /* import a message/rfc822 stream */ @@ -929,10 +927,25 @@ emft_drop_async_drop (struct _mail_msg * } - + static void -emft_drop_async_free (struct _mail_msg *mm) +emft_drop_async__done (struct _DragDataReceivedAsync *m) { - struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + gboolean success, delete; - + + /* ?? */ + if (m->aborted) { + success = FALSE; @@ -3268,7 +3268,7 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma + success = !camel_exception_is_set (&m->base.ex); + delete = success && m->move && !m->moved; + } -+ ++ + gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME); +} + @@ -3281,7 +3281,7 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma @@ -941,18 +954,19 @@ emft_drop_async_free (struct _mail_msg * g_free(m->selection); } - + -static struct _mail_msg_op emft_drop_async_op = { - emft_drop_async_desc, - emft_drop_async_drop, @@ -3294,7 +3294,7 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma + (MailMsgDoneFunc) emft_drop_async__done, + (MailMsgFreeFunc) emft_drop_async__free }; - + static void tree_drag_data_action(struct _DragDataReceivedAsync *m) { @@ -3302,21 +3302,21 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma - e_thread_put (mail_thread_new, (EMsg *) m); + mail_msg_unordered_push (m); } - + static void @@ -979,7 +993,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu struct _DragDataReceivedAsync *m = data; - + m->aborted = TRUE; - mail_msg_free(&m->msg); + mail_msg_unref(m); } - + static EPopupItem emft_drop_popup_menu[] = { @@ -1035,7 +1049,7 @@ tree_drag_data_received(GtkWidget *widge return; } - + - m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync)); + m = mail_msg_new (&emft_drop_async_info); m->context = context; @@ -3324,17 +3324,17 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma m->store = store; @@ -1674,7 +1688,7 @@ dump_fi (CamelFolderInfo *fi, int depth) #endif - + struct _EMFolderTreeGetFolderInfo { - struct _mail_msg msg; + MailMsg base; - + /* input data */ GtkTreeRowReference *root; @@ -1687,10 +1701,9 @@ struct _EMFolderTreeGetFolderInfo { CamelFolderInfo *fi; }; - + -static char * -emft_get_folder_info__desc(struct _mail_msg *mm, int done) +static gchar * @@ -3342,22 +3342,22 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma { - struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm; char *ret, *name; - + name = camel_service_get_name((CamelService *)m->store, TRUE); @@ -1700,18 +1713,16 @@ emft_get_folder_info__desc(struct _mail_ } - + static void -emft_get_folder_info__get (struct _mail_msg *mm) +emft_get_folder_info__exec (struct _EMFolderTreeGetFolderInfo *m) { - struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; guint32 flags = m->flags | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - + - m->fi = camel_store_get_folder_info (m->store, m->top, flags, &mm->ex); + m->fi = camel_store_get_folder_info (m->store, m->top, flags, &m->base.ex); } - + static void -emft_get_folder_info__got (struct _mail_msg *mm) +emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) @@ -3368,7 +3368,7 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma GtkTreeIter root, iter; @@ -1739,7 +1750,7 @@ emft_get_folder_info__got (struct _mail_ gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); - + /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ - if (!m->fi && camel_exception_is_set(&mm->ex)) { + if (!m->fi && camel_exception_is_set(&m->base.ex)) { @@ -3377,20 +3377,20 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma gtk_tree_path_free (path); @@ -1794,10 +1805,8 @@ emft_get_folder_info__got (struct _mail_ } - + static void -emft_get_folder_info__free (struct _mail_msg *mm) +emft_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m) { - struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; -- +- camel_store_free_folder_info (m->store, m->fi); - + gtk_tree_row_reference_free (m->root); @@ -1806,11 +1815,12 @@ emft_get_folder_info__free (struct _mail g_free (m->top); } - + -static struct _mail_msg_op get_folder_info_op = { - emft_get_folder_info__desc, - emft_get_folder_info__get, @@ -3403,12 +3403,12 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma + (MailMsgDoneFunc) emft_get_folder_info__done, + (MailMsgFreeFunc) emft_get_folder_info__free }; - + static void @@ -1897,7 +1907,7 @@ emft_tree_row_expanded (GtkTreeView *tre - + gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); - + - m = mail_msg_new (&get_folder_info_op, NULL, sizeof (struct _EMFolderTreeGetFolderInfo)); + m = mail_msg_new (&get_folder_info_info); m->root = gtk_tree_row_reference_new (model, tree_path); @@ -3417,28 +3417,28 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma @@ -1906,7 +1916,7 @@ emft_tree_row_expanded (GtkTreeView *tre m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; - + - e_thread_put (mail_thread_new, (EMsg *) m); + mail_msg_unordered_push (m); } - + static gboolean diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1/mail/em-folder-browser.c --- evolution-2.21.1/mail/em-folder-browser.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 +++ evolution-2.21.1/mail/em-folder-browser.c 2007-10-29 14:47:20.000000000 -0400 @@ -848,7 +848,7 @@ get_view_query (ESearchBar *esb) - - + + struct _setup_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; char *query; @@ -856,16 +856,15 @@ struct _setup_msg { GList *sources_folder; }; - + -static char * -vfolder_setup_desc(struct _mail_msg *mm, int done) +static gchar * @@ -3446,7 +3446,7 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 { return g_strdup(_("Searching")); } - + static void -vfolder_setup_do(struct _mail_msg *mm) +vfolder_setup_exec(struct _setup_msg *m) @@ -3454,7 +3454,7 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 - struct _setup_msg *m = (struct _setup_msg *)mm; GList *l, *list = NULL; CamelFolder *folder; - + @@ -876,12 +875,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l) { @@ -3472,7 +3472,7 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 } @@ -905,17 +904,13 @@ vfolder_setup_do(struct _mail_msg *mm) } - + static void -vfolder_setup_done(struct _mail_msg *mm) +vfolder_setup_done(struct _setup_msg *m) @@ -3481,19 +3481,19 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 - - m = m; } - + static void -vfolder_setup_free (struct _mail_msg *mm) +vfolder_setup_free (struct _setup_msg *m) { - struct _setup_msg *m = (struct _setup_msg *)mm; GList *l; - + camel_object_unref(m->folder); @@ -936,11 +931,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } - + -static struct _mail_msg_op vfolder_setup_op = { - vfolder_setup_desc, - vfolder_setup_do, @@ -3506,12 +3506,12 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 + (MailMsgDoneFunc) vfolder_setup_done, + (MailMsgFreeFunc) vfolder_setup_free }; - + /* sources_uri should be camel uri's */ @@ -950,15 +946,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; - + - m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); + m = mail_msg_new(&vfolder_setup_info); m->folder = folder; @@ -3519,30 +3519,30 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 m->query = g_strdup(query); m->sources_uri = sources_uri; m->sources_folder = sources_folder; - + - id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + id = m->base.seq; + mail_msg_slow_ordered_push (m); - + return id; } diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail/message-list.c --- evolution-2.21.1/mail/message-list.c.kill-ethread 2007-10-28 22:02:16.000000000 -0400 +++ evolution-2.21.1/mail/message-list.c 2007-10-29 14:47:20.000000000 -0400 -@@ -1848,7 +1848,7 @@ ml_tree_drag_data_get (ETree *tree, int +@@ -1848,7 +1848,7 @@ ml_tree_drag_data_get (ETree *tree, int /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ struct _drop_msg { - struct _mail_msg msg; + MailMsg base; - + GdkDragContext *context; - + @@ -1865,11 +1865,9 @@ struct _drop_msg { unsigned int aborted:1; }; - + -static char * -ml_drop_async_desc (struct _mail_msg *mm, int done) +static gchar * @@ -3555,7 +3555,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail else @@ -1877,13 +1875,11 @@ ml_drop_async_desc (struct _mail_msg *mm } - + static void -ml_drop_async_drop(struct _mail_msg *mm) +ml_drop_async_exec (struct _drop_msg *m) @@ -3571,14 +3571,14 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail em_utils_selection_get_message(m->selection, m->folder); @@ -1895,9 +1891,8 @@ ml_drop_async_drop(struct _mail_msg *mm) } - + static void -ml_drop_async_done(struct _mail_msg *mm) +ml_drop_async_done (struct _drop_msg *m) { - struct _drop_msg *m = (struct _drop_msg *)mm; gboolean success, delete; - + /* ?? */ @@ -1905,7 +1900,7 @@ ml_drop_async_done(struct _mail_msg *mm) success = FALSE; @@ -3588,23 +3588,23 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail + success = !camel_exception_is_set (&m->base.ex); delete = success && m->move && !m->moved; } - + @@ -1913,10 +1908,8 @@ ml_drop_async_done(struct _mail_msg *mm) } - + static void -ml_drop_async_free(struct _mail_msg *mm) +ml_drop_async_free (struct _drop_msg *m) { - struct _drop_msg *m = (struct _drop_msg *)mm; -- +- g_object_unref(m->context); camel_object_unref(m->folder); - + @@ -1924,18 +1917,19 @@ ml_drop_async_free(struct _mail_msg *mm) g_free(m->selection); } - + -static struct _mail_msg_op ml_drop_async_op = { - ml_drop_async_desc, - ml_drop_async_drop, @@ -3617,7 +3617,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) ml_drop_async_done, + (MailMsgFreeFunc) ml_drop_async_free }; - + static void ml_drop_action(struct _drop_msg *m) { @@ -3625,39 +3625,39 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail - e_thread_put (mail_thread_new, (EMsg *) m); + mail_msg_unordered_push (m); } - + static void @@ -1962,7 +1956,7 @@ ml_drop_popup_cancel(EPopup *ep, EPopupI struct _drop_msg *m = data; - + m->aborted = TRUE; - mail_msg_free(&m->msg); + mail_msg_unref(m); } - + static EPopupItem ml_drop_popup_menu[] = { @@ -1992,7 +1986,7 @@ ml_tree_drag_data_received (ETree *tree, if (!ml->folder || data->data == NULL || data->length == -1) return; - + - m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); + m = mail_msg_new(&ml_drop_async_info); m->context = context; g_object_ref(context); m->folder = ml->folder; @@ -3718,7 +3712,7 @@ save_hide_state (MessageList *ml) - + /* ** REGENERATE MESSAGELIST ********************************************** */ struct _regen_list_msg { - struct _mail_msg msg; + MailMsg base; - + int complete; - + @@ -3746,16 +3740,15 @@ struct _regen_list_msg { - + */ - + -static char * -regen_list_describe (struct _mail_msg *mm, gint complete) +static gchar * @@ -3665,7 +3665,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail { return g_strdup (_("Generating message list")); } - + static void -regen_list_regen (struct _mail_msg *mm) +regen_list_exec (struct _regen_list_msg *m) @@ -3682,7 +3682,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail + searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); } else { char *expr; - + @@ -3795,23 +3788,23 @@ regen_list_regen (struct _mail_msg *mm) sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); } else @@ -3697,11 +3697,11 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail uids = camel_folder_get_uids (m->folder); } } - + - if (camel_exception_is_set (&mm->ex)) + if (camel_exception_is_set (&m->base.ex)) return; - + /* perform hiding */ if (m->hideexpr && camel_folder_has_search_capability(m->folder)) { - uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex); @@ -3709,13 +3709,13 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail /* well, lets not abort just because this faileld ... */ - camel_exception_clear (&mm->ex); + camel_exception_clear (&m->base.ex); - + if (uidnew) { MESSAGE_LIST_LOCK(m->ml, hide_lock); @@ -3886,7 +3879,7 @@ regen_list_regen (struct _mail_msg *mm) - + e_profile_event_emit("list.threaduids", m->folder->full_name, 0); - + - if (!camel_operation_cancel_check(mm->cancel)) { + if (!camel_operation_cancel_check(m->base.cancel)) { /* update/build a new tree */ @@ -3723,7 +3723,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail if (m->tree) @@ -3915,17 +3908,15 @@ regen_list_regen (struct _mail_msg *mm) } - + static void -regen_list_regened (struct _mail_msg *mm) +regen_list_done (struct _regen_list_msg *m) @@ -3732,30 +3732,30 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail - if (m->ml->priv->destroyed) return; - + if (!m->complete) return; - + - if (camel_operation_cancel_check(mm->cancel)) + if (camel_operation_cancel_check(m->base.cancel)) return; - + if (m->ml->folder != m->folder) @@ -3976,9 +3967,8 @@ regen_list_regened (struct _mail_msg *mm } - + static void -regen_list_free (struct _mail_msg *mm) +regen_list_free (struct _regen_list_msg *m) { - struct _regen_list_msg *m = (struct _regen_list_msg *)mm; int i; - + e_profile_event_emit("list.regenerated", m->folder->full_name, 0); @@ -4006,11 +3996,12 @@ regen_list_free (struct _mail_msg *mm) g_object_unref(m->ml); } - + -static struct _mail_msg_op regen_list_op = { - regen_list_describe, - regen_list_regen, @@ -3768,24 +3768,24 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) regen_list_done, + (MailMsgFreeFunc) regen_list_free }; - + static gboolean -@@ -4020,7 +4011,7 @@ ml_regen_timeout(struct _regen_list_msg - +@@ -4020,7 +4011,7 @@ ml_regen_timeout(struct _regen_list_msg + m->ml->regen = g_list_prepend(m->ml->regen, m); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ - e_thread_put (mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); - + m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; @@ -4036,7 +4027,7 @@ mail_regen_cancel(MessageList *ml) GList *l = ml->regen; - + while (l) { - struct _mail_msg *mm = l->data; + MailMsg *mm = l->data; - + if (mm->cancel) camel_operation_cancel(mm->cancel); @@ -4048,7 +4039,7 @@ mail_regen_cancel(MessageList *ml) @@ -3797,10 +3797,10 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail ml->regen_timeout_msg = NULL; } } -@@ -4083,7 +4074,7 @@ mail_regen_list (MessageList *ml, const +@@ -4083,7 +4074,7 @@ mail_regen_list (MessageList *ml, const } #endif - + - m = mail_msg_new (®en_list_op, NULL, sizeof (*m)); + m = mail_msg_new (®en_list_info); m->ml = ml; @@ -3809,10 +3809,10 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/mail/em-sync-stream.h --- evolution-2.21.1/mail/em-sync-stream.h.kill-ethread 2007-10-23 06:06:27.000000000 -0400 +++ evolution-2.21.1/mail/em-sync-stream.h 2007-10-29 14:47:20.000000000 -0400 -@@ -29,41 +29,45 @@ requests are always handled in the main +@@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H - + -#ifdef __cplusplus -extern "C" { -#pragma } @@ -3825,7 +3825,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/ma - #include #include - + -typedef struct _EMSyncStream { - CamelStream parent_stream; - @@ -3851,18 +3851,18 @@ diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/ma + GString *buffer; + gboolean cancel; +}; - + - int cancel; -} EMSyncStream; - -typedef struct { +struct _EMSyncStreamClass { CamelStreamClass parent_class; - + - ssize_t (*sync_write) (CamelStream *stream, const char *buffer, size_t n); - int (*sync_close) (CamelStream *stream); - int (*sync_flush) (CamelStream *stream); -- +- -} EMSyncStreamClass; - -CamelType em_sync_stream_get_type (void); @@ -3883,19 +3883,19 @@ diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/ma + gsize size); + +G_END_DECLS - + #endif /* EM_SYNC_STREAM_H */ diff -up evolution-2.21.1/mail/em-format-html-print.c.kill-ethread evolution-2.21.1/mail/em-format-html-print.c --- evolution-2.21.1/mail/em-format-html-print.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 +++ evolution-2.21.1/mail/em-format-html-print.c 2007-10-29 14:47:20.000000000 -0400 @@ -228,7 +228,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); - + mail_get_message ( - folder, uid, emfhp_got_message, efhp, mail_thread_new); + folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); } - + void diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/mail/em-sync-stream.c --- evolution-2.21.1/mail/em-sync-stream.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 @@ -3903,7 +3903,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma @@ -25,42 +25,17 @@ #include #endif - + -#include +#include "em-sync-stream.h" + @@ -3914,15 +3914,15 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma -#include -#include "em-sync-stream.h" +#include - + #include "mail-mt.h" - + -#define LOG_STREAM - --#define d(x) +-#define d(x) - #define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass)) - + -struct _EMSyncStreamPrivate { - /* FIXME: use a single data port/gui channel for all instances */ - /* TODO: possibly just use one of the mail-mt ports ... */ @@ -3949,20 +3949,20 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma EMSS_FLUSH, @@ -68,275 +43,168 @@ enum _write_msg_t { }; - + struct _write_msg { - EMsg msg; + EMSyncStream *emss; + EFlag *done; - + enum _write_msg_t op; - + - const char *data; - size_t n; + const gchar *string; + gsize len; }; - + -static void em_sync_stream_class_init (EMSyncStreamClass *klass); -static void em_sync_stream_init (CamelObject *object); -static void em_sync_stream_finalize (CamelObject *object); @@ -3972,12 +3972,12 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma -static int stream_flush(CamelStream *stream); - static CamelStreamClass *parent_class = NULL; - + -CamelType -em_sync_stream_get_type (void) -{ - static CamelType type = CAMEL_INVALID_TYPE; -- +- - if (type == CAMEL_INVALID_TYPE) { -#ifdef LOG_STREAM - dolog = getenv("EVOLUTION_MAIL_LOG_HTML") != NULL; @@ -3991,7 +3991,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - (CamelObjectInitFunc) em_sync_stream_init, - (CamelObjectFinalizeFunc) em_sync_stream_finalize); - } -- +- - return type; -} - @@ -3999,9 +3999,9 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma -em_sync_stream_class_init (EMSyncStreamClass *klass) -{ - CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (klass); -- +- - parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; -- +- - /* virtual method overload */ - stream_class->write = stream_write; - stream_class->flush = stream_flush; @@ -4035,7 +4035,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - p->buf_used = 0; - } + struct _EMSyncStream *emss = msg->emss; - + - /* FIXME: need to handle return values */ + /* Force out any pending data before doing anything else. */ + if (emss->buffer != NULL && emss->buffer->len > 0) { @@ -4044,7 +4044,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + emss->buffer->len); + g_string_set_size (emss->buffer, 0); + } - + switch (msg->op) { - case EMSS_WRITE: - EMSS_CLASS(emss)->sync_write((CamelStream *)emss, msg->data, msg->n); @@ -4078,7 +4078,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + CAMEL_STREAM (emss)); + break; } -- +- - e_msgport_reply((EMsg *)msg); - d(printf("%p: gui sync op jobs done\n", emss)); - @@ -4092,11 +4092,11 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - struct _EMSyncStreamPrivate *p; - - p = emss->priv = g_malloc0(sizeof(*p)); - + - p->data_port = e_msgport_new(); - p->reply_port = e_msgport_new(); + e_flag_set (msg->done); - + -#ifndef G_OS_WIN32 - p->gui_channel = g_io_channel_unix_new(e_msgport_fd(p->data_port)); -#else @@ -4118,7 +4118,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - d(printf("%p: new emss\n", emss)); + return FALSE; } - + static void -sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) +emss_sync_op (EMSyncStream *emss, enum _write_msg_t op, @@ -4129,7 +4129,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - EMsg *reply_msg; - - d(printf("%p: launching sync op %d\n", emss, op)); - + - /* we do everything synchronous, we should never have any locks, and - this prevents overflow from banked up data */ - @@ -4158,19 +4158,19 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - g_io_channel_unref(p->gui_channel); + msg.string = string; + msg.len = len; - + - e_msgport_destroy(p->data_port); - e_msgport_destroy(p->reply_port); + camel_object_ref (emss); - + - p->data_port = NULL; - p->reply_port = NULL; + g_idle_add ((GSourceFunc) emss_process_message, &msg); - + - g_free(p->buf_data); + e_flag_wait (msg.done); + e_flag_free (msg.done); - + -#ifdef LOG_STREAM - if (p->logfd) - fclose(p->logfd); @@ -4179,7 +4179,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - g_free(p); + camel_object_unref (emss); } - + -static ssize_t -stream_write (CamelStream *stream, const char *buffer, size_t n) +static gssize @@ -4187,10 +4187,10 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma { EMSyncStream *emss = EM_SYNC_STREAM (stream); - struct _EMSyncStreamPrivate *p = emss->priv; - + if (emss->cancel) return -1; - + - if (pthread_equal(pthread_self(), mail_gui_thread)) { - EMSS_CLASS(emss)->sync_write(stream, buffer, n); -#ifdef LOG_STREAM @@ -4217,21 +4217,21 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - sync_op(emss, EMSS_WRITE, buffer, n); + emss_sync_op(emss, EMSS_WRITE, string, len); } - + - return (ssize_t) n; + return (gssize) len; } - + static int -stream_flush(CamelStream *stream) +emss_stream_flush (CamelStream *stream) { - EMSyncStream *emss = (EMSyncStream *)stream; + EMSyncStream *emss = EM_SYNC_STREAM (stream); - + if (emss->cancel) return -1; - + - if (pthread_equal(pthread_self(), mail_gui_thread)) - return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); + if (mail_in_main_thread ()) @@ -4239,20 +4239,20 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma else - sync_op(emss, EMSS_FLUSH, NULL, 0); + emss_sync_op (emss, EMSS_FLUSH, NULL, 0); - + return 0; } - + static int -stream_close(CamelStream *stream) +emss_stream_close (CamelStream *stream) { - EMSyncStream *emss = (EMSyncStream *)stream; + EMSyncStream *emss = EM_SYNC_STREAM (stream); - + if (emss->cancel) return -1; - + - d(printf("%p: closing stream\n", stream)); - - if (pthread_equal(pthread_self(), mail_gui_thread)) { @@ -4269,10 +4269,10 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + return EMSS_CLASS (emss)->sync_close (stream); + else + emss_sync_op (emss, EMSS_CLOSE, NULL, 0); - + return 0; } - + -void -em_sync_stream_set_buffer_size(EMSyncStream *emss, size_t size) +static void @@ -4310,7 +4310,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + NULL, + (CamelObjectInitFunc) NULL, + (CamelObjectFinalizeFunc) em_sync_stream_finalize); - + - g_free(p->buf_data); - p->buf_data = g_malloc(size); - p->buf_size = size; @@ -4330,17 +4330,17 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 +++ evolution-2.21.1/mail/em-subscribe-editor.c 2007-10-29 14:47:20.000000000 -0400 @@ -173,7 +173,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ - + struct _zsubscribe_msg { - struct _mail_msg msg; + MailMsg base; - + EMSubscribe *sub; EMSubscribeNode *node; @@ -182,20 +182,18 @@ struct _zsubscribe_msg { }; - - static void + + static void -sub_folder_subscribe (struct _mail_msg *mm) +sub_folder_exec (struct _zsubscribe_msg *m) { @@ -4353,7 +4353,7 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 - camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); + camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); } - + static void -sub_folder_subscribed (struct _mail_msg *mm) +sub_folder_done (struct _zsubscribe_msg *m) @@ -4363,16 +4363,16 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 GtkTreeIter iter; GtkTreeModel *model; EMSubscribeNode *node; -@@ -205,7 +203,7 @@ sub_folder_subscribed (struct _mail_msg +@@ -205,7 +203,7 @@ sub_folder_subscribed (struct _mail_msg if (m->sub->cancel) return; - + - if (!camel_exception_is_set(&mm->ex)) { + if (!camel_exception_is_set(&m->base.ex)) { if (m->subscribe) m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; else -@@ -226,8 +224,8 @@ sub_folder_subscribed (struct _mail_msg +@@ -226,8 +224,8 @@ sub_folder_subscribed (struct _mail_msg /* queue any further ones, or if out, update the ui */ next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); if (next) { @@ -4383,10 +4383,10 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 } else { /* should it go off the model instead? */ sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); -@@ -235,19 +233,18 @@ sub_folder_subscribed (struct _mail_msg +@@ -235,19 +233,18 @@ sub_folder_subscribed (struct _mail_msg } - - static void + + static void -sub_folder_free (struct _mail_msg *mm) +sub_folder_free (struct _zsubscribe_msg *m) { @@ -4395,7 +4395,7 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 g_free(m->path); sub_unref(m->sub); } - + -static struct _mail_msg_op sub_subscribe_folder_op = { - NULL, /*subscribe_folder_desc,*/ - sub_folder_subscribe, @@ -4408,12 +4408,12 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 + (MailMsgDoneFunc) sub_folder_done, + (MailMsgFreeFunc) sub_folder_free }; - + /* spath is tree path in string form */ -@@ -257,18 +254,18 @@ sub_subscribe_folder (EMSubscribe *sub, +@@ -257,18 +254,18 @@ sub_subscribe_folder (EMSubscribe *sub, struct _zsubscribe_msg *m; int id; - + - m = mail_msg_new (&sub_subscribe_folder_op, NULL, sizeof(*m)); + m = mail_msg_new (&sub_subscribe_folder_info); m->sub = sub; @@ -4421,7 +4421,7 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 m->node = node; m->subscribe = state; m->path = g_strdup(spath); - + - id = m->msg.seq; + id = m->base.seq; if (sub->subscribe_id == -1) { @@ -4434,23 +4434,23 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 e_dlist_addtail(&sub->subscribe, (EDListNode *)m); @@ -339,7 +336,7 @@ sub_fill_level(EMSubscribe *sub, CamelFo /* async query of folderinfo */ - + struct _emse_folderinfo_msg { - struct _mail_msg msg; + MailMsg base; - + int seq; - + @@ -349,31 +346,29 @@ struct _emse_folderinfo_msg { }; - + static void -sub_folderinfo_get (struct _mail_msg *mm) +sub_folderinfo_exec (struct _emse_folderinfo_msg *m) { - struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; char *pub_full_name=NULL; - + if (m->seq == m->sub->seq) { - camel_operation_register(mm->cancel); - m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex); @@ -4460,29 +4460,29 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 + camel_operation_unregister(m->base.cancel); } } - + static void -sub_folderinfo_got(struct _mail_msg *mm) +sub_folderinfo_done (struct _emse_folderinfo_msg *m) { - struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; EMSubscribeNode *node; - + m->sub->pending_id = -1; if (m->sub->cancel || m->seq != m->sub->seq) return; - + - if (camel_exception_is_set (&mm->ex)) { + if (camel_exception_is_set (&m->base.ex)) { g_warning ("Error getting folder info from store: %s", - camel_exception_get_description (&mm->ex)); + camel_exception_get_description (&m->base.ex)); } - + if (m->info) { @@ -394,10 +389,8 @@ sub_folderinfo_got(struct _mail_msg *mm) } - + static void -sub_folderinfo_free(struct _mail_msg *mm) +sub_folderinfo_free (struct _emse_folderinfo_msg *m) @@ -4491,11 +4491,11 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 - if (m->info) m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); - + @@ -413,11 +406,12 @@ sub_folderinfo_free(struct _mail_msg *mm sub_unref(m->sub); } - + -static struct _mail_msg_op sub_folderinfo_op = { - NULL, /*sub_folderinfo_desc, we do our own progress reporting/cancellation */ - sub_folderinfo_get, @@ -4508,39 +4508,39 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 + (MailMsgDoneFunc) sub_folderinfo_done, + (MailMsgFreeFunc) sub_folderinfo_free }; - + static int @@ -429,19 +423,19 @@ sub_queue_fill_level(EMSubscribe *sub, E d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, node?node->info->full_name:"")); - + - m = mail_msg_new (&sub_folderinfo_op, NULL, sizeof(*m)); + m = mail_msg_new (&sub_folderinfo_info); sub_ref(sub); m->sub = sub; m->node = node; m->seq = sub->seq; - + - sub->pending_id = m->msg.seq; + sub->pending_id = m->base.seq; - + sub_editor_busy(sub->editor, 1); - + - id = m->msg.seq; + id = m->base.seq; - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); return id; } - + @@ -571,7 +565,7 @@ sub_destroy(GtkWidget *w, EMSubscribe *s mail_msg_cancel(sub->subscribe_id); - + while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) - mail_msg_free(m); + mail_msg_unref(m); - + sub_unref(sub); } diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail-mt.h @@ -4549,13 +4549,13 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail @@ -23,47 +23,64 @@ #ifndef _MAIL_MT #define _MAIL_MT - + -#include #include "camel/camel-exception.h" -#include "libedataserver/e-msgport.h" #include "camel/camel-object.h" #include "camel/camel-operation.h" - + -typedef struct _mail_msg { - EMsg msg; /* parent type */ - struct _mail_msg_op *ops; /* operation functions */ @@ -4580,7 +4580,7 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail -} mail_msg_t; + MailMsgPrivate *priv; +}; - + -/* callback functions for thread message */ -typedef struct _mail_msg_op { - char *(*describe_msg)(struct _mail_msg *msg, int complete); @@ -4596,11 +4596,11 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail + MailMsgDoneFunc done; + MailMsgFreeFunc free; +}; - + /* setup ports */ void mail_msg_init(void); void mail_msg_cleanup (void); - + +gboolean mail_in_main_thread (void); + /* allocate a new message */ @@ -4615,7 +4615,7 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail void mail_msg_wait(unsigned int msgid); void mail_msg_wait_all(void); int mail_msg_active(unsigned int msgid); - + +/* dispatch a message */ +void mail_msg_main_loop_push (gpointer msg); +void mail_msg_unordered_push (gpointer msg); @@ -4629,13 +4629,13 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail +GHook * mail_cancel_hook_add (GHookFunc func, gpointer data); +void mail_cancel_hook_remove (GHook *hook); +void mail_cancel_all (void); - + /* request a string/password */ char *mail_get_password (CamelService *service, const char *prompt, @@ -112,24 +129,6 @@ void *mail_call_main(mail_call_t type, M void mail_enable_stop(void); void mail_disable_stop(void); - + -/* a message port that receives messages in the gui thread, used for sending port */ -extern EMsgPort *mail_gui_port; -/* a message port that receives messages in the gui thread, used for the reply port */ @@ -4663,7 +4663,7 @@ diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mai @@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ - + +#include "mail-mt.h" + #include "camel/camel-store.h" @@ -4671,10 +4671,10 @@ diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mai #include "camel/camel-filter-driver.h" #include "camel/camel-mime-message.h" #include "camel/camel-operation.h" - + -#include "libedataserver/e-msgport.h" #include "libedataserver/e-account.h" - + void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, @@ -55,12 +56,12 @@ void mail_transfer_messages (CamelFolder void mail_get_message (CamelFolder *folder, const char *uid, @@ -4682,13 +4682,13 @@ diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mai void *data, - EThread *thread); + MailMsgDispatchFunc dispatch); - + void mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), - void *data, EThread *thread); + void *data, MailMsgDispatchFunc dispatch); - + /* get several messages */ void mail_get_messages (CamelFolder *folder, GPtrArray *uids, @@ -70,7 +71,7 @@ void mail_get_messages (CamelFolder *fol @@ -4697,7 +4697,7 @@ diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mai void (*done) (char *uri, CamelFolder *folder, void *data), void *data, - EThread *thread); + MailMsgDispatchFunc dispatch); - + /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, diff -up evolution-2.21.1/mail/em-composer-utils.c.kill-ethread evolution-2.21.1/mail/em-composer-utils.c @@ -4706,24 +4706,24 @@ diff -up evolution-2.21.1/mail/em-composer-utils.c.kill-ethread evolution-2.21.1 @@ -557,7 +557,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; - + - id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); + id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); mail_msg_wait (id); - + if (!folder || !account->enabled) { @@ -1108,7 +1108,7 @@ em_utils_redirect_message_by_uid (CamelF g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); - + - mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); + mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); } - + static void @@ -1139,7 +1139,7 @@ em_utils_handle_receipt (CamelFolder *fo } - + if (msg == NULL) { - mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); + mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); @@ -4736,13 +4736,13 @@ diff -up evolution-2.21.1/mail/em-composer-utils.c.kill-ethread evolution-2.21.1 g_object_ref(rd->source); - mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); + mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); - + return; } @@ -2125,5 +2125,5 @@ em_utils_post_reply_to_message_by_uid (C g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); - + - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } @@ -4781,15 +4781,15 @@ diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1 --- evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 +++ evolution-2.21.1/mail/mail-folder-cache.c 2007-10-29 14:47:20.000000000 -0400 @@ -866,15 +866,14 @@ update_folders(CamelStore *store, CamelF - - + + struct _ping_store_msg { - struct _mail_msg msg; + MailMsg base; - + CamelStore *store; }; - + -static char * -ping_store_desc (struct _mail_msg *mm, int done) +static gchar * @@ -4798,17 +4798,17 @@ diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1 - struct _ping_store_msg *m = (struct _ping_store_msg *) mm; char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; - + @@ -885,10 +884,9 @@ ping_store_desc (struct _mail_msg *mm, i } - + static void -ping_store_ping (struct _mail_msg *mm) +ping_store_exec (struct _ping_store_msg *m) { gboolean online = FALSE; - struct _ping_store_msg *m = (struct _ping_store_msg *) mm; - + if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { if (CAMEL_IS_DISCO_STORE (m->store) && @@ -899,22 +897,21 @@ ping_store_ping (struct _mail_msg *mm) @@ -4818,16 +4818,16 @@ diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1 - camel_store_noop (m->store, &mm->ex); + camel_store_noop (m->store, &m->base.ex); } - + static void -ping_store_free (struct _mail_msg *mm) +ping_store_free (struct _ping_store_msg *m) { - struct _ping_store_msg *m = (struct _ping_store_msg *) mm; -- +- camel_object_unref (m->store); } - + -static struct _mail_msg_op ping_store_op = { - ping_store_desc, - ping_store_ping, @@ -4840,40 +4840,40 @@ diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1 + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) ping_store_free }; - + static void -@@ -926,11 +923,11 @@ ping_store (gpointer key, gpointer val, +@@ -926,11 +923,11 @@ ping_store (gpointer key, gpointer val, if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) return; - + - m = mail_msg_new (&ping_store_op, NULL, sizeof (struct _ping_store_msg)); + m = mail_msg_new (&ping_store_info); m->store = store; camel_object_ref (store); - + - e_thread_put (mail_thread_queued_slow, (EMsg *) m); + mail_msg_slow_ordered_push (m); } - + static gboolean @@ -975,7 +972,7 @@ mail_note_store(CamelStore *store, Camel int hook = 0; - + g_return_if_fail (CAMEL_IS_STORE(store)); - g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); + g_return_if_fail (mail_in_main_thread()); - + LOCK(info_lock); - + diff -up evolution-2.21.1/mail/em-folder-view.c.kill-ethread evolution-2.21.1/mail/em-folder-view.c --- evolution-2.21.1/mail/em-folder-view.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 +++ evolution-2.21.1/mail/em-folder-view.c 2007-10-29 14:47:20.000000000 -0400 @@ -71,6 +71,7 @@ #include - + #include +#include - + #include "menus/gal-view-etable.h" #include "menus/gal-view-factory-etable.h" @@ -777,7 +778,7 @@ emfv_got_folder(char *uri, CamelFolder * @@ -4883,25 +4883,25 @@ diff -up evolution-2.21.1/mail/em-folder-view.c.kill-ethread evolution-2.21.1/ma - mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_thread_queued); + mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_msg_fast_ordered_push); } - + static void @@ -1752,7 +1753,7 @@ filter_type_uid (CamelFolder *folder, co data->type = type; data->source = source; - + - mail_get_message (folder, uid, filter_type_got_message, data, mail_thread_new); + mail_get_message (folder, uid, filter_type_got_message, data, mail_msg_unordered_push); } - + static void @@ -1850,7 +1851,7 @@ vfolder_type_uid (CamelFolder *folder, c data->type = type; data->uri = g_strdup (uri); - + - mail_get_message (folder, uid, vfolder_type_got_message, data, mail_thread_new); + mail_get_message (folder, uid, vfolder_type_got_message, data, mail_msg_unordered_push); } - + static void @@ -2427,7 +2428,7 @@ emfv_message_selected_timeout(void *data emfv->displayed_uid); @@ -4917,46 +4917,46 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail +++ evolution-2.21.1/mail/mail-session.c 2007-10-29 14:47:20.000000000 -0400 @@ -35,7 +35,7 @@ #include - + #include -#include +#include - + #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -264,148 +264,145 @@ forget_password (CamelSession *session, - +@@ -264,148 +264,145 @@ forget_password (CamelSession *session, + /* ********************************************************************** */ - + -static GtkDialog *message_dialog; -static EDList message_list = E_DLIST_INITIALISER(message_list); +static gpointer user_message_dialog; +static GQueue user_message_queue = { NULL, NULL, 0 }; - + struct _user_message_msg { - struct _mail_msg msg; + MailMsg base; - + CamelSessionAlertType type; char *prompt; + EFlag *done; - + unsigned int allow_cancel:1; unsigned int result:1; unsigned int ismain:1; }; - + -static void do_user_message (struct _mail_msg *mm); +static void user_message_exec (struct _user_message_msg *m); - + /* clicked, send back the reply */ static void user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m) { gtk_widget_destroy ((GtkWidget *) dialog); -- +- - message_dialog = NULL; -- +- + + user_message_dialog = NULL; + @@ -4966,7 +4966,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail - e_msgport_reply((EMsg *)m); + e_flag_set (m->done); } - + /* check for pendings */ - if ((m = (struct _user_message_msg *)e_dlist_remhead(&message_list))) - do_user_message((struct _mail_msg *)m); @@ -4982,7 +4982,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + mail_msg_unref (m); + } } - + -/* This is kinda ugly/inefficient, but oh well, it works */ -static const char *error_type[] = { - "mail:session-message-info", "mail:session-message-warning", "mail:session-message-error", @@ -4996,14 +4996,14 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail - struct _user_message_msg *m = (struct _user_message_msg *)mm; - int type; + const gchar *error_type; - + - if (!m->ismain && message_dialog != NULL) { - e_dlist_addtail (&message_list, (EDListNode *)m); + if (!m->ismain && user_message_dialog != NULL) { + g_queue_push_tail (&user_message_queue, mail_msg_ref (m)); return; } - + switch (m->type) { - case CAMEL_SESSION_ALERT_INFO: - type = 0; @@ -5020,10 +5020,10 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail - - if (m->allow_cancel) - type += 3; -- +- - message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL); - g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); -- +- - /* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */ - if (m->allow_cancel) { - if (m->ismain) { @@ -5072,7 +5072,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + gtk_widget_show (user_message_dialog); } } - + static void -free_user_message(struct _mail_msg *mm) +user_message_free (struct _user_message_msg *m) @@ -5082,7 +5082,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail g_free(m->prompt); + e_flag_free(m->done); } - + -static struct _mail_msg_op user_message_op = { NULL, do_user_message, NULL, free_user_message }; +static MailMsgInfo user_message_info = { + sizeof (struct _user_message_msg), @@ -5091,7 +5091,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) user_message_free +}; - + static gboolean alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) { @@ -5101,12 +5101,12 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail - gboolean ret; + struct _user_message_msg *m; + gboolean result = TRUE; - + if (!mail_session->interactive) return FALSE; - + - if (cancel) -- user_message_reply = e_msgport_new (); +- user_message_reply = e_msgport_new (); - m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); - m->ismain = pthread_equal(pthread_self(), mail_gui_thread); + m = mail_msg_new (&user_message_info); @@ -5116,21 +5116,21 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + m->prompt = g_strdup (prompt); + m->done = e_flag_new (); m->allow_cancel = cancel; - + - if (m->ismain) - do_user_message((struct _mail_msg *)m); - else { - extern EMsgPort *mail_gui_port2; + if (cancel) + mail_msg_ref (m); - + - e_msgport_put(mail_gui_port2, (EMsg *)m); - } + if (m->ismain) + user_message_exec (m); + else + mail_msg_main_loop_push (m); - + if (cancel) { - r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); - g_return_val_if_fail (m == r, FALSE); @@ -5138,7 +5138,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + result = m->result; + mail_msg_unref (m); + } - + - ret = m->result; - mail_msg_free(m); - e_msgport_destroy(user_message_reply); @@ -5148,19 +5148,19 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + user_message_free (m); + mail_msg_unref (m); + } - + - return ret; + return result; } - + static CamelFolder * @@ -541,7 +538,7 @@ get_filter_driver (CamelSession *session /* TODO: This is very temporary, until we have a better way to do the progress reporting, we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ - + -static mail_msg_op_t ms_thread_ops_dummy = { NULL }; +static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) }; - + static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { @@ -550,7 +547,7 @@ static void *ms_thread_msg_new(CamelSess @@ -5169,29 +5169,29 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail if (msg) { - struct _mail_msg *m = mail_msg_new(&ms_thread_ops_dummy, NULL, sizeof(struct _mail_msg)); + MailMsg *m = mail_msg_new(&ms_thread_info_dummy); - + msg->data = m; camel_operation_unref(msg->op); @@ -563,7 +560,7 @@ static void *ms_thread_msg_new(CamelSess - + static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { - mail_msg_free(m->data); + mail_msg_unref(m->data); ms_parent_class->thread_msg_free(session, m); } - + @@ -686,22 +683,23 @@ mail_session_set_interactive (gboolean i MAIL_SESSION (session)->interactive = interactive; - + if (!interactive) { - struct _user_message_msg *um; + struct _user_message_msg *msg; - + d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); - + e_passwords_cancel(); - + /* flush/cancel pending user messages */ - while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { - d(printf ("Flusing message request: %s\n", um->prompt)); @@ -5201,7 +5201,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + e_flag_set (msg->done); + mail_msg_unref (msg); } - + /* and the current */ - if (message_dialog) { + if (user_message_dialog) { @@ -5217,16 +5217,16 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail @@ -29,8 +29,8 @@ #include #include - + -#include #include +#include - + #include #include @@ -63,7 +63,7 @@ static void mail_operation_status(struct #endif - + /* background operation status stuff */ -struct _mail_msg_priv { +struct _MailMsgPrivate { @@ -5236,11 +5236,11 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail @@ -82,15 +82,12 @@ static GHashTable *mail_msg_active_table static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; - + -pthread_t mail_gui_thread; - MailAsyncEvent *mail_async_event; - + -static void mail_msg_destroy(EThread *e, EMsg *msg, void *data); - -void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size) @@ -5249,12 +5249,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail { - struct _mail_msg *msg; + MailMsg *msg; - + MAIL_MT_LOCK(mail_msg_lock); - + @@ -112,7 +109,6 @@ void *mail_msg_new(mail_msg_op_t *ops, E fprintf(log, "Logging async operations\n"); - + if (log_locks) { - fprintf(log, "Logging lock operations, mail_gui_thread = %" G_GINT64_MODIFIER "x\n\n", e_util_pthread_id(mail_gui_thread)); fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); @@ -5275,13 +5275,13 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail camel_exception_init(&msg->ex); - msg->priv = g_malloc0(sizeof(*msg->priv)); + msg->priv = g_slice_new0 (MailMsgPrivate); - + g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); - + @@ -143,12 +139,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E return msg; } - + - -static void end_event_callback (CamelObject *o, void *event_data, void *data) +static void @@ -5291,16 +5291,16 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + MailComponent *component; + EActivityHandler *activity_handler; guint activity_id = GPOINTER_TO_INT (event_data); - + + component = mail_component_peek (); + activity_handler = mail_component_peek_activity_handler (component); e_activity_handler_operation_finished (activity_handler, activity_id); } - + @@ -177,58 +176,93 @@ checkmem(void *p) } #endif - + -void mail_msg_free(void *msg) +static void +mail_msg_free (MailMsg *mail_msg) @@ -5343,7 +5343,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + + if (g_atomic_int_exchange_and_add (&mail_msg->ref_count, -1) > 1) + return; - + #ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); @@ -5353,14 +5353,14 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + checkmem(mail_msg->priv); #endif d(printf("Free message %p\n", msg)); - + - if (m->ops->destroy_msg) - m->ops->destroy_msg(m); + if (mail_msg->info->free) + mail_msg->info->free(mail_msg); - + MAIL_MT_LOCK(mail_msg_lock); - + #ifdef LOG_OPS - if (log_ops) - fprintf(log, "%p: Free (exception `%s')\n", msg, @@ -5379,7 +5379,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + g_hash_table_remove ( + mail_msg_active_table, GINT_TO_POINTER (mail_msg->seq)); + pthread_cond_broadcast (&mail_msg_cond); - + /* We need to make sure we dont lose a reference here YUCK YUCK */ /* This is tightly integrated with the code in do_op_status, as it closely relates to the CamelOperation setup in msg_new() above */ @@ -5395,9 +5395,9 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - activity_id = m->priv->activity_id; + activity_id = mail_msg->priv->activity_id; } - + MAIL_MT_UNLOCK(mail_msg_lock); - + - if (m->cancel) { - camel_operation_mute(m->cancel); - camel_operation_unref(m->cancel); @@ -5408,7 +5408,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - g_free(m->priv); - g_free(m); + mail_msg_free (mail_msg); - + if (activity_id != 0) - mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, - NULL, GINT_TO_POINTER (activity_id), NULL); @@ -5417,12 +5417,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailAsyncFunc) end_event_callback, + NULL, GINT_TO_POINTER (activity_id), NULL); } - + /* hash table of ops->dialogue of active errors */ @@ -244,9 +278,10 @@ static void error_response(GtkObject *o, gtk_widget_destroy((GtkWidget *)o); } - + -void mail_msg_check_error(void *msg) +void +mail_msg_check_error (gpointer msg) @@ -5431,7 +5431,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + MailMsg *m = msg; char *what; GtkDialog *gd; - + @@ -271,27 +306,27 @@ void mail_msg_check_error(void *msg) /* check to see if we have dialogue already running for this operation */ /* we key on the operation pointer, which is at least accurate enough @@ -5441,7 +5441,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail g_warning("Error occurred while existing dialogue active:\n%s", camel_exception_get_description(&m->ex)); return; } - + - if (m->ops->describe_msg - && (what = m->ops->describe_msg(m, FALSE))) { + if (m->info->desc @@ -5450,7 +5450,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail g_free(what); } else gd = (GtkDialog *)e_error_new(NULL, "mail:async-error-nodescribe", camel_exception_get_description(&m->ex), NULL); - + - g_hash_table_insert(active_errors, m->ops, gd); - g_signal_connect(gd, "response", G_CALLBACK(error_response), m->ops); - g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->ops); @@ -5459,17 +5459,17 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->info); gtk_widget_show((GtkWidget *)gd); } - + void mail_msg_cancel(unsigned int msgid) { - struct _mail_msg *m; + MailMsg *m; - + MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); @@ -304,13 +339,12 @@ void mail_msg_cancel(unsigned int msgid) - - + + /* waits for a message to be finished processing (freed) - the messageid is from struct _mail_msg->seq */ + the messageid is from MailMsg->seq */ @@ -5478,14 +5478,14 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - struct _mail_msg *m; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); + MailMsg *m; - + - if (ismain) { + if (mail_in_main_thread ()) { MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { @@ -347,9 +381,7 @@ int mail_msg_active(unsigned int msgid) - + void mail_msg_wait_all(void) { - int ismain = pthread_equal(pthread_self(), mail_gui_thread); @@ -5497,17 +5497,17 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail MAIL_MT_UNLOCK(mail_msg_lock); @@ -367,294 +399,239 @@ void mail_msg_wait_all(void) } - + /* **************************************** */ -struct _cancel_hook_data { - struct _cancel_hook_data *next; - struct _cancel_hook_data *prev; - + - GDestroyNotify func; - void *data; -}; +static GHookList cancel_hook_list; - + -static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); - -void *mail_cancel_hook_add(GDestroyNotify func, void *data) @@ -5516,29 +5516,29 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail { - struct _cancel_hook_data *d; + GHook *hook; - + - d = g_malloc0(sizeof(*d)); - d->func = func; - d->data = data; + MAIL_MT_LOCK (mail_msg_lock); - + - MAIL_MT_LOCK(mail_msg_lock); - e_dlist_addtail(&cancel_hook_list, (EDListNode *)d); - MAIL_MT_UNLOCK(mail_msg_lock); + if (!cancel_hook_list.is_setup) + g_hook_list_init (&cancel_hook_list, sizeof (GHook)); - + - return (void *)d; -} + hook = g_hook_alloc (&cancel_hook_list); + hook->func = func; + hook->data = data; - + -void mail_cancel_hook_remove(void *handle) -{ - struct _cancel_hook_data *d = handle; + g_hook_append (&cancel_hook_list, hook); - + - MAIL_MT_LOCK(mail_msg_lock); - e_dlist_remove((EDListNode *)d); - MAIL_MT_UNLOCK(mail_msg_lock); @@ -5547,18 +5547,18 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + + return hook; } - + -void mail_cancel_all(void) +void +mail_cancel_hook_remove (GHook *hook) { - struct _cancel_hook_data *d, *n; + MAIL_MT_LOCK (mail_msg_lock); - + - camel_operation_cancel(NULL); + g_assert (cancel_hook_list.is_setup); + g_hook_destroy_link (&cancel_hook_list, hook); - + - /* I can ssee a deadlock coming on ... */ - MAIL_MT_LOCK(mail_msg_lock); - d = (struct _cancel_hook_data *)cancel_hook_list.head; @@ -5571,7 +5571,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - MAIL_MT_UNLOCK(mail_msg_lock); + MAIL_MT_UNLOCK (mail_msg_lock); } - + -EMsgPort *mail_gui_port; -static GIOChannel *mail_gui_channel; -static guint mail_gui_watch; @@ -5616,7 +5616,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail +static GAsyncQueue *main_loop_queue = NULL; +static GAsyncQueue *msg_reply_queue = NULL; +static GThread *main_thread = NULL; - + static gboolean -mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) +mail_msg_idle_cb (void) @@ -5624,11 +5624,11 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; + MailMsg *msg; - + - while (( m = (mail_msg_t *)e_msgport_get(port))) { + g_assert (main_loop_queue != NULL); + g_assert (msg_reply_queue != NULL); - + -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); @@ -5665,11 +5665,11 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + mail_msg_check_error (msg); + mail_msg_unref (msg); } - + - return TRUE; + return FALSE; } - + -static gboolean -mail_msgport_received(GIOChannel *source, GIOCondition cond, void *d) +static void @@ -5720,7 +5720,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + msg->cancel = NULL; + MAIL_MT_UNLOCK (mail_msg_lock); } - + - return TRUE; + g_async_queue_push (msg_reply_queue, msg); + @@ -5730,7 +5730,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (GSourceFunc) mail_msg_idle_cb, NULL); + G_UNLOCK (idle_source_id); } - + -/* Test code, lighterwight, more configurable calls */ -static gboolean -mail_msgport_received2(GIOChannel *source, GIOCondition cond, void *d) @@ -5740,7 +5740,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; + mail_msg_wait_all(); - + - while (( m = (mail_msg_t *)e_msgport_get(port))) { -#ifdef LOG_OPS - if (log_ops) @@ -5749,7 +5749,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + G_LOCK (idle_source_id); + if (idle_source_id != 0) { + GSource *source; - + - if (m->ops->receive_msg) - m->ops->receive_msg(m); - else @@ -5762,18 +5762,18 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + idle_source_id = 0; } + G_UNLOCK (idle_source_id); - + - return TRUE; -} + g_assert (main_loop_queue != NULL); + g_async_queue_unref (main_loop_queue); + main_loop_queue = NULL; - + + g_assert (msg_reply_queue != NULL); + g_async_queue_unref (msg_reply_queue); + msg_reply_queue = NULL; +} - + -static void -mail_msg_destroy(EThread *e, EMsg *msg, void *data) +void @@ -5782,19 +5782,19 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - mail_msg_t *m = (mail_msg_t *)msg; + main_loop_queue = g_async_queue_new (); + msg_reply_queue = g_async_queue_new (); - + -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); - checkmem(m->priv); --#endif +-#endif + mail_msg_active_table = g_hash_table_new (NULL, NULL); + main_thread = g_thread_self (); - + - mail_msg_free(m); + mail_async_event = mail_async_event_new (); } - + -static void -mail_msg_received(EThread *e, EMsg *msg, void *data) +static gint @@ -5803,7 +5803,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - mail_msg_t *m = (mail_msg_t *)msg; + gint priority1 = msg1->priority; + gint priority2 = msg2->priority; - + -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); @@ -5811,7 +5811,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail -#endif + if (priority1 == priority2) + return 0; - + - if (m->ops->describe_msg) { - char *text = m->ops->describe_msg(m, FALSE); - @@ -5821,7 +5821,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail -#endif + return (priority1 < priority2) ? 1 : -1; +} - + - d(printf("message received at thread\n")); - camel_operation_register(m->cancel); - camel_operation_start(m->cancel, "%s", text); @@ -5837,7 +5837,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail +{ + GThreadPool *thread_pool; + gint max_threads = GPOINTER_TO_INT (data); - + - if (m->ops->receive_msg) { - mail_enable_stop(); - m->ops->receive_msg(m); @@ -5848,7 +5848,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (GFunc) mail_msg_proxy, NULL, max_threads, FALSE, NULL); + g_thread_pool_set_sort_function ( + thread_pool, (GCompareDataFunc) mail_msg_compare, NULL); - + - if (m->ops->describe_msg) { - camel_operation_end(m->cancel); - camel_operation_unregister(m->cancel); @@ -5859,7 +5859,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - } + return thread_pool; } - + -void mail_msg_cleanup(void) +void +mail_msg_main_loop_push (gpointer msg) @@ -5867,7 +5867,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - mail_msg_wait_all(); + g_async_queue_push_sorted (main_loop_queue, msg, + (GCompareDataFunc) mail_msg_compare, NULL); - + - e_thread_destroy(mail_thread_queued_slow); - e_thread_destroy(mail_thread_queued); - e_thread_destroy(mail_thread_new); @@ -5877,7 +5877,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (GSourceFunc) mail_msg_idle_cb, NULL); + G_UNLOCK (idle_source_id); +} - + - g_io_channel_unref(mail_gui_channel); - g_io_channel_unref(mail_gui_reply_channel); +void @@ -5886,12 +5886,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + static GOnce once = G_ONCE_INIT; + + g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); - + - e_msgport_destroy(mail_gui_port); - e_msgport_destroy(mail_gui_reply_port); + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); } - + -static guint -em_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) +void @@ -5900,7 +5900,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - GSource *source; - guint id; + static GOnce once = G_ONCE_INIT; - + - *port = e_msgport_new(); -#ifndef G_OS_WIN32 - *channel = g_io_channel_unix_new(e_msgport_fd(*port)); @@ -5913,11 +5913,11 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - id = g_source_attach(source, NULL); - g_source_unref(source); + g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - + - return id; + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); } - + -void mail_msg_init(void) +void +mail_msg_slow_ordered_push (gpointer msg) @@ -5942,35 +5942,35 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); + static GOnce once = G_ONCE_INIT; - + - mail_msg_active_table = g_hash_table_new(NULL, NULL); - mail_gui_thread = pthread_self(); + g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); + + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); +} - + - mail_async_event = mail_async_event_new(); +gboolean +mail_in_main_thread (void) +{ + return (g_thread_self () == main_thread); } - + /* ********************************************************************** */ @@ -665,7 +642,8 @@ static pthread_mutex_t status_lock = PTH /* ********************************************************************** */ - + struct _proxy_msg { - struct _mail_msg msg; + MailMsg base; + MailAsyncEvent *ea; mail_async_event_t type; - + @@ -679,10 +657,8 @@ struct _proxy_msg { }; - + static void -do_async_event(struct _mail_msg *mm) +do_async_event(struct _proxy_msg *m) @@ -5986,10 +5986,10 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail do_async_event(mm); - mail_msg_free(mm); + mail_msg_unref(mm); - + return FALSE; } - + -static struct _mail_msg_op async_event_op = { - NULL, - do_async_event, @@ -6002,14 +6002,14 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) NULL }; - + MailAsyncEvent *mail_async_event_new(void) @@ -723,10 +700,9 @@ int mail_async_event_emit(MailAsyncEvent { struct _proxy_msg *m; int id; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); - + /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ - m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); + m = mail_msg_new(&async_event_info); @@ -6019,7 +6019,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail @@ -735,7 +711,7 @@ int mail_async_event_emit(MailAsyncEvent m->type = type; m->have_thread = FALSE; - + - id = m->msg.seq; + id = m->base.seq; g_mutex_lock(ea->lock); @@ -6038,7 +6038,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail } else - e_thread_put(mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); - + return id; } @@ -762,7 +738,7 @@ int mail_async_event_destroy(MailAsyncEv @@ -6052,7 +6052,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail g_mutex_unlock(ea->lock); @@ -784,17 +760,18 @@ int mail_async_event_destroy(MailAsyncEv /* ********************************************************************** */ - + struct _call_msg { - struct _mail_msg msg; + MailMsg base; @@ -6063,7 +6063,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail va_list ap; + EFlag *done; }; - + static void -do_call(struct _mail_msg *mm) +do_call(struct _call_msg *m) @@ -6080,7 +6080,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + if (m->done != NULL) + e_flag_set (m->done); } - + -static struct _mail_msg_op mail_call_op = { - NULL, - do_call, @@ -6093,7 +6093,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) NULL }; - + -void *mail_call_main(mail_call_t type, MailMainFunc func, ...) +void * +mail_call_main (mail_call_t type, MailMainFunc func, ...) @@ -6103,9 +6103,9 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail va_list ap; - EMsgPort *reply = NULL; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); - + va_start(ap, func); - + - if (!ismain) - reply = e_msgport_new(); - @@ -6114,7 +6114,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail m->type = type; m->func = func; G_VA_COPY(m->ap, ap); - + - if (!ismain) { - e_msgport_put(mail_gui_port, (EMsg *)m); - e_msgport_wait(reply); @@ -6130,26 +6130,26 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + e_flag_wait (m->done); + e_flag_free (m->done); } - + va_end(ap); - + ret = m->ret; - mail_msg_free(m); + mail_msg_unref (m); - + return ret; } @@ -889,40 +868,42 @@ void *mail_call_main(mail_call_t type, M /* locked via status_lock */ static int busy_state; - + -static void do_set_busy(struct _mail_msg *mm) +static void +do_set_busy(MailMsg *mm) { set_stop(busy_state > 0); } - + -static struct _mail_msg_op set_busy_op = { - NULL, - do_set_busy, @@ -6162,12 +6162,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) NULL }; - + void mail_enable_stop(void) { - struct _mail_msg *m; + MailMsg *m; - + MAIL_MT_LOCK(status_lock); busy_state++; if (busy_state == 1) { @@ -6178,12 +6178,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail } MAIL_MT_UNLOCK(status_lock); } - + void mail_disable_stop(void) { - struct _mail_msg *m; + MailMsg *m; - + MAIL_MT_LOCK(status_lock); busy_state--; if (busy_state == 0) { @@ -6196,17 +6196,17 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail } @@ -930,7 +911,7 @@ void mail_disable_stop(void) /* ******************************************************************************** */ - + struct _op_status_msg { - struct _mail_msg msg; + MailMsg base; - + struct _CamelOperation *op; char *what; @@ -938,16 +919,16 @@ struct _op_status_msg { void *data; }; - + -static void do_op_status(struct _mail_msg *mm) +static void +op_status_exec (struct _op_status_msg *m) @@ -6219,15 +6219,15 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + MailMsgPrivate *data; char *out, *p, *o, c; int pc; - + - g_return_if_fail (pthread_equal(mail_gui_thread, pthread_self ())); + g_return_if_fail (mail_in_main_thread ()); - + MAIL_MT_LOCK (mail_msg_lock); - + @@ -986,8 +967,8 @@ static void do_op_status(struct _mail_ms progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); - + MAIL_MT_UNLOCK (mail_msg_lock); - if (msg->ops->describe_msg) - what = msg->ops->describe_msg (msg, FALSE); @@ -6238,7 +6238,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail /* uncommenting because message is not very useful for a user, see bug 271734*/ @@ -1004,13 +985,7 @@ static void do_op_status(struct _mail_ms int activity_id = data->activity_id; - + MAIL_MT_UNLOCK (mail_msg_lock); - if (msg->cancel) { - camel_operation_mute (msg->cancel); @@ -6248,12 +6248,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - g_free (msg->priv); - g_free (msg); + mail_msg_free (msg); - + if (activity_id != 0) mail_async_event_emit (mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, @@ -1030,18 +1005,17 @@ static void do_op_status(struct _mail_ms } - + static void -do_op_status_free (struct _mail_msg *mm) +op_status_free (struct _op_status_msg *m) @@ -6262,7 +6262,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - g_free (m->what); } - + -static struct _mail_msg_op op_status_op = { - NULL, - do_op_status, @@ -6275,12 +6275,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) op_status_free }; - + static void @@ -1051,7 +1025,7 @@ mail_operation_status (struct _CamelOper - + d(printf("got operation statys: %s %d%%\n", what, pc)); - + - m = mail_msg_new(&op_status_op, NULL, sizeof(*m)); + m = mail_msg_new(&op_status_info); m->op = op; @@ -6293,33 +6293,33 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - e_msgport_put(mail_gui_port, (EMsg *)m); + mail_msg_main_loop_push(m); } - + /* ******************** */ diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c --- evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-10-23 06:06:00.000000000 -0400 +++ evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-10-29 14:47:20.000000000 -0400 @@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( - - + + struct _folder_unsub_t { - struct _mail_msg msg; + MailMsg base; - + char *uri; }; - + -static char * -folder_unsubscribe__desc (struct _mail_msg *mm, int done) +static gchar * +folder_unsubscribe_desc (struct _folder_unsub_t *msg) { - struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; -- +- - return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri); + return g_strdup_printf ( + _("Unsubscribing from folder \"%s\""), msg->uri); } - + static void -folder_unsubscribe__unsub (struct _mail_msg *mm) +folder_unsubscribe_exec (struct _folder_unsub_t *msg) @@ -6329,11 +6329,11 @@ diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-e const char *path = NULL; CamelStore *store; CamelURL *url; - + - if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex))) + if (!(store = camel_session_get_store (session, msg->uri, &mm->ex))) return; - + - url = camel_url_new (unsub->uri, NULL); + url = camel_url_new (msg->uri, NULL); if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) @@ -6341,17 +6341,17 @@ diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-e else if (url->path && url->path[0]) @@ -82,18 +80,17 @@ folder_unsubscribe__unsub (struct _mail_ } - + static void -folder_unsubscribe__free (struct _mail_msg *mm) +folder_unsubscribe_free (struct _folder_unsub_t *msg) { - struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; -- +- - g_free (unsub->uri); + g_free (msg->uri); } - + -static struct _mail_msg_op unsubscribe_op = { - folder_unsubscribe__desc, - folder_unsubscribe__unsub, @@ -6364,16 +6364,16 @@ diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-e + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) folder_unsubscribe_free }; - - + + @@ -105,8 +102,8 @@ org_gnome_mail_folder_unsubscribe (EPlug if (target->uri == NULL) return; - + - unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); + unsub = mail_msg_new (&unsubscribe_info); unsub->uri = g_strdup (target->uri); - + - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } @@ -6383,31 +6383,31 @@ diff -up evolution-2.21.1/plugins/mark-all-read/mark-all-read.c.kill-ethread evo @@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } - + - mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); + mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); } - + static void diff -up evolution-2.21.1/plugins/exchange-operations/exchange-folder.c.kill-ethread evolution-2.21.1/plugins/exchange-operations/exchange-folder.c --- evolution-2.21.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-10-23 06:06:03.000000000 -0400 +++ evolution-2.21.1/plugins/exchange-operations/exchange-folder.c 2007-10-29 14:47:20.000000000 -0400 @@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); - + /* To get the CamelStore/Folder */ - mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); + mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); - - + + } diff -up evolution-2.21.1/plugins/save-attachments/save-attachments.c.kill-ethread evolution-2.21.1/plugins/save-attachments/save-attachments.c --- evolution-2.21.1/plugins/save-attachments/save-attachments.c.kill-ethread 2007-10-23 06:06:07.000000000 -0400 +++ evolution-2.21.1/plugins/save-attachments/save-attachments.c 2007-10-29 14:47:20.000000000 -0400 -@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin +@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); - + - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } @@ -6416,33 +6416,33 @@ diff -up evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c.ki +++ evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-10-29 14:47:20.000000000 -0400 @@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); - + mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), - emla_list_action_do, data, mail_thread_new); + emla_list_action_do, data, mail_msg_unordered_push); } - + void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread evolution-2.21.1/plugins/itip-formatter/itip-formatter.c --- evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread 2007-10-23 06:06:07.000000000 -0400 +++ evolution-2.21.1/plugins/itip-formatter/itip-formatter.c 2007-10-29 14:47:20.000000000 -0400 @@ -1547,47 +1547,38 @@ extract_itip_data (FormatItipPObject *pi } - + struct _opencal_msg { - struct _mail_msg msg; + MailMsg base; - + char *command; /* command line to run */ }; - + static char * -open_calendar_desc (struct _mail_msg *mm, int done) +open_calendar__desc (struct _opencal_msg *m, gint complete) { return g_strdup (_("Opening calendar")); } - + static void -open_calendar_do (struct _mail_msg *mm) +open_calendar__exec (struct _opencal_msg *m) @@ -6453,7 +6453,7 @@ diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread e g_warning ("Could not launch %s", m->command); } } - + static void -open_calendar_done (struct _mail_msg *mm) -{ @@ -6469,7 +6469,7 @@ diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread e g_free (m->command); m->command = NULL; } - + -static struct _mail_msg_op open_calendar_op = { - open_calendar_desc, - open_calendar_do, @@ -6482,19 +6482,19 @@ diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread e + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) open_calendar__free, }; - + static gboolean -@@ -1596,10 +1587,10 @@ idle_open_cb (gpointer data) - FormatItipPObject *pitip = data; +@@ -1596,10 +1587,10 @@ idle_open_cb (gpointer data) + FormatItipPObject *pitip = data; struct _opencal_msg *m; - + - m = mail_msg_new (&open_calendar_op, NULL, sizeof (*m)); + m = mail_msg_new (&open_calendar_info); - m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"", + m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"", isodate_from_time_t (pitip->start_time), isodate_from_time_t (pitip->end_time)); - e_thread_put (mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); - + return FALSE; } diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill-ethread evolution-2.21.1/plugins/groupwise-features/share-folder-common.c @@ -6502,35 +6502,35 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- +++ evolution-2.21.1/plugins/groupwise-features/share-folder-common.c 2007-10-29 14:47:20.000000000 -0400 @@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } - + struct _EMCreateFolder { - struct _mail_msg msg; + MailMsg base; - + /* input data */ CamelStore *store; @@ -137,31 +137,26 @@ struct _EMCreateFolder { void *user_data; }; - + -static char * -create_folder__desc (struct _mail_msg *mm, int done) +static gchar * +create_folder_desc (struct _EMCreateFolder *m) { - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- +- return g_strdup_printf (_("Creating folder `%s'"), m->full_name); } - + static void -create_folder__create (struct _mail_msg *mm) +create_folder_exec (struct _EMCreateFolder *m) { - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- +- d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - + - if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { + if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { if (camel_store_supports_subscriptions (m->store)) @@ -6538,7 +6538,7 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- + camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); } } - + static void -create_folder__created (struct _mail_msg *mm) +create_folder_done (struct _EMCreateFolder *m) @@ -6549,20 +6549,20 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- EGwConnection *ccnc; @@ -180,10 +175,8 @@ create_folder__created (struct _mail_msg } - + static void -create_folder__free (struct _mail_msg *mm) +create_folder_free (struct _EMCreateFolder *m) { - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- +- camel_store_free_folder_info (m->store, m->fi); camel_object_unref (m->store); g_free (m->full_name); @@ -191,11 +184,12 @@ create_folder__free (struct _mail_msg *m g_free (m->name); } - + -static struct _mail_msg_op create_folder_op = { - create_folder__desc, - create_folder__create, @@ -6575,18 +6575,18 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- + (MailMsgDoneFunc) create_folder_done, + (MailMsgFreeFunc) create_folder_free }; - + static void -@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const +@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const parent = namebuf; } - + - m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); + m = mail_msg_new (&create_folder_info); camel_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); -@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const +@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const m->user_data = (struct ShareInfo *) user_data; m->done = done; g_free (namebuf); @@ -6594,16 +6594,16 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- - e_thread_put (mail_thread_new, (EMsg *) m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h --- evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-10-23 06:12:51.000000000 -0400 +++ evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h 2007-10-29 14:47:20.000000000 -0400 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo - + typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; - + -typedef struct _AlarmMsg AlarmMsg; -typedef struct _AlarmMsgPrivate AlarmMsgPrivate; - @@ -6612,41 +6612,41 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread - - void (*receive_msg)(EThread *e, struct _AlarmMsg *msg, void *data); /* message received */ - void *data; -- +- - /* Private Usage */ - struct _AlarmMsgPrivate *priv; -}; - struct _AlarmNotify { BonoboObject object; - + diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c --- evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-10-26 01:20:38.000000000 -0400 +++ evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c 2007-10-29 14:47:20.000000000 -0400 @@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; - + -EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ -EMsgPort *alarm_reply_port; -static GIOChannel *alarm_reply_channel; - #define d(x) x - + @@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object) g_mutex_free (priv->mutex); g_free (priv); - + - e_thread_destroy(alarm_operation_thread); - g_io_channel_unref(alarm_reply_channel); - e_msgport_destroy(alarm_reply_port); if (G_OBJECT_CLASS (parent_class)->finalize) (* G_OBJECT_CLASS (parent_class)->finalize) (object); } - + - + -static guint -alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) -{ @@ -6697,8 +6697,8 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread -alarm_msg_received(EThread *e, EMsg *msg, void *data) -{ - AlarmMsg *m = (AlarmMsg *)msg; -- -- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); +- +- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); - if (m->receive_msg) { - m->receive_msg (e, m, data); - } @@ -6706,16 +6706,16 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread - /** * alarm_notify_new: - * + * @@ -363,23 +299,10 @@ alarm_msg_received(EThread *e, EMsg *msg AlarmNotify * alarm_notify_new (void) { - AlarmNotify *an; -- +- - d (printf("%s:%d (alarm_notify_new) - Alarm Notify New \n ", __FILE__, __LINE__)); - -- /* Create a thread for alarm queue operation*/ +- /* Create a thread for alarm queue operation*/ - alarm_channel_setup(&alarm_reply_port, &alarm_reply_channel, alarm_msgport_replied); - - alarm_operation_thread = e_thread_new(E_THREAD_QUEUE); @@ -6726,14 +6726,14 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread - an = g_object_new (TYPE_ALARM_NOTIFY, - "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL), - NULL); -- +- - return an; + return g_object_new (TYPE_ALARM_NOTIFY, + "poa", bonobo_poa_get_threaded ( + ORBIT_THREAD_HINT_PER_REQUEST, NULL), + NULL); } - + static void diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c --- evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-10-26 01:20:38.000000000 -0400 @@ -6741,7 +6741,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e @@ -98,9 +98,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; - + -/* Main Tasks thread for dealing with the global structures */ -extern EThread *alarm_operation_thread; - @@ -6751,7 +6751,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e @@ -182,6 +179,40 @@ static void on_dialog_objs_removed_cb (E static void load_alarms_for_today (ClientAlarms *ca); static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); - + +/* Simple asynchronous message dispatcher */ + +typedef struct _Message Message; @@ -6791,12 +6791,12 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e */ @@ -220,47 +251,41 @@ add_client_alarms_cb (gpointer key, gpoi } - + struct _midnight_refresh_msg { + Message header; gboolean remove; }; - + /* Loads the alarms for the new day every midnight */ static void -midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) @@ -6805,47 +6805,47 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _midnight_refresh_msg *list = msg->data; - d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); - + /* Re-load the alarms for all clients */ g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); - + /* Re-schedule the midnight update */ - if (list->remove && midnight_refresh_id != NULL) { + if (msg->remove && midnight_refresh_id != NULL) { - d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); + d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); alarm_remove (midnight_refresh_id); midnight_refresh_id = NULL; } - + queue_midnight_refresh (); + + g_slice_free (struct _midnight_refresh_msg, msg); } - + static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) { - AlarmMsg *msg; - struct _midnight_refresh_msg *list; -- +- - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = midnight_refresh_async; - - list = malloc (sizeof (struct _midnight_refresh_msg)); + struct _midnight_refresh_msg *msg; - + - list->remove = TRUE; - msg->data = list; + msg = g_slice_new (struct _midnight_refresh_msg); + msg->header.func = (MessageFunc) midnight_refresh_async; + msg->remove = TRUE; - + - d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + /* Looks up a client in the client alarms hash table */ @@ -658,6 +683,7 @@ remove_comp (ClientAlarms *ca, ECalCompo * alarms. @@ -6857,7 +6857,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e gpointer data; @@ -691,7 +717,7 @@ duplicate_ecal (GList *in_list) } - + static void -query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) +query_objects_changed_async (struct _query_msg *msg) @@ -6871,14 +6871,14 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _query_msg *list = msg->data; ECal *client; GList *objects; - + - client = list->client; - ca = list->data; - objects = list->objects; + client = msg->client; + ca = msg->data; + objects = msg->objects; - + from = config_data_get_last_notification_time (); if (from == -1) @@ -800,43 +825,38 @@ query_objects_changed_async (EThread *e, @@ -6888,14 +6888,14 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + + g_slice_free (struct _query_msg, msg); } - + static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data) { - AlarmMsg *msg; - struct _query_msg *list; + struct _query_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = query_objects_changed_async; @@ -6905,17 +6905,17 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - list->data = data; - msg->data = list; - -- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); +- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _query_msg); + msg->header.func = (MessageFunc) query_objects_changed_async; + msg->client = client; + msg->objects = duplicate_ical (objects); + msg->data = data; - + + message_push ((Message *) msg); } - + /* Called when a calendar component is removed; we must delete its corresponding * alarms. */ @@ -6928,24 +6928,24 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _query_msg *list = msg->data; ECal *client; GList *objects; - + - client = list->client; - ca = list->data; - objects = list->objects; + client = msg->client; + ca = msg->data; + objects = msg->objects; - + d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); - + @@ -849,27 +869,22 @@ query_objects_removed_async (EThread *e, } - + g_list_free (objects); + + g_slice_free (struct _query_msg, msg); } - + static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data) { @@ -6959,25 +6959,25 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - list = malloc (sizeof (struct _query_msg)); - list->client = client; - list->objects = duplicate_ecal (objects); -- list->data = data; +- list->data = data; - msg->data = list; + struct _query_msg *msg; - -- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); + +- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _query_msg); + msg->header.func = (MessageFunc) query_objects_removed_async; + msg->client = client; + msg->objects = duplicate_ecal (objects); + msg->data = data; - + + message_push ((Message *) msg); } - + @@ -1011,20 +1026,19 @@ free_tray_icon_data (TrayIconData *tray_ } - + static void -on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) +on_dialog_objs_removed_async (struct _query_msg *msg) @@ -6988,16 +6988,16 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _query_msg *list = msg->data; ECal *client; GList *objects; - + d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); - + - client = list->client; - tray_data = list->data; - objects = list->objects; + client = msg->client; + tray_data = msg->data; + objects = msg->objects; - + e_cal_component_get_uid (tray_data->comp, &our_uid); g_return_if_fail (our_uid && *our_uid); @@ -1042,37 +1056,33 @@ on_dialog_objs_removed_async (EThread *e @@ -7007,14 +7007,14 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + + g_slice_free (struct _query_msg, msg); } - + static void on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) { - AlarmMsg *msg; - struct _query_msg *list; + struct _query_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = on_dialog_objs_removed_async; @@ -7029,17 +7029,17 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg->client = client; + msg->objects = objects; + msg->data = data; - + - d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + struct _tray_cqa_msg { + Message header; CompQueuedAlarms *cqa; }; - + static void -tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) +tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) @@ -7048,7 +7048,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - CompQueuedAlarms *cqa = tmsg->cqa; + CompQueuedAlarms *cqa = msg->cqa; GList *list = tray_icons_list; - + d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); @@ -1111,28 +1121,25 @@ tray_list_remove_cqa_async(EThread *e, A gtk_tree_selection_select_iter (sel, &iter); @@ -7057,7 +7057,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + + g_slice_free (struct _tray_cqa_msg, msg); } - + static void tray_list_remove_cqa (CompQueuedAlarms *cqa) { @@ -7075,27 +7075,27 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg = g_slice_new (struct _tray_cqa_msg); + msg->header.func = (MessageFunc) tray_list_remove_cqa_async; + msg->cqa = cqa; - + - d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + /* Callback used from the alarm notify dialog */ static void -tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) +tray_list_remove_async (Message *msg) { GList *list = tray_icons_list; - + @@ -1162,55 +1169,50 @@ tray_list_remove_async(EThread *e, Alarm } else list = list->next; - } + } + + g_slice_free (Message, msg); } - + static void tray_list_remove_icons (void) { @@ -7105,21 +7105,21 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = tray_list_remove_async; + Message *msg; - + - msg->data = NULL; + msg = g_slice_new (Message); + msg->func = tray_list_remove_async; - + - d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push (msg); } - + struct _tray_msg { + Message header; TrayIconData *data; }; - + static void -tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) +tray_list_remove_data_async (struct _tray_msg *msg) @@ -7127,16 +7127,16 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _tray_msg *tmsg = msg->data; - TrayIconData *tray_data = tmsg->data; + TrayIconData *tray_data = msg->data; - + d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); - + tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); free_tray_icon_data (tray_data); tray_data = NULL; + + g_slice_free (struct _tray_msg, msg); } - + static void tray_list_remove_data (TrayIconData *data) { @@ -7154,36 +7154,36 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg = g_slice_new (struct _tray_msg); + msg->header.func = (MessageFunc) tray_list_remove_data_async; + msg->data = data; - + - d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + static void @@ -1417,29 +1419,24 @@ tray_icon_blink_cb (gpointer data) /* Add a new data to tray list */ - + static void -tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) +tray_list_add_async (struct _tray_msg *msg) { - struct _tray_msg *list = msg->data; -- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); +- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); - tray_icons_list = g_list_prepend (tray_icons_list, list->data); -+ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); ++ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); + tray_icons_list = g_list_prepend (tray_icons_list, msg->data); + + g_slice_free (struct _tray_msg, msg); } - + static void tray_list_add_new (TrayIconData *data) { - AlarmMsg *msg; - struct _tray_msg *list; + struct _tray_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = tray_list_add_async; @@ -7191,8 +7191,8 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - list = malloc (sizeof (struct _tray_msg)); - list->data = data; - msg->data = list; -- -- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); +- +- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _tray_msg); + msg->header.func = (MessageFunc) tray_list_add_async; @@ -7200,43 +7200,43 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + + message_push ((Message *) msg); } - + /* Performs notification of a display alarm */ @@ -1836,21 +1833,13 @@ check_midnight_refresh (gpointer user_da new_midnight = time_day_end_with_zone (time (NULL), zone); - + if (new_midnight > midnight) { - AlarmMsg *msg; - struct _midnight_refresh_msg *list; -- +- - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = midnight_refresh_async; - - list = malloc (sizeof (struct _midnight_refresh_msg)); + struct _midnight_refresh_msg *msg; - + - list->remove = FALSE; - /* We dont need it. So set it to NULL */ - msg->data = list; + msg = g_slice_new (struct _midnight_refresh_msg); + msg->header.func = (MessageFunc) midnight_refresh_async; + msg->remove = FALSE; - + - d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + return TRUE; @@ -1981,14 +1970,15 @@ hash_ids (gpointer a) } - + struct _alarm_client_msg { + Message header; ECal *client; }; - + -static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) +static void +alarm_queue_add_async (struct _alarm_client_msg *msg) @@ -7245,17 +7245,17 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _alarm_client_msg *list = msg->data; - ECal *client = list->client; + ECal *client = msg->client; - + g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); @@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre G_CALLBACK (cal_opened_cb), ca); - } + } + + g_slice_free (struct _alarm_client_msg, msg); } - + /** @@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre void @@ -7264,7 +7264,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - AlarmMsg *msg; - struct _alarm_client_msg *list; + struct _alarm_client_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = alarm_queue_add_async; @@ -7276,12 +7276,12 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg = g_slice_new (struct _alarm_client_msg); + msg->header.func = (MessageFunc) alarm_queue_add_async; + msg->client = g_object_ref (client); - + - d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + /* Removes a component an its alarms */ @@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca) * Removes a calendar client from the alarm queueing system. @@ -7294,17 +7294,17 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _alarm_client_msg *list = msg->data; - ECal *client = list->client; + ECal *client = msg->client; - + g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); @@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al g_free (ca); - + g_hash_table_remove (client_alarms_hash, client); + + g_slice_free (struct _alarm_client_msg, msg); } - + /** alarm_queue_remove_client @@ -2156,24 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al void @@ -7313,7 +7313,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - AlarmMsg *msg; - struct _alarm_client_msg *list; + struct _alarm_client_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = alarm_queue_remove_async; @@ -7324,7 +7324,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg = g_slice_new (struct _alarm_client_msg); + msg->header.func = (MessageFunc) alarm_queue_remove_async; + msg->client = client; - + - d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); if (immediately) { - alarm_queue_remove_async (NULL, msg, NULL); @@ -7335,5 +7335,5 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - - /* Update non-time related variables for various structures on modification of an existing component + + /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch index 10f93f2..56b9582 100644 --- a/evolution-2.9.1-kill-ememory.patch +++ b/evolution-2.9.1-kill-ememory.patch @@ -4,7 +4,7 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail @@ -416,70 +416,28 @@ get_message_info (MessageList *message_l return info; } - + -static const char * -get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int col) +static const gchar * @@ -14,7 +14,7 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail - char *normalised; - EPoolv *poolv; - int index; -- +- - switch (col) { - case COL_SUBJECT_NORM: - string = camel_message_info_subject (info); @@ -33,7 +33,7 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail - index = NORMALISED_LAST; - g_warning ("Should not be reached\n"); - } -- +- - /* slight optimisation */ - if (string == NULL || string[0] == '\0') + GHashTable *hash_table = message_list->normalised_hash; @@ -42,7 +42,7 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail + + if (string == NULL || *string == '\0') return ""; -- +- - poolv = g_hash_table_lookup (message_list->normalised_hash, camel_message_info_uid (info)); - if (poolv == NULL) { - poolv = e_poolv_new (NORMALISED_LAST); @@ -52,29 +52,29 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail - if (*str) - return str; - } -- +- - if (col == COL_SUBJECT_NORM) { - const unsigned char *subject; -- +- - subject = (const unsigned char *) string; - while (!g_ascii_strncasecmp ((char *)subject, "Re:", 3)) { - subject += 3; -- +- - /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) - subject++; - } -- +- - /* jump over any spaces */ - while (*subject && isspace ((int) *subject)) - subject++; -- +- - string = (const char *) subject; - } -- +- - normalised = g_utf8_collate_key (string, -1); - e_poolv_set (poolv, index, normalised, TRUE); -- +- - return e_poolv_get (poolv, index); + + collation_key = g_hash_table_lookup (hash_table, string); @@ -90,7 +90,7 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail + + return collation_key; } - + static void @@ -1287,12 +1245,23 @@ ml_tree_value_at (ETreeModel *etm, ETree str = camel_message_info_from (msg_info); @@ -117,7 +117,7 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail + return (void *) get_normalised_string (message_list, str); case COL_SENT: { ETreePath child; - + @@ -1316,7 +1285,8 @@ ml_tree_value_at (ETreeModel *etm, ETree str = camel_message_info_to (msg_info); return (void *)(str ? str : ""); @@ -131,7 +131,7 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail @@ -2066,13 +2036,13 @@ message_list_init (MessageList *message_ gtk_scrolled_window_set_vadjustment ((GtkScrolledWindow *) message_list, adjustment); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - + - message_list->normalised_hash = g_hash_table_new_full ( - g_str_hash, g_str_equal, - (GDestroyNotify) NULL, @@ -140,22 +140,22 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail + g_hash_table_new (g_str_hash, g_str_equal); + + message_list->string_chunk = g_string_chunk_new (1024); - + message_list->hidden = NULL; - message_list->hidden_pool = NULL; + message_list->hidden_string_chunk = NULL; message_list->hide_before = ML_HIDE_NONE_START; message_list->hide_after = ML_HIDE_NONE_END; - + @@ -2166,15 +2136,16 @@ message_list_finalise (GObject *object) struct _MessageListPrivate *p = message_list->priv; - + g_hash_table_destroy (message_list->normalised_hash); + g_string_chunk_free (message_list->string_chunk); - + if (message_list->thread_tree) camel_folder_thread_messages_unref(message_list->thread_tree); - + if (message_list->hidden) { g_hash_table_destroy(message_list->hidden); - e_mempool_destroy(message_list->hidden_pool); @@ -164,18 +164,18 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail - message_list->hidden_pool = NULL; + message_list->hidden_string_chunk = NULL; } - + g_free(message_list->search); @@ -3124,6 +3095,9 @@ message_list_set_folder (MessageList *me - + /* reset the normalised sort performance hack */ g_hash_table_remove_all (message_list->normalised_hash); + + g_string_chunk_free (message_list->string_chunk); + message_list->string_chunk = g_string_chunk_new (1024); - + mail_regen_cancel(message_list); - + @@ -3574,14 +3548,14 @@ message_list_hide_uids (MessageList *ml, MESSAGE_LIST_LOCK (ml, hide_lock); if (ml->hidden == NULL) { @@ -183,7 +183,7 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail - ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE); + ml->hidden_string_chunk = g_string_chunk_new (512); } - + - uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); + uid = g_string_chunk_insert (ml->hidden_string_chunk, uids->pdata[i]); g_hash_table_insert (ml->hidden, uid, uid); @@ -229,21 +229,21 @@ diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail camel_file_util_decode_fixed_int32 (in, &upper); @@ -3662,7 +3636,7 @@ load_hide_state (MessageList *ml) char *olduid, *uid; - + if (camel_file_util_decode_string (in, &olduid) != -1) { - uid = e_mempool_strdup(ml->hidden_pool, olduid); + uid = g_string_chunk_insert(ml->hidden_string_chunk, olduid); g_free (olduid); g_hash_table_insert(ml->hidden, uid, uid); } -@@ -3811,12 +3785,12 @@ regen_list_exec (struct _regen_list_msg - +@@ -3811,12 +3785,12 @@ regen_list_exec (struct _regen_list_msg + if (m->ml->hidden == NULL) { m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); - m->ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE); + m->ml->hidden_string_chunk = g_string_chunk_new (512); } - + for (i = 0; i < uidnew->len; i++) { if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == NULL) { - char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]); @@ -256,10 +256,10 @@ diff -up evolution-2.21.2/mail/message-list.h.kill-ememory evolution-2.21.2/mail +++ evolution-2.21.2/mail/message-list.h 2007-12-01 10:22:46.000000000 -0500 @@ -102,11 +102,12 @@ struct _MessageList { GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ - + GHashTable *normalised_hash; + GStringChunk *string_chunk; - + /* UID's to hide. Keys in the mempool */ /* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */ GHashTable *hidden; @@ -267,4 +267,4 @@ diff -up evolution-2.21.2/mail/message-list.h.kill-ememory evolution-2.21.2/mail + GStringChunk *hidden_string_chunk; int hide_unhidden; /* total length, before hiding */ int hide_before, hide_after; /* hide ranges of messages */ - + diff --git a/evolution-2.9.3-meeting-list-view.patch b/evolution-2.9.3-meeting-list-view.patch deleted file mode 100644 index 9b87a14..0000000 --- a/evolution-2.9.3-meeting-list-view.patch +++ /dev/null @@ -1,86 +0,0 @@ ---- evolution-2.9.3/calendar/gui/e-meeting-list-view.c.meeting-list-view 2006-12-11 23:13:47.000000000 -0500 -+++ evolution-2.9.3/calendar/gui/e-meeting-list-view.c 2006-12-11 23:14:17.000000000 -0500 -@@ -623,18 +623,45 @@ - - } - -+void -+attendee_added_cb (EMeetingStore *store, GtkTreePath *path, -+ GtkTreeIter *iter, EMeetingListView *view) -+{ -+ EMeetingAttendee *attendee; -+ gint row; -+ -+ /* Add the new attendee to the name selector. */ -+ row = gtk_tree_path_get_indices (path) [0]; -+ attendee = e_meeting_store_find_attendee_at_row (store, row); -+ e_meeting_list_view_add_attendee_to_name_selector (view, attendee); -+} -+ -+void -+attendee_deleted_cb (EMeetingStore *store, GtkTreePath *path, -+ EMeetingListView *view) -+{ -+ EMeetingAttendee *attendee; -+ gint row; -+ -+ /* Remove the old attendee from the name selector. */ -+ row = gtk_tree_path_get_indices (path) [0]; -+ attendee = e_meeting_store_find_attendee_at_row (store, row); -+ e_meeting_list_view_remove_attendee_from_name_selector (view, attendee); -+} - - EMeetingListView * - e_meeting_list_view_new (EMeetingStore *store) - { -- EMeetingListView *view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL); -+ EMeetingListView *view; - GtkTreeSelection *selection; - -- if (view) { -- view->priv->store = store; -- gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store)); -- build_table (view); -- } -+ view = g_object_new (E_TYPE_MEETING_LIST_VIEW, NULL); -+ view->priv->store = store; -+ gtk_tree_view_set_model (GTK_TREE_VIEW (view), GTK_TREE_MODEL (store)); -+ build_table (view); -+ -+ g_signal_connect (store, "row-inserted", G_CALLBACK (attendee_added_cb), view); -+ g_signal_connect (store, "row-deleted", G_CALLBACK (attendee_deleted_cb), view); - - selection = gtk_tree_view_get_selection (GTK_TREE_VIEW(view)); - g_signal_connect (selection, "changed", G_CALLBACK (row_activated_cb), view); ---- evolution-2.9.3/calendar/gui/e-meeting-store.c.meeting-list-view 2006-12-04 10:44:42.000000000 -0500 -+++ evolution-2.9.3/calendar/gui/e-meeting-store.c 2006-12-11 23:14:17.000000000 -0500 -@@ -794,14 +794,13 @@ - } - - if (row != -1) { -- -- g_ptr_array_remove_index (store->priv->attendees, row); -- g_object_unref (attendee); -- - path = gtk_tree_path_new (); - gtk_tree_path_append_index (path, row); - gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path); - gtk_tree_path_free (path); -+ -+ g_ptr_array_remove_index (store->priv->attendees, row); -+ g_object_unref (attendee); - } - } - -@@ -815,10 +814,10 @@ - - for (i = 0; i < store->priv->attendees->len; i++) { - EMeetingAttendee *attendee = g_ptr_array_index (store->priv->attendees, i); -- g_object_unref (attendee); - - gtk_tree_model_row_deleted (GTK_TREE_MODEL (store), path); - gtk_tree_path_next (path); -+ g_object_unref (attendee); - } - - g_ptr_array_set_size (store->priv->attendees, 0); diff --git a/evolution.spec b/evolution.spec index 7031709..49c5018 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.21.2 -Release: 4%{?dist} +Version: 2.21.3 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -110,16 +110,10 @@ Patch27: evolution-2.9.1-im-context-reset.patch # RH bug #215478 / GNOME bug #383842 Patch30: evolution-2.9.3-source-path-entry.patch -# RH bug #215467 / GNOME bug #380644 -Patch31: evolution-2.9.3-meeting-list-view.patch - # GNOME bug #376991 # XXX Disabled due to outstanding issues. #Patch33: evolution-2.10.0-e-passwords.patch -# GNOME bug #499920 -Patch34: evolution-2.21.2-invalid-include.patch - ## Dependencies ### Requires(post): GConf2 @@ -252,9 +246,7 @@ PalmOS devices with %{name}. %patch27 -p1 -b .im-context-reset #%patch29 -p1 -b .view-attachment-uri %patch30 -p1 -b .source-path-entry -%patch31 -p1 -b .meeting-list-view #%patch33 -p1 -b .e-passwords -%patch34 -p1 -b .invalid-include mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -680,6 +672,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Dec 03 2007 Matthew Barnes - 2.21.3-1.fc9 +- Update to 2.21.3 +- Remove patch for RH bug #215467 (fixed upstream). +- Remove patch for GNOME bug #499920 (fixed upstream). + * Sat Dec 01 2007 Matthew Barnes - 2.21.2-4.fc9 - Fix a corrupted patch that caused GNOME bug #499291. diff --git a/sources b/sources index b630403..770cae4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -833cf5f76ec30170d22f04948fba9997 evolution-2.21.2.tar.bz2 +c8e4b72d503cc37ae9936dff06ae1d26 evolution-2.21.3.tar.bz2 From 5c11ff620e6271165ab12d9e7e9465303780be1d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 5 Dec 2007 02:30:38 +0000 Subject: [PATCH 188/844] Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 49c5018..b40dac6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -672,6 +672,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Dec 4 2007 Matthias Clasen - 2.21.3-2 +- Rebuild against new openssl + * Mon Dec 03 2007 Matthew Barnes - 2.21.3-1.fc9 - Update to 2.21.3 - Remove patch for RH bug #215467 (fixed upstream). From 5143c77ba71ebf23b5b1a8aad42c04d64f289a94 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 5 Dec 2007 20:01:45 +0000 Subject: [PATCH 189/844] - Bump eds_version to 2.21.3. --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b40dac6..b2d7b31 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.21.1 +%define eds_version 2.21.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -672,6 +672,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Dec 05 2007 Matthew Barnes - 2.21.3-3.fc9 +- Bump eds_version to 2.21.3. + * Tue Dec 4 2007 Matthias Clasen - 2.21.3-2 - Rebuild against new openssl From f795f839c6cfae3257fa96899ff8e374c9ac9f3c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 5 Dec 2007 20:22:33 +0000 Subject: [PATCH 190/844] - Bump eds_version to 2.21.3 and gtkhtml_version to 3.17.3. --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b2d7b31..f518df1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gnome_pilot_version 2.0.15 %define gnomevfs2_version 2.4 %define gtk2_version 2.12.0 -%define gtkhtml_version 3.17.1 +%define gtkhtml_version 3.17.3 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.16.0 @@ -673,7 +673,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Dec 05 2007 Matthew Barnes - 2.21.3-3.fc9 -- Bump eds_version to 2.21.3. +- Bump eds_version to 2.21.3 and gtkhtml_version to 3.17.3. * Tue Dec 4 2007 Matthias Clasen - 2.21.3-2 - Rebuild against new openssl From 23a28c01895fca723f932b220655e19874346956 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 10 Dec 2007 20:16:51 +0000 Subject: [PATCH 191/844] - Split junk filtering plugins into evolution-bogofilter and evolution-spamassassin subpackages, each of which requires the necessary backend packages. (RH bug #377381) --- evolution.spec | 53 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 40 insertions(+), 13 deletions(-) diff --git a/evolution.spec b/evolution.spec index f518df1..ac69b5b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.3 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -55,9 +55,6 @@ Source: evolution-%{version}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} -Provides: evolution-bogofilter = %{version}-%{release} -Obsoletes: evolution-bogofilter <= 0.2.0-5 - ### Patches ### # bad hack @@ -225,10 +222,28 @@ Requires: %{name} = %{version}-%{release} Requires: gnome-pilot >= %{gnome_pilot_version} %description conduits -The package contains conduits for synchronizing PalmPilot or other +This package contains conduits for synchronizing PalmPilot or other PalmOS devices with %{name}. %endif +%package bogofilter +Group: Applications/Productivity +Summary: Bogofilter plugin for Evolution +Requires: %{name} = %{version}-%{release} +Requires: bogofilter + +%description bogofilter +This package contains the plugin to filter junk mail using Bogofilter. + +%package spamassassin +Group: Applications/Productivity +Summary: SpamAssassin plugin for Evolution +Requires: %{name} = %{version}-%{release} +Requires: spamassassin + +%description spamassassin +This package contains the plugin to filter junk mail using SpamAssassin. + %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack @@ -396,9 +411,12 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.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 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null +%post bogofilter +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null + %postun /sbin/ldconfig scrollkeeper-update -q @@ -419,7 +437,6 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas -%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas %{_sysconfdir}/gconf/schemas/evolution-mail.schemas # The main executable @@ -513,9 +530,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-audio-inline.so %endif -%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug -%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so - %{evo_plugin_dir}/org-gnome-calendar-file.eplug %{evo_plugin_dir}/liborg-gnome-calendar-file.so @@ -599,9 +613,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-print-message.so %{evo_plugin_dir}/org-gnome-print-message.xml -%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug -%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so - %{evo_plugin_dir}/org-gnome-save-calendar.eplug %{evo_plugin_dir}/liborg-gnome-save-calendar.so @@ -671,7 +682,23 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gnome-pilot/conduits/e-todo.conduit %endif +%files bogofilter +%defattr(-, root, root) +%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug +%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so +%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas + +%files spamassassin +%defattr(-, root, root) +%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug +%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so + %changelog +* Mon Dec 10 2007 Matthew Barnes - 2.21.3-4.fc9 +- Split junk filtering plugins into evolution-bogofilter and + evolution-spamassassin subpackages, each of which requires the + necessary backend packages. (RH bug #377381) + * Mon Dec 05 2007 Matthew Barnes - 2.21.3-3.fc9 - Bump eds_version to 2.21.3 and gtkhtml_version to 3.17.3. From ab1faa09f2d4b7f99fcb568ab9fd49cccc48d1dc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 17 Dec 2007 20:02:57 +0000 Subject: [PATCH 192/844] - Update to 2.21.4 - Expunge unused patches. - Bump eds_version to 2.21.4 for new Camel functions. --- evolution-2.10.0-e-passwords.patch | 31 - evolution-2.21.4-too-noisy.patch | 12 + ...4.1-hide-switcher-buttons-by-default.patch | 11 - evolution-2.8.1-kill-ethread.patch | 2635 +++++++++-------- evolution-2.9.3-view-attachment-uri.patch | 46 - evolution.spec | 67 +- 6 files changed, 1372 insertions(+), 1430 deletions(-) delete mode 100644 evolution-2.10.0-e-passwords.patch create mode 100644 evolution-2.21.4-too-noisy.patch delete mode 100644 evolution-2.4.1-hide-switcher-buttons-by-default.patch delete mode 100644 evolution-2.9.3-view-attachment-uri.patch diff --git a/evolution-2.10.0-e-passwords.patch b/evolution-2.10.0-e-passwords.patch deleted file mode 100644 index 8489dee..0000000 --- a/evolution-2.10.0-e-passwords.patch +++ /dev/null @@ -1,31 +0,0 @@ ---- evolution-2.10.0/mail/mail-session.c.e-passwords 2007-03-12 23:41:06.000000000 -0400 -+++ evolution-2.10.0/mail/mail-session.c 2007-03-12 23:41:35.000000000 -0400 -@@ -679,8 +679,6 @@ - - d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); - -- e_passwords_cancel(); -- - /* flush/cancel pending user messages */ - while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { - d(printf ("Flusing message request: %s\n", um->prompt)); ---- evolution-2.10.0/shell/main.c.e-passwords 2007-03-12 23:39:38.000000000 -0400 -+++ evolution-2.10.0/shell/main.c 2007-03-12 23:39:54.000000000 -0400 -@@ -565,7 +565,6 @@ - glade_init (); - e_cursors_init (); - e_icon_factory_init (); -- e_passwords_init(); - - gtk_window_set_default_icon_name ("evolution"); - ---- evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c.e-passwords 2007-03-12 23:40:22.000000000 -0400 -+++ evolution-2.10.0/calendar/gui/alarm-notify/notify-main.c 2007-03-12 23:40:36.000000000 -0400 -@@ -169,7 +169,6 @@ - - alarm_done (); - -- e_passwords_shutdown (); - gnome_sound_shutdown (); - - return 0; diff --git a/evolution-2.21.4-too-noisy.patch b/evolution-2.21.4-too-noisy.patch new file mode 100644 index 0000000..379e6ff --- /dev/null +++ b/evolution-2.21.4-too-noisy.patch @@ -0,0 +1,12 @@ +diff -up evolution-2.21.4/plugins/mail-notification/mail-notification.c.too-noisy evolution-2.21.4/plugins/mail-notification/mail-notification.c +--- evolution-2.21.4/plugins/mail-notification/mail-notification.c.too-noisy 2007-12-15 10:58:55.000000000 -0500 ++++ evolution-2.21.4/plugins/mail-notification/mail-notification.c 2007-12-17 12:41:26.000000000 -0500 +@@ -581,7 +581,7 @@ static void + new_notify_sound (EMEventTargetFolder *t) + { + time_t last_newmail; +- struct _SoundNotifyData data = {0, 0}; ++ static struct _SoundNotifyData data = {0, 0}; + + time (&last_newmail); + diff --git a/evolution-2.4.1-hide-switcher-buttons-by-default.patch b/evolution-2.4.1-hide-switcher-buttons-by-default.patch deleted file mode 100644 index f5ac169..0000000 --- a/evolution-2.4.1-hide-switcher-buttons-by-default.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- evolution-2.4.1/shell/apps_evolution_shell.schemas.in.hide-switcher-buttons-by-default 2005-10-26 16:21:15.000000000 -0400 -+++ evolution-2.4.1/shell/apps_evolution_shell.schemas.in 2005-10-26 16:21:22.000000000 -0400 -@@ -99,7 +99,7 @@ - /apps/evolution/shell/view_defaults/buttons_visible - evolution - bool -- TRUE -+ FALSE - - Window buttons are visible - Whether the window buttons should be visible. diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 4c9f486..72c9513 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -1,18 +1,18 @@ -diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/mail/mail-send-recv.c ---- evolution-2.21.1/mail/mail-send-recv.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-send-recv.c 2007-10-29 14:47:20.000000000 -0400 -@@ -775,23 +775,22 @@ receive_get_folder(CamelFilterDriver *d, +diff -up evolution-2.21.4/mail/mail-send-recv.c.kill-ethread evolution-2.21.4/mail/mail-send-recv.c +--- evolution-2.21.4/mail/mail-send-recv.c.kill-ethread 2007-12-16 14:30:32.000000000 -0500 ++++ evolution-2.21.4/mail/mail-send-recv.c 2007-12-17 12:33:07.000000000 -0500 +@@ -779,23 +779,22 @@ receive_get_folder(CamelFilterDriver *d, /* ********************************************************************** */ - + struct _refresh_folders_msg { - struct _mail_msg msg; + MailMsg base; - + struct _send_info *info; GPtrArray *folders; CamelStore *store; }; - + -static char * -refresh_folders_desc (struct _mail_msg *mm, int done) +static gchar * @@ -20,7 +20,7 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma { return g_strdup_printf(_("Checking for new mail")); } - + static void -refresh_folders_get (struct _mail_msg *mm) +refresh_folders_exec (struct _refresh_folders_msg *m) @@ -29,9 +29,9 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma int i; CamelFolder *folder; CamelException ex = CAMEL_EXCEPTION_INITIALISER; -@@ -813,17 +812,14 @@ refresh_folders_get (struct _mail_msg *m +@@ -817,17 +816,14 @@ refresh_folders_get (struct _mail_msg *m } - + static void -refresh_folders_got (struct _mail_msg *mm) +refresh_folders_done (struct _refresh_folders_msg *m) @@ -40,19 +40,19 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma - receive_done("", m->info); } - + static void -refresh_folders_free (struct _mail_msg *mm) +refresh_folders_free (struct _refresh_folders_msg *m) { - struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; int i; - + for (i=0;ifolders->len;i++) -@@ -832,11 +828,12 @@ refresh_folders_free (struct _mail_msg * +@@ -836,11 +832,12 @@ refresh_folders_free (struct _mail_msg * camel_object_unref(m->store); } - + -static struct _mail_msg_op refresh_folders_op = { - refresh_folders_desc, - refresh_folders_get, @@ -65,52 +65,52 @@ diff -up evolution-2.21.1/mail/mail-send-recv.c.kill-ethread evolution-2.21.1/ma + (MailMsgDoneFunc) refresh_folders_done, + (MailMsgFreeFunc) refresh_folders_free }; - + static void -@@ -869,13 +866,13 @@ receive_update_got_folderinfo(CamelStore - +@@ -870,13 +867,13 @@ receive_update_got_folderinfo(CamelStore + get_folders(store, folders, info); - + - m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m)); + m = mail_msg_new(&refresh_folders_info); m->store = store; camel_object_ref(store); m->folders = folders; m->info = sinfo; - + - e_thread_put(mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } else { receive_done ("", data); } -diff -up evolution-2.21.1/mail/mail-component.c.kill-ethread evolution-2.21.1/mail/mail-component.c ---- evolution-2.21.1/mail/mail-component.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-component.c 2007-10-29 14:47:20.000000000 -0400 -@@ -1000,7 +1000,7 @@ impl_handleURI (PortableServer_Servant s +diff -up evolution-2.21.4/mail/mail-component.c.kill-ethread evolution-2.21.4/mail/mail-component.c +--- evolution-2.21.4/mail/mail-component.c.kill-ethread 2007-12-16 15:05:36.000000000 -0500 ++++ evolution-2.21.4/mail/mail-component.c 2007-12-17 12:33:08.000000000 -0500 +@@ -1010,7 +1010,7 @@ impl_handleURI (PortableServer_Servant s if (camel_url_get_param(url, "uid") != NULL) { char *curi = em_uri_to_camel(uri); - + - mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); + mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); g_free(curi); } else { g_warning("email uri's must include a uid parameter"); -diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mail-ops.c ---- evolution-2.21.1/mail/mail-ops.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-ops.c 2007-10-29 14:54:45.000000000 -0400 +diff -up evolution-2.21.4/mail/mail-ops.c.kill-ethread evolution-2.21.4/mail/mail-ops.c +--- evolution-2.21.4/mail/mail-ops.c.kill-ethread 2007-12-16 14:36:47.000000000 -0500 ++++ evolution-2.21.4/mail/mail-ops.c 2007-12-17 12:33:07.000000000 -0500 @@ -75,7 +75,7 @@ /* used for both just filtering a folder + uid's, and for filtering a whole folder */ /* used both for fetching mail, and for filtering mail */ struct _filter_mail_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *source_folder; /* where they come from */ GPtrArray *source_uids; /* uids to copy, or NULL == copy all */ @@ -99,8 +99,8 @@ struct _fetch_mail_msg { void *data; }; - + -static char * -em_filter_folder_element_describe (struct _mail_msg *mm, int complete) +static gchar * @@ -128,35 +128,35 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm; CamelFolder *folder; GPtrArray *uids, *folder_uids = NULL; - -@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct + +@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct else folder_uids = uids = camel_folder_get_uids (folder); - + - camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &mm->ex); - camel_filter_driver_flush (m->driver, &mm->ex); + camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &m->base.ex); + camel_filter_driver_flush (m->driver, &m->base.ex); - + if (folder_uids) camel_folder_free_uids (folder, folder_uids); - + /* sync our source folder */ if (!m->cache) - camel_folder_sync (folder, FALSE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex); + camel_folder_sync (folder, FALSE, camel_exception_is_set (&m->base.ex) ? NULL : &m->base.ex); camel_folder_thaw (folder); - + if (m->destination) -@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct +@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct } - + static void -em_filter_folder_element_filtered (struct _mail_msg *mm) +em_filter_folder_element_done (struct _filter_mail_msg *m) { } - + static void -em_filter_folder_element_free (struct _mail_msg *mm) +em_filter_folder_element_free (struct _filter_mail_msg *m) @@ -165,11 +165,11 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - if (m->source_folder) camel_object_unref (m->source_folder); - + @@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m mail_session_flush_filter_log (); } - + -static struct _mail_msg_op em_filter_folder_element_op = { - em_filter_folder_element_describe, /* we do our own progress reporting? */ - em_filter_folder_element_filter, @@ -182,12 +182,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) em_filter_folder_element_done, + (MailMsgFreeFunc) em_filter_folder_element_free }; - + void @@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_ { struct _filter_mail_msg *m; - + - m = mail_msg_new (&em_filter_folder_element_op, NULL, sizeof (*m)); + m = mail_msg_new (&em_filter_folder_element_info); m->source_folder = source_folder; @@ -196,16 +196,16 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_ camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); } - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* convenience functions for it */ @@ -260,17 +258,16 @@ uid_cachename_hack (CamelStore *store) return filename; } - + -static char * -fetch_mail_describe (struct _mail_msg *mm, int complete) +static gchar * @@ -213,7 +213,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { return g_strdup (_("Fetching Mail")); } - + static void -fetch_mail_fetch (struct _mail_msg *mm) +fetch_mail_exec (struct _fetch_mail_msg *m) @@ -222,7 +222,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _filter_mail_msg *fm = (struct _filter_mail_msg *)mm; + struct _filter_mail_msg *fm = (struct _filter_mail_msg *)m; int i; - + if (m->cancel) @@ -283,20 +280,20 @@ fetch_mail_fetch (struct _mail_msg *mm) /* FIXME: this should support keep_on_server too, which would then perform a spool @@ -230,7 +230,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (!strncmp (m->source_uri, "mbox:", 5)) { - char *path = mail_tool_do_movemail (m->source_uri, &mm->ex); + char *path = mail_tool_do_movemail (m->source_uri, &fm->base.ex); - + - if (path && !camel_exception_is_set (&mm->ex)) { + if (path && !camel_exception_is_set (&fm->base.ex)) { camel_folder_freeze (fm->destination); @@ -238,7 +238,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &mm->ex); + camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &fm->base.ex); camel_folder_thaw (fm->destination); - + - if (!camel_exception_is_set (&mm->ex)) + if (!camel_exception_is_set (&fm->base.ex)) g_unlink (path); @@ -247,25 +247,25 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai } else { - CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &mm->ex); + CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &fm->base.ex); - + if (folder) { /* this handles 'keep on server' stuff, if we have any new uid's to copy @@ -322,17 +319,17 @@ fetch_mail_fetch (struct _mail_msg *mm) camel_uid_cache_free_uids (cache_uids); - + fm->cache = cache; - em_filter_folder_element_filter (mm); + em_filter_folder_element_exec (fm); - + /* need to uncancel so writes/etc. don't fail */ - if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) + if (fm->base.ex.id == CAMEL_EXCEPTION_USER_CANCEL) camel_operation_uncancel(NULL); - + /* save the cache of uids that we've just downloaded */ camel_uid_cache_save (cache); } - + - if (fm->delete && mm->ex.id == CAMEL_EXCEPTION_NONE) { + if (fm->delete && fm->base.ex.id == CAMEL_EXCEPTION_NONE) { /* not keep on server - just delete all the actual messages on the server */ @@ -278,11 +278,11 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - em_filter_folder_element_filter (mm); + em_filter_folder_element_exec (fm); } - + /* we unref the source folder here since we @@ -372,31 +369,28 @@ fail: } - + static void -fetch_mail_fetched (struct _mail_msg *mm) +fetch_mail_done (struct _fetch_mail_msg *m) @@ -292,7 +292,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done (m->source_uri, m->data); } - + static void -fetch_mail_free (struct _mail_msg *mm) +fetch_mail_free (struct _fetch_mail_msg *m) @@ -302,11 +302,11 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai g_free (m->source_uri); if (m->cancel) camel_operation_unref (m->cancel); - + - em_filter_folder_element_free (mm); + em_filter_folder_element_free ((struct _filter_mail_msg *) m); } - + -static struct _mail_msg_op fetch_mail_op = { - fetch_mail_describe, /* we do our own progress reporting */ - fetch_mail_fetch, @@ -319,12 +319,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) fetch_mail_done, + (MailMsgFreeFunc) fetch_mail_free }; - + /* ouch, a 'do everything' interface ... */ @@ -409,7 +403,7 @@ mail_fetch_mail (const char *source, int struct _fetch_mail_msg *m; struct _filter_mail_msg *fm; - + - m = mail_msg_new (&fetch_mail_op, NULL, sizeof (*m)); + m = mail_msg_new (&fetch_mail_info); fm = (struct _filter_mail_msg *)m; @@ -333,24 +333,24 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai @@ -426,7 +420,7 @@ mail_fetch_mail (const char *source, int if (status) camel_filter_driver_set_status_func (fm->driver, status, status_data); - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ********************************************************************** */ @@ -657,7 +651,7 @@ exit: /* ** SEND MAIL QUEUE ***************************************************** */ - + struct _send_queue_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *queue; char *destination; @@ -689,9 +683,8 @@ report_status (struct _send_queue_msg *m } - + static void -send_queue_send(struct _mail_msg *mm) +send_queue_exec (struct _send_queue_msg *m) @@ -359,7 +359,16 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai CamelFolder *sent_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT); GPtrArray *uids, *send_uids = NULL; CamelException ex; -@@ -739,17 +732,17 @@ send_queue_send(struct _mail_msg *mm) +@@ -725,7 +718,7 @@ send_queue_send(struct _mail_msg *mm) + if (m->cancel) + camel_operation_register (m->cancel); + else +- camel_operation_register (mm->cancel); ++ camel_operation_register (m->base.cancel); + + if (!m->cancel) + camel_operation_start (NULL, _("Sending message")); +@@ -746,17 +739,17 @@ send_queue_send(struct _mail_msg *mm) if (camel_exception_is_set (&ex)) { if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { /* merge exceptions into one */ @@ -371,7 +380,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_exception_xfer (&mm->ex, &ex); + camel_exception_xfer (&m->base.ex, &ex); camel_exception_clear (&ex); - + /* keep track of the number of failures */ j++; } else { @@ -381,8 +390,8 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai break; } } -@@ -759,7 +752,7 @@ send_queue_send(struct _mail_msg *mm) - +@@ -766,7 +759,7 @@ send_queue_send(struct _mail_msg *mm) + if (j > 0) report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed to send %d of %d messages"), j, send_uids->len); - else if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) @@ -390,9 +399,15 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Canceled.")); else report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); -@@ -785,19 +778,15 @@ send_queue_send(struct _mail_msg *mm) +@@ -793,24 +786,20 @@ send_queue_send(struct _mail_msg *mm) + if (m->cancel) + camel_operation_unregister (m->cancel); + else +- camel_operation_unregister (mm->cancel); ++ camel_operation_unregister (m->base.cancel); + } - + static void -send_queue_sent(struct _mail_msg *mm) +send_queue_done (struct _send_queue_msg *m) @@ -402,7 +417,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->destination, m->data); } - + static void -send_queue_free(struct _mail_msg *mm) +send_queue_free (struct _send_queue_msg *m) @@ -412,10 +427,10 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->driver) camel_object_unref(m->driver); camel_object_unref(m->queue); -@@ -806,11 +795,12 @@ send_queue_free(struct _mail_msg *mm) +@@ -819,11 +808,12 @@ send_queue_free(struct _mail_msg *mm) camel_operation_unref(m->cancel); } - + -static struct _mail_msg_op send_queue_op = { - NULL, /* do our own reporting, as with fetch mail */ - send_queue_send, @@ -428,37 +443,50 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) send_queue_done, + (MailMsgFreeFunc) send_queue_free }; - + /* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */ -@@ -823,7 +813,7 @@ mail_send_queue(CamelFolder *queue, cons +@@ -836,17 +826,17 @@ mail_send_queue(CamelFolder *queue, cons { struct _send_queue_msg *m; - + - m = mail_msg_new(&send_queue_op, NULL, sizeof(*m)); + m = mail_msg_new(&send_queue_info); m->queue = queue; camel_object_ref(queue); m->destination = g_strdup(destination); -@@ -839,13 +829,13 @@ mail_send_queue(CamelFolder *queue, cons + if (cancel) { + m->cancel = cancel; + camel_operation_ref(cancel); +- camel_operation_unref (((struct _mail_msg *) m)->cancel); +- mail_msg_set_cancelable ((struct _mail_msg *)m, FALSE); ++ camel_operation_unref (m->base.cancel); ++ mail_msg_set_cancelable (m, FALSE); + +- ((struct _mail_msg *) m)->cancel = NULL; ++ m->base.cancel = NULL; + } + m->status = status; + m->status_data = status_data; +@@ -856,13 +846,13 @@ mail_send_queue(CamelFolder *queue, cons m->driver = camel_session_get_filter_driver (session, type, NULL); camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); - + - e_thread_put(mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ** APPEND MESSAGE TO FOLDER ******************************************** */ - + struct _append_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; CamelMimeMessage *message; -@@ -856,45 +846,40 @@ struct _append_msg { +@@ -873,45 +863,40 @@ struct _append_msg { void *data; }; - + -static char * -append_mail_desc (struct _mail_msg *mm, int done) +static gchar * @@ -466,7 +494,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { return g_strdup (_("Saving message to folder")); } - + static void -append_mail_append (struct _mail_msg *mm) +append_mail_exec (struct _append_msg *m) @@ -477,7 +505,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &mm->ex); + camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &m->base.ex); } - + static void -append_mail_appended (struct _mail_msg *mm) +append_mail_done (struct _append_msg *m) @@ -488,7 +516,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->done(m->folder, m->message, m->info, !camel_exception_is_set(&mm->ex), m->appended_uid, m->data); + m->done(m->folder, m->message, m->info, !camel_exception_is_set(&m->base.ex), m->appended_uid, m->data); } - + static void -append_mail_free (struct _mail_msg *mm) +append_mail_free (struct _append_msg *m) @@ -499,7 +527,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_object_unref(m->folder); g_free (m->appended_uid); } - + -static struct _mail_msg_op append_mail_op = { - append_mail_desc, - append_mail_append, @@ -512,37 +540,37 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) append_mail_done, + (MailMsgFreeFunc) append_mail_free }; - + void -@@ -911,7 +896,7 @@ mail_append_mail (CamelFolder *folder, C +@@ -928,7 +913,7 @@ mail_append_mail (CamelFolder *folder, C camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); - + - m = mail_msg_new (&append_mail_op, NULL, sizeof (*m)); + m = mail_msg_new (&append_mail_info); m->folder = folder; camel_object_ref(folder); m->message = message; -@@ -921,13 +906,13 @@ mail_append_mail (CamelFolder *folder, C +@@ -938,13 +923,13 @@ mail_append_mail (CamelFolder *folder, C m->done = done; m->data = data; - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ** TRANSFER MESSAGES **************************************************** */ - + struct _transfer_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *source; GPtrArray *uids; -@@ -939,24 +924,21 @@ struct _transfer_msg { +@@ -956,24 +941,21 @@ struct _transfer_msg { void *data; }; - + -static char * -transfer_messages_desc (struct _mail_msg *mm, int done) +static gchar * @@ -552,35 +580,35 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - return g_strdup_printf(m->delete?_("Moving messages to %s"):_("Copying messages to %s"), m->dest_uri); - + } - + static void -transfer_messages_transfer (struct _mail_msg *mm) +transfer_messages_exec (struct _transfer_msg *m) { - struct _transfer_msg *m = (struct _transfer_msg *)mm; CamelFolder *dest; - + - dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &mm->ex); - if (camel_exception_is_set (&mm->ex)) + dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &m->base.ex); + if (camel_exception_is_set (&m->base.ex)) return; - + if (dest == m->source) { -@@ -968,7 +950,7 @@ transfer_messages_transfer (struct _mail +@@ -985,7 +967,7 @@ transfer_messages_transfer (struct _mail camel_folder_freeze (m->source); camel_folder_freeze (dest); - + - camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &mm->ex); + camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &m->base.ex); - + /* make sure all deleted messages are marked as seen */ - -@@ -987,29 +969,26 @@ transfer_messages_transfer (struct _mail + +@@ -1004,29 +986,26 @@ transfer_messages_transfer (struct _mail } - + static void -transfer_messages_transferred (struct _mail_msg *mm) +transfer_messages_done (struct _transfer_msg *m) @@ -591,7 +619,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->done (!camel_exception_is_set (&mm->ex), m->data); + m->done (!camel_exception_is_set (&m->base.ex), m->data); } - + static void -transfer_messages_free (struct _mail_msg *mm) +transfer_messages_free (struct _transfer_msg *m) @@ -602,7 +630,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai g_free (m->dest_uri); em_utils_uids_free (m->uids); } - + -static struct _mail_msg_op transfer_messages_op = { - transfer_messages_desc, - transfer_messages_transfer, @@ -615,37 +643,37 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) transfer_messages_done, + (MailMsgFreeFunc) transfer_messages_free }; - + void -@@ -1026,7 +1005,7 @@ mail_transfer_messages (CamelFolder *sou +@@ -1043,7 +1022,7 @@ mail_transfer_messages (CamelFolder *sou g_return_if_fail (uids != NULL); g_return_if_fail (dest_uri != NULL); - + - m = mail_msg_new(&transfer_messages_op, NULL, sizeof(*m)); + m = mail_msg_new(&transfer_messages_info); m->source = source; camel_object_ref (source); m->uids = uids; -@@ -1036,13 +1015,13 @@ mail_transfer_messages (CamelFolder *sou +@@ -1053,13 +1032,13 @@ mail_transfer_messages (CamelFolder *sou m->done = done; m->data = data; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ** SCAN SUBFOLDERS ***************************************************** */ - + struct _get_folderinfo_msg { - struct _mail_msg msg; + MailMsg base; - + CamelStore *store; CamelFolderInfo *info; -@@ -1050,10 +1029,9 @@ struct _get_folderinfo_msg { +@@ -1067,10 +1046,9 @@ struct _get_folderinfo_msg { void *data; }; - + -static char * -get_folderinfo_desc (struct _mail_msg *mm, int done) +static gchar * @@ -653,22 +681,22 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { - struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; char *ret, *name; - + name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1063,25 +1041,22 @@ get_folderinfo_desc (struct _mail_msg *m +@@ -1080,25 +1058,22 @@ get_folderinfo_desc (struct _mail_msg *m } - + static void -get_folderinfo_get (struct _mail_msg *mm) +get_folderinfo_exec (struct _get_folderinfo_msg *m) { - struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - + - m->info = camel_store_get_folder_info (m->store, NULL, flags, &mm->ex); + m->info = camel_store_get_folder_info (m->store, NULL, flags, &m->base.ex); } - + static void -get_folderinfo_got (struct _mail_msg *mm) +get_folderinfo_done (struct _get_folderinfo_msg *m) @@ -678,17 +706,17 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - if (!m->info && camel_exception_is_set (&mm->ex)) { + if (!m->info && camel_exception_is_set (&m->base.ex)) { char *url; - + url = camel_service_get_url (CAMEL_SERVICE (m->store)); w(g_warning ("Error getting folder info from store at %s: %s", - url, camel_exception_get_description (&mm->ex))); + url, camel_exception_get_description (&m->base.ex))); g_free (url); } - -@@ -1090,20 +1065,19 @@ get_folderinfo_got (struct _mail_msg *mm + +@@ -1107,20 +1082,19 @@ get_folderinfo_got (struct _mail_msg *mm } - + static void -get_folderinfo_free (struct _mail_msg *mm) +get_folderinfo_free (struct _get_folderinfo_msg *m) @@ -699,7 +727,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_store_free_folder_info(m->store, m->info); camel_object_unref(m->store); } - + -static struct _mail_msg_op get_folderinfo_op = { - get_folderinfo_desc, - get_folderinfo_get, @@ -712,12 +740,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_folderinfo_done, + (MailMsgFreeFunc) get_folderinfo_free }; - + int -@@ -1112,19 +1086,19 @@ mail_get_folderinfo (CamelStore *store, +@@ -1129,19 +1103,19 @@ mail_get_folderinfo (CamelStore *store, struct _get_folderinfo_msg *m; int id; - + - m = mail_msg_new(&get_folderinfo_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_folderinfo_info); if (op) { @@ -733,25 +761,25 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai m->data = data; - id = m->msg.seq; + id = m->base.seq; - + - e_thread_put(mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); - + return id; } -@@ -1196,7 +1170,7 @@ mail_build_attachment(CamelFolder *folde +@@ -1213,7 +1187,7 @@ mail_build_attachment(CamelFolder *folde presumably create a folder ... */ - + struct _get_folder_msg { - struct _mail_msg msg; + MailMsg base; - + char *uri; guint32 flags; -@@ -1205,71 +1179,64 @@ struct _get_folder_msg { +@@ -1222,71 +1196,64 @@ struct _get_folder_msg { void *data; }; - + -static char * -get_folder_desc (struct _mail_msg *mm, int done) +static gchar * @@ -761,7 +789,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - return g_strdup_printf(_("Opening folder %s"), m->uri); } - + static void -get_folder_get (struct _mail_msg *mm) +get_folder_exec (struct _get_folder_msg *m) @@ -771,7 +799,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &mm->ex); + m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &m->base.ex); } - + static void -get_folder_got (struct _mail_msg *mm) +get_folder_done (struct _get_folder_msg *m) @@ -781,7 +809,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done (m->uri, m->folder, m->data); } - + static void -get_folder_free (struct _mail_msg *mm) +get_folder_free (struct _get_folder_msg *m) @@ -792,7 +820,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->folder) camel_object_unref (m->folder); } - + -static struct _mail_msg_op get_folder_op = { - get_folder_desc, - get_folder_get, @@ -805,7 +833,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_folder_done, + (MailMsgFreeFunc) get_folder_free }; - + int mail_get_folder (const char *uri, guint32 flags, void (*done)(char *uri, CamelFolder *folder, void *data), @@ -814,33 +842,33 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { struct _get_folder_msg *m; int id; - + - m = mail_msg_new(&get_folder_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_folder_info); m->uri = g_strdup (uri); m->flags = flags; m->data = data; m->done = done; - + - id = m->msg.seq; - e_thread_put(thread, (EMsg *)m); + id = m->base.seq; + dispatch (m); return id; } - + /* ** GET STORE ******************************************************* */ - + struct _get_store_msg { - struct _mail_msg msg; + MailMsg base; - + char *uri; CamelStore *store; -@@ -1277,50 +1244,43 @@ struct _get_store_msg { +@@ -1294,50 +1261,43 @@ struct _get_store_msg { void *data; }; - + -static char * -get_store_desc (struct _mail_msg *mm, int done) +static gchar * @@ -850,7 +878,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - return g_strdup_printf(_("Opening store %s"), m->uri); } - + static void -get_store_get (struct _mail_msg *mm) +get_store_exec (struct _get_store_msg *m) @@ -858,13 +886,13 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _get_store_msg *m = (struct _get_store_msg *)mm; - /*camel_session_get_store connects us, which we don't want to do on startup. */ - + m->store = (CamelStore *) camel_session_get_service (session, m->uri, CAMEL_PROVIDER_STORE, - &mm->ex); + &m->base.ex); } - + static void -get_store_got (struct _mail_msg *mm) +get_store_done (struct _get_store_msg *m) @@ -874,7 +902,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done (m->uri, m->store, m->data); } - + static void -get_store_free (struct _mail_msg *mm) +get_store_free (struct _get_store_msg *m) @@ -885,7 +913,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->store) camel_object_unref (m->store); } - + -static struct _mail_msg_op get_store_op = { - get_store_desc, - get_store_get, @@ -898,12 +926,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_store_done, + (MailMsgFreeFunc) get_store_free }; - + int -@@ -1329,25 +1289,25 @@ mail_get_store (const char *uri, CamelOp +@@ -1346,25 +1306,25 @@ mail_get_store (const char *uri, CamelOp struct _get_store_msg *m; int id; - + - m = mail_msg_new (&get_store_op, NULL, sizeof (*m)); + m = mail_msg_new (&get_store_info); if (op) { @@ -916,26 +944,26 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai m->uri = g_strdup (uri); m->data = data; m->done = done; - + - id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); return id; } - + /* ** REMOVE FOLDER ******************************************************* */ - + struct _remove_folder_msg { - struct _mail_msg msg; + MailMsg base; - + char *uri; gboolean removed; -@@ -1355,18 +1315,15 @@ struct _remove_folder_msg { +@@ -1372,18 +1332,15 @@ struct _remove_folder_msg { void *data; }; - + -static char * -remove_folder_desc (struct _mail_msg *mm, int done) +static gchar * @@ -945,7 +973,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - return g_strdup_printf (_("Removing folder %s"), m->uri); } - + static void -remove_folder_get (struct _mail_msg *mm) +remove_folder_exec (struct _remove_folder_msg *m) @@ -954,18 +982,18 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai CamelStore *store; CamelFolder *folder; GPtrArray *uids; -@@ -1374,7 +1331,7 @@ remove_folder_get (struct _mail_msg *mm) - +@@ -1391,7 +1348,7 @@ remove_folder_get (struct _mail_msg *mm) + m->removed = FALSE; - + - folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); + folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); if (!folder) return; - -@@ -1394,16 +1351,14 @@ remove_folder_get (struct _mail_msg *mm) + +@@ -1411,16 +1368,14 @@ remove_folder_get (struct _mail_msg *mm) camel_store_unsubscribe_folder (store, folder->full_name, NULL); - + /* Then delete the folder from the store */ - camel_store_delete_folder (store, folder->full_name, &mm->ex); - m->removed = !camel_exception_is_set (&mm->ex); @@ -973,7 +1001,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + m->removed = !camel_exception_is_set (&m->base.ex); camel_object_unref (folder); } - + static void -remove_folder_got (struct _mail_msg *mm) +remove_folder_done (struct _remove_folder_msg *m) @@ -983,9 +1011,9 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->removed) { /* FIXME: Remove this folder from the folder cache ??? */ } -@@ -1413,18 +1368,17 @@ remove_folder_got (struct _mail_msg *mm) +@@ -1430,18 +1385,17 @@ remove_folder_got (struct _mail_msg *mm) } - + static void -remove_folder_free (struct _mail_msg *mm) +remove_folder_free (struct _remove_folder_msg *m) @@ -994,7 +1022,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - g_free (m->uri); } - + -static struct _mail_msg_op remove_folder_op = { - remove_folder_desc, - remove_folder_get, @@ -1007,33 +1035,33 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) remove_folder_done, + (MailMsgFreeFunc) remove_folder_free }; - + void -@@ -1432,59 +1386,56 @@ mail_remove_folder (const char *uri, voi +@@ -1449,59 +1403,56 @@ mail_remove_folder (const char *uri, voi { struct _remove_folder_msg *m; - + - m = mail_msg_new (&remove_folder_op, NULL, sizeof (*m)); + m = mail_msg_new (&remove_folder_info); m->uri = g_strdup (uri); m->data = data; m->done = done; - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ** SYNC FOLDER ********************************************************* */ - + struct _sync_folder_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; void (*done) (CamelFolder *folder, void *data); void *data; }; - + -static char *sync_folder_desc(struct _mail_msg *mm, int done) +static gchar * +sync_folder_desc (struct _sync_folder_msg *m) @@ -1043,7 +1071,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai return g_strdup_printf (_("Storing folder \'%s\'"), camel_folder_get_full_name (m->folder)); } - + -static void sync_folder_sync(struct _mail_msg *mm) +static void +sync_folder_exec (struct _sync_folder_msg *m) @@ -1053,7 +1081,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_folder_sync(m->folder, FALSE, &mm->ex); + camel_folder_sync(m->folder, FALSE, &m->base.ex); } - + -static void sync_folder_synced(struct _mail_msg *mm) +static void +sync_folder_done (struct _sync_folder_msg *m) @@ -1063,7 +1091,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->folder, m->data); } - + -static void sync_folder_free(struct _mail_msg *mm) +static void +sync_folder_free (struct _sync_folder_msg *m) @@ -1072,7 +1100,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_object_unref((CamelObject *)m->folder); } - + -static struct _mail_msg_op sync_folder_op = { - sync_folder_desc, - sync_folder_sync, @@ -1085,47 +1113,47 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) sync_folder_done, + (MailMsgFreeFunc) sync_folder_free }; - + void -@@ -1492,19 +1443,19 @@ mail_sync_folder(CamelFolder *folder, vo +@@ -1509,19 +1460,19 @@ mail_sync_folder(CamelFolder *folder, vo { struct _sync_folder_msg *m; - + - m = mail_msg_new(&sync_folder_op, NULL, sizeof(*m)); + m = mail_msg_new(&sync_folder_info); m->folder = folder; camel_object_ref(folder); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ** SYNC STORE ********************************************************* */ - + struct _sync_store_msg { - struct _mail_msg msg; + MailMsg base; - + CamelStore *store; int expunge; -@@ -1512,9 +1463,9 @@ struct _sync_store_msg { +@@ -1529,9 +1480,9 @@ struct _sync_store_msg { void *data; }; - + -static char *sync_store_desc(struct _mail_msg *mm, int done) +static gchar * +sync_store_desc (struct _sync_store_msg *m) { - struct _sync_store_msg *m = (struct _sync_store_msg *)mm; char *uri, *res; - + uri = camel_url_to_string(((CamelService *)m->store)->url, CAMEL_URL_HIDE_ALL); -@@ -1527,33 +1478,31 @@ static char *sync_store_desc(struct _mai +@@ -1544,33 +1495,31 @@ static char *sync_store_desc(struct _mai return res; } - + -static void sync_store_sync(struct _mail_msg *mm) +static void +sync_store_exec (struct _sync_store_msg *m) @@ -1135,7 +1163,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_store_sync(m->store, m->expunge, &mm->ex); + camel_store_sync(m->store, m->expunge, &m->base.ex); } - + -static void sync_store_synced(struct _mail_msg *mm) +static void +sync_store_done (struct _sync_store_msg *m) @@ -1145,7 +1173,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->store, m->data); } - + -static void sync_store_free(struct _mail_msg *mm) +static void +sync_store_free (struct _sync_store_msg *m) @@ -1154,7 +1182,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_object_unref(m->store); } - + -static struct _mail_msg_op sync_store_op = { - sync_store_desc, - sync_store_sync, @@ -1167,12 +1195,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) sync_store_done, + (MailMsgFreeFunc) sync_store_free }; - + void -@@ -1561,36 +1510,37 @@ mail_sync_store(CamelStore *store, int e +@@ -1578,36 +1527,37 @@ mail_sync_store(CamelStore *store, int e { struct _sync_store_msg *m; - + - m = mail_msg_new(&sync_store_op, NULL, sizeof(*m)); + m = mail_msg_new(&sync_store_info); m->store = store; @@ -1180,20 +1208,20 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_object_ref(store); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ******************************************************************************** */ - + -static char *refresh_folder_desc(struct _mail_msg *mm, int done) +static gchar * +refresh_folder_desc (struct _sync_folder_msg *m) { return g_strdup(_("Refreshing folder")); } - + -static void refresh_folder_refresh(struct _mail_msg *mm) +static void +refresh_folder_exec (struct _sync_folder_msg *m) @@ -1203,7 +1231,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_folder_refresh_info(m->folder, &mm->ex); + camel_folder_refresh_info(m->folder, &m->base.ex); } - + /* we just use the sync stuff where we can, since it would be the same */ -static struct _mail_msg_op refresh_folder_op = { - refresh_folder_desc, @@ -1217,32 +1245,32 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) sync_folder_done, + (MailMsgFreeFunc) sync_folder_free }; - + void -@@ -1598,35 +1548,36 @@ mail_refresh_folder(CamelFolder *folder, +@@ -1615,35 +1565,36 @@ mail_refresh_folder(CamelFolder *folder, { struct _sync_folder_msg *m; - + - m = mail_msg_new(&refresh_folder_op, NULL, sizeof(*m)); + m = mail_msg_new(&refresh_folder_info); m->folder = folder; camel_object_ref(folder); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ******************************************************************************** */ - + -static char *expunge_folder_desc(struct _mail_msg *mm, int done) +static gchar * +expunge_folder_desc (struct _sync_folder_msg *m) { return g_strdup(_("Expunging folder")); } - + -static void expunge_folder_expunge(struct _mail_msg *mm) +static void +expunge_folder_exec (struct _sync_folder_msg *m) @@ -1252,7 +1280,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_folder_expunge(m->folder, &mm->ex); + camel_folder_expunge(m->folder, &m->base.ex); } - + /* we just use the sync stuff where we can, since it would be the same */ -static struct _mail_msg_op expunge_folder_op = { - expunge_folder_desc, @@ -1266,34 +1294,34 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) sync_folder_done, + (MailMsgFreeFunc) sync_folder_free }; - + void -@@ -1634,31 +1585,30 @@ mail_expunge_folder(CamelFolder *folder, +@@ -1651,31 +1602,30 @@ mail_expunge_folder(CamelFolder *folder, { struct _sync_folder_msg *m; - + - m = mail_msg_new(&expunge_folder_op, NULL, sizeof(*m)); + m = mail_msg_new(&expunge_folder_info); m->folder = folder; camel_object_ref(folder); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ******************************************************************************** */ - + struct _empty_trash_msg { - struct _mail_msg msg; + MailMsg base; - + EAccount *account; void (*done) (EAccount *account, void *data); void *data; }; - + -static char *empty_trash_desc(struct _mail_msg *mm, int done) +static gchar * +empty_trash_desc (struct _empty_trash_msg *m) @@ -1305,10 +1333,10 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai return g_strdup_printf (_("Emptying trash in \'%s\'"), m->account ? m->account->name : _("Local Folders")); #else -@@ -1666,49 +1616,48 @@ static char *empty_trash_desc(struct _ma +@@ -1683,49 +1633,48 @@ static char *empty_trash_desc(struct _ma #endif } - + -static void empty_trash_empty(struct _mail_msg *mm) +static void +empty_trash_exec (struct _empty_trash_msg *m) @@ -1317,7 +1345,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai const char *evolution_dir; CamelFolder *trash; char *uri; - + if (m->account) { - trash = mail_tool_get_trash (m->account->source->url, FALSE, &mm->ex); + trash = mail_tool_get_trash (m->account->source->url, FALSE, &m->base.ex); @@ -1328,14 +1356,14 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + trash = mail_tool_get_trash (uri, TRUE, &m->base.ex); g_free (uri); } - + if (trash) - camel_folder_expunge (trash, &mm->ex); + camel_folder_expunge (trash, &m->base.ex); - + camel_object_unref (trash); } - + -static void empty_trash_emptied(struct _mail_msg *mm) +static void +empty_trash_done (struct _empty_trash_msg *m) @@ -1345,7 +1373,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->account, m->data); } - + -static void empty_trash_free(struct _mail_msg *mm) +static void +empty_trash_free (struct _empty_trash_msg *m) @@ -1355,7 +1383,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->account) g_object_unref(m->account); } - + -static struct _mail_msg_op empty_trash_op = { - empty_trash_desc, - empty_trash_empty, @@ -1368,12 +1396,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) empty_trash_done, + (MailMsgFreeFunc) empty_trash_free }; - + void -@@ -1716,20 +1665,20 @@ mail_empty_trash(EAccount *account, void +@@ -1733,20 +1682,20 @@ mail_empty_trash(EAccount *account, void { struct _empty_trash_msg *m; - + - m = mail_msg_new(&empty_trash_op, NULL, sizeof(*m)); + m = mail_msg_new(&empty_trash_info); m->account = account; @@ -1381,23 +1409,23 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai g_object_ref(account); m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ** GET MESSAGE(s) ***************************************************** */ - + struct _get_message_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; char *uid; -@@ -1739,32 +1688,28 @@ struct _get_message_msg { +@@ -1756,32 +1705,28 @@ struct _get_message_msg { CamelOperation *cancel; }; - + -static char *get_message_desc(struct _mail_msg *mm, int done) +static gchar * +get_message_desc (struct _get_message_msg *m) @@ -1406,7 +1434,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - return g_strdup_printf(_("Retrieving message %s"), m->uid); } - + -static void get_message_get(struct _mail_msg *mm) +static void +get_message_exec (struct _get_message_msg *m) @@ -1416,7 +1444,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->message = camel_folder_get_message(m->folder, m->uid, &mm->ex); + m->message = camel_folder_get_message(m->folder, m->uid, &m->base.ex); } - + -static void get_message_got(struct _mail_msg *mm) +static void +get_message_done (struct _get_message_msg *m) @@ -1426,7 +1454,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->folder, m->uid, m->message, m->data); } - + -static void get_message_free(struct _mail_msg *mm) +static void +get_message_free (struct _get_message_msg *m) @@ -1436,10 +1464,10 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai g_free (m->uid); camel_object_unref (m->folder); camel_operation_unref (m->cancel); -@@ -1773,21 +1718,22 @@ static void get_message_free(struct _mai +@@ -1790,21 +1735,22 @@ static void get_message_free(struct _mai camel_object_unref (m->message); } - + -static struct _mail_msg_op get_message_op = { - get_message_desc, - get_message_get, @@ -1452,7 +1480,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_message_done, + (MailMsgFreeFunc) get_message_free }; - + void mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), @@ -1460,22 +1488,22 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + void *data, MailMsgDispatchFunc dispatch) { struct _get_message_msg *m; - + - m = mail_msg_new(&get_message_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_message_info); m->folder = folder; camel_object_ref(folder); m->uid = g_strdup(uid); -@@ -1795,37 +1741,37 @@ mail_get_message(CamelFolder *folder, co +@@ -1812,37 +1758,37 @@ mail_get_message(CamelFolder *folder, co m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); - + - e_thread_put(thread, (EMsg *)m); + dispatch (m); } - + typedef void (*get_done)(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *); - + -static void get_messagex_got(struct _mail_msg *mm) +static void +get_messagex_done (struct _get_message_msg *m) @@ -1488,7 +1516,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + done(m->folder, m->uid, m->message, m->data, &m->base.ex); } } - + -static struct _mail_msg_op get_messagex_op = { - get_message_desc, - get_message_get, @@ -1501,7 +1529,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_messagex_done, + (MailMsgFreeFunc) get_message_free }; - + /* This is temporary, to avoid having to rewrite everything that uses mail_get_message; it adds an exception argument to the callback */ void @@ -1510,32 +1538,32 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + void *data, MailMsgDispatchFunc dispatch) { struct _get_message_msg *m; - + - m = mail_msg_new(&get_messagex_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_messagex_info); m->folder = folder; camel_object_ref(folder); m->uid = g_strdup(uid); -@@ -1833,13 +1779,13 @@ mail_get_messagex(CamelFolder *folder, c +@@ -1850,13 +1796,13 @@ mail_get_messagex(CamelFolder *folder, c m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; m->cancel = camel_operation_new(NULL, NULL); - + - e_thread_put(thread, (EMsg *)m); + dispatch (m); } - + /* ********************************************************************** */ - + struct _get_messages_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; GPtrArray *uids; -@@ -1849,26 +1795,25 @@ struct _get_messages_msg { +@@ -1866,26 +1812,25 @@ struct _get_messages_msg { void *data; }; - + -static char * get_messages_desc(struct _mail_msg *mm, int done) +static gchar * +get_messages_desc (struct _get_messages_msg *m) @@ -1546,7 +1574,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai "Retrieving %d messages", m->uids->len), m->uids->len); } - + -static void get_messages_get(struct _mail_msg *mm) +static void +get_messages_exec (struct _get_messages_msg *m) @@ -1554,21 +1582,21 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _get_messages_msg *m = (struct _get_messages_msg *)mm; int i; CamelMimeMessage *message; - + for (i=0; iuids->len; i++) { int pc = ((i+1) * 100) / m->uids->len; - + - message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex); - camel_operation_progress(mm->cancel, pc); + message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); + camel_operation_progress(m->base.cancel, pc); if (message == NULL) break; - -@@ -1876,17 +1821,16 @@ static void get_messages_get(struct _mai + +@@ -1893,17 +1838,16 @@ static void get_messages_get(struct _mai } } - + -static void get_messages_got(struct _mail_msg *mm) +static void +get_messages_done (struct _get_messages_msg *m) @@ -1578,19 +1606,19 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->folder, m->uids, m->messages, m->data); } - + -static void get_messages_free(struct _mail_msg *mm) +static void +get_messages_free (struct _get_messages_msg *m) { - struct _get_messages_msg *m = (struct _get_messages_msg *)mm; int i; - + em_utils_uids_free (m->uids); -@@ -1898,11 +1842,12 @@ static void get_messages_free(struct _ma +@@ -1915,11 +1859,12 @@ static void get_messages_free(struct _ma camel_object_unref(m->folder); } - + -static struct _mail_msg_op get_messages_op = { - get_messages_desc, - get_messages_get, @@ -1603,37 +1631,37 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) get_messages_done, + (MailMsgFreeFunc) get_messages_free }; - + void -@@ -1912,7 +1857,7 @@ mail_get_messages(CamelFolder *folder, G +@@ -1929,7 +1874,7 @@ mail_get_messages(CamelFolder *folder, G { struct _get_messages_msg *m; - + - m = mail_msg_new(&get_messages_op, NULL, sizeof(*m)); + m = mail_msg_new(&get_messages_info); m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -1920,13 +1865,13 @@ mail_get_messages(CamelFolder *folder, G +@@ -1937,13 +1882,13 @@ mail_get_messages(CamelFolder *folder, G m->data = data; m->done = done; - + - e_thread_put(mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); } - + /* ** SAVE MESSAGES ******************************************************* */ - + struct _save_messages_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; GPtrArray *uids; -@@ -1935,10 +1880,9 @@ struct _save_messages_msg { +@@ -1952,10 +1897,9 @@ struct _save_messages_msg { void *data; }; - + -static char *save_messages_desc(struct _mail_msg *mm, int done) +static gchar * +save_messages_desc (struct _save_messages_msg *m) @@ -1643,9 +1671,9 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai return g_strdup_printf(ngettext("Saving %d message", "Saving %d messsages", m->uids->len), m->uids->len); -@@ -1977,9 +1921,8 @@ save_prepare_part (CamelMimePart *mime_p +@@ -1994,9 +1938,8 @@ save_prepare_part (CamelMimePart *mime_p } - + static void -save_messages_save (struct _mail_msg *mm) +save_messages_exec (struct _save_messages_msg *m) @@ -1654,18 +1682,18 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai CamelStreamFilter *filtered_stream; CamelMimeFilterFrom *from_filter; CamelStream *stream; -@@ -1996,8 +1939,8 @@ save_messages_save (struct _mail_msg *mm +@@ -2013,8 +1956,8 @@ save_messages_save (struct _mail_msg *mm CamelMimeMessage *message; int pc = ((i+1) * 100) / m->uids->len; - + - message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex); - camel_operation_progress(mm->cancel, pc); + message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); + camel_operation_progress(m->base.cancel, pc); if (message == NULL) break; - -@@ -2009,7 +1952,7 @@ save_messages_save (struct _mail_msg *mm + +@@ -2026,7 +1969,7 @@ save_messages_save (struct _mail_msg *mm || camel_stream_flush(stream) == -1 || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1 || camel_stream_flush((CamelStream *)filtered_stream) == -1) { @@ -1674,10 +1702,10 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai _("Error saving messages to: %s:\n %s"), m->path, strerror(errno)); g_free(from); camel_object_unref((CamelObject *)message); -@@ -2023,28 +1966,27 @@ save_messages_save (struct _mail_msg *mm +@@ -2040,28 +1983,27 @@ save_messages_save (struct _mail_msg *mm camel_object_unref(stream); } - + -static void save_messages_saved(struct _mail_msg *mm) +static void +save_messages_done (struct _save_messages_msg *m) @@ -1687,7 +1715,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->folder, m->uids, m->path, m->data); } - + -static void save_messages_free(struct _mail_msg *mm) +static void +save_messages_free (struct _save_messages_msg *m) @@ -1698,7 +1726,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_object_unref(m->folder); g_free(m->path); } - + -static struct _mail_msg_op save_messages_op = { - save_messages_desc, - save_messages_save, @@ -1711,48 +1739,48 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) save_messages_done, + (MailMsgFreeFunc) save_messages_free }; - + int -@@ -2054,7 +1996,7 @@ mail_save_messages(CamelFolder *folder, +@@ -2071,7 +2013,7 @@ mail_save_messages(CamelFolder *folder, struct _save_messages_msg *m; int id; - + - m = mail_msg_new(&save_messages_op, NULL, sizeof(*m)); + m = mail_msg_new(&save_messages_info); m->folder = folder; camel_object_ref(folder); m->uids = uids; -@@ -2062,8 +2004,8 @@ mail_save_messages(CamelFolder *folder, +@@ -2079,8 +2021,8 @@ mail_save_messages(CamelFolder *folder, m->data = data; m->done = done; - + - id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } -@@ -2071,7 +2013,7 @@ mail_save_messages(CamelFolder *folder, +@@ -2088,7 +2030,7 @@ mail_save_messages(CamelFolder *folder, /* ** SAVE PART ******************************************************* */ - + struct _save_part_msg { - struct _mail_msg msg; + MailMsg base; - + CamelMimePart *part; char *path; -@@ -2080,27 +2022,27 @@ struct _save_part_msg { +@@ -2097,27 +2039,27 @@ struct _save_part_msg { gboolean readonly; }; - + -static char *save_part_desc(struct _mail_msg *mm, int done) +static gchar * +save_part_desc (struct _save_part_msg *m) { return g_strdup(_("Saving attachment")); } - + static void -save_part_save (struct _mail_msg *mm) +save_part_exec (struct _save_part_msg *m) @@ -1760,7 +1788,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _save_part_msg *m = (struct _save_part_msg *)mm; CamelDataWrapper *content; CamelStream *stream; - + if(!m->readonly){ if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { - camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, @@ -1775,18 +1803,18 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai _("Cannot create output file: %s:\n %s"), m->path, g_strerror (errno)); return; -@@ -2110,7 +2052,7 @@ save_part_save (struct _mail_msg *mm) - +@@ -2127,7 +2069,7 @@ save_part_save (struct _mail_msg *mm) + if (camel_data_wrapper_decode_to_stream (content, stream) == -1 || camel_stream_flush (stream) == -1) - camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, + camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, _("Could not write data: %s"), g_strerror (errno)); - -@@ -2118,27 +2060,25 @@ save_part_save (struct _mail_msg *mm) + +@@ -2135,27 +2077,25 @@ save_part_save (struct _mail_msg *mm) } - + static void -save_part_saved (struct _mail_msg *mm) +save_part_done (struct _save_part_msg *m) @@ -1797,7 +1825,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->done (m->part, m->path, !camel_exception_is_set (&mm->ex), m->data); + m->done (m->part, m->path, !camel_exception_is_set (&m->base.ex), m->data); } - + static void -save_part_free (struct _mail_msg *mm) +save_part_free (struct _save_part_msg *m) @@ -1806,7 +1834,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_object_unref (m->part); g_free (m->path); } - + -static struct _mail_msg_op save_part_op = { - save_part_desc, - save_part_save, @@ -1819,9 +1847,9 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) save_part_done, + (MailMsgFreeFunc) save_part_free }; - + int -@@ -2147,7 +2087,7 @@ mail_save_part (CamelMimePart *part, con +@@ -2164,7 +2104,7 @@ mail_save_part (CamelMimePart *part, con { struct _save_part_msg *m; int id; @@ -1830,40 +1858,40 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai m->part = part; camel_object_ref (part); m->path = g_strdup (path); -@@ -2155,8 +2095,8 @@ mail_save_part (CamelMimePart *part, con +@@ -2172,8 +2112,8 @@ mail_save_part (CamelMimePart *part, con m->done = done; m->readonly = readonly; - + - id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } -@@ -2165,7 +2105,7 @@ mail_save_part (CamelMimePart *part, con +@@ -2182,7 +2122,7 @@ mail_save_part (CamelMimePart *part, con /* ** PREPARE OFFLINE ***************************************************** */ - + struct _prep_offline_msg { - struct _mail_msg msg; + MailMsg base; - + CamelOperation *cancel; char *uri; -@@ -2173,22 +2113,22 @@ struct _prep_offline_msg { +@@ -2190,22 +2130,22 @@ struct _prep_offline_msg { void *data; }; - + -static void prep_offline_do(struct _mail_msg *mm) +static void +prep_offline_exec (struct _prep_offline_msg *m) { - struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm; CamelFolder *folder; - + if (m->cancel) camel_operation_register(m->cancel); - + - folder = mail_tool_uri_to_folder(m->uri, 0, &mm->ex); + folder = mail_tool_uri_to_folder(m->uri, 0, &m->base.ex); if (folder) { @@ -1878,10 +1906,10 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai } /* prepare_for_offline should do this? */ /* of course it should all be atomic, but ... */ -@@ -2200,28 +2140,27 @@ static void prep_offline_do(struct _mail +@@ -2217,28 +2157,27 @@ static void prep_offline_do(struct _mail camel_operation_unregister(m->cancel); } - + -static void prep_offline_done(struct _mail_msg *mm) +static void +prep_offline_done (struct _prep_offline_msg *m) @@ -1891,7 +1919,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->uri, m->data); } - + -static void prep_offline_free(struct _mail_msg *mm) +static void +prep_offline_free (struct _prep_offline_msg *m) @@ -1902,7 +1930,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai camel_operation_unref(m->cancel); g_free(m->uri); } - + -static struct _mail_msg_op prep_offline_op = { - NULL, /* DO NOT CHANGE THIS, IT MUST BE NULL FOR CANCELLATION TO WORK */ - prep_offline_do, @@ -1915,37 +1943,37 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) prep_offline_done, + (MailMsgFreeFunc) prep_offline_free }; - + void -@@ -2232,7 +2171,7 @@ mail_prep_offline(const char *uri, +@@ -2249,7 +2188,7 @@ mail_prep_offline(const char *uri, { struct _prep_offline_msg *m; - + - m = mail_msg_new(&prep_offline_op, NULL, sizeof(*m)); + m = mail_msg_new(&prep_offline_info); m->cancel = cancel; if (cancel) camel_operation_ref(cancel); -@@ -2240,13 +2179,13 @@ mail_prep_offline(const char *uri, +@@ -2257,13 +2196,13 @@ mail_prep_offline(const char *uri, m->data = data; m->done = done; - + - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); } - + /* ** GO OFFLINE ***************************************************** */ - + struct _set_offline_msg { - struct _mail_msg msg; + MailMsg base; - + CamelStore *store; gboolean offline; -@@ -2254,9 +2193,9 @@ struct _set_offline_msg { +@@ -2271,9 +2210,9 @@ struct _set_offline_msg { void *data; }; - + -static char *set_offline_desc(struct _mail_msg *mm, int done) +static gchar * +set_offline_desc (struct _set_offline_msg *m) @@ -1953,11 +1981,11 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _set_offline_msg *m = (struct _set_offline_msg *)mm; char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; - -@@ -2266,61 +2205,59 @@ static char *set_offline_desc(struct _ma + +@@ -2283,61 +2222,59 @@ static char *set_offline_desc(struct _ma return msg; } - + -static void set_offline_do(struct _mail_msg *mm) +static void +set_offline_exec (struct _set_offline_msg *m) @@ -1993,13 +2021,13 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai return; } } - + if (m->offline) camel_service_disconnect (CAMEL_SERVICE (m->store), - TRUE, &mm->ex); + TRUE, &m->base.ex); } - + -static void set_offline_done(struct _mail_msg *mm) +static void +set_offline_done (struct _set_offline_msg *m) @@ -2009,7 +2037,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->store, m->data); } - + -static void set_offline_free(struct _mail_msg *mm) +static void +set_offline_free (struct _set_offline_msg *m) @@ -2018,7 +2046,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_object_unref(m->store); } - + -static struct _mail_msg_op set_offline_op = { - set_offline_desc, - set_offline_do, @@ -2031,12 +2059,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) set_offline_done, + (MailMsgFreeFunc) set_offline_free }; - + int -@@ -2337,61 +2274,59 @@ mail_store_set_offline (CamelStore *stor +@@ -2354,61 +2291,59 @@ mail_store_set_offline (CamelStore *stor if (offline) camel_service_cancel_connect (CAMEL_SERVICE (store)); - + - m = mail_msg_new(&set_offline_op, NULL, sizeof(*m)); + m = mail_msg_new(&set_offline_info); m->store = store; @@ -2044,17 +2072,17 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai m->offline = offline; m->data = data; m->done = done; - + - id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } - + /* ** Prepare OFFLINE ***************************************************** */ - + -static char *prepare_offline_desc(struct _mail_msg *mm, int done) +static char * +prepare_offline_desc (struct _set_offline_msg *m, int done) @@ -2062,14 +2090,14 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - struct _set_offline_msg *m = (struct _set_offline_msg *)mm; char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; - + - msg = g_strdup_printf(_("Preparing account '%s' for offline"), service_name); + msg = g_strdup_printf (_("Preparing account '%s' for offline"), service_name); g_free(service_name); - + return msg; } - + -static void prepare_offline_do(struct _mail_msg *mm) +static void +prepare_offline_exec (struct _set_offline_msg *m) @@ -2080,7 +2108,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - &mm->ex); + &m->base.ex); } - + -static void prepare_offline_done(struct _mail_msg *mm) +static void +prepare_offline_done (struct _set_offline_msg *m) @@ -2091,7 +2119,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - m->done(m->store, m->data); + m->done (m->store, m->data); } - + -static void prepare_offline_free(struct _mail_msg *mm) +static void +prepare_offline_free (struct _set_offline_msg *m) @@ -2101,7 +2129,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai - camel_object_unref(m->store); + camel_object_unref (m->store); } - + -static struct _mail_msg_op prepare_offline_op = { - prepare_offline_desc, - prepare_offline_do, @@ -2114,39 +2142,39 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) prepare_offline_done, + (MailMsgFreeFunc) prepare_offline_free }; - + int -@@ -2404,14 +2339,14 @@ mail_store_prepare_offline (CamelStore * +@@ -2421,14 +2356,14 @@ mail_store_prepare_offline (CamelStore * * thread won't get queued behind a hung connect op. */ - + - m = mail_msg_new(&prepare_offline_op, NULL, sizeof(*m)); + m = mail_msg_new(&prepare_offline_info); m->store = store; camel_object_ref(store); m->data = NULL; m->done = NULL; - + - id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } -@@ -2428,7 +2363,7 @@ mail_execute_shell_command (CamelFilterD - +@@ -2445,7 +2380,7 @@ mail_execute_shell_command (CamelFilterD + /* Async service-checking/authtype-lookup code. */ struct _check_msg { - struct _mail_msg msg; + MailMsg base; - + char *url; CamelProviderType type; -@@ -2438,51 +2373,47 @@ struct _check_msg { +@@ -2455,51 +2390,47 @@ struct _check_msg { void *data; }; - + -static char * -check_service_describe(struct _mail_msg *mm, int complete) +static gchar * @@ -2154,14 +2182,14 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai { return g_strdup(_("Checking Service")); } - + static void -check_service_check(struct _mail_msg *mm) +check_service_exec (struct _check_msg *m) { - struct _check_msg *m = (struct _check_msg *)mm; CamelService *service; - + - service = camel_session_get_service(session, m->url, m->type, &mm->ex); + service = camel_session_get_service(session, m->url, m->type, &m->base.ex); if (!service) { @@ -2169,12 +2197,12 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + camel_operation_unregister(m->base.cancel); return; } - + - m->authtypes = camel_service_query_auth_types(service, &mm->ex); + m->authtypes = camel_service_query_auth_types(service, &m->base.ex); camel_object_unref(service); } - + static void -check_service_done(struct _mail_msg *mm) +check_service_done (struct _check_msg *m) @@ -2184,7 +2212,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai if (m->done) m->done(m->url, m->type, m->authtypes, m->data); } - + static void -check_service_free(struct _mail_msg *mm) +check_service_free (struct _check_msg *m) @@ -2194,7 +2222,7 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai g_free(m->url); g_list_free(m->authtypes); } - + -static struct _mail_msg_op check_service_op = { - check_service_describe, - check_service_check, @@ -2207,42 +2235,42 @@ diff -up evolution-2.21.1/mail/mail-ops.c.kill-ethread evolution-2.21.1/mail/mai + (MailMsgDoneFunc) check_service_done, + (MailMsgFreeFunc) check_service_free }; - + int -@@ -2491,14 +2422,14 @@ mail_check_service(const char *url, Came +@@ -2508,14 +2439,14 @@ mail_check_service(const char *url, Came struct _check_msg *m; int id; - + - m = mail_msg_new (&check_service_op, NULL, sizeof(*m)); + m = mail_msg_new (&check_service_info); m->url = g_strdup(url); m->type = type; m->done = done; m->data = data; - + - id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } -diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/mail/em-folder-utils.c ---- evolution-2.21.1/mail/em-folder-utils.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-folder-utils.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/em-folder-utils.c.kill-ethread evolution-2.21.4/mail/em-folder-utils.c +--- evolution-2.21.4/mail/em-folder-utils.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/em-folder-utils.c 2007-12-17 12:33:07.000000000 -0500 @@ -85,7 +85,7 @@ emfu_is_special_local_folder (const char } - + struct _EMCopyFolders { - struct _mail_msg msg; + MailMsg base; - + /* input data */ CamelStore *fromstore; @@ -97,18 +97,15 @@ struct _EMCopyFolders { int delete; }; - + -static char * -emft_copy_folders__desc (struct _mail_msg *mm, int complete) +static gchar * @@ -2252,7 +2280,7 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m - return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); } - + static void -emft_copy_folders__copy (struct _mail_msg *mm) +emft_copy_folders__exec (struct _EMCopyFolders *m) @@ -2264,11 +2292,11 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m @@ -116,7 +113,7 @@ emft_copy_folders__copy (struct _mail_ms const char *tmp; int fromlen; - + - if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &mm->ex))) + if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) return; - + pending = g_list_append (pending, fi); @@ -156,8 +153,8 @@ emft_copy_folders__copy (struct _mail_ms if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { @@ -2279,32 +2307,32 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m + camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex); + if (camel_exception_is_set (&m->base.ex)) goto exception; - + /* this folder no longer exists, unsubscribe it */ @@ -166,16 +163,16 @@ emft_copy_folders__copy (struct _mail_ms - + deleted = 1; } else { - if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &mm->ex))) + if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex))) goto exception; - + - if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &mm->ex))) { + if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) { camel_object_unref (fromfolder); goto exception; } - + uids = camel_folder_get_uids (fromfolder); - camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &mm->ex); + camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex); camel_folder_free_uids (fromfolder, uids); - + if (m->delete) @@ -186,7 +183,7 @@ emft_copy_folders__copy (struct _mail_ms } } - + - if (camel_exception_is_set (&mm->ex)) + if (camel_exception_is_set (&m->base.ex)) goto exception; @@ -2312,7 +2340,7 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m deleting = g_list_prepend (deleting, info); @@ -227,10 +224,8 @@ emft_copy_folders__copy (struct _mail_ms } - + static void -emft_copy_folders__free (struct _mail_msg *mm) +emft_copy_folders__free (struct _EMCopyFolders *m) @@ -2321,11 +2349,11 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m - camel_object_unref (m->fromstore); camel_object_unref (m->tostore); - + @@ -238,11 +233,12 @@ emft_copy_folders__free (struct _mail_ms g_free (m->tobase); } - + -static struct _mail_msg_op copy_folders_op = { - emft_copy_folders__desc, - emft_copy_folders__copy, @@ -2338,42 +2366,42 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) emft_copy_folders__free }; - + int -@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore +@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore struct _EMCopyFolders *m; int seq; - + - m = mail_msg_new (©_folders_op, NULL, sizeof (struct _EMCopyFolders)); + m = mail_msg_new (©_folders_info); camel_object_ref (fromstore); m->fromstore = fromstore; camel_object_ref (tostore); -@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore +@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore m->frombase = g_strdup (frombase); m->tobase = g_strdup (tobase); m->delete = delete; - seq = m->msg.seq; + seq = m->base.seq; - + - e_thread_put (mail_thread_new, (EMsg *) m); + mail_msg_unordered_push (m); - + return seq; } @@ -558,7 +554,7 @@ em_folder_utils_rename_folder (CamelFold } - + struct _EMCreateFolder { - struct _mail_msg msg; + MailMsg base; - + /* input data */ CamelStore *store; @@ -582,41 +578,33 @@ struct _EMCreateFolderTempData char *uri; }; - + -static char * -emfu_create_folder__desc (struct _mail_msg *mm, int done) +static gchar * @@ -2383,7 +2411,7 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); } - + static void -emfu_create_folder__create (struct _mail_msg *mm) +emfu_create_folder__exec (struct _EMCreateFolder *m) @@ -2391,7 +2419,7 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; - d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - + - if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { + if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { if (camel_store_supports_subscriptions (m->store)) @@ -2399,7 +2427,7 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m + camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); } } - + static void -emfu_create_folder__created (struct _mail_msg *mm) +emfu_create_folder__done (struct _EMCreateFolder *m) @@ -2409,7 +2437,7 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m if (m->done) m->done (m->fi, m->user_data); } - + static void -emfu_create_folder__free (struct _mail_msg *mm) +emfu_create_folder__free (struct _EMCreateFolder *m) @@ -2422,7 +2450,7 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m @@ -624,11 +612,12 @@ emfu_create_folder__free (struct _mail_m g_free (m->name); } - + -static struct _mail_msg_op create_folder_op = { - emfu_create_folder__desc, - emfu_create_folder__create, @@ -2435,44 +2463,44 @@ diff -up evolution-2.21.1/mail/em-folder-utils.c.kill-ethread evolution-2.21.1/m + (MailMsgDoneFunc) emfu_create_folder__done, + (MailMsgFreeFunc) emfu_create_folder__free }; - - + + @@ -649,7 +638,7 @@ emfu_create_folder_real (CamelStore *sto parent = namebuf; } - + - m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); + m = mail_msg_new (&create_folder_info); camel_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); @@ -660,8 +649,8 @@ emfu_create_folder_real (CamelStore *sto - + g_free (namebuf); - + - id = m->msg.seq; - e_thread_put (mail_thread_new, (EMsg *) m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } -diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2.21.1/mail/importers/elm-importer.c ---- evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread 2007-10-23 06:06:23.000000000 -0400 -+++ evolution-2.21.1/mail/importers/elm-importer.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/importers/elm-importer.c.kill-ethread evolution-2.21.4/mail/importers/elm-importer.c +--- evolution-2.21.4/mail/importers/elm-importer.c.kill-ethread 2007-11-29 23:24:03.000000000 -0500 ++++ evolution-2.21.4/mail/importers/elm-importer.c 2007-12-17 12:33:08.000000000 -0500 @@ -51,7 +51,7 @@ #define d(x) x - + struct _elm_import_msg { - struct _mail_msg msg; + MailMsg base; - + EImport *import; EImportTargetHome *target; @@ -178,8 +178,8 @@ elm_supported(EImport *ei, EImportTarget return mailexists; } - + -static char * -elm_import_describe (struct _mail_msg *mm, int complete) +static gchar * @@ -2482,7 +2510,7 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 } @@ -190,9 +190,8 @@ static MailImporterSpecial elm_special_f }; - + static void -elm_import_import(struct _mail_msg *mm) +elm_import_exec (struct _elm_import_msg *m) @@ -2490,10 +2518,10 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 - struct _elm_import_msg *m = (struct _elm_import_msg *) mm; const char *maildir; char *elmdir; - + @@ -210,13 +209,11 @@ elm_import_import(struct _mail_msg *mm) } - + static void -elm_import_imported(struct _mail_msg *mm) +elm_import_done(struct _elm_import_msg *m) @@ -2501,15 +2529,15 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 - struct _elm_import_msg *m = (struct _elm_import_msg *)mm; - printf("importing complete\n"); - + - if (!camel_exception_is_set(&mm->ex)) { + if (!camel_exception_is_set(&m->base.ex)) { GConfClient *gconf; - + gconf = gconf_client_get_default(); @@ -228,10 +225,8 @@ elm_import_imported(struct _mail_msg *mm } - + static void -elm_import_free(struct _mail_msg *mm) +elm_import_free(struct _elm_import_msg *m) @@ -2517,12 +2545,12 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 - struct _elm_import_msg *m = (struct _elm_import_msg *)mm; - camel_operation_unref(m->status); - + g_free(m->status_what); @@ -280,11 +275,12 @@ elm_status_timeout(void *data) return TRUE; } - + -static struct _mail_msg_op elm_import_op = { - elm_import_describe, - elm_import_import, @@ -2535,12 +2563,12 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 + (MailMsgDoneFunc) elm_import_done, + (MailMsgFreeFunc) elm_import_free }; - + static int @@ -293,7 +289,7 @@ mail_importer_elm_import(EImport *ei, EI struct _elm_import_msg *m; int id; - + - m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); + m = mail_msg_new(&elm_import_info); g_datalist_set_data(&target->data, "elm-msg", m); @@ -2549,31 +2577,31 @@ diff -up evolution-2.21.1/mail/importers/elm-importer.c.kill-ethread evolution-2 @@ -302,9 +298,9 @@ mail_importer_elm_import(EImport *ei, EI m->status_lock = g_mutex_new(); m->status = camel_operation_new(elm_status, m); - + - id = m->msg.seq; + id = m->base.seq; - + - e_thread_put(mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); - + return id; } -diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution-2.21.1/mail/importers/mail-importer.c ---- evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread 2007-10-23 06:06:23.000000000 -0400 -+++ evolution-2.21.1/mail/importers/mail-importer.c 2007-10-29 14:47:50.000000000 -0400 +diff -up evolution-2.21.4/mail/importers/mail-importer.c.kill-ethread evolution-2.21.4/mail/importers/mail-importer.c +--- evolution-2.21.4/mail/importers/mail-importer.c.kill-ethread 2007-11-29 23:24:03.000000000 -0500 ++++ evolution-2.21.4/mail/importers/mail-importer.c 2007-12-17 12:33:08.000000000 -0500 @@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact } - + struct _import_mbox_msg { - struct _mail_msg msg; + MailMsg base; - + char *path; char *uri; @@ -142,8 +142,8 @@ struct _import_mbox_msg { void *done_data; }; - + -static char * -import_mbox_describe(struct _mail_msg *mm, int complete) +static gchar * @@ -2583,7 +2611,7 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- } @@ -190,9 +190,8 @@ decode_mozilla_status(const char *tmp) } - + static void -import_mbox_import(struct _mail_msg *mm) +import_mbox_exec (struct _import_mbox_msg *m) @@ -2598,26 +2626,26 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- else - folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &mm->ex); + folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); - + if (folder == NULL) return; @@ -262,11 +261,11 @@ import_mbox_import(struct _mail_msg *mm) flags |= decode_status(tmp); - + camel_message_info_set_flags(info, flags, ~0); - camel_folder_append_message(folder, msg, info, NULL, &mm->ex); + camel_folder_append_message(folder, msg, info, NULL, &m->base.ex); camel_message_info_free(info); camel_object_unref(msg); - + - if (camel_exception_is_set(&mm->ex)) + if (camel_exception_is_set(&m->base.ex)) break; - - camel_mime_parser_step(mp, 0, 0); + + camel_mime_parser_step(mp, NULL, NULL); @@ -286,30 +285,27 @@ fail1: } - + static void -import_mbox_done(struct _mail_msg *mm) +import_mbox_done (struct _import_mbox_msg *m) @@ -2628,7 +2656,7 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- - m->done(m->done_data, &mm->ex); + m->done(m->done_data, &m->base.ex); } - + static void -import_mbox_free (struct _mail_msg *mm) +import_mbox_free (struct _import_mbox_msg *m) @@ -2640,7 +2668,7 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- g_free(m->uri); g_free(m->path); } - + -static struct _mail_msg_op import_mbox_op = { - import_mbox_describe, - import_mbox_import, @@ -2653,12 +2681,12 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- + (MailMsgDoneFunc) import_mbox_done, + (MailMsgFreeFunc) import_mbox_free }; - + int @@ -318,7 +314,7 @@ mail_importer_import_mbox(const char *pa struct _import_mbox_msg *m; int id; - + - m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); + m = mail_msg_new(&import_mbox_info); m->path = g_strdup(path); @@ -2667,18 +2695,18 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- @@ -328,8 +324,8 @@ mail_importer_import_mbox(const char *pa camel_operation_ref(cancel); } - + - id = m->msg.seq; - e_thread_put(mail_thread_queued, (EMsg *)m); + id = m->base.seq; + mail_msg_fast_ordered_push (m); - + return id; } @@ -339,7 +335,7 @@ mail_importer_import_mbox_sync(const cha { struct _import_mbox_msg *m; - + - m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); + m = mail_msg_new(&import_mbox_info); m->path = g_strdup(path); @@ -2687,7 +2715,7 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- @@ -347,9 +343,9 @@ mail_importer_import_mbox_sync(const cha camel_operation_ref(cancel); } - + - import_mbox_import(&m->msg); - import_mbox_done(&m->msg); - mail_msg_free(&m->msg); @@ -2695,24 +2723,24 @@ diff -up evolution-2.21.1/mail/importers/mail-importer.c.kill-ethread evolution- + import_mbox_done(m); + mail_msg_unref(m); } - + struct _import_folders_data { -diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution-2.21.1/mail/importers/pine-importer.c ---- evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread 2007-10-23 06:06:23.000000000 -0400 -+++ evolution-2.21.1/mail/importers/pine-importer.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/importers/pine-importer.c.kill-ethread evolution-2.21.4/mail/importers/pine-importer.c +--- evolution-2.21.4/mail/importers/pine-importer.c.kill-ethread 2007-11-29 23:24:03.000000000 -0500 ++++ evolution-2.21.4/mail/importers/pine-importer.c 2007-12-17 12:33:08.000000000 -0500 @@ -56,7 +56,7 @@ #define d(x) x - + struct _pine_import_msg { - struct _mail_msg msg; + MailMsg base; - + EImport *import; EImportTarget *target; @@ -223,8 +223,8 @@ import_contacts(void) g_object_unref(book); } - + -static char * -pine_import_describe (struct _mail_msg *mm, int complete) +static gchar * @@ -2722,7 +2750,7 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- } @@ -236,10 +236,8 @@ static MailImporterSpecial pine_special_ }; - + static void -pine_import_import(struct _mail_msg *mm) +pine_import_exec(struct _pine_import_msg *m) @@ -2731,10 +2759,10 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- - if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) import_contacts(); - + @@ -253,13 +251,11 @@ pine_import_import(struct _mail_msg *mm) } - + static void -pine_import_imported(struct _mail_msg *mm) +pine_import_done(struct _pine_import_msg *m) @@ -2742,15 +2770,15 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- - struct _pine_import_msg *m = (struct _pine_import_msg *)mm; - printf("importing complete\n"); - + - if (!camel_exception_is_set(&mm->ex)) { + if (!camel_exception_is_set(&m->base.ex)) { GConfClient *gconf; - + gconf = gconf_client_get_default(); @@ -274,10 +270,8 @@ pine_import_imported(struct _mail_msg *m } - + static void -pine_import_free(struct _mail_msg *mm) +pine_import_free(struct _pine_import_msg *m) @@ -2758,12 +2786,12 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- - struct _pine_import_msg *m = (struct _pine_import_msg *)mm; - camel_operation_unref(m->status); - + g_free(m->status_what); @@ -326,11 +320,12 @@ pine_status_timeout(void *data) return TRUE; } - + -static struct _mail_msg_op pine_import_op = { - pine_import_describe, - pine_import_import, @@ -2776,12 +2804,12 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- + (MailMsgDoneFunc) pine_import_done, + (MailMsgFreeFunc) pine_import_free }; - + static int @@ -339,7 +334,7 @@ mail_importer_pine_import(EImport *ei, E struct _pine_import_msg *m; int id; - + - m = mail_msg_new(&pine_import_op, NULL, sizeof (*m)); + m = mail_msg_new(&pine_import_info); g_datalist_set_data(&target->data, "pine-msg", m); @@ -2790,52 +2818,52 @@ diff -up evolution-2.21.1/mail/importers/pine-importer.c.kill-ethread evolution- @@ -348,9 +343,9 @@ mail_importer_pine_import(EImport *ei, E m->status_lock = g_mutex_new(); m->status = camel_operation_new(pine_status, m); - + - id = m->msg.seq; + id = m->base.seq; - + - e_thread_put(mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); - + return id; } -diff -up evolution-2.21.1/mail/em-utils.c.kill-ethread evolution-2.21.1/mail/em-utils.c ---- evolution-2.21.1/mail/em-utils.c.kill-ethread 2007-10-29 14:47:20.000000000 -0400 -+++ evolution-2.21.1/mail/em-utils.c 2007-10-29 14:47:20.000000000 -0400 -@@ -1912,7 +1912,7 @@ em_utils_in_addressbook(CamelInternetAdd +diff -up evolution-2.21.4/mail/em-utils.c.kill-ethread evolution-2.21.4/mail/em-utils.c +--- evolution-2.21.4/mail/em-utils.c.kill-ethread 2007-12-17 12:33:00.000000000 -0500 ++++ evolution-2.21.4/mail/em-utils.c 2007-12-17 12:33:08.000000000 -0500 +@@ -1990,7 +1990,7 @@ em_utils_in_addressbook(CamelInternetAdd ESource *source = s->data; GList *contacts; EBook *book; - void *hook; + GHook *hook; - + d(printf(" checking '%s'\n", e_source_get_uri(source))); - -diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail/mail-vfolder.c ---- evolution-2.21.1/mail/mail-vfolder.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-vfolder.c 2007-10-29 14:47:20.000000000 -0400 + +diff -up evolution-2.21.4/mail/mail-vfolder.c.kill-ethread evolution-2.21.4/mail/mail-vfolder.c +--- evolution-2.21.4/mail/mail-vfolder.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/mail-vfolder.c 2007-12-17 12:33:07.000000000 -0500 @@ -21,7 +21,7 @@ */ - + #include - +#include #include - + #include @@ -75,7 +75,7 @@ static void rule_changed(FilterRule *rul /* ********************************************************************** */ - + struct _setup_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; char *query; @@ -83,18 +83,15 @@ struct _setup_msg { GList *sources_folder; }; - + -static char * -vfolder_setup_desc(struct _mail_msg *mm, int done) +static gchar * @@ -2845,7 +2873,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name); } - + static void -vfolder_setup_do(struct _mail_msg *mm) +vfolder_setup_exec (struct _setup_msg *m) @@ -2853,7 +2881,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - struct _setup_msg *m = (struct _setup_msg *)mm; GList *l, *list = NULL; CamelFolder *folder; - + @@ -105,12 +102,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l && !shutdown) { @@ -2871,7 +2899,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail } @@ -135,17 +132,13 @@ vfolder_setup_do(struct _mail_msg *mm) } - + static void -vfolder_setup_done(struct _mail_msg *mm) +vfolder_setup_done (struct _setup_msg *m) @@ -2880,19 +2908,19 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - - m = m; } - + static void -vfolder_setup_free (struct _mail_msg *mm) +vfolder_setup_free (struct _setup_msg *m) { - struct _setup_msg *m = (struct _setup_msg *)mm; GList *l; - + camel_object_unref(m->folder); @@ -166,11 +159,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } - + -static struct _mail_msg_op vfolder_setup_op = { - vfolder_setup_desc, - vfolder_setup_do, @@ -2905,12 +2933,12 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) vfolder_setup_done, + (MailMsgFreeFunc) vfolder_setup_free }; - + /* sources_uri should be camel uri's */ @@ -180,15 +174,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; - + - m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); + m = mail_msg_new(&vfolder_setup_info); m->folder = folder; @@ -2918,26 +2946,26 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail m->query = g_strdup(query); m->sources_uri = sources_uri; m->sources_folder = sources_folder; - + - id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + id = m->base.seq; + mail_msg_slow_ordered_push (m); - + return id; } @@ -196,17 +190,16 @@ vfolder_setup(CamelFolder *folder, const /* ********************************************************************** */ - + struct _adduri_msg { - struct _mail_msg msg; + MailMsg base; - + char *uri; GList *folders; int remove; }; - + -static char * -vfolder_adduri_desc(struct _mail_msg *mm, int done) +static gchar * @@ -2945,11 +2973,11 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail { - struct _adduri_msg *m = (struct _adduri_msg *)mm; char *euri, *desc = NULL; - + /* Yuck yuck. Lookup the account name and use that to describe the path */ @@ -250,9 +243,8 @@ vfolder_adduri_desc(struct _mail_msg *mm } - + static void -vfolder_adduri_do(struct _mail_msg *mm) +vfolder_adduri_exec (struct _adduri_msg *m) @@ -2957,19 +2985,19 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - struct _adduri_msg *m = (struct _adduri_msg *)mm; GList *l; CamelFolder *folder = NULL; - + @@ -269,7 +261,7 @@ vfolder_adduri_do(struct _mail_msg *mm) } - + if (folder == NULL) - folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); + folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); - + if (folder != NULL) { l = m->folders; @@ -285,28 +277,24 @@ vfolder_adduri_do(struct _mail_msg *mm) } - + static void -vfolder_adduri_done(struct _mail_msg *mm) +vfolder_adduri_done(struct _adduri_msg *m) @@ -2978,7 +3006,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail - - m = m; } - + static void -vfolder_adduri_free (struct _mail_msg *mm) +vfolder_adduri_free (struct _adduri_msg *m) @@ -2989,7 +3017,7 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail g_list_free(m->folders); g_free(m->uri); } - + -static struct _mail_msg_op vfolder_adduri_op = { - vfolder_adduri_desc, - vfolder_adduri_do, @@ -3002,55 +3030,55 @@ diff -up evolution-2.21.1/mail/mail-vfolder.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) vfolder_adduri_done, + (MailMsgFreeFunc) vfolder_adduri_free }; - - + + @@ -317,13 +305,13 @@ vfolder_adduri(const char *uri, GList *f struct _adduri_msg *m; int id; - + - m = mail_msg_new(&vfolder_adduri_op, NULL, sizeof (*m)); + m = mail_msg_new(&vfolder_adduri_info); m->folders = folders; m->uri = g_strdup(uri); m->remove = remove; - + - id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + id = m->base.seq; + mail_msg_slow_ordered_push (m); - + return id; } -@@ -447,7 +435,7 @@ mail_vfolder_add_uri(CamelStore *store, +@@ -447,7 +435,7 @@ mail_vfolder_add_uri(CamelStore *store, return; } - + - g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); + g_return_if_fail (mail_in_main_thread()); - + is_ignore = uri_is_ignore(store, curi); - + @@ -543,7 +531,7 @@ mail_vfolder_delete_uri(CamelStore *stor - + d(printf ("Deleting uri to check: %s\n", uri)); - + - g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); + g_return_if_fail (mail_in_main_thread()); - + changed = g_string_new (""); - + @@ -627,7 +615,7 @@ mail_vfolder_rename_uri(CamelStore *stor if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) return; - + - g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); + g_return_if_fail (mail_in_main_thread()); - + from = em_uri_from_camel(cfrom); to = em_uri_from_camel(cto); -diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/mail/em-format-html.c ---- evolution-2.21.1/mail/em-format-html.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-format-html.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/em-format-html.c.kill-ethread evolution-2.21.4/mail/em-format-html.c +--- evolution-2.21.4/mail/em-format-html.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/em-format-html.c 2007-12-17 12:33:08.000000000 -0500 @@ -176,7 +176,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor if (efh->priv->format_timeout_id != 0) { g_source_remove(efh->priv->format_timeout_id); @@ -3059,27 +3087,27 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma + mail_msg_unref(efh->priv->format_timeout_msg); efh->priv->format_timeout_msg = NULL; } - + @@ -1205,7 +1205,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc - + /* Sigh, this is so we have a cancellable, async rendering thread */ struct _format_msg { - struct _mail_msg msg; + MailMsg base; - + EMFormatHTML *format; EMFormat *format_source; @@ -1215,14 +1215,15 @@ struct _format_msg { CamelMimeMessage *message; }; - + -static char *efh_format_desc(struct _mail_msg *mm, int done) +static gchar * +efh_format_desc (struct _format_msg *m) { return g_strdup(_("Formatting message")); } - + -static void efh_format_do(struct _mail_msg *mm) +static void +efh_format_exec (struct _format_msg *m) @@ -3091,7 +3119,7 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma @@ -1307,10 +1308,9 @@ static void efh_format_do(struct _mail_m ((EMFormat *)m->format)->pending_uri_level = puri_level; } - + -static void efh_format_done(struct _mail_msg *mm) +static void +efh_format_done (struct _format_msg *m) @@ -3099,12 +3127,12 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma - struct _format_msg *m = (struct _format_msg *)mm; - d(printf("formatting finished\n")); - + m->format->load_http_now = FALSE; @@ -1318,10 +1318,9 @@ static void efh_format_done(struct _mail g_signal_emit_by_name(m->format, "complete"); } - + -static void efh_format_free(struct _mail_msg *mm) +static void +efh_format_free (struct _format_msg *m) @@ -3117,7 +3145,7 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma @@ -1337,11 +1336,12 @@ static void efh_format_free(struct _mail g_object_unref(m->format_source); } - + -static struct _mail_msg_op efh_format_op = { - efh_format_desc, - efh_format_do, @@ -3130,17 +3158,17 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma + (MailMsgDoneFunc) efh_format_done, + (MailMsgFreeFunc) efh_format_free }; - + static gboolean @@ -1352,7 +1352,7 @@ efh_format_timeout(struct _format_msg *m struct _EMFormatHTMLPrivate *p = efh->priv; - + if (m->format->html == NULL) { - mail_msg_free(m); + mail_msg_unref(m); return FALSE; } - + @@ -1380,7 +1380,7 @@ efh_format_timeout(struct _format_msg *m if (m->message == NULL) { hstream = gtk_html_begin(efh->html); @@ -3149,19 +3177,19 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma + mail_msg_unref(m); p->last_part = NULL; } else { - hstream = gtk_html_begin(efh->html); -@@ -1402,8 +1402,8 @@ efh_format_timeout(struct _format_msg *m + if (p->last_part != m->message) { +@@ -1403,8 +1403,8 @@ efh_format_timeout(struct _format_msg *m p->last_part = m->message; } - + - efh->priv->format_id = m->msg.seq; - e_thread_put(mail_thread_new, (EMsg *)m); + efh->priv->format_id = m->base.seq; + mail_msg_unordered_push (m); } - + efh->priv->format_timeout_id = 0; -@@ -1427,11 +1427,11 @@ static void efh_format_clone(EMFormat *e +@@ -1428,11 +1428,11 @@ static void efh_format_clone(EMFormat *e d(printf(" timeout for last still active, removing ...\n")); g_source_remove(efh->priv->format_timeout_id); efh->priv->format_timeout_id = 0; @@ -3169,48 +3197,48 @@ diff -up evolution-2.21.1/mail/em-format-html.c.kill-ethread evolution-2.21.1/ma + mail_msg_unref(efh->priv->format_timeout_msg); efh->priv->format_timeout_msg = NULL; } - + - m = mail_msg_new(&efh_format_op, NULL, sizeof(*m)); + m = mail_msg_new(&efh_format_info); m->format = (EMFormatHTML *)emf; g_object_ref(emf); m->format_source = emfsource; -diff -up evolution-2.21.1/mail/em-folder-properties.c.kill-ethread evolution-2.21.1/mail/em-folder-properties.c ---- evolution-2.21.1/mail/em-folder-properties.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-folder-properties.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/em-folder-properties.c.kill-ethread evolution-2.21.4/mail/em-folder-properties.c +--- evolution-2.21.4/mail/em-folder-properties.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/em-folder-properties.c 2007-12-17 12:33:07.000000000 -0500 @@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par } - + if (folder == NULL) - mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); + mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); else emfp_dialog_got_folder((char *)uri, folder, NULL); } -diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/mail/em-folder-tree.c ---- evolution-2.21.1/mail/em-folder-tree.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-folder-tree.c 2007-10-29 14:47:20.000000000 -0400 -@@ -835,7 +835,7 @@ fail: +diff -up evolution-2.21.4/mail/em-folder-tree.c.kill-ethread evolution-2.21.4/mail/em-folder-tree.c +--- evolution-2.21.4/mail/em-folder-tree.c.kill-ethread 2007-12-14 09:25:49.000000000 -0500 ++++ evolution-2.21.4/mail/em-folder-tree.c 2007-12-17 12:33:07.000000000 -0500 +@@ -846,7 +846,7 @@ fail: /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ /* Drop handling */ struct _DragDataReceivedAsync { - struct _mail_msg msg; + MailMsg base; - + /* input data */ GdkDragContext *context; -@@ -860,17 +860,16 @@ emft_drop_folder(struct _DragDataReceive - +@@ -871,17 +871,16 @@ emft_drop_folder(struct _DragDataReceive + d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); - + - if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->msg.ex))) + if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) return; - + em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); camel_object_unref(src); } - + -static char * -emft_drop_async_desc (struct _mail_msg *mm, int done) +static gchar * @@ -3219,19 +3247,19 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma - struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; CamelURL *url; char *buf; - -@@ -894,9 +893,8 @@ emft_drop_async_desc (struct _mail_msg * + +@@ -905,9 +904,8 @@ emft_drop_async_desc (struct _mail_msg * } - + static void -emft_drop_async_drop (struct _mail_msg *mm) +emft_drop_async__exec (struct _DragDataReceivedAsync *m) { - struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; CamelFolder *folder; - + /* for types other than folder, we can't drop to the root path */ -@@ -904,14 +902,14 @@ emft_drop_async_drop (struct _mail_msg * +@@ -915,14 +913,14 @@ emft_drop_async_drop (struct _mail_msg * /* copy or move (aka rename) a folder */ emft_drop_folder(m); } else if (m->full_name == NULL) { @@ -3250,16 +3278,16 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma break; case DND_DROP_TYPE_MESSAGE_RFC822: /* import a message/rfc822 stream */ -@@ -929,10 +927,25 @@ emft_drop_async_drop (struct _mail_msg * +@@ -940,10 +938,25 @@ emft_drop_async_drop (struct _mail_msg * } - + static void -emft_drop_async_free (struct _mail_msg *mm) +emft_drop_async__done (struct _DragDataReceivedAsync *m) { - struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; + gboolean success, delete; - + + /* ?? */ + if (m->aborted) { + success = FALSE; @@ -3268,7 +3296,7 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma + success = !camel_exception_is_set (&m->base.ex); + delete = success && m->move && !m->moved; + } -+ ++ + gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME); +} + @@ -3278,10 +3306,10 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma g_object_unref(m->context); camel_object_unref(m->store); g_free(m->full_name); -@@ -941,18 +954,19 @@ emft_drop_async_free (struct _mail_msg * +@@ -952,18 +965,19 @@ emft_drop_async_free (struct _mail_msg * g_free(m->selection); } - + -static struct _mail_msg_op emft_drop_async_op = { - emft_drop_async_desc, - emft_drop_async_drop, @@ -3294,7 +3322,7 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma + (MailMsgDoneFunc) emft_drop_async__done, + (MailMsgFreeFunc) emft_drop_async__free }; - + static void tree_drag_data_action(struct _DragDataReceivedAsync *m) { @@ -3302,39 +3330,39 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma - e_thread_put (mail_thread_new, (EMsg *) m); + mail_msg_unordered_push (m); } - + static void -@@ -979,7 +993,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu +@@ -990,7 +1004,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu struct _DragDataReceivedAsync *m = data; - + m->aborted = TRUE; - mail_msg_free(&m->msg); + mail_msg_unref(m); } - + static EPopupItem emft_drop_popup_menu[] = { -@@ -1035,7 +1049,7 @@ tree_drag_data_received(GtkWidget *widge +@@ -1046,7 +1060,7 @@ tree_drag_data_received(GtkWidget *widge return; } - + - m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync)); + m = mail_msg_new (&emft_drop_async_info); m->context = context; g_object_ref(context); m->store = store; -@@ -1674,7 +1688,7 @@ dump_fi (CamelFolderInfo *fi, int depth) +@@ -1685,7 +1699,7 @@ dump_fi (CamelFolderInfo *fi, int depth) #endif - + struct _EMFolderTreeGetFolderInfo { - struct _mail_msg msg; + MailMsg base; - + /* input data */ GtkTreeRowReference *root; -@@ -1687,10 +1701,9 @@ struct _EMFolderTreeGetFolderInfo { +@@ -1698,10 +1712,9 @@ struct _EMFolderTreeGetFolderInfo { CamelFolderInfo *fi; }; - + -static char * -emft_get_folder_info__desc(struct _mail_msg *mm, int done) +static gchar * @@ -3342,22 +3370,22 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma { - struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm; char *ret, *name; - + name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1700,18 +1713,16 @@ emft_get_folder_info__desc(struct _mail_ +@@ -1711,18 +1724,16 @@ emft_get_folder_info__desc(struct _mail_ } - + static void -emft_get_folder_info__get (struct _mail_msg *mm) +emft_get_folder_info__exec (struct _EMFolderTreeGetFolderInfo *m) { - struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; guint32 flags = m->flags | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - + - m->fi = camel_store_get_folder_info (m->store, m->top, flags, &mm->ex); + m->fi = camel_store_get_folder_info (m->store, m->top, flags, &m->base.ex); } - + static void -emft_get_folder_info__got (struct _mail_msg *mm) +emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) @@ -3366,18 +3394,18 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma struct _EMFolderTreePrivate *priv = m->emft->priv; struct _EMFolderTreeModelStoreInfo *si; GtkTreeIter root, iter; -@@ -1739,7 +1750,7 @@ emft_get_folder_info__got (struct _mail_ +@@ -1750,7 +1761,7 @@ emft_get_folder_info__got (struct _mail_ gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); - + /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ - if (!m->fi && camel_exception_is_set(&mm->ex)) { + if (!m->fi && camel_exception_is_set(&m->base.ex)) { gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); gtk_tree_view_collapse_row (priv->treeview, path); gtk_tree_path_free (path); -@@ -1794,10 +1805,8 @@ emft_get_folder_info__got (struct _mail_ +@@ -1805,10 +1816,8 @@ emft_get_folder_info__got (struct _mail_ } - + static void -emft_get_folder_info__free (struct _mail_msg *mm) +emft_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m) @@ -3385,12 +3413,12 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma - struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; - camel_store_free_folder_info (m->store, m->fi); - + gtk_tree_row_reference_free (m->root); -@@ -1806,11 +1815,12 @@ emft_get_folder_info__free (struct _mail +@@ -1817,11 +1826,12 @@ emft_get_folder_info__free (struct _mail g_free (m->top); } - + -static struct _mail_msg_op get_folder_info_op = { - emft_get_folder_info__desc, - emft_get_folder_info__get, @@ -3403,42 +3431,42 @@ diff -up evolution-2.21.1/mail/em-folder-tree.c.kill-ethread evolution-2.21.1/ma + (MailMsgDoneFunc) emft_get_folder_info__done, + (MailMsgFreeFunc) emft_get_folder_info__free }; - + static void -@@ -1897,7 +1907,7 @@ emft_tree_row_expanded (GtkTreeView *tre - +@@ -1884,7 +1894,7 @@ emft_tree_row_expanded (GtkTreeView *tre + gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); - + - m = mail_msg_new (&get_folder_info_op, NULL, sizeof (struct _EMFolderTreeGetFolderInfo)); + m = mail_msg_new (&get_folder_info_info); m->root = gtk_tree_row_reference_new (model, tree_path); camel_object_ref (store); m->store = store; -@@ -1906,7 +1916,7 @@ emft_tree_row_expanded (GtkTreeView *tre +@@ -1893,7 +1903,7 @@ emft_tree_row_expanded (GtkTreeView *tre m->top = full_name; m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; - + - e_thread_put (mail_thread_new, (EMsg *) m); + mail_msg_unordered_push (m); } - + static gboolean -diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1/mail/em-folder-browser.c ---- evolution-2.21.1/mail/em-folder-browser.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-folder-browser.c 2007-10-29 14:47:20.000000000 -0400 -@@ -848,7 +848,7 @@ get_view_query (ESearchBar *esb) - - +diff -up evolution-2.21.4/mail/em-folder-browser.c.kill-ethread evolution-2.21.4/mail/em-folder-browser.c +--- evolution-2.21.4/mail/em-folder-browser.c.kill-ethread 2007-12-17 00:36:19.000000000 -0500 ++++ evolution-2.21.4/mail/em-folder-browser.c 2007-12-17 12:33:07.000000000 -0500 +@@ -908,7 +908,7 @@ get_view_query (ESearchBar *esb, CamelFo + + struct _setup_msg { - struct _mail_msg msg; + MailMsg base; - + CamelFolder *folder; char *query; -@@ -856,16 +856,15 @@ struct _setup_msg { +@@ -916,16 +916,15 @@ struct _setup_msg { GList *sources_folder; }; - + -static char * -vfolder_setup_desc(struct _mail_msg *mm, int done) +static gchar * @@ -3446,7 +3474,7 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 { return g_strdup(_("Searching")); } - + static void -vfolder_setup_do(struct _mail_msg *mm) +vfolder_setup_exec(struct _setup_msg *m) @@ -3454,8 +3482,8 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 - struct _setup_msg *m = (struct _setup_msg *)mm; GList *l, *list = NULL; CamelFolder *folder; - -@@ -876,12 +875,12 @@ vfolder_setup_do(struct _mail_msg *mm) + +@@ -936,12 +935,12 @@ vfolder_setup_do(struct _mail_msg *mm) l = m->sources_uri; while (l) { d(printf(" Adding uri: %s\n", (char *)l->data)); @@ -3470,9 +3498,9 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 } l = l->next; } -@@ -905,17 +904,13 @@ vfolder_setup_do(struct _mail_msg *mm) +@@ -965,17 +964,13 @@ vfolder_setup_do(struct _mail_msg *mm) } - + static void -vfolder_setup_done(struct _mail_msg *mm) +vfolder_setup_done(struct _setup_msg *m) @@ -3481,19 +3509,19 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 - - m = m; } - + static void -vfolder_setup_free (struct _mail_msg *mm) +vfolder_setup_free (struct _setup_msg *m) { - struct _setup_msg *m = (struct _setup_msg *)mm; GList *l; - + camel_object_unref(m->folder); -@@ -936,11 +931,12 @@ vfolder_setup_free (struct _mail_msg *mm +@@ -996,11 +991,12 @@ vfolder_setup_free (struct _mail_msg *mm g_list_free(m->sources_folder); } - + -static struct _mail_msg_op vfolder_setup_op = { - vfolder_setup_desc, - vfolder_setup_do, @@ -3506,12 +3534,12 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 + (MailMsgDoneFunc) vfolder_setup_done, + (MailMsgFreeFunc) vfolder_setup_free }; - + /* sources_uri should be camel uri's */ -@@ -950,15 +946,15 @@ vfolder_setup(CamelFolder *folder, const +@@ -1010,15 +1006,15 @@ vfolder_setup(CamelFolder *folder, const struct _setup_msg *m; int id; - + - m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); + m = mail_msg_new(&vfolder_setup_info); m->folder = folder; @@ -3519,30 +3547,30 @@ diff -up evolution-2.21.1/mail/em-folder-browser.c.kill-ethread evolution-2.21.1 m->query = g_strdup(query); m->sources_uri = sources_uri; m->sources_folder = sources_folder; - + - id = m->msg.seq; - e_thread_put(mail_thread_queued_slow, (EMsg *)m); + id = m->base.seq; + mail_msg_slow_ordered_push (m); - + return id; } -diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail/message-list.c ---- evolution-2.21.1/mail/message-list.c.kill-ethread 2007-10-28 22:02:16.000000000 -0400 -+++ evolution-2.21.1/mail/message-list.c 2007-10-29 14:47:20.000000000 -0400 -@@ -1848,7 +1848,7 @@ ml_tree_drag_data_get (ETree *tree, int +diff -up evolution-2.21.4/mail/message-list.c.kill-ethread evolution-2.21.4/mail/message-list.c +--- evolution-2.21.4/mail/message-list.c.kill-ethread 2007-12-17 00:36:27.000000000 -0500 ++++ evolution-2.21.4/mail/message-list.c 2007-12-17 12:33:08.000000000 -0500 +@@ -1942,7 +1942,7 @@ ml_tree_drag_data_get (ETree *tree, int /* TODO: merge this with the folder tree stuff via empopup targets */ /* Drop handling */ struct _drop_msg { - struct _mail_msg msg; + MailMsg base; - + GdkDragContext *context; - -@@ -1865,11 +1865,9 @@ struct _drop_msg { + +@@ -1959,11 +1959,9 @@ struct _drop_msg { unsigned int aborted:1; }; - + -static char * -ml_drop_async_desc (struct _mail_msg *mm, int done) +static gchar * @@ -3553,9 +3581,9 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail if (m->move) return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); else -@@ -1877,13 +1875,11 @@ ml_drop_async_desc (struct _mail_msg *mm +@@ -1971,13 +1969,11 @@ ml_drop_async_desc (struct _mail_msg *mm } - + static void -ml_drop_async_drop(struct _mail_msg *mm) +ml_drop_async_exec (struct _drop_msg *m) @@ -3569,18 +3597,18 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail break; case DND_MESSAGE_RFC822: em_utils_selection_get_message(m->selection, m->folder); -@@ -1895,9 +1891,8 @@ ml_drop_async_drop(struct _mail_msg *mm) +@@ -1989,9 +1985,8 @@ ml_drop_async_drop(struct _mail_msg *mm) } - + static void -ml_drop_async_done(struct _mail_msg *mm) +ml_drop_async_done (struct _drop_msg *m) { - struct _drop_msg *m = (struct _drop_msg *)mm; gboolean success, delete; - + /* ?? */ -@@ -1905,7 +1900,7 @@ ml_drop_async_done(struct _mail_msg *mm) +@@ -1999,7 +1994,7 @@ ml_drop_async_done(struct _mail_msg *mm) success = FALSE; delete = FALSE; } else { @@ -3588,10 +3616,10 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail + success = !camel_exception_is_set (&m->base.ex); delete = success && m->move && !m->moved; } - -@@ -1913,10 +1908,8 @@ ml_drop_async_done(struct _mail_msg *mm) + +@@ -2007,10 +2002,8 @@ ml_drop_async_done(struct _mail_msg *mm) } - + static void -ml_drop_async_free(struct _mail_msg *mm) +ml_drop_async_free (struct _drop_msg *m) @@ -3600,11 +3628,11 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail - g_object_unref(m->context); camel_object_unref(m->folder); - -@@ -1924,18 +1917,19 @@ ml_drop_async_free(struct _mail_msg *mm) + +@@ -2018,18 +2011,19 @@ ml_drop_async_free(struct _mail_msg *mm) g_free(m->selection); } - + -static struct _mail_msg_op ml_drop_async_op = { - ml_drop_async_desc, - ml_drop_async_drop, @@ -3617,7 +3645,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) ml_drop_async_done, + (MailMsgFreeFunc) ml_drop_async_free }; - + static void ml_drop_action(struct _drop_msg *m) { @@ -3625,39 +3653,39 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail - e_thread_put (mail_thread_new, (EMsg *) m); + mail_msg_unordered_push (m); } - + static void -@@ -1962,7 +1956,7 @@ ml_drop_popup_cancel(EPopup *ep, EPopupI +@@ -2056,7 +2050,7 @@ ml_drop_popup_cancel(EPopup *ep, EPopupI struct _drop_msg *m = data; - + m->aborted = TRUE; - mail_msg_free(&m->msg); + mail_msg_unref(m); } - + static EPopupItem ml_drop_popup_menu[] = { -@@ -1992,7 +1986,7 @@ ml_tree_drag_data_received (ETree *tree, +@@ -2086,7 +2080,7 @@ ml_tree_drag_data_received (ETree *tree, if (!ml->folder || data->data == NULL || data->length == -1) return; - + - m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); + m = mail_msg_new(&ml_drop_async_info); m->context = context; g_object_ref(context); m->folder = ml->folder; -@@ -3718,7 +3712,7 @@ save_hide_state (MessageList *ml) - +@@ -3811,7 +3805,7 @@ save_hide_state (MessageList *ml) + /* ** REGENERATE MESSAGELIST ********************************************** */ struct _regen_list_msg { - struct _mail_msg msg; + MailMsg base; - + int complete; - -@@ -3746,16 +3740,15 @@ struct _regen_list_msg { - + +@@ -3841,16 +3835,15 @@ struct _regen_list_msg { + */ - + -static char * -regen_list_describe (struct _mail_msg *mm, gint complete) +static gchar * @@ -3665,7 +3693,7 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail { return g_strdup (_("Generating message list")); } - + static void -regen_list_regen (struct _mail_msg *mm) +regen_list_exec (struct _regen_list_msg *m) @@ -3673,8 +3701,8 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail - struct _regen_list_msg *m = (struct _regen_list_msg *)mm; GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; CamelMessageInfo *info; - int i; -@@ -3785,7 +3778,7 @@ regen_list_regen (struct _mail_msg *mm) + ETreePath cursor; +@@ -3885,7 +3878,7 @@ regen_list_regen (struct _mail_msg *mm) } else expr = "(match-all (not (system-flag \"deleted\")))"; } @@ -3682,8 +3710,8 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail + searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); } else { char *expr; - -@@ -3795,23 +3788,23 @@ regen_list_regen (struct _mail_msg *mm) + +@@ -3895,23 +3888,23 @@ regen_list_regen (struct _mail_msg *mm) sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); } else expr = "(match-all (not (system-flag \"junk\")))"; @@ -3697,11 +3725,11 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail uids = camel_folder_get_uids (m->folder); } } - + - if (camel_exception_is_set (&mm->ex)) + if (camel_exception_is_set (&m->base.ex)) return; - + /* perform hiding */ if (m->hideexpr && camel_folder_has_search_capability(m->folder)) { - uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex); @@ -3709,21 +3737,21 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail /* well, lets not abort just because this faileld ... */ - camel_exception_clear (&mm->ex); + camel_exception_clear (&m->base.ex); - + if (uidnew) { MESSAGE_LIST_LOCK(m->ml, hide_lock); -@@ -3886,7 +3879,7 @@ regen_list_regen (struct _mail_msg *mm) - +@@ -3998,7 +3991,7 @@ regen_list_regen (struct _mail_msg *mm) + e_profile_event_emit("list.threaduids", m->folder->full_name, 0); - + - if (!camel_operation_cancel_check(mm->cancel)) { + if (!camel_operation_cancel_check(m->base.cancel)) { /* update/build a new tree */ if (m->dotree) { if (m->tree) -@@ -3915,17 +3908,15 @@ regen_list_regen (struct _mail_msg *mm) +@@ -4027,17 +4020,15 @@ regen_list_regen (struct _mail_msg *mm) } - + static void -regen_list_regened (struct _mail_msg *mm) +regen_list_done (struct _regen_list_msg *m) @@ -3732,30 +3760,30 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail - if (m->ml->priv->destroyed) return; - + if (!m->complete) return; - + - if (camel_operation_cancel_check(mm->cancel)) + if (camel_operation_cancel_check(m->base.cancel)) return; - + if (m->ml->folder != m->folder) -@@ -3976,9 +3967,8 @@ regen_list_regened (struct _mail_msg *mm +@@ -4101,9 +4092,8 @@ regen_list_regened (struct _mail_msg *mm } - + static void -regen_list_free (struct _mail_msg *mm) +regen_list_free (struct _regen_list_msg *m) { - struct _regen_list_msg *m = (struct _regen_list_msg *)mm; int i; - + e_profile_event_emit("list.regenerated", m->folder->full_name, 0); -@@ -4006,11 +3996,12 @@ regen_list_free (struct _mail_msg *mm) +@@ -4131,11 +4121,12 @@ regen_list_free (struct _mail_msg *mm) g_object_unref(m->ml); } - + -static struct _mail_msg_op regen_list_op = { - regen_list_describe, - regen_list_regen, @@ -3768,27 +3796,27 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) regen_list_done, + (MailMsgFreeFunc) regen_list_free }; - + static gboolean -@@ -4020,7 +4011,7 @@ ml_regen_timeout(struct _regen_list_msg - +@@ -4145,7 +4136,7 @@ ml_regen_timeout(struct _regen_list_msg + m->ml->regen = g_list_prepend(m->ml->regen, m); /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ - e_thread_put (mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); - + m->ml->regen_timeout_msg = NULL; m->ml->regen_timeout_id = 0; -@@ -4036,7 +4027,7 @@ mail_regen_cancel(MessageList *ml) +@@ -4161,7 +4152,7 @@ mail_regen_cancel(MessageList *ml) GList *l = ml->regen; - + while (l) { - struct _mail_msg *mm = l->data; + MailMsg *mm = l->data; - + if (mm->cancel) camel_operation_cancel(mm->cancel); -@@ -4048,7 +4039,7 @@ mail_regen_cancel(MessageList *ml) +@@ -4173,7 +4164,7 @@ mail_regen_cancel(MessageList *ml) if (ml->regen_timeout_id) { g_source_remove(ml->regen_timeout_id); ml->regen_timeout_id = 0; @@ -3797,22 +3825,22 @@ diff -up evolution-2.21.1/mail/message-list.c.kill-ethread evolution-2.21.1/mail ml->regen_timeout_msg = NULL; } } -@@ -4083,7 +4074,7 @@ mail_regen_list (MessageList *ml, const +@@ -4208,7 +4199,7 @@ mail_regen_list (MessageList *ml, const } #endif - + - m = mail_msg_new (®en_list_op, NULL, sizeof (*m)); + m = mail_msg_new (®en_list_info); m->ml = ml; m->search = g_strdup (search); m->hideexpr = g_strdup (hideexpr); -diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/mail/em-sync-stream.h ---- evolution-2.21.1/mail/em-sync-stream.h.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-sync-stream.h 2007-10-29 14:47:20.000000000 -0400 -@@ -29,41 +29,45 @@ requests are always handled in the main +diff -up evolution-2.21.4/mail/em-sync-stream.h.kill-ethread evolution-2.21.4/mail/em-sync-stream.h +--- evolution-2.21.4/mail/em-sync-stream.h.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/em-sync-stream.h 2007-12-17 12:33:08.000000000 -0500 +@@ -29,41 +29,45 @@ requests are always handled in the main #ifndef EM_SYNC_STREAM_H #define EM_SYNC_STREAM_H - + -#ifdef __cplusplus -extern "C" { -#pragma } @@ -3825,7 +3853,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/ma - #include #include - + -typedef struct _EMSyncStream { - CamelStream parent_stream; - @@ -3851,14 +3879,14 @@ diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/ma + GString *buffer; + gboolean cancel; +}; - + - int cancel; -} EMSyncStream; - -typedef struct { +struct _EMSyncStreamClass { CamelStreamClass parent_class; - + - ssize_t (*sync_write) (CamelStream *stream, const char *buffer, size_t n); - int (*sync_close) (CamelStream *stream); - int (*sync_flush) (CamelStream *stream); @@ -3883,27 +3911,27 @@ diff -up evolution-2.21.1/mail/em-sync-stream.h.kill-ethread evolution-2.21.1/ma + gsize size); + +G_END_DECLS - + #endif /* EM_SYNC_STREAM_H */ -diff -up evolution-2.21.1/mail/em-format-html-print.c.kill-ethread evolution-2.21.1/mail/em-format-html-print.c ---- evolution-2.21.1/mail/em-format-html-print.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-format-html-print.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/em-format-html-print.c.kill-ethread evolution-2.21.4/mail/em-format-html-print.c +--- evolution-2.21.4/mail/em-format-html-print.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 ++++ evolution-2.21.4/mail/em-format-html-print.c 2007-12-17 12:33:07.000000000 -0500 @@ -228,7 +228,7 @@ em_format_html_print_message (EMFormatHT g_object_ref (efhp); - + mail_get_message ( - folder, uid, emfhp_got_message, efhp, mail_thread_new); + folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); } - + void -diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/mail/em-sync-stream.c ---- evolution-2.21.1/mail/em-sync-stream.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-sync-stream.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/em-sync-stream.c.kill-ethread evolution-2.21.4/mail/em-sync-stream.c +--- evolution-2.21.4/mail/em-sync-stream.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/em-sync-stream.c 2007-12-17 12:33:08.000000000 -0500 @@ -25,42 +25,17 @@ #include #endif - + -#include +#include "em-sync-stream.h" + @@ -3914,15 +3942,15 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma -#include -#include "em-sync-stream.h" +#include - + #include "mail-mt.h" - + -#define LOG_STREAM - -#define d(x) - #define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass)) - + -struct _EMSyncStreamPrivate { - /* FIXME: use a single data port/gui channel for all instances */ - /* TODO: possibly just use one of the mail-mt ports ... */ @@ -3949,20 +3977,20 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma EMSS_FLUSH, @@ -68,275 +43,168 @@ enum _write_msg_t { }; - + struct _write_msg { - EMsg msg; + EMSyncStream *emss; + EFlag *done; - + enum _write_msg_t op; - + - const char *data; - size_t n; + const gchar *string; + gsize len; }; - + -static void em_sync_stream_class_init (EMSyncStreamClass *klass); -static void em_sync_stream_init (CamelObject *object); -static void em_sync_stream_finalize (CamelObject *object); @@ -3972,7 +4000,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma -static int stream_flush(CamelStream *stream); - static CamelStreamClass *parent_class = NULL; - + -CamelType -em_sync_stream_get_type (void) -{ @@ -4035,7 +4063,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - p->buf_used = 0; - } + struct _EMSyncStream *emss = msg->emss; - + - /* FIXME: need to handle return values */ + /* Force out any pending data before doing anything else. */ + if (emss->buffer != NULL && emss->buffer->len > 0) { @@ -4044,7 +4072,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + emss->buffer->len); + g_string_set_size (emss->buffer, 0); + } - + switch (msg->op) { - case EMSS_WRITE: - EMSS_CLASS(emss)->sync_write((CamelStream *)emss, msg->data, msg->n); @@ -4078,7 +4106,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + CAMEL_STREAM (emss)); + break; } -- + - e_msgport_reply((EMsg *)msg); - d(printf("%p: gui sync op jobs done\n", emss)); - @@ -4092,11 +4120,11 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - struct _EMSyncStreamPrivate *p; - - p = emss->priv = g_malloc0(sizeof(*p)); - +- - p->data_port = e_msgport_new(); - p->reply_port = e_msgport_new(); + e_flag_set (msg->done); - + -#ifndef G_OS_WIN32 - p->gui_channel = g_io_channel_unix_new(e_msgport_fd(p->data_port)); -#else @@ -4118,7 +4146,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - d(printf("%p: new emss\n", emss)); + return FALSE; } - + static void -sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) +emss_sync_op (EMSyncStream *emss, enum _write_msg_t op, @@ -4129,7 +4157,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - EMsg *reply_msg; - - d(printf("%p: launching sync op %d\n", emss, op)); - + - /* we do everything synchronous, we should never have any locks, and - this prevents overflow from banked up data */ - @@ -4158,19 +4186,19 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - g_io_channel_unref(p->gui_channel); + msg.string = string; + msg.len = len; - + - e_msgport_destroy(p->data_port); - e_msgport_destroy(p->reply_port); + camel_object_ref (emss); - + - p->data_port = NULL; - p->reply_port = NULL; + g_idle_add ((GSourceFunc) emss_process_message, &msg); - + - g_free(p->buf_data); + e_flag_wait (msg.done); + e_flag_free (msg.done); - + -#ifdef LOG_STREAM - if (p->logfd) - fclose(p->logfd); @@ -4179,7 +4207,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - g_free(p); + camel_object_unref (emss); } - + -static ssize_t -stream_write (CamelStream *stream, const char *buffer, size_t n) +static gssize @@ -4187,10 +4215,10 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma { EMSyncStream *emss = EM_SYNC_STREAM (stream); - struct _EMSyncStreamPrivate *p = emss->priv; - + if (emss->cancel) return -1; - + - if (pthread_equal(pthread_self(), mail_gui_thread)) { - EMSS_CLASS(emss)->sync_write(stream, buffer, n); -#ifdef LOG_STREAM @@ -4217,21 +4245,21 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma - sync_op(emss, EMSS_WRITE, buffer, n); + emss_sync_op(emss, EMSS_WRITE, string, len); } - + - return (ssize_t) n; + return (gssize) len; } - + static int -stream_flush(CamelStream *stream) +emss_stream_flush (CamelStream *stream) { - EMSyncStream *emss = (EMSyncStream *)stream; + EMSyncStream *emss = EM_SYNC_STREAM (stream); - + if (emss->cancel) return -1; - + - if (pthread_equal(pthread_self(), mail_gui_thread)) - return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); + if (mail_in_main_thread ()) @@ -4239,20 +4267,20 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma else - sync_op(emss, EMSS_FLUSH, NULL, 0); + emss_sync_op (emss, EMSS_FLUSH, NULL, 0); - + return 0; } - + static int -stream_close(CamelStream *stream) +emss_stream_close (CamelStream *stream) { - EMSyncStream *emss = (EMSyncStream *)stream; + EMSyncStream *emss = EM_SYNC_STREAM (stream); - + if (emss->cancel) return -1; - + - d(printf("%p: closing stream\n", stream)); - - if (pthread_equal(pthread_self(), mail_gui_thread)) { @@ -4269,10 +4297,10 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + return EMSS_CLASS (emss)->sync_close (stream); + else + emss_sync_op (emss, EMSS_CLOSE, NULL, 0); - + return 0; } - + -void -em_sync_stream_set_buffer_size(EMSyncStream *emss, size_t size) +static void @@ -4310,7 +4338,7 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + NULL, + (CamelObjectInitFunc) NULL, + (CamelObjectFinalizeFunc) em_sync_stream_finalize); - + - g_free(p->buf_data); - p->buf_data = g_malloc(size); - p->buf_size = size; @@ -4325,21 +4353,21 @@ diff -up evolution-2.21.1/mail/em-sync-stream.c.kill-ethread evolution-2.21.1/ma + g_string_free (emss->buffer, TRUE); + emss->buffer = g_string_sized_new (size); } -diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21.1/mail/em-subscribe-editor.c ---- evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-subscribe-editor.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/em-subscribe-editor.c.kill-ethread evolution-2.21.4/mail/em-subscribe-editor.c +--- evolution-2.21.4/mail/em-subscribe-editor.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/em-subscribe-editor.c 2007-12-17 12:33:07.000000000 -0500 @@ -173,7 +173,7 @@ sub_unref(EMSubscribe *sub) /* ** Subscribe folder operation **************************************** */ - + struct _zsubscribe_msg { - struct _mail_msg msg; + MailMsg base; - + EMSubscribe *sub; EMSubscribeNode *node; @@ -182,20 +182,18 @@ struct _zsubscribe_msg { }; - + static void -sub_folder_subscribe (struct _mail_msg *mm) +sub_folder_exec (struct _zsubscribe_msg *m) @@ -4353,7 +4381,7 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 - camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); + camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); } - + static void -sub_folder_subscribed (struct _mail_msg *mm) +sub_folder_done (struct _zsubscribe_msg *m) @@ -4363,16 +4391,16 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 GtkTreeIter iter; GtkTreeModel *model; EMSubscribeNode *node; -@@ -205,7 +203,7 @@ sub_folder_subscribed (struct _mail_msg +@@ -205,7 +203,7 @@ sub_folder_subscribed (struct _mail_msg if (m->sub->cancel) return; - + - if (!camel_exception_is_set(&mm->ex)) { + if (!camel_exception_is_set(&m->base.ex)) { if (m->subscribe) m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; else -@@ -226,8 +224,8 @@ sub_folder_subscribed (struct _mail_msg +@@ -226,8 +224,8 @@ sub_folder_subscribed (struct _mail_msg /* queue any further ones, or if out, update the ui */ next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); if (next) { @@ -4383,9 +4411,9 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 } else { /* should it go off the model instead? */ sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); -@@ -235,19 +233,18 @@ sub_folder_subscribed (struct _mail_msg +@@ -235,19 +233,18 @@ sub_folder_subscribed (struct _mail_msg } - + static void -sub_folder_free (struct _mail_msg *mm) +sub_folder_free (struct _zsubscribe_msg *m) @@ -4395,7 +4423,7 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 g_free(m->path); sub_unref(m->sub); } - + -static struct _mail_msg_op sub_subscribe_folder_op = { - NULL, /*subscribe_folder_desc,*/ - sub_folder_subscribe, @@ -4408,12 +4436,12 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 + (MailMsgDoneFunc) sub_folder_done, + (MailMsgFreeFunc) sub_folder_free }; - + /* spath is tree path in string form */ -@@ -257,18 +254,18 @@ sub_subscribe_folder (EMSubscribe *sub, +@@ -257,18 +254,18 @@ sub_subscribe_folder (EMSubscribe *sub, struct _zsubscribe_msg *m; int id; - + - m = mail_msg_new (&sub_subscribe_folder_op, NULL, sizeof(*m)); + m = mail_msg_new (&sub_subscribe_folder_info); m->sub = sub; @@ -4421,7 +4449,7 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 m->node = node; m->subscribe = state; m->path = g_strdup(spath); - + - id = m->msg.seq; + id = m->base.seq; if (sub->subscribe_id == -1) { @@ -4434,23 +4462,23 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 e_dlist_addtail(&sub->subscribe, (EDListNode *)m); @@ -339,7 +336,7 @@ sub_fill_level(EMSubscribe *sub, CamelFo /* async query of folderinfo */ - + struct _emse_folderinfo_msg { - struct _mail_msg msg; + MailMsg base; - + int seq; - + @@ -349,31 +346,29 @@ struct _emse_folderinfo_msg { }; - + static void -sub_folderinfo_get (struct _mail_msg *mm) +sub_folderinfo_exec (struct _emse_folderinfo_msg *m) { - struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; char *pub_full_name=NULL; - + if (m->seq == m->sub->seq) { - camel_operation_register(mm->cancel); - m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex); @@ -4460,29 +4488,29 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 + camel_operation_unregister(m->base.cancel); } } - + static void -sub_folderinfo_got(struct _mail_msg *mm) +sub_folderinfo_done (struct _emse_folderinfo_msg *m) { - struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; EMSubscribeNode *node; - + m->sub->pending_id = -1; if (m->sub->cancel || m->seq != m->sub->seq) return; - + - if (camel_exception_is_set (&mm->ex)) { + if (camel_exception_is_set (&m->base.ex)) { g_warning ("Error getting folder info from store: %s", - camel_exception_get_description (&mm->ex)); + camel_exception_get_description (&m->base.ex)); } - + if (m->info) { @@ -394,10 +389,8 @@ sub_folderinfo_got(struct _mail_msg *mm) } - + static void -sub_folderinfo_free(struct _mail_msg *mm) +sub_folderinfo_free (struct _emse_folderinfo_msg *m) @@ -4491,11 +4519,11 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 - if (m->info) m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); - + @@ -413,11 +406,12 @@ sub_folderinfo_free(struct _mail_msg *mm sub_unref(m->sub); } - + -static struct _mail_msg_op sub_folderinfo_op = { - NULL, /*sub_folderinfo_desc, we do our own progress reporting/cancellation */ - sub_folderinfo_get, @@ -4508,54 +4536,54 @@ diff -up evolution-2.21.1/mail/em-subscribe-editor.c.kill-ethread evolution-2.21 + (MailMsgDoneFunc) sub_folderinfo_done, + (MailMsgFreeFunc) sub_folderinfo_free }; - + static int @@ -429,19 +423,19 @@ sub_queue_fill_level(EMSubscribe *sub, E d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, node?node->info->full_name:"")); - + - m = mail_msg_new (&sub_folderinfo_op, NULL, sizeof(*m)); + m = mail_msg_new (&sub_folderinfo_info); sub_ref(sub); m->sub = sub; m->node = node; m->seq = sub->seq; - + - sub->pending_id = m->msg.seq; + sub->pending_id = m->base.seq; - + sub_editor_busy(sub->editor, 1); - + - id = m->msg.seq; + id = m->base.seq; - + - e_thread_put (mail_thread_new, (EMsg *)m); + mail_msg_unordered_push (m); return id; } - + @@ -571,7 +565,7 @@ sub_destroy(GtkWidget *w, EMSubscribe *s mail_msg_cancel(sub->subscribe_id); - + while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) - mail_msg_free(m); + mail_msg_unref(m); - + sub_unref(sub); } -diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail-mt.h ---- evolution-2.21.1/mail/mail-mt.h.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-mt.h 2007-10-29 14:47:20.000000000 -0400 -@@ -23,47 +23,64 @@ +diff -up evolution-2.21.4/mail/mail-mt.h.kill-ethread evolution-2.21.4/mail/mail-mt.h +--- evolution-2.21.4/mail/mail-mt.h.kill-ethread 2007-12-16 14:30:32.000000000 -0500 ++++ evolution-2.21.4/mail/mail-mt.h 2007-12-17 12:33:08.000000000 -0500 +@@ -23,48 +23,65 @@ #ifndef _MAIL_MT #define _MAIL_MT - + -#include #include "camel/camel-exception.h" -#include "libedataserver/e-msgport.h" #include "camel/camel-object.h" #include "camel/camel-operation.h" - + -typedef struct _mail_msg { - EMsg msg; /* parent type */ - struct _mail_msg_op *ops; /* operation functions */ @@ -4580,7 +4608,7 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail -} mail_msg_t; + MailMsgPrivate *priv; +}; - + -/* callback functions for thread message */ -typedef struct _mail_msg_op { - char *(*describe_msg)(struct _mail_msg *msg, int complete); @@ -4596,11 +4624,11 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail + MailMsgDoneFunc done; + MailMsgFreeFunc free; +}; - + /* setup ports */ void mail_msg_init(void); void mail_msg_cleanup (void); - + +gboolean mail_in_main_thread (void); + /* allocate a new message */ @@ -4615,7 +4643,7 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail void mail_msg_wait(unsigned int msgid); void mail_msg_wait_all(void); int mail_msg_active(unsigned int msgid); - + +/* dispatch a message */ +void mail_msg_main_loop_push (gpointer msg); +void mail_msg_unordered_push (gpointer msg); @@ -4626,16 +4654,18 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail -void *mail_cancel_hook_add(GDestroyNotify func, void *data); -void mail_cancel_hook_remove(void *handle); -void mail_cancel_all(void); +-void mail_msg_set_cancelable (struct _mail_msg *msg, gboolean status); +GHook * mail_cancel_hook_add (GHookFunc func, gpointer data); +void mail_cancel_hook_remove (GHook *hook); +void mail_cancel_all (void); - ++void mail_msg_set_cancelable (gpointer msg, gboolean status); + /* request a string/password */ char *mail_get_password (CamelService *service, const char *prompt, -@@ -112,24 +129,6 @@ void *mail_call_main(mail_call_t type, M +@@ -113,24 +130,6 @@ void *mail_call_main(mail_call_t type, M void mail_enable_stop(void); void mail_disable_stop(void); - + -/* a message port that receives messages in the gui thread, used for sending port */ -extern EMsgPort *mail_gui_port; -/* a message port that receives messages in the gui thread, used for the reply port */ @@ -4657,13 +4687,13 @@ diff -up evolution-2.21.1/mail/mail-mt.h.kill-ethread evolution-2.21.1/mail/mail /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ extern MailAsyncEvent *mail_async_event; -diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mail-ops.h ---- evolution-2.21.1/mail/mail-ops.h.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-ops.h 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/mail-ops.h.kill-ethread evolution-2.21.4/mail/mail-ops.h +--- evolution-2.21.4/mail/mail-ops.h.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/mail-ops.h 2007-12-17 12:33:08.000000000 -0500 @@ -30,13 +30,14 @@ extern "C" { #pragma } #endif /* __cplusplus */ - + +#include "mail-mt.h" + #include "camel/camel-store.h" @@ -4671,10 +4701,10 @@ diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mai #include "camel/camel-filter-driver.h" #include "camel/camel-mime-message.h" #include "camel/camel-operation.h" - + -#include "libedataserver/e-msgport.h" #include "libedataserver/e-account.h" - + void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, @@ -55,12 +56,12 @@ void mail_transfer_messages (CamelFolder void mail_get_message (CamelFolder *folder, const char *uid, @@ -4682,13 +4712,13 @@ diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mai void *data, - EThread *thread); + MailMsgDispatchFunc dispatch); - + void mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), - void *data, EThread *thread); + void *data, MailMsgDispatchFunc dispatch); - + /* get several messages */ void mail_get_messages (CamelFolder *folder, GPtrArray *uids, @@ -70,7 +71,7 @@ void mail_get_messages (CamelFolder *fol @@ -4697,33 +4727,33 @@ diff -up evolution-2.21.1/mail/mail-ops.h.kill-ethread evolution-2.21.1/mail/mai void (*done) (char *uri, CamelFolder *folder, void *data), void *data, - EThread *thread); + MailMsgDispatchFunc dispatch); - + /* and for a store */ int mail_get_store (const char *uri, CamelOperation *op, -diff -up evolution-2.21.1/mail/em-composer-utils.c.kill-ethread evolution-2.21.1/mail/em-composer-utils.c ---- evolution-2.21.1/mail/em-composer-utils.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-composer-utils.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/em-composer-utils.c.kill-ethread evolution-2.21.4/mail/em-composer-utils.c +--- evolution-2.21.4/mail/em-composer-utils.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 ++++ evolution-2.21.4/mail/em-composer-utils.c 2007-12-17 12:33:08.000000000 -0500 @@ -557,7 +557,7 @@ em_utils_composer_save_draft_cb (EMsgCom strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { int id; - + - id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); + id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); mail_msg_wait (id); - + if (!folder || !account->enabled) { @@ -1108,7 +1108,7 @@ em_utils_redirect_message_by_uid (CamelF g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); - + - mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); + mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); } - + static void @@ -1139,7 +1139,7 @@ em_utils_handle_receipt (CamelFolder *fo } - + if (msg == NULL) { - mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); + mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); @@ -4736,60 +4766,29 @@ diff -up evolution-2.21.1/mail/em-composer-utils.c.kill-ethread evolution-2.21.1 g_object_ref(rd->source); - mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); + mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); - + return; } @@ -2125,5 +2125,5 @@ em_utils_post_reply_to_message_by_uid (C g_return_if_fail (CAMEL_IS_FOLDER (folder)); g_return_if_fail (uid != NULL); - + - mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); + mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); } -diff -up evolution-2.21.1/mail/em-filter-i18n.h.kill-ethread evolution-2.21.1/mail/em-filter-i18n.h ---- evolution-2.21.1/mail/em-filter-i18n.h.kill-ethread 2007-10-29 03:19:19.000000000 -0400 -+++ evolution-2.21.1/mail/em-filter-i18n.h 2007-10-29 14:47:20.000000000 -0400 -@@ -3,7 +3,10 @@ char *s = N_("Adjust Score"); - char *s = N_("Assign Color"); - char *s = N_("Assign Score"); - char *s = N_("Attachments"); -+char *s = N_("BCC"); - char *s = N_("Beep"); -+char *s = N_("CC"); -+char *s = N_("Completed On"); - char *s = N_("contains"); - char *s = N_("Copy to Folder"); - char *s = N_("Date received"); -@@ -32,6 +35,8 @@ char *s = N_("is greater than"); - char *s = N_("is less than"); - char *s = N_("is not"); - char *s = N_("is not Flagged"); -+char *s = N_("is not set"); -+char *s = N_("is set"); - char *s = N_("Junk"); - char *s = N_("Junk Test"); - char *s = N_("Label"); -@@ -54,6 +59,7 @@ char *s = N_("returns less than"); - char *s = N_("Run Program"); - char *s = N_("Score"); - char *s = N_("Sender"); -+char *s = N_("Set Label"); - char *s = N_("Set Status"); - char *s = N_("Size (kB)"); - char *s = N_("sounds like"); -diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1/mail/mail-folder-cache.c ---- evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-folder-cache.c 2007-10-29 14:47:20.000000000 -0400 -@@ -866,15 +866,14 @@ update_folders(CamelStore *store, CamelF - - +diff -up evolution-2.21.4/mail/mail-folder-cache.c.kill-ethread evolution-2.21.4/mail/mail-folder-cache.c +--- evolution-2.21.4/mail/mail-folder-cache.c.kill-ethread 2007-12-15 10:58:56.000000000 -0500 ++++ evolution-2.21.4/mail/mail-folder-cache.c 2007-12-17 12:33:08.000000000 -0500 +@@ -808,15 +808,14 @@ update_folders(CamelStore *store, CamelF + + struct _ping_store_msg { - struct _mail_msg msg; + MailMsg base; - + CamelStore *store; }; - + -static char * -ping_store_desc (struct _mail_msg *mm, int done) +static gchar * @@ -4798,27 +4797,27 @@ diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1 - struct _ping_store_msg *m = (struct _ping_store_msg *) mm; char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); char *msg; - -@@ -885,10 +884,9 @@ ping_store_desc (struct _mail_msg *mm, i + +@@ -827,10 +826,9 @@ ping_store_desc (struct _mail_msg *mm, i } - + static void -ping_store_ping (struct _mail_msg *mm) +ping_store_exec (struct _ping_store_msg *m) { gboolean online = FALSE; - struct _ping_store_msg *m = (struct _ping_store_msg *) mm; - + if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -899,22 +897,21 @@ ping_store_ping (struct _mail_msg *mm) +@@ -841,22 +839,21 @@ ping_store_ping (struct _mail_msg *mm) online = TRUE; } if (online) - camel_store_noop (m->store, &mm->ex); + camel_store_noop (m->store, &m->base.ex); } - + static void -ping_store_free (struct _mail_msg *mm) +ping_store_free (struct _ping_store_msg *m) @@ -4827,7 +4826,7 @@ diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1 - camel_object_unref (m->store); } - + -static struct _mail_msg_op ping_store_op = { - ping_store_desc, - ping_store_ping, @@ -4840,70 +4839,70 @@ diff -up evolution-2.21.1/mail/mail-folder-cache.c.kill-ethread evolution-2.21.1 + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) ping_store_free }; - + static void -@@ -926,11 +923,11 @@ ping_store (gpointer key, gpointer val, +@@ -868,11 +865,11 @@ ping_store (gpointer key, gpointer val, if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) return; - + - m = mail_msg_new (&ping_store_op, NULL, sizeof (struct _ping_store_msg)); + m = mail_msg_new (&ping_store_info); m->store = store; camel_object_ref (store); - + - e_thread_put (mail_thread_queued_slow, (EMsg *) m); + mail_msg_slow_ordered_push (m); } - + static gboolean -@@ -975,7 +972,7 @@ mail_note_store(CamelStore *store, Camel +@@ -917,7 +914,7 @@ mail_note_store(CamelStore *store, Camel int hook = 0; - + g_return_if_fail (CAMEL_IS_STORE(store)); - g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); + g_return_if_fail (mail_in_main_thread()); - + LOCK(info_lock); - -diff -up evolution-2.21.1/mail/em-folder-view.c.kill-ethread evolution-2.21.1/mail/em-folder-view.c ---- evolution-2.21.1/mail/em-folder-view.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/em-folder-view.c 2007-10-29 14:47:20.000000000 -0400 -@@ -71,6 +71,7 @@ + +diff -up evolution-2.21.4/mail/em-folder-view.c.kill-ethread evolution-2.21.4/mail/em-folder-view.c +--- evolution-2.21.4/mail/em-folder-view.c.kill-ethread 2007-12-17 00:36:27.000000000 -0500 ++++ evolution-2.21.4/mail/em-folder-view.c 2007-12-17 12:33:08.000000000 -0500 +@@ -72,6 +72,7 @@ #include - + #include +#include - + #include "menus/gal-view-etable.h" #include "menus/gal-view-factory-etable.h" -@@ -777,7 +778,7 @@ emfv_got_folder(char *uri, CamelFolder * +@@ -778,7 +779,7 @@ emfv_got_folder(char *uri, CamelFolder * static void emfv_set_folder_uri(EMFolderView *emfv, const char *uri) { - mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_thread_queued); + mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_msg_fast_ordered_push); } - + static void -@@ -1752,7 +1753,7 @@ filter_type_uid (CamelFolder *folder, co +@@ -1885,7 +1886,7 @@ filter_type_uid (CamelFolder *folder, co data->type = type; data->source = source; - + - mail_get_message (folder, uid, filter_type_got_message, data, mail_thread_new); + mail_get_message (folder, uid, filter_type_got_message, data, mail_msg_unordered_push); } - + static void -@@ -1850,7 +1851,7 @@ vfolder_type_uid (CamelFolder *folder, c +@@ -1983,7 +1984,7 @@ vfolder_type_uid (CamelFolder *folder, c data->type = type; data->uri = g_strdup (uri); - + - mail_get_message (folder, uid, vfolder_type_got_message, data, mail_thread_new); + mail_get_message (folder, uid, vfolder_type_got_message, data, mail_msg_unordered_push); } - + static void -@@ -2427,7 +2428,7 @@ emfv_message_selected_timeout(void *data +@@ -2560,7 +2561,7 @@ emfv_message_selected_timeout(void *data emfv->displayed_uid); gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); */ @@ -4912,61 +4911,59 @@ diff -up evolution-2.21.1/mail/em-folder-view.c.kill-ethread evolution-2.21.1/ma } else { e_profile_event_emit("goto.empty", "", 0); g_free(emfv->priv->selected_uid); -diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail/mail-session.c ---- evolution-2.21.1/mail/mail-session.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-session.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/mail-session.c.kill-ethread evolution-2.21.4/mail/mail-session.c +--- evolution-2.21.4/mail/mail-session.c.kill-ethread 2007-12-17 00:33:20.000000000 -0500 ++++ evolution-2.21.4/mail/mail-session.c 2007-12-17 12:33:08.000000000 -0500 @@ -35,7 +35,7 @@ #include - + #include -#include +#include - + #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ #include -@@ -264,148 +264,145 @@ forget_password (CamelSession *session, - +@@ -265,21 +265,22 @@ forget_password (CamelSession *session, + /* ********************************************************************** */ - + -static GtkDialog *message_dialog; -static EDList message_list = E_DLIST_INITIALISER(message_list); +static gpointer user_message_dialog; +static GQueue user_message_queue = { NULL, NULL, 0 }; - + struct _user_message_msg { - struct _mail_msg msg; + MailMsg base; - + CamelSessionAlertType type; char *prompt; + EFlag *done; - + unsigned int allow_cancel:1; unsigned int result:1; unsigned int ismain:1; }; - + -static void do_user_message (struct _mail_msg *mm); +static void user_message_exec (struct _user_message_msg *m); - + /* clicked, send back the reply */ static void - user_message_response (GtkDialog *dialog, int button, struct _user_message_msg *m) +@@ -287,126 +288,122 @@ user_message_response (GtkDialog *dialog { gtk_widget_destroy ((GtkWidget *) dialog); -- + - message_dialog = NULL; -- -+ + user_message_dialog = NULL; -+ + /* if !allow_cancel, then we've already replied */ if (m->allow_cancel) { m->result = button == GTK_RESPONSE_OK; - e_msgport_reply((EMsg *)m); + e_flag_set (m->done); } - + /* check for pendings */ - if ((m = (struct _user_message_msg *)e_dlist_remhead(&message_list))) - do_user_message((struct _mail_msg *)m); @@ -4982,7 +4979,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + mail_msg_unref (m); + } } - + -/* This is kinda ugly/inefficient, but oh well, it works */ -static const char *error_type[] = { - "mail:session-message-info", "mail:session-message-warning", "mail:session-message-error", @@ -4996,14 +4993,14 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail - struct _user_message_msg *m = (struct _user_message_msg *)mm; - int type; + const gchar *error_type; - + - if (!m->ismain && message_dialog != NULL) { - e_dlist_addtail (&message_list, (EDListNode *)m); + if (!m->ismain && user_message_dialog != NULL) { + g_queue_push_tail (&user_message_queue, mail_msg_ref (m)); return; } - + switch (m->type) { - case CAMEL_SESSION_ALERT_INFO: - type = 0; @@ -5072,7 +5069,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + gtk_widget_show (user_message_dialog); } } - + static void -free_user_message(struct _mail_msg *mm) +user_message_free (struct _user_message_msg *m) @@ -5082,7 +5079,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail g_free(m->prompt); + e_flag_free(m->done); } - + -static struct _mail_msg_op user_message_op = { NULL, do_user_message, NULL, free_user_message }; +static MailMsgInfo user_message_info = { + sizeof (struct _user_message_msg), @@ -5091,7 +5088,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) user_message_free +}; - + static gboolean alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) { @@ -5101,10 +5098,10 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail - gboolean ret; + struct _user_message_msg *m; + gboolean result = TRUE; - + if (!mail_session->interactive) return FALSE; - + - if (cancel) - user_message_reply = e_msgport_new (); - m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); @@ -5116,21 +5113,21 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + m->prompt = g_strdup (prompt); + m->done = e_flag_new (); m->allow_cancel = cancel; - + - if (m->ismain) - do_user_message((struct _mail_msg *)m); - else { - extern EMsgPort *mail_gui_port2; + if (cancel) + mail_msg_ref (m); - + - e_msgport_put(mail_gui_port2, (EMsg *)m); - } + if (m->ismain) + user_message_exec (m); + else + mail_msg_main_loop_push (m); - + if (cancel) { - r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); - g_return_val_if_fail (m == r, FALSE); @@ -5138,7 +5135,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + result = m->result; + mail_msg_unref (m); + } - + - ret = m->result; - mail_msg_free(m); - e_msgport_destroy(user_message_reply); @@ -5148,50 +5145,50 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + user_message_free (m); + mail_msg_unref (m); + } - + - return ret; + return result; } - + static CamelFolder * -@@ -541,7 +538,7 @@ get_filter_driver (CamelSession *session +@@ -542,7 +539,7 @@ get_filter_driver (CamelSession *session /* TODO: This is very temporary, until we have a better way to do the progress reporting, we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ - + -static mail_msg_op_t ms_thread_ops_dummy = { NULL }; +static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) }; - + static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) { -@@ -550,7 +547,7 @@ static void *ms_thread_msg_new(CamelSess +@@ -551,7 +548,7 @@ static void *ms_thread_msg_new(CamelSess /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so we get cancellation and progress in common with hte existing mail code, for free */ if (msg) { - struct _mail_msg *m = mail_msg_new(&ms_thread_ops_dummy, NULL, sizeof(struct _mail_msg)); + MailMsg *m = mail_msg_new(&ms_thread_info_dummy); - + msg->data = m; camel_operation_unref(msg->op); -@@ -563,7 +560,7 @@ static void *ms_thread_msg_new(CamelSess - +@@ -564,7 +561,7 @@ static void *ms_thread_msg_new(CamelSess + static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) { - mail_msg_free(m->data); + mail_msg_unref(m->data); ms_parent_class->thread_msg_free(session, m); } - -@@ -686,22 +683,23 @@ mail_session_set_interactive (gboolean i + +@@ -689,22 +686,23 @@ mail_session_set_interactive (gboolean i MAIL_SESSION (session)->interactive = interactive; - + if (!interactive) { - struct _user_message_msg *um; + struct _user_message_msg *msg; - + d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); - + e_passwords_cancel(); - + /* flush/cancel pending user messages */ - while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { - d(printf ("Flusing message request: %s\n", um->prompt)); @@ -5201,7 +5198,7 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail + e_flag_set (msg->done); + mail_msg_unref (msg); } - + /* and the current */ - if (message_dialog) { + if (user_message_dialog) { @@ -5211,56 +5208,61 @@ diff -up evolution-2.21.1/mail/mail-session.c.kill-ethread evolution-2.21.1/mail } } } -diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail-mt.c ---- evolution-2.21.1/mail/mail-mt.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.1/mail/mail-mt.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/mail/mail-mt.c.kill-ethread evolution-2.21.4/mail/mail-mt.c +--- evolution-2.21.4/mail/mail-mt.c.kill-ethread 2007-12-17 00:52:03.000000000 -0500 ++++ evolution-2.21.4/mail/mail-mt.c 2007-12-17 12:33:08.000000000 -0500 @@ -29,8 +29,8 @@ #include #include - + -#include #include +#include - + #include #include @@ -63,7 +63,7 @@ static void mail_operation_status(struct #endif - + /* background operation status stuff */ -struct _mail_msg_priv { +struct _MailMsgPrivate { int activity_state; /* sigh sigh sigh, we need to keep track of the state external to the pointer itself for locking/race conditions */ int activity_id; -@@ -82,15 +82,12 @@ static GHashTable *mail_msg_active_table +@@ -84,20 +84,12 @@ static GHashTable *mail_msg_active_table static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; - + -pthread_t mail_gui_thread; - MailAsyncEvent *mail_async_event; - + -static void mail_msg_destroy(EThread *e, EMsg *msg, void *data); - +-void mail_msg_set_cancelable (struct _mail_msg *msg, gboolean status) +-{ +- msg->priv->cancelable = status; +-} +- -void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size) +gpointer +mail_msg_new (MailMsgInfo *info) { - struct _mail_msg *msg; + MailMsg *msg; - + MAIL_MT_LOCK(mail_msg_lock); - -@@ -112,7 +109,6 @@ void *mail_msg_new(mail_msg_op_t *ops, E + +@@ -119,7 +111,6 @@ void *mail_msg_new(mail_msg_op_t *ops, E fprintf(log, "Logging async operations\n"); - + if (log_locks) { - fprintf(log, "Logging lock operations, mail_gui_thread = %" G_GINT64_MODIFIER "x\n\n", e_util_pthread_id(mail_gui_thread)); fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); } } else { -@@ -122,13 +118,13 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -129,13 +120,13 @@ void *mail_msg_new(mail_msg_op_t *ops, E } } #endif @@ -5275,41 +5277,44 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail camel_exception_init(&msg->ex); - msg->priv = g_malloc0(sizeof(*msg->priv)); + msg->priv = g_slice_new0 (MailMsgPrivate); - + msg->priv->cancelable = TRUE; + g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); - -@@ -143,12 +139,15 @@ void *mail_msg_new(mail_msg_op_t *ops, E +@@ -151,18 +142,20 @@ void *mail_msg_new(mail_msg_op_t *ops, E return msg; } - + - --static void end_event_callback (CamelObject *o, void *event_data, void *data) +-static void end_event_callback (CamelObject *o, void *event_data, void *error) +static void -+end_event_callback (CamelObject *o, void *event_data, void *data) ++end_event_callback (CamelObject *o, void *event_data, void *data, void *error) { - EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); + MailComponent *component; + EActivityHandler *activity_handler; guint activity_id = GPOINTER_TO_INT (event_data); - + + component = mail_component_peek (); + activity_handler = mail_component_peek_activity_handler (component); - e_activity_handler_operation_finished (activity_handler, activity_id); + if (!error) { + e_activity_handler_operation_finished (activity_handler, activity_id); + } else { + d(printf("Yahooooo, we got it nonintrusively\n")); + e_activity_handler_operation_set_error (activity_handler, activity_id, error); +- + } } - -@@ -177,58 +176,93 @@ checkmem(void *p) + +@@ -191,43 +184,81 @@ checkmem(void *p) } #endif - + -void mail_msg_free(void *msg) +static void +mail_msg_free (MailMsg *mail_msg) { - struct _mail_msg *m = msg; - int activity_id; -+ /* XXX This function is broken out from mail_msg_unref() -+ * only for the benefit of op_status_exec() below. */ -+ + if (mail_msg->cancel != NULL) { + camel_operation_mute (mail_msg->cancel); + camel_operation_unref (mail_msg->cancel); @@ -5337,13 +5342,14 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail +{ + MailMsg *mail_msg = msg; + gint activity_id; -+ + GtkWidget *error = NULL; + + g_return_if_fail (mail_msg != NULL); + g_return_if_fail (mail_msg->ref_count > 0); + + if (g_atomic_int_exchange_and_add (&mail_msg->ref_count, -1) > 1) + return; - ++ #ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); @@ -5353,14 +5359,14 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + checkmem(mail_msg->priv); #endif d(printf("Free message %p\n", msg)); - + - if (m->ops->destroy_msg) - m->ops->destroy_msg(m); + if (mail_msg->info->free) + mail_msg->info->free(mail_msg); - + MAIL_MT_LOCK(mail_msg_lock); - + #ifdef LOG_OPS - if (log_ops) - fprintf(log, "%p: Free (exception `%s')\n", msg, @@ -5379,7 +5385,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + g_hash_table_remove ( + mail_msg_active_table, GINT_TO_POINTER (mail_msg->seq)); + pthread_cond_broadcast (&mail_msg_cond); - + /* We need to make sure we dont lose a reference here YUCK YUCK */ /* This is tightly integrated with the code in do_op_status, as it closely relates to the CamelOperation setup in msg_new() above */ @@ -5393,11 +5399,16 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail return; } else { - activity_id = m->priv->activity_id; +- error = m->priv->error; + activity_id = mail_msg->priv->activity_id; - } - ++ error = mail_msg->priv->error; + if (error && !activity_id) { + e_activity_handler_make_error (mail_component_peek_activity_handler (mail_component_peek ()), "mail", + g_object_get_data ((GObject *) error, "primary"), error); +@@ -238,19 +269,13 @@ void mail_msg_free(void *msg) + MAIL_MT_UNLOCK(mail_msg_lock); - + - if (m->cancel) { - camel_operation_mute(m->cancel); - camel_operation_unref(m->cancel); @@ -5408,21 +5419,21 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - g_free(m->priv); - g_free(m); + mail_msg_free (mail_msg); - + if (activity_id != 0) - mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, -- NULL, GINT_TO_POINTER (activity_id), NULL); +- NULL, GINT_TO_POINTER (activity_id), error); + mail_async_event_emit ( + mail_async_event, MAIL_ASYNC_GUI, + (MailAsyncFunc) end_event_callback, -+ NULL, GINT_TO_POINTER (activity_id), NULL); ++ NULL, GINT_TO_POINTER (activity_id), error); } - + /* hash table of ops->dialogue of active errors */ -@@ -244,9 +278,10 @@ static void error_response(GtkObject *o, +@@ -266,9 +291,10 @@ static void error_response(GtkObject *o, gtk_widget_destroy((GtkWidget *)o); } - + -void mail_msg_check_error(void *msg) +void +mail_msg_check_error (gpointer msg) @@ -5431,8 +5442,8 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + MailMsg *m = msg; char *what; GtkDialog *gd; - -@@ -271,27 +306,27 @@ void mail_msg_check_error(void *msg) + +@@ -293,21 +319,21 @@ void mail_msg_check_error(void *msg) /* check to see if we have dialogue already running for this operation */ /* we key on the operation pointer, which is at least accurate enough for the operation type, although it could be on a different object. */ @@ -5441,7 +5452,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail g_warning("Error occurred while existing dialogue active:\n%s", camel_exception_get_description(&m->ex)); return; } - + - if (m->ops->describe_msg - && (what = m->ops->describe_msg(m, FALSE))) { + if (m->info->desc @@ -5450,26 +5461,28 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail g_free(what); } else gd = (GtkDialog *)e_error_new(NULL, "mail:async-error-nodescribe", camel_exception_get_description(&m->ex), NULL); - + - g_hash_table_insert(active_errors, m->ops, gd); - g_signal_connect(gd, "response", G_CALLBACK(error_response), m->ops); - g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->ops); + g_hash_table_insert(active_errors, m->info, gd); + g_signal_connect(gd, "response", G_CALLBACK(error_response), m->info); + g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->info); - gtk_widget_show((GtkWidget *)gd); - } - + if (m->priv->cancelable) + m->priv->error = (GtkWidget *) gd; + else +@@ -316,7 +342,7 @@ void mail_msg_check_error(void *msg) + void mail_msg_cancel(unsigned int msgid) { - struct _mail_msg *m; + MailMsg *m; - + MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); -@@ -304,13 +339,12 @@ void mail_msg_cancel(unsigned int msgid) - - +@@ -329,13 +355,12 @@ void mail_msg_cancel(unsigned int msgid) + + /* waits for a message to be finished processing (freed) - the messageid is from struct _mail_msg->seq */ + the messageid is from MailMsg->seq */ @@ -5478,14 +5491,14 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - struct _mail_msg *m; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); + MailMsg *m; - + - if (ismain) { + if (mail_in_main_thread ()) { MAIL_MT_LOCK(mail_msg_lock); m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); while (m) { -@@ -347,9 +381,7 @@ int mail_msg_active(unsigned int msgid) - +@@ -372,9 +397,7 @@ int mail_msg_active(unsigned int msgid) + void mail_msg_wait_all(void) { - int ismain = pthread_equal(pthread_self(), mail_gui_thread); @@ -5495,70 +5508,81 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail MAIL_MT_LOCK(mail_msg_lock); while (g_hash_table_size(mail_msg_active_table) > 0) { MAIL_MT_UNLOCK(mail_msg_lock); -@@ -367,294 +399,239 @@ void mail_msg_wait_all(void) +@@ -392,294 +415,247 @@ void mail_msg_wait_all(void) } - + /* **************************************** */ -struct _cancel_hook_data { - struct _cancel_hook_data *next; - struct _cancel_hook_data *prev; - +- - GDestroyNotify func; - void *data; -}; -+static GHookList cancel_hook_list; - + -static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); -- ++static GHookList cancel_hook_list; + -void *mail_cancel_hook_add(GDestroyNotify func, void *data) +GHook * +mail_cancel_hook_add (GHookFunc func, gpointer data) { - struct _cancel_hook_data *d; + GHook *hook; - + - d = g_malloc0(sizeof(*d)); - d->func = func; - d->data = data; + MAIL_MT_LOCK (mail_msg_lock); - + - MAIL_MT_LOCK(mail_msg_lock); - e_dlist_addtail(&cancel_hook_list, (EDListNode *)d); - MAIL_MT_UNLOCK(mail_msg_lock); + if (!cancel_hook_list.is_setup) + g_hook_list_init (&cancel_hook_list, sizeof (GHook)); - + - return (void *)d; --} + hook = g_hook_alloc (&cancel_hook_list); + hook->func = func; + hook->data = data; - --void mail_cancel_hook_remove(void *handle) --{ -- struct _cancel_hook_data *d = handle; ++ + g_hook_append (&cancel_hook_list, hook); - -- MAIL_MT_LOCK(mail_msg_lock); -- e_dlist_remove((EDListNode *)d); -- MAIL_MT_UNLOCK(mail_msg_lock); -- g_free(d); ++ + MAIL_MT_UNLOCK (mail_msg_lock); + + return hook; } - --void mail_cancel_all(void) + +-void mail_cancel_hook_remove(void *handle) +void +mail_cancel_hook_remove (GHook *hook) { -- struct _cancel_hook_data *d, *n; +- struct _cancel_hook_data *d = handle; + MAIL_MT_LOCK (mail_msg_lock); - -- camel_operation_cancel(NULL); + +- MAIL_MT_LOCK(mail_msg_lock); +- e_dlist_remove((EDListNode *)d); +- MAIL_MT_UNLOCK(mail_msg_lock); +- g_free(d); + g_assert (cancel_hook_list.is_setup); + g_hook_destroy_link (&cancel_hook_list, hook); - ++ ++ MAIL_MT_UNLOCK (mail_msg_lock); + } + +-void mail_cancel_all(void) ++void ++mail_cancel_all (void) + { +- struct _cancel_hook_data *d, *n; ++ camel_operation_cancel (NULL); ++ ++ MAIL_MT_LOCK (mail_msg_lock); + +- camel_operation_cancel(NULL); ++ if (cancel_hook_list.is_setup) ++ g_hook_list_invoke (&cancel_hook_list, FALSE); + - /* I can ssee a deadlock coming on ... */ - MAIL_MT_LOCK(mail_msg_lock); - d = (struct _cancel_hook_data *)cancel_hook_list.head; @@ -5571,7 +5595,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - MAIL_MT_UNLOCK(mail_msg_lock); + MAIL_MT_UNLOCK (mail_msg_lock); } - + -EMsgPort *mail_gui_port; -static GIOChannel *mail_gui_channel; -static guint mail_gui_watch; @@ -5597,17 +5621,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail -EThread * -mail_win32_get_mail_thread_queued (void) +void -+mail_cancel_all (void) ++mail_msg_set_cancelable (gpointer msg, gboolean status) { - return mail_thread_queued; -+ camel_operation_cancel (NULL); ++ MailMsg *mail_msg = msg; + -+ MAIL_MT_LOCK (mail_msg_lock); -+ -+ if (cancel_hook_list.is_setup) -+ g_hook_list_invoke (&cancel_hook_list, FALSE); -+ -+ MAIL_MT_UNLOCK (mail_msg_lock); ++ mail_msg->priv->cancelable = status; } -#endif + @@ -5616,7 +5635,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail +static GAsyncQueue *main_loop_queue = NULL; +static GAsyncQueue *msg_reply_queue = NULL; +static GThread *main_thread = NULL; - + static gboolean -mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) +mail_msg_idle_cb (void) @@ -5624,11 +5643,11 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; + MailMsg *msg; - + - while (( m = (mail_msg_t *)e_msgport_get(port))) { + g_assert (main_loop_queue != NULL); + g_assert (msg_reply_queue != NULL); - + -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); @@ -5665,11 +5684,11 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + mail_msg_check_error (msg); + mail_msg_unref (msg); } - + - return TRUE; + return FALSE; } - + -static gboolean -mail_msgport_received(GIOChannel *source, GIOCondition cond, void *d) +static void @@ -5720,7 +5739,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + msg->cancel = NULL; + MAIL_MT_UNLOCK (mail_msg_lock); } - + - return TRUE; + g_async_queue_push (msg_reply_queue, msg); + @@ -5730,7 +5749,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (GSourceFunc) mail_msg_idle_cb, NULL); + G_UNLOCK (idle_source_id); } - + -/* Test code, lighterwight, more configurable calls */ -static gboolean -mail_msgport_received2(GIOChannel *source, GIOCondition cond, void *d) @@ -5740,7 +5759,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - EMsgPort *port = (EMsgPort *)d; - mail_msg_t *m; + mail_msg_wait_all(); - + - while (( m = (mail_msg_t *)e_msgport_get(port))) { -#ifdef LOG_OPS - if (log_ops) @@ -5749,7 +5768,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + G_LOCK (idle_source_id); + if (idle_source_id != 0) { + GSource *source; - + - if (m->ops->receive_msg) - m->ops->receive_msg(m); - else @@ -5762,18 +5781,18 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + idle_source_id = 0; } + G_UNLOCK (idle_source_id); - + - return TRUE; -} + g_assert (main_loop_queue != NULL); + g_async_queue_unref (main_loop_queue); + main_loop_queue = NULL; - + + g_assert (msg_reply_queue != NULL); + g_async_queue_unref (msg_reply_queue); + msg_reply_queue = NULL; +} - + -static void -mail_msg_destroy(EThread *e, EMsg *msg, void *data) +void @@ -5782,7 +5801,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - mail_msg_t *m = (mail_msg_t *)msg; + main_loop_queue = g_async_queue_new (); + msg_reply_queue = g_async_queue_new (); - + -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); @@ -5790,38 +5809,38 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail -#endif + mail_msg_active_table = g_hash_table_new (NULL, NULL); + main_thread = g_thread_self (); - + - mail_msg_free(m); + mail_async_event = mail_async_event_new (); } - + -static void -mail_msg_received(EThread *e, EMsg *msg, void *data) +static gint +mail_msg_compare (const MailMsg *msg1, const MailMsg *msg2) { - mail_msg_t *m = (mail_msg_t *)msg; -+ gint priority1 = msg1->priority; -+ gint priority2 = msg2->priority; - +- -#ifdef MALLOC_CHECK - checkmem(m); - checkmem(m->cancel); - checkmem(m->priv); -#endif -+ if (priority1 == priority2) -+ return 0; - ++ gint priority1 = msg1->priority; ++ gint priority2 = msg2->priority; + - if (m->ops->describe_msg) { - char *text = m->ops->describe_msg(m, FALSE); -- ++ if (priority1 == priority2) ++ return 0; + -#ifdef LOG_OPS - if (log_ops) - fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x: '%s'\n", m, e_util_pthread_id(pthread_self()), text); -#endif + return (priority1 < priority2) ? 1 : -1; +} - + - d(printf("message received at thread\n")); - camel_operation_register(m->cancel); - camel_operation_start(m->cancel, "%s", text); @@ -5837,7 +5856,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail +{ + GThreadPool *thread_pool; + gint max_threads = GPOINTER_TO_INT (data); - + - if (m->ops->receive_msg) { - mail_enable_stop(); - m->ops->receive_msg(m); @@ -5848,7 +5867,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (GFunc) mail_msg_proxy, NULL, max_threads, FALSE, NULL); + g_thread_pool_set_sort_function ( + thread_pool, (GCompareDataFunc) mail_msg_compare, NULL); - + - if (m->ops->describe_msg) { - camel_operation_end(m->cancel); - camel_operation_unregister(m->cancel); @@ -5859,7 +5878,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - } + return thread_pool; } - + -void mail_msg_cleanup(void) +void +mail_msg_main_loop_push (gpointer msg) @@ -5867,7 +5886,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - mail_msg_wait_all(); + g_async_queue_push_sorted (main_loop_queue, msg, + (GCompareDataFunc) mail_msg_compare, NULL); - + - e_thread_destroy(mail_thread_queued_slow); - e_thread_destroy(mail_thread_queued); - e_thread_destroy(mail_thread_new); @@ -5877,21 +5896,21 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (GSourceFunc) mail_msg_idle_cb, NULL); + G_UNLOCK (idle_source_id); +} - -- g_io_channel_unref(mail_gui_channel); -- g_io_channel_unref(mail_gui_reply_channel); ++ +void +mail_msg_unordered_push (gpointer msg) +{ + static GOnce once = G_ONCE_INIT; -+ + +- g_io_channel_unref(mail_gui_channel); +- g_io_channel_unref(mail_gui_reply_channel); + g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); - + - e_msgport_destroy(mail_gui_port); - e_msgport_destroy(mail_gui_reply_port); + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); } - + -static guint -em_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) +void @@ -5900,7 +5919,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - GSource *source; - guint id; + static GOnce once = G_ONCE_INIT; - + - *port = e_msgport_new(); -#ifndef G_OS_WIN32 - *channel = g_io_channel_unix_new(e_msgport_fd(*port)); @@ -5913,11 +5932,11 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - id = g_source_attach(source, NULL); - g_source_unref(source); + g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - + - return id; + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); } - + -void mail_msg_init(void) +void +mail_msg_slow_ordered_push (gpointer msg) @@ -5942,35 +5961,35 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); - e_thread_set_queue_limit(mail_thread_new, 10); + static GOnce once = G_ONCE_INIT; - + - mail_msg_active_table = g_hash_table_new(NULL, NULL); - mail_gui_thread = pthread_self(); + g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); + + g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); +} - + - mail_async_event = mail_async_event_new(); +gboolean +mail_in_main_thread (void) +{ + return (g_thread_self () == main_thread); } - + /* ********************************************************************** */ -@@ -665,7 +642,8 @@ static pthread_mutex_t status_lock = PTH +@@ -690,7 +666,8 @@ static pthread_mutex_t status_lock = PTH /* ********************************************************************** */ - + struct _proxy_msg { - struct _mail_msg msg; + MailMsg base; + MailAsyncEvent *ea; mail_async_event_t type; - -@@ -679,10 +657,8 @@ struct _proxy_msg { + +@@ -704,10 +681,8 @@ struct _proxy_msg { }; - + static void -do_async_event(struct _mail_msg *mm) +do_async_event(struct _proxy_msg *m) @@ -5980,16 +5999,16 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail m->thread = pthread_self(); m->have_thread = TRUE; m->func(m->o, m->event_data, m->data); -@@ -697,16 +673,17 @@ static int +@@ -722,16 +697,17 @@ static int idle_async_event(void *mm) { do_async_event(mm); - mail_msg_free(mm); + mail_msg_unref(mm); - + return FALSE; } - + -static struct _mail_msg_op async_event_op = { - NULL, - do_async_event, @@ -6002,30 +6021,30 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) NULL }; - + MailAsyncEvent *mail_async_event_new(void) -@@ -723,10 +700,9 @@ int mail_async_event_emit(MailAsyncEvent +@@ -748,10 +724,9 @@ int mail_async_event_emit(MailAsyncEvent { struct _proxy_msg *m; int id; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); - + /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ - m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); + m = mail_msg_new(&async_event_info); m->func = func; m->o = o; m->event_data = event_data; -@@ -735,7 +711,7 @@ int mail_async_event_emit(MailAsyncEvent +@@ -760,7 +735,7 @@ int mail_async_event_emit(MailAsyncEvent m->type = type; m->have_thread = FALSE; - + - id = m->msg.seq; + id = m->base.seq; g_mutex_lock(ea->lock); ea->tasks = g_slist_prepend(ea->tasks, m); g_mutex_unlock(ea->lock); -@@ -743,12 +719,12 @@ int mail_async_event_emit(MailAsyncEvent +@@ -768,12 +743,12 @@ int mail_async_event_emit(MailAsyncEvent /* We use an idle function instead of our own message port only because the gui message ports's notification buffer might overflow and deadlock us */ if (type == MAIL_ASYNC_GUI) { @@ -6038,10 +6057,10 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail } else - e_thread_put(mail_thread_queued, (EMsg *)m); + mail_msg_fast_ordered_push (m); - + return id; } -@@ -762,7 +738,7 @@ int mail_async_event_destroy(MailAsyncEv +@@ -787,7 +762,7 @@ int mail_async_event_destroy(MailAsyncEv g_mutex_lock(ea->lock); while (ea->tasks) { m = ea->tasks->data; @@ -6050,9 +6069,9 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail if (m->have_thread && pthread_equal(m->thread, thread)) { g_warning("Destroying async event from inside an event, returning EDEADLK"); g_mutex_unlock(ea->lock); -@@ -784,17 +760,18 @@ int mail_async_event_destroy(MailAsyncEv +@@ -809,17 +784,18 @@ int mail_async_event_destroy(MailAsyncEv /* ********************************************************************** */ - + struct _call_msg { - struct _mail_msg msg; + MailMsg base; @@ -6063,7 +6082,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail va_list ap; + EFlag *done; }; - + static void -do_call(struct _mail_msg *mm) +do_call(struct _call_msg *m) @@ -6072,7 +6091,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail void *p1, *p2, *p3, *p4, *p5; int i1; va_list ap; -@@ -842,45 +819,47 @@ do_call(struct _mail_msg *mm) +@@ -867,45 +843,47 @@ do_call(struct _mail_msg *mm) m->ret = m->func(p1, p2, i1, p3, p4, p5); break; } @@ -6080,7 +6099,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + if (m->done != NULL) + e_flag_set (m->done); } - + -static struct _mail_msg_op mail_call_op = { - NULL, - do_call, @@ -6093,7 +6112,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) NULL }; - + -void *mail_call_main(mail_call_t type, MailMainFunc func, ...) +void * +mail_call_main (mail_call_t type, MailMainFunc func, ...) @@ -6103,9 +6122,9 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail va_list ap; - EMsgPort *reply = NULL; - int ismain = pthread_equal(pthread_self(), mail_gui_thread); - + va_start(ap, func); - + - if (!ismain) - reply = e_msgport_new(); - @@ -6114,7 +6133,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail m->type = type; m->func = func; G_VA_COPY(m->ap, ap); - + - if (!ismain) { - e_msgport_put(mail_gui_port, (EMsg *)m); - e_msgport_wait(reply); @@ -6130,26 +6149,26 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + e_flag_wait (m->done); + e_flag_free (m->done); } - + va_end(ap); - + ret = m->ret; - mail_msg_free(m); + mail_msg_unref (m); - + return ret; } -@@ -889,40 +868,42 @@ void *mail_call_main(mail_call_t type, M +@@ -914,40 +892,42 @@ void *mail_call_main(mail_call_t type, M /* locked via status_lock */ static int busy_state; - + -static void do_set_busy(struct _mail_msg *mm) +static void +do_set_busy(MailMsg *mm) { set_stop(busy_state > 0); } - + -static struct _mail_msg_op set_busy_op = { - NULL, - do_set_busy, @@ -6162,12 +6181,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) NULL }; - + void mail_enable_stop(void) { - struct _mail_msg *m; + MailMsg *m; - + MAIL_MT_LOCK(status_lock); busy_state++; if (busy_state == 1) { @@ -6178,12 +6197,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail } MAIL_MT_UNLOCK(status_lock); } - + void mail_disable_stop(void) { - struct _mail_msg *m; + MailMsg *m; - + MAIL_MT_LOCK(status_lock); busy_state--; if (busy_state == 0) { @@ -6194,19 +6213,19 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail } MAIL_MT_UNLOCK(status_lock); } -@@ -930,7 +911,7 @@ void mail_disable_stop(void) +@@ -961,7 +941,7 @@ operation_cancel (CamelOperation *p) /* ******************************************************************************** */ - + struct _op_status_msg { - struct _mail_msg msg; + MailMsg base; - + struct _CamelOperation *op; char *what; -@@ -938,16 +919,16 @@ struct _op_status_msg { +@@ -969,16 +949,16 @@ struct _op_status_msg { void *data; }; - + -static void do_op_status(struct _mail_msg *mm) +static void +op_status_exec (struct _op_status_msg *m) @@ -6219,15 +6238,15 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + MailMsgPrivate *data; char *out, *p, *o, c; int pc; - + - g_return_if_fail (pthread_equal(mail_gui_thread, pthread_self ())); + g_return_if_fail (mail_in_main_thread ()); - + MAIL_MT_LOCK (mail_msg_lock); - -@@ -986,8 +967,8 @@ static void do_op_status(struct _mail_ms + +@@ -1017,8 +997,8 @@ static void do_op_status(struct _mail_ms progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); - + MAIL_MT_UNLOCK (mail_msg_lock); - if (msg->ops->describe_msg) - what = msg->ops->describe_msg (msg, FALSE); @@ -6236,9 +6255,9 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail else if (m->what) what = g_strdup (m->what); /* uncommenting because message is not very useful for a user, see bug 271734*/ -@@ -1004,13 +985,7 @@ static void do_op_status(struct _mail_ms +@@ -1034,13 +1014,7 @@ static void do_op_status(struct _mail_ms int activity_id = data->activity_id; - + MAIL_MT_UNLOCK (mail_msg_lock); - if (msg->cancel) { - camel_operation_mute (msg->cancel); @@ -6248,12 +6267,12 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - g_free (msg->priv); - g_free (msg); + mail_msg_free (msg); - + if (activity_id != 0) mail_async_event_emit (mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, -@@ -1030,18 +1005,17 @@ static void do_op_status(struct _mail_ms +@@ -1060,18 +1034,17 @@ static void do_op_status(struct _mail_ms } - + static void -do_op_status_free (struct _mail_msg *mm) +op_status_free (struct _op_status_msg *m) @@ -6262,7 +6281,7 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail - g_free (m->what); } - + -static struct _mail_msg_op op_status_op = { - NULL, - do_op_status, @@ -6275,39 +6294,39 @@ diff -up evolution-2.21.1/mail/mail-mt.c.kill-ethread evolution-2.21.1/mail/mail + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) op_status_free }; - + static void -@@ -1051,7 +1025,7 @@ mail_operation_status (struct _CamelOper - +@@ -1081,7 +1054,7 @@ mail_operation_status (struct _CamelOper + d(printf("got operation statys: %s %d%%\n", what, pc)); - + - m = mail_msg_new(&op_status_op, NULL, sizeof(*m)); + m = mail_msg_new(&op_status_info); m->op = op; m->what = g_strdup(what); switch (pc) { -@@ -1064,7 +1038,7 @@ mail_operation_status (struct _CamelOper +@@ -1094,7 +1067,7 @@ mail_operation_status (struct _CamelOper } m->pc = pc; m->data = data; - e_msgport_put(mail_gui_port, (EMsg *)m); + mail_msg_main_loop_push(m); } - + /* ******************** */ -diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c ---- evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-10-23 06:06:00.000000000 -0400 -+++ evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-10-29 14:47:20.000000000 -0400 -@@ -44,32 +44,30 @@ void org_gnome_mail_folder_unsubscribe ( - - +diff -up evolution-2.21.4/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread evolution-2.21.4/plugins/folder-unsubscribe/folder-unsubscribe.c +--- evolution-2.21.4/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 ++++ evolution-2.21.4/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-12-17 12:33:07.000000000 -0500 +@@ -44,56 +44,53 @@ void org_gnome_mail_folder_unsubscribe ( + + struct _folder_unsub_t { - struct _mail_msg msg; + MailMsg base; - + char *uri; }; - + -static char * -folder_unsubscribe__desc (struct _mail_msg *mm, int done) +static gchar * @@ -6319,7 +6338,7 @@ diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-e + return g_strdup_printf ( + _("Unsubscribing from folder \"%s\""), msg->uri); } - + static void -folder_unsubscribe__unsub (struct _mail_msg *mm) +folder_unsubscribe_exec (struct _folder_unsub_t *msg) @@ -6329,19 +6348,25 @@ diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-e const char *path = NULL; CamelStore *store; CamelURL *url; - + - if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex))) -+ if (!(store = camel_session_get_store (session, msg->uri, &mm->ex))) ++ if (!(store = camel_session_get_store (session, msg->uri, &msg->base.ex))) return; - + - url = camel_url_new (unsub->uri, NULL); + url = camel_url_new (msg->uri, NULL); if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) path = url->fragment; else if (url->path && url->path[0]) -@@ -82,18 +80,17 @@ folder_unsubscribe__unsub (struct _mail_ + path = url->path + 1; + + if (path != NULL) +- camel_store_unsubscribe_folder (store, path, &mm->ex); ++ camel_store_unsubscribe_folder (store, path, &msg->base.ex); + + camel_url_free (url); } - + static void -folder_unsubscribe__free (struct _mail_msg *mm) +folder_unsubscribe_free (struct _folder_unsub_t *msg) @@ -6351,7 +6376,7 @@ diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-e - g_free (unsub->uri); + g_free (msg->uri); } - + -static struct _mail_msg_op unsubscribe_op = { - folder_unsubscribe__desc, - folder_unsubscribe__unsub, @@ -6364,85 +6389,85 @@ diff -up evolution-2.21.1/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-e + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) folder_unsubscribe_free }; - - + + @@ -105,8 +102,8 @@ org_gnome_mail_folder_unsubscribe (EPlug if (target->uri == NULL) return; - + - unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); + unsub = mail_msg_new (&unsubscribe_info); unsub->uri = g_strdup (target->uri); - + - e_thread_put (mail_thread_new, (EMsg *) unsub); + mail_msg_unordered_push (unsub); } -diff -up evolution-2.21.1/plugins/mark-all-read/mark-all-read.c.kill-ethread evolution-2.21.1/plugins/mark-all-read/mark-all-read.c ---- evolution-2.21.1/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-10-23 06:06:03.000000000 -0400 -+++ evolution-2.21.1/plugins/mark-all-read/mark-all-read.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/plugins/mark-all-read/mark-all-read.c.kill-ethread evolution-2.21.4/plugins/mark-all-read/mark-all-read.c +--- evolution-2.21.4/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 ++++ evolution-2.21.4/plugins/mark-all-read/mark-all-read.c 2007-12-17 12:33:07.000000000 -0500 @@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM return; } - + - mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); + mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); } - + static void -diff -up evolution-2.21.1/plugins/exchange-operations/exchange-folder.c.kill-ethread evolution-2.21.1/plugins/exchange-operations/exchange-folder.c ---- evolution-2.21.1/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-10-23 06:06:03.000000000 -0400 -+++ evolution-2.21.1/plugins/exchange-operations/exchange-folder.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/plugins/exchange-operations/exchange-folder.c.kill-ethread evolution-2.21.4/plugins/exchange-operations/exchange-folder.c +--- evolution-2.21.4/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 ++++ evolution-2.21.4/plugins/exchange-operations/exchange-folder.c 2007-12-17 12:33:07.000000000 -0500 @@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr inbox_physical_uri = e_folder_get_physical_uri (inbox); - + /* To get the CamelStore/Folder */ - mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); + mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); - - + + } -diff -up evolution-2.21.1/plugins/save-attachments/save-attachments.c.kill-ethread evolution-2.21.1/plugins/save-attachments/save-attachments.c ---- evolution-2.21.1/plugins/save-attachments/save-attachments.c.kill-ethread 2007-10-23 06:06:07.000000000 -0400 -+++ evolution-2.21.1/plugins/save-attachments/save-attachments.c 2007-10-29 14:47:20.000000000 -0400 -@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin +diff -up evolution-2.21.4/plugins/save-attachments/save-attachments.c.kill-ethread evolution-2.21.4/plugins/save-attachments/save-attachments.c +--- evolution-2.21.4/plugins/save-attachments/save-attachments.c.kill-ethread 2007-11-29 23:24:03.000000000 -0500 ++++ evolution-2.21.4/plugins/save-attachments/save-attachments.c 2007-12-17 12:33:07.000000000 -0500 +@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin camel_object_ref(data->folder); data->uid = g_strdup(target->uids->pdata[0]); - + - mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); + mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); } -diff -up evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c ---- evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-10-23 06:06:05.000000000 -0400 -+++ evolution-2.21.1/plugins/mailing-list-actions/mailing-list-actions.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread evolution-2.21.4/plugins/mailing-list-actions/mailing-list-actions.c +--- evolution-2.21.4/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 ++++ evolution-2.21.4/plugins/mailing-list-actions/mailing-list-actions.c 2007-12-17 12:33:07.000000000 -0500 @@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM data->uri = strdup (sel->uri); - + mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), - emla_list_action_do, data, mail_thread_new); + emla_list_action_do, data, mail_msg_unordered_push); } - + void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) -diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread evolution-2.21.1/plugins/itip-formatter/itip-formatter.c ---- evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread 2007-10-23 06:06:07.000000000 -0400 -+++ evolution-2.21.1/plugins/itip-formatter/itip-formatter.c 2007-10-29 14:47:20.000000000 -0400 -@@ -1547,47 +1547,38 @@ extract_itip_data (FormatItipPObject *pi +diff -up evolution-2.21.4/plugins/itip-formatter/itip-formatter.c.kill-ethread evolution-2.21.4/plugins/itip-formatter/itip-formatter.c +--- evolution-2.21.4/plugins/itip-formatter/itip-formatter.c.kill-ethread 2007-12-14 09:26:42.000000000 -0500 ++++ evolution-2.21.4/plugins/itip-formatter/itip-formatter.c 2007-12-17 12:33:07.000000000 -0500 +@@ -1551,47 +1551,38 @@ extract_itip_data (FormatItipPObject *pi } - + struct _opencal_msg { - struct _mail_msg msg; + MailMsg base; - + char *command; /* command line to run */ }; - + static char * -open_calendar_desc (struct _mail_msg *mm, int done) +open_calendar__desc (struct _opencal_msg *m, gint complete) { return g_strdup (_("Opening calendar")); } - + static void -open_calendar_do (struct _mail_msg *mm) +open_calendar__exec (struct _opencal_msg *m) @@ -6453,7 +6478,7 @@ diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread e g_warning ("Could not launch %s", m->command); } } - + static void -open_calendar_done (struct _mail_msg *mm) -{ @@ -6469,7 +6494,7 @@ diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread e g_free (m->command); m->command = NULL; } - + -static struct _mail_msg_op open_calendar_op = { - open_calendar_desc, - open_calendar_do, @@ -6482,37 +6507,37 @@ diff -up evolution-2.21.1/plugins/itip-formatter/itip-formatter.c.kill-ethread e + (MailMsgDoneFunc) NULL, + (MailMsgFreeFunc) open_calendar__free, }; - + static gboolean -@@ -1596,10 +1587,10 @@ idle_open_cb (gpointer data) +@@ -1600,10 +1591,10 @@ idle_open_cb (gpointer data) FormatItipPObject *pitip = data; struct _opencal_msg *m; - + - m = mail_msg_new (&open_calendar_op, NULL, sizeof (*m)); + m = mail_msg_new (&open_calendar_info); m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"", isodate_from_time_t (pitip->start_time), isodate_from_time_t (pitip->end_time)); - e_thread_put (mail_thread_queued_slow, (EMsg *)m); + mail_msg_slow_ordered_push (m); - + return FALSE; } -diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill-ethread evolution-2.21.1/plugins/groupwise-features/share-folder-common.c ---- evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-10-23 06:06:01.000000000 -0400 -+++ evolution-2.21.1/plugins/groupwise-features/share-folder-common.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/plugins/groupwise-features/share-folder-common.c.kill-ethread evolution-2.21.4/plugins/groupwise-features/share-folder-common.c +--- evolution-2.21.4/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 ++++ evolution-2.21.4/plugins/groupwise-features/share-folder-common.c 2007-12-17 12:33:07.000000000 -0500 @@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi } - + struct _EMCreateFolder { - struct _mail_msg msg; + MailMsg base; - + /* input data */ CamelStore *store; @@ -137,31 +137,26 @@ struct _EMCreateFolder { void *user_data; }; - + -static char * -create_folder__desc (struct _mail_msg *mm, int done) +static gchar * @@ -6522,7 +6547,7 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); } - + static void -create_folder__create (struct _mail_msg *mm) +create_folder_exec (struct _EMCreateFolder *m) @@ -6530,7 +6555,7 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- - struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; - d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - + - if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { + if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { if (camel_store_supports_subscriptions (m->store)) @@ -6538,7 +6563,7 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- + camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); } } - + static void -create_folder__created (struct _mail_msg *mm) +create_folder_done (struct _EMCreateFolder *m) @@ -6549,7 +6574,7 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- EGwConnection *ccnc; @@ -180,10 +175,8 @@ create_folder__created (struct _mail_msg } - + static void -create_folder__free (struct _mail_msg *mm) +create_folder_free (struct _EMCreateFolder *m) @@ -6562,7 +6587,7 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- @@ -191,11 +184,12 @@ create_folder__free (struct _mail_msg *m g_free (m->name); } - + -static struct _mail_msg_op create_folder_op = { - create_folder__desc, - create_folder__create, @@ -6575,18 +6600,18 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- + (MailMsgDoneFunc) create_folder_done, + (MailMsgFreeFunc) create_folder_free }; - + static void -@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const +@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const parent = namebuf; } - + - m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); + m = mail_msg_new (&create_folder_info); camel_object_ref (store); m->store = store; m->full_name = g_strdup (full_name); -@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const +@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const m->user_data = (struct ShareInfo *) user_data; m->done = done; g_free (namebuf); @@ -6594,16 +6619,16 @@ diff -up evolution-2.21.1/plugins/groupwise-features/share-folder-common.c.kill- - e_thread_put (mail_thread_new, (EMsg *) m); + id = m->base.seq; + mail_msg_unordered_push (m); - + return id; } -diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h ---- evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-10-23 06:12:51.000000000 -0400 -+++ evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.h +--- evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-11-29 23:24:07.000000000 -0500 ++++ evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.h 2007-12-17 12:33:08.000000000 -0500 @@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo - + typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; - + -typedef struct _AlarmMsg AlarmMsg; -typedef struct _AlarmMsgPrivate AlarmMsgPrivate; - @@ -6619,34 +6644,34 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread - struct _AlarmNotify { BonoboObject object; - -diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c ---- evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-10-26 01:20:38.000000000 -0400 -+++ evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c 2007-10-29 14:47:20.000000000 -0400 + +diff -up evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.c +--- evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-11-29 23:24:07.000000000 -0500 ++++ evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.c 2007-12-17 12:33:08.000000000 -0500 @@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { GMutex *mutex; }; - + -EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ -EMsgPort *alarm_reply_port; -static GIOChannel *alarm_reply_channel; - #define d(x) x - + @@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object) g_mutex_free (priv->mutex); g_free (priv); - + - e_thread_destroy(alarm_operation_thread); - g_io_channel_unref(alarm_reply_channel); - e_msgport_destroy(alarm_reply_port); if (G_OBJECT_CLASS (parent_class)->finalize) (* G_OBJECT_CLASS (parent_class)->finalize) (object); } - + - + -static guint -alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) -{ @@ -6733,15 +6758,15 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread + ORBIT_THREAD_HINT_PER_REQUEST, NULL), + NULL); } - + static void -diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c ---- evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-10-26 01:20:38.000000000 -0400 -+++ evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c 2007-10-29 14:47:20.000000000 -0400 +diff -up evolution-2.21.4/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread evolution-2.21.4/calendar/gui/alarm-notify/alarm-queue.c +--- evolution-2.21.4/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-11-29 23:24:07.000000000 -0500 ++++ evolution-2.21.4/calendar/gui/alarm-notify/alarm-queue.c 2007-12-17 12:33:08.000000000 -0500 @@ -98,9 +98,6 @@ static int tray_blink_id = -1; static int tray_blink_state = FALSE; static AlarmNotify *an; - + -/* Main Tasks thread for dealing with the global structures */ -extern EThread *alarm_operation_thread; - @@ -6751,7 +6776,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e @@ -182,6 +179,40 @@ static void on_dialog_objs_removed_cb (E static void load_alarms_for_today (ClientAlarms *ca); static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); - + +/* Simple asynchronous message dispatcher */ + +typedef struct _Message Message; @@ -6791,12 +6816,12 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e */ @@ -220,47 +251,41 @@ add_client_alarms_cb (gpointer key, gpoi } - + struct _midnight_refresh_msg { + Message header; gboolean remove; }; - + /* Loads the alarms for the new day every midnight */ static void -midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) @@ -6805,10 +6830,10 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _midnight_refresh_msg *list = msg->data; - d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); - + /* Re-load the alarms for all clients */ g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); - + /* Re-schedule the midnight update */ - if (list->remove && midnight_refresh_id != NULL) { + if (msg->remove && midnight_refresh_id != NULL) { @@ -6816,12 +6841,12 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e alarm_remove (midnight_refresh_id); midnight_refresh_id = NULL; } - + queue_midnight_refresh (); + + g_slice_free (struct _midnight_refresh_msg, msg); } - + static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) { @@ -6834,18 +6859,18 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - - list = malloc (sizeof (struct _midnight_refresh_msg)); + struct _midnight_refresh_msg *msg; - + - list->remove = TRUE; - msg->data = list; + msg = g_slice_new (struct _midnight_refresh_msg); + msg->header.func = (MessageFunc) midnight_refresh_async; + msg->remove = TRUE; - + - d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + /* Looks up a client in the client alarms hash table */ @@ -658,6 +683,7 @@ remove_comp (ClientAlarms *ca, ECalCompo * alarms. @@ -6857,7 +6882,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e gpointer data; @@ -691,7 +717,7 @@ duplicate_ecal (GList *in_list) } - + static void -query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) +query_objects_changed_async (struct _query_msg *msg) @@ -6871,14 +6896,14 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _query_msg *list = msg->data; ECal *client; GList *objects; - + - client = list->client; - ca = list->data; - objects = list->objects; + client = msg->client; + ca = msg->data; + objects = msg->objects; - + from = config_data_get_last_notification_time (); if (from == -1) @@ -800,43 +825,38 @@ query_objects_changed_async (EThread *e, @@ -6888,14 +6913,13 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + + g_slice_free (struct _query_msg, msg); } - + static void query_objects_changed_cb (ECal *client, GList *objects, gpointer data) { - AlarmMsg *msg; - struct _query_msg *list; -+ struct _query_msg *msg; - +- - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = query_objects_changed_async; @@ -6904,7 +6928,8 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - list->objects = duplicate_ical (objects); - list->data = data; - msg->data = list; -- ++ struct _query_msg *msg; + - d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _query_msg); @@ -6912,10 +6937,10 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg->client = client; + msg->objects = duplicate_ical (objects); + msg->data = data; - + + message_push ((Message *) msg); } - + /* Called when a calendar component is removed; we must delete its corresponding * alarms. */ @@ -6928,24 +6953,24 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _query_msg *list = msg->data; ECal *client; GList *objects; - + - client = list->client; - ca = list->data; - objects = list->objects; + client = msg->client; + ca = msg->data; + objects = msg->objects; - + d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); - + @@ -849,27 +869,22 @@ query_objects_removed_async (EThread *e, } - + g_list_free (objects); + + g_slice_free (struct _query_msg, msg); } - + static void query_objects_removed_cb (ECal *client, GList *objects, gpointer data) { @@ -6962,7 +6987,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - list->data = data; - msg->data = list; + struct _query_msg *msg; - + - d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _query_msg); @@ -6970,14 +6995,14 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg->client = client; + msg->objects = duplicate_ecal (objects); + msg->data = data; - + + message_push ((Message *) msg); } - + @@ -1011,20 +1026,19 @@ free_tray_icon_data (TrayIconData *tray_ } - + static void -on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) +on_dialog_objs_removed_async (struct _query_msg *msg) @@ -6988,16 +7013,16 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _query_msg *list = msg->data; ECal *client; GList *objects; - + d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); - + - client = list->client; - tray_data = list->data; - objects = list->objects; + client = msg->client; + tray_data = msg->data; + objects = msg->objects; - + e_cal_component_get_uid (tray_data->comp, &our_uid); g_return_if_fail (our_uid && *our_uid); @@ -1042,37 +1056,33 @@ on_dialog_objs_removed_async (EThread *e @@ -7007,14 +7032,14 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + + g_slice_free (struct _query_msg, msg); } - + static void on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) { - AlarmMsg *msg; - struct _query_msg *list; + struct _query_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = on_dialog_objs_removed_async; @@ -7029,17 +7054,17 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg->client = client; + msg->objects = objects; + msg->data = data; - + - d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + struct _tray_cqa_msg { + Message header; CompQueuedAlarms *cqa; }; - + static void -tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) +tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) @@ -7048,7 +7073,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - CompQueuedAlarms *cqa = tmsg->cqa; + CompQueuedAlarms *cqa = msg->cqa; GList *list = tray_icons_list; - + d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); @@ -1111,28 +1121,25 @@ tray_list_remove_cqa_async(EThread *e, A gtk_tree_selection_select_iter (sel, &iter); @@ -7057,7 +7082,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + + g_slice_free (struct _tray_cqa_msg, msg); } - + static void tray_list_remove_cqa (CompQueuedAlarms *cqa) { @@ -7075,19 +7100,19 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg = g_slice_new (struct _tray_cqa_msg); + msg->header.func = (MessageFunc) tray_list_remove_cqa_async; + msg->cqa = cqa; - + - d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + /* Callback used from the alarm notify dialog */ static void -tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) +tray_list_remove_async (Message *msg) { GList *list = tray_icons_list; - + @@ -1162,55 +1169,50 @@ tray_list_remove_async(EThread *e, Alarm } else list = list->next; @@ -7095,7 +7120,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + + g_slice_free (Message, msg); } - + static void tray_list_remove_icons (void) { @@ -7105,21 +7130,21 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = tray_list_remove_async; + Message *msg; - + - msg->data = NULL; + msg = g_slice_new (Message); + msg->func = tray_list_remove_async; - + - d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push (msg); } - + struct _tray_msg { + Message header; TrayIconData *data; }; - + static void -tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) +tray_list_remove_data_async (struct _tray_msg *msg) @@ -7127,16 +7152,16 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _tray_msg *tmsg = msg->data; - TrayIconData *tray_data = tmsg->data; + TrayIconData *tray_data = msg->data; - + d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); - + tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); free_tray_icon_data (tray_data); tray_data = NULL; + + g_slice_free (struct _tray_msg, msg); } - + static void tray_list_remove_data (TrayIconData *data) { @@ -7150,20 +7175,20 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - list->data = data; - msg->data = list; + struct _tray_msg *msg; -+ + +- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _tray_msg); + msg->header.func = (MessageFunc) tray_list_remove_data_async; + msg->data = data; - -- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); ++ + message_push ((Message *) msg); } - + static void -@@ -1417,29 +1419,24 @@ tray_icon_blink_cb (gpointer data) +@@ -1417,29 +1419,23 @@ tray_icon_blink_cb (gpointer data) /* Add a new data to tray list */ - + static void -tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) +tray_list_add_async (struct _tray_msg *msg) @@ -7171,19 +7196,18 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _tray_msg *list = msg->data; - d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); - tray_icons_list = g_list_prepend (tray_icons_list, list->data); -+ d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, msg->data)); + tray_icons_list = g_list_prepend (tray_icons_list, msg->data); + + g_slice_free (struct _tray_msg, msg); } - + static void tray_list_add_new (TrayIconData *data) { - AlarmMsg *msg; - struct _tray_msg *list; + struct _tray_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = tray_list_add_async; @@ -7191,52 +7215,51 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - list = malloc (sizeof (struct _tray_msg)); - list->data = data; - msg->data = list; -- -- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); + msg = g_slice_new (struct _tray_msg); + msg->header.func = (MessageFunc) tray_list_add_async; + msg->data = data; -+ + +- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); +- e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + /* Performs notification of a display alarm */ -@@ -1836,21 +1833,13 @@ check_midnight_refresh (gpointer user_da +@@ -1836,21 +1832,13 @@ check_midnight_refresh (gpointer user_da new_midnight = time_day_end_with_zone (time (NULL), zone); - + if (new_midnight > midnight) { - AlarmMsg *msg; - struct _midnight_refresh_msg *list; -- ++ struct _midnight_refresh_msg *msg; + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); -+ struct _midnight_refresh_msg *msg; - -- list->remove = FALSE; -- /* We dont need it. So set it to NULL */ -- msg->data = list; + msg = g_slice_new (struct _midnight_refresh_msg); + msg->header.func = (MessageFunc) midnight_refresh_async; + msg->remove = FALSE; - + +- list = malloc (sizeof (struct _midnight_refresh_msg)); +- +- list->remove = FALSE; +- /* We dont need it. So set it to NULL */ +- msg->data = list; +- - d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + return TRUE; -@@ -1981,14 +1970,15 @@ hash_ids (gpointer a) +@@ -1981,14 +1969,15 @@ hash_ids (gpointer a) } - + struct _alarm_client_msg { + Message header; ECal *client; }; - + -static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) +static void +alarm_queue_add_async (struct _alarm_client_msg *msg) @@ -7245,26 +7268,26 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _alarm_client_msg *list = msg->data; - ECal *client = list->client; + ECal *client = msg->client; - + g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2019,6 +2009,8 @@ static void alarm_queue_add_async (EThre +@@ -2019,6 +2008,8 @@ static void alarm_queue_add_async (EThre G_CALLBACK (cal_opened_cb), ca); } + + g_slice_free (struct _alarm_client_msg, msg); } - + /** -@@ -2038,20 +2030,13 @@ static void alarm_queue_add_async (EThre +@@ -2038,20 +2029,13 @@ static void alarm_queue_add_async (EThre void alarm_queue_add_client (ECal *client) { - AlarmMsg *msg; - struct _alarm_client_msg *list; + struct _alarm_client_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = alarm_queue_add_async; @@ -7276,14 +7299,14 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg = g_slice_new (struct _alarm_client_msg); + msg->header.func = (MessageFunc) alarm_queue_add_async; + msg->client = g_object_ref (client); - + - d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + /* Removes a component an its alarms */ -@@ -2103,11 +2088,10 @@ remove_client_alarms (ClientAlarms *ca) +@@ -2103,11 +2087,10 @@ remove_client_alarms (ClientAlarms *ca) * Removes a calendar client from the alarm queueing system. **/ static void @@ -7294,26 +7317,26 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - struct _alarm_client_msg *list = msg->data; - ECal *client = list->client; + ECal *client = msg->client; - + g_return_if_fail (alarm_queue_inited); g_return_if_fail (client != NULL); -@@ -2144,6 +2128,8 @@ alarm_queue_remove_async (EThread *e, Al +@@ -2144,6 +2127,8 @@ alarm_queue_remove_async (EThread *e, Al g_free (ca); - + g_hash_table_remove (client_alarms_hash, client); + + g_slice_free (struct _alarm_client_msg, msg); } - + /** alarm_queue_remove_client -@@ -2156,24 +2142,16 @@ alarm_queue_remove_async (EThread *e, Al +@@ -2156,24 +2141,16 @@ alarm_queue_remove_async (EThread *e, Al void alarm_queue_remove_client (ECal *client, gboolean immediately) { - AlarmMsg *msg; - struct _alarm_client_msg *list; + struct _alarm_client_msg *msg; - + - /* These two structures will be freed by the msg destroy function*/ - msg = malloc (sizeof (AlarmMsg)); - msg->receive_msg = alarm_queue_remove_async; @@ -7324,7 +7347,7 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e + msg = g_slice_new (struct _alarm_client_msg); + msg->header.func = (MessageFunc) alarm_queue_remove_async; + msg->client = client; - + - d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); if (immediately) { - alarm_queue_remove_async (NULL, msg, NULL); @@ -7335,5 +7358,5 @@ diff -up evolution-2.21.1/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread e - e_thread_put(alarm_operation_thread, (EMsg *)msg); + message_push ((Message *) msg); } - + /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution-2.9.3-view-attachment-uri.patch b/evolution-2.9.3-view-attachment-uri.patch deleted file mode 100644 index a506488..0000000 --- a/evolution-2.9.3-view-attachment-uri.patch +++ /dev/null @@ -1,46 +0,0 @@ ---- evolution-2.9.3/mail/mail-ops.c.view-attachment-uri 2006-12-06 10:26:24.000000000 -0500 -+++ evolution-2.9.3/mail/mail-ops.c 2006-12-06 11:16:46.000000000 -0500 -@@ -2089,21 +2089,23 @@ - save_part_save (struct _mail_msg *mm) - { - struct _save_part_msg *m = (struct _save_part_msg *)mm; -+ mode_t mode = S_IRUSR | S_IRGRP | S_IROTH; -+ int flags = O_WRONLY | O_CREAT | O_TRUNC; - CamelDataWrapper *content; - CamelStream *stream; -- -- if(!m->readonly){ -- if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { -- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, -- _("Cannot create output file: %s:\n %s"), -- m->path, g_strerror (errno)); -- return; -- } -- } else if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0444))) { -+ gchar *uri; -+ -+ uri = g_filename_to_uri (m->path, NULL, NULL); -+ -+ if (!m->readonly) -+ mode |= S_IWUSR; -+ -+ stream = camel_stream_vfs_new_with_uri (uri, flags, mode); -+ if (stream == NULL) { - camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, - _("Cannot create output file: %s:\n %s"), - m->path, g_strerror (errno)); -- return; -+ goto exit; - } - - content = camel_medium_get_content_object (CAMEL_MEDIUM (m->part)); -@@ -2115,6 +2117,9 @@ - g_strerror (errno)); - - camel_object_unref (stream); -+ -+exit: -+ g_free (uri); - } - - static void diff --git a/evolution.spec b/evolution.spec index ac69b5b..ca5674f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.21.3 +%define eds_version 2.21.4 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.21.3 -Release: 4%{?dist} +Version: 2.21.4 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -66,50 +66,42 @@ Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch # Fix for RH bug 164957 (was for 145552): Patch12: evolution-2.0.2-fix-145552.patch -# Part of RH bug 170799: -# XXX Revert this for Fedora 9 -#Patch13: evolution-2.4.1-hide-switcher-buttons-by-default.patch - # Patches for conduits, based upon # rh-161817-attach-116019-conduit_pilot_link_updates.diff # (the latter patch was originally by Mark G. Adams): -# Patch14: evolution-2.5.4-fix-conduits.patch +# Patch13: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) # This patch effects other parts of evolution.spec and so is necessary # for a successful build. -Patch15: evolution-2.5.4-fix-conduit-dir.patch +Patch14: evolution-2.5.4-fix-conduit-dir.patch # Remove gnome-common macros from configure.in. # We do not ship gnome-common (or at least we're not supposed to). -Patch16: evolution-2.7.1-no-gnome-common.patch +Patch15: evolution-2.7.1-no-gnome-common.patch -#Patch17: evolution-2.7.1-notification-cleanups.patch +#Patch16: evolution-2.7.1-notification-cleanups.patch # RH bug #166231 / GNOME bug #264485 -Patch20: evolution-2.7.3-replicated-cjk-input.patch +Patch17: evolution-2.7.3-replicated-cjk-input.patch # RH bug #178295 / GNOME bug #348638 -Patch21: evolution-2.7.4-deleting-preedit-buffer.patch +Patch18: evolution-2.7.4-deleting-preedit-buffer.patch # GNOME bug #362638 -Patch25: evolution-2.8.1-kill-ethread.patch +Patch19: evolution-2.8.1-kill-ethread.patch # GNOME bug #363695 -Patch26: evolution-2.9.1-kill-ememory.patch +Patch20: evolution-2.9.1-kill-ememory.patch # RH bug #176400 -Patch27: evolution-2.9.1-im-context-reset.patch - -# RH bug #216537 / GNOME bug #383047 -#Patch29: evolution-2.9.3-view-attachment-uri.patch +Patch21: evolution-2.9.1-im-context-reset.patch # RH bug #215478 / GNOME bug #383842 -Patch30: evolution-2.9.3-source-path-entry.patch +Patch22: evolution-2.9.3-source-path-entry.patch -# GNOME bug #376991 -# XXX Disabled due to outstanding issues. -#Patch33: evolution-2.10.0-e-passwords.patch +# GNOME bug #504030 +Patch23: evolution-2.21.4-too-noisy.patch ## Dependencies ### @@ -249,19 +241,17 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .commit-enter-on-calendar %patch12 -p1 -b .fix-164957 -#patch13 -p1 -b .hide-switcher-buttons-by-default -#patch14 -p1 -b .fix-conduits # leave commented -%patch15 -p1 -b .fix-conduit-dir -%patch16 -p1 -b .no-gnome-common -#patch17 -p1 -b .notification-cleanups -%patch20 -p1 -b .replicated-cjk-input -%patch21 -p1 -b .deleting-preedit-buffer -%patch25 -p1 -b .kill-ethread -%patch26 -p1 -b .kill-ememory -%patch27 -p1 -b .im-context-reset -#%patch29 -p1 -b .view-attachment-uri -%patch30 -p1 -b .source-path-entry -#%patch33 -p1 -b .e-passwords +#patch13 -p1 -b .fix-conduits # leave commented +%patch14 -p1 -b .fix-conduit-dir +%patch15 -p1 -b .no-gnome-common +#patch16 -p1 -b .notification-cleanups +%patch17 -p1 -b .replicated-cjk-input +%patch18 -p1 -b .deleting-preedit-buffer +%patch19 -p1 -b .kill-ethread +%patch20 -p1 -b .kill-ememory +%patch21 -p1 -b .im-context-reset +%patch22 -p1 -b .source-path-entry +%patch23 -p1 -b .too-noisy mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -694,6 +684,11 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Dec 17 2007 Matthew Barnes - 2.21.4-1.fc9 +- Update to 2.21.4 +- Expunge unused patches. +- Bump eds_version to 2.21.4 for new Camel functions. + * Mon Dec 10 2007 Matthew Barnes - 2.21.3-4.fc9 - Split junk filtering plugins into evolution-bogofilter and evolution-spamassassin subpackages, each of which requires the From ceb81d246006f8b071560398ef30260d4d9f9a05 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 18 Dec 2007 01:27:21 +0000 Subject: [PATCH 193/844] Fix a typo I made while updating the "kill-ethread" patch. --- evolution-2.8.1-kill-ethread.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch index 72c9513..b756a71 100644 --- a/evolution-2.8.1-kill-ethread.patch +++ b/evolution-2.8.1-kill-ethread.patch @@ -5287,7 +5287,7 @@ diff -up evolution-2.21.4/mail/mail-mt.c.kill-ethread evolution-2.21.4/mail/mail - -static void end_event_callback (CamelObject *o, void *event_data, void *error) +static void -+end_event_callback (CamelObject *o, void *event_data, void *data, void *error) ++end_event_callback (CamelObject *o, void *event_data, void *error) { - EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); + MailComponent *component; From ad53c7c436643407f6db90795e9b545bc00c4b72 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 18 Dec 2007 02:48:03 +0000 Subject: [PATCH 194/844] Commit sources. --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 271665a..846bf2a 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.3.tar.bz2 +evolution-2.21.4.tar.bz2 diff --git a/sources b/sources index 770cae4..525d802 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c8e4b72d503cc37ae9936dff06ae1d26 evolution-2.21.3.tar.bz2 +04f7d3aada64a21b6ee41ff4164f4246 evolution-2.21.4.tar.bz2 From aca4b000e7c0524b801bdaf491d83cf22b9b06eb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 6 Jan 2008 00:34:54 +0000 Subject: [PATCH 195/844] - Add patch for GNOME bug #507311 (send Bug Buddy reports to the new BugBuddyBugs Bugzilla component). --- evolution-2.21.4-bugzilla-component.patch | 12 ++++++++++++ evolution.spec | 10 +++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 evolution-2.21.4-bugzilla-component.patch diff --git a/evolution-2.21.4-bugzilla-component.patch b/evolution-2.21.4-bugzilla-component.patch new file mode 100644 index 0000000..020dd05 --- /dev/null +++ b/evolution-2.21.4-bugzilla-component.patch @@ -0,0 +1,12 @@ +diff -up evolution-2.21.4/data/evolution.desktop.in.in.bugzilla-component evolution-2.21.4/data/evolution.desktop.in.in +--- evolution-2.21.4/data/evolution.desktop.in.in.bugzilla-component 2008-01-05 18:39:45.000000000 -0500 ++++ evolution-2.21.4/data/evolution.desktop.in.in 2008-01-05 18:39:59.000000000 -0500 +@@ -11,7 +11,7 @@ Categories=GNOME;GTK;Office;Email;Calend + StartupNotify=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=Evolution +-X-GNOME-Bugzilla-Component=Miscellaneous ++X-GNOME-Bugzilla-Component=BugBuddyBugs + X-GNOME-Bugzilla-Version=@BASE_VERSION@.x + X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-@DATASERVER_EXEC_VERSION@;evolution-exchange-storage;evolution-alarm-notify; + diff --git a/evolution.spec b/evolution.spec index ca5674f..665c703 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -103,6 +103,9 @@ Patch22: evolution-2.9.3-source-path-entry.patch # GNOME bug #504030 Patch23: evolution-2.21.4-too-noisy.patch +# GNOME bug #507311 +Patch24: evolution-2.21.4-bugzilla-component.patch + ## Dependencies ### Requires(post): GConf2 @@ -252,6 +255,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch21 -p1 -b .im-context-reset %patch22 -p1 -b .source-path-entry %patch23 -p1 -b .too-noisy +%patch24 -p1 -b .bugzilla-component mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -684,6 +688,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Sat Jun 05 2008 Matthew Barnes - 2.21.4-2.fc9 +- Add patch for GNOME bug #507311 (send Bug Buddy reports to the new + BugBuddyBugs Bugzilla component). + * Mon Dec 17 2007 Matthew Barnes - 2.21.4-1.fc9 - Update to 2.21.4 - Expunge unused patches. From 1fe0c31d20d559a0701fe7ffe29cad1aba079069 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 Jan 2008 23:16:30 +0000 Subject: [PATCH 196/844] - Update to 2.21.5 - The backup-restore plugin is stable again. - Remove patch for RH bug #154360 (fixed upstream). - Remove patch for RH bug #166231 (obsolete, possibly fixed upstream). - Remove patch for RH bug #178295 (fixed upstream). - Remove patch for GNOME bug #362638 (fixed upstream). - Remove patch for GNOME bug #504030 (fixed upstream). - Remove patch for GNOME bug #507311 (fixed upstream). --- .cvsignore | 2 +- evolution-2.21.4-bugzilla-component.patch | 12 - evolution-2.21.4-too-noisy.patch | 12 - ...ion-2.5.5.1-commit-enter-on-calendar.patch | 242 - evolution-2.7.3-replicated-cjk-input.patch | 22 - evolution-2.7.4-deleting-preedit-buffer.patch | 110 - evolution-2.8.1-kill-ethread.patch | 7362 ----------------- evolution.spec | 80 +- sources | 2 +- 9 files changed, 36 insertions(+), 7808 deletions(-) delete mode 100644 evolution-2.21.4-bugzilla-component.patch delete mode 100644 evolution-2.21.4-too-noisy.patch delete mode 100644 evolution-2.5.5.1-commit-enter-on-calendar.patch delete mode 100644 evolution-2.7.3-replicated-cjk-input.patch delete mode 100644 evolution-2.7.4-deleting-preedit-buffer.patch delete mode 100644 evolution-2.8.1-kill-ethread.patch diff --git a/.cvsignore b/.cvsignore index 846bf2a..1d94c86 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.4.tar.bz2 +evolution-2.21.5.tar.bz2 diff --git a/evolution-2.21.4-bugzilla-component.patch b/evolution-2.21.4-bugzilla-component.patch deleted file mode 100644 index 020dd05..0000000 --- a/evolution-2.21.4-bugzilla-component.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-2.21.4/data/evolution.desktop.in.in.bugzilla-component evolution-2.21.4/data/evolution.desktop.in.in ---- evolution-2.21.4/data/evolution.desktop.in.in.bugzilla-component 2008-01-05 18:39:45.000000000 -0500 -+++ evolution-2.21.4/data/evolution.desktop.in.in 2008-01-05 18:39:59.000000000 -0500 -@@ -11,7 +11,7 @@ Categories=GNOME;GTK;Office;Email;Calend - StartupNotify=true - X-GNOME-Bugzilla-Bugzilla=GNOME - X-GNOME-Bugzilla-Product=Evolution --X-GNOME-Bugzilla-Component=Miscellaneous -+X-GNOME-Bugzilla-Component=BugBuddyBugs - X-GNOME-Bugzilla-Version=@BASE_VERSION@.x - X-GNOME-Bugzilla-OtherBinaries=evolution-data-server-@DATASERVER_EXEC_VERSION@;evolution-exchange-storage;evolution-alarm-notify; - diff --git a/evolution-2.21.4-too-noisy.patch b/evolution-2.21.4-too-noisy.patch deleted file mode 100644 index 379e6ff..0000000 --- a/evolution-2.21.4-too-noisy.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-2.21.4/plugins/mail-notification/mail-notification.c.too-noisy evolution-2.21.4/plugins/mail-notification/mail-notification.c ---- evolution-2.21.4/plugins/mail-notification/mail-notification.c.too-noisy 2007-12-15 10:58:55.000000000 -0500 -+++ evolution-2.21.4/plugins/mail-notification/mail-notification.c 2007-12-17 12:41:26.000000000 -0500 -@@ -581,7 +581,7 @@ static void - new_notify_sound (EMEventTargetFolder *t) - { - time_t last_newmail; -- struct _SoundNotifyData data = {0, 0}; -+ static struct _SoundNotifyData data = {0, 0}; - - time (&last_newmail); - diff --git a/evolution-2.5.5.1-commit-enter-on-calendar.patch b/evolution-2.5.5.1-commit-enter-on-calendar.patch deleted file mode 100644 index 84e58f2..0000000 --- a/evolution-2.5.5.1-commit-enter-on-calendar.patch +++ /dev/null @@ -1,242 +0,0 @@ ---- 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)) diff --git a/evolution-2.7.3-replicated-cjk-input.patch b/evolution-2.7.3-replicated-cjk-input.patch deleted file mode 100644 index 9dabf33..0000000 --- a/evolution-2.7.3-replicated-cjk-input.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- evolution-2.7.3/widgets/text/e-text.c.replicated_cjk_input 2006-07-06 09:57:22.000000000 -0400 -+++ evolution-2.7.3/widgets/text/e-text.c 2006-07-06 09:58:27.000000000 -0400 -@@ -1498,7 +1498,8 @@ - } - - -- insert_preedit_text (text); -+ if (text->im_context_signals_registered) -+ insert_preedit_text (text); - - if (!pango_layout_get_text (text->layout)) - return; -@@ -2212,7 +2213,8 @@ - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, - NULL, save_text); -- save_text->im_context_signals_registered = FALSE; -+ save_text->im_context_signals_registered = FALSE; -+ reset_layout (save_text); - } - - if (text->im_context) { diff --git a/evolution-2.7.4-deleting-preedit-buffer.patch b/evolution-2.7.4-deleting-preedit-buffer.patch deleted file mode 100644 index 8a82df0..0000000 --- a/evolution-2.7.4-deleting-preedit-buffer.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- evolution-2.7.90/widgets/text/e-text.c.deleting-preedit-buffer 2006-07-26 10:16:02.000000000 -0400 -+++ evolution-2.7.90/widgets/text/e-text.c 2006-07-26 10:25:29.000000000 -0400 -@@ -284,7 +284,7 @@ - PangoAttrList *preedit_attrs = NULL; - gchar *preedit_string = NULL; - GString *tmp_string = g_string_new (NULL); -- gint length = 0, cpos = 0, preedit_length = 0; -+ gint length = 0, cpos = 0; - gboolean new_attrs = FALSE; - - if (text->layout == NULL || !GTK_IS_IM_CONTEXT (text->im_context)) -@@ -295,19 +295,15 @@ - - g_string_prepend_len (tmp_string, text->text,length); - -- if (text->preedit_len) -- gtk_im_context_get_preedit_string (text->im_context, -- &preedit_string, &preedit_attrs, -- NULL); -+ /* we came into this function only when text->preedit_len was not 0 -+ so we can saftely fetch the preedit string */ -+ gtk_im_context_get_preedit_string (text->im_context, &preedit_string, &preedit_attrs, NULL); - - if (preedit_string && g_utf8_validate (preedit_string, -1, NULL)) -- text->preedit_len = preedit_length = strlen (preedit_string); -- else -- text->preedit_len = preedit_length = 0; -- -- cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; -+ { -+ text->preedit_len = strlen (preedit_string); -+ cpos = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text; - -- if (preedit_length) { - g_string_insert (tmp_string, cpos, preedit_string); - - reset_layout_attrs (text); -@@ -320,15 +316,17 @@ - - pango_layout_set_text (text->layout, tmp_string->str, tmp_string->len); - -- pango_attr_list_splice (attrs, preedit_attrs, cpos, preedit_length); -+ pango_attr_list_splice (attrs, preedit_attrs, cpos, text->preedit_len); - - if (new_attrs) { - pango_layout_set_attributes (text->layout, attrs); - pango_attr_list_unref (attrs); -- } -+ } - - update_im_cursor_position (text); - } -+ else -+ text->preedit_len = 0; - - if (preedit_string) - g_free (preedit_string); -@@ -385,9 +383,12 @@ - pango_attr_list_insert_before (attrs, attr); - } - } -+ - pango_layout_set_attributes (text->layout, attrs); -+ - if (attrs) - pango_attr_list_unref (attrs); -+ - calc_height (text); - } - -@@ -1510,9 +1511,14 @@ - } - } - -- -- if (text->im_context_signals_registered) -- insert_preedit_text (text); -+ /* Insert preedit text only when im_context signals are connected & text->preedit_len is not zero */ -+ if (text->im_context_signals_registered && text->preedit_len) -+ insert_preedit_text (text); -+ -+ /* Need to reset the layout to cleanly clear the preedit buffer -+ * when typing in CJK & using backspace on the preedit */ -+ if(!text->preedit_len) -+ reset_layout (text); - - if (!pango_layout_get_text (text->layout)) - return; -@@ -2220,11 +2226,12 @@ - */ - - if (save_text && save_text->im_context) { -+ gtk_im_context_focus_out(save_text->im_context); - g_signal_handlers_disconnect_matched (save_text->im_context, - G_SIGNAL_MATCH_DATA, - 0, 0, NULL, - NULL, save_text); -- save_text->im_context_signals_registered = FALSE; -+ save_text->im_context_signals_registered = FALSE; - reset_layout (save_text); - } - -@@ -2240,6 +2247,7 @@ - G_CALLBACK (e_text_delete_surrounding_cb), text); - text->im_context_signals_registered = TRUE; - } -+ gtk_im_context_focus_in(text->im_context); - } - start_editing (text); - text->show_cursor = FALSE; /* so we'll redraw and the cursor will be shown */ diff --git a/evolution-2.8.1-kill-ethread.patch b/evolution-2.8.1-kill-ethread.patch deleted file mode 100644 index b756a71..0000000 --- a/evolution-2.8.1-kill-ethread.patch +++ /dev/null @@ -1,7362 +0,0 @@ -diff -up evolution-2.21.4/mail/mail-send-recv.c.kill-ethread evolution-2.21.4/mail/mail-send-recv.c ---- evolution-2.21.4/mail/mail-send-recv.c.kill-ethread 2007-12-16 14:30:32.000000000 -0500 -+++ evolution-2.21.4/mail/mail-send-recv.c 2007-12-17 12:33:07.000000000 -0500 -@@ -779,23 +779,22 @@ receive_get_folder(CamelFilterDriver *d, - /* ********************************************************************** */ - - struct _refresh_folders_msg { -- struct _mail_msg msg; -+ MailMsg base; - - struct _send_info *info; - GPtrArray *folders; - CamelStore *store; - }; - --static char * --refresh_folders_desc (struct _mail_msg *mm, int done) -+static gchar * -+refresh_folders_desc (struct _refresh_folders_msg *m) - { - return g_strdup_printf(_("Checking for new mail")); - } - - static void --refresh_folders_get (struct _mail_msg *mm) -+refresh_folders_exec (struct _refresh_folders_msg *m) - { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; - int i; - CamelFolder *folder; - CamelException ex = CAMEL_EXCEPTION_INITIALISER; -@@ -817,17 +816,14 @@ refresh_folders_get (struct _mail_msg *m - } - - static void --refresh_folders_got (struct _mail_msg *mm) -+refresh_folders_done (struct _refresh_folders_msg *m) - { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; -- - receive_done("", m->info); - } - - static void --refresh_folders_free (struct _mail_msg *mm) -+refresh_folders_free (struct _refresh_folders_msg *m) - { -- struct _refresh_folders_msg *m = (struct _refresh_folders_msg *)mm; - int i; - - for (i=0;ifolders->len;i++) -@@ -836,11 +832,12 @@ refresh_folders_free (struct _mail_msg * - camel_object_unref(m->store); - } - --static struct _mail_msg_op refresh_folders_op = { -- refresh_folders_desc, -- refresh_folders_get, -- refresh_folders_got, -- refresh_folders_free, -+static MailMsgInfo refresh_folders_info = { -+ sizeof (struct _refresh_folders_msg), -+ (MailMsgDescFunc) refresh_folders_desc, -+ (MailMsgExecFunc) refresh_folders_exec, -+ (MailMsgDoneFunc) refresh_folders_done, -+ (MailMsgFreeFunc) refresh_folders_free - }; - - static void -@@ -870,13 +867,13 @@ receive_update_got_folderinfo(CamelStore - - get_folders(store, folders, info); - -- m = mail_msg_new(&refresh_folders_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&refresh_folders_info); - m->store = store; - camel_object_ref(store); - m->folders = folders; - m->info = sinfo; - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } else { - receive_done ("", data); - } -diff -up evolution-2.21.4/mail/mail-component.c.kill-ethread evolution-2.21.4/mail/mail-component.c ---- evolution-2.21.4/mail/mail-component.c.kill-ethread 2007-12-16 15:05:36.000000000 -0500 -+++ evolution-2.21.4/mail/mail-component.c 2007-12-17 12:33:08.000000000 -0500 -@@ -1010,7 +1010,7 @@ impl_handleURI (PortableServer_Servant s - if (camel_url_get_param(url, "uid") != NULL) { - char *curi = em_uri_to_camel(uri); - -- mail_get_folder(curi, 0, handleuri_got_folder, url, mail_thread_new); -+ mail_get_folder(curi, 0, handleuri_got_folder, url, mail_msg_unordered_push); - g_free(curi); - } else { - g_warning("email uri's must include a uid parameter"); -diff -up evolution-2.21.4/mail/mail-ops.c.kill-ethread evolution-2.21.4/mail/mail-ops.c ---- evolution-2.21.4/mail/mail-ops.c.kill-ethread 2007-12-16 14:36:47.000000000 -0500 -+++ evolution-2.21.4/mail/mail-ops.c 2007-12-17 12:33:07.000000000 -0500 -@@ -75,7 +75,7 @@ - /* used for both just filtering a folder + uid's, and for filtering a whole folder */ - /* used both for fetching mail, and for filtering mail */ - struct _filter_mail_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *source_folder; /* where they come from */ - GPtrArray *source_uids; /* uids to copy, or NULL == copy all */ -@@ -99,8 +99,8 @@ struct _fetch_mail_msg { - void *data; - }; - --static char * --em_filter_folder_element_describe (struct _mail_msg *mm, int complete) -+static gchar * -+em_filter_folder_element_desc (struct _filter_mail_msg *m) - { - return g_strdup (_("Filtering Selected Messages")); - } -@@ -108,9 +108,8 @@ em_filter_folder_element_describe (struc - /* filter a folder, or a subset thereof, uses source_folder/source_uids */ - /* this is shared with fetch_mail */ - static void --em_filter_folder_element_filter (struct _mail_msg *mm) -+em_filter_folder_element_exec (struct _filter_mail_msg *m) - { -- struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm; - CamelFolder *folder; - GPtrArray *uids, *folder_uids = NULL; - -@@ -137,15 +136,15 @@ em_filter_folder_element_filter (struct - else - folder_uids = uids = camel_folder_get_uids (folder); - -- camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &mm->ex); -- camel_filter_driver_flush (m->driver, &mm->ex); -+ camel_filter_driver_filter_folder (m->driver, folder, m->cache, uids, m->delete, &m->base.ex); -+ camel_filter_driver_flush (m->driver, &m->base.ex); - - if (folder_uids) - camel_folder_free_uids (folder, folder_uids); - - /* sync our source folder */ - if (!m->cache) -- camel_folder_sync (folder, FALSE, camel_exception_is_set (&mm->ex) ? NULL : &mm->ex); -+ camel_folder_sync (folder, FALSE, camel_exception_is_set (&m->base.ex) ? NULL : &m->base.ex); - camel_folder_thaw (folder); - - if (m->destination) -@@ -161,15 +160,13 @@ em_filter_folder_element_filter (struct - } - - static void --em_filter_folder_element_filtered (struct _mail_msg *mm) -+em_filter_folder_element_done (struct _filter_mail_msg *m) - { - } - - static void --em_filter_folder_element_free (struct _mail_msg *mm) -+em_filter_folder_element_free (struct _filter_mail_msg *m) - { -- struct _filter_mail_msg *m = (struct _filter_mail_msg *)mm; -- - if (m->source_folder) - camel_object_unref (m->source_folder); - -@@ -188,11 +185,12 @@ em_filter_folder_element_free (struct _m - mail_session_flush_filter_log (); - } - --static struct _mail_msg_op em_filter_folder_element_op = { -- em_filter_folder_element_describe, /* we do our own progress reporting? */ -- em_filter_folder_element_filter, -- em_filter_folder_element_filtered, -- em_filter_folder_element_free, -+static MailMsgInfo em_filter_folder_element_info = { -+ sizeof (struct _filter_mail_msg), -+ (MailMsgDescFunc) em_filter_folder_element_desc, /* we do our own progress reporting? */ -+ (MailMsgExecFunc) em_filter_folder_element_exec, -+ (MailMsgDoneFunc) em_filter_folder_element_done, -+ (MailMsgFreeFunc) em_filter_folder_element_free - }; - - void -@@ -202,7 +200,7 @@ mail_filter_folder (CamelFolder *source_ - { - struct _filter_mail_msg *m; - -- m = mail_msg_new (&em_filter_folder_element_op, NULL, sizeof (*m)); -+ m = mail_msg_new (&em_filter_folder_element_info); - m->source_folder = source_folder; - camel_object_ref (source_folder); - m->source_uids = uids; -@@ -221,7 +219,7 @@ mail_filter_folder (CamelFolder *source_ - camel_filter_driver_remove_rule_by_name (m->driver, "new-mail-notification"); - } - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } - - /* convenience functions for it */ -@@ -260,17 +258,16 @@ uid_cachename_hack (CamelStore *store) - return filename; - } - --static char * --fetch_mail_describe (struct _mail_msg *mm, int complete) -+static gchar * -+fetch_mail_desc (struct _fetch_mail_msg *m) - { - return g_strdup (_("Fetching Mail")); - } - - static void --fetch_mail_fetch (struct _mail_msg *mm) -+fetch_mail_exec (struct _fetch_mail_msg *m) - { -- struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm; -- struct _filter_mail_msg *fm = (struct _filter_mail_msg *)mm; -+ struct _filter_mail_msg *fm = (struct _filter_mail_msg *)m; - int i; - - if (m->cancel) -@@ -283,20 +280,20 @@ fetch_mail_fetch (struct _mail_msg *mm) - /* FIXME: this should support keep_on_server too, which would then perform a spool - access thingy, right? problem is matching raw messages to uid's etc. */ - if (!strncmp (m->source_uri, "mbox:", 5)) { -- char *path = mail_tool_do_movemail (m->source_uri, &mm->ex); -+ char *path = mail_tool_do_movemail (m->source_uri, &fm->base.ex); - -- if (path && !camel_exception_is_set (&mm->ex)) { -+ if (path && !camel_exception_is_set (&fm->base.ex)) { - camel_folder_freeze (fm->destination); - camel_filter_driver_set_default_folder (fm->driver, fm->destination); -- camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &mm->ex); -+ camel_filter_driver_filter_mbox (fm->driver, path, m->source_uri, &fm->base.ex); - camel_folder_thaw (fm->destination); - -- if (!camel_exception_is_set (&mm->ex)) -+ if (!camel_exception_is_set (&fm->base.ex)) - g_unlink (path); - } - g_free (path); - } else { -- CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &mm->ex); -+ CamelFolder *folder = fm->source_folder = mail_tool_get_inbox (m->source_uri, &fm->base.ex); - - if (folder) { - /* this handles 'keep on server' stuff, if we have any new uid's to copy -@@ -322,17 +319,17 @@ fetch_mail_fetch (struct _mail_msg *mm) - camel_uid_cache_free_uids (cache_uids); - - fm->cache = cache; -- em_filter_folder_element_filter (mm); -+ em_filter_folder_element_exec (fm); - - /* need to uncancel so writes/etc. don't fail */ -- if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) -+ if (fm->base.ex.id == CAMEL_EXCEPTION_USER_CANCEL) - camel_operation_uncancel(NULL); - - /* save the cache of uids that we've just downloaded */ - camel_uid_cache_save (cache); - } - -- if (fm->delete && mm->ex.id == CAMEL_EXCEPTION_NONE) { -+ if (fm->delete && fm->base.ex.id == CAMEL_EXCEPTION_NONE) { - /* not keep on server - just delete all the actual messages on the server */ - for (i=0;ilen;i++) { - d(printf("force delete uid '%s'\n", (char *)folder_uids->pdata[i])); -@@ -348,7 +345,7 @@ fetch_mail_fetch (struct _mail_msg *mm) - camel_uid_cache_destroy (cache); - camel_folder_free_uids (folder, folder_uids); - } else { -- em_filter_folder_element_filter (mm); -+ em_filter_folder_element_exec (fm); - } - - /* we unref the source folder here since we -@@ -372,31 +369,28 @@ fail: - } - - static void --fetch_mail_fetched (struct _mail_msg *mm) -+fetch_mail_done (struct _fetch_mail_msg *m) - { -- struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm; -- - if (m->done) - m->done (m->source_uri, m->data); - } - - static void --fetch_mail_free (struct _mail_msg *mm) -+fetch_mail_free (struct _fetch_mail_msg *m) - { -- struct _fetch_mail_msg *m = (struct _fetch_mail_msg *)mm; -- - g_free (m->source_uri); - if (m->cancel) - camel_operation_unref (m->cancel); - -- em_filter_folder_element_free (mm); -+ em_filter_folder_element_free ((struct _filter_mail_msg *) m); - } - --static struct _mail_msg_op fetch_mail_op = { -- fetch_mail_describe, /* we do our own progress reporting */ -- fetch_mail_fetch, -- fetch_mail_fetched, -- fetch_mail_free, -+static MailMsgInfo fetch_mail_info = { -+ sizeof (struct _fetch_mail_msg), -+ (MailMsgDescFunc) fetch_mail_desc, -+ (MailMsgExecFunc) fetch_mail_exec, -+ (MailMsgDoneFunc) fetch_mail_done, -+ (MailMsgFreeFunc) fetch_mail_free - }; - - /* ouch, a 'do everything' interface ... */ -@@ -409,7 +403,7 @@ mail_fetch_mail (const char *source, int - struct _fetch_mail_msg *m; - struct _filter_mail_msg *fm; - -- m = mail_msg_new (&fetch_mail_op, NULL, sizeof (*m)); -+ m = mail_msg_new (&fetch_mail_info); - fm = (struct _filter_mail_msg *)m; - m->source_uri = g_strdup (source); - fm->delete = !keep; -@@ -426,7 +420,7 @@ mail_fetch_mail (const char *source, int - if (status) - camel_filter_driver_set_status_func (fm->driver, status, status_data); - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } - - /* ********************************************************************** */ -@@ -657,7 +651,7 @@ exit: - /* ** SEND MAIL QUEUE ***************************************************** */ - - struct _send_queue_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *queue; - char *destination; -@@ -689,9 +683,8 @@ report_status (struct _send_queue_msg *m - } - - static void --send_queue_send(struct _mail_msg *mm) -+send_queue_exec (struct _send_queue_msg *m) - { -- struct _send_queue_msg *m = (struct _send_queue_msg *)mm; - CamelFolder *sent_folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_SENT); - GPtrArray *uids, *send_uids = NULL; - CamelException ex; -@@ -725,7 +718,7 @@ send_queue_send(struct _mail_msg *mm) - if (m->cancel) - camel_operation_register (m->cancel); - else -- camel_operation_register (mm->cancel); -+ camel_operation_register (m->base.cancel); - - if (!m->cancel) - camel_operation_start (NULL, _("Sending message")); -@@ -746,17 +739,17 @@ send_queue_send(struct _mail_msg *mm) - if (camel_exception_is_set (&ex)) { - if (ex.id != CAMEL_EXCEPTION_USER_CANCEL) { - /* merge exceptions into one */ -- if (camel_exception_is_set (&mm->ex)) -- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, "%s\n\n%s", mm->ex.desc, ex.desc); -+ if (camel_exception_is_set (&m->base.ex)) -+ camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, "%s\n\n%s", m->base.ex.desc, ex.desc); - else -- camel_exception_xfer (&mm->ex, &ex); -+ camel_exception_xfer (&m->base.ex, &ex); - camel_exception_clear (&ex); - - /* keep track of the number of failures */ - j++; - } else { - /* transfer the USER_CANCEL exeption to the async op exception and then break */ -- camel_exception_xfer (&mm->ex, &ex); -+ camel_exception_xfer (&m->base.ex, &ex); - break; - } - } -@@ -766,7 +759,7 @@ send_queue_send(struct _mail_msg *mm) - - if (j > 0) - report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Failed to send %d of %d messages"), j, send_uids->len); -- else if (mm->ex.id == CAMEL_EXCEPTION_USER_CANCEL) -+ else if (m->base.ex.id == CAMEL_EXCEPTION_USER_CANCEL) - report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Canceled.")); - else - report_status (m, CAMEL_FILTER_STATUS_END, 100, _("Complete.")); -@@ -793,24 +786,20 @@ send_queue_send(struct _mail_msg *mm) - if (m->cancel) - camel_operation_unregister (m->cancel); - else -- camel_operation_unregister (mm->cancel); -+ camel_operation_unregister (m->base.cancel); - - } - - static void --send_queue_sent(struct _mail_msg *mm) -+send_queue_done (struct _send_queue_msg *m) - { -- struct _send_queue_msg *m = (struct _send_queue_msg *)mm; -- - if (m->done) - m->done(m->destination, m->data); - } - - static void --send_queue_free(struct _mail_msg *mm) -+send_queue_free (struct _send_queue_msg *m) - { -- struct _send_queue_msg *m = (struct _send_queue_msg *)mm; -- - if (m->driver) - camel_object_unref(m->driver); - camel_object_unref(m->queue); -@@ -819,11 +808,12 @@ send_queue_free(struct _mail_msg *mm) - camel_operation_unref(m->cancel); - } - --static struct _mail_msg_op send_queue_op = { -- NULL, /* do our own reporting, as with fetch mail */ -- send_queue_send, -- send_queue_sent, -- send_queue_free, -+static MailMsgInfo send_queue_info = { -+ sizeof (struct _send_queue_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) send_queue_exec, -+ (MailMsgDoneFunc) send_queue_done, -+ (MailMsgFreeFunc) send_queue_free - }; - - /* same interface as fetch_mail, just 'cause i'm lazy today (and we need to run it from the same spot?) */ -@@ -836,17 +826,17 @@ mail_send_queue(CamelFolder *queue, cons - { - struct _send_queue_msg *m; - -- m = mail_msg_new(&send_queue_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&send_queue_info); - m->queue = queue; - camel_object_ref(queue); - m->destination = g_strdup(destination); - if (cancel) { - m->cancel = cancel; - camel_operation_ref(cancel); -- camel_operation_unref (((struct _mail_msg *) m)->cancel); -- mail_msg_set_cancelable ((struct _mail_msg *)m, FALSE); -+ camel_operation_unref (m->base.cancel); -+ mail_msg_set_cancelable (m, FALSE); - -- ((struct _mail_msg *) m)->cancel = NULL; -+ m->base.cancel = NULL; - } - m->status = status; - m->status_data = status_data; -@@ -856,13 +846,13 @@ mail_send_queue(CamelFolder *queue, cons - m->driver = camel_session_get_filter_driver (session, type, NULL); - camel_filter_driver_set_folder_func (m->driver, get_folder, get_data); - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } - - /* ** APPEND MESSAGE TO FOLDER ******************************************** */ - - struct _append_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - CamelMimeMessage *message; -@@ -873,45 +863,40 @@ struct _append_msg { - void *data; - }; - --static char * --append_mail_desc (struct _mail_msg *mm, int done) -+static gchar * -+append_mail_desc (struct _append_msg *m) - { - return g_strdup (_("Saving message to folder")); - } - - static void --append_mail_append (struct _mail_msg *mm) -+append_mail_exec (struct _append_msg *m) - { -- struct _append_msg *m = (struct _append_msg *)mm; -- - camel_mime_message_set_date(m->message, CAMEL_MESSAGE_DATE_CURRENT, 0); -- camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &mm->ex); -+ camel_folder_append_message(m->folder, m->message, m->info, &m->appended_uid, &m->base.ex); - } - - static void --append_mail_appended (struct _mail_msg *mm) -+append_mail_done (struct _append_msg *m) - { -- struct _append_msg *m = (struct _append_msg *)mm; -- - if (m->done) -- m->done(m->folder, m->message, m->info, !camel_exception_is_set(&mm->ex), m->appended_uid, m->data); -+ m->done(m->folder, m->message, m->info, !camel_exception_is_set(&m->base.ex), m->appended_uid, m->data); - } - - static void --append_mail_free (struct _mail_msg *mm) -+append_mail_free (struct _append_msg *m) - { -- struct _append_msg *m = (struct _append_msg *)mm; -- - camel_object_unref(m->message); - camel_object_unref(m->folder); - g_free (m->appended_uid); - } - --static struct _mail_msg_op append_mail_op = { -- append_mail_desc, -- append_mail_append, -- append_mail_appended, -- append_mail_free -+static MailMsgInfo append_mail_info = { -+ sizeof (struct _append_msg), -+ (MailMsgDescFunc) append_mail_desc, -+ (MailMsgExecFunc) append_mail_exec, -+ (MailMsgDoneFunc) append_mail_done, -+ (MailMsgFreeFunc) append_mail_free - }; - - void -@@ -928,7 +913,7 @@ mail_append_mail (CamelFolder *folder, C - camel_medium_set_header (CAMEL_MEDIUM (message), "X-Mailer", - "Evolution " VERSION SUB_VERSION " " VERSION_COMMENT); - -- m = mail_msg_new (&append_mail_op, NULL, sizeof (*m)); -+ m = mail_msg_new (&append_mail_info); - m->folder = folder; - camel_object_ref(folder); - m->message = message; -@@ -938,13 +923,13 @@ mail_append_mail (CamelFolder *folder, C - m->done = done; - m->data = data; - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } - - /* ** TRANSFER MESSAGES **************************************************** */ - - struct _transfer_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *source; - GPtrArray *uids; -@@ -956,24 +941,21 @@ struct _transfer_msg { - void *data; - }; - --static char * --transfer_messages_desc (struct _mail_msg *mm, int done) -+static gchar * -+transfer_messages_desc (struct _transfer_msg *m) - { -- struct _transfer_msg *m = (struct _transfer_msg *)mm; -- - return g_strdup_printf(m->delete?_("Moving messages to %s"):_("Copying messages to %s"), - m->dest_uri); - - } - - static void --transfer_messages_transfer (struct _mail_msg *mm) -+transfer_messages_exec (struct _transfer_msg *m) - { -- struct _transfer_msg *m = (struct _transfer_msg *)mm; - CamelFolder *dest; - -- dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &mm->ex); -- if (camel_exception_is_set (&mm->ex)) -+ dest = mail_tool_uri_to_folder (m->dest_uri, m->dest_flags, &m->base.ex); -+ if (camel_exception_is_set (&m->base.ex)) - return; - - if (dest == m->source) { -@@ -985,7 +967,7 @@ transfer_messages_transfer (struct _mail - camel_folder_freeze (m->source); - camel_folder_freeze (dest); - -- camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &mm->ex); -+ camel_folder_transfer_messages_to (m->source, m->uids, dest, NULL, m->delete, &m->base.ex); - - /* make sure all deleted messages are marked as seen */ - -@@ -1004,29 +986,26 @@ transfer_messages_transfer (struct _mail - } - - static void --transfer_messages_transferred (struct _mail_msg *mm) -+transfer_messages_done (struct _transfer_msg *m) - { -- struct _transfer_msg *m = (struct _transfer_msg *)mm; -- - if (m->done) -- m->done (!camel_exception_is_set (&mm->ex), m->data); -+ m->done (!camel_exception_is_set (&m->base.ex), m->data); - } - - static void --transfer_messages_free (struct _mail_msg *mm) -+transfer_messages_free (struct _transfer_msg *m) - { -- struct _transfer_msg *m = (struct _transfer_msg *)mm; -- - camel_object_unref (m->source); - g_free (m->dest_uri); - em_utils_uids_free (m->uids); - } - --static struct _mail_msg_op transfer_messages_op = { -- transfer_messages_desc, -- transfer_messages_transfer, -- transfer_messages_transferred, -- transfer_messages_free, -+static MailMsgInfo transfer_messages_info = { -+ sizeof (struct _transfer_msg), -+ (MailMsgDescFunc) transfer_messages_desc, -+ (MailMsgExecFunc) transfer_messages_exec, -+ (MailMsgDoneFunc) transfer_messages_done, -+ (MailMsgFreeFunc) transfer_messages_free - }; - - void -@@ -1043,7 +1022,7 @@ mail_transfer_messages (CamelFolder *sou - g_return_if_fail (uids != NULL); - g_return_if_fail (dest_uri != NULL); - -- m = mail_msg_new(&transfer_messages_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&transfer_messages_info); - m->source = source; - camel_object_ref (source); - m->uids = uids; -@@ -1053,13 +1032,13 @@ mail_transfer_messages (CamelFolder *sou - m->done = done; - m->data = data; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push (m); - } - - /* ** SCAN SUBFOLDERS ***************************************************** */ - - struct _get_folderinfo_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelStore *store; - CamelFolderInfo *info; -@@ -1067,10 +1046,9 @@ struct _get_folderinfo_msg { - void *data; - }; - --static char * --get_folderinfo_desc (struct _mail_msg *mm, int done) -+static gchar * -+get_folderinfo_desc (struct _get_folderinfo_msg *m) - { -- struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; - char *ret, *name; - - name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1080,25 +1058,22 @@ get_folderinfo_desc (struct _mail_msg *m - } - - static void --get_folderinfo_get (struct _mail_msg *mm) -+get_folderinfo_exec (struct _get_folderinfo_msg *m) - { -- struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; - guint32 flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - -- m->info = camel_store_get_folder_info (m->store, NULL, flags, &mm->ex); -+ m->info = camel_store_get_folder_info (m->store, NULL, flags, &m->base.ex); - } - - static void --get_folderinfo_got (struct _mail_msg *mm) -+get_folderinfo_done (struct _get_folderinfo_msg *m) - { -- struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; -- -- if (!m->info && camel_exception_is_set (&mm->ex)) { -+ if (!m->info && camel_exception_is_set (&m->base.ex)) { - char *url; - - url = camel_service_get_url (CAMEL_SERVICE (m->store)); - w(g_warning ("Error getting folder info from store at %s: %s", -- url, camel_exception_get_description (&mm->ex))); -+ url, camel_exception_get_description (&m->base.ex))); - g_free (url); - } - -@@ -1107,20 +1082,19 @@ get_folderinfo_got (struct _mail_msg *mm - } - - static void --get_folderinfo_free (struct _mail_msg *mm) -+get_folderinfo_free (struct _get_folderinfo_msg *m) - { -- struct _get_folderinfo_msg *m = (struct _get_folderinfo_msg *)mm; -- - if (m->info) - camel_store_free_folder_info(m->store, m->info); - camel_object_unref(m->store); - } - --static struct _mail_msg_op get_folderinfo_op = { -- get_folderinfo_desc, -- get_folderinfo_get, -- get_folderinfo_got, -- get_folderinfo_free, -+static MailMsgInfo get_folderinfo_info = { -+ sizeof (struct _get_folderinfo_msg), -+ (MailMsgDescFunc) get_folderinfo_desc, -+ (MailMsgExecFunc) get_folderinfo_exec, -+ (MailMsgDoneFunc) get_folderinfo_done, -+ (MailMsgFreeFunc) get_folderinfo_free - }; - - int -@@ -1129,19 +1103,19 @@ mail_get_folderinfo (CamelStore *store, - struct _get_folderinfo_msg *m; - int id; - -- m = mail_msg_new(&get_folderinfo_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&get_folderinfo_info); - if (op) { -- camel_operation_unref(m->msg.cancel); -- m->msg.cancel = op; -+ camel_operation_unref(m->base.cancel); -+ m->base.cancel = op; - camel_operation_ref(op); - } - m->store = store; - camel_object_ref(store); - m->done = done; - m->data = data; -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - - return id; - } -@@ -1213,7 +1187,7 @@ mail_build_attachment(CamelFolder *folde - presumably create a folder ... */ - - struct _get_folder_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *uri; - guint32 flags; -@@ -1222,71 +1196,64 @@ struct _get_folder_msg { - void *data; - }; - --static char * --get_folder_desc (struct _mail_msg *mm, int done) -+static gchar * -+get_folder_desc (struct _get_folder_msg *m) - { -- struct _get_folder_msg *m = (struct _get_folder_msg *)mm; -- - return g_strdup_printf(_("Opening folder %s"), m->uri); - } - - static void --get_folder_get (struct _mail_msg *mm) -+get_folder_exec (struct _get_folder_msg *m) - { -- struct _get_folder_msg *m = (struct _get_folder_msg *)mm; -- -- m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &mm->ex); -+ m->folder = mail_tool_uri_to_folder (m->uri, m->flags, &m->base.ex); - } - - static void --get_folder_got (struct _mail_msg *mm) -+get_folder_done (struct _get_folder_msg *m) - { -- struct _get_folder_msg *m = (struct _get_folder_msg *)mm; -- - if (m->done) - m->done (m->uri, m->folder, m->data); - } - - static void --get_folder_free (struct _mail_msg *mm) -+get_folder_free (struct _get_folder_msg *m) - { -- struct _get_folder_msg *m = (struct _get_folder_msg *)mm; -- - g_free (m->uri); - if (m->folder) - camel_object_unref (m->folder); - } - --static struct _mail_msg_op get_folder_op = { -- get_folder_desc, -- get_folder_get, -- get_folder_got, -- get_folder_free, -+static MailMsgInfo get_folder_info = { -+ sizeof (struct _get_folder_msg), -+ (MailMsgDescFunc) get_folder_desc, -+ (MailMsgExecFunc) get_folder_exec, -+ (MailMsgDoneFunc) get_folder_done, -+ (MailMsgFreeFunc) get_folder_free - }; - - int - mail_get_folder (const char *uri, guint32 flags, - void (*done)(char *uri, CamelFolder *folder, void *data), -- void *data, EThread *thread) -+ void *data, MailMsgDispatchFunc dispatch) - { - struct _get_folder_msg *m; - int id; - -- m = mail_msg_new(&get_folder_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&get_folder_info); - m->uri = g_strdup (uri); - m->flags = flags; - m->data = data; - m->done = done; - -- id = m->msg.seq; -- e_thread_put(thread, (EMsg *)m); -+ id = m->base.seq; -+ dispatch (m); - return id; - } - - /* ** GET STORE ******************************************************* */ - - struct _get_store_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *uri; - CamelStore *store; -@@ -1294,50 +1261,43 @@ struct _get_store_msg { - void *data; - }; - --static char * --get_store_desc (struct _mail_msg *mm, int done) -+static gchar * -+get_store_desc (struct _get_store_msg *m) - { -- struct _get_store_msg *m = (struct _get_store_msg *)mm; -- - return g_strdup_printf(_("Opening store %s"), m->uri); - } - - static void --get_store_get (struct _mail_msg *mm) -+get_store_exec (struct _get_store_msg *m) - { -- struct _get_store_msg *m = (struct _get_store_msg *)mm; -- - /*camel_session_get_store connects us, which we don't want to do on startup. */ - - m->store = (CamelStore *) camel_session_get_service (session, m->uri, - CAMEL_PROVIDER_STORE, -- &mm->ex); -+ &m->base.ex); - } - - static void --get_store_got (struct _mail_msg *mm) -+get_store_done (struct _get_store_msg *m) - { -- struct _get_store_msg *m = (struct _get_store_msg *)mm; -- - if (m->done) - m->done (m->uri, m->store, m->data); - } - - static void --get_store_free (struct _mail_msg *mm) -+get_store_free (struct _get_store_msg *m) - { -- struct _get_store_msg *m = (struct _get_store_msg *)mm; -- - g_free (m->uri); - if (m->store) - camel_object_unref (m->store); - } - --static struct _mail_msg_op get_store_op = { -- get_store_desc, -- get_store_get, -- get_store_got, -- get_store_free, -+static MailMsgInfo get_store_info = { -+ sizeof (struct _get_store_msg), -+ (MailMsgDescFunc) get_store_desc, -+ (MailMsgExecFunc) get_store_exec, -+ (MailMsgDoneFunc) get_store_done, -+ (MailMsgFreeFunc) get_store_free - }; - - int -@@ -1346,25 +1306,25 @@ mail_get_store (const char *uri, CamelOp - struct _get_store_msg *m; - int id; - -- m = mail_msg_new (&get_store_op, NULL, sizeof (*m)); -+ m = mail_msg_new (&get_store_info); - if (op) { -- camel_operation_unref(m->msg.cancel); -- m->msg.cancel = op; -+ camel_operation_unref(m->base.cancel); -+ m->base.cancel = op; - camel_operation_ref(op); - } - m->uri = g_strdup (uri); - m->data = data; - m->done = done; - -- id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - return id; - } - - /* ** REMOVE FOLDER ******************************************************* */ - - struct _remove_folder_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *uri; - gboolean removed; -@@ -1372,18 +1332,15 @@ struct _remove_folder_msg { - void *data; - }; - --static char * --remove_folder_desc (struct _mail_msg *mm, int done) -+static gchar * -+remove_folder_desc (struct _remove_folder_msg *m) - { -- struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; -- - return g_strdup_printf (_("Removing folder %s"), m->uri); - } - - static void --remove_folder_get (struct _mail_msg *mm) -+remove_folder_exec (struct _remove_folder_msg *m) - { -- struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; - CamelStore *store; - CamelFolder *folder; - GPtrArray *uids; -@@ -1391,7 +1348,7 @@ remove_folder_get (struct _mail_msg *mm) - - m->removed = FALSE; - -- folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); - if (!folder) - return; - -@@ -1411,16 +1368,14 @@ remove_folder_get (struct _mail_msg *mm) - camel_store_unsubscribe_folder (store, folder->full_name, NULL); - - /* Then delete the folder from the store */ -- camel_store_delete_folder (store, folder->full_name, &mm->ex); -- m->removed = !camel_exception_is_set (&mm->ex); -+ camel_store_delete_folder (store, folder->full_name, &m->base.ex); -+ m->removed = !camel_exception_is_set (&m->base.ex); - camel_object_unref (folder); - } - - static void --remove_folder_got (struct _mail_msg *mm) -+remove_folder_done (struct _remove_folder_msg *m) - { -- struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; -- - if (m->removed) { - /* FIXME: Remove this folder from the folder cache ??? */ - } -@@ -1430,18 +1385,17 @@ remove_folder_got (struct _mail_msg *mm) - } - - static void --remove_folder_free (struct _mail_msg *mm) -+remove_folder_free (struct _remove_folder_msg *m) - { -- struct _remove_folder_msg *m = (struct _remove_folder_msg *)mm; -- - g_free (m->uri); - } - --static struct _mail_msg_op remove_folder_op = { -- remove_folder_desc, -- remove_folder_get, -- remove_folder_got, -- remove_folder_free, -+static MailMsgInfo remove_folder_info = { -+ sizeof (struct _remove_folder_msg), -+ (MailMsgDescFunc) remove_folder_desc, -+ (MailMsgExecFunc) remove_folder_exec, -+ (MailMsgDoneFunc) remove_folder_done, -+ (MailMsgFreeFunc) remove_folder_free - }; - - void -@@ -1449,59 +1403,56 @@ mail_remove_folder (const char *uri, voi - { - struct _remove_folder_msg *m; - -- m = mail_msg_new (&remove_folder_op, NULL, sizeof (*m)); -+ m = mail_msg_new (&remove_folder_info); - m->uri = g_strdup (uri); - m->data = data; - m->done = done; - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } - - /* ** SYNC FOLDER ********************************************************* */ - - struct _sync_folder_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - void (*done) (CamelFolder *folder, void *data); - void *data; - }; - --static char *sync_folder_desc(struct _mail_msg *mm, int done) -+static gchar * -+sync_folder_desc (struct _sync_folder_msg *m) - { -- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; -- - return g_strdup_printf (_("Storing folder \'%s\'"), - camel_folder_get_full_name (m->folder)); - } - --static void sync_folder_sync(struct _mail_msg *mm) -+static void -+sync_folder_exec (struct _sync_folder_msg *m) - { -- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; -- -- camel_folder_sync(m->folder, FALSE, &mm->ex); -+ camel_folder_sync(m->folder, FALSE, &m->base.ex); - } - --static void sync_folder_synced(struct _mail_msg *mm) -+static void -+sync_folder_done (struct _sync_folder_msg *m) - { -- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; -- - if (m->done) - m->done(m->folder, m->data); - } - --static void sync_folder_free(struct _mail_msg *mm) -+static void -+sync_folder_free (struct _sync_folder_msg *m) - { -- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; -- - camel_object_unref((CamelObject *)m->folder); - } - --static struct _mail_msg_op sync_folder_op = { -- sync_folder_desc, -- sync_folder_sync, -- sync_folder_synced, -- sync_folder_free, -+static MailMsgInfo sync_folder_info = { -+ sizeof (struct _sync_folder_msg), -+ (MailMsgDescFunc) sync_folder_desc, -+ (MailMsgExecFunc) sync_folder_exec, -+ (MailMsgDoneFunc) sync_folder_done, -+ (MailMsgFreeFunc) sync_folder_free - }; - - void -@@ -1509,19 +1460,19 @@ mail_sync_folder(CamelFolder *folder, vo - { - struct _sync_folder_msg *m; - -- m = mail_msg_new(&sync_folder_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&sync_folder_info); - m->folder = folder; - camel_object_ref(folder); - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push (m); - } - - /* ** SYNC STORE ********************************************************* */ - - struct _sync_store_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelStore *store; - int expunge; -@@ -1529,9 +1480,9 @@ struct _sync_store_msg { - void *data; - }; - --static char *sync_store_desc(struct _mail_msg *mm, int done) -+static gchar * -+sync_store_desc (struct _sync_store_msg *m) - { -- struct _sync_store_msg *m = (struct _sync_store_msg *)mm; - char *uri, *res; - - uri = camel_url_to_string(((CamelService *)m->store)->url, CAMEL_URL_HIDE_ALL); -@@ -1544,33 +1495,31 @@ static char *sync_store_desc(struct _mai - return res; - } - --static void sync_store_sync(struct _mail_msg *mm) -+static void -+sync_store_exec (struct _sync_store_msg *m) - { -- struct _sync_store_msg *m = (struct _sync_store_msg *)mm; -- -- camel_store_sync(m->store, m->expunge, &mm->ex); -+ camel_store_sync(m->store, m->expunge, &m->base.ex); - } - --static void sync_store_synced(struct _mail_msg *mm) -+static void -+sync_store_done (struct _sync_store_msg *m) - { -- struct _sync_store_msg *m = (struct _sync_store_msg *)mm; -- - if (m->done) - m->done(m->store, m->data); - } - --static void sync_store_free(struct _mail_msg *mm) -+static void -+sync_store_free (struct _sync_store_msg *m) - { -- struct _sync_store_msg *m = (struct _sync_store_msg *)mm; -- - camel_object_unref(m->store); - } - --static struct _mail_msg_op sync_store_op = { -- sync_store_desc, -- sync_store_sync, -- sync_store_synced, -- sync_store_free, -+static MailMsgInfo sync_store_info = { -+ sizeof (struct _sync_store_msg), -+ (MailMsgDescFunc) sync_store_desc, -+ (MailMsgExecFunc) sync_store_exec, -+ (MailMsgDoneFunc) sync_store_done, -+ (MailMsgFreeFunc) sync_store_free - }; - - void -@@ -1578,36 +1527,37 @@ mail_sync_store(CamelStore *store, int e - { - struct _sync_store_msg *m; - -- m = mail_msg_new(&sync_store_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&sync_store_info); - m->store = store; - m->expunge = expunge; - camel_object_ref(store); - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push (m); - } - - /* ******************************************************************************** */ - --static char *refresh_folder_desc(struct _mail_msg *mm, int done) -+static gchar * -+refresh_folder_desc (struct _sync_folder_msg *m) - { - return g_strdup(_("Refreshing folder")); - } - --static void refresh_folder_refresh(struct _mail_msg *mm) -+static void -+refresh_folder_exec (struct _sync_folder_msg *m) - { -- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; -- -- camel_folder_refresh_info(m->folder, &mm->ex); -+ camel_folder_refresh_info(m->folder, &m->base.ex); - } - - /* we just use the sync stuff where we can, since it would be the same */ --static struct _mail_msg_op refresh_folder_op = { -- refresh_folder_desc, -- refresh_folder_refresh, -- sync_folder_synced, -- sync_folder_free, -+static MailMsgInfo refresh_folder_info = { -+ sizeof (struct _sync_folder_msg), -+ (MailMsgDescFunc) refresh_folder_desc, -+ (MailMsgExecFunc) refresh_folder_exec, -+ (MailMsgDoneFunc) sync_folder_done, -+ (MailMsgFreeFunc) sync_folder_free - }; - - void -@@ -1615,35 +1565,36 @@ mail_refresh_folder(CamelFolder *folder, - { - struct _sync_folder_msg *m; - -- m = mail_msg_new(&refresh_folder_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&refresh_folder_info); - m->folder = folder; - camel_object_ref(folder); - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push (m); - } - - /* ******************************************************************************** */ - --static char *expunge_folder_desc(struct _mail_msg *mm, int done) -+static gchar * -+expunge_folder_desc (struct _sync_folder_msg *m) - { - return g_strdup(_("Expunging folder")); - } - --static void expunge_folder_expunge(struct _mail_msg *mm) -+static void -+expunge_folder_exec (struct _sync_folder_msg *m) - { -- struct _sync_folder_msg *m = (struct _sync_folder_msg *)mm; -- -- camel_folder_expunge(m->folder, &mm->ex); -+ camel_folder_expunge(m->folder, &m->base.ex); - } - - /* we just use the sync stuff where we can, since it would be the same */ --static struct _mail_msg_op expunge_folder_op = { -- expunge_folder_desc, -- expunge_folder_expunge, -- sync_folder_synced, -- sync_folder_free, -+static MailMsgInfo expunge_folder_info = { -+ sizeof (struct _sync_folder_msg), -+ (MailMsgDescFunc) expunge_folder_desc, -+ (MailMsgExecFunc) expunge_folder_exec, -+ (MailMsgDoneFunc) sync_folder_done, -+ (MailMsgFreeFunc) sync_folder_free - }; - - void -@@ -1651,31 +1602,30 @@ mail_expunge_folder(CamelFolder *folder, - { - struct _sync_folder_msg *m; - -- m = mail_msg_new(&expunge_folder_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&expunge_folder_info); - m->folder = folder; - camel_object_ref(folder); - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push (m); - } - - /* ******************************************************************************** */ - - struct _empty_trash_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EAccount *account; - void (*done) (EAccount *account, void *data); - void *data; - }; - --static char *empty_trash_desc(struct _mail_msg *mm, int done) -+static gchar * -+empty_trash_desc (struct _empty_trash_msg *m) - { - /* FIXME after 1.4 is out and we're not in string freeze any more. */ - #if 0 -- struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; -- - return g_strdup_printf (_("Emptying trash in \'%s\'"), - m->account ? m->account->name : _("Local Folders")); - #else -@@ -1683,49 +1633,48 @@ static char *empty_trash_desc(struct _ma - #endif - } - --static void empty_trash_empty(struct _mail_msg *mm) -+static void -+empty_trash_exec (struct _empty_trash_msg *m) - { -- struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; - const char *evolution_dir; - CamelFolder *trash; - char *uri; - - if (m->account) { -- trash = mail_tool_get_trash (m->account->source->url, FALSE, &mm->ex); -+ trash = mail_tool_get_trash (m->account->source->url, FALSE, &m->base.ex); - } else { - evolution_dir = mail_component_peek_base_directory (mail_component_peek ()); - uri = g_strdup_printf ("mbox:%s/mail/local", evolution_dir); -- trash = mail_tool_get_trash (uri, TRUE, &mm->ex); -+ trash = mail_tool_get_trash (uri, TRUE, &m->base.ex); - g_free (uri); - } - - if (trash) -- camel_folder_expunge (trash, &mm->ex); -+ camel_folder_expunge (trash, &m->base.ex); - - camel_object_unref (trash); - } - --static void empty_trash_emptied(struct _mail_msg *mm) -+static void -+empty_trash_done (struct _empty_trash_msg *m) - { -- struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; -- - if (m->done) - m->done(m->account, m->data); - } - --static void empty_trash_free(struct _mail_msg *mm) -+static void -+empty_trash_free (struct _empty_trash_msg *m) - { -- struct _empty_trash_msg *m = (struct _empty_trash_msg *)mm; -- - if (m->account) - g_object_unref(m->account); - } - --static struct _mail_msg_op empty_trash_op = { -- empty_trash_desc, -- empty_trash_empty, -- empty_trash_emptied, -- empty_trash_free, -+static MailMsgInfo empty_trash_info = { -+ sizeof (struct _empty_trash_msg), -+ (MailMsgDescFunc) empty_trash_desc, -+ (MailMsgExecFunc) empty_trash_exec, -+ (MailMsgDoneFunc) empty_trash_done, -+ (MailMsgFreeFunc) empty_trash_free - }; - - void -@@ -1733,20 +1682,20 @@ mail_empty_trash(EAccount *account, void - { - struct _empty_trash_msg *m; - -- m = mail_msg_new(&empty_trash_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&empty_trash_info); - m->account = account; - if (account) - g_object_ref(account); - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push (m); - } - - /* ** GET MESSAGE(s) ***************************************************** */ - - struct _get_message_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - char *uid; -@@ -1756,32 +1705,28 @@ struct _get_message_msg { - CamelOperation *cancel; - }; - --static char *get_message_desc(struct _mail_msg *mm, int done) -+static gchar * -+get_message_desc (struct _get_message_msg *m) - { -- struct _get_message_msg *m = (struct _get_message_msg *)mm; -- - return g_strdup_printf(_("Retrieving message %s"), m->uid); - } - --static void get_message_get(struct _mail_msg *mm) -+static void -+get_message_exec (struct _get_message_msg *m) - { -- struct _get_message_msg *m = (struct _get_message_msg *)mm; -- -- m->message = camel_folder_get_message(m->folder, m->uid, &mm->ex); -+ m->message = camel_folder_get_message(m->folder, m->uid, &m->base.ex); - } - --static void get_message_got(struct _mail_msg *mm) -+static void -+get_message_done (struct _get_message_msg *m) - { -- struct _get_message_msg *m = (struct _get_message_msg *)mm; -- - if (m->done) - m->done(m->folder, m->uid, m->message, m->data); - } - --static void get_message_free(struct _mail_msg *mm) -+static void -+get_message_free (struct _get_message_msg *m) - { -- struct _get_message_msg *m = (struct _get_message_msg *)mm; -- - g_free (m->uid); - camel_object_unref (m->folder); - camel_operation_unref (m->cancel); -@@ -1790,21 +1735,22 @@ static void get_message_free(struct _mai - camel_object_unref (m->message); - } - --static struct _mail_msg_op get_message_op = { -- get_message_desc, -- get_message_get, -- get_message_got, -- get_message_free, -+static MailMsgInfo get_message_info = { -+ sizeof (struct _get_message_msg), -+ (MailMsgDescFunc) get_message_desc, -+ (MailMsgExecFunc) get_message_exec, -+ (MailMsgDoneFunc) get_message_done, -+ (MailMsgFreeFunc) get_message_free - }; - - void - mail_get_message(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, - CamelMimeMessage *msg, void *data), -- void *data, EThread *thread) -+ void *data, MailMsgDispatchFunc dispatch) - { - struct _get_message_msg *m; - -- m = mail_msg_new(&get_message_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&get_message_info); - m->folder = folder; - camel_object_ref(folder); - m->uid = g_strdup(uid); -@@ -1812,37 +1758,37 @@ mail_get_message(CamelFolder *folder, co - m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; - m->cancel = camel_operation_new(NULL, NULL); - -- e_thread_put(thread, (EMsg *)m); -+ dispatch (m); - } - - typedef void (*get_done)(CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *); - --static void get_messagex_got(struct _mail_msg *mm) -+static void -+get_messagex_done (struct _get_message_msg *m) - { -- struct _get_message_msg *m = (struct _get_message_msg *)mm; -- - if (m->done) { - get_done done = (get_done)m->done; -- done(m->folder, m->uid, m->message, m->data, &mm->ex); -+ done(m->folder, m->uid, m->message, m->data, &m->base.ex); - } - } - --static struct _mail_msg_op get_messagex_op = { -- get_message_desc, -- get_message_get, -- get_messagex_got, -- get_message_free, -+static MailMsgInfo get_messagex_info = { -+ sizeof (struct _get_message_msg), -+ (MailMsgDescFunc) get_message_desc, -+ (MailMsgExecFunc) get_message_exec, -+ (MailMsgDoneFunc) get_messagex_done, -+ (MailMsgFreeFunc) get_message_free - }; - - /* This is temporary, to avoid having to rewrite everything that uses - mail_get_message; it adds an exception argument to the callback */ - void - mail_get_messagex(CamelFolder *folder, const char *uid, void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), -- void *data, EThread *thread) -+ void *data, MailMsgDispatchFunc dispatch) - { - struct _get_message_msg *m; - -- m = mail_msg_new(&get_messagex_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&get_messagex_info); - m->folder = folder; - camel_object_ref(folder); - m->uid = g_strdup(uid); -@@ -1850,13 +1796,13 @@ mail_get_messagex(CamelFolder *folder, c - m->done = (void (*) (CamelFolder *, const char *, CamelMimeMessage *, void *)) done; - m->cancel = camel_operation_new(NULL, NULL); - -- e_thread_put(thread, (EMsg *)m); -+ dispatch (m); - } - - /* ********************************************************************** */ - - struct _get_messages_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - GPtrArray *uids; -@@ -1866,26 +1812,25 @@ struct _get_messages_msg { - void *data; - }; - --static char * get_messages_desc(struct _mail_msg *mm, int done) -+static gchar * -+get_messages_desc (struct _get_messages_msg *m) - { -- struct _get_messages_msg *m = (struct _get_messages_msg *)mm; -- - return g_strdup_printf(ngettext("Retrieving %d message", - "Retrieving %d messages", m->uids->len), - m->uids->len); - } - --static void get_messages_get(struct _mail_msg *mm) -+static void -+get_messages_exec (struct _get_messages_msg *m) - { -- struct _get_messages_msg *m = (struct _get_messages_msg *)mm; - int i; - CamelMimeMessage *message; - - for (i=0; iuids->len; i++) { - int pc = ((i+1) * 100) / m->uids->len; - -- message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex); -- camel_operation_progress(mm->cancel, pc); -+ message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); -+ camel_operation_progress(m->base.cancel, pc); - if (message == NULL) - break; - -@@ -1893,17 +1838,16 @@ static void get_messages_get(struct _mai - } - } - --static void get_messages_got(struct _mail_msg *mm) -+static void -+get_messages_done (struct _get_messages_msg *m) - { -- struct _get_messages_msg *m = (struct _get_messages_msg *)mm; -- - if (m->done) - m->done(m->folder, m->uids, m->messages, m->data); - } - --static void get_messages_free(struct _mail_msg *mm) -+static void -+get_messages_free (struct _get_messages_msg *m) - { -- struct _get_messages_msg *m = (struct _get_messages_msg *)mm; - int i; - - em_utils_uids_free (m->uids); -@@ -1915,11 +1859,12 @@ static void get_messages_free(struct _ma - camel_object_unref(m->folder); - } - --static struct _mail_msg_op get_messages_op = { -- get_messages_desc, -- get_messages_get, -- get_messages_got, -- get_messages_free, -+static MailMsgInfo get_messages_info = { -+ sizeof (struct _get_messages_msg), -+ (MailMsgDescFunc) get_messages_desc, -+ (MailMsgExecFunc) get_messages_exec, -+ (MailMsgDoneFunc) get_messages_done, -+ (MailMsgFreeFunc) get_messages_free - }; - - void -@@ -1929,7 +1874,7 @@ mail_get_messages(CamelFolder *folder, G - { - struct _get_messages_msg *m; - -- m = mail_msg_new(&get_messages_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&get_messages_info); - m->folder = folder; - camel_object_ref(folder); - m->uids = uids; -@@ -1937,13 +1882,13 @@ mail_get_messages(CamelFolder *folder, G - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } - - /* ** SAVE MESSAGES ******************************************************* */ - - struct _save_messages_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - GPtrArray *uids; -@@ -1952,10 +1897,9 @@ struct _save_messages_msg { - void *data; - }; - --static char *save_messages_desc(struct _mail_msg *mm, int done) -+static gchar * -+save_messages_desc (struct _save_messages_msg *m) - { -- struct _save_messages_msg *m = (struct _save_messages_msg *)mm; -- - return g_strdup_printf(ngettext("Saving %d message", - "Saving %d messsages", m->uids->len), - m->uids->len); -@@ -1994,9 +1938,8 @@ save_prepare_part (CamelMimePart *mime_p - } - - static void --save_messages_save (struct _mail_msg *mm) -+save_messages_exec (struct _save_messages_msg *m) - { -- struct _save_messages_msg *m = (struct _save_messages_msg *)mm; - CamelStreamFilter *filtered_stream; - CamelMimeFilterFrom *from_filter; - CamelStream *stream; -@@ -2013,8 +1956,8 @@ save_messages_save (struct _mail_msg *mm - CamelMimeMessage *message; - int pc = ((i+1) * 100) / m->uids->len; - -- message = camel_folder_get_message(m->folder, m->uids->pdata[i], &mm->ex); -- camel_operation_progress(mm->cancel, pc); -+ message = camel_folder_get_message(m->folder, m->uids->pdata[i], &m->base.ex); -+ camel_operation_progress(m->base.cancel, pc); - if (message == NULL) - break; - -@@ -2026,7 +1969,7 @@ save_messages_save (struct _mail_msg *mm - || camel_stream_flush(stream) == -1 - || camel_data_wrapper_write_to_stream((CamelDataWrapper *)message, (CamelStream *)filtered_stream) == -1 - || camel_stream_flush((CamelStream *)filtered_stream) == -1) { -- camel_exception_setv(&mm->ex, CAMEL_EXCEPTION_SYSTEM, -+ camel_exception_setv(&m->base.ex, CAMEL_EXCEPTION_SYSTEM, - _("Error saving messages to: %s:\n %s"), m->path, strerror(errno)); - g_free(from); - camel_object_unref((CamelObject *)message); -@@ -2040,28 +1983,27 @@ save_messages_save (struct _mail_msg *mm - camel_object_unref(stream); - } - --static void save_messages_saved(struct _mail_msg *mm) -+static void -+save_messages_done (struct _save_messages_msg *m) - { -- struct _save_messages_msg *m = (struct _save_messages_msg *)mm; -- - if (m->done) - m->done(m->folder, m->uids, m->path, m->data); - } - --static void save_messages_free(struct _mail_msg *mm) -+static void -+save_messages_free (struct _save_messages_msg *m) - { -- struct _save_messages_msg *m = (struct _save_messages_msg *)mm; -- - em_utils_uids_free (m->uids); - camel_object_unref(m->folder); - g_free(m->path); - } - --static struct _mail_msg_op save_messages_op = { -- save_messages_desc, -- save_messages_save, -- save_messages_saved, -- save_messages_free, -+static MailMsgInfo save_messages_info = { -+ sizeof (struct _save_messages_msg), -+ (MailMsgDescFunc) save_messages_desc, -+ (MailMsgExecFunc) save_messages_exec, -+ (MailMsgDoneFunc) save_messages_done, -+ (MailMsgFreeFunc) save_messages_free - }; - - int -@@ -2071,7 +2013,7 @@ mail_save_messages(CamelFolder *folder, - struct _save_messages_msg *m; - int id; - -- m = mail_msg_new(&save_messages_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&save_messages_info); - m->folder = folder; - camel_object_ref(folder); - m->uids = uids; -@@ -2079,8 +2021,8 @@ mail_save_messages(CamelFolder *folder, - m->data = data; - m->done = done; - -- id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } -@@ -2088,7 +2030,7 @@ mail_save_messages(CamelFolder *folder, - /* ** SAVE PART ******************************************************* */ - - struct _save_part_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelMimePart *part; - char *path; -@@ -2097,27 +2039,27 @@ struct _save_part_msg { - gboolean readonly; - }; - --static char *save_part_desc(struct _mail_msg *mm, int done) -+static gchar * -+save_part_desc (struct _save_part_msg *m) - { - return g_strdup(_("Saving attachment")); - } - - static void --save_part_save (struct _mail_msg *mm) -+save_part_exec (struct _save_part_msg *m) - { -- struct _save_part_msg *m = (struct _save_part_msg *)mm; - CamelDataWrapper *content; - CamelStream *stream; - - if(!m->readonly){ - if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0644))) { -- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, -+ camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, - _("Cannot create output file: %s:\n %s"), - m->path, g_strerror (errno)); - return; - } - } else if (!(stream = camel_stream_vfs_new_with_uri (m->path, O_WRONLY | O_CREAT | O_TRUNC, 0444))) { -- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, -+ camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, - _("Cannot create output file: %s:\n %s"), - m->path, g_strerror (errno)); - return; -@@ -2127,7 +2069,7 @@ save_part_save (struct _mail_msg *mm) - - if (camel_data_wrapper_decode_to_stream (content, stream) == -1 - || camel_stream_flush (stream) == -1) -- camel_exception_setv (&mm->ex, CAMEL_EXCEPTION_SYSTEM, -+ camel_exception_setv (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, - _("Could not write data: %s"), - g_strerror (errno)); - -@@ -2135,27 +2077,25 @@ save_part_save (struct _mail_msg *mm) - } - - static void --save_part_saved (struct _mail_msg *mm) -+save_part_done (struct _save_part_msg *m) - { -- struct _save_part_msg *m = (struct _save_part_msg *)mm; -- - if (m->done) -- m->done (m->part, m->path, !camel_exception_is_set (&mm->ex), m->data); -+ m->done (m->part, m->path, !camel_exception_is_set (&m->base.ex), m->data); - } - - static void --save_part_free (struct _mail_msg *mm) -+save_part_free (struct _save_part_msg *m) - { -- struct _save_part_msg *m = (struct _save_part_msg *)mm; - camel_object_unref (m->part); - g_free (m->path); - } - --static struct _mail_msg_op save_part_op = { -- save_part_desc, -- save_part_save, -- save_part_saved, -- save_part_free, -+static MailMsgInfo save_part_info = { -+ sizeof (struct _save_part_msg), -+ (MailMsgDescFunc) save_part_desc, -+ (MailMsgExecFunc) save_part_exec, -+ (MailMsgDoneFunc) save_part_done, -+ (MailMsgFreeFunc) save_part_free - }; - - int -@@ -2164,7 +2104,7 @@ mail_save_part (CamelMimePart *part, con - { - struct _save_part_msg *m; - int id; -- m = mail_msg_new (&save_part_op, NULL, sizeof (*m)); -+ m = mail_msg_new (&save_part_info); - m->part = part; - camel_object_ref (part); - m->path = g_strdup (path); -@@ -2172,8 +2112,8 @@ mail_save_part (CamelMimePart *part, con - m->done = done; - m->readonly = readonly; - -- id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } -@@ -2182,7 +2122,7 @@ mail_save_part (CamelMimePart *part, con - /* ** PREPARE OFFLINE ***************************************************** */ - - struct _prep_offline_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelOperation *cancel; - char *uri; -@@ -2190,22 +2130,22 @@ struct _prep_offline_msg { - void *data; - }; - --static void prep_offline_do(struct _mail_msg *mm) -+static void -+prep_offline_exec (struct _prep_offline_msg *m) - { -- struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm; - CamelFolder *folder; - - if (m->cancel) - camel_operation_register(m->cancel); - -- folder = mail_tool_uri_to_folder(m->uri, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder(m->uri, 0, &m->base.ex); - if (folder) { - if (CAMEL_IS_DISCO_FOLDER(folder)) { - camel_disco_folder_prepare_for_offline((CamelDiscoFolder *)folder, - "(match-all)", -- &mm->ex); -+ &m->base.ex); - } else if (CAMEL_IS_OFFLINE_FOLDER (folder)) { -- camel_offline_folder_downsync ((CamelOfflineFolder *) folder, "(match-all)", &mm->ex); -+ camel_offline_folder_downsync ((CamelOfflineFolder *) folder, "(match-all)", &m->base.ex); - } - /* prepare_for_offline should do this? */ - /* of course it should all be atomic, but ... */ -@@ -2217,28 +2157,27 @@ static void prep_offline_do(struct _mail - camel_operation_unregister(m->cancel); - } - --static void prep_offline_done(struct _mail_msg *mm) -+static void -+prep_offline_done (struct _prep_offline_msg *m) - { -- struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm; -- - if (m->done) - m->done(m->uri, m->data); - } - --static void prep_offline_free(struct _mail_msg *mm) -+static void -+prep_offline_free (struct _prep_offline_msg *m) - { -- struct _prep_offline_msg *m = (struct _prep_offline_msg *)mm; -- - if (m->cancel) - camel_operation_unref(m->cancel); - g_free(m->uri); - } - --static struct _mail_msg_op prep_offline_op = { -- NULL, /* DO NOT CHANGE THIS, IT MUST BE NULL FOR CANCELLATION TO WORK */ -- prep_offline_do, -- prep_offline_done, -- prep_offline_free, -+static MailMsgInfo prep_offline_info = { -+ sizeof (struct _prep_offline_msg), -+ (MailMsgDescFunc) NULL, /* DO NOT CHANGE THIS, IT MUST BE NULL FOR CANCELLATION TO WORK */ -+ (MailMsgExecFunc) prep_offline_exec, -+ (MailMsgDoneFunc) prep_offline_done, -+ (MailMsgFreeFunc) prep_offline_free - }; - - void -@@ -2249,7 +2188,7 @@ mail_prep_offline(const char *uri, - { - struct _prep_offline_msg *m; - -- m = mail_msg_new(&prep_offline_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&prep_offline_info); - m->cancel = cancel; - if (cancel) - camel_operation_ref(cancel); -@@ -2257,13 +2196,13 @@ mail_prep_offline(const char *uri, - m->data = data; - m->done = done; - -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push (m); - } - - /* ** GO OFFLINE ***************************************************** */ - - struct _set_offline_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelStore *store; - gboolean offline; -@@ -2271,9 +2210,9 @@ struct _set_offline_msg { - void *data; - }; - --static char *set_offline_desc(struct _mail_msg *mm, int done) -+static gchar * -+set_offline_desc (struct _set_offline_msg *m) - { -- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; - char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); - char *msg; - -@@ -2283,61 +2222,59 @@ static char *set_offline_desc(struct _ma - return msg; - } - --static void set_offline_do(struct _mail_msg *mm) -+static void -+set_offline_exec (struct _set_offline_msg *m) - { -- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; -- - if (CAMEL_IS_DISCO_STORE (m->store)) { - if (!m->offline) { - camel_disco_store_set_status (CAMEL_DISCO_STORE (m->store), - CAMEL_DISCO_STORE_ONLINE, -- &mm->ex); -+ &m->base.ex); - return; - } else if (camel_disco_store_can_work_offline (CAMEL_DISCO_STORE (m->store))) { - camel_disco_store_set_status (CAMEL_DISCO_STORE (m->store), - CAMEL_DISCO_STORE_OFFLINE, -- &mm->ex); -+ &m->base.ex); - return; - } - } else if (CAMEL_IS_OFFLINE_STORE (m->store)) { - if (!m->offline) { - camel_offline_store_set_network_state (CAMEL_OFFLINE_STORE (m->store), - CAMEL_OFFLINE_STORE_NETWORK_AVAIL, -- &mm->ex); -+ &m->base.ex); - return; - } else { - camel_offline_store_set_network_state (CAMEL_OFFLINE_STORE (m->store), - CAMEL_OFFLINE_STORE_NETWORK_UNAVAIL, -- &mm->ex); -+ &m->base.ex); - return; - } - } - - if (m->offline) - camel_service_disconnect (CAMEL_SERVICE (m->store), -- TRUE, &mm->ex); -+ TRUE, &m->base.ex); - } - --static void set_offline_done(struct _mail_msg *mm) -+static void -+set_offline_done (struct _set_offline_msg *m) - { -- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; -- - if (m->done) - m->done(m->store, m->data); - } - --static void set_offline_free(struct _mail_msg *mm) -+static void -+set_offline_free (struct _set_offline_msg *m) - { -- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; -- - camel_object_unref(m->store); - } - --static struct _mail_msg_op set_offline_op = { -- set_offline_desc, -- set_offline_do, -- set_offline_done, -- set_offline_free, -+static MailMsgInfo set_offline_info = { -+ sizeof (struct _set_offline_msg), -+ (MailMsgDescFunc) set_offline_desc, -+ (MailMsgExecFunc) set_offline_exec, -+ (MailMsgDoneFunc) set_offline_done, -+ (MailMsgFreeFunc) set_offline_free - }; - - int -@@ -2354,61 +2291,59 @@ mail_store_set_offline (CamelStore *stor - if (offline) - camel_service_cancel_connect (CAMEL_SERVICE (store)); - -- m = mail_msg_new(&set_offline_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&set_offline_info); - m->store = store; - camel_object_ref(store); - m->offline = offline; - m->data = data; - m->done = done; - -- id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } - - /* ** Prepare OFFLINE ***************************************************** */ - --static char *prepare_offline_desc(struct _mail_msg *mm, int done) -+static char * -+prepare_offline_desc (struct _set_offline_msg *m, int done) - { -- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; - char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); - char *msg; - -- msg = g_strdup_printf(_("Preparing account '%s' for offline"), service_name); -+ msg = g_strdup_printf (_("Preparing account '%s' for offline"), service_name); - g_free(service_name); - - return msg; - } - --static void prepare_offline_do(struct _mail_msg *mm) -+static void -+prepare_offline_exec (struct _set_offline_msg *m) - { -- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; -- - camel_disco_store_prepare_for_offline (CAMEL_DISCO_STORE (m->store), -- &mm->ex); -+ &m->base.ex); - } - --static void prepare_offline_done(struct _mail_msg *mm) -+static void -+prepare_offline_done (struct _set_offline_msg *m) - { -- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; -- - if (m->done) -- m->done(m->store, m->data); -+ m->done (m->store, m->data); - } - --static void prepare_offline_free(struct _mail_msg *mm) -+static void -+prepare_offline_free (struct _set_offline_msg *m) - { -- struct _set_offline_msg *m = (struct _set_offline_msg *)mm; -- -- camel_object_unref(m->store); -+ camel_object_unref (m->store); - } - --static struct _mail_msg_op prepare_offline_op = { -- prepare_offline_desc, -- prepare_offline_do, -- prepare_offline_done, -- prepare_offline_free, -+static MailMsgInfo prepare_offline_info = { -+ sizeof (struct _set_offline_msg), -+ (MailMsgDescFunc) prepare_offline_desc, -+ (MailMsgExecFunc) prepare_offline_exec, -+ (MailMsgDoneFunc) prepare_offline_done, -+ (MailMsgFreeFunc) prepare_offline_free - }; - - int -@@ -2421,14 +2356,14 @@ mail_store_prepare_offline (CamelStore * - * thread won't get queued behind a hung connect op. - */ - -- m = mail_msg_new(&prepare_offline_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&prepare_offline_info); - m->store = store; - camel_object_ref(store); - m->data = NULL; - m->done = NULL; - -- id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } -@@ -2445,7 +2380,7 @@ mail_execute_shell_command (CamelFilterD - - /* Async service-checking/authtype-lookup code. */ - struct _check_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *url; - CamelProviderType type; -@@ -2455,51 +2390,47 @@ struct _check_msg { - void *data; - }; - --static char * --check_service_describe(struct _mail_msg *mm, int complete) -+static gchar * -+check_service_desc (struct _check_msg *m) - { - return g_strdup(_("Checking Service")); - } - - static void --check_service_check(struct _mail_msg *mm) -+check_service_exec (struct _check_msg *m) - { -- struct _check_msg *m = (struct _check_msg *)mm; - CamelService *service; - -- service = camel_session_get_service(session, m->url, m->type, &mm->ex); -+ service = camel_session_get_service(session, m->url, m->type, &m->base.ex); - if (!service) { -- camel_operation_unregister(mm->cancel); -+ camel_operation_unregister(m->base.cancel); - return; - } - -- m->authtypes = camel_service_query_auth_types(service, &mm->ex); -+ m->authtypes = camel_service_query_auth_types(service, &m->base.ex); - camel_object_unref(service); - } - - static void --check_service_done(struct _mail_msg *mm) -+check_service_done (struct _check_msg *m) - { -- struct _check_msg *m = (struct _check_msg *)mm; -- - if (m->done) - m->done(m->url, m->type, m->authtypes, m->data); - } - - static void --check_service_free(struct _mail_msg *mm) -+check_service_free (struct _check_msg *m) - { -- struct _check_msg *m = (struct _check_msg *)mm; -- - g_free(m->url); - g_list_free(m->authtypes); - } - --static struct _mail_msg_op check_service_op = { -- check_service_describe, -- check_service_check, -- check_service_done, -- check_service_free, -+static MailMsgInfo check_service_info = { -+ sizeof (struct _check_msg), -+ (MailMsgDescFunc) check_service_desc, -+ (MailMsgExecFunc) check_service_exec, -+ (MailMsgDoneFunc) check_service_done, -+ (MailMsgFreeFunc) check_service_free - }; - - int -@@ -2508,14 +2439,14 @@ mail_check_service(const char *url, Came - struct _check_msg *m; - int id; - -- m = mail_msg_new (&check_service_op, NULL, sizeof(*m)); -+ m = mail_msg_new (&check_service_info); - m->url = g_strdup(url); - m->type = type; - m->done = done; - m->data = data; - -- id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } -diff -up evolution-2.21.4/mail/em-folder-utils.c.kill-ethread evolution-2.21.4/mail/em-folder-utils.c ---- evolution-2.21.4/mail/em-folder-utils.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/em-folder-utils.c 2007-12-17 12:33:07.000000000 -0500 -@@ -85,7 +85,7 @@ emfu_is_special_local_folder (const char - } - - struct _EMCopyFolders { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *fromstore; -@@ -97,18 +97,15 @@ struct _EMCopyFolders { - int delete; - }; - --static char * --emft_copy_folders__desc (struct _mail_msg *mm, int complete) -+static gchar * -+emft_copy_folders__desc (struct _EMCopyFolders *m, gint complete) - { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; -- - return g_strdup_printf (_("Copying `%s' to `%s'"), m->frombase, m->tobase); - } - - static void --emft_copy_folders__copy (struct _mail_msg *mm) -+emft_copy_folders__exec (struct _EMCopyFolders *m) - { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; - guint32 flags = CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_RECURSIVE | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - GList *pending = NULL, *deleting = NULL, *l; - GString *fromname, *toname; -@@ -116,7 +113,7 @@ emft_copy_folders__copy (struct _mail_ms - const char *tmp; - int fromlen; - -- if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &mm->ex))) -+ if (!(fi = camel_store_get_folder_info (m->fromstore, m->frombase, flags, &m->base.ex))) - return; - - pending = g_list_append (pending, fi); -@@ -156,8 +153,8 @@ emft_copy_folders__copy (struct _mail_ms - if ((info->flags & CAMEL_FOLDER_NOSELECT) == 0) { - d(printf ("this folder is selectable\n")); - if (m->tostore == m->fromstore && m->delete) { -- camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &mm->ex); -- if (camel_exception_is_set (&mm->ex)) -+ camel_store_rename_folder (m->fromstore, info->full_name, toname->str, &m->base.ex); -+ if (camel_exception_is_set (&m->base.ex)) - goto exception; - - /* this folder no longer exists, unsubscribe it */ -@@ -166,16 +163,16 @@ emft_copy_folders__copy (struct _mail_ms - - deleted = 1; - } else { -- if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &mm->ex))) -+ if (!(fromfolder = camel_store_get_folder (m->fromstore, info->full_name, 0, &m->base.ex))) - goto exception; - -- if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &mm->ex))) { -+ if (!(tofolder = camel_store_get_folder (m->tostore, toname->str, CAMEL_STORE_FOLDER_CREATE, &m->base.ex))) { - camel_object_unref (fromfolder); - goto exception; - } - - uids = camel_folder_get_uids (fromfolder); -- camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &mm->ex); -+ camel_folder_transfer_messages_to (fromfolder, uids, tofolder, NULL, m->delete, &m->base.ex); - camel_folder_free_uids (fromfolder, uids); - - if (m->delete) -@@ -186,7 +183,7 @@ emft_copy_folders__copy (struct _mail_ms - } - } - -- if (camel_exception_is_set (&mm->ex)) -+ if (camel_exception_is_set (&m->base.ex)) - goto exception; - else if (m->delete && !deleted) - deleting = g_list_prepend (deleting, info); -@@ -227,10 +224,8 @@ emft_copy_folders__copy (struct _mail_ms - } - - static void --emft_copy_folders__free (struct _mail_msg *mm) -+emft_copy_folders__free (struct _EMCopyFolders *m) - { -- struct _EMCopyFolders *m = (struct _EMCopyFolders *) mm; -- - camel_object_unref (m->fromstore); - camel_object_unref (m->tostore); - -@@ -238,11 +233,12 @@ emft_copy_folders__free (struct _mail_ms - g_free (m->tobase); - } - --static struct _mail_msg_op copy_folders_op = { -- emft_copy_folders__desc, -- emft_copy_folders__copy, -- NULL, -- emft_copy_folders__free, -+static MailMsgInfo copy_folders_info = { -+ sizeof (struct _EMCopyFolders), -+ (MailMsgDescFunc) emft_copy_folders__desc, -+ (MailMsgExecFunc) emft_copy_folders__exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) emft_copy_folders__free - }; - - int -@@ -251,7 +247,7 @@ em_folder_utils_copy_folders(CamelStore - struct _EMCopyFolders *m; - int seq; - -- m = mail_msg_new (©_folders_op, NULL, sizeof (struct _EMCopyFolders)); -+ m = mail_msg_new (©_folders_info); - camel_object_ref (fromstore); - m->fromstore = fromstore; - camel_object_ref (tostore); -@@ -259,9 +255,9 @@ em_folder_utils_copy_folders(CamelStore - m->frombase = g_strdup (frombase); - m->tobase = g_strdup (tobase); - m->delete = delete; -- seq = m->msg.seq; -+ seq = m->base.seq; - -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - - return seq; - } -@@ -558,7 +554,7 @@ em_folder_utils_rename_folder (CamelFold - } - - struct _EMCreateFolder { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *store; -@@ -582,41 +578,33 @@ struct _EMCreateFolderTempData - char *uri; - }; - --static char * --emfu_create_folder__desc (struct _mail_msg *mm, int done) -+static gchar * -+emfu_create_folder__desc (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); - } - - static void --emfu_create_folder__create (struct _mail_msg *mm) -+emfu_create_folder__exec (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - -- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { -+ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { - if (camel_store_supports_subscriptions (m->store)) -- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); - } - } - - static void --emfu_create_folder__created (struct _mail_msg *mm) -+emfu_create_folder__done (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - if (m->done) - m->done (m->fi, m->user_data); - } - - static void --emfu_create_folder__free (struct _mail_msg *mm) -+emfu_create_folder__free (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - camel_object_unref (m->store); - g_free (m->full_name); -@@ -624,11 +612,12 @@ emfu_create_folder__free (struct _mail_m - g_free (m->name); - } - --static struct _mail_msg_op create_folder_op = { -- emfu_create_folder__desc, -- emfu_create_folder__create, -- emfu_create_folder__created, -- emfu_create_folder__free, -+static MailMsgInfo create_folder_info = { -+ sizeof (struct _EMCreateFolder), -+ (MailMsgDescFunc) emfu_create_folder__desc, -+ (MailMsgExecFunc) emfu_create_folder__exec, -+ (MailMsgDoneFunc) emfu_create_folder__done, -+ (MailMsgFreeFunc) emfu_create_folder__free - }; - - -@@ -649,7 +638,7 @@ emfu_create_folder_real (CamelStore *sto - parent = namebuf; - } - -- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); -+ m = mail_msg_new (&create_folder_info); - camel_object_ref (store); - m->store = store; - m->full_name = g_strdup (full_name); -@@ -660,8 +649,8 @@ emfu_create_folder_real (CamelStore *sto - - g_free (namebuf); - -- id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } -diff -up evolution-2.21.4/mail/importers/elm-importer.c.kill-ethread evolution-2.21.4/mail/importers/elm-importer.c ---- evolution-2.21.4/mail/importers/elm-importer.c.kill-ethread 2007-11-29 23:24:03.000000000 -0500 -+++ evolution-2.21.4/mail/importers/elm-importer.c 2007-12-17 12:33:08.000000000 -0500 -@@ -51,7 +51,7 @@ - #define d(x) x - - struct _elm_import_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EImport *import; - EImportTargetHome *target; -@@ -178,8 +178,8 @@ elm_supported(EImport *ei, EImportTarget - return mailexists; - } - --static char * --elm_import_describe (struct _mail_msg *mm, int complete) -+static gchar * -+elm_import_desc (struct _elm_import_msg *m) - { - return g_strdup (_("Importing Elm data")); - } -@@ -190,9 +190,8 @@ static MailImporterSpecial elm_special_f - }; - - static void --elm_import_import(struct _mail_msg *mm) -+elm_import_exec (struct _elm_import_msg *m) - { -- struct _elm_import_msg *m = (struct _elm_import_msg *) mm; - const char *maildir; - char *elmdir; - -@@ -210,13 +209,11 @@ elm_import_import(struct _mail_msg *mm) - } - - static void --elm_import_imported(struct _mail_msg *mm) -+elm_import_done(struct _elm_import_msg *m) - { -- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; -- - printf("importing complete\n"); - -- if (!camel_exception_is_set(&mm->ex)) { -+ if (!camel_exception_is_set(&m->base.ex)) { - GConfClient *gconf; - - gconf = gconf_client_get_default(); -@@ -228,10 +225,8 @@ elm_import_imported(struct _mail_msg *mm - } - - static void --elm_import_free(struct _mail_msg *mm) -+elm_import_free(struct _elm_import_msg *m) - { -- struct _elm_import_msg *m = (struct _elm_import_msg *)mm; -- - camel_operation_unref(m->status); - - g_free(m->status_what); -@@ -280,11 +275,12 @@ elm_status_timeout(void *data) - return TRUE; - } - --static struct _mail_msg_op elm_import_op = { -- elm_import_describe, -- elm_import_import, -- elm_import_imported, -- elm_import_free, -+static MailMsgInfo elm_import_info = { -+ sizeof (struct _elm_import_msg), -+ (MailMsgDescFunc) elm_import_desc, -+ (MailMsgExecFunc) elm_import_exec, -+ (MailMsgDoneFunc) elm_import_done, -+ (MailMsgFreeFunc) elm_import_free - }; - - static int -@@ -293,7 +289,7 @@ mail_importer_elm_import(EImport *ei, EI - struct _elm_import_msg *m; - int id; - -- m = mail_msg_new(&elm_import_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&elm_import_info); - g_datalist_set_data(&target->data, "elm-msg", m); - m->import = ei; - g_object_ref(m->import); -@@ -302,9 +298,9 @@ mail_importer_elm_import(EImport *ei, EI - m->status_lock = g_mutex_new(); - m->status = camel_operation_new(elm_status, m); - -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - return id; - } -diff -up evolution-2.21.4/mail/importers/mail-importer.c.kill-ethread evolution-2.21.4/mail/importers/mail-importer.c ---- evolution-2.21.4/mail/importers/mail-importer.c.kill-ethread 2007-11-29 23:24:03.000000000 -0500 -+++ evolution-2.21.4/mail/importers/mail-importer.c 2007-12-17 12:33:08.000000000 -0500 -@@ -132,7 +132,7 @@ struct _BonoboObject *mail_importer_fact - } - - struct _import_mbox_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *path; - char *uri; -@@ -142,8 +142,8 @@ struct _import_mbox_msg { - void *done_data; - }; - --static char * --import_mbox_describe(struct _mail_msg *mm, int complete) -+static gchar * -+import_mbox_desc (struct _import_mbox_msg *m) - { - return g_strdup (_("Importing mailbox")); - } -@@ -190,9 +190,8 @@ decode_mozilla_status(const char *tmp) - } - - static void --import_mbox_import(struct _mail_msg *mm) -+import_mbox_exec (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *) mm; - CamelFolder *folder; - CamelMimeParser *mp = NULL; - struct stat st; -@@ -207,7 +206,7 @@ import_mbox_import(struct _mail_msg *mm) - if (m->uri == NULL || m->uri[0] == 0) - folder = mail_component_get_folder(NULL, MAIL_COMPONENT_FOLDER_INBOX); - else -- folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &mm->ex); -+ folder = mail_tool_uri_to_folder(m->uri, CAMEL_STORE_FOLDER_CREATE, &m->base.ex); - - if (folder == NULL) - return; -@@ -262,11 +261,11 @@ import_mbox_import(struct _mail_msg *mm) - flags |= decode_status(tmp); - - camel_message_info_set_flags(info, flags, ~0); -- camel_folder_append_message(folder, msg, info, NULL, &mm->ex); -+ camel_folder_append_message(folder, msg, info, NULL, &m->base.ex); - camel_message_info_free(info); - camel_object_unref(msg); - -- if (camel_exception_is_set(&mm->ex)) -+ if (camel_exception_is_set(&m->base.ex)) - break; - - camel_mime_parser_step(mp, NULL, NULL); -@@ -286,30 +285,27 @@ fail1: - } - - static void --import_mbox_done(struct _mail_msg *mm) -+import_mbox_done (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; -- - if (m->done) -- m->done(m->done_data, &mm->ex); -+ m->done(m->done_data, &m->base.ex); - } - - static void --import_mbox_free (struct _mail_msg *mm) -+import_mbox_free (struct _import_mbox_msg *m) - { -- struct _import_mbox_msg *m = (struct _import_mbox_msg *)mm; -- - if (m->cancel) - camel_operation_unref(m->cancel); - g_free(m->uri); - g_free(m->path); - } - --static struct _mail_msg_op import_mbox_op = { -- import_mbox_describe, -- import_mbox_import, -- import_mbox_done, -- import_mbox_free, -+static MailMsgInfo import_mbox_info = { -+ sizeof (struct _import_mbox_msg), -+ (MailMsgDescFunc) import_mbox_desc, -+ (MailMsgExecFunc) import_mbox_exec, -+ (MailMsgDoneFunc) import_mbox_done, -+ (MailMsgFreeFunc) import_mbox_free - }; - - int -@@ -318,7 +314,7 @@ mail_importer_import_mbox(const char *pa - struct _import_mbox_msg *m; - int id; - -- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&import_mbox_info); - m->path = g_strdup(path); - m->uri = g_strdup(folderuri); - m->done = done; -@@ -328,8 +324,8 @@ mail_importer_import_mbox(const char *pa - camel_operation_ref(cancel); - } - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_fast_ordered_push (m); - - return id; - } -@@ -339,7 +335,7 @@ mail_importer_import_mbox_sync(const cha - { - struct _import_mbox_msg *m; - -- m = mail_msg_new(&import_mbox_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&import_mbox_info); - m->path = g_strdup(path); - m->uri = g_strdup(folderuri); - if (cancel) { -@@ -347,9 +343,9 @@ mail_importer_import_mbox_sync(const cha - camel_operation_ref(cancel); - } - -- import_mbox_import(&m->msg); -- import_mbox_done(&m->msg); -- mail_msg_free(&m->msg); -+ import_mbox_exec(m); -+ import_mbox_done(m); -+ mail_msg_unref(m); - } - - struct _import_folders_data { -diff -up evolution-2.21.4/mail/importers/pine-importer.c.kill-ethread evolution-2.21.4/mail/importers/pine-importer.c ---- evolution-2.21.4/mail/importers/pine-importer.c.kill-ethread 2007-11-29 23:24:03.000000000 -0500 -+++ evolution-2.21.4/mail/importers/pine-importer.c 2007-12-17 12:33:08.000000000 -0500 -@@ -56,7 +56,7 @@ - #define d(x) x - - struct _pine_import_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EImport *import; - EImportTarget *target; -@@ -223,8 +223,8 @@ import_contacts(void) - g_object_unref(book); - } - --static char * --pine_import_describe (struct _mail_msg *mm, int complete) -+static gchar * -+pine_import_desc (struct _pine_import_msg *m) - { - return g_strdup (_("Importing Pine data")); - } -@@ -236,10 +236,8 @@ static MailImporterSpecial pine_special_ - }; - - static void --pine_import_import(struct _mail_msg *mm) -+pine_import_exec(struct _pine_import_msg *m) - { -- struct _pine_import_msg *m = (struct _pine_import_msg *) mm; -- - if (GPOINTER_TO_INT(g_datalist_get_data(&m->target->data, "pine-do-addr"))) - import_contacts(); - -@@ -253,13 +251,11 @@ pine_import_import(struct _mail_msg *mm) - } - - static void --pine_import_imported(struct _mail_msg *mm) -+pine_import_done(struct _pine_import_msg *m) - { -- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; -- - printf("importing complete\n"); - -- if (!camel_exception_is_set(&mm->ex)) { -+ if (!camel_exception_is_set(&m->base.ex)) { - GConfClient *gconf; - - gconf = gconf_client_get_default(); -@@ -274,10 +270,8 @@ pine_import_imported(struct _mail_msg *m - } - - static void --pine_import_free(struct _mail_msg *mm) -+pine_import_free(struct _pine_import_msg *m) - { -- struct _pine_import_msg *m = (struct _pine_import_msg *)mm; -- - camel_operation_unref(m->status); - - g_free(m->status_what); -@@ -326,11 +320,12 @@ pine_status_timeout(void *data) - return TRUE; - } - --static struct _mail_msg_op pine_import_op = { -- pine_import_describe, -- pine_import_import, -- pine_import_imported, -- pine_import_free, -+static MailMsgInfo pine_import_info = { -+ sizeof (struct _pine_import_msg), -+ (MailMsgDescFunc) pine_import_desc, -+ (MailMsgExecFunc) pine_import_exec, -+ (MailMsgDoneFunc) pine_import_done, -+ (MailMsgFreeFunc) pine_import_free - }; - - static int -@@ -339,7 +334,7 @@ mail_importer_pine_import(EImport *ei, E - struct _pine_import_msg *m; - int id; - -- m = mail_msg_new(&pine_import_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&pine_import_info); - g_datalist_set_data(&target->data, "pine-msg", m); - m->import = ei; - g_object_ref(m->import); -@@ -348,9 +343,9 @@ mail_importer_pine_import(EImport *ei, E - m->status_lock = g_mutex_new(); - m->status = camel_operation_new(pine_status, m); - -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - return id; - } -diff -up evolution-2.21.4/mail/em-utils.c.kill-ethread evolution-2.21.4/mail/em-utils.c ---- evolution-2.21.4/mail/em-utils.c.kill-ethread 2007-12-17 12:33:00.000000000 -0500 -+++ evolution-2.21.4/mail/em-utils.c 2007-12-17 12:33:08.000000000 -0500 -@@ -1990,7 +1990,7 @@ em_utils_in_addressbook(CamelInternetAdd - ESource *source = s->data; - GList *contacts; - EBook *book; -- void *hook; -+ GHook *hook; - - d(printf(" checking '%s'\n", e_source_get_uri(source))); - -diff -up evolution-2.21.4/mail/mail-vfolder.c.kill-ethread evolution-2.21.4/mail/mail-vfolder.c ---- evolution-2.21.4/mail/mail-vfolder.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/mail-vfolder.c 2007-12-17 12:33:07.000000000 -0500 -@@ -21,7 +21,7 @@ - */ - - #include -- -+#include - #include - - #include -@@ -75,7 +75,7 @@ static void rule_changed(FilterRule *rul - /* ********************************************************************** */ - - struct _setup_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - char *query; -@@ -83,18 +83,15 @@ struct _setup_msg { - GList *sources_folder; - }; - --static char * --vfolder_setup_desc(struct _mail_msg *mm, int done) -+static gchar * -+vfolder_setup_desc (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; -- - return g_strdup_printf(_("Setting up Search Folder: %s"), m->folder->full_name); - } - - static void --vfolder_setup_do(struct _mail_msg *mm) -+vfolder_setup_exec (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l, *list = NULL; - CamelFolder *folder; - -@@ -105,12 +102,12 @@ vfolder_setup_do(struct _mail_msg *mm) - l = m->sources_uri; - while (l && !shutdown) { - d(printf(" Adding uri: %s\n", (char *)l->data)); -- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); - if (folder) { - list = g_list_append(list, folder); - } else { - g_warning("Could not open vfolder source: %s", (char *)l->data); -- camel_exception_clear(&mm->ex); -+ camel_exception_clear(&m->base.ex); - } - l = l->next; - } -@@ -135,17 +132,13 @@ vfolder_setup_do(struct _mail_msg *mm) - } - - static void --vfolder_setup_done(struct _mail_msg *mm) -+vfolder_setup_done (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; -- -- m = m; - } - - static void --vfolder_setup_free (struct _mail_msg *mm) -+vfolder_setup_free (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l; - - camel_object_unref(m->folder); -@@ -166,11 +159,12 @@ vfolder_setup_free (struct _mail_msg *mm - g_list_free(m->sources_folder); - } - --static struct _mail_msg_op vfolder_setup_op = { -- vfolder_setup_desc, -- vfolder_setup_do, -- vfolder_setup_done, -- vfolder_setup_free, -+static MailMsgInfo vfolder_setup_info = { -+ sizeof (struct _setup_msg), -+ (MailMsgDescFunc) vfolder_setup_desc, -+ (MailMsgExecFunc) vfolder_setup_exec, -+ (MailMsgDoneFunc) vfolder_setup_done, -+ (MailMsgFreeFunc) vfolder_setup_free - }; - - /* sources_uri should be camel uri's */ -@@ -180,15 +174,15 @@ vfolder_setup(CamelFolder *folder, const - struct _setup_msg *m; - int id; - -- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&vfolder_setup_info); - m->folder = folder; - camel_object_ref(folder); - m->query = g_strdup(query); - m->sources_uri = sources_uri; - m->sources_folder = sources_folder; - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_slow_ordered_push (m); - - return id; - } -@@ -196,17 +190,16 @@ vfolder_setup(CamelFolder *folder, const - /* ********************************************************************** */ - - struct _adduri_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *uri; - GList *folders; - int remove; - }; - --static char * --vfolder_adduri_desc(struct _mail_msg *mm, int done) -+static gchar * -+vfolder_adduri_desc (struct _adduri_msg *m) - { -- struct _adduri_msg *m = (struct _adduri_msg *)mm; - char *euri, *desc = NULL; - - /* Yuck yuck. Lookup the account name and use that to describe the path */ -@@ -250,9 +243,8 @@ vfolder_adduri_desc(struct _mail_msg *mm - } - - static void --vfolder_adduri_do(struct _mail_msg *mm) -+vfolder_adduri_exec (struct _adduri_msg *m) - { -- struct _adduri_msg *m = (struct _adduri_msg *)mm; - GList *l; - CamelFolder *folder = NULL; - -@@ -269,7 +261,7 @@ vfolder_adduri_do(struct _mail_msg *mm) - } - - if (folder == NULL) -- folder = mail_tool_uri_to_folder (m->uri, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder (m->uri, 0, &m->base.ex); - - if (folder != NULL) { - l = m->folders; -@@ -285,28 +277,24 @@ vfolder_adduri_do(struct _mail_msg *mm) - } - - static void --vfolder_adduri_done(struct _mail_msg *mm) -+vfolder_adduri_done(struct _adduri_msg *m) - { -- struct _adduri_msg *m = (struct _adduri_msg *)mm; -- -- m = m; - } - - static void --vfolder_adduri_free (struct _mail_msg *mm) -+vfolder_adduri_free (struct _adduri_msg *m) - { -- struct _adduri_msg *m = (struct _adduri_msg *)mm; -- - g_list_foreach(m->folders, (GFunc)camel_object_unref, NULL); - g_list_free(m->folders); - g_free(m->uri); - } - --static struct _mail_msg_op vfolder_adduri_op = { -- vfolder_adduri_desc, -- vfolder_adduri_do, -- vfolder_adduri_done, -- vfolder_adduri_free, -+static MailMsgInfo vfolder_adduri_info = { -+ sizeof (struct _adduri_msg), -+ (MailMsgDescFunc) vfolder_adduri_desc, -+ (MailMsgExecFunc) vfolder_adduri_exec, -+ (MailMsgDoneFunc) vfolder_adduri_done, -+ (MailMsgFreeFunc) vfolder_adduri_free - }; - - -@@ -317,13 +305,13 @@ vfolder_adduri(const char *uri, GList *f - struct _adduri_msg *m; - int id; - -- m = mail_msg_new(&vfolder_adduri_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&vfolder_adduri_info); - m->folders = folders; - m->uri = g_strdup(uri); - m->remove = remove; - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_slow_ordered_push (m); - - return id; - } -@@ -447,7 +435,7 @@ mail_vfolder_add_uri(CamelStore *store, - return; - } - -- g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); -+ g_return_if_fail (mail_in_main_thread()); - - is_ignore = uri_is_ignore(store, curi); - -@@ -543,7 +531,7 @@ mail_vfolder_delete_uri(CamelStore *stor - - d(printf ("Deleting uri to check: %s\n", uri)); - -- g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); -+ g_return_if_fail (mail_in_main_thread()); - - changed = g_string_new (""); - -@@ -627,7 +615,7 @@ mail_vfolder_rename_uri(CamelStore *stor - if (context == NULL || uri_is_spethal(store, cfrom) || uri_is_spethal(store, cto)) - return; - -- g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); -+ g_return_if_fail (mail_in_main_thread()); - - from = em_uri_from_camel(cfrom); - to = em_uri_from_camel(cto); -diff -up evolution-2.21.4/mail/em-format-html.c.kill-ethread evolution-2.21.4/mail/em-format-html.c ---- evolution-2.21.4/mail/em-format-html.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/em-format-html.c 2007-12-17 12:33:08.000000000 -0500 -@@ -176,7 +176,7 @@ efh_gtkhtml_destroy(GtkHTML *html, EMFor - if (efh->priv->format_timeout_id != 0) { - g_source_remove(efh->priv->format_timeout_id); - efh->priv->format_timeout_id = 0; -- mail_msg_free(efh->priv->format_timeout_msg); -+ mail_msg_unref(efh->priv->format_timeout_msg); - efh->priv->format_timeout_msg = NULL; - } - -@@ -1205,7 +1205,7 @@ efh_builtin_init(EMFormatHTMLClass *efhc - - /* Sigh, this is so we have a cancellable, async rendering thread */ - struct _format_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EMFormatHTML *format; - EMFormat *format_source; -@@ -1215,14 +1215,15 @@ struct _format_msg { - CamelMimeMessage *message; - }; - --static char *efh_format_desc(struct _mail_msg *mm, int done) -+static gchar * -+efh_format_desc (struct _format_msg *m) - { - return g_strdup(_("Formatting message")); - } - --static void efh_format_do(struct _mail_msg *mm) -+static void -+efh_format_exec (struct _format_msg *m) - { -- struct _format_msg *m = (struct _format_msg *)mm; - struct _EMFormatHTMLJob *job; - struct _EMFormatPURITree *puri_level; - int cancelled = FALSE; -@@ -1307,10 +1308,9 @@ static void efh_format_do(struct _mail_m - ((EMFormat *)m->format)->pending_uri_level = puri_level; - } - --static void efh_format_done(struct _mail_msg *mm) -+static void -+efh_format_done (struct _format_msg *m) - { -- struct _format_msg *m = (struct _format_msg *)mm; -- - d(printf("formatting finished\n")); - - m->format->load_http_now = FALSE; -@@ -1318,10 +1318,9 @@ static void efh_format_done(struct _mail - g_signal_emit_by_name(m->format, "complete"); - } - --static void efh_format_free(struct _mail_msg *mm) -+static void -+efh_format_free (struct _format_msg *m) - { -- struct _format_msg *m = (struct _format_msg *)mm; -- - d(printf("formatter freed\n")); - g_object_unref(m->format); - if (m->estream) { -@@ -1337,11 +1336,12 @@ static void efh_format_free(struct _mail - g_object_unref(m->format_source); - } - --static struct _mail_msg_op efh_format_op = { -- efh_format_desc, -- efh_format_do, -- efh_format_done, -- efh_format_free, -+static MailMsgInfo efh_format_info = { -+ sizeof (struct _format_msg), -+ (MailMsgDescFunc) efh_format_desc, -+ (MailMsgExecFunc) efh_format_exec, -+ (MailMsgDoneFunc) efh_format_done, -+ (MailMsgFreeFunc) efh_format_free - }; - - static gboolean -@@ -1352,7 +1352,7 @@ efh_format_timeout(struct _format_msg *m - struct _EMFormatHTMLPrivate *p = efh->priv; - - if (m->format->html == NULL) { -- mail_msg_free(m); -+ mail_msg_unref(m); - return FALSE; - } - -@@ -1380,7 +1380,7 @@ efh_format_timeout(struct _format_msg *m - if (m->message == NULL) { - hstream = gtk_html_begin(efh->html); - gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); -- mail_msg_free(m); -+ mail_msg_unref(m); - p->last_part = NULL; - } else { - if (p->last_part != m->message) { -@@ -1403,8 +1403,8 @@ efh_format_timeout(struct _format_msg *m - p->last_part = m->message; - } - -- efh->priv->format_id = m->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)m); -+ efh->priv->format_id = m->base.seq; -+ mail_msg_unordered_push (m); - } - - efh->priv->format_timeout_id = 0; -@@ -1428,11 +1428,11 @@ static void efh_format_clone(EMFormat *e - d(printf(" timeout for last still active, removing ...\n")); - g_source_remove(efh->priv->format_timeout_id); - efh->priv->format_timeout_id = 0; -- mail_msg_free(efh->priv->format_timeout_msg); -+ mail_msg_unref(efh->priv->format_timeout_msg); - efh->priv->format_timeout_msg = NULL; - } - -- m = mail_msg_new(&efh_format_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&efh_format_info); - m->format = (EMFormatHTML *)emf; - g_object_ref(emf); - m->format_source = emfsource; -diff -up evolution-2.21.4/mail/em-folder-properties.c.kill-ethread evolution-2.21.4/mail/em-folder-properties.c ---- evolution-2.21.4/mail/em-folder-properties.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/em-folder-properties.c 2007-12-17 12:33:07.000000000 -0500 -@@ -386,7 +386,7 @@ em_folder_properties_show(GtkWindow *par - } - - if (folder == NULL) -- mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_thread_new); -+ mail_get_folder(uri, 0, emfp_dialog_got_folder, NULL, mail_msg_unordered_push); - else - emfp_dialog_got_folder((char *)uri, folder, NULL); - } -diff -up evolution-2.21.4/mail/em-folder-tree.c.kill-ethread evolution-2.21.4/mail/em-folder-tree.c ---- evolution-2.21.4/mail/em-folder-tree.c.kill-ethread 2007-12-14 09:25:49.000000000 -0500 -+++ evolution-2.21.4/mail/em-folder-tree.c 2007-12-17 12:33:07.000000000 -0500 -@@ -846,7 +846,7 @@ fail: - /* TODO: Merge the drop handling code/menu's into one spot using a popup target for details */ - /* Drop handling */ - struct _DragDataReceivedAsync { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - GdkDragContext *context; -@@ -871,17 +871,16 @@ emft_drop_folder(struct _DragDataReceive - - d(printf(" * Drop folder '%s' onto '%s'\n", m->selection->data, m->full_name)); - -- if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->msg.ex))) -+ if (!(src = mail_tool_uri_to_folder((char *)m->selection->data, 0, &m->base.ex))) - return; - - em_folder_utils_copy_folders(src->parent_store, src->full_name, m->store, m->full_name?m->full_name:"", m->move); - camel_object_unref(src); - } - --static char * --emft_drop_async_desc (struct _mail_msg *mm, int done) -+static gchar * -+emft_drop_async__desc (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; - CamelURL *url; - char *buf; - -@@ -905,9 +904,8 @@ emft_drop_async_desc (struct _mail_msg * - } - - static void --emft_drop_async_drop (struct _mail_msg *mm) -+emft_drop_async__exec (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; - CamelFolder *folder; - - /* for types other than folder, we can't drop to the root path */ -@@ -915,14 +913,14 @@ emft_drop_async_drop (struct _mail_msg * - /* copy or move (aka rename) a folder */ - emft_drop_folder(m); - } else if (m->full_name == NULL) { -- camel_exception_set (&mm->ex, CAMEL_EXCEPTION_SYSTEM, -+ camel_exception_set (&m->base.ex, CAMEL_EXCEPTION_SYSTEM, - _("Cannot drop message(s) into toplevel store")); -- } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &mm->ex))) { -+ } else if ((folder = camel_store_get_folder (m->store, m->full_name, 0, &m->base.ex))) { - switch (m->info) { - case DND_DROP_TYPE_UID_LIST: - /* import a list of uids from another evo folder */ -- em_utils_selection_get_uidlist(m->selection, folder, m->move, &mm->ex); -- m->moved = m->move && !camel_exception_is_set(&mm->ex); -+ em_utils_selection_get_uidlist(m->selection, folder, m->move, &m->base.ex); -+ m->moved = m->move && !camel_exception_is_set(&m->base.ex); - break; - case DND_DROP_TYPE_MESSAGE_RFC822: - /* import a message/rfc822 stream */ -@@ -940,10 +938,25 @@ emft_drop_async_drop (struct _mail_msg * - } - - static void --emft_drop_async_free (struct _mail_msg *mm) -+emft_drop_async__done (struct _DragDataReceivedAsync *m) - { -- struct _DragDataReceivedAsync *m = (struct _DragDataReceivedAsync *) mm; -+ gboolean success, delete; - -+ /* ?? */ -+ if (m->aborted) { -+ success = FALSE; -+ delete = FALSE; -+ } else { -+ success = !camel_exception_is_set (&m->base.ex); -+ delete = success && m->move && !m->moved; -+ } -+ -+ gtk_drag_finish (m->context, success, delete, GDK_CURRENT_TIME); -+} -+ -+static void -+emft_drop_async__free (struct _DragDataReceivedAsync *m) -+{ - g_object_unref(m->context); - camel_object_unref(m->store); - g_free(m->full_name); -@@ -952,18 +965,19 @@ emft_drop_async_free (struct _mail_msg * - g_free(m->selection); - } - --static struct _mail_msg_op emft_drop_async_op = { -- emft_drop_async_desc, -- emft_drop_async_drop, -- NULL, -- emft_drop_async_free, -+static MailMsgInfo emft_drop_async_info = { -+ sizeof (struct _DragDataReceivedAsync), -+ (MailMsgDescFunc) emft_drop_async__desc, -+ (MailMsgExecFunc) emft_drop_async__exec, -+ (MailMsgDoneFunc) emft_drop_async__done, -+ (MailMsgFreeFunc) emft_drop_async__free - }; - - static void - tree_drag_data_action(struct _DragDataReceivedAsync *m) - { - m->move = m->action == GDK_ACTION_MOVE; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static void -@@ -990,7 +1004,7 @@ emft_drop_popup_cancel(EPopup *ep, EPopu - struct _DragDataReceivedAsync *m = data; - - m->aborted = TRUE; -- mail_msg_free(&m->msg); -+ mail_msg_unref(m); - } - - static EPopupItem emft_drop_popup_menu[] = { -@@ -1046,7 +1060,7 @@ tree_drag_data_received(GtkWidget *widge - return; - } - -- m = mail_msg_new (&emft_drop_async_op, NULL, sizeof (struct _DragDataReceivedAsync)); -+ m = mail_msg_new (&emft_drop_async_info); - m->context = context; - g_object_ref(context); - m->store = store; -@@ -1685,7 +1699,7 @@ dump_fi (CamelFolderInfo *fi, int depth) - #endif - - struct _EMFolderTreeGetFolderInfo { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - GtkTreeRowReference *root; -@@ -1698,10 +1712,9 @@ struct _EMFolderTreeGetFolderInfo { - CamelFolderInfo *fi; - }; - --static char * --emft_get_folder_info__desc(struct _mail_msg *mm, int done) -+static gchar * -+emft_get_folder_info__desc (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *)mm; - char *ret, *name; - - name = camel_service_get_name((CamelService *)m->store, TRUE); -@@ -1711,18 +1724,16 @@ emft_get_folder_info__desc(struct _mail_ - } - - static void --emft_get_folder_info__get (struct _mail_msg *mm) -+emft_get_folder_info__exec (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; - guint32 flags = m->flags | CAMEL_STORE_FOLDER_INFO_SUBSCRIBED; - -- m->fi = camel_store_get_folder_info (m->store, m->top, flags, &mm->ex); -+ m->fi = camel_store_get_folder_info (m->store, m->top, flags, &m->base.ex); - } - - static void --emft_get_folder_info__got (struct _mail_msg *mm) -+emft_get_folder_info__done (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; - struct _EMFolderTreePrivate *priv = m->emft->priv; - struct _EMFolderTreeModelStoreInfo *si; - GtkTreeIter root, iter; -@@ -1750,7 +1761,7 @@ emft_get_folder_info__got (struct _mail_ - gtk_tree_model_get_iter ((GtkTreeModel *) model, &root, path); - - /* if we had an error, then we need to re-set the load subdirs state and collapse the node */ -- if (!m->fi && camel_exception_is_set(&mm->ex)) { -+ if (!m->fi && camel_exception_is_set(&m->base.ex)) { - gtk_tree_store_set(model, &root, COL_BOOL_LOAD_SUBDIRS, TRUE, -1); - gtk_tree_view_collapse_row (priv->treeview, path); - gtk_tree_path_free (path); -@@ -1805,10 +1816,8 @@ emft_get_folder_info__got (struct _mail_ - } - - static void --emft_get_folder_info__free (struct _mail_msg *mm) -+emft_get_folder_info__free (struct _EMFolderTreeGetFolderInfo *m) - { -- struct _EMFolderTreeGetFolderInfo *m = (struct _EMFolderTreeGetFolderInfo *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - - gtk_tree_row_reference_free (m->root); -@@ -1817,11 +1826,12 @@ emft_get_folder_info__free (struct _mail - g_free (m->top); - } - --static struct _mail_msg_op get_folder_info_op = { -- emft_get_folder_info__desc, -- emft_get_folder_info__get, -- emft_get_folder_info__got, -- emft_get_folder_info__free, -+static MailMsgInfo get_folder_info_info = { -+ sizeof (struct _EMFolderTreeGetFolderInfo), -+ (MailMsgDescFunc) emft_get_folder_info__desc, -+ (MailMsgExecFunc) emft_get_folder_info__exec, -+ (MailMsgDoneFunc) emft_get_folder_info__done, -+ (MailMsgFreeFunc) emft_get_folder_info__free - }; - - static void -@@ -1884,7 +1894,7 @@ emft_tree_row_expanded (GtkTreeView *tre - - gtk_tree_store_set((GtkTreeStore *)model, root, COL_BOOL_LOAD_SUBDIRS, FALSE, -1); - -- m = mail_msg_new (&get_folder_info_op, NULL, sizeof (struct _EMFolderTreeGetFolderInfo)); -+ m = mail_msg_new (&get_folder_info_info); - m->root = gtk_tree_row_reference_new (model, tree_path); - camel_object_ref (store); - m->store = store; -@@ -1893,7 +1903,7 @@ emft_tree_row_expanded (GtkTreeView *tre - m->top = full_name; - m->flags = CAMEL_STORE_FOLDER_INFO_RECURSIVE|CAMEL_STORE_FOLDER_INFO_FAST; - -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static gboolean -diff -up evolution-2.21.4/mail/em-folder-browser.c.kill-ethread evolution-2.21.4/mail/em-folder-browser.c ---- evolution-2.21.4/mail/em-folder-browser.c.kill-ethread 2007-12-17 00:36:19.000000000 -0500 -+++ evolution-2.21.4/mail/em-folder-browser.c 2007-12-17 12:33:07.000000000 -0500 -@@ -908,7 +908,7 @@ get_view_query (ESearchBar *esb, CamelFo - - - struct _setup_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelFolder *folder; - char *query; -@@ -916,16 +916,15 @@ struct _setup_msg { - GList *sources_folder; - }; - --static char * --vfolder_setup_desc(struct _mail_msg *mm, int done) -+static gchar * -+vfolder_setup_desc(struct _setup_msg *m) - { - return g_strdup(_("Searching")); - } - - static void --vfolder_setup_do(struct _mail_msg *mm) -+vfolder_setup_exec(struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l, *list = NULL; - CamelFolder *folder; - -@@ -936,12 +935,12 @@ vfolder_setup_do(struct _mail_msg *mm) - l = m->sources_uri; - while (l) { - d(printf(" Adding uri: %s\n", (char *)l->data)); -- folder = mail_tool_uri_to_folder (l->data, 0, &mm->ex); -+ folder = mail_tool_uri_to_folder (l->data, 0, &m->base.ex); - if (folder) { - list = g_list_append(list, folder); - } else { - g_warning("Could not open vfolder source: %s", (char *)l->data); -- camel_exception_clear(&mm->ex); -+ camel_exception_clear(&m->base.ex); - } - l = l->next; - } -@@ -965,17 +964,13 @@ vfolder_setup_do(struct _mail_msg *mm) - } - - static void --vfolder_setup_done(struct _mail_msg *mm) -+vfolder_setup_done(struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; -- -- m = m; - } - - static void --vfolder_setup_free (struct _mail_msg *mm) -+vfolder_setup_free (struct _setup_msg *m) - { -- struct _setup_msg *m = (struct _setup_msg *)mm; - GList *l; - - camel_object_unref(m->folder); -@@ -996,11 +991,12 @@ vfolder_setup_free (struct _mail_msg *mm - g_list_free(m->sources_folder); - } - --static struct _mail_msg_op vfolder_setup_op = { -- vfolder_setup_desc, -- vfolder_setup_do, -- vfolder_setup_done, -- vfolder_setup_free, -+static MailMsgInfo vfolder_setup_info = { -+ sizeof (struct _setup_msg), -+ (MailMsgDescFunc) vfolder_setup_desc, -+ (MailMsgExecFunc) vfolder_setup_exec, -+ (MailMsgDoneFunc) vfolder_setup_done, -+ (MailMsgFreeFunc) vfolder_setup_free - }; - - /* sources_uri should be camel uri's */ -@@ -1010,15 +1006,15 @@ vfolder_setup(CamelFolder *folder, const - struct _setup_msg *m; - int id; - -- m = mail_msg_new(&vfolder_setup_op, NULL, sizeof (*m)); -+ m = mail_msg_new(&vfolder_setup_info); - m->folder = folder; - camel_object_ref(folder); - m->query = g_strdup(query); - m->sources_uri = sources_uri; - m->sources_folder = sources_folder; - -- id = m->msg.seq; -- e_thread_put(mail_thread_queued_slow, (EMsg *)m); -+ id = m->base.seq; -+ mail_msg_slow_ordered_push (m); - - return id; - } -diff -up evolution-2.21.4/mail/message-list.c.kill-ethread evolution-2.21.4/mail/message-list.c ---- evolution-2.21.4/mail/message-list.c.kill-ethread 2007-12-17 00:36:27.000000000 -0500 -+++ evolution-2.21.4/mail/message-list.c 2007-12-17 12:33:08.000000000 -0500 -@@ -1942,7 +1942,7 @@ ml_tree_drag_data_get (ETree *tree, int - /* TODO: merge this with the folder tree stuff via empopup targets */ - /* Drop handling */ - struct _drop_msg { -- struct _mail_msg msg; -+ MailMsg base; - - GdkDragContext *context; - -@@ -1959,11 +1959,9 @@ struct _drop_msg { - unsigned int aborted:1; - }; - --static char * --ml_drop_async_desc (struct _mail_msg *mm, int done) -+static gchar * -+ml_drop_async_desc (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *) mm; -- - if (m->move) - return g_strdup_printf(_("Moving messages into folder %s"), m->folder->full_name); - else -@@ -1971,13 +1969,11 @@ ml_drop_async_desc (struct _mail_msg *mm - } - - static void --ml_drop_async_drop(struct _mail_msg *mm) -+ml_drop_async_exec (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; -- - switch (m->info) { - case DND_X_UID_LIST: -- em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &mm->ex); -+ em_utils_selection_get_uidlist(m->selection, m->folder, m->action == GDK_ACTION_MOVE, &m->base.ex); - break; - case DND_MESSAGE_RFC822: - em_utils_selection_get_message(m->selection, m->folder); -@@ -1989,9 +1985,8 @@ ml_drop_async_drop(struct _mail_msg *mm) - } - - static void --ml_drop_async_done(struct _mail_msg *mm) -+ml_drop_async_done (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; - gboolean success, delete; - - /* ?? */ -@@ -1999,7 +1994,7 @@ ml_drop_async_done(struct _mail_msg *mm) - success = FALSE; - delete = FALSE; - } else { -- success = !camel_exception_is_set (&mm->ex); -+ success = !camel_exception_is_set (&m->base.ex); - delete = success && m->move && !m->moved; - } - -@@ -2007,10 +2002,8 @@ ml_drop_async_done(struct _mail_msg *mm) - } - - static void --ml_drop_async_free(struct _mail_msg *mm) -+ml_drop_async_free (struct _drop_msg *m) - { -- struct _drop_msg *m = (struct _drop_msg *)mm; -- - g_object_unref(m->context); - camel_object_unref(m->folder); - -@@ -2018,18 +2011,19 @@ ml_drop_async_free(struct _mail_msg *mm) - g_free(m->selection); - } - --static struct _mail_msg_op ml_drop_async_op = { -- ml_drop_async_desc, -- ml_drop_async_drop, -- ml_drop_async_done, -- ml_drop_async_free, -+static MailMsgInfo ml_drop_async_info = { -+ sizeof (struct _drop_msg), -+ (MailMsgDescFunc) ml_drop_async_desc, -+ (MailMsgExecFunc) ml_drop_async_exec, -+ (MailMsgDoneFunc) ml_drop_async_done, -+ (MailMsgFreeFunc) ml_drop_async_free - }; - - static void - ml_drop_action(struct _drop_msg *m) - { - m->move = m->action == GDK_ACTION_MOVE; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ mail_msg_unordered_push (m); - } - - static void -@@ -2056,7 +2050,7 @@ ml_drop_popup_cancel(EPopup *ep, EPopupI - struct _drop_msg *m = data; - - m->aborted = TRUE; -- mail_msg_free(&m->msg); -+ mail_msg_unref(m); - } - - static EPopupItem ml_drop_popup_menu[] = { -@@ -2086,7 +2080,7 @@ ml_tree_drag_data_received (ETree *tree, - if (!ml->folder || data->data == NULL || data->length == -1) - return; - -- m = mail_msg_new(&ml_drop_async_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&ml_drop_async_info); - m->context = context; - g_object_ref(context); - m->folder = ml->folder; -@@ -3811,7 +3805,7 @@ save_hide_state (MessageList *ml) - - /* ** REGENERATE MESSAGELIST ********************************************** */ - struct _regen_list_msg { -- struct _mail_msg msg; -+ MailMsg base; - - int complete; - -@@ -3841,16 +3835,15 @@ struct _regen_list_msg { - - */ - --static char * --regen_list_describe (struct _mail_msg *mm, gint complete) -+static gchar * -+regen_list_desc (struct _regen_list_msg *m) - { - return g_strdup (_("Generating message list")); - } - - static void --regen_list_regen (struct _mail_msg *mm) -+regen_list_exec (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; - GPtrArray *uids, *uidnew, *showuids, *searchuids = NULL; - CamelMessageInfo *info; - ETreePath cursor; -@@ -3885,7 +3878,7 @@ regen_list_regen (struct _mail_msg *mm) - } else - expr = "(match-all (not (system-flag \"deleted\")))"; - } -- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); - } else { - char *expr; - -@@ -3895,23 +3888,23 @@ regen_list_regen (struct _mail_msg *mm) - sprintf(expr, "(and (match-all (not (system-flag \"junk\")))\n %s)", m->search); - } else - expr = "(match-all (not (system-flag \"junk\")))"; -- searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, expr, &m->base.ex); - } else { - if (m->search) -- searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &mm->ex); -+ searchuids = uids = camel_folder_search_by_expression (m->folder, m->search, &m->base.ex); - else - uids = camel_folder_get_uids (m->folder); - } - } - -- if (camel_exception_is_set (&mm->ex)) -+ if (camel_exception_is_set (&m->base.ex)) - return; - - /* perform hiding */ - if (m->hideexpr && camel_folder_has_search_capability(m->folder)) { -- uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &mm->ex); -+ uidnew = camel_folder_search_by_expression (m->ml->folder, m->hideexpr, &m->base.ex); - /* well, lets not abort just because this faileld ... */ -- camel_exception_clear (&mm->ex); -+ camel_exception_clear (&m->base.ex); - - if (uidnew) { - MESSAGE_LIST_LOCK(m->ml, hide_lock); -@@ -3998,7 +3991,7 @@ regen_list_regen (struct _mail_msg *mm) - - e_profile_event_emit("list.threaduids", m->folder->full_name, 0); - -- if (!camel_operation_cancel_check(mm->cancel)) { -+ if (!camel_operation_cancel_check(m->base.cancel)) { - /* update/build a new tree */ - if (m->dotree) { - if (m->tree) -@@ -4027,17 +4020,15 @@ regen_list_regen (struct _mail_msg *mm) - } - - static void --regen_list_regened (struct _mail_msg *mm) -+regen_list_done (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; -- - if (m->ml->priv->destroyed) - return; - - if (!m->complete) - return; - -- if (camel_operation_cancel_check(mm->cancel)) -+ if (camel_operation_cancel_check(m->base.cancel)) - return; - - if (m->ml->folder != m->folder) -@@ -4101,9 +4092,8 @@ regen_list_regened (struct _mail_msg *mm - } - - static void --regen_list_free (struct _mail_msg *mm) -+regen_list_free (struct _regen_list_msg *m) - { -- struct _regen_list_msg *m = (struct _regen_list_msg *)mm; - int i; - - e_profile_event_emit("list.regenerated", m->folder->full_name, 0); -@@ -4131,11 +4121,12 @@ regen_list_free (struct _mail_msg *mm) - g_object_unref(m->ml); - } - --static struct _mail_msg_op regen_list_op = { -- regen_list_describe, -- regen_list_regen, -- regen_list_regened, -- regen_list_free, -+static MailMsgInfo regen_list_info = { -+ sizeof (struct _regen_list_msg), -+ (MailMsgDescFunc) regen_list_desc, -+ (MailMsgExecFunc) regen_list_exec, -+ (MailMsgDoneFunc) regen_list_done, -+ (MailMsgFreeFunc) regen_list_free - }; - - static gboolean -@@ -4145,7 +4136,7 @@ ml_regen_timeout(struct _regen_list_msg - - m->ml->regen = g_list_prepend(m->ml->regen, m); - /* TODO: we should manage our own thread stuff, would make cancelling outstanding stuff easier */ -- e_thread_put (mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - m->ml->regen_timeout_msg = NULL; - m->ml->regen_timeout_id = 0; -@@ -4161,7 +4152,7 @@ mail_regen_cancel(MessageList *ml) - GList *l = ml->regen; - - while (l) { -- struct _mail_msg *mm = l->data; -+ MailMsg *mm = l->data; - - if (mm->cancel) - camel_operation_cancel(mm->cancel); -@@ -4173,7 +4164,7 @@ mail_regen_cancel(MessageList *ml) - if (ml->regen_timeout_id) { - g_source_remove(ml->regen_timeout_id); - ml->regen_timeout_id = 0; -- mail_msg_free((struct _mail_msg *)ml->regen_timeout_msg); -+ mail_msg_unref(ml->regen_timeout_msg); - ml->regen_timeout_msg = NULL; - } - } -@@ -4208,7 +4199,7 @@ mail_regen_list (MessageList *ml, const - } - #endif - -- m = mail_msg_new (®en_list_op, NULL, sizeof (*m)); -+ m = mail_msg_new (®en_list_info); - m->ml = ml; - m->search = g_strdup (search); - m->hideexpr = g_strdup (hideexpr); -diff -up evolution-2.21.4/mail/em-sync-stream.h.kill-ethread evolution-2.21.4/mail/em-sync-stream.h ---- evolution-2.21.4/mail/em-sync-stream.h.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/em-sync-stream.h 2007-12-17 12:33:08.000000000 -0500 -@@ -29,41 +29,45 @@ requests are always handled in the main - #ifndef EM_SYNC_STREAM_H - #define EM_SYNC_STREAM_H - --#ifdef __cplusplus --extern "C" { --#pragma } --#endif /* __cplusplus */ -- --#define EM_SYNC_STREAM_TYPE (em_sync_stream_get_type ()) --#define EM_SYNC_STREAM(obj) (CAMEL_CHECK_CAST((obj), EM_SYNC_STREAM_TYPE, EMSyncStream)) --#define EM_SYNC_STREAM_CLASS(k) (CAMEL_CHECK_CLASS_CAST ((k), EM_SYNC_STREAM_TYPE, EMSyncStreamClass)) --#define EM_IS_SYNC_STREAM(o) (CAMEL_CHECK_TYPE((o), EM_SYNC_STREAM_TYPE)) -- - #include - #include - --typedef struct _EMSyncStream { -- CamelStream parent_stream; -- -- struct _EMSyncStreamPrivate *priv; -+#define EM_SYNC_STREAM_TYPE \ -+ (em_sync_stream_get_type ()) -+#define EM_SYNC_STREAM(obj) \ -+ (CAMEL_CHECK_CAST \ -+ ((obj), EM_SYNC_STREAM_TYPE, EMSyncStream)) -+#define EM_SYNC_STREAM_CLASS(cls) \ -+ (CAMEL_CHECK_CLASS_CAST \ -+ ((cls), EM_SYNC_STREAM_TYPE, EMSyncStreamClass)) -+#define EM_IS_SYNC_STREAM(obj) \ -+ (CAMEL_CHECK_TYPE ((obj), EM_SYNC_STREAM_TYPE)) -+ -+G_BEGIN_DECLS -+ -+typedef struct _EMSyncStream EMSyncStream; -+typedef struct _EMSyncStreamClass EMSyncStreamClass; -+ -+struct _EMSyncStream { -+ CamelStream parent; -+ GString *buffer; -+ gboolean cancel; -+}; - -- int cancel; --} EMSyncStream; -- --typedef struct { -+struct _EMSyncStreamClass { - CamelStreamClass parent_class; - -- ssize_t (*sync_write) (CamelStream *stream, const char *buffer, size_t n); -- int (*sync_close) (CamelStream *stream); -- int (*sync_flush) (CamelStream *stream); -- --} EMSyncStreamClass; -- --CamelType em_sync_stream_get_type (void); --void em_sync_stream_set_buffer_size(EMSyncStream *, size_t size); -- --#ifdef __cplusplus --} --#endif /* __cplusplus */ -+ gssize (*sync_write) (CamelStream *stream, -+ const gchar *string, -+ gsize len); -+ int (*sync_close) (CamelStream *stream); -+ int (*sync_flush) (CamelStream *stream); -+}; -+ -+CamelType em_sync_stream_get_type (void); -+void em_sync_stream_set_buffer_size (EMSyncStream *stream, -+ gsize size); -+ -+G_END_DECLS - - #endif /* EM_SYNC_STREAM_H */ -diff -up evolution-2.21.4/mail/em-format-html-print.c.kill-ethread evolution-2.21.4/mail/em-format-html-print.c ---- evolution-2.21.4/mail/em-format-html-print.c.kill-ethread 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.4/mail/em-format-html-print.c 2007-12-17 12:33:07.000000000 -0500 -@@ -228,7 +228,7 @@ em_format_html_print_message (EMFormatHT - g_object_ref (efhp); - - mail_get_message ( -- folder, uid, emfhp_got_message, efhp, mail_thread_new); -+ folder, uid, emfhp_got_message, efhp, mail_msg_unordered_push); - } - - void -diff -up evolution-2.21.4/mail/em-sync-stream.c.kill-ethread evolution-2.21.4/mail/em-sync-stream.c ---- evolution-2.21.4/mail/em-sync-stream.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/em-sync-stream.c 2007-12-17 12:33:08.000000000 -0500 -@@ -25,42 +25,17 @@ - #include - #endif - --#include -+#include "em-sync-stream.h" -+ - #include --#include -+#include - #include --#include --#include "em-sync-stream.h" -+#include - - #include "mail-mt.h" - --#define LOG_STREAM -- --#define d(x) -- - #define EMSS_CLASS(x) ((EMSyncStreamClass *)(((CamelObject *)(x))->klass)) - --struct _EMSyncStreamPrivate { -- /* FIXME: use a single data port/gui channel for all instances */ -- /* TODO: possibly just use one of the mail-mt ports ... */ -- struct _EMsgPort *data_port, *reply_port; -- struct _GIOChannel *gui_channel; -- guint gui_watch; -- -- char *buf_data; -- int buf_used; -- int buf_size; -- --#ifdef LOG_STREAM -- FILE *logfd; --#endif --}; -- --#ifdef LOG_STREAM --static int dolog; --#endif -- --/* Should probably expose messages to outside world ... so subclasses can extend */ - enum _write_msg_t { - EMSS_WRITE, - EMSS_FLUSH, -@@ -68,275 +43,168 @@ enum _write_msg_t { - }; - - struct _write_msg { -- EMsg msg; -+ EMSyncStream *emss; -+ EFlag *done; - - enum _write_msg_t op; - -- const char *data; -- size_t n; -+ const gchar *string; -+ gsize len; - }; - --static void em_sync_stream_class_init (EMSyncStreamClass *klass); --static void em_sync_stream_init (CamelObject *object); --static void em_sync_stream_finalize (CamelObject *object); -- --static ssize_t stream_write(CamelStream *stream, const char *buffer, size_t n); --static int stream_close(CamelStream *stream); --static int stream_flush(CamelStream *stream); -- - static CamelStreamClass *parent_class = NULL; - --CamelType --em_sync_stream_get_type (void) --{ -- static CamelType type = CAMEL_INVALID_TYPE; -- -- if (type == CAMEL_INVALID_TYPE) { --#ifdef LOG_STREAM -- dolog = getenv("EVOLUTION_MAIL_LOG_HTML") != NULL; --#endif -- type = camel_type_register (CAMEL_STREAM_TYPE, -- "EMSyncStream", -- sizeof (EMSyncStream), -- sizeof (EMSyncStreamClass), -- (CamelObjectClassInitFunc) em_sync_stream_class_init, -- NULL, -- (CamelObjectInitFunc) em_sync_stream_init, -- (CamelObjectFinalizeFunc) em_sync_stream_finalize); -- } -- -- return type; --} -- --static void --em_sync_stream_class_init (EMSyncStreamClass *klass) --{ -- CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (klass); -- -- parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; -- -- /* virtual method overload */ -- stream_class->write = stream_write; -- stream_class->flush = stream_flush; -- stream_class->close = stream_close; --} -- - static gboolean --emcs_gui_received(GIOChannel *source, GIOCondition cond, void *data) -+emss_process_message (struct _write_msg *msg) - { -- EMSyncStream *emss = data; -- struct _EMSyncStreamPrivate *p = emss->priv; -- struct _write_msg *msg; -- -- d(printf("%p: gui sync op job waiting\n", emss)); -- -- msg = (struct _write_msg *)e_msgport_get(p->data_port); -- /* Should never happen ... */ -- if (msg == NULL) -- return TRUE; -- -- d(printf("%p: running sync op %d\n", emss, msg->op)); -- -- /* force out any pending data before doing anything else */ -- if (p->buf_used > 0) { -- EMSS_CLASS(emss)->sync_write((CamelStream *)emss, p->buf_data, p->buf_used); --#ifdef LOG_STREAM -- if (p->logfd) -- fwrite(p->buf_data, 1, p->buf_used, p->logfd); --#endif -- p->buf_used = 0; -- } -+ struct _EMSyncStream *emss = msg->emss; - -- /* FIXME: need to handle return values */ -+ /* Force out any pending data before doing anything else. */ -+ if (emss->buffer != NULL && emss->buffer->len > 0) { -+ EMSS_CLASS (emss)->sync_write ( -+ CAMEL_STREAM (emss), emss->buffer->str, -+ emss->buffer->len); -+ g_string_set_size (emss->buffer, 0); -+ } - - switch (msg->op) { -- case EMSS_WRITE: -- EMSS_CLASS(emss)->sync_write((CamelStream *)emss, msg->data, msg->n); --#ifdef LOG_STREAM -- if (p->logfd) -- fwrite(msg->data, 1, msg->n, p->logfd); --#endif -- break; -- case EMSS_FLUSH: -- EMSS_CLASS(emss)->sync_flush((CamelStream *)emss); -- break; -- case EMSS_CLOSE: -- EMSS_CLASS(emss)->sync_close((CamelStream *)emss); --#ifdef LOG_STREAM -- if (p->logfd) { -- fclose(p->logfd); -- p->logfd = NULL; -- } --#endif -- break; -+ case EMSS_WRITE: -+ EMSS_CLASS (emss)->sync_write ( -+ CAMEL_STREAM (emss), msg->string, msg->len); -+ break; -+ case EMSS_FLUSH: -+ EMSS_CLASS (emss)->sync_flush ( -+ CAMEL_STREAM (emss)); -+ break; -+ case EMSS_CLOSE: -+ EMSS_CLASS (emss)->sync_close ( -+ CAMEL_STREAM (emss)); -+ break; - } - -- e_msgport_reply((EMsg *)msg); -- d(printf("%p: gui sync op jobs done\n", emss)); -- -- return TRUE; --} -- --static void --em_sync_stream_init (CamelObject *object) --{ -- EMSyncStream *emss = (EMSyncStream *)object; -- struct _EMSyncStreamPrivate *p; -- -- p = emss->priv = g_malloc0(sizeof(*p)); -- -- p->data_port = e_msgport_new(); -- p->reply_port = e_msgport_new(); -+ e_flag_set (msg->done); - --#ifndef G_OS_WIN32 -- p->gui_channel = g_io_channel_unix_new(e_msgport_fd(p->data_port)); --#else -- p->gui_channel = g_io_channel_win32_new_socket(e_msgport_fd(p->data_port)); --#endif -- p->gui_watch = g_io_add_watch(p->gui_channel, G_IO_IN, emcs_gui_received, emss); -- --#ifdef LOG_STREAM -- if (dolog) { -- char name[32]; -- static int count; -- -- sprintf(name, "sync-stream.%d.html", count++); -- printf("Saving raw data stream to '%s'\n", name); -- p->logfd = fopen(name, "w"); -- } --#endif -- -- d(printf("%p: new emss\n", emss)); -+ return FALSE; - } - - static void --sync_op(EMSyncStream *emss, enum _write_msg_t op, const char *data, size_t n) -+emss_sync_op (EMSyncStream *emss, enum _write_msg_t op, -+ const gchar *string, gsize len) - { -- struct _EMSyncStreamPrivate *p = emss->priv; - struct _write_msg msg; -- EMsg *reply_msg; -- -- d(printf("%p: launching sync op %d\n", emss, op)); - -- /* we do everything synchronous, we should never have any locks, and -- this prevents overflow from banked up data */ -- -- msg.msg.reply_port = p->reply_port; -+ msg.done = e_flag_new (); -+ msg.emss = emss; - msg.op = op; -- msg.data = data; -- msg.n = n; -- -- e_msgport_put(p->data_port, &msg.msg); -- reply_msg = e_msgport_wait(p->reply_port); -- g_return_if_fail (reply_msg == &msg.msg); -- -- d(printf("%p: returned sync op %d\n", emss, op)); --} -- --static void --em_sync_stream_finalize (CamelObject *object) --{ -- EMSyncStream *emss = (EMSyncStream *)object; -- struct _EMSyncStreamPrivate *p = emss->priv; -- -- /* TODO: is this stuff safe to do in another thread? */ -- g_source_remove(p->gui_watch); -- g_io_channel_unref(p->gui_channel); -+ msg.string = string; -+ msg.len = len; - -- e_msgport_destroy(p->data_port); -- e_msgport_destroy(p->reply_port); -+ camel_object_ref (emss); - -- p->data_port = NULL; -- p->reply_port = NULL; -+ g_idle_add ((GSourceFunc) emss_process_message, &msg); - -- g_free(p->buf_data); -+ e_flag_wait (msg.done); -+ e_flag_free (msg.done); - --#ifdef LOG_STREAM -- if (p->logfd) -- fclose(p->logfd); --#endif -- -- g_free(p); -+ camel_object_unref (emss); - } - --static ssize_t --stream_write (CamelStream *stream, const char *buffer, size_t n) -+static gssize -+emss_stream_write (CamelStream *stream, const gchar *string, gsize len) - { - EMSyncStream *emss = EM_SYNC_STREAM (stream); -- struct _EMSyncStreamPrivate *p = emss->priv; - - if (emss->cancel) - return -1; - -- if (pthread_equal(pthread_self(), mail_gui_thread)) { -- EMSS_CLASS(emss)->sync_write(stream, buffer, n); --#ifdef LOG_STREAM -- if (p->logfd) -- fwrite(buffer, 1, n, p->logfd); --#endif -- } else if (p->buf_size > 0) { -- size_t left = p->buf_size-p->buf_used; -- -- if (n >= left) { -- sync_op(emss, EMSS_WRITE, buffer, n); -- } else { -- memcpy(p->buf_data + p->buf_used, buffer, n); -- p->buf_used += n; -- } -+ if (mail_in_main_thread ()) { -+ EMSS_CLASS (emss)->sync_write (stream, string, len); -+ } else if (emss->buffer != NULL) { -+ if (len < (emss->buffer->allocated_len - emss->buffer->len)) -+ g_string_append_len (emss->buffer, string, len); -+ else -+ emss_sync_op (emss, EMSS_WRITE, string, len); - } else { -- sync_op(emss, EMSS_WRITE, buffer, n); -+ emss_sync_op(emss, EMSS_WRITE, string, len); - } - -- return (ssize_t) n; -+ return (gssize) len; - } - - static int --stream_flush(CamelStream *stream) -+emss_stream_flush (CamelStream *stream) - { -- EMSyncStream *emss = (EMSyncStream *)stream; -+ EMSyncStream *emss = EM_SYNC_STREAM (stream); - - if (emss->cancel) - return -1; - -- if (pthread_equal(pthread_self(), mail_gui_thread)) -- return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_flush(stream); -+ if (mail_in_main_thread ()) -+ return EMSS_CLASS (emss)->sync_flush (stream); - else -- sync_op(emss, EMSS_FLUSH, NULL, 0); -+ emss_sync_op (emss, EMSS_FLUSH, NULL, 0); - - return 0; - } - - static int --stream_close(CamelStream *stream) -+emss_stream_close (CamelStream *stream) - { -- EMSyncStream *emss = (EMSyncStream *)stream; -+ EMSyncStream *emss = EM_SYNC_STREAM (stream); - - if (emss->cancel) - return -1; - -- d(printf("%p: closing stream\n", stream)); -- -- if (pthread_equal(pthread_self(), mail_gui_thread)) { --#ifdef LOG_STREAM -- if (emss->priv->logfd) { -- fclose(emss->priv->logfd); -- emss->priv->logfd = NULL; -- } --#endif -- return ((EMSyncStreamClass *)(((CamelObject *)emss)->klass))->sync_close(stream); -- } else -- sync_op(emss, EMSS_CLOSE, NULL, 0); -+ if (mail_in_main_thread ()) -+ return EMSS_CLASS (emss)->sync_close (stream); -+ else -+ emss_sync_op (emss, EMSS_CLOSE, NULL, 0); - - return 0; - } - --void --em_sync_stream_set_buffer_size(EMSyncStream *emss, size_t size) -+static void -+em_sync_stream_class_init (EMSyncStreamClass *class) -+{ -+ CamelStreamClass *stream_class = CAMEL_STREAM_CLASS (class); -+ -+ parent_class = (CamelStreamClass *) CAMEL_STREAM_TYPE; -+ -+ stream_class->write = emss_stream_write; -+ stream_class->flush = emss_stream_flush; -+ stream_class->close = emss_stream_close; -+} -+ -+static void -+em_sync_stream_finalize (EMSyncStream *emss) -+{ -+ if (emss->buffer != NULL) -+ g_string_free (emss->buffer, TRUE); -+} -+ -+CamelType -+em_sync_stream_get_type (void) - { -- struct _EMSyncStreamPrivate *p = emss->priv; -+ static CamelType type = CAMEL_INVALID_TYPE; -+ -+ if (G_UNLIKELY (type == CAMEL_INVALID_TYPE)) -+ type = camel_type_register ( -+ CAMEL_STREAM_TYPE, -+ "EMSyncStream", -+ sizeof (EMSyncStream), -+ sizeof (EMSyncStreamClass), -+ (CamelObjectClassInitFunc) em_sync_stream_class_init, -+ NULL, -+ (CamelObjectInitFunc) NULL, -+ (CamelObjectFinalizeFunc) em_sync_stream_finalize); - -- g_free(p->buf_data); -- p->buf_data = g_malloc(size); -- p->buf_size = size; -- p->buf_used = 0; -+ return type; -+} -+ -+void -+em_sync_stream_set_buffer_size (EMSyncStream *emss, gsize size) -+{ -+ if (emss->buffer != NULL) -+ g_string_free (emss->buffer, TRUE); -+ emss->buffer = g_string_sized_new (size); - } -diff -up evolution-2.21.4/mail/em-subscribe-editor.c.kill-ethread evolution-2.21.4/mail/em-subscribe-editor.c ---- evolution-2.21.4/mail/em-subscribe-editor.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/em-subscribe-editor.c 2007-12-17 12:33:07.000000000 -0500 -@@ -173,7 +173,7 @@ sub_unref(EMSubscribe *sub) - /* ** Subscribe folder operation **************************************** */ - - struct _zsubscribe_msg { -- struct _mail_msg msg; -+ MailMsg base; - - EMSubscribe *sub; - EMSubscribeNode *node; -@@ -182,20 +182,18 @@ struct _zsubscribe_msg { - }; - - static void --sub_folder_subscribe (struct _mail_msg *mm) -+sub_folder_exec (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; -- - if (m->subscribe) -- camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); - else -- camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &mm->ex); -+ camel_store_unsubscribe_folder (m->sub->store, m->node->info->full_name, &m->base.ex); - } - - static void --sub_folder_subscribed (struct _mail_msg *mm) -+sub_folder_done (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *)mm, *next; -+ struct _zsubscribe_msg *next; - GtkTreeIter iter; - GtkTreeModel *model; - EMSubscribeNode *node; -@@ -205,7 +203,7 @@ sub_folder_subscribed (struct _mail_msg - if (m->sub->cancel) - return; - -- if (!camel_exception_is_set(&mm->ex)) { -+ if (!camel_exception_is_set(&m->base.ex)) { - if (m->subscribe) - m->node->info->flags |= CAMEL_FOLDER_SUBSCRIBED; - else -@@ -226,8 +224,8 @@ sub_folder_subscribed (struct _mail_msg - /* queue any further ones, or if out, update the ui */ - next = (struct _zsubscribe_msg *)e_dlist_remhead(&m->sub->subscribe); - if (next) { -- next->sub->subscribe_id = next->msg.seq; -- e_thread_put(mail_thread_new, (EMsg *)next); -+ next->sub->subscribe_id = next->base.seq; -+ mail_msg_unordered_push (next); - } else { - /* should it go off the model instead? */ - sub_selection_changed(gtk_tree_view_get_selection(m->sub->tree), m->sub); -@@ -235,19 +233,18 @@ sub_folder_subscribed (struct _mail_msg - } - - static void --sub_folder_free (struct _mail_msg *mm) -+sub_folder_free (struct _zsubscribe_msg *m) - { -- struct _zsubscribe_msg *m = (struct _zsubscribe_msg *) mm; -- - g_free(m->path); - sub_unref(m->sub); - } - --static struct _mail_msg_op sub_subscribe_folder_op = { -- NULL, /*subscribe_folder_desc,*/ -- sub_folder_subscribe, -- sub_folder_subscribed, -- sub_folder_free, -+static MailMsgInfo sub_subscribe_folder_info = { -+ sizeof (struct _zsubscribe_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) sub_folder_exec, -+ (MailMsgDoneFunc) sub_folder_done, -+ (MailMsgFreeFunc) sub_folder_free - }; - - /* spath is tree path in string form */ -@@ -257,18 +254,18 @@ sub_subscribe_folder (EMSubscribe *sub, - struct _zsubscribe_msg *m; - int id; - -- m = mail_msg_new (&sub_subscribe_folder_op, NULL, sizeof(*m)); -+ m = mail_msg_new (&sub_subscribe_folder_info); - m->sub = sub; - sub_ref(sub); - m->node = node; - m->subscribe = state; - m->path = g_strdup(spath); - -- id = m->msg.seq; -+ id = m->base.seq; - if (sub->subscribe_id == -1) { - sub->subscribe_id = id; - d(printf("running subscribe folder '%s'\n", spath)); -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - } else { - d(printf("queueing subscribe folder '%s'\n", spath)); - e_dlist_addtail(&sub->subscribe, (EDListNode *)m); -@@ -339,7 +336,7 @@ sub_fill_level(EMSubscribe *sub, CamelFo - /* async query of folderinfo */ - - struct _emse_folderinfo_msg { -- struct _mail_msg msg; -+ MailMsg base; - - int seq; - -@@ -349,31 +346,29 @@ struct _emse_folderinfo_msg { - }; - - static void --sub_folderinfo_get (struct _mail_msg *mm) -+sub_folderinfo_exec (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; - char *pub_full_name=NULL; - - if (m->seq == m->sub->seq) { -- camel_operation_register(mm->cancel); -- m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &mm->ex); -- camel_operation_unregister(mm->cancel); -+ camel_operation_register(m->base.cancel); -+ m->info = camel_store_get_folder_info(m->sub->store, m->node?m->node->info->full_name:pub_full_name, CAMEL_STORE_FOLDER_INFO_FAST | CAMEL_STORE_FOLDER_INFO_NO_VIRTUAL, &m->base.ex); -+ camel_operation_unregister(m->base.cancel); - } - } - - static void --sub_folderinfo_got(struct _mail_msg *mm) -+sub_folderinfo_done (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; - EMSubscribeNode *node; - - m->sub->pending_id = -1; - if (m->sub->cancel || m->seq != m->sub->seq) - return; - -- if (camel_exception_is_set (&mm->ex)) { -+ if (camel_exception_is_set (&m->base.ex)) { - g_warning ("Error getting folder info from store: %s", -- camel_exception_get_description (&mm->ex)); -+ camel_exception_get_description (&m->base.ex)); - } - - if (m->info) { -@@ -394,10 +389,8 @@ sub_folderinfo_got(struct _mail_msg *mm) - } - - static void --sub_folderinfo_free(struct _mail_msg *mm) -+sub_folderinfo_free (struct _emse_folderinfo_msg *m) - { -- struct _emse_folderinfo_msg *m = (struct _emse_folderinfo_msg *) mm; -- - if (m->info) - m->sub->info_list = g_slist_prepend(m->sub->info_list, m->info); - -@@ -413,11 +406,12 @@ sub_folderinfo_free(struct _mail_msg *mm - sub_unref(m->sub); - } - --static struct _mail_msg_op sub_folderinfo_op = { -- NULL, /*sub_folderinfo_desc, we do our own progress reporting/cancellation */ -- sub_folderinfo_get, -- sub_folderinfo_got, -- sub_folderinfo_free, -+static MailMsgInfo sub_folderinfo_info = { -+ sizeof (struct _emse_folderinfo_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) sub_folderinfo_exec, -+ (MailMsgDoneFunc) sub_folderinfo_done, -+ (MailMsgFreeFunc) sub_folderinfo_free - }; - - static int -@@ -429,19 +423,19 @@ sub_queue_fill_level(EMSubscribe *sub, E - d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, - node?node->info->full_name:"")); - -- m = mail_msg_new (&sub_folderinfo_op, NULL, sizeof(*m)); -+ m = mail_msg_new (&sub_folderinfo_info); - sub_ref(sub); - m->sub = sub; - m->node = node; - m->seq = sub->seq; - -- sub->pending_id = m->msg.seq; -+ sub->pending_id = m->base.seq; - - sub_editor_busy(sub->editor, 1); - -- id = m->msg.seq; -+ id = m->base.seq; - -- e_thread_put (mail_thread_new, (EMsg *)m); -+ mail_msg_unordered_push (m); - return id; - } - -@@ -571,7 +565,7 @@ sub_destroy(GtkWidget *w, EMSubscribe *s - mail_msg_cancel(sub->subscribe_id); - - while ( (m = (struct _zsubscribe_msg *)e_dlist_remhead(&sub->subscribe)) ) -- mail_msg_free(m); -+ mail_msg_unref(m); - - sub_unref(sub); - } -diff -up evolution-2.21.4/mail/mail-mt.h.kill-ethread evolution-2.21.4/mail/mail-mt.h ---- evolution-2.21.4/mail/mail-mt.h.kill-ethread 2007-12-16 14:30:32.000000000 -0500 -+++ evolution-2.21.4/mail/mail-mt.h 2007-12-17 12:33:08.000000000 -0500 -@@ -23,48 +23,65 @@ - #ifndef _MAIL_MT - #define _MAIL_MT - --#include - #include "camel/camel-exception.h" --#include "libedataserver/e-msgport.h" - #include "camel/camel-object.h" - #include "camel/camel-operation.h" - --typedef struct _mail_msg { -- EMsg msg; /* parent type */ -- struct _mail_msg_op *ops; /* operation functions */ -+typedef struct _MailMsg MailMsg; -+typedef struct _MailMsgInfo MailMsgInfo; -+typedef struct _MailMsgPrivate MailMsgPrivate; -+ -+typedef gchar * (*MailMsgDescFunc) (MailMsg *msg); -+typedef void (*MailMsgExecFunc) (MailMsg *msg); -+typedef void (*MailMsgDoneFunc) (MailMsg *msg); -+typedef void (*MailMsgFreeFunc) (MailMsg *msg); -+typedef void (*MailMsgDispatchFunc) (gpointer msg); -+ -+struct _MailMsg { -+ MailMsgInfo *info; -+ volatile gint ref_count; - unsigned int seq; /* seq number for synchronisation */ -+ gint priority; /* priority (default = 0) */ - CamelOperation *cancel; /* a cancellation/status handle */ - CamelException ex; /* an initialised camel exception, upto the caller to use this */ -- struct _mail_msg_priv *priv; /* private for internal use */ --} mail_msg_t; -+ MailMsgPrivate *priv; -+}; - --/* callback functions for thread message */ --typedef struct _mail_msg_op { -- char *(*describe_msg)(struct _mail_msg *msg, int complete); -- -- void (*receive_msg)(struct _mail_msg *msg); /* message received */ -- void (*reply_msg)(struct _mail_msg *msg); /* message replied */ -- void (*destroy_msg)(struct _mail_msg *msg); /* finalise message */ --} mail_msg_op_t; -+struct _MailMsgInfo { -+ gsize size; -+ MailMsgDescFunc desc; -+ MailMsgExecFunc exec; -+ MailMsgDoneFunc done; -+ MailMsgFreeFunc free; -+}; - - /* setup ports */ - void mail_msg_init(void); - void mail_msg_cleanup (void); - -+gboolean mail_in_main_thread (void); -+ - /* allocate a new message */ --void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size); --void mail_msg_free(void *msg); --void mail_msg_check_error(void *msg); -+gpointer mail_msg_new (MailMsgInfo *info); -+gpointer mail_msg_ref (gpointer msg); -+void mail_msg_unref (gpointer msg); -+void mail_msg_check_error (gpointer msg); - void mail_msg_cancel(unsigned int msgid); - void mail_msg_wait(unsigned int msgid); - void mail_msg_wait_all(void); - int mail_msg_active(unsigned int msgid); - -+/* dispatch a message */ -+void mail_msg_main_loop_push (gpointer msg); -+void mail_msg_unordered_push (gpointer msg); -+void mail_msg_fast_ordered_push (gpointer msg); -+void mail_msg_slow_ordered_push (gpointer msg); -+ - /* To implement the stop button */ --void *mail_cancel_hook_add(GDestroyNotify func, void *data); --void mail_cancel_hook_remove(void *handle); --void mail_cancel_all(void); --void mail_msg_set_cancelable (struct _mail_msg *msg, gboolean status); -+GHook * mail_cancel_hook_add (GHookFunc func, gpointer data); -+void mail_cancel_hook_remove (GHook *hook); -+void mail_cancel_all (void); -+void mail_msg_set_cancelable (gpointer msg, gboolean status); - - /* request a string/password */ - char *mail_get_password (CamelService *service, const char *prompt, -@@ -113,24 +130,6 @@ void *mail_call_main(mail_call_t type, M - void mail_enable_stop(void); - void mail_disable_stop(void); - --/* a message port that receives messages in the gui thread, used for sending port */ --extern EMsgPort *mail_gui_port; --/* a message port that receives messages in the gui thread, used for the reply port */ --extern EMsgPort *mail_gui_reply_port; -- --/* some globally available threads */ --#ifndef G_OS_WIN32 --extern EThread *mail_thread_queued; /* for operations that can (or should) be queued */ --#else --EThread *mail_win32_get_mail_thread_queued (void); --#define mail_thread_queued mail_win32_get_mail_thread_queued () --#endif --extern EThread *mail_thread_new; /* for operations that should run in a new thread each time */ --extern EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */ -- --/* The main thread. */ --extern pthread_t mail_gui_thread; -- - /* A generic proxy event for anything that can be proxied during the life of the mailer (almost nothing) */ - /* Note that almost all objects care about the lifecycle of their events, so this cannot be used */ - extern MailAsyncEvent *mail_async_event; -diff -up evolution-2.21.4/mail/mail-ops.h.kill-ethread evolution-2.21.4/mail/mail-ops.h ---- evolution-2.21.4/mail/mail-ops.h.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/mail-ops.h 2007-12-17 12:33:08.000000000 -0500 -@@ -30,13 +30,14 @@ extern "C" { - #pragma } - #endif /* __cplusplus */ - -+#include "mail-mt.h" -+ - #include "camel/camel-store.h" - #include "camel/camel-folder.h" - #include "camel/camel-filter-driver.h" - #include "camel/camel-mime-message.h" - #include "camel/camel-operation.h" - --#include "libedataserver/e-msgport.h" - #include "libedataserver/e-account.h" - - void mail_append_mail (CamelFolder *folder, CamelMimeMessage *message, CamelMessageInfo *info, -@@ -55,12 +56,12 @@ void mail_transfer_messages (CamelFolder - void mail_get_message (CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data), - void *data, -- EThread *thread); -+ MailMsgDispatchFunc dispatch); - - void - mail_get_messagex(CamelFolder *folder, const char *uid, - void (*done) (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data, CamelException *), -- void *data, EThread *thread); -+ void *data, MailMsgDispatchFunc dispatch); - - /* get several messages */ - void mail_get_messages (CamelFolder *folder, GPtrArray *uids, -@@ -70,7 +71,7 @@ void mail_get_messages (CamelFolder *fol - /* same for a folder */ - int mail_get_folder (const char *uri, guint32 flags, - void (*done) (char *uri, CamelFolder *folder, void *data), void *data, -- EThread *thread); -+ MailMsgDispatchFunc dispatch); - - /* and for a store */ - int mail_get_store (const char *uri, CamelOperation *op, -diff -up evolution-2.21.4/mail/em-composer-utils.c.kill-ethread evolution-2.21.4/mail/em-composer-utils.c ---- evolution-2.21.4/mail/em-composer-utils.c.kill-ethread 2007-11-29 23:24:04.000000000 -0500 -+++ evolution-2.21.4/mail/em-composer-utils.c 2007-12-17 12:33:08.000000000 -0500 -@@ -557,7 +557,7 @@ em_utils_composer_save_draft_cb (EMsgCom - strcmp (account->drafts_folder_uri, default_drafts_folder_uri) != 0) { - int id; - -- id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_thread_new); -+ id = mail_get_folder (account->drafts_folder_uri, 0, save_draft_folder, &folder, mail_msg_unordered_push); - mail_msg_wait (id); - - if (!folder || !account->enabled) { -@@ -1108,7 +1108,7 @@ em_utils_redirect_message_by_uid (CamelF - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - -- mail_get_message (folder, uid, redirect_msg, NULL, mail_thread_new); -+ mail_get_message (folder, uid, redirect_msg, NULL, mail_msg_unordered_push); - } - - static void -@@ -1139,7 +1139,7 @@ em_utils_handle_receipt (CamelFolder *fo - } - - if (msg == NULL) { -- mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_thread_new); -+ mail_get_messagex(folder, uid, emu_handle_receipt_message, NULL, mail_msg_unordered_push); - camel_message_info_free(info); - return; - } -@@ -1953,7 +1953,7 @@ em_utils_reply_to_message(CamelFolder *f - rd->source = source; - if (rd->source) - g_object_ref(rd->source); -- mail_get_message(folder, uid, reply_to_message, rd, mail_thread_new); -+ mail_get_message(folder, uid, reply_to_message, rd, mail_msg_unordered_push); - - return; - } -@@ -2125,5 +2125,5 @@ em_utils_post_reply_to_message_by_uid (C - g_return_if_fail (CAMEL_IS_FOLDER (folder)); - g_return_if_fail (uid != NULL); - -- mail_get_message (folder, uid, post_reply_to_message, NULL, mail_thread_new); -+ mail_get_message (folder, uid, post_reply_to_message, NULL, mail_msg_unordered_push); - } -diff -up evolution-2.21.4/mail/mail-folder-cache.c.kill-ethread evolution-2.21.4/mail/mail-folder-cache.c ---- evolution-2.21.4/mail/mail-folder-cache.c.kill-ethread 2007-12-15 10:58:56.000000000 -0500 -+++ evolution-2.21.4/mail/mail-folder-cache.c 2007-12-17 12:33:08.000000000 -0500 -@@ -808,15 +808,14 @@ update_folders(CamelStore *store, CamelF - - - struct _ping_store_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelStore *store; - }; - --static char * --ping_store_desc (struct _mail_msg *mm, int done) -+static gchar * -+ping_store_desc (struct _ping_store_msg *m) - { -- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; - char *service_name = camel_service_get_name (CAMEL_SERVICE (m->store), TRUE); - char *msg; - -@@ -827,10 +826,9 @@ ping_store_desc (struct _mail_msg *mm, i - } - - static void --ping_store_ping (struct _mail_msg *mm) -+ping_store_exec (struct _ping_store_msg *m) - { - gboolean online = FALSE; -- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; - - if (CAMEL_SERVICE (m->store)->status == CAMEL_SERVICE_CONNECTED) { - if (CAMEL_IS_DISCO_STORE (m->store) && -@@ -841,22 +839,21 @@ ping_store_ping (struct _mail_msg *mm) - online = TRUE; - } - if (online) -- camel_store_noop (m->store, &mm->ex); -+ camel_store_noop (m->store, &m->base.ex); - } - - static void --ping_store_free (struct _mail_msg *mm) -+ping_store_free (struct _ping_store_msg *m) - { -- struct _ping_store_msg *m = (struct _ping_store_msg *) mm; -- - camel_object_unref (m->store); - } - --static struct _mail_msg_op ping_store_op = { -- ping_store_desc, -- ping_store_ping, -- NULL, -- ping_store_free -+static MailMsgInfo ping_store_info = { -+ sizeof (struct _ping_store_msg), -+ (MailMsgDescFunc) ping_store_desc, -+ (MailMsgExecFunc) ping_store_exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) ping_store_free - }; - - static void -@@ -868,11 +865,11 @@ ping_store (gpointer key, gpointer val, - if (CAMEL_SERVICE (store)->status != CAMEL_SERVICE_CONNECTED) - return; - -- m = mail_msg_new (&ping_store_op, NULL, sizeof (struct _ping_store_msg)); -+ m = mail_msg_new (&ping_store_info); - m->store = store; - camel_object_ref (store); - -- e_thread_put (mail_thread_queued_slow, (EMsg *) m); -+ mail_msg_slow_ordered_push (m); - } - - static gboolean -@@ -917,7 +914,7 @@ mail_note_store(CamelStore *store, Camel - int hook = 0; - - g_return_if_fail (CAMEL_IS_STORE(store)); -- g_return_if_fail (pthread_equal(pthread_self(), mail_gui_thread)); -+ g_return_if_fail (mail_in_main_thread()); - - LOCK(info_lock); - -diff -up evolution-2.21.4/mail/em-folder-view.c.kill-ethread evolution-2.21.4/mail/em-folder-view.c ---- evolution-2.21.4/mail/em-folder-view.c.kill-ethread 2007-12-17 00:36:27.000000000 -0500 -+++ evolution-2.21.4/mail/em-folder-view.c 2007-12-17 12:33:08.000000000 -0500 -@@ -72,6 +72,7 @@ - #include - - #include -+#include - - #include "menus/gal-view-etable.h" - #include "menus/gal-view-factory-etable.h" -@@ -778,7 +779,7 @@ emfv_got_folder(char *uri, CamelFolder * - static void - emfv_set_folder_uri(EMFolderView *emfv, const char *uri) - { -- mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_thread_queued); -+ mail_get_folder(uri, 0, emfv_got_folder, emfv, mail_msg_fast_ordered_push); - } - - static void -@@ -1885,7 +1886,7 @@ filter_type_uid (CamelFolder *folder, co - data->type = type; - data->source = source; - -- mail_get_message (folder, uid, filter_type_got_message, data, mail_thread_new); -+ mail_get_message (folder, uid, filter_type_got_message, data, mail_msg_unordered_push); - } - - static void -@@ -1983,7 +1984,7 @@ vfolder_type_uid (CamelFolder *folder, c - data->type = type; - data->uri = g_strdup (uri); - -- mail_get_message (folder, uid, vfolder_type_got_message, data, mail_thread_new); -+ mail_get_message (folder, uid, vfolder_type_got_message, data, mail_msg_unordered_push); - } - - static void -@@ -2560,7 +2561,7 @@ emfv_message_selected_timeout(void *data - emfv->displayed_uid); - gtk_html_stream_close(hstream, GTK_HTML_STREAM_OK); - */ -- mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_thread_queued); -+ mail_get_messagex(emfv->folder, emfv->displayed_uid, emfv_list_done_message_selected, emfv, mail_msg_fast_ordered_push); - } else { - e_profile_event_emit("goto.empty", "", 0); - g_free(emfv->priv->selected_uid); -diff -up evolution-2.21.4/mail/mail-session.c.kill-ethread evolution-2.21.4/mail/mail-session.c ---- evolution-2.21.4/mail/mail-session.c.kill-ethread 2007-12-17 00:33:20.000000000 -0500 -+++ evolution-2.21.4/mail/mail-session.c 2007-12-17 12:33:08.000000000 -0500 -@@ -35,7 +35,7 @@ - #include - - #include --#include -+#include - - #include /* FIXME: this is where camel_init is defined, it shouldn't include everything else */ - #include -@@ -265,21 +265,22 @@ forget_password (CamelSession *session, - - /* ********************************************************************** */ - --static GtkDialog *message_dialog; --static EDList message_list = E_DLIST_INITIALISER(message_list); -+static gpointer user_message_dialog; -+static GQueue user_message_queue = { NULL, NULL, 0 }; - - struct _user_message_msg { -- struct _mail_msg msg; -+ MailMsg base; - - CamelSessionAlertType type; - char *prompt; -+ EFlag *done; - - unsigned int allow_cancel:1; - unsigned int result:1; - unsigned int ismain:1; - }; - --static void do_user_message (struct _mail_msg *mm); -+static void user_message_exec (struct _user_message_msg *m); - - /* clicked, send back the reply */ - static void -@@ -287,126 +288,122 @@ user_message_response (GtkDialog *dialog - { - gtk_widget_destroy ((GtkWidget *) dialog); - -- message_dialog = NULL; -+ user_message_dialog = NULL; - - /* if !allow_cancel, then we've already replied */ - if (m->allow_cancel) { - m->result = button == GTK_RESPONSE_OK; -- e_msgport_reply((EMsg *)m); -+ e_flag_set (m->done); - } - - /* check for pendings */ -- if ((m = (struct _user_message_msg *)e_dlist_remhead(&message_list))) -- do_user_message((struct _mail_msg *)m); --} -- --static void --user_message_destroy_notify (struct _user_message_msg *m, GObject *deadbeef) --{ -- message_dialog = NULL; -+ if (!g_queue_is_empty (&user_message_queue)) { -+ m = g_queue_pop_head (&user_message_queue); -+ user_message_exec (m); -+ mail_msg_unref (m); -+ } - } - --/* This is kinda ugly/inefficient, but oh well, it works */ --static const char *error_type[] = { -- "mail:session-message-info", "mail:session-message-warning", "mail:session-message-error", -- "mail:session-message-info-cancel", "mail:session-message-warning-cancel", "mail:session-message-error-cancel" --}; -- - static void --do_user_message (struct _mail_msg *mm) -+user_message_exec (struct _user_message_msg *m) - { -- struct _user_message_msg *m = (struct _user_message_msg *)mm; -- int type; -+ const gchar *error_type; - -- if (!m->ismain && message_dialog != NULL) { -- e_dlist_addtail (&message_list, (EDListNode *)m); -+ if (!m->ismain && user_message_dialog != NULL) { -+ g_queue_push_tail (&user_message_queue, mail_msg_ref (m)); - return; - } - - switch (m->type) { -- case CAMEL_SESSION_ALERT_INFO: -- type = 0; -- break; -- case CAMEL_SESSION_ALERT_WARNING: -- type = 1; -- break; -- case CAMEL_SESSION_ALERT_ERROR: -- type = 2; -- break; -- default: -- type = 0; -- } -- -- if (m->allow_cancel) -- type += 3; -- -- message_dialog = (GtkDialog *)e_error_new(NULL, error_type[type], m->prompt, NULL); -- g_object_set ((GObject *) message_dialog, "allow_shrink", TRUE, "allow_grow", TRUE, NULL); -- -- /* We only need to wait for the result if we allow cancel otherwise show but send result back instantly */ -- if (m->allow_cancel) { -- if (m->ismain) { -- user_message_response(message_dialog, gtk_dialog_run (message_dialog), m); -- } else { -- g_signal_connect (message_dialog, "response", G_CALLBACK (user_message_response), m); -- gtk_widget_show ((GtkWidget *) message_dialog); -- } -+ case CAMEL_SESSION_ALERT_INFO: -+ error_type = m->allow_cancel ? -+ "mail:session-message-info-cancel" : -+ "mail:session-message-info"; -+ break; -+ case CAMEL_SESSION_ALERT_WARNING: -+ error_type = m->allow_cancel ? -+ "mail:session-message-warning-cancel" : -+ "mail:session-message-warning"; -+ break; -+ case CAMEL_SESSION_ALERT_ERROR: -+ error_type = m->allow_cancel ? -+ "mail:session-message-error-cancel" : -+ "mail:session-message-error"; -+ break; -+ default: -+ g_assert_not_reached (); -+ } -+ -+ user_message_dialog = e_error_new (NULL, error_type, m->prompt, NULL); -+ g_object_set ( -+ user_message_dialog, "allow_shrink", TRUE, -+ "allow_grow", TRUE, NULL); -+ -+ /* We only need to wait for the result if we allow cancel -+ * otherwise show but send result back instantly */ -+ if (m->allow_cancel && m->ismain) { -+ gint response = gtk_dialog_run (user_message_dialog); -+ user_message_response (user_message_dialog, response, m); - } else { -- g_signal_connect (message_dialog, "response", G_CALLBACK (gtk_widget_destroy), message_dialog); -- g_object_weak_ref ((GObject *) message_dialog, (GWeakNotify) user_message_destroy_notify, m); -- gtk_widget_show ((GtkWidget *) message_dialog); -- mail_msg_free(m); -+ g_signal_connect ( -+ user_message_dialog, "response", -+ G_CALLBACK (user_message_response), m); -+ gtk_widget_show (user_message_dialog); - } - } - - static void --free_user_message(struct _mail_msg *mm) -+user_message_free (struct _user_message_msg *m) - { -- struct _user_message_msg *m = (struct _user_message_msg *)mm; -- - g_free(m->prompt); -+ e_flag_free(m->done); - } - --static struct _mail_msg_op user_message_op = { NULL, do_user_message, NULL, free_user_message }; -+static MailMsgInfo user_message_info = { -+ sizeof (struct _user_message_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) user_message_exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) user_message_free -+}; - - static gboolean - alert_user(CamelSession *session, CamelSessionAlertType type, const char *prompt, gboolean cancel) - { - MailSession *mail_session = MAIL_SESSION (session); -- struct _user_message_msg *m, *r; -- EMsgPort *user_message_reply = NULL; -- gboolean ret; -+ struct _user_message_msg *m; -+ gboolean result = TRUE; - - if (!mail_session->interactive) - return FALSE; - -- if (cancel) -- user_message_reply = e_msgport_new (); -- m = mail_msg_new (&user_message_op, user_message_reply, sizeof (*m)); -- m->ismain = pthread_equal(pthread_self(), mail_gui_thread); -+ m = mail_msg_new (&user_message_info); -+ m->ismain = mail_in_main_thread (); - m->type = type; -- m->prompt = g_strdup(prompt); -+ m->prompt = g_strdup (prompt); -+ m->done = e_flag_new (); - m->allow_cancel = cancel; - -- if (m->ismain) -- do_user_message((struct _mail_msg *)m); -- else { -- extern EMsgPort *mail_gui_port2; -+ if (cancel) -+ mail_msg_ref (m); - -- e_msgport_put(mail_gui_port2, (EMsg *)m); -- } -+ if (m->ismain) -+ user_message_exec (m); -+ else -+ mail_msg_main_loop_push (m); - - if (cancel) { -- r = (struct _user_message_msg *)e_msgport_wait(user_message_reply); -- g_return_val_if_fail (m == r, FALSE); -+ e_flag_wait (m->done); -+ result = m->result; -+ mail_msg_unref (m); -+ } - -- ret = m->result; -- mail_msg_free(m); -- e_msgport_destroy(user_message_reply); -- } else -- ret = TRUE; -+ if (m->ismain) { -+ user_message_free (m); -+ mail_msg_unref (m); -+ } - -- return ret; -+ return result; - } - - static CamelFolder * -@@ -542,7 +539,7 @@ get_filter_driver (CamelSession *session - /* TODO: This is very temporary, until we have a better way to do the progress reporting, - we just borrow a dummy mail-mt thread message and hook it onto out camel thread message */ - --static mail_msg_op_t ms_thread_ops_dummy = { NULL }; -+static MailMsgInfo ms_thread_info_dummy = { sizeof (MailMsg) }; - - static void *ms_thread_msg_new(CamelSession *session, CamelSessionThreadOps *ops, unsigned int size) - { -@@ -551,7 +548,7 @@ static void *ms_thread_msg_new(CamelSess - /* We create a dummy mail_msg, and then copy its cancellation port over to ours, so - we get cancellation and progress in common with hte existing mail code, for free */ - if (msg) { -- struct _mail_msg *m = mail_msg_new(&ms_thread_ops_dummy, NULL, sizeof(struct _mail_msg)); -+ MailMsg *m = mail_msg_new(&ms_thread_info_dummy); - - msg->data = m; - camel_operation_unref(msg->op); -@@ -564,7 +561,7 @@ static void *ms_thread_msg_new(CamelSess - - static void ms_thread_msg_free(CamelSession *session, CamelSessionThreadMsg *m) - { -- mail_msg_free(m->data); -+ mail_msg_unref(m->data); - ms_parent_class->thread_msg_free(session, m); - } - -@@ -689,22 +686,23 @@ mail_session_set_interactive (gboolean i - MAIL_SESSION (session)->interactive = interactive; - - if (!interactive) { -- struct _user_message_msg *um; -+ struct _user_message_msg *msg; - - d(printf ("Gone non-interactive, checking for outstanding interactive tasks\n")); - - e_passwords_cancel(); - - /* flush/cancel pending user messages */ -- while ((um = (struct _user_message_msg *) e_dlist_remhead (&message_list))) { -- d(printf ("Flusing message request: %s\n", um->prompt)); -- e_msgport_reply((EMsg *) um); -+ while (!g_queue_is_empty (&user_message_queue)) { -+ msg = g_queue_pop_head (&user_message_queue); -+ e_flag_set (msg->done); -+ mail_msg_unref (msg); - } - - /* and the current */ -- if (message_dialog) { -+ if (user_message_dialog) { - d(printf("Destroying message dialogue\n")); -- gtk_widget_destroy ((GtkWidget *) message_dialog); -+ gtk_widget_destroy ((GtkWidget *) user_message_dialog); - } - } - } -diff -up evolution-2.21.4/mail/mail-mt.c.kill-ethread evolution-2.21.4/mail/mail-mt.c ---- evolution-2.21.4/mail/mail-mt.c.kill-ethread 2007-12-17 00:52:03.000000000 -0500 -+++ evolution-2.21.4/mail/mail-mt.c 2007-12-17 12:33:08.000000000 -0500 -@@ -29,8 +29,8 @@ - #include - #include - --#include - #include -+#include - - #include - #include -@@ -63,7 +63,7 @@ static void mail_operation_status(struct - #endif - - /* background operation status stuff */ --struct _mail_msg_priv { -+struct _MailMsgPrivate { - int activity_state; /* sigh sigh sigh, we need to keep track of the state external to the - pointer itself for locking/race conditions */ - int activity_id; -@@ -84,20 +84,12 @@ static GHashTable *mail_msg_active_table - static pthread_mutex_t mail_msg_lock = PTHREAD_MUTEX_INITIALIZER; - static pthread_cond_t mail_msg_cond = PTHREAD_COND_INITIALIZER; - --pthread_t mail_gui_thread; -- - MailAsyncEvent *mail_async_event; - --static void mail_msg_destroy(EThread *e, EMsg *msg, void *data); -- --void mail_msg_set_cancelable (struct _mail_msg *msg, gboolean status) --{ -- msg->priv->cancelable = status; --} -- --void *mail_msg_new(mail_msg_op_t *ops, EMsgPort *reply_port, size_t size) -+gpointer -+mail_msg_new (MailMsgInfo *info) - { -- struct _mail_msg *msg; -+ MailMsg *msg; - - MAIL_MT_LOCK(mail_msg_lock); - -@@ -119,7 +111,6 @@ void *mail_msg_new(mail_msg_op_t *ops, E - fprintf(log, "Logging async operations\n"); - - if (log_locks) { -- fprintf(log, "Logging lock operations, mail_gui_thread = %" G_GINT64_MODIFIER "x\n\n", e_util_pthread_id(mail_gui_thread)); - fprintf(log, "%" G_GINT64_MODIFIER "x: lock mail_msg_lock\n", e_util_pthread_id(pthread_self())); - } - } else { -@@ -129,13 +120,13 @@ void *mail_msg_new(mail_msg_op_t *ops, E - } - } - #endif -- msg = g_malloc0(size); -- msg->ops = ops; -+ msg = g_slice_alloc0 (info->size); -+ msg->info = info; -+ msg->ref_count = 1; - msg->seq = mail_msg_seq++; -- msg->msg.reply_port = reply_port; - msg->cancel = camel_operation_new(mail_operation_status, GINT_TO_POINTER(msg->seq)); - camel_exception_init(&msg->ex); -- msg->priv = g_malloc0(sizeof(*msg->priv)); -+ msg->priv = g_slice_new0 (MailMsgPrivate); - msg->priv->cancelable = TRUE; - - g_hash_table_insert(mail_msg_active_table, GINT_TO_POINTER(msg->seq), msg); -@@ -151,18 +142,20 @@ void *mail_msg_new(mail_msg_op_t *ops, E - return msg; - } - -- --static void end_event_callback (CamelObject *o, void *event_data, void *error) -+static void -+end_event_callback (CamelObject *o, void *event_data, void *error) - { -- EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); -+ MailComponent *component; -+ EActivityHandler *activity_handler; - guint activity_id = GPOINTER_TO_INT (event_data); - -+ component = mail_component_peek (); -+ activity_handler = mail_component_peek_activity_handler (component); - if (!error) { - e_activity_handler_operation_finished (activity_handler, activity_id); - } else { - d(printf("Yahooooo, we got it nonintrusively\n")); - e_activity_handler_operation_set_error (activity_handler, activity_id, error); -- - } - } - -@@ -191,43 +184,81 @@ checkmem(void *p) - } - #endif - --void mail_msg_free(void *msg) -+static void -+mail_msg_free (MailMsg *mail_msg) - { -- struct _mail_msg *m = msg; -- int activity_id; -+ if (mail_msg->cancel != NULL) { -+ camel_operation_mute (mail_msg->cancel); -+ camel_operation_unref (mail_msg->cancel); -+ } -+ -+ camel_exception_clear (&mail_msg->ex); -+ g_slice_free (MailMsgPrivate, mail_msg->priv); -+ g_slice_free1 (mail_msg->info->size, mail_msg); -+} -+ -+gpointer -+mail_msg_ref (gpointer msg) -+{ -+ MailMsg *mail_msg = msg; -+ -+ g_return_val_if_fail (mail_msg != NULL, msg); -+ g_return_val_if_fail (mail_msg->ref_count > 0, msg); -+ -+ g_atomic_int_add (&mail_msg->ref_count, 1); -+ return msg; -+} -+ -+void -+mail_msg_unref (gpointer msg) -+{ -+ MailMsg *mail_msg = msg; -+ gint activity_id; - GtkWidget *error = NULL; - -+ g_return_if_fail (mail_msg != NULL); -+ g_return_if_fail (mail_msg->ref_count > 0); -+ -+ if (g_atomic_int_exchange_and_add (&mail_msg->ref_count, -1) > 1) -+ return; -+ - #ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); -+ checkmem(mail_msg); -+ checkmem(mail_msg->cancel); -+ checkmem(mail_msg->priv); - #endif - d(printf("Free message %p\n", msg)); - -- if (m->ops->destroy_msg) -- m->ops->destroy_msg(m); -+ if (mail_msg->info->free) -+ mail_msg->info->free(mail_msg); - - MAIL_MT_LOCK(mail_msg_lock); - - #ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Free (exception `%s')\n", msg, -- camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); -+ if (log_ops) { -+ const gchar *description; -+ -+ description = camel_exception_get_description (&mail_msg->ex); -+ if (description == NULL) -+ description = "None"; -+ fprintf(log, "%p: Free (exception `%s')\n", msg, description); -+ } - #endif -- g_hash_table_remove(mail_msg_active_table, GINT_TO_POINTER(m->seq)); -- pthread_cond_broadcast(&mail_msg_cond); -+ g_hash_table_remove ( -+ mail_msg_active_table, GINT_TO_POINTER (mail_msg->seq)); -+ pthread_cond_broadcast (&mail_msg_cond); - - /* We need to make sure we dont lose a reference here YUCK YUCK */ - /* This is tightly integrated with the code in do_op_status, - as it closely relates to the CamelOperation setup in msg_new() above */ -- if (m->priv->activity_state == 1) { -- m->priv->activity_state = 3; /* tell the other thread -- * to free it itself (yuck yuck) */ -+ if (mail_msg->priv->activity_state == 1) { -+ /* tell the other to free it itself */ -+ mail_msg->priv->activity_state = 3; - MAIL_MT_UNLOCK(mail_msg_lock); - return; - } else { -- activity_id = m->priv->activity_id; -- error = m->priv->error; -+ activity_id = mail_msg->priv->activity_id; -+ error = mail_msg->priv->error; - if (error && !activity_id) { - e_activity_handler_make_error (mail_component_peek_activity_handler (mail_component_peek ()), "mail", - g_object_get_data ((GObject *) error, "primary"), error); -@@ -238,19 +269,13 @@ void mail_msg_free(void *msg) - - MAIL_MT_UNLOCK(mail_msg_lock); - -- if (m->cancel) { -- camel_operation_mute(m->cancel); -- camel_operation_unref(m->cancel); -- } -- -- camel_exception_clear(&m->ex); -- /*g_free(m->priv->what);*/ -- g_free(m->priv); -- g_free(m); -+ mail_msg_free (mail_msg); - - if (activity_id != 0) -- mail_async_event_emit(mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, -- NULL, GINT_TO_POINTER (activity_id), error); -+ mail_async_event_emit ( -+ mail_async_event, MAIL_ASYNC_GUI, -+ (MailAsyncFunc) end_event_callback, -+ NULL, GINT_TO_POINTER (activity_id), error); - } - - /* hash table of ops->dialogue of active errors */ -@@ -266,9 +291,10 @@ static void error_response(GtkObject *o, - gtk_widget_destroy((GtkWidget *)o); - } - --void mail_msg_check_error(void *msg) -+void -+mail_msg_check_error (gpointer msg) - { -- struct _mail_msg *m = msg; -+ MailMsg *m = msg; - char *what; - GtkDialog *gd; - -@@ -293,21 +319,21 @@ void mail_msg_check_error(void *msg) - /* check to see if we have dialogue already running for this operation */ - /* we key on the operation pointer, which is at least accurate enough - for the operation type, although it could be on a different object. */ -- if (g_hash_table_lookup(active_errors, m->ops)) { -+ if (g_hash_table_lookup(active_errors, m->info)) { - g_warning("Error occurred while existing dialogue active:\n%s", camel_exception_get_description(&m->ex)); - return; - } - -- if (m->ops->describe_msg -- && (what = m->ops->describe_msg(m, FALSE))) { -+ if (m->info->desc -+ && (what = m->info->desc (m))) { - gd = (GtkDialog *)e_error_new(NULL, "mail:async-error", what, camel_exception_get_description(&m->ex), NULL); - g_free(what); - } else - gd = (GtkDialog *)e_error_new(NULL, "mail:async-error-nodescribe", camel_exception_get_description(&m->ex), NULL); - -- g_hash_table_insert(active_errors, m->ops, gd); -- g_signal_connect(gd, "response", G_CALLBACK(error_response), m->ops); -- g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->ops); -+ g_hash_table_insert(active_errors, m->info, gd); -+ g_signal_connect(gd, "response", G_CALLBACK(error_response), m->info); -+ g_signal_connect(gd, "destroy", G_CALLBACK(error_destroy), m->info); - if (m->priv->cancelable) - m->priv->error = (GtkWidget *) gd; - else -@@ -316,7 +342,7 @@ void mail_msg_check_error(void *msg) - - void mail_msg_cancel(unsigned int msgid) - { -- struct _mail_msg *m; -+ MailMsg *m; - - MAIL_MT_LOCK(mail_msg_lock); - m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); -@@ -329,13 +355,12 @@ void mail_msg_cancel(unsigned int msgid) - - - /* waits for a message to be finished processing (freed) -- the messageid is from struct _mail_msg->seq */ -+ the messageid is from MailMsg->seq */ - void mail_msg_wait(unsigned int msgid) - { -- struct _mail_msg *m; -- int ismain = pthread_equal(pthread_self(), mail_gui_thread); -+ MailMsg *m; - -- if (ismain) { -+ if (mail_in_main_thread ()) { - MAIL_MT_LOCK(mail_msg_lock); - m = g_hash_table_lookup(mail_msg_active_table, GINT_TO_POINTER(msgid)); - while (m) { -@@ -372,9 +397,7 @@ int mail_msg_active(unsigned int msgid) - - void mail_msg_wait_all(void) - { -- int ismain = pthread_equal(pthread_self(), mail_gui_thread); -- -- if (ismain) { -+ if (mail_in_main_thread ()) { - MAIL_MT_LOCK(mail_msg_lock); - while (g_hash_table_size(mail_msg_active_table) > 0) { - MAIL_MT_UNLOCK(mail_msg_lock); -@@ -392,294 +415,247 @@ void mail_msg_wait_all(void) - } - - /* **************************************** */ --struct _cancel_hook_data { -- struct _cancel_hook_data *next; -- struct _cancel_hook_data *prev; -- -- GDestroyNotify func; -- void *data; --}; - --static EDList cancel_hook_list = E_DLIST_INITIALISER(cancel_hook_list); -+static GHookList cancel_hook_list; - --void *mail_cancel_hook_add(GDestroyNotify func, void *data) -+GHook * -+mail_cancel_hook_add (GHookFunc func, gpointer data) - { -- struct _cancel_hook_data *d; -+ GHook *hook; - -- d = g_malloc0(sizeof(*d)); -- d->func = func; -- d->data = data; -+ MAIL_MT_LOCK (mail_msg_lock); - -- MAIL_MT_LOCK(mail_msg_lock); -- e_dlist_addtail(&cancel_hook_list, (EDListNode *)d); -- MAIL_MT_UNLOCK(mail_msg_lock); -+ if (!cancel_hook_list.is_setup) -+ g_hook_list_init (&cancel_hook_list, sizeof (GHook)); - -- return (void *)d; -+ hook = g_hook_alloc (&cancel_hook_list); -+ hook->func = func; -+ hook->data = data; -+ -+ g_hook_append (&cancel_hook_list, hook); -+ -+ MAIL_MT_UNLOCK (mail_msg_lock); -+ -+ return hook; - } - --void mail_cancel_hook_remove(void *handle) -+void -+mail_cancel_hook_remove (GHook *hook) - { -- struct _cancel_hook_data *d = handle; -+ MAIL_MT_LOCK (mail_msg_lock); - -- MAIL_MT_LOCK(mail_msg_lock); -- e_dlist_remove((EDListNode *)d); -- MAIL_MT_UNLOCK(mail_msg_lock); -- g_free(d); -+ g_assert (cancel_hook_list.is_setup); -+ g_hook_destroy_link (&cancel_hook_list, hook); -+ -+ MAIL_MT_UNLOCK (mail_msg_lock); - } - --void mail_cancel_all(void) -+void -+mail_cancel_all (void) - { -- struct _cancel_hook_data *d, *n; -+ camel_operation_cancel (NULL); -+ -+ MAIL_MT_LOCK (mail_msg_lock); - -- camel_operation_cancel(NULL); -+ if (cancel_hook_list.is_setup) -+ g_hook_list_invoke (&cancel_hook_list, FALSE); - -- /* I can ssee a deadlock coming on ... */ -- MAIL_MT_LOCK(mail_msg_lock); -- d = (struct _cancel_hook_data *)cancel_hook_list.head; -- n = d->next; -- while (n) { -- d->func(d->data); -- d = n; -- n = n->next; -- } -- MAIL_MT_UNLOCK(mail_msg_lock); -+ MAIL_MT_UNLOCK (mail_msg_lock); - } - --EMsgPort *mail_gui_port; --static GIOChannel *mail_gui_channel; --static guint mail_gui_watch; -- --/* TODO: Merge these, gui_port2 doesn't do any mail_msg processing on the request (replies, forwards, frees) */ --EMsgPort *mail_gui_port2; --static GIOChannel *mail_gui_channel2; --static guint mail_gui_watch2; -- --EMsgPort *mail_gui_reply_port; --static GIOChannel *mail_gui_reply_channel; -- --/* a couple of global threads available */ --#ifdef G_OS_WIN32 --#undef mail_thread_queued --static --#endif --EThread *mail_thread_queued; /* for operations that can (or should) be queued */ --EThread *mail_thread_queued_slow; /* for operations that can (or should) be queued, but take a long time */ --EThread *mail_thread_new; /* for operations that should run in a new thread each time */ -- --#ifdef G_OS_WIN32 --EThread * --mail_win32_get_mail_thread_queued (void) -+void -+mail_msg_set_cancelable (gpointer msg, gboolean status) - { -- return mail_thread_queued; -+ MailMsg *mail_msg = msg; -+ -+ mail_msg->priv->cancelable = status; - } --#endif -+ -+static guint idle_source_id = 0; -+G_LOCK_DEFINE_STATIC (idle_source_id); -+static GAsyncQueue *main_loop_queue = NULL; -+static GAsyncQueue *msg_reply_queue = NULL; -+static GThread *main_thread = NULL; - - static gboolean --mail_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) -+mail_msg_idle_cb (void) - { -- EMsgPort *port = (EMsgPort *)d; -- mail_msg_t *m; -+ MailMsg *msg; - -- while (( m = (mail_msg_t *)e_msgport_get(port))) { -+ g_assert (main_loop_queue != NULL); -+ g_assert (msg_reply_queue != NULL); - --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -- --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Replied to GUI thread (exception `%s'\n", m, -- camel_exception_get_description(&m->ex)?camel_exception_get_description(&m->ex):"None"); --#endif -- -- if (m->ops->reply_msg) -- m->ops->reply_msg(m); -- mail_msg_check_error(m); -- mail_msg_free(m); -+ G_LOCK (idle_source_id); -+ idle_source_id = 0; -+ G_UNLOCK (idle_source_id); -+ -+ /* check the main loop queue */ -+ while ((msg = g_async_queue_try_pop (main_loop_queue)) != NULL) { -+ if (msg->info->exec != NULL) -+ msg->info->exec (msg); -+ if (msg->info->done != NULL) -+ msg->info->done (msg); -+ mail_msg_unref (msg); -+ } -+ -+ /* check the reply queue */ -+ while ((msg = g_async_queue_try_pop (msg_reply_queue)) != NULL) { -+ if (msg->info->done != NULL) -+ msg->info->done (msg); -+ mail_msg_check_error (msg); -+ mail_msg_unref (msg); - } - -- return TRUE; -+ return FALSE; - } - --static gboolean --mail_msgport_received(GIOChannel *source, GIOCondition cond, void *d) -+static void -+mail_msg_proxy (MailMsg *msg) - { -- EMsgPort *port = (EMsgPort *)d; -- mail_msg_t *m; -- -- while (( m = (mail_msg_t *)e_msgport_get(port))) { --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -- --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Received at GUI thread\n", m); --#endif -- -- if (m->ops->receive_msg) -- m->ops->receive_msg(m); -- if (m->msg.reply_port) -- e_msgport_reply((EMsg *)m); -- else { -- if (m->ops->reply_msg) -- m->ops->reply_msg(m); -- mail_msg_free(m); -- } -+ if (msg->info->desc != NULL) { -+ gchar *text = msg->info->desc (msg); -+ camel_operation_register (msg->cancel); -+ camel_operation_start (msg->cancel, "%s", text); -+ g_free (text); -+ } -+ -+ if (msg->info->exec != NULL) { -+ mail_enable_stop (); -+ msg->info->exec (msg); -+ mail_disable_stop (); -+ } -+ -+ if (msg->info->desc != NULL) { -+ camel_operation_end (msg->cancel); -+ camel_operation_unregister (msg->cancel); -+ MAIL_MT_LOCK (mail_msg_lock); -+ camel_operation_unref (msg->cancel); -+ msg->cancel = NULL; -+ MAIL_MT_UNLOCK (mail_msg_lock); - } - -- return TRUE; -+ g_async_queue_push (msg_reply_queue, msg); -+ -+ G_LOCK (idle_source_id); -+ if (idle_source_id == 0) -+ idle_source_id = g_idle_add ( -+ (GSourceFunc) mail_msg_idle_cb, NULL); -+ G_UNLOCK (idle_source_id); - } - --/* Test code, lighterwight, more configurable calls */ --static gboolean --mail_msgport_received2(GIOChannel *source, GIOCondition cond, void *d) -+void -+mail_msg_cleanup (void) - { -- EMsgPort *port = (EMsgPort *)d; -- mail_msg_t *m; -+ mail_msg_wait_all(); - -- while (( m = (mail_msg_t *)e_msgport_get(port))) { --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Received at GUI2 thread\n", m); --#endif -+ G_LOCK (idle_source_id); -+ if (idle_source_id != 0) { -+ GSource *source; - -- if (m->ops->receive_msg) -- m->ops->receive_msg(m); -- else -- mail_msg_free(m); -+ /* Cancel the idle source. */ -+ source = g_main_context_find_source_by_id ( -+ g_main_context_default (), idle_source_id); -+ g_assert (source != NULL); -+ g_source_destroy (source); -+ idle_source_id = 0; - } -+ G_UNLOCK (idle_source_id); - -- return TRUE; --} -+ g_assert (main_loop_queue != NULL); -+ g_async_queue_unref (main_loop_queue); -+ main_loop_queue = NULL; - -+ g_assert (msg_reply_queue != NULL); -+ g_async_queue_unref (msg_reply_queue); -+ msg_reply_queue = NULL; -+} - --static void --mail_msg_destroy(EThread *e, EMsg *msg, void *data) -+void -+mail_msg_init (void) - { -- mail_msg_t *m = (mail_msg_t *)msg; -+ main_loop_queue = g_async_queue_new (); -+ msg_reply_queue = g_async_queue_new (); - --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -+ mail_msg_active_table = g_hash_table_new (NULL, NULL); -+ main_thread = g_thread_self (); - -- mail_msg_free(m); -+ mail_async_event = mail_async_event_new (); - } - --static void --mail_msg_received(EThread *e, EMsg *msg, void *data) -+static gint -+mail_msg_compare (const MailMsg *msg1, const MailMsg *msg2) - { -- mail_msg_t *m = (mail_msg_t *)msg; -- --#ifdef MALLOC_CHECK -- checkmem(m); -- checkmem(m->cancel); -- checkmem(m->priv); --#endif -+ gint priority1 = msg1->priority; -+ gint priority2 = msg2->priority; - -- if (m->ops->describe_msg) { -- char *text = m->ops->describe_msg(m, FALSE); -+ if (priority1 == priority2) -+ return 0; - --#ifdef LOG_OPS -- if (log_ops) -- fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x: '%s'\n", m, e_util_pthread_id(pthread_self()), text); --#endif -+ return (priority1 < priority2) ? 1 : -1; -+} - -- d(printf("message received at thread\n")); -- camel_operation_register(m->cancel); -- camel_operation_start(m->cancel, "%s", text); -- g_free(text); -- } --#ifdef LOG_OPS -- else -- if (log_ops) -- fprintf(log, "%p: Received at thread %" G_GINT64_MODIFIER "x\n", m, e_util_pthread_id(pthread_self())); --#endif -+static gpointer -+create_thread_pool (gpointer data) -+{ -+ GThreadPool *thread_pool; -+ gint max_threads = GPOINTER_TO_INT (data); - -- if (m->ops->receive_msg) { -- mail_enable_stop(); -- m->ops->receive_msg(m); -- mail_disable_stop(); -- } -+ /* once created, run forever */ -+ thread_pool = g_thread_pool_new ( -+ (GFunc) mail_msg_proxy, NULL, max_threads, FALSE, NULL); -+ g_thread_pool_set_sort_function ( -+ thread_pool, (GCompareDataFunc) mail_msg_compare, NULL); - -- if (m->ops->describe_msg) { -- camel_operation_end(m->cancel); -- camel_operation_unregister(m->cancel); -- MAIL_MT_LOCK(mail_msg_lock); -- camel_operation_unref(m->cancel); -- m->cancel = NULL; -- MAIL_MT_UNLOCK(mail_msg_lock); -- } -+ return thread_pool; - } - --void mail_msg_cleanup(void) -+void -+mail_msg_main_loop_push (gpointer msg) - { -- mail_msg_wait_all(); -+ g_async_queue_push_sorted (main_loop_queue, msg, -+ (GCompareDataFunc) mail_msg_compare, NULL); - -- e_thread_destroy(mail_thread_queued_slow); -- e_thread_destroy(mail_thread_queued); -- e_thread_destroy(mail_thread_new); -+ G_LOCK (idle_source_id); -+ if (idle_source_id == 0) -+ idle_source_id = g_idle_add ( -+ (GSourceFunc) mail_msg_idle_cb, NULL); -+ G_UNLOCK (idle_source_id); -+} -+ -+void -+mail_msg_unordered_push (gpointer msg) -+{ -+ static GOnce once = G_ONCE_INIT; - -- g_io_channel_unref(mail_gui_channel); -- g_io_channel_unref(mail_gui_reply_channel); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (10)); - -- e_msgport_destroy(mail_gui_port); -- e_msgport_destroy(mail_gui_reply_port); -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); - } - --static guint --em_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) -+void -+mail_msg_fast_ordered_push (gpointer msg) - { -- GSource *source; -- guint id; -+ static GOnce once = G_ONCE_INIT; - -- *port = e_msgport_new(); --#ifndef G_OS_WIN32 -- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); --#else -- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); --#endif -- source = g_io_create_watch(*channel, G_IO_IN); -- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); -- g_source_set_can_recurse(source, FALSE); -- id = g_source_attach(source, NULL); -- g_source_unref(source); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); - -- return id; -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); - } - --void mail_msg_init(void) -+void -+mail_msg_slow_ordered_push (gpointer msg) - { -- em_channel_setup(&mail_gui_reply_port, &mail_gui_reply_channel, mail_msgport_replied); -- mail_gui_watch = em_channel_setup(&mail_gui_port, &mail_gui_channel, mail_msgport_received); -- mail_gui_watch2 = em_channel_setup(&mail_gui_port2, &mail_gui_channel2, mail_msgport_received2); -- -- mail_thread_queued = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(mail_thread_queued, mail_msg_destroy, NULL); -- e_thread_set_msg_received(mail_thread_queued, mail_msg_received, NULL); -- e_thread_set_reply_port(mail_thread_queued, mail_gui_reply_port); -- -- mail_thread_queued_slow = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(mail_thread_queued_slow, mail_msg_destroy, NULL); -- e_thread_set_msg_received(mail_thread_queued_slow, mail_msg_received, NULL); -- e_thread_set_reply_port(mail_thread_queued_slow, mail_gui_reply_port); -- -- mail_thread_new = e_thread_new(E_THREAD_NEW); -- e_thread_set_msg_destroy(mail_thread_new, mail_msg_destroy, NULL); -- e_thread_set_msg_received(mail_thread_new, mail_msg_received, NULL); -- e_thread_set_reply_port(mail_thread_new, mail_gui_reply_port); -- e_thread_set_queue_limit(mail_thread_new, 10); -+ static GOnce once = G_ONCE_INIT; - -- mail_msg_active_table = g_hash_table_new(NULL, NULL); -- mail_gui_thread = pthread_self(); -+ g_once (&once, (GThreadFunc) create_thread_pool, GINT_TO_POINTER (1)); -+ -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); -+} - -- mail_async_event = mail_async_event_new(); -+gboolean -+mail_in_main_thread (void) -+{ -+ return (g_thread_self () == main_thread); - } - - /* ********************************************************************** */ -@@ -690,7 +666,8 @@ static pthread_mutex_t status_lock = PTH - /* ********************************************************************** */ - - struct _proxy_msg { -- struct _mail_msg msg; -+ MailMsg base; -+ - MailAsyncEvent *ea; - mail_async_event_t type; - -@@ -704,10 +681,8 @@ struct _proxy_msg { - }; - - static void --do_async_event(struct _mail_msg *mm) -+do_async_event(struct _proxy_msg *m) - { -- struct _proxy_msg *m = (struct _proxy_msg *)mm; -- - m->thread = pthread_self(); - m->have_thread = TRUE; - m->func(m->o, m->event_data, m->data); -@@ -722,16 +697,17 @@ static int - idle_async_event(void *mm) - { - do_async_event(mm); -- mail_msg_free(mm); -+ mail_msg_unref(mm); - - return FALSE; - } - --static struct _mail_msg_op async_event_op = { -- NULL, -- do_async_event, -- NULL, -- NULL, -+static MailMsgInfo async_event_info = { -+ sizeof (struct _proxy_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) do_async_event, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) NULL - }; - - MailAsyncEvent *mail_async_event_new(void) -@@ -748,10 +724,9 @@ int mail_async_event_emit(MailAsyncEvent - { - struct _proxy_msg *m; - int id; -- int ismain = pthread_equal(pthread_self(), mail_gui_thread); - - /* we dont have a reply port for this, we dont care when/if it gets executed, just queue it */ -- m = mail_msg_new(&async_event_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&async_event_info); - m->func = func; - m->o = o; - m->event_data = event_data; -@@ -760,7 +735,7 @@ int mail_async_event_emit(MailAsyncEvent - m->type = type; - m->have_thread = FALSE; - -- id = m->msg.seq; -+ id = m->base.seq; - g_mutex_lock(ea->lock); - ea->tasks = g_slist_prepend(ea->tasks, m); - g_mutex_unlock(ea->lock); -@@ -768,12 +743,12 @@ int mail_async_event_emit(MailAsyncEvent - /* We use an idle function instead of our own message port only because the - gui message ports's notification buffer might overflow and deadlock us */ - if (type == MAIL_ASYNC_GUI) { -- if (ismain) -+ if (mail_in_main_thread ()) - g_idle_add(idle_async_event, m); - else -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push(m); - } else -- e_thread_put(mail_thread_queued, (EMsg *)m); -+ mail_msg_fast_ordered_push (m); - - return id; - } -@@ -787,7 +762,7 @@ int mail_async_event_destroy(MailAsyncEv - g_mutex_lock(ea->lock); - while (ea->tasks) { - m = ea->tasks->data; -- id = m->msg.seq; -+ id = m->base.seq; - if (m->have_thread && pthread_equal(m->thread, thread)) { - g_warning("Destroying async event from inside an event, returning EDEADLK"); - g_mutex_unlock(ea->lock); -@@ -809,17 +784,18 @@ int mail_async_event_destroy(MailAsyncEv - /* ********************************************************************** */ - - struct _call_msg { -- struct _mail_msg msg; -+ MailMsg base; -+ - mail_call_t type; - MailMainFunc func; - void *ret; - va_list ap; -+ EFlag *done; - }; - - static void --do_call(struct _mail_msg *mm) -+do_call(struct _call_msg *m) - { -- struct _call_msg *m = (struct _call_msg *)mm; - void *p1, *p2, *p3, *p4, *p5; - int i1; - va_list ap; -@@ -867,45 +843,47 @@ do_call(struct _mail_msg *mm) - m->ret = m->func(p1, p2, i1, p3, p4, p5); - break; - } -+ -+ if (m->done != NULL) -+ e_flag_set (m->done); - } - --static struct _mail_msg_op mail_call_op = { -- NULL, -- do_call, -- NULL, -- NULL, -+static MailMsgInfo mail_call_info = { -+ sizeof (struct _call_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) do_call, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) NULL - }; - --void *mail_call_main(mail_call_t type, MailMainFunc func, ...) -+void * -+mail_call_main (mail_call_t type, MailMainFunc func, ...) - { - struct _call_msg *m; - void *ret; - va_list ap; -- EMsgPort *reply = NULL; -- int ismain = pthread_equal(pthread_self(), mail_gui_thread); - - va_start(ap, func); - -- if (!ismain) -- reply = e_msgport_new(); -- -- m = mail_msg_new(&mail_call_op, reply, sizeof(*m)); -+ m = mail_msg_new (&mail_call_info); - m->type = type; - m->func = func; - G_VA_COPY(m->ap, ap); - -- if (!ismain) { -- e_msgport_put(mail_gui_port, (EMsg *)m); -- e_msgport_wait(reply); -- e_msgport_destroy(reply); -- } else { -- do_call(&m->msg); -+ if (mail_in_main_thread ()) -+ do_call (m); -+ else { -+ mail_msg_ref (m); -+ m->done = e_flag_new (); -+ mail_msg_main_loop_push (m); -+ e_flag_wait (m->done); -+ e_flag_free (m->done); - } - - va_end(ap); - - ret = m->ret; -- mail_msg_free(m); -+ mail_msg_unref (m); - - return ret; - } -@@ -914,40 +892,42 @@ void *mail_call_main(mail_call_t type, M - /* locked via status_lock */ - static int busy_state; - --static void do_set_busy(struct _mail_msg *mm) -+static void -+do_set_busy(MailMsg *mm) - { - set_stop(busy_state > 0); - } - --static struct _mail_msg_op set_busy_op = { -- NULL, -- do_set_busy, -- NULL, -- NULL, -+static MailMsgInfo set_busy_info = { -+ sizeof (MailMsg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) do_set_busy, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) NULL - }; - - void mail_enable_stop(void) - { -- struct _mail_msg *m; -+ MailMsg *m; - - MAIL_MT_LOCK(status_lock); - busy_state++; - if (busy_state == 1) { -- m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ m = mail_msg_new(&set_busy_info); -+ mail_msg_main_loop_push(m); - } - MAIL_MT_UNLOCK(status_lock); - } - - void mail_disable_stop(void) - { -- struct _mail_msg *m; -+ MailMsg *m; - - MAIL_MT_LOCK(status_lock); - busy_state--; - if (busy_state == 0) { -- m = mail_msg_new(&set_busy_op, NULL, sizeof(*m)); -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ m = mail_msg_new(&set_busy_info); -+ mail_msg_main_loop_push(m); - } - MAIL_MT_UNLOCK(status_lock); - } -@@ -961,7 +941,7 @@ operation_cancel (CamelOperation *p) - /* ******************************************************************************** */ - - struct _op_status_msg { -- struct _mail_msg msg; -+ MailMsg base; - - struct _CamelOperation *op; - char *what; -@@ -969,16 +949,16 @@ struct _op_status_msg { - void *data; - }; - --static void do_op_status(struct _mail_msg *mm) -+static void -+op_status_exec (struct _op_status_msg *m) - { - EActivityHandler *activity_handler = mail_component_peek_activity_handler (mail_component_peek ()); -- struct _op_status_msg *m = (struct _op_status_msg *)mm; -- struct _mail_msg *msg; -- struct _mail_msg_priv *data; -+ MailMsg *msg; -+ MailMsgPrivate *data; - char *out, *p, *o, c; - int pc; - -- g_return_if_fail (pthread_equal(mail_gui_thread, pthread_self ())); -+ g_return_if_fail (mail_in_main_thread ()); - - MAIL_MT_LOCK (mail_msg_lock); - -@@ -1017,8 +997,8 @@ static void do_op_status(struct _mail_ms - progress_icon = e_icon_factory_get_icon ("mail-unread", E_ICON_SIZE_MENU); - - MAIL_MT_UNLOCK (mail_msg_lock); -- if (msg->ops->describe_msg) -- what = msg->ops->describe_msg (msg, FALSE); -+ if (msg->info->desc) -+ what = msg->info->desc (msg); - else if (m->what) - what = g_strdup (m->what); - /* uncommenting because message is not very useful for a user, see bug 271734*/ -@@ -1034,13 +1014,7 @@ static void do_op_status(struct _mail_ms - int activity_id = data->activity_id; - - MAIL_MT_UNLOCK (mail_msg_lock); -- if (msg->cancel) { -- camel_operation_mute (msg->cancel); -- camel_operation_unref (msg->cancel); -- } -- camel_exception_clear (&msg->ex); -- g_free (msg->priv); -- g_free (msg); -+ mail_msg_free (msg); - - if (activity_id != 0) - mail_async_event_emit (mail_async_event, MAIL_ASYNC_GUI, (MailAsyncFunc) end_event_callback, -@@ -1060,18 +1034,17 @@ static void do_op_status(struct _mail_ms - } - - static void --do_op_status_free (struct _mail_msg *mm) -+op_status_free (struct _op_status_msg *m) - { -- struct _op_status_msg *m = (struct _op_status_msg *)mm; -- - g_free (m->what); - } - --static struct _mail_msg_op op_status_op = { -- NULL, -- do_op_status, -- NULL, -- do_op_status_free, -+static MailMsgInfo op_status_info = { -+ sizeof (struct _op_status_msg), -+ (MailMsgDescFunc) NULL, -+ (MailMsgExecFunc) op_status_exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) op_status_free - }; - - static void -@@ -1081,7 +1054,7 @@ mail_operation_status (struct _CamelOper - - d(printf("got operation statys: %s %d%%\n", what, pc)); - -- m = mail_msg_new(&op_status_op, NULL, sizeof(*m)); -+ m = mail_msg_new(&op_status_info); - m->op = op; - m->what = g_strdup(what); - switch (pc) { -@@ -1094,7 +1067,7 @@ mail_operation_status (struct _CamelOper - } - m->pc = pc; - m->data = data; -- e_msgport_put(mail_gui_port, (EMsg *)m); -+ mail_msg_main_loop_push(m); - } - - /* ******************** */ -diff -up evolution-2.21.4/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread evolution-2.21.4/plugins/folder-unsubscribe/folder-unsubscribe.c ---- evolution-2.21.4/plugins/folder-unsubscribe/folder-unsubscribe.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 -+++ evolution-2.21.4/plugins/folder-unsubscribe/folder-unsubscribe.c 2007-12-17 12:33:07.000000000 -0500 -@@ -44,56 +44,53 @@ void org_gnome_mail_folder_unsubscribe ( - - - struct _folder_unsub_t { -- struct _mail_msg msg; -+ MailMsg base; - - char *uri; - }; - --static char * --folder_unsubscribe__desc (struct _mail_msg *mm, int done) -+static gchar * -+folder_unsubscribe_desc (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; -- -- return g_strdup_printf (_("Unsubscribing from folder \"%s\""), unsub->uri); -+ return g_strdup_printf ( -+ _("Unsubscribing from folder \"%s\""), msg->uri); - } - - static void --folder_unsubscribe__unsub (struct _mail_msg *mm) -+folder_unsubscribe_exec (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; - extern CamelSession *session; - const char *path = NULL; - CamelStore *store; - CamelURL *url; - -- if (!(store = camel_session_get_store (session, unsub->uri, &mm->ex))) -+ if (!(store = camel_session_get_store (session, msg->uri, &msg->base.ex))) - return; - -- url = camel_url_new (unsub->uri, NULL); -+ url = camel_url_new (msg->uri, NULL); - if (((CamelService *) store)->provider->url_flags & CAMEL_URL_FRAGMENT_IS_PATH) - path = url->fragment; - else if (url->path && url->path[0]) - path = url->path + 1; - - if (path != NULL) -- camel_store_unsubscribe_folder (store, path, &mm->ex); -+ camel_store_unsubscribe_folder (store, path, &msg->base.ex); - - camel_url_free (url); - } - - static void --folder_unsubscribe__free (struct _mail_msg *mm) -+folder_unsubscribe_free (struct _folder_unsub_t *msg) - { -- struct _folder_unsub_t *unsub = (struct _folder_unsub_t *) mm; -- -- g_free (unsub->uri); -+ g_free (msg->uri); - } - --static struct _mail_msg_op unsubscribe_op = { -- folder_unsubscribe__desc, -- folder_unsubscribe__unsub, -- NULL, -- folder_unsubscribe__free, -+static MailMsgInfo unsubscribe_info = { -+ sizeof (struct _folder_unsub_t), -+ (MailMsgDescFunc) folder_unsubscribe_desc, -+ (MailMsgExecFunc) folder_unsubscribe_exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) folder_unsubscribe_free - }; - - -@@ -105,8 +102,8 @@ org_gnome_mail_folder_unsubscribe (EPlug - if (target->uri == NULL) - return; - -- unsub = mail_msg_new (&unsubscribe_op, NULL, sizeof (struct _folder_unsub_t)); -+ unsub = mail_msg_new (&unsubscribe_info); - unsub->uri = g_strdup (target->uri); - -- e_thread_put (mail_thread_new, (EMsg *) unsub); -+ mail_msg_unordered_push (unsub); - } -diff -up evolution-2.21.4/plugins/mark-all-read/mark-all-read.c.kill-ethread evolution-2.21.4/plugins/mark-all-read/mark-all-read.c ---- evolution-2.21.4/plugins/mark-all-read/mark-all-read.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 -+++ evolution-2.21.4/plugins/mark-all-read/mark-all-read.c 2007-12-17 12:33:07.000000000 -0500 -@@ -44,7 +44,7 @@ org_gnome_mark_all_read (EPlugin *ep, EM - return; - } - -- mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_thread_new); -+ mail_get_folder(t->uri, 0, mar_got_folder, NULL, mail_msg_unordered_push); - } - - static void -diff -up evolution-2.21.4/plugins/exchange-operations/exchange-folder.c.kill-ethread evolution-2.21.4/plugins/exchange-operations/exchange-folder.c ---- evolution-2.21.4/plugins/exchange-operations/exchange-folder.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 -+++ evolution-2.21.4/plugins/exchange-operations/exchange-folder.c 2007-12-17 12:33:07.000000000 -0500 -@@ -140,7 +140,7 @@ org_gnome_exchange_folder_inbox_unsubscr - inbox_physical_uri = e_folder_get_physical_uri (inbox); - - /* To get the CamelStore/Folder */ -- mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_thread_new); -+ mail_get_folder (inbox_physical_uri, 0, exchange_get_folder, target_uri, mail_msg_unordered_push); - - - } -diff -up evolution-2.21.4/plugins/save-attachments/save-attachments.c.kill-ethread evolution-2.21.4/plugins/save-attachments/save-attachments.c ---- evolution-2.21.4/plugins/save-attachments/save-attachments.c.kill-ethread 2007-11-29 23:24:03.000000000 -0500 -+++ evolution-2.21.4/plugins/save-attachments/save-attachments.c 2007-12-17 12:33:07.000000000 -0500 -@@ -403,5 +403,5 @@ org_gnome_save_attachments_save(EPlugin - camel_object_ref(data->folder); - data->uid = g_strdup(target->uids->pdata[0]); - -- mail_get_message(data->folder, data->uid, save_got_message, data, mail_thread_new); -+ mail_get_message(data->folder, data->uid, save_got_message, data, mail_msg_unordered_push); - } -diff -up evolution-2.21.4/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread evolution-2.21.4/plugins/mailing-list-actions/mailing-list-actions.c ---- evolution-2.21.4/plugins/mailing-list-actions/mailing-list-actions.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 -+++ evolution-2.21.4/plugins/mailing-list-actions/mailing-list-actions.c 2007-12-17 12:33:07.000000000 -0500 -@@ -89,7 +89,7 @@ void emla_list_action (EPlugin *item, EM - data->uri = strdup (sel->uri); - - mail_get_message (sel->folder, (const char*) g_ptr_array_index (sel->uids, 0), -- emla_list_action_do, data, mail_thread_new); -+ emla_list_action_do, data, mail_msg_unordered_push); - } - - void emla_list_action_do (CamelFolder *folder, const char *uid, CamelMimeMessage *msg, void *data) -diff -up evolution-2.21.4/plugins/itip-formatter/itip-formatter.c.kill-ethread evolution-2.21.4/plugins/itip-formatter/itip-formatter.c ---- evolution-2.21.4/plugins/itip-formatter/itip-formatter.c.kill-ethread 2007-12-14 09:26:42.000000000 -0500 -+++ evolution-2.21.4/plugins/itip-formatter/itip-formatter.c 2007-12-17 12:33:07.000000000 -0500 -@@ -1551,47 +1551,38 @@ extract_itip_data (FormatItipPObject *pi - } - - struct _opencal_msg { -- struct _mail_msg msg; -+ MailMsg base; - - char *command; /* command line to run */ - }; - - static char * --open_calendar_desc (struct _mail_msg *mm, int done) -+open_calendar__desc (struct _opencal_msg *m, gint complete) - { - return g_strdup (_("Opening calendar")); - } - - static void --open_calendar_do (struct _mail_msg *mm) -+open_calendar__exec (struct _opencal_msg *m) - { -- struct _opencal_msg *m = (struct _opencal_msg *)mm; -- - if (!g_spawn_command_line_async (m->command, NULL)) { - g_warning ("Could not launch %s", m->command); - } - } - - static void --open_calendar_done (struct _mail_msg *mm) --{ -- /*struct _opencal_msg *m = (struct _opencal_msg *)mm;*/ --} -- --static void --open_calendar_free (struct _mail_msg *mm) -+open_calendar__free (struct _opencal_msg *m) - { -- struct _opencal_msg *m = (struct _opencal_msg *)mm; -- - g_free (m->command); - m->command = NULL; - } - --static struct _mail_msg_op open_calendar_op = { -- open_calendar_desc, -- open_calendar_do, -- open_calendar_done, -- open_calendar_free, -+static MailMsgInfo open_calendar_info = { -+ sizeof (struct _opencal_msg), -+ (MailMsgDescFunc) open_calendar__desc, -+ (MailMsgExecFunc) open_calendar__exec, -+ (MailMsgDoneFunc) NULL, -+ (MailMsgFreeFunc) open_calendar__free, - }; - - static gboolean -@@ -1600,10 +1591,10 @@ idle_open_cb (gpointer data) - FormatItipPObject *pitip = data; - struct _opencal_msg *m; - -- m = mail_msg_new (&open_calendar_op, NULL, sizeof (*m)); -+ m = mail_msg_new (&open_calendar_info); - m->command = g_strdup_printf ("evolution \"calendar://?startdate=%s&enddate=%s\"", - isodate_from_time_t (pitip->start_time), isodate_from_time_t (pitip->end_time)); -- e_thread_put (mail_thread_queued_slow, (EMsg *)m); -+ mail_msg_slow_ordered_push (m); - - return FALSE; - } -diff -up evolution-2.21.4/plugins/groupwise-features/share-folder-common.c.kill-ethread evolution-2.21.4/plugins/groupwise-features/share-folder-common.c ---- evolution-2.21.4/plugins/groupwise-features/share-folder-common.c.kill-ethread 2007-11-29 23:24:02.000000000 -0500 -+++ evolution-2.21.4/plugins/groupwise-features/share-folder-common.c 2007-12-17 12:33:07.000000000 -0500 -@@ -121,7 +121,7 @@ shared_folder_abort (EPlugin *ep, EConfi - } - - struct _EMCreateFolder { -- struct _mail_msg msg; -+ MailMsg base; - - /* input data */ - CamelStore *store; -@@ -137,31 +137,26 @@ struct _EMCreateFolder { - void *user_data; - }; - --static char * --create_folder__desc (struct _mail_msg *mm, int done) -+static gchar * -+create_folder_desc (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - return g_strdup_printf (_("Creating folder `%s'"), m->full_name); - } - - static void --create_folder__create (struct _mail_msg *mm) -+create_folder_exec (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - d(printf ("creating folder parent='%s' name='%s' full_name='%s'\n", m->parent, m->name, m->full_name)); - -- if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &mm->ex))) { -+ if ((m->fi = camel_store_create_folder (m->store, m->parent, m->name, &m->base.ex))) { - if (camel_store_supports_subscriptions (m->store)) -- camel_store_subscribe_folder (m->store, m->full_name, &mm->ex); -+ camel_store_subscribe_folder (m->store, m->full_name, &m->base.ex); - } - } - - static void --create_folder__created (struct _mail_msg *mm) -+create_folder_done (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; - struct ShareInfo *ssi = (struct ShareInfo *) m->user_data; - CamelStore *store = CAMEL_STORE (m->store) ; - EGwConnection *ccnc; -@@ -180,10 +175,8 @@ create_folder__created (struct _mail_msg - } - - static void --create_folder__free (struct _mail_msg *mm) -+create_folder_free (struct _EMCreateFolder *m) - { -- struct _EMCreateFolder *m = (struct _EMCreateFolder *) mm; -- - camel_store_free_folder_info (m->store, m->fi); - camel_object_unref (m->store); - g_free (m->full_name); -@@ -191,11 +184,12 @@ create_folder__free (struct _mail_msg *m - g_free (m->name); - } - --static struct _mail_msg_op create_folder_op = { -- create_folder__desc, -- create_folder__create, -- create_folder__created, -- create_folder__free, -+static MailMsgInfo create_folder_info = { -+ sizeof (struct _EMCreateFolder), -+ (MailMsgDescFunc) create_folder_desc, -+ (MailMsgExecFunc) create_folder_exec, -+ (MailMsgDoneFunc) create_folder_done, -+ (MailMsgFreeFunc) create_folder_free - }; - - static void -@@ -229,7 +223,7 @@ create_folder (CamelStore *store, const - parent = namebuf; - } - -- m = mail_msg_new (&create_folder_op, NULL, sizeof (struct _EMCreateFolder)); -+ m = mail_msg_new (&create_folder_info); - camel_object_ref (store); - m->store = store; - m->full_name = g_strdup (full_name); -@@ -238,8 +232,8 @@ create_folder (CamelStore *store, const - m->user_data = (struct ShareInfo *) user_data; - m->done = done; - g_free (namebuf); -- id = m->msg.seq; -- e_thread_put (mail_thread_new, (EMsg *) m); -+ id = m->base.seq; -+ mail_msg_unordered_push (m); - - return id; - } -diff -up evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.h ---- evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.h.kill-ethread 2007-11-29 23:24:07.000000000 -0500 -+++ evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.h 2007-12-17 12:33:08.000000000 -0500 -@@ -39,19 +39,6 @@ typedef struct _AlarmNotifyClass AlarmNo - - typedef struct _AlarmNotifyPrivate AlarmNotifyPrivate; - --typedef struct _AlarmMsg AlarmMsg; --typedef struct _AlarmMsgPrivate AlarmMsgPrivate; -- --struct _AlarmMsg { -- EMsg msg; -- -- void (*receive_msg)(EThread *e, struct _AlarmMsg *msg, void *data); /* message received */ -- void *data; -- -- /* Private Usage */ -- struct _AlarmMsgPrivate *priv; --}; -- - struct _AlarmNotify { - BonoboObject object; - -diff -up evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.c ---- evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.c.kill-ethread 2007-11-29 23:24:07.000000000 -0500 -+++ evolution-2.21.4/calendar/gui/alarm-notify/alarm-notify.c 2007-12-17 12:33:08.000000000 -0500 -@@ -45,10 +45,6 @@ struct _AlarmNotifyPrivate { - GMutex *mutex; - }; - --EThread *alarm_operation_thread; /* for operations that can (or should) be queued */ --EMsgPort *alarm_reply_port; --static GIOChannel *alarm_reply_channel; -- - #define d(x) x - - -@@ -286,72 +282,12 @@ alarm_notify_finalize (GObject *object) - g_mutex_free (priv->mutex); - g_free (priv); - -- e_thread_destroy(alarm_operation_thread); -- g_io_channel_unref(alarm_reply_channel); -- e_msgport_destroy(alarm_reply_port); - if (G_OBJECT_CLASS (parent_class)->finalize) - (* G_OBJECT_CLASS (parent_class)->finalize) (object); - } - - - --static guint --alarm_channel_setup(EMsgPort **port, GIOChannel **channel, GIOFunc func) --{ -- GSource *source; -- guint id; -- -- d (printf("%s:%d (alarm_channel_setup) - Channel Setup\n ", __FILE__, __LINE__)); -- *port = e_msgport_new(); --#ifndef G_OS_WIN32 -- *channel = g_io_channel_unix_new(e_msgport_fd(*port)); --#else -- *channel = g_io_channel_win32_new_socket(e_msgport_fd(*port)); --#endif -- source = g_io_create_watch(*channel, G_IO_IN); -- g_source_set_callback(source, (GSourceFunc)func, *port, NULL); -- g_source_set_can_recurse(source, FALSE); -- id = g_source_attach(source, NULL); -- g_source_unref(source); -- -- return id; --} -- --static void --alarm_msg_destroy(EThread *e, EMsg *msg, void *data) --{ -- AlarmMsg *m = (AlarmMsg *)msg; -- -- /* Free the private */ -- g_free (m->data); /* Mostly it is a structure allocated as a carrier*/ -- g_free (m); --} -- --static gboolean --alarm_msgport_replied(GIOChannel *source, GIOCondition cond, void *d) --{ -- EMsgPort *port = (EMsgPort *)d; -- EMsg *m; -- -- while (( m = e_msgport_get(port))) { -- d (printf("%s:%d (alarm_msgport_replied) - %p: Replied to GUI thread\n", __FILE__, __LINE__, m)); -- alarm_msg_destroy(NULL, m, NULL); -- } -- -- return TRUE; --} -- --static void --alarm_msg_received(EThread *e, EMsg *msg, void *data) --{ -- AlarmMsg *m = (AlarmMsg *)msg; -- -- d(printf("%s:%d (alarm_msg_received) - %p: Received at thread %" G_GINT64_MODIFIER "x\n", __FILE__, __LINE__, m, e_util_pthread_id(pthread_self()))); -- if (m->receive_msg) { -- m->receive_msg (e, m, data); -- } --} -- - /** - * alarm_notify_new: - * -@@ -363,23 +299,10 @@ alarm_msg_received(EThread *e, EMsg *msg - AlarmNotify * - alarm_notify_new (void) - { -- AlarmNotify *an; -- -- d (printf("%s:%d (alarm_notify_new) - Alarm Notify New \n ", __FILE__, __LINE__)); -- -- /* Create a thread for alarm queue operation*/ -- alarm_channel_setup(&alarm_reply_port, &alarm_reply_channel, alarm_msgport_replied); -- -- alarm_operation_thread = e_thread_new(E_THREAD_QUEUE); -- e_thread_set_msg_destroy(alarm_operation_thread, alarm_msg_destroy, NULL); -- e_thread_set_msg_received(alarm_operation_thread, alarm_msg_received, NULL); -- e_thread_set_reply_port(alarm_operation_thread, alarm_reply_port); -- -- an = g_object_new (TYPE_ALARM_NOTIFY, -- "poa", bonobo_poa_get_threaded (ORBIT_THREAD_HINT_PER_REQUEST, NULL), -- NULL); -- -- return an; -+ return g_object_new (TYPE_ALARM_NOTIFY, -+ "poa", bonobo_poa_get_threaded ( -+ ORBIT_THREAD_HINT_PER_REQUEST, NULL), -+ NULL); - } - - static void -diff -up evolution-2.21.4/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread evolution-2.21.4/calendar/gui/alarm-notify/alarm-queue.c ---- evolution-2.21.4/calendar/gui/alarm-notify/alarm-queue.c.kill-ethread 2007-11-29 23:24:07.000000000 -0500 -+++ evolution-2.21.4/calendar/gui/alarm-notify/alarm-queue.c 2007-12-17 12:33:08.000000000 -0500 -@@ -98,9 +98,6 @@ static int tray_blink_id = -1; - static int tray_blink_state = FALSE; - static AlarmNotify *an; - --/* Main Tasks thread for dealing with the global structures */ --extern EThread *alarm_operation_thread; -- - /* Structure that stores a client we are monitoring */ - typedef struct { - /* Monitored client */ -@@ -182,6 +179,40 @@ static void on_dialog_objs_removed_cb (E - static void load_alarms_for_today (ClientAlarms *ca); - static void midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data); - -+/* Simple asynchronous message dispatcher */ -+ -+typedef struct _Message Message; -+typedef void (*MessageFunc) (Message *msg); -+ -+struct _Message { -+ MessageFunc func; -+}; -+ -+static void -+message_proxy (Message *msg) -+{ -+ g_return_if_fail (msg->func != NULL); -+ -+ msg->func (msg); -+} -+ -+static gpointer -+create_thread_pool (void) -+{ -+ /* once created, run forever */ -+ return g_thread_pool_new ((GFunc) message_proxy, NULL, 1, FALSE, NULL); -+} -+ -+static void -+message_push (Message *msg) -+{ -+ static GOnce once = G_ONCE_INIT; -+ -+ g_once (&once, (GThreadFunc) create_thread_pool, NULL); -+ -+ g_thread_pool_push ((GThreadPool *) once.retval, msg, NULL); -+} -+ - /* Queues an alarm trigger for midnight so that we can load the next day's worth - * of alarms. - */ -@@ -220,47 +251,41 @@ add_client_alarms_cb (gpointer key, gpoi - } - - struct _midnight_refresh_msg { -+ Message header; - gboolean remove; - }; - - /* Loads the alarms for the new day every midnight */ - static void --midnight_refresh_async (EThread *e, AlarmMsg *msg, void *data) -+midnight_refresh_async (struct _midnight_refresh_msg *msg) - { -- struct _midnight_refresh_msg *list = msg->data; -- - d(printf("%s:%d (midnight_refresh_async) \n",__FILE__, __LINE__)); - - /* Re-load the alarms for all clients */ - g_hash_table_foreach (client_alarms_hash, add_client_alarms_cb, NULL); - - /* Re-schedule the midnight update */ -- if (list->remove && midnight_refresh_id != NULL) { -+ if (msg->remove && midnight_refresh_id != NULL) { - d(printf("%s:%d (midnight_refresh_async) - Reschedule the midnight update \n",__FILE__, __LINE__)); - alarm_remove (midnight_refresh_id); - midnight_refresh_id = NULL; - } - - queue_midnight_refresh (); -+ -+ g_slice_free (struct _midnight_refresh_msg, msg); - } - - static void - midnight_refresh_cb (gpointer alarm_id, time_t trigger, gpointer data) - { -- AlarmMsg *msg; -- struct _midnight_refresh_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = midnight_refresh_async; -- -- list = malloc (sizeof (struct _midnight_refresh_msg)); -+ struct _midnight_refresh_msg *msg; - -- list->remove = TRUE; -- msg->data = list; -+ msg = g_slice_new (struct _midnight_refresh_msg); -+ msg->header.func = (MessageFunc) midnight_refresh_async; -+ msg->remove = TRUE; - -- d(printf("%s:%d (midnight_refresh_cb) - Invoking task for midnight refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Looks up a client in the client alarms hash table */ -@@ -658,6 +683,7 @@ remove_comp (ClientAlarms *ca, ECalCompo - * alarms. - */ - struct _query_msg { -+ Message header; - ECal *client; - GList *objects; - gpointer data; -@@ -691,7 +717,7 @@ duplicate_ecal (GList *in_list) - } - - static void --query_objects_changed_async (EThread *e, AlarmMsg *msg, void *data) -+query_objects_changed_async (struct _query_msg *msg) - { - ClientAlarms *ca; - time_t from, day_end; -@@ -700,13 +726,12 @@ query_objects_changed_async (EThread *e, - icaltimezone *zone; - CompQueuedAlarms *cqa; - GList *l; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - -- client = list->client; -- ca = list->data; -- objects = list->objects; -+ client = msg->client; -+ ca = msg->data; -+ objects = msg->objects; - - from = config_data_get_last_notification_time (); - if (from == -1) -@@ -800,43 +825,38 @@ query_objects_changed_async (EThread *e, - comp = NULL; - } - g_list_free (objects); -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - query_objects_changed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = query_objects_changed_async; -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = duplicate_ical (objects); -- list->data = data; -- msg->data = list; -+ struct _query_msg *msg; - -- d(printf("%s:%d (query_objects_changed_cb) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) query_objects_changed_async; -+ msg->client = client; -+ msg->objects = duplicate_ical (objects); -+ msg->data = data; - -+ message_push ((Message *) msg); - } - - /* Called when a calendar component is removed; we must delete its corresponding - * alarms. - */ - static void --query_objects_removed_async (EThread *e, AlarmMsg *msg, void *data) -+query_objects_removed_async (struct _query_msg *msg) - { - ClientAlarms *ca; - GList *l; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - -- client = list->client; -- ca = list->data; -- objects = list->objects; -+ client = msg->client; -+ ca = msg->data; -+ objects = msg->objects; - - d(printf("%s:%d (query_objects_removed_async) - Removing %d objects\n",__FILE__, __LINE__, g_list_length(objects))); - -@@ -849,27 +869,22 @@ query_objects_removed_async (EThread *e, - } - - g_list_free (objects); -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - query_objects_removed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = query_objects_removed_async; -- -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = duplicate_ecal (objects); -- list->data = data; -- msg->data = list; -+ struct _query_msg *msg; - -- d(printf("%s:%d (query_objects_removed_cb) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) query_objects_removed_async; -+ msg->client = client; -+ msg->objects = duplicate_ecal (objects); -+ msg->data = data; - -+ message_push ((Message *) msg); - } - - -@@ -1011,20 +1026,19 @@ free_tray_icon_data (TrayIconData *tray_ - } - - static void --on_dialog_objs_removed_async (EThread *e, AlarmMsg *msg, void *data) -+on_dialog_objs_removed_async (struct _query_msg *msg) - { - const char *our_uid; - GList *l; - TrayIconData *tray_data; -- struct _query_msg *list = msg->data; - ECal *client; - GList *objects; - - d(printf("%s:%d (on_dialog_objs_removed_async)\n",__FILE__, __LINE__)); - -- client = list->client; -- tray_data = list->data; -- objects = list->objects; -+ client = msg->client; -+ tray_data = msg->data; -+ objects = msg->objects; - - e_cal_component_get_uid (tray_data->comp, &our_uid); - g_return_if_fail (our_uid && *our_uid); -@@ -1042,37 +1056,33 @@ on_dialog_objs_removed_async (EThread *e - tray_data = NULL; - } - } -+ -+ g_slice_free (struct _query_msg, msg); - } - - static void - on_dialog_objs_removed_cb (ECal *client, GList *objects, gpointer data) - { -- AlarmMsg *msg; -- struct _query_msg *list; -+ struct _query_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = on_dialog_objs_removed_async; -- -- list = malloc (sizeof (struct _query_msg)); -- list->client = client; -- list->objects = objects; -- list->data = data; -- msg->data = list; -+ msg = g_slice_new (struct _query_msg); -+ msg->header.func = (MessageFunc) on_dialog_objs_removed_async; -+ msg->client = client; -+ msg->objects = objects; -+ msg->data = data; - -- d(printf("%s:%d (on_dialog_objs_removed_cb) - Posting a task \n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - struct _tray_cqa_msg { -+ Message header; - CompQueuedAlarms *cqa; - }; - - static void --tray_list_remove_cqa_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_cqa_async (struct _tray_cqa_msg *msg) - { -- struct _tray_cqa_msg *tmsg = msg->data; -- CompQueuedAlarms *cqa = tmsg->cqa; -+ CompQueuedAlarms *cqa = msg->cqa; - GList *list = tray_icons_list; - - d(printf("%s:%d (tray_list_remove_cqa_async) - Removing CQA %p from tray list\n",__FILE__, __LINE__, cqa)); -@@ -1111,28 +1121,25 @@ tray_list_remove_cqa_async(EThread *e, A - gtk_tree_selection_select_iter (sel, &iter); - } - } -+ -+ g_slice_free (struct _tray_cqa_msg, msg); - } - - static void - tray_list_remove_cqa (CompQueuedAlarms *cqa) - { -- AlarmMsg *msg; -- struct _tray_cqa_msg *list; -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_cqa_async; -- -- list = malloc (sizeof (struct _tray_cqa_msg)); -- list->cqa = cqa; -- msg->data = list; -+ struct _tray_cqa_msg *msg; -+ -+ msg = g_slice_new (struct _tray_cqa_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_cqa_async; -+ msg->cqa = cqa; - -- d(printf("%s:%d (tray_list_remove_cqa) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Callback used from the alarm notify dialog */ - static void --tray_list_remove_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_async (Message *msg) - { - GList *list = tray_icons_list; - -@@ -1162,55 +1169,50 @@ tray_list_remove_async(EThread *e, Alarm - } else - list = list->next; - } -+ -+ g_slice_free (Message, msg); - } - - static void - tray_list_remove_icons (void) - { -- AlarmMsg *msg; -- -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_async; -+ Message *msg; - -- msg->data = NULL; -+ msg = g_slice_new (Message); -+ msg->func = tray_list_remove_async; - -- d(printf("%s:%d (tray_list_remove_icons) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push (msg); - } - - struct _tray_msg { -+ Message header; - TrayIconData *data; - }; - - static void --tray_list_remove_data_async(EThread *e, AlarmMsg *msg, void *data) -+tray_list_remove_data_async (struct _tray_msg *msg) - { -- struct _tray_msg *tmsg = msg->data; -- TrayIconData *tray_data = tmsg->data; -+ TrayIconData *tray_data = msg->data; - - d(printf("%s:%d (tray_list_remove_data_async) - Removing %p from tray list\n",__FILE__, __LINE__, tray_data)); - - tray_icons_list = g_list_remove_all (tray_icons_list, tray_data); - free_tray_icon_data (tray_data); - tray_data = NULL; -+ -+ g_slice_free (struct _tray_msg, msg); - } - - static void - tray_list_remove_data (TrayIconData *data) - { -- AlarmMsg *msg; -- struct _tray_msg *list; -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_remove_data_async; -- -- list = malloc (sizeof (struct _tray_msg)); -- list->data = data; -- msg->data = list; -+ struct _tray_msg *msg; - -- d(printf("%s:%d (tray_list_remove_data) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_remove_data_async; -+ msg->data = data; -+ -+ message_push ((Message *) msg); - } - - static void -@@ -1417,29 +1419,23 @@ tray_icon_blink_cb (gpointer data) - /* Add a new data to tray list */ - - static void --tray_list_add_async (EThread *e, AlarmMsg *msg, void *data) -+tray_list_add_async (struct _tray_msg *msg) - { -- struct _tray_msg *list = msg->data; -- d(printf("%s:%d (tray_list_add_async) - Add %p\n",__FILE__, __LINE__, list->data)); -- tray_icons_list = g_list_prepend (tray_icons_list, list->data); -+ tray_icons_list = g_list_prepend (tray_icons_list, msg->data); -+ -+ g_slice_free (struct _tray_msg, msg); - } - - static void - tray_list_add_new (TrayIconData *data) - { -- AlarmMsg *msg; -- struct _tray_msg *list; -+ struct _tray_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = tray_list_add_async; -- -- list = malloc (sizeof (struct _tray_msg)); -- list->data = data; -- msg->data = list; -+ msg = g_slice_new (struct _tray_msg); -+ msg->header.func = (MessageFunc) tray_list_add_async; -+ msg->data = data; - -- d(printf("%s:%d (tray_list_add_new) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Performs notification of a display alarm */ -@@ -1836,21 +1832,13 @@ check_midnight_refresh (gpointer user_da - new_midnight = time_day_end_with_zone (time (NULL), zone); - - if (new_midnight > midnight) { -- AlarmMsg *msg; -- struct _midnight_refresh_msg *list; -+ struct _midnight_refresh_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = midnight_refresh_async; -+ msg = g_slice_new (struct _midnight_refresh_msg); -+ msg->header.func = (MessageFunc) midnight_refresh_async; -+ msg->remove = FALSE; - -- list = malloc (sizeof (struct _midnight_refresh_msg)); -- -- list->remove = FALSE; -- /* We dont need it. So set it to NULL */ -- msg->data = list; -- -- d(printf("%s:%d (check_midnight_refresh) - Posting a task to refresh\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - return TRUE; -@@ -1981,14 +1969,15 @@ hash_ids (gpointer a) - } - - struct _alarm_client_msg { -+ Message header; - ECal *client; - }; - --static void alarm_queue_add_async (EThread *e, AlarmMsg *msg, void *data) -+static void -+alarm_queue_add_async (struct _alarm_client_msg *msg) - { - ClientAlarms *ca; -- struct _alarm_client_msg *list = msg->data; -- ECal *client = list->client; -+ ECal *client = msg->client; - - g_return_if_fail (alarm_queue_inited); - g_return_if_fail (client != NULL); -@@ -2019,6 +2008,8 @@ static void alarm_queue_add_async (EThre - G_CALLBACK (cal_opened_cb), - ca); - } -+ -+ g_slice_free (struct _alarm_client_msg, msg); - } - - /** -@@ -2038,20 +2029,13 @@ static void alarm_queue_add_async (EThre - void - alarm_queue_add_client (ECal *client) - { -- AlarmMsg *msg; -- struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = alarm_queue_add_async; -- -- list = malloc (sizeof (struct _alarm_client_msg)); -- list->client = client; -- g_object_ref (client); -- msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_add_async; -+ msg->client = g_object_ref (client); - -- d(printf("%s:%d (alarm_queue_add_client) - Posting a task\n",__FILE__, __LINE__)); -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Removes a component an its alarms */ -@@ -2103,11 +2087,10 @@ remove_client_alarms (ClientAlarms *ca) - * Removes a calendar client from the alarm queueing system. - **/ - static void --alarm_queue_remove_async (EThread *e, AlarmMsg *msg, void *data) -+alarm_queue_remove_async (struct _alarm_client_msg *msg) - { - ClientAlarms *ca; -- struct _alarm_client_msg *list = msg->data; -- ECal *client = list->client; -+ ECal *client = msg->client; - - g_return_if_fail (alarm_queue_inited); - g_return_if_fail (client != NULL); -@@ -2144,6 +2127,8 @@ alarm_queue_remove_async (EThread *e, Al - g_free (ca); - - g_hash_table_remove (client_alarms_hash, client); -+ -+ g_slice_free (struct _alarm_client_msg, msg); - } - - /** alarm_queue_remove_client -@@ -2156,24 +2141,16 @@ alarm_queue_remove_async (EThread *e, Al - void - alarm_queue_remove_client (ECal *client, gboolean immediately) - { -- AlarmMsg *msg; -- struct _alarm_client_msg *list; -+ struct _alarm_client_msg *msg; - -- /* These two structures will be freed by the msg destroy function*/ -- msg = malloc (sizeof (AlarmMsg)); -- msg->receive_msg = alarm_queue_remove_async; -- -- list = malloc (sizeof (struct _alarm_client_msg)); -- list->client = client; -- msg->data = list; -+ msg = g_slice_new (struct _alarm_client_msg); -+ msg->header.func = (MessageFunc) alarm_queue_remove_async; -+ msg->client = client; - -- d(printf("%s:%d (alarm_queue_remove_client) - Posting a task\n",__FILE__, __LINE__)); - if (immediately) { -- alarm_queue_remove_async (NULL, msg, NULL); -- g_free (list); -- g_free (msg); -+ alarm_queue_remove_async (msg); - } else -- e_thread_put(alarm_operation_thread, (EMsg *)msg); -+ message_push ((Message *) msg); - } - - /* Update non-time related variables for various structures on modification of an existing component diff --git a/evolution.spec b/evolution.spec index 665c703..53772d0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.21.4 -Release: 2%{?dist} +Version: 2.21.5 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -60,51 +60,33 @@ Obsoletes: libgal2 <= %{last_libgal2_version} # bad hack Patch10: evolution-1.4.4-ldap-x86_64-hack.patch -# Fix for RH bug #154360: -Patch11: evolution-2.5.5.1-commit-enter-on-calendar.patch - # Fix for RH bug 164957 (was for 145552): -Patch12: evolution-2.0.2-fix-145552.patch +Patch11: evolution-2.0.2-fix-145552.patch # Patches for conduits, based upon # rh-161817-attach-116019-conduit_pilot_link_updates.diff # (the latter patch was originally by Mark G. Adams): -# Patch13: evolution-2.5.4-fix-conduits.patch +# Patch12: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) # This patch effects other parts of evolution.spec and so is necessary # for a successful build. -Patch14: evolution-2.5.4-fix-conduit-dir.patch +Patch13: evolution-2.5.4-fix-conduit-dir.patch # Remove gnome-common macros from configure.in. # We do not ship gnome-common (or at least we're not supposed to). -Patch15: evolution-2.7.1-no-gnome-common.patch +Patch14: evolution-2.7.1-no-gnome-common.patch -#Patch16: evolution-2.7.1-notification-cleanups.patch - -# RH bug #166231 / GNOME bug #264485 -Patch17: evolution-2.7.3-replicated-cjk-input.patch - -# RH bug #178295 / GNOME bug #348638 -Patch18: evolution-2.7.4-deleting-preedit-buffer.patch - -# GNOME bug #362638 -Patch19: evolution-2.8.1-kill-ethread.patch +#Patch15: evolution-2.7.1-notification-cleanups.patch # GNOME bug #363695 -Patch20: evolution-2.9.1-kill-ememory.patch +Patch16: evolution-2.9.1-kill-ememory.patch # RH bug #176400 -Patch21: evolution-2.9.1-im-context-reset.patch +Patch17: evolution-2.9.1-im-context-reset.patch # RH bug #215478 / GNOME bug #383842 -Patch22: evolution-2.9.3-source-path-entry.patch - -# GNOME bug #504030 -Patch23: evolution-2.21.4-too-noisy.patch - -# GNOME bug #507311 -Patch24: evolution-2.21.4-bugzilla-component.patch +Patch18: evolution-2.9.3-source-path-entry.patch ## Dependencies ### @@ -242,20 +224,14 @@ This package contains the plugin to filter junk mail using SpamAssassin. %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack -%patch11 -p1 -b .commit-enter-on-calendar -%patch12 -p1 -b .fix-164957 -#patch13 -p1 -b .fix-conduits # leave commented -%patch14 -p1 -b .fix-conduit-dir -%patch15 -p1 -b .no-gnome-common -#patch16 -p1 -b .notification-cleanups -%patch17 -p1 -b .replicated-cjk-input -%patch18 -p1 -b .deleting-preedit-buffer -%patch19 -p1 -b .kill-ethread -%patch20 -p1 -b .kill-ememory -%patch21 -p1 -b .im-context-reset -%patch22 -p1 -b .source-path-entry -%patch23 -p1 -b .too-noisy -%patch24 -p1 -b .bugzilla-component +%patch11 -p1 -b .fix-164957 +#patch12 -p1 -b .fix-conduits # leave commented +%patch13 -p1 -b .fix-conduit-dir +%patch14 -p1 -b .no-gnome-common +#patch15 -p1 -b .notification-cleanups +%patch16 -p1 -b .kill-ememory +%patch17 -p1 -b .im-context-reset +%patch18 -p1 -b .source-path-entry mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -499,6 +475,7 @@ rm -rf $RPM_BUILD_ROOT %{_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}/evolution-backup %{_libexecdir}/evolution/%{evo_major}/killev # The plugin directory: @@ -524,6 +501,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-audio-inline.so %endif +%{evo_plugin_dir}/org-gnome-backup-restore.eplug +%{evo_plugin_dir}/org-gnome-backup-restore.xml +%{evo_plugin_dir}/liborg-gnome-backup-restore.so + %{evo_plugin_dir}/org-gnome-calendar-file.eplug %{evo_plugin_dir}/liborg-gnome-calendar-file.so @@ -593,9 +574,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-mark-calendar-offline.eplug %{evo_plugin_dir}/liborg-gnome-mark-calendar-offline.so -%{evo_plugin_dir}/org-gnome-new-mail-notify.eplug -%{evo_plugin_dir}/liborg-gnome-new-mail-notify.so - %{evo_plugin_dir}/org-gnome-plugin-manager.eplug %{evo_plugin_dir}/liborg-gnome-plugin-manager.so %{evo_plugin_dir}/org-gnome-plugin-manager.xml @@ -688,7 +666,17 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog -* Sat Jun 05 2008 Matthew Barnes - 2.21.4-2.fc9 +* Mon Jan 14 2008 Matthew Barnes - 2.21.5-1.fc9 +- Update to 2.21.5 +- The backup-restore plugin is stable again. +- Remove patch for RH bug #154360 (fixed upstream). +- Remove patch for RH bug #166231 (obsolete, possibly fixed upstream). +- Remove patch for RH bug #178295 (fixed upstream). +- Remove patch for GNOME bug #362638 (fixed upstream). +- Remove patch for GNOME bug #504030 (fixed upstream). +- Remove patch for GNOME bug #507311 (fixed upstream). + +* Sat Jan 05 2008 Matthew Barnes - 2.21.4-2.fc9 - Add patch for GNOME bug #507311 (send Bug Buddy reports to the new BugBuddyBugs Bugzilla component). diff --git a/sources b/sources index 525d802..5f3889f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -04f7d3aada64a21b6ee41ff4164f4246 evolution-2.21.4.tar.bz2 +80982f22860e447e51ddc4475cfedd70 evolution-2.21.5.tar.bz2 From 4f9238a9f31cee61579491706b3f89078299ec83 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 15 Jan 2008 21:18:23 +0000 Subject: [PATCH 197/844] - Add patch for GNOME bug #509741 (crash on startup). --- evolution-2.21.5-crash-on-startup.patch | 18 ++++++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 evolution-2.21.5-crash-on-startup.patch diff --git a/evolution-2.21.5-crash-on-startup.patch b/evolution-2.21.5-crash-on-startup.patch new file mode 100644 index 0000000..10f8da8 --- /dev/null +++ b/evolution-2.21.5-crash-on-startup.patch @@ -0,0 +1,18 @@ +diff -up evolution-2.21.5/mail/mail-session.c.crash-on-startup evolution-2.21.5/mail/mail-session.c +--- evolution-2.21.5/mail/mail-session.c.crash-on-startup 2008-01-10 04:20:18.000000000 -0500 ++++ evolution-2.21.5/mail/mail-session.c 2008-01-15 16:15:51.000000000 -0500 +@@ -351,7 +351,13 @@ user_message_exec (struct _user_message_ + g_signal_connect ( + user_message_dialog, "response", + G_CALLBACK (user_message_response), m); +- em_utils_show_error_silent (user_message_dialog); ++ ++ /* If the dialog has no "primary" text, there's nothing to ++ * display in the status bar. So just show the dialog. */ ++ if (g_object_get_data (user_message_dialog, "primary")) ++ em_utils_show_error_silent (user_message_dialog); ++ else ++ gtk_widget_show (user_message_dialog); + } + } + diff --git a/evolution.spec b/evolution.spec index 53772d0..26d3fc9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.21.5 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -88,6 +88,9 @@ Patch17: evolution-2.9.1-im-context-reset.patch # RH bug #215478 / GNOME bug #383842 Patch18: evolution-2.9.3-source-path-entry.patch +# GNOME bug #509741 +Patch19: evolution-2.21.5-crash-on-startup.patch + ## Dependencies ### Requires(post): GConf2 @@ -232,6 +235,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch16 -p1 -b .kill-ememory %patch17 -p1 -b .im-context-reset %patch18 -p1 -b .source-path-entry +%patch19 -p1 -b .crash-on-startup mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -666,6 +670,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Jan 15 2008 Matthew Barnes - 2.21.5-2.fc9 +- Add patch for GNOME bug #509741 (crash on startup). + * Mon Jan 14 2008 Matthew Barnes - 2.21.5-1.fc9 - Update to 2.21.5 - The backup-restore plugin is stable again. From 5d2020ca7805d13d4bf1ebf6985c4729fd4345c2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 29 Jan 2008 01:51:37 +0000 Subject: [PATCH 198/844] - Update to 2.21.90 - Update build requirements. - Remove patch for GNOME #363695 (obsolete/problematic). - Remove patch for GNOME #509741 (fixed upstream). --- .cvsignore | 2 +- evolution-2.21.5-crash-on-startup.patch | 18 -- evolution-2.9.1-kill-ememory.patch | 270 ------------------------ evolution.spec | 24 +-- sources | 2 +- 5 files changed, 14 insertions(+), 302 deletions(-) delete mode 100644 evolution-2.21.5-crash-on-startup.patch delete mode 100644 evolution-2.9.1-kill-ememory.patch diff --git a/.cvsignore b/.cvsignore index 1d94c86..800cb8c 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.5.tar.bz2 +evolution-2.21.90.tar.bz2 diff --git a/evolution-2.21.5-crash-on-startup.patch b/evolution-2.21.5-crash-on-startup.patch deleted file mode 100644 index 10f8da8..0000000 --- a/evolution-2.21.5-crash-on-startup.patch +++ /dev/null @@ -1,18 +0,0 @@ -diff -up evolution-2.21.5/mail/mail-session.c.crash-on-startup evolution-2.21.5/mail/mail-session.c ---- evolution-2.21.5/mail/mail-session.c.crash-on-startup 2008-01-10 04:20:18.000000000 -0500 -+++ evolution-2.21.5/mail/mail-session.c 2008-01-15 16:15:51.000000000 -0500 -@@ -351,7 +351,13 @@ user_message_exec (struct _user_message_ - g_signal_connect ( - user_message_dialog, "response", - G_CALLBACK (user_message_response), m); -- em_utils_show_error_silent (user_message_dialog); -+ -+ /* If the dialog has no "primary" text, there's nothing to -+ * display in the status bar. So just show the dialog. */ -+ if (g_object_get_data (user_message_dialog, "primary")) -+ em_utils_show_error_silent (user_message_dialog); -+ else -+ gtk_widget_show (user_message_dialog); - } - } - diff --git a/evolution-2.9.1-kill-ememory.patch b/evolution-2.9.1-kill-ememory.patch deleted file mode 100644 index 56b9582..0000000 --- a/evolution-2.9.1-kill-ememory.patch +++ /dev/null @@ -1,270 +0,0 @@ -diff -up evolution-2.21.2/mail/message-list.c.kill-ememory evolution-2.21.2/mail/message-list.c ---- evolution-2.21.2/mail/message-list.c.kill-ememory 2007-12-01 10:22:46.000000000 -0500 -+++ evolution-2.21.2/mail/message-list.c 2007-12-01 10:23:43.000000000 -0500 -@@ -416,70 +416,28 @@ get_message_info (MessageList *message_l - return info; - } - --static const char * --get_normalised_string (MessageList *message_list, CamelMessageInfo *info, int col) -+static const gchar * -+get_normalised_string (MessageList *message_list, const gchar *string) - { -- const char *string, *str; -- char *normalised; -- EPoolv *poolv; -- int index; -- -- switch (col) { -- case COL_SUBJECT_NORM: -- string = camel_message_info_subject (info); -- index = NORMALISED_SUBJECT; -- break; -- case COL_FROM_NORM: -- string = camel_message_info_from (info); -- index = NORMALISED_FROM; -- break; -- case COL_TO_NORM: -- string = camel_message_info_to (info); -- index = NORMALISED_TO; -- break; -- default: -- string = NULL; -- index = NORMALISED_LAST; -- g_warning ("Should not be reached\n"); -- } -- -- /* slight optimisation */ -- if (string == NULL || string[0] == '\0') -+ GHashTable *hash_table = message_list->normalised_hash; -+ GStringChunk *string_chunk = message_list->string_chunk; -+ gchar *collation_key, *temp; -+ -+ if (string == NULL || *string == '\0') - return ""; -- -- poolv = g_hash_table_lookup (message_list->normalised_hash, camel_message_info_uid (info)); -- if (poolv == NULL) { -- poolv = e_poolv_new (NORMALISED_LAST); -- g_hash_table_insert (message_list->normalised_hash, (char *) camel_message_info_uid (info), poolv); -- } else { -- str = e_poolv_get (poolv, index); -- if (*str) -- return str; -- } -- -- if (col == COL_SUBJECT_NORM) { -- const unsigned char *subject; -- -- subject = (const unsigned char *) string; -- while (!g_ascii_strncasecmp ((char *)subject, "Re:", 3)) { -- subject += 3; -- -- /* jump over any spaces */ -- while (*subject && isspace ((int) *subject)) -- subject++; -- } -- -- /* jump over any spaces */ -- while (*subject && isspace ((int) *subject)) -- subject++; -- -- string = (const char *) subject; -- } -- -- normalised = g_utf8_collate_key (string, -1); -- e_poolv_set (poolv, index, normalised, TRUE); -- -- return e_poolv_get (poolv, index); -+ -+ collation_key = g_hash_table_lookup (hash_table, string); -+ if (collation_key != NULL) -+ return collation_key; -+ -+ temp = g_utf8_collate_key (string, -1); -+ collation_key = g_string_chunk_insert_const (string_chunk, temp); -+ g_free (temp); -+ -+ temp = g_string_chunk_insert_const (string_chunk, string); -+ g_hash_table_insert (hash_table, temp, collation_key); -+ -+ return collation_key; - } - - static void -@@ -1287,12 +1245,23 @@ ml_tree_value_at (ETreeModel *etm, ETree - str = camel_message_info_from (msg_info); - return (void *)(str ? str : ""); - case COL_FROM_NORM: -- return (void *) get_normalised_string (message_list, msg_info, col); -+ str = camel_message_info_from (msg_info); -+ return (void *) get_normalised_string (message_list, str); - case COL_SUBJECT: - str = camel_message_info_subject (msg_info); - return (void *)(str ? str : ""); - case COL_SUBJECT_NORM: -- return (void *) get_normalised_string (message_list, msg_info, col); -+ str = camel_message_info_subject (msg_info); -+ while (str != NULL && *str != '\0') { -+ /* skip over spaces and reply prefixes */ -+ if (g_ascii_strncasecmp (str, "Re:", 3) == 0) -+ str += 3; -+ else if (g_ascii_isspace (*str)) -+ str++; -+ else -+ break; -+ } -+ return (void *) get_normalised_string (message_list, str); - case COL_SENT: { - ETreePath child; - -@@ -1316,7 +1285,8 @@ ml_tree_value_at (ETreeModel *etm, ETree - str = camel_message_info_to (msg_info); - return (void *)(str ? str : ""); - case COL_TO_NORM: -- return (void *) get_normalised_string (message_list, msg_info, col); -+ str = camel_message_info_to (msg_info); -+ return (void *) get_normalised_string (message_list, str); - case COL_SIZE: - return GINT_TO_POINTER (camel_message_info_size(msg_info)); - case COL_DELETED: -@@ -2066,13 +2036,13 @@ message_list_init (MessageList *message_ - gtk_scrolled_window_set_vadjustment ((GtkScrolledWindow *) message_list, adjustment); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (message_list), GTK_POLICY_NEVER, GTK_POLICY_ALWAYS); - -- message_list->normalised_hash = g_hash_table_new_full ( -- g_str_hash, g_str_equal, -- (GDestroyNotify) NULL, -- (GDestroyNotify) e_poolv_destroy); -+ message_list->normalised_hash = -+ g_hash_table_new (g_str_hash, g_str_equal); -+ -+ message_list->string_chunk = g_string_chunk_new (1024); - - message_list->hidden = NULL; -- message_list->hidden_pool = NULL; -+ message_list->hidden_string_chunk = NULL; - message_list->hide_before = ML_HIDE_NONE_START; - message_list->hide_after = ML_HIDE_NONE_END; - -@@ -2166,15 +2136,16 @@ message_list_finalise (GObject *object) - struct _MessageListPrivate *p = message_list->priv; - - g_hash_table_destroy (message_list->normalised_hash); -+ g_string_chunk_free (message_list->string_chunk); - - if (message_list->thread_tree) - camel_folder_thread_messages_unref(message_list->thread_tree); - - if (message_list->hidden) { - g_hash_table_destroy(message_list->hidden); -- e_mempool_destroy(message_list->hidden_pool); -+ g_string_chunk_free(message_list->hidden_string_chunk); - message_list->hidden = NULL; -- message_list->hidden_pool = NULL; -+ message_list->hidden_string_chunk = NULL; - } - - g_free(message_list->search); -@@ -3124,6 +3095,9 @@ message_list_set_folder (MessageList *me - - /* reset the normalised sort performance hack */ - g_hash_table_remove_all (message_list->normalised_hash); -+ -+ g_string_chunk_free (message_list->string_chunk); -+ message_list->string_chunk = g_string_chunk_new (1024); - - mail_regen_cancel(message_list); - -@@ -3574,14 +3548,14 @@ message_list_hide_uids (MessageList *ml, - MESSAGE_LIST_LOCK (ml, hide_lock); - if (ml->hidden == NULL) { - ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); -- ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE); -+ ml->hidden_string_chunk = g_string_chunk_new (512); - } - -- uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); -+ uid = g_string_chunk_insert (ml->hidden_string_chunk, uids->pdata[i]); - g_hash_table_insert (ml->hidden, uid, uid); - for ( ; i < uids->len; i++) { - if (g_hash_table_lookup (ml->uid_nodemap, uids->pdata[i])) { -- uid = e_mempool_strdup (ml->hidden_pool, uids->pdata[i]); -+ uid = g_string_chunk_insert (ml->hidden_string_chunk, uids->pdata[i]); - g_hash_table_insert (ml->hidden, uid, uid); - } - } -@@ -3602,9 +3576,9 @@ message_list_hide_clear (MessageList *ml - MESSAGE_LIST_LOCK (ml, hide_lock); - if (ml->hidden) { - g_hash_table_destroy (ml->hidden); -- e_mempool_destroy (ml->hidden_pool); -+ g_string_chunk_free (ml->hidden_string_chunk); - ml->hidden = NULL; -- ml->hidden_pool = NULL; -+ ml->hidden_string_chunk = NULL; - } - ml->hide_before = ML_HIDE_NONE_START; - ml->hide_after = ML_HIDE_NONE_END; -@@ -3640,9 +3614,9 @@ load_hide_state (MessageList *ml) - MESSAGE_LIST_LOCK(ml, hide_lock); - if (ml->hidden) { - g_hash_table_destroy (ml->hidden); -- e_mempool_destroy (ml->hidden_pool); -+ g_string_chunk_free (ml->hidden_string_chunk); - ml->hidden = NULL; -- ml->hidden_pool = NULL; -+ ml->hidden_string_chunk = NULL; - } - ml->hide_before = ML_HIDE_NONE_START; - ml->hide_after = ML_HIDE_NONE_END; -@@ -3653,7 +3627,7 @@ load_hide_state (MessageList *ml) - camel_file_util_decode_fixed_int32 (in, &version); - if (version == HIDE_STATE_VERSION) { - ml->hidden = g_hash_table_new(g_str_hash, g_str_equal); -- ml->hidden_pool = e_mempool_new(512, 256, E_MEMPOOL_ALIGN_BYTE); -+ ml->hidden_string_chunk = g_string_chunk_new(512); - camel_file_util_decode_fixed_int32 (in, &lower); - ml->hide_before = lower; - camel_file_util_decode_fixed_int32 (in, &upper); -@@ -3662,7 +3636,7 @@ load_hide_state (MessageList *ml) - char *olduid, *uid; - - if (camel_file_util_decode_string (in, &olduid) != -1) { -- uid = e_mempool_strdup(ml->hidden_pool, olduid); -+ uid = g_string_chunk_insert(ml->hidden_string_chunk, olduid); - g_free (olduid); - g_hash_table_insert(ml->hidden, uid, uid); - } -@@ -3811,12 +3785,12 @@ regen_list_exec (struct _regen_list_msg - - if (m->ml->hidden == NULL) { - m->ml->hidden = g_hash_table_new (g_str_hash, g_str_equal); -- m->ml->hidden_pool = e_mempool_new (512, 256, E_MEMPOOL_ALIGN_BYTE); -+ m->ml->hidden_string_chunk = g_string_chunk_new (512); - } - - for (i = 0; i < uidnew->len; i++) { - if (g_hash_table_lookup (m->ml->hidden, uidnew->pdata[i]) == NULL) { -- char *uid = e_mempool_strdup (m->ml->hidden_pool, uidnew->pdata[i]); -+ char *uid = g_string_chunk_insert (m->ml->hidden_string_chunk, uidnew->pdata[i]); - g_hash_table_insert (m->ml->hidden, uid, uid); - } - } -diff -up evolution-2.21.2/mail/message-list.h.kill-ememory evolution-2.21.2/mail/message-list.h ---- evolution-2.21.2/mail/message-list.h.kill-ememory 2007-10-23 06:06:27.000000000 -0400 -+++ evolution-2.21.2/mail/message-list.h 2007-12-01 10:22:46.000000000 -0500 -@@ -102,11 +102,12 @@ struct _MessageList { - GHashTable *uid_nodemap; /* uid (from info) -> tree node mapping */ - - GHashTable *normalised_hash; -+ GStringChunk *string_chunk; - - /* UID's to hide. Keys in the mempool */ - /* IMPORTANT: You MUST have obtained the hide lock, to operate on this data */ - GHashTable *hidden; -- struct _EMemPool *hidden_pool; -+ GStringChunk *hidden_string_chunk; - int hide_unhidden; /* total length, before hiding */ - int hide_before, hide_after; /* hide ranges of messages */ - diff --git a/evolution.spec b/evolution.spec index 26d3fc9..48cfb2d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,7 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.21.4 +%define eds_version 2.21.90 +%define glib2_version 2.15.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 @@ -9,7 +10,7 @@ %define gtkhtml_version 3.17.3 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 -%define libbonobo_version 2.16.0 +%define libbonobo_version 2.20.3 %define libbonoboui_version 2.4.2 %define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 @@ -44,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.21.5 -Release: 2%{?dist} +Version: 2.21.90 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -79,18 +80,12 @@ Patch14: evolution-2.7.1-no-gnome-common.patch #Patch15: evolution-2.7.1-notification-cleanups.patch -# GNOME bug #363695 -Patch16: evolution-2.9.1-kill-ememory.patch - # RH bug #176400 Patch17: evolution-2.9.1-im-context-reset.patch # RH bug #215478 / GNOME bug #383842 Patch18: evolution-2.9.3-source-path-entry.patch -# GNOME bug #509741 -Patch19: evolution-2.21.5-crash-on-startup.patch - ## Dependencies ### Requires(post): GConf2 @@ -116,6 +111,7 @@ BuildRequires: desktop-file-utils BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: flex BuildRequires: gettext +BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} BuildRequires: gnutls-devel @@ -232,10 +228,8 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch13 -p1 -b .fix-conduit-dir %patch14 -p1 -b .no-gnome-common #patch15 -p1 -b .notification-cleanups -%patch16 -p1 -b .kill-ememory %patch17 -p1 -b .im-context-reset %patch18 -p1 -b .source-path-entry -%patch19 -p1 -b .crash-on-startup mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -670,6 +664,12 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Jan 28 2008 Matthew Barnes - 2.21.90-1.fc9 +- Update to 2.21.90 +- Update build requirements. +- Remove patch for GNOME #363695 (obsolete/problematic). +- Remove patch for GNOME #509741 (fixed upstream). + * Tue Jan 15 2008 Matthew Barnes - 2.21.5-2.fc9 - Add patch for GNOME bug #509741 (crash on startup). diff --git a/sources b/sources index 5f3889f..1f7eab3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -80982f22860e447e51ddc4475cfedd70 evolution-2.21.5.tar.bz2 +537097b6b70cff8e0c246f513f2adb33 evolution-2.21.90.tar.bz2 From 722476610aba5ca1047f4ed51e53852c5e9fab9f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 29 Jan 2008 13:48:24 +0000 Subject: [PATCH 199/844] - Add patch for GNOME bug #240073 (don't strikeout Click to Add in tasks). --- evolution-2.21.90-click-to-add.patch | 14 ++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 evolution-2.21.90-click-to-add.patch diff --git a/evolution-2.21.90-click-to-add.patch b/evolution-2.21.90-click-to-add.patch new file mode 100644 index 0000000..6fb423c --- /dev/null +++ b/evolution-2.21.90-click-to-add.patch @@ -0,0 +1,14 @@ +diff -up evolution-2.21.90/calendar/gui/e-cal-model-tasks.h.click-to-add evolution-2.21.90/calendar/gui/e-cal-model-tasks.h +--- evolution-2.21.90/calendar/gui/e-cal-model-tasks.h.click-to-add 2008-01-29 08:44:08.000000000 -0500 ++++ evolution-2.21.90/calendar/gui/e-cal-model-tasks.h 2008-01-29 08:44:46.000000000 -0500 +@@ -46,8 +46,8 @@ typedef enum { + E_CAL_MODEL_TASKS_FIELD_PRIORITY, + E_CAL_MODEL_TASKS_FIELD_STATUS, + E_CAL_MODEL_TASKS_FIELD_URL, +- E_CAL_MODEL_TASKS_FIELD_LAST, +- E_CAL_MODEL_TASKS_FIELD_STRIKEOUT /* it's another virtual readonly column */ ++ E_CAL_MODEL_TASKS_FIELD_STRIKEOUT, /* it's another virtual readonly column */ ++ E_CAL_MODEL_TASKS_FIELD_LAST + } ECalModelTasksField; + + typedef struct { diff --git a/evolution.spec b/evolution.spec index 48cfb2d..48e400c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.21.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -86,6 +86,9 @@ Patch17: evolution-2.9.1-im-context-reset.patch # RH bug #215478 / GNOME bug #383842 Patch18: evolution-2.9.3-source-path-entry.patch +# GNOME bug #240073 +Patch19: evolution-2.21.90-click-to-add.patch + ## Dependencies ### Requires(post): GConf2 @@ -230,6 +233,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. #patch15 -p1 -b .notification-cleanups %patch17 -p1 -b .im-context-reset %patch18 -p1 -b .source-path-entry +%patch19 -p1 -b .click-to-add mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -664,6 +668,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Jan 29 2008 Matthew Barnes - 2.21.90-2.fc9 +- Add patch for GNOME bug #240073 (don't strikeout Click to Add in tasks). + * Mon Jan 28 2008 Matthew Barnes - 2.21.90-1.fc9 - Update to 2.21.90 - Update build requirements. From 0209ccd31c2eba1d9e574ff6976a5d713490d0f8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 29 Jan 2008 15:41:07 +0000 Subject: [PATCH 200/844] - Add patch to address the recent deprecation of G_GNUC_FUNCTION. --- evolution-2.21.90-no-gnuc-function.patch | 120 +++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 128 insertions(+), 1 deletion(-) create mode 100644 evolution-2.21.90-no-gnuc-function.patch diff --git a/evolution-2.21.90-no-gnuc-function.patch b/evolution-2.21.90-no-gnuc-function.patch new file mode 100644 index 0000000..15988d2 --- /dev/null +++ b/evolution-2.21.90-no-gnuc-function.patch @@ -0,0 +1,120 @@ +diff -up evolution-2.21.90/mail/mail-send-recv.c.no-gnuc-function evolution-2.21.90/mail/mail-send-recv.c +--- evolution-2.21.90/mail/mail-send-recv.c.no-gnuc-function 2008-01-10 04:08:27.000000000 -0500 ++++ evolution-2.21.90/mail/mail-send-recv.c 2008-01-29 10:28:54.000000000 -0500 +@@ -714,7 +714,7 @@ receive_done (char *uri, void *data) + gtk_widget_set_sensitive (info->cancel_button, FALSE); + + /* remove/free this active download */ +- d(printf("%s: freeing info %p\n", G_GNUC_FUNCTION, info)); ++ d(printf("%s: freeing info %p\n", G_STRFUNC, info)); + if (info->type == SEND_SEND) + g_hash_table_steal(info->data->active, SEND_URI_KEY); + else +diff -up evolution-2.21.90/widgets/menus/gal-view-collection.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-collection.c +--- evolution-2.21.90/widgets/menus/gal-view-collection.c.no-gnuc-function 2007-11-29 23:24:05.000000000 -0500 ++++ evolution-2.21.90/widgets/menus/gal-view-collection.c 2008-01-29 10:28:54.000000000 -0500 +@@ -753,7 +753,7 @@ gal_view_collection_append_with_title (G + + gal_view_set_title (view, title); + +- d(g_print("%s: %p\n", G_GNUC_FUNCTION, view)); ++ d(g_print("%s: %p\n", G_STRFUNC, view)); + + item = g_new(GalViewCollectionItem, 1); + item->ever_changed = TRUE; +@@ -791,7 +791,7 @@ gal_view_collection_set_nth_view (GalVie + g_return_val_if_fail (i >= 0, NULL); + g_return_val_if_fail (i < collection->view_count, NULL); + +- d(g_print("%s: %p\n", G_GNUC_FUNCTION, view)); ++ d(g_print("%s: %p\n", G_STRFUNC, view)); + + item = collection->view_data[i]; + +diff -up evolution-2.21.90/widgets/menus/gal-view-instance.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-instance.c +--- evolution-2.21.90/widgets/menus/gal-view-instance.c.no-gnuc-function 2007-11-29 23:24:05.000000000 -0500 ++++ evolution-2.21.90/widgets/menus/gal-view-instance.c 2008-01-29 10:28:54.000000000 -0500 +@@ -375,7 +375,7 @@ gal_view_instance_set_current_view_id (G + g_return_if_fail (instance != NULL); + g_return_if_fail (GAL_IS_VIEW_INSTANCE (instance)); + +- d(g_print("%s: view_id set to %s\n", G_GNUC_FUNCTION, view_id)); ++ d(g_print("%s: view_id set to %s\n", G_STRFUNC, view_id)); + + if (instance->current_id && !strcmp (instance->current_id, view_id)) + return; +diff -up evolution-2.21.90/widgets/menus/gal-view-menus.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-menus.c +--- evolution-2.21.90/widgets/menus/gal-view-menus.c.no-gnuc-function 2007-11-29 23:24:05.000000000 -0500 ++++ evolution-2.21.90/widgets/menus/gal-view-menus.c 2008-01-29 10:28:54.000000000 -0500 +@@ -491,10 +491,10 @@ void + gal_view_menus_unmerge (GalViewMenus *gvm, + CORBA_Environment *opt_ev) + { +- d(g_print ("%s:\n", G_GNUC_FUNCTION)); ++ d(g_print ("%s:\n", G_STRFUNC)); + if (bonobo_ui_component_get_container (gvm->priv->component) != NULL + && bonobo_ui_component_path_exists (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev)) { +- d(g_print ("%s: Removing path\n", G_GNUC_FUNCTION)); ++ d(g_print ("%s: Removing path\n", G_STRFUNC)); + bonobo_ui_component_rm (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev); + } + } +diff -up evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c.no-gnuc-function evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c +--- evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c.no-gnuc-function 2007-11-29 23:23:58.000000000 -0500 ++++ evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c 2008-01-29 10:28:54.000000000 -0500 +@@ -192,7 +192,7 @@ column_width_changed (EMinicardViewWidge + GtkAdjustment *adj; + GtkAdjustment *adj_new; + +- d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width)); ++ d(g_print("%s: Old width = %f, New width = %f\n", G_STRFUNC, view->column_width, width)); + if (view->column_width != width) { + view->column_width = width; + gal_view_changed(GAL_VIEW(view)); +diff -up evolution-2.21.90/addressbook/gui/widgets/e-minicard.c.no-gnuc-function evolution-2.21.90/addressbook/gui/widgets/e-minicard.c +--- evolution-2.21.90/addressbook/gui/widgets/e-minicard.c.no-gnuc-function 2008-01-27 22:59:43.000000000 -0500 ++++ evolution-2.21.90/addressbook/gui/widgets/e-minicard.c 2008-01-29 10:28:54.000000000 -0500 +@@ -347,7 +347,7 @@ e_minicard_set_property (GObject *objec + } + break; + case PROP_HAS_CURSOR: +- d(g_print("%s: PROP_HAS_CURSOR\n", G_GNUC_FUNCTION)); ++ d(g_print("%s: PROP_HAS_CURSOR\n", G_STRFUNC)); + if (e_minicard->has_cursor != g_value_get_boolean (value)) + set_has_cursor (e_minicard, g_value_get_boolean (value)); + break; +@@ -588,7 +588,7 @@ e_minicard_event (GnomeCanvasItem *item, + case GDK_FOCUS_CHANGE: + { + GdkEventFocus *focus_event = (GdkEventFocus *) event; +- d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_GNUC_FUNCTION, focus_event->in?"in":"out")); ++ d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out")); + if (focus_event->in) { + /* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it. */ + e_minicard->has_focus = TRUE; +diff -up evolution-2.21.90/shell/e-component-registry.c.no-gnuc-function evolution-2.21.90/shell/e-component-registry.c +--- evolution-2.21.90/shell/e-component-registry.c.no-gnuc-function 2007-11-29 23:23:59.000000000 -0500 ++++ evolution-2.21.90/shell/e-component-registry.c 2008-01-29 10:28:54.000000000 -0500 +@@ -343,7 +343,7 @@ e_component_registry_activate (EComponen + + info = e_component_registry_peek_info (registry, ECR_FIELD_ID, id); + if (info == NULL) { +- g_warning (G_GNUC_FUNCTION " - Unknown id \"%s\"", id); ++ g_warning (G_STRFUNC " - Unknown id \"%s\"", id); + return CORBA_OBJECT_NIL; + } + +diff -up evolution-2.21.90/shell/e-shell-importer.c.no-gnuc-function evolution-2.21.90/shell/e-shell-importer.c +--- evolution-2.21.90/shell/e-shell-importer.c.no-gnuc-function 2007-11-29 23:23:59.000000000 -0500 ++++ evolution-2.21.90/shell/e-shell-importer.c 2008-01-29 10:28:54.000000000 -0500 +@@ -120,8 +120,8 @@ typedef struct _ImportData { + /*#define IMPORTER_DEBUG*/ + + #ifdef IMPORTER_DEBUG +-#define IN g_print ("=====> %s (%d)\n", G_GNUC_FUNCTION, __LINE__) +-#define OUT g_print ("<==== %s (%d)\n", G_GNUC_FUNCTION, __LINE__) ++#define IN g_print ("=====> %s (%d)\n", G_STRFUNC, __LINE__) ++#define OUT g_print ("<==== %s (%d)\n", G_STRFUNC, __LINE__) + #else + #define IN + #define OUT diff --git a/evolution.spec b/evolution.spec index 48e400c..16fd8ad 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.21.90 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -89,6 +89,9 @@ Patch18: evolution-2.9.3-source-path-entry.patch # GNOME bug #240073 Patch19: evolution-2.21.90-click-to-add.patch +# Deal with recent G_GNUC_FUNCTION deprecation +Patch20: evolution-2.21.90-no-gnuc-function.patch + ## Dependencies ### Requires(post): GConf2 @@ -234,6 +237,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch17 -p1 -b .im-context-reset %patch18 -p1 -b .source-path-entry %patch19 -p1 -b .click-to-add +%patch20 -p1 -b .no-gnuc-function mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -668,6 +672,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Jan 29 2008 Matthew Barnes - 2.21.90-3.fc9 +- Add patch to address the recent deprecation of G_GNUC_FUNCTION. + * Tue Jan 29 2008 Matthew Barnes - 2.21.90-2.fc9 - Add patch for GNOME bug #240073 (don't strikeout Click to Add in tasks). From e83c620128d0f4df8548925be2937b66b4db90ab Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 29 Jan 2008 16:28:51 +0000 Subject: [PATCH 201/844] Fix a flaw in the last patch. --- evolution-2.21.90-no-gnuc-function.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-2.21.90-no-gnuc-function.patch b/evolution-2.21.90-no-gnuc-function.patch index 15988d2..3526c09 100644 --- a/evolution-2.21.90-no-gnuc-function.patch +++ b/evolution-2.21.90-no-gnuc-function.patch @@ -100,7 +100,7 @@ diff -up evolution-2.21.90/shell/e-component-registry.c.no-gnuc-function evoluti info = e_component_registry_peek_info (registry, ECR_FIELD_ID, id); if (info == NULL) { - g_warning (G_GNUC_FUNCTION " - Unknown id \"%s\"", id); -+ g_warning (G_STRFUNC " - Unknown id \"%s\"", id); ++ g_warning ("%s - Unknown id \"%s\"", %s, id); return CORBA_OBJECT_NIL; } From 1b6e71608a34bfef69bd7d4bb7d5f91ffbf08483 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 29 Jan 2008 17:42:15 +0000 Subject: [PATCH 202/844] Now I'm just not paying attention. --- evolution-2.21.90-no-gnuc-function.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-2.21.90-no-gnuc-function.patch b/evolution-2.21.90-no-gnuc-function.patch index 3526c09..b4bde68 100644 --- a/evolution-2.21.90-no-gnuc-function.patch +++ b/evolution-2.21.90-no-gnuc-function.patch @@ -100,7 +100,7 @@ diff -up evolution-2.21.90/shell/e-component-registry.c.no-gnuc-function evoluti info = e_component_registry_peek_info (registry, ECR_FIELD_ID, id); if (info == NULL) { - g_warning (G_GNUC_FUNCTION " - Unknown id \"%s\"", id); -+ g_warning ("%s - Unknown id \"%s\"", %s, id); ++ g_warning ("%s - Unknown id \"%s\"", G_STRFUNC, id); return CORBA_OBJECT_NIL; } From ad50da6175ec34ed27dcfee4b6468b8695e8af07 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 2 Feb 2008 23:23:51 +0000 Subject: [PATCH 203/844] - Remove some obsolete configure options: --enable-file-chooser, --enable-file-locking, --enable-dot-locking - Remove gnome-doc-utils work-around for GNOME bug #427939 (fixed upstream). - Remove patch for RH bug #215478 (fixed upstream). --- evolution-2.7.1-notification-cleanups.patch | 51 --------------------- evolution-2.9.3-source-path-entry.patch | 19 -------- evolution.spec | 34 ++++++-------- 3 files changed, 13 insertions(+), 91 deletions(-) delete mode 100644 evolution-2.7.1-notification-cleanups.patch delete mode 100644 evolution-2.9.3-source-path-entry.patch diff --git a/evolution-2.7.1-notification-cleanups.patch b/evolution-2.7.1-notification-cleanups.patch deleted file mode 100644 index 1fb6841..0000000 --- a/evolution-2.7.1-notification-cleanups.patch +++ /dev/null @@ -1,51 +0,0 @@ ---- evolution-2.7.2.1/calendar/gui/alarm-notify/alarm-queue.c.notification-cleanups 2006-04-22 00:39:20.000000000 -0400 -+++ evolution-2.7.2.1/calendar/gui/alarm-notify/alarm-queue.c 2006-05-23 16:04:23.000000000 -0400 -@@ -1566,10 +1566,11 @@ - const char *summary, *location; - GtkTooltips *tooltips; - ECalComponentText text; -- char *str, *start_str, *end_str, *alarm_str, *time_str; -+ char *start_str, *end_str, *alarm_str, *time_str; - icaltimezone *current_zone; - ECalComponentOrganizer organiser; - char *body; -+ NotifyNotification *n; - - d(printf("%s:%d (popup_notification)\n",__FILE__, __LINE__)); - -@@ -1601,9 +1602,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); - -- str = g_strdup_printf ("%s %s", -- start_str, time_str); -- - if (organiser.cn) { - if (location) - body = g_strdup_printf ("%s\n%s %s\n%s %s", organiser.cn, _("Location:"), location, start_str, time_str); -@@ -1617,16 +1615,21 @@ - body = g_strdup_printf ("%s %s", start_str, time_str); - } - -- NotifyNotification *n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); -- if (!notify_notification_show(n, NULL)) -+ n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); -+ -+ /* Notifications don't timeout: require explicit user action: */ -+ notify_notification_set_timeout (n, NOTIFY_EXPIRES_NEVER); -+ -+ if (!notify_notification_show (n, NULL)) - g_warning ("Could not send notification to daemon\n"); - -- /* create the private structure */ -+ g_object_unref (n); -+ -+ g_free (body); - g_free (start_str); - g_free (end_str); - g_free (alarm_str); - g_free (time_str); -- g_free (str); - - - } diff --git a/evolution-2.9.3-source-path-entry.patch b/evolution-2.9.3-source-path-entry.patch deleted file mode 100644 index 2a6337a..0000000 --- a/evolution-2.9.3-source-path-entry.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- evolution-2.9.3/mail/mail-config.glade.source-path-entry 2006-12-08 20:15:16.000000000 -0500 -+++ evolution-2.9.3/mail/mail-config.glade 2006-12-08 20:16:13.000000000 -0500 -@@ -1343,7 +1343,7 @@ - - True - Mailbox location -- GTK_FILE_CHOOSER_ACTION_OPEN -+ GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER - True - False - False -@@ -1354,7 +1354,6 @@ - 2 - 2 - 3 -- fill - - - diff --git a/evolution.spec b/evolution.spec index 16fd8ad..fd7b0b7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.21.90 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -78,19 +78,14 @@ Patch13: evolution-2.5.4-fix-conduit-dir.patch # We do not ship gnome-common (or at least we're not supposed to). Patch14: evolution-2.7.1-no-gnome-common.patch -#Patch15: evolution-2.7.1-notification-cleanups.patch - # RH bug #176400 -Patch17: evolution-2.9.1-im-context-reset.patch - -# RH bug #215478 / GNOME bug #383842 -Patch18: evolution-2.9.3-source-path-entry.patch +Patch15: evolution-2.9.1-im-context-reset.patch # GNOME bug #240073 -Patch19: evolution-2.21.90-click-to-add.patch +Patch16: evolution-2.21.90-click-to-add.patch # Deal with recent G_GNUC_FUNCTION deprecation -Patch20: evolution-2.21.90-no-gnuc-function.patch +Patch17: evolution-2.21.90-no-gnuc-function.patch ## Dependencies ### @@ -233,11 +228,9 @@ This package contains the plugin to filter junk mail using SpamAssassin. #patch12 -p1 -b .fix-conduits # leave commented %patch13 -p1 -b .fix-conduit-dir %patch14 -p1 -b .no-gnome-common -#patch15 -p1 -b .notification-cleanups -%patch17 -p1 -b .im-context-reset -%patch18 -p1 -b .source-path-entry -%patch19 -p1 -b .click-to-add -%patch20 -p1 -b .no-gnuc-function +%patch15 -p1 -b .im-context-reset +%patch16 -p1 -b .click-to-add +%patch17 -p1 -b .no-gnuc-function mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -321,18 +314,11 @@ CFLAGS="$CFLAGS \ # TODO: Make -DCAMEL_DISABLE_DEPRECATED work. %endif -# Temporary work-around for a bad gnome-doc-utils.make. -# See GNOME bug #427939. Should be fixed in evolution-2.10.2. -sed -i -e 's/@ENABLE_SK_TRUE@_s/_s/' help/Makefile.in - %configure \ - --disable-scrollkeeper \ --enable-gtk-doc \ --enable-ipv6 \ - --enable-file-locking=fcntl --enable-dot-locking=no \ --with-sub-version=" (%{version}-%{release})" \ --with-kde-applnk-path=no \ - --enable-file-chooser=yes \ %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ --enable-plugins=all export tagname=CC @@ -672,6 +658,12 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Sat Feb 02 2008 Matthew Barnes - 2.21.90-4.fc9 +- Remove some obsolete configure options: + --enable-file-chooser, --enable-file-locking, --enable-dot-locking +- Remove gnome-doc-utils work-around for GNOME bug #427939 (fixed upstream). +- Remove patch for RH bug #215478 (fixed upstream). + * Tue Jan 29 2008 Matthew Barnes - 2.21.90-3.fc9 - Add patch to address the recent deprecation of G_GNUC_FUNCTION. From 13f0104181400c1a33aa5d3cd6f7d767ef47fc86 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 11 Feb 2008 17:15:05 +0000 Subject: [PATCH 204/844] - Update to 2.21.91 - Remove patch for GNOME bug #240073 (fixed upstream). --- .cvsignore | 2 +- evolution-2.21.90-click-to-add.patch | 14 --- evolution-2.21.90-no-gnuc-function.patch | 120 ----------------------- evolution.spec | 16 ++- sources | 2 +- 5 files changed, 8 insertions(+), 146 deletions(-) delete mode 100644 evolution-2.21.90-click-to-add.patch delete mode 100644 evolution-2.21.90-no-gnuc-function.patch diff --git a/.cvsignore b/.cvsignore index 800cb8c..2c3e230 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.90.tar.bz2 +evolution-2.21.91.tar.bz2 diff --git a/evolution-2.21.90-click-to-add.patch b/evolution-2.21.90-click-to-add.patch deleted file mode 100644 index 6fb423c..0000000 --- a/evolution-2.21.90-click-to-add.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up evolution-2.21.90/calendar/gui/e-cal-model-tasks.h.click-to-add evolution-2.21.90/calendar/gui/e-cal-model-tasks.h ---- evolution-2.21.90/calendar/gui/e-cal-model-tasks.h.click-to-add 2008-01-29 08:44:08.000000000 -0500 -+++ evolution-2.21.90/calendar/gui/e-cal-model-tasks.h 2008-01-29 08:44:46.000000000 -0500 -@@ -46,8 +46,8 @@ typedef enum { - E_CAL_MODEL_TASKS_FIELD_PRIORITY, - E_CAL_MODEL_TASKS_FIELD_STATUS, - E_CAL_MODEL_TASKS_FIELD_URL, -- E_CAL_MODEL_TASKS_FIELD_LAST, -- E_CAL_MODEL_TASKS_FIELD_STRIKEOUT /* it's another virtual readonly column */ -+ E_CAL_MODEL_TASKS_FIELD_STRIKEOUT, /* it's another virtual readonly column */ -+ E_CAL_MODEL_TASKS_FIELD_LAST - } ECalModelTasksField; - - typedef struct { diff --git a/evolution-2.21.90-no-gnuc-function.patch b/evolution-2.21.90-no-gnuc-function.patch deleted file mode 100644 index b4bde68..0000000 --- a/evolution-2.21.90-no-gnuc-function.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -up evolution-2.21.90/mail/mail-send-recv.c.no-gnuc-function evolution-2.21.90/mail/mail-send-recv.c ---- evolution-2.21.90/mail/mail-send-recv.c.no-gnuc-function 2008-01-10 04:08:27.000000000 -0500 -+++ evolution-2.21.90/mail/mail-send-recv.c 2008-01-29 10:28:54.000000000 -0500 -@@ -714,7 +714,7 @@ receive_done (char *uri, void *data) - gtk_widget_set_sensitive (info->cancel_button, FALSE); - - /* remove/free this active download */ -- d(printf("%s: freeing info %p\n", G_GNUC_FUNCTION, info)); -+ d(printf("%s: freeing info %p\n", G_STRFUNC, info)); - if (info->type == SEND_SEND) - g_hash_table_steal(info->data->active, SEND_URI_KEY); - else -diff -up evolution-2.21.90/widgets/menus/gal-view-collection.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-collection.c ---- evolution-2.21.90/widgets/menus/gal-view-collection.c.no-gnuc-function 2007-11-29 23:24:05.000000000 -0500 -+++ evolution-2.21.90/widgets/menus/gal-view-collection.c 2008-01-29 10:28:54.000000000 -0500 -@@ -753,7 +753,7 @@ gal_view_collection_append_with_title (G - - gal_view_set_title (view, title); - -- d(g_print("%s: %p\n", G_GNUC_FUNCTION, view)); -+ d(g_print("%s: %p\n", G_STRFUNC, view)); - - item = g_new(GalViewCollectionItem, 1); - item->ever_changed = TRUE; -@@ -791,7 +791,7 @@ gal_view_collection_set_nth_view (GalVie - g_return_val_if_fail (i >= 0, NULL); - g_return_val_if_fail (i < collection->view_count, NULL); - -- d(g_print("%s: %p\n", G_GNUC_FUNCTION, view)); -+ d(g_print("%s: %p\n", G_STRFUNC, view)); - - item = collection->view_data[i]; - -diff -up evolution-2.21.90/widgets/menus/gal-view-instance.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-instance.c ---- evolution-2.21.90/widgets/menus/gal-view-instance.c.no-gnuc-function 2007-11-29 23:24:05.000000000 -0500 -+++ evolution-2.21.90/widgets/menus/gal-view-instance.c 2008-01-29 10:28:54.000000000 -0500 -@@ -375,7 +375,7 @@ gal_view_instance_set_current_view_id (G - g_return_if_fail (instance != NULL); - g_return_if_fail (GAL_IS_VIEW_INSTANCE (instance)); - -- d(g_print("%s: view_id set to %s\n", G_GNUC_FUNCTION, view_id)); -+ d(g_print("%s: view_id set to %s\n", G_STRFUNC, view_id)); - - if (instance->current_id && !strcmp (instance->current_id, view_id)) - return; -diff -up evolution-2.21.90/widgets/menus/gal-view-menus.c.no-gnuc-function evolution-2.21.90/widgets/menus/gal-view-menus.c ---- evolution-2.21.90/widgets/menus/gal-view-menus.c.no-gnuc-function 2007-11-29 23:24:05.000000000 -0500 -+++ evolution-2.21.90/widgets/menus/gal-view-menus.c 2008-01-29 10:28:54.000000000 -0500 -@@ -491,10 +491,10 @@ void - gal_view_menus_unmerge (GalViewMenus *gvm, - CORBA_Environment *opt_ev) - { -- d(g_print ("%s:\n", G_GNUC_FUNCTION)); -+ d(g_print ("%s:\n", G_STRFUNC)); - if (bonobo_ui_component_get_container (gvm->priv->component) != NULL - && bonobo_ui_component_path_exists (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev)) { -- d(g_print ("%s: Removing path\n", G_GNUC_FUNCTION)); -+ d(g_print ("%s: Removing path\n", G_STRFUNC)); - bonobo_ui_component_rm (gvm->priv->component, CURRENT_VIEW_PATH, opt_ev); - } - } -diff -up evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c.no-gnuc-function evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c ---- evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c.no-gnuc-function 2007-11-29 23:23:58.000000000 -0500 -+++ evolution-2.21.90/addressbook/gui/widgets/gal-view-minicard.c 2008-01-29 10:28:54.000000000 -0500 -@@ -192,7 +192,7 @@ column_width_changed (EMinicardViewWidge - GtkAdjustment *adj; - GtkAdjustment *adj_new; - -- d(g_print("%s: Old width = %f, New width = %f\n", G_GNUC_FUNCTION, view->column_width, width)); -+ d(g_print("%s: Old width = %f, New width = %f\n", G_STRFUNC, view->column_width, width)); - if (view->column_width != width) { - view->column_width = width; - gal_view_changed(GAL_VIEW(view)); -diff -up evolution-2.21.90/addressbook/gui/widgets/e-minicard.c.no-gnuc-function evolution-2.21.90/addressbook/gui/widgets/e-minicard.c ---- evolution-2.21.90/addressbook/gui/widgets/e-minicard.c.no-gnuc-function 2008-01-27 22:59:43.000000000 -0500 -+++ evolution-2.21.90/addressbook/gui/widgets/e-minicard.c 2008-01-29 10:28:54.000000000 -0500 -@@ -347,7 +347,7 @@ e_minicard_set_property (GObject *objec - } - break; - case PROP_HAS_CURSOR: -- d(g_print("%s: PROP_HAS_CURSOR\n", G_GNUC_FUNCTION)); -+ d(g_print("%s: PROP_HAS_CURSOR\n", G_STRFUNC)); - if (e_minicard->has_cursor != g_value_get_boolean (value)) - set_has_cursor (e_minicard, g_value_get_boolean (value)); - break; -@@ -588,7 +588,7 @@ e_minicard_event (GnomeCanvasItem *item, - case GDK_FOCUS_CHANGE: - { - GdkEventFocus *focus_event = (GdkEventFocus *) event; -- d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_GNUC_FUNCTION, focus_event->in?"in":"out")); -+ d(g_print("%s: GDK_FOCUS_CHANGE: %s\n", G_STRFUNC, focus_event->in?"in":"out")); - if (focus_event->in) { - /* Chris: When EMinicard gets the cursor, if it doesn't have the focus, it should take it. */ - e_minicard->has_focus = TRUE; -diff -up evolution-2.21.90/shell/e-component-registry.c.no-gnuc-function evolution-2.21.90/shell/e-component-registry.c ---- evolution-2.21.90/shell/e-component-registry.c.no-gnuc-function 2007-11-29 23:23:59.000000000 -0500 -+++ evolution-2.21.90/shell/e-component-registry.c 2008-01-29 10:28:54.000000000 -0500 -@@ -343,7 +343,7 @@ e_component_registry_activate (EComponen - - info = e_component_registry_peek_info (registry, ECR_FIELD_ID, id); - if (info == NULL) { -- g_warning (G_GNUC_FUNCTION " - Unknown id \"%s\"", id); -+ g_warning ("%s - Unknown id \"%s\"", G_STRFUNC, id); - return CORBA_OBJECT_NIL; - } - -diff -up evolution-2.21.90/shell/e-shell-importer.c.no-gnuc-function evolution-2.21.90/shell/e-shell-importer.c ---- evolution-2.21.90/shell/e-shell-importer.c.no-gnuc-function 2007-11-29 23:23:59.000000000 -0500 -+++ evolution-2.21.90/shell/e-shell-importer.c 2008-01-29 10:28:54.000000000 -0500 -@@ -120,8 +120,8 @@ typedef struct _ImportData { - /*#define IMPORTER_DEBUG*/ - - #ifdef IMPORTER_DEBUG --#define IN g_print ("=====> %s (%d)\n", G_GNUC_FUNCTION, __LINE__) --#define OUT g_print ("<==== %s (%d)\n", G_GNUC_FUNCTION, __LINE__) -+#define IN g_print ("=====> %s (%d)\n", G_STRFUNC, __LINE__) -+#define OUT g_print ("<==== %s (%d)\n", G_STRFUNC, __LINE__) - #else - #define IN - #define OUT diff --git a/evolution.spec b/evolution.spec index fd7b0b7..184823c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.21.90 -Release: 4%{?dist} +Version: 2.21.91 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -81,12 +81,6 @@ Patch14: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch15: evolution-2.9.1-im-context-reset.patch -# GNOME bug #240073 -Patch16: evolution-2.21.90-click-to-add.patch - -# Deal with recent G_GNUC_FUNCTION deprecation -Patch17: evolution-2.21.90-no-gnuc-function.patch - ## Dependencies ### Requires(post): GConf2 @@ -229,8 +223,6 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch13 -p1 -b .fix-conduit-dir %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset -%patch16 -p1 -b .click-to-add -%patch17 -p1 -b .no-gnuc-function mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -658,6 +650,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Feb 11 2008 Matthew Barnes - 2.21.91-1.fc9 +- Update to 2.21.91 +- Remove patch for GNOME bug #240073 (fixed upstream). + * Sat Feb 02 2008 Matthew Barnes - 2.21.90-4.fc9 - Remove some obsolete configure options: --enable-file-chooser, --enable-file-locking, --enable-dot-locking diff --git a/sources b/sources index 1f7eab3..7a68c6c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -537097b6b70cff8e0c246f513f2adb33 evolution-2.21.90.tar.bz2 +52a892cb2d0566c579350adad46a2222 evolution-2.21.91.tar.bz2 From 800a440999eac97b79bd7811b42e624e6ab961ae Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 12 Feb 2008 19:55:46 +0000 Subject: [PATCH 205/844] - Update to 2.21.91 - Bump eds_version to 2.21.91. - Remove patch for GNOME bug #240073 (fixed upstream). --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 184823c..bd1925a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.21.90 +%define eds_version 2.21.91 %define glib2_version 2.15.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -652,6 +652,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Feb 11 2008 Matthew Barnes - 2.21.91-1.fc9 - Update to 2.21.91 +- Bump eds_version to 2.21.91. - Remove patch for GNOME bug #240073 (fixed upstream). * Sat Feb 02 2008 Matthew Barnes - 2.21.90-4.fc9 From ad72824000a6332a4f110d4ef197698576b197c3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 13 Feb 2008 22:52:25 +0000 Subject: [PATCH 206/844] - Rebuild against libsoup 2.3.2. --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index bd1925a..8a40f0e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.21.91 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -650,6 +650,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Wed Feb 13 2008 Matthew Barnes - 2.21.91-2.fc9 +- Rebuild against libsoup 2.3.2. + * Mon Feb 11 2008 Matthew Barnes - 2.21.91-1.fc9 - Update to 2.21.91 - Bump eds_version to 2.21.91. From 2c123bf4597fb484bcaff85a81be61da3eacf688 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 Feb 2008 19:43:55 +0000 Subject: [PATCH 207/844] - Update to 2.21.92 - Bump eds_version to 2.21.92. --- .cvsignore | 2 +- evolution.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2c3e230..8863ebd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.91.tar.bz2 +evolution-2.21.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 8a40f0e..caf37de 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.21.91 +%define eds_version 2.21.92 %define glib2_version 2.15.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -45,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.21.91 -Release: 2%{?dist} +Version: 2.21.92 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -650,6 +650,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Feb 25 2008 Matthew Barnes - 2.21.92-1.fc9 +- Update to 2.21.92 +- Bump eds_version to 2.21.92. + * Wed Feb 13 2008 Matthew Barnes - 2.21.91-2.fc9 - Rebuild against libsoup 2.3.2. diff --git a/sources b/sources index 7a68c6c..eeb48fe 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -52a892cb2d0566c579350adad46a2222 evolution-2.21.91.tar.bz2 +8635bc402bf3ba6f57bb3a7635bafd5c evolution-2.21.92.tar.bz2 From 0078e8714fe3d42217ab0185db3fe725ad63af72 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 5 Mar 2008 15:09:45 +0000 Subject: [PATCH 208/844] - Add patch for CVE-2008-0072 (format string vulnerability). --- evolution-2.21.92-CVE-2008-0072.patch | 48 +++++++++++++++++++++++++++ evolution.spec | 9 ++++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 evolution-2.21.92-CVE-2008-0072.patch diff --git a/evolution-2.21.92-CVE-2008-0072.patch b/evolution-2.21.92-CVE-2008-0072.patch new file mode 100644 index 0000000..7183312 --- /dev/null +++ b/evolution-2.21.92-CVE-2008-0072.patch @@ -0,0 +1,48 @@ +diff -up evolution-2.21.92/mail/em-format.c.CVE-2008-0072 evolution-2.21.92/mail/em-format.c +--- evolution-2.21.92/mail/em-format.c.CVE-2008-0072 2008-01-27 22:59:48.000000000 -0500 ++++ evolution-2.21.92/mail/em-format.c 2008-03-04 15:40:29.000000000 -0500 +@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf + opart = camel_mime_part_new(); + valid = camel_cipher_decrypt(context, part, opart, ex); + if (valid == NULL) { +- em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); ++ em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); + em_format_part_as(emf, stream, part, NULL); + } else { + if (emfc == NULL) +@@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C + if (valid == NULL) { + em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error")); + if (ex->desc) +- em_format_format_error(emf, stream, ex->desc); ++ em_format_format_error(emf, stream, "%s", ex->desc); + em_format_part_as(emf, stream, part, "multipart/mixed"); + } else { + if (emfc == NULL) +@@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came + if (valid == NULL) { + em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); + if (ex->desc) +- em_format_format_error(emf, stream, ex->desc); ++ em_format_format_error(emf, stream, "%s", ex->desc); + em_format_part_as(emf, stream, part, "multipart/mixed"); + } else { + if (emfc == NULL) +@@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came + if (!valid) { + em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); + if (ex->desc) +- em_format_format_error(emf, stream, ex->desc); ++ em_format_format_error(emf, stream, "%s", ex->desc); + em_format_format_source(emf, stream, ipart); + /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ + camel_exception_free(ex); +@@ -1658,7 +1658,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C + if (!valid) { + em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); + if (ex->desc) +- em_format_format_error(emf, stream, ex->desc); ++ em_format_format_error(emf, stream, "%s", ex->desc); + em_format_format_source(emf, stream, ipart); + /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ + camel_exception_free(ex); diff --git a/evolution.spec b/evolution.spec index caf37de..721c2c8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.21.92 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -81,6 +81,9 @@ Patch14: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch15: evolution-2.9.1-im-context-reset.patch +# CVE-2008-0072 +Patch16: evolution-2.21.92-CVE-2008-0072.patch + ## Dependencies ### Requires(post): GConf2 @@ -223,6 +226,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch13 -p1 -b .fix-conduit-dir %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset +%patch16 -p1 -b .CVE-2008-0072 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -650,6 +654,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Mar 04 2008 Matthew Barnes - 2.21.92-2.fc9 +- Add patch for CVE-2008-0072 (format string vulnerability). + * Mon Feb 25 2008 Matthew Barnes - 2.21.92-1.fc9 - Update to 2.21.92 - Bump eds_version to 2.21.92. From 6d1857fa387aeb3b34beeff8e93ff37b0dc796e3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 5 Mar 2008 15:41:03 +0000 Subject: [PATCH 209/844] Add a Bugzilla reference for CVE-2008-0072. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 721c2c8..1694539 100644 --- a/evolution.spec +++ b/evolution.spec @@ -81,7 +81,7 @@ Patch14: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch15: evolution-2.9.1-im-context-reset.patch -# CVE-2008-0072 +# RH bug #436082 / CVE-2008-0072 Patch16: evolution-2.21.92-CVE-2008-0072.patch ## Dependencies ### From df93db51077012a1fa9276b6698924af0cdfa0cd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 10 Mar 2008 17:20:53 +0000 Subject: [PATCH 210/844] - Update to 2.22.0 - Remove patch for CVE-2008-0072 (fixed upstream). --- .cvsignore | 2 +- evolution.spec | 14 +++++++------- sources | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8863ebd..34f3d5d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.21.92.tar.bz2 +evolution-2.22.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 1694539..6f8f290 100644 --- a/evolution.spec +++ b/evolution.spec @@ -7,7 +7,7 @@ %define gnome_pilot_version 2.0.15 %define gnomevfs2_version 2.4 %define gtk2_version 2.12.0 -%define gtkhtml_version 3.17.3 +%define gtkhtml_version 3.17.5 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 @@ -45,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.21.92 -Release: 2%{?dist} +Version: 2.22.0 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -81,9 +81,6 @@ Patch14: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch15: evolution-2.9.1-im-context-reset.patch -# RH bug #436082 / CVE-2008-0072 -Patch16: evolution-2.21.92-CVE-2008-0072.patch - ## Dependencies ### Requires(post): GConf2 @@ -226,7 +223,6 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch13 -p1 -b .fix-conduit-dir %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset -%patch16 -p1 -b .CVE-2008-0072 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -654,6 +650,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Mar 10 2008 Matthew Barnes - 2.22.0-1.fc9 +- Update to 2.22.0 +- Remove patch for CVE-2008-0072 (fixed upstream). + * Tue Mar 04 2008 Matthew Barnes - 2.21.92-2.fc9 - Add patch for CVE-2008-0072 (format string vulnerability). diff --git a/sources b/sources index eeb48fe..1c39e75 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8635bc402bf3ba6f57bb3a7635bafd5c evolution-2.21.92.tar.bz2 +22567465cfba2658fd0a9be03f8c854f evolution-2.22.0.tar.bz2 From e09af7888ee7ca67b40e2169288baf5dfc1c8773 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 14 Mar 2008 17:01:26 +0000 Subject: [PATCH 211/844] - Add patch for RH bug #437208 (tracking network status). --- evolution-2.22.0-line-status.patch | 185 +++++++++++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 193 insertions(+), 1 deletion(-) create mode 100644 evolution-2.22.0-line-status.patch diff --git a/evolution-2.22.0-line-status.patch b/evolution-2.22.0-line-status.patch new file mode 100644 index 0000000..8b13eb2 --- /dev/null +++ b/evolution-2.22.0-line-status.patch @@ -0,0 +1,185 @@ +diff -up evolution-2.22.0/shell/e-shell-nm-glib.c.line-status evolution-2.22.0/shell/e-shell-nm-glib.c +--- evolution-2.22.0/shell/e-shell-nm-glib.c.line-status 2007-11-29 23:23:59.000000000 -0500 ++++ evolution-2.22.0/shell/e-shell-nm-glib.c 2008-03-14 12:13:29.000000000 -0400 +@@ -33,23 +33,40 @@ + static libnm_glib_ctx *nm_ctx = NULL; + static guint id = 0; + +-static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) ++static void ++e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) + { + libnm_glib_state state; +- EShellLineStatus line_status; + EShellWindow *window = E_SHELL_WINDOW (user_data); + EShell *shell = e_shell_window_peek_shell (window); + GNOME_Evolution_ShellState shell_state; ++ gboolean shell_is_online; ++ gboolean shell_is_offline; + + g_return_if_fail (ctx != NULL); + + state = libnm_glib_get_network_state (ctx); +- line_status = e_shell_get_line_status (shell); + +- if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == LIBNM_NO_NETWORK_CONNECTION) { ++ switch (e_shell_get_line_status (shell)) { ++ case E_SHELL_LINE_STATUS_ONLINE: ++ shell_is_online = TRUE; ++ shell_is_offline = FALSE; ++ break; ++ case E_SHELL_LINE_STATUS_OFFLINE: ++ case E_SHELL_LINE_STATUS_FORCED_OFFLINE: ++ shell_is_online = FALSE; ++ shell_is_offline = TRUE; ++ break; ++ default: /* in-between states */ ++ shell_is_online = FALSE; ++ shell_is_offline = FALSE; ++ } ++ ++ if (shell_is_online && state == LIBNM_NO_NETWORK_CONNECTION) { + shell_state = GNOME_Evolution_FORCED_OFFLINE; + e_shell_go_offline (shell, window, shell_state); +- } else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && state == LIBNM_ACTIVE_NETWORK_CONNECTION) { ++ ++ } else if (shell_is_offline && state == LIBNM_ACTIVE_NETWORK_CONNECTION) { + shell_state = GNOME_Evolution_USER_ONLINE; + e_shell_go_online (shell, window, shell_state); + } +@@ -58,15 +75,15 @@ static void e_shell_glib_network_monitor + int e_shell_nm_glib_initialise (EShellWindow *window); + void e_shell_nm_glib_dispose (EShellWindow *window); + +-int e_shell_nm_glib_initialise (EShellWindow *window) ++int ++e_shell_nm_glib_initialise (EShellWindow *window) + { +- if (!nm_ctx) +- { ++ if (!nm_ctx) { + nm_ctx = libnm_glib_init (); + if (!nm_ctx) { +- fprintf (stderr, "Could not initialize libnm.\n"); +- return FALSE; +- } ++ g_warning ("Could not initialize libnm."); ++ return FALSE; ++ } + } + + id = libnm_glib_register_callback (nm_ctx, e_shell_glib_network_monitor, window, NULL); +@@ -74,7 +91,8 @@ int e_shell_nm_glib_initialise (EShellWi + return TRUE; + } + +-void e_shell_nm_glib_dispose (EShellWindow *window) ++void ++e_shell_nm_glib_dispose (EShellWindow *window) + { + if (id != 0 && nm_ctx != NULL) { + libnm_glib_unregister_callback (nm_ctx, id); +@@ -83,4 +101,3 @@ void e_shell_nm_glib_dispose (EShellWind + id = 0; + } + } +- +diff -up evolution-2.22.0/shell/e-shell-nm.c.line-status evolution-2.22.0/shell/e-shell-nm.c +--- evolution-2.22.0/shell/e-shell-nm.c.line-status 2008-02-22 04:51:05.000000000 -0500 ++++ evolution-2.22.0/shell/e-shell-nm.c 2008-03-14 12:13:29.000000000 -0400 +@@ -35,17 +35,12 @@ + #include + #include + +-typedef enum _ShellLineStatus { +- E_SHELL_LINE_DOWN, +- E_SHELL_LINE_UP +-} ShellLineStatus; +- +- + static gboolean init_dbus (EShellWindow *window); ++int e_shell_dbus_initialise (EShellWindow *window); ++void e_shell_dbus_dispose (EShellWindow *window); + + static DBusConnection *dbus_connection = NULL; + +- + static gboolean + reinit_dbus (gpointer user_data) + { +@@ -63,11 +58,12 @@ e_shell_network_monitor (DBusConnection + { + DBusError error; + const char *object; +- ShellLineStatus status; + EShellWindow *window = NULL; + EShell *shell = NULL; + GNOME_Evolution_ShellState shell_state; +- EShellLineStatus line_status; ++ gboolean shell_is_online; ++ gboolean shell_is_offline; ++ gboolean network_device_active; + + if (!user_data || !E_IS_SHELL_WINDOW (user_data)) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; +@@ -89,9 +85,9 @@ e_shell_network_monitor (DBusConnection + } + + if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) +- status = E_SHELL_LINE_DOWN; ++ network_device_active = FALSE; + else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) +- status = E_SHELL_LINE_UP; ++ network_device_active = TRUE; + else + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + +@@ -99,12 +95,26 @@ e_shell_network_monitor (DBusConnection + &object, DBUS_TYPE_INVALID)) + return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; + +- line_status = e_shell_get_line_status (shell); ++ switch (e_shell_get_line_status (shell)) { ++ case E_SHELL_LINE_STATUS_ONLINE: ++ shell_is_online = TRUE; ++ shell_is_offline = FALSE; ++ break; ++ case E_SHELL_LINE_STATUS_OFFLINE: ++ case E_SHELL_LINE_STATUS_FORCED_OFFLINE: ++ shell_is_online = FALSE; ++ shell_is_offline = TRUE; ++ break; ++ default: /* in-between states */ ++ shell_is_online = FALSE; ++ shell_is_offline = FALSE; ++ } + +- if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) { ++ if (shell_is_online && !network_device_active) { + shell_state = GNOME_Evolution_FORCED_OFFLINE; + e_shell_go_offline (shell, window, shell_state); +- } else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && status == E_SHELL_LINE_UP) { ++ ++ } else if (shell_is_offline && network_device_active) { + shell_state = GNOME_Evolution_USER_ONLINE; + e_shell_go_online (shell, window, shell_state); + } +@@ -153,14 +163,16 @@ init_dbus (EShellWindow *window) + return FALSE; + } + +-int e_shell_dbus_initialise (EShellWindow *window) ++int ++e_shell_dbus_initialise (EShellWindow *window) + { + g_type_init (); + + return init_dbus (window); + } + +-void e_shell_dbus_dispose (EShellWindow *window) ++void ++e_shell_dbus_dispose (EShellWindow *window) + { + //FIXME + return; diff --git a/evolution.spec b/evolution.spec index 6f8f290..3dca495 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.22.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -81,6 +81,9 @@ Patch14: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch15: evolution-2.9.1-im-context-reset.patch +# RH bug #437208 / GNOME bug #518103 +Patch16: evolution-2.22.0-line-status.patch + ## Dependencies ### Requires(post): GConf2 @@ -223,6 +226,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch13 -p1 -b .fix-conduit-dir %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset +%patch16 -p1 -b .line-status mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -650,6 +654,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Fri Mar 14 2008 Matthew Barnes - 2.22.0-2.fc9 +- Add patch for RH bug #437208 (tracking network status). + * Mon Mar 10 2008 Matthew Barnes - 2.22.0-1.fc9 - Update to 2.22.0 - Remove patch for CVE-2008-0072 (fixed upstream). From 8a8ab3e5588817bbcacefc650dc1d03ad5f908e3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 14 Mar 2008 20:10:05 +0000 Subject: [PATCH 212/844] - Explicit require evolution-data-server since its shared object names still can't be trusted (RH bug #426511). --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 3dca495..9f6b76a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.22.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -90,6 +90,9 @@ Requires(post): GConf2 Requires(post): scrollkeeper >= %{scrollkeeper_version} Requires(postun): scrollkeeper >= %{scrollkeeper_version} +# Don't trust evolution-data-server to maintain accurate sonames. +Requires: evolution-data-server >= %{eds_version} + Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-spell >= 1.0.2 Requires: gnome-themes @@ -654,6 +657,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Fri Mar 14 2008 Matthew Barnes - 2.22.0-3.fc9 +- Explicit require evolution-data-server since its shared object names + still can't be trusted (RH bug #426511). + * Fri Mar 14 2008 Matthew Barnes - 2.22.0-2.fc9 - Add patch for RH bug #437208 (tracking network status). From a3965452469b0595c70aaf9cc2ca8337db5ee838 Mon Sep 17 00:00:00 2001 From: Daniel Williams Date: Tue, 25 Mar 2008 15:26:56 +0000 Subject: [PATCH 213/844] - Add patch for GNOME bug #524310 --- evolution-2.10.3-server-message-double-free.patch | 15 +++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 evolution-2.10.3-server-message-double-free.patch diff --git a/evolution-2.10.3-server-message-double-free.patch b/evolution-2.10.3-server-message-double-free.patch new file mode 100644 index 0000000..8c4316c --- /dev/null +++ b/evolution-2.10.3-server-message-double-free.patch @@ -0,0 +1,15 @@ +diff -up evolution-2.10.3/mail/mail-session.c.server-message-double-free evolution-2.10.3/mail/mail-session.c +--- evolution-2.10.3/mail/mail-session.c.server-message-double-free 2008-03-25 10:01:13.000000000 -0400 ++++ evolution-2.10.3/mail/mail-session.c 2008-03-25 10:01:25.000000000 -0400 +@@ -389,10 +389,8 @@ alert_user(CamelSession *session, CamelS + mail_msg_unref (m); + } + +- if (m->ismain) { +- user_message_free (m); ++ if (m->ismain) + mail_msg_unref (m); +- } + + return result; + } diff --git a/evolution.spec b/evolution.spec index 9f6b76a..b0060a9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -46,7 +46,7 @@ Name: evolution Version: 2.22.0 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -84,6 +84,9 @@ Patch15: evolution-2.9.1-im-context-reset.patch # RH bug #437208 / GNOME bug #518103 Patch16: evolution-2.22.0-line-status.patch +# GNOME bug #524310 +Patch17: evolution-2.10.3-server-message-double-free.patch + ## Dependencies ### Requires(post): GConf2 @@ -230,6 +233,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset %patch16 -p1 -b .line-status +%patch17 -p1 -b .server-message-double-free mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -657,6 +661,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Mar 25 2008 Dan Williams - 2.22.0-4.fc9 +- Add patch for GNOME bug #524310 + * Fri Mar 14 2008 Matthew Barnes - 2.22.0-3.fc9 - Explicit require evolution-data-server since its shared object names still can't be trusted (RH bug #426511). From 3950e3f13684b4fa20e2196d81644fa5aca3cbd2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 7 Apr 2008 17:49:56 +0000 Subject: [PATCH 214/844] - Update to 2.22.1 --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b0060a9..a9fdd9c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.22.0 -Release: 4%{?dist} +Version: 2.22.1 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -661,6 +661,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Apr 07 2008 Matthew Barnes - 2.22.1-1.fc9 +- Update to 2.22.1 + * Tue Mar 25 2008 Dan Williams - 2.22.0-4.fc9 - Add patch for GNOME bug #524310 From 446bff88e78477dda3d5babd8b776511a910f9ef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 7 Apr 2008 17:52:54 +0000 Subject: [PATCH 215/844] - Update to 2.22.1 - Remove patch for GNOME bug #524310 (fixed upstream). --- evolution-2.10.3-server-message-double-free.patch | 15 --------------- evolution.spec | 5 +---- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 evolution-2.10.3-server-message-double-free.patch diff --git a/evolution-2.10.3-server-message-double-free.patch b/evolution-2.10.3-server-message-double-free.patch deleted file mode 100644 index 8c4316c..0000000 --- a/evolution-2.10.3-server-message-double-free.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up evolution-2.10.3/mail/mail-session.c.server-message-double-free evolution-2.10.3/mail/mail-session.c ---- evolution-2.10.3/mail/mail-session.c.server-message-double-free 2008-03-25 10:01:13.000000000 -0400 -+++ evolution-2.10.3/mail/mail-session.c 2008-03-25 10:01:25.000000000 -0400 -@@ -389,10 +389,8 @@ alert_user(CamelSession *session, CamelS - mail_msg_unref (m); - } - -- if (m->ismain) { -- user_message_free (m); -+ if (m->ismain) - mail_msg_unref (m); -- } - - return result; - } diff --git a/evolution.spec b/evolution.spec index a9fdd9c..dcd0efe 100644 --- a/evolution.spec +++ b/evolution.spec @@ -84,9 +84,6 @@ Patch15: evolution-2.9.1-im-context-reset.patch # RH bug #437208 / GNOME bug #518103 Patch16: evolution-2.22.0-line-status.patch -# GNOME bug #524310 -Patch17: evolution-2.10.3-server-message-double-free.patch - ## Dependencies ### Requires(post): GConf2 @@ -233,7 +230,6 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch14 -p1 -b .no-gnome-common %patch15 -p1 -b .im-context-reset %patch16 -p1 -b .line-status -%patch17 -p1 -b .server-message-double-free mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -663,6 +659,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Apr 07 2008 Matthew Barnes - 2.22.1-1.fc9 - Update to 2.22.1 +- Remove patch for GNOME bug #524310 (fixed upstream). * Tue Mar 25 2008 Dan Williams - 2.22.0-4.fc9 - Add patch for GNOME bug #524310 From b11c344bf2e423041f3c6a3ee227c39e0f79c9b3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 7 Apr 2008 18:51:10 +0000 Subject: [PATCH 216/844] It's Monday. --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 34f3d5d..9b20597 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.22.0.tar.bz2 +evolution-2.22.1.tar.bz2 diff --git a/sources b/sources index 1c39e75..c17cad4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -22567465cfba2658fd0a9be03f8c854f evolution-2.22.0.tar.bz2 +b8eddd6e26b59b1fe6ad0ae849916836 evolution-2.22.1.tar.bz2 From cfd835eadbd5018c6d9a5013c0afa902968cb91c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Apr 2008 18:41:26 +0000 Subject: [PATCH 217/844] - Update to 2.23.1 - Bump evo_major to 2.22. - Bump eds_version to 2.23.1. - Bump glib2_version to 2.16.0. - Bump gtkhtml_version to 3.19.1. - Add gvfs requirement. - Drop gnomevfs2 requirement. - Remove patch for RH bug #164957 (obsolete). --- .cvsignore | 2 +- evolution.spec | 51 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/.cvsignore b/.cvsignore index 9b20597..b2da284 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.22.1.tar.bz2 +evolution-2.23.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index dcd0efe..1361b80 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,13 +1,12 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.21.92 -%define glib2_version 2.15.3 +%define eds_version 2.23.1 +%define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 -%define gnomevfs2_version 2.4 %define gtk2_version 2.12.0 -%define gtkhtml_version 3.17.5 +%define gtkhtml_version 3.19.1 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 @@ -17,7 +16,7 @@ %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.22 +%define evo_major 2.24 %define exchange_support 1 %define inline_audio_support 1 @@ -45,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.22.1 +Version: 2.23.1 Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity @@ -61,28 +60,25 @@ Obsoletes: libgal2 <= %{last_libgal2_version} # bad hack Patch10: evolution-1.4.4-ldap-x86_64-hack.patch -# Fix for RH bug 164957 (was for 145552): -Patch11: evolution-2.0.2-fix-145552.patch - # Patches for conduits, based upon # rh-161817-attach-116019-conduit_pilot_link_updates.diff # (the latter patch was originally by Mark G. Adams): -# Patch12: evolution-2.5.4-fix-conduits.patch +# Patch11: evolution-2.5.4-fix-conduits.patch # Move .conduit files from share to lib (for the sake of multilib) # This patch effects other parts of evolution.spec and so is necessary # for a successful build. -Patch13: evolution-2.5.4-fix-conduit-dir.patch +Patch12: evolution-2.5.4-fix-conduit-dir.patch # Remove gnome-common macros from configure.in. # We do not ship gnome-common (or at least we're not supposed to). -Patch14: evolution-2.7.1-no-gnome-common.patch +Patch13: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 -Patch15: evolution-2.9.1-im-context-reset.patch +Patch14: evolution-2.9.1-im-context-reset.patch # RH bug #437208 / GNOME bug #518103 -Patch16: evolution-2.22.0-line-status.patch +Patch15: evolution-2.22.0-line-status.patch ## Dependencies ### @@ -114,11 +110,11 @@ BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} -BuildRequires: gnome-vfs2-devel >= %{gnomevfs2_version} BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +BuildRequires: gvfs BuildRequires: intltool >= %{intltool_version} BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version} @@ -224,12 +220,11 @@ This package contains the plugin to filter junk mail using SpamAssassin. %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack -%patch11 -p1 -b .fix-164957 -#patch12 -p1 -b .fix-conduits # leave commented -%patch13 -p1 -b .fix-conduit-dir -%patch14 -p1 -b .no-gnome-common -%patch15 -p1 -b .im-context-reset -%patch16 -p1 -b .line-status +#patch11 -p1 -b .fix-conduits # leave commented +%patch12 -p1 -b .fix-conduit-dir +%patch13 -p1 -b .no-gnome-common +%patch14 -p1 -b .im-context-reset +%patch15 -p1 -b .line-status mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -572,10 +567,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-prefer-plain.eplug %{evo_plugin_dir}/liborg-gnome-prefer-plain.so -%{evo_plugin_dir}/org-gnome-print-message.eplug -%{evo_plugin_dir}/liborg-gnome-print-message.so -%{evo_plugin_dir}/org-gnome-print-message.xml - %{evo_plugin_dir}/org-gnome-save-calendar.eplug %{evo_plugin_dir}/liborg-gnome-save-calendar.so @@ -657,6 +648,16 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Apr 21 2008 Matthew Barnes - 2.23.1-1.fc10 +- Update to 2.23.1 +- Bump evo_major to 2.22. +- Bump eds_version to 2.23.1. +- Bump glib2_version to 2.16.0. +- Bump gtkhtml_version to 3.19.1. +- Add gvfs requirement. +- Drop gnomevfs2 requirement. +- Remove patch for RH bug #164957 (obsolete). + * Mon Apr 07 2008 Matthew Barnes - 2.22.1-1.fc9 - Update to 2.22.1 - Remove patch for GNOME bug #524310 (fixed upstream). diff --git a/sources b/sources index c17cad4..fbb6e26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b8eddd6e26b59b1fe6ad0ae849916836 evolution-2.22.1.tar.bz2 +cb8193627f93648975675c3c908b929b evolution-2.23.1.tar.bz2 From 5dc1c52b8190dc30d5399ec26388c797156c0529 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 28 Apr 2008 20:44:58 +0000 Subject: [PATCH 218/844] - Explicitly require enchant-devel, even though I shouldn't need to. --- evolution.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1361b80..bf18f57 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.23.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -105,6 +105,7 @@ BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils +BuildRequires: enchant-devel BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: flex BuildRequires: gettext @@ -648,6 +649,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Apr 28 2008 Matthew Barnes - 2.23.1-2.fc10 +- Explicitly require enchant-devel, even though I shouldn't need to. + * Mon Apr 21 2008 Matthew Barnes - 2.23.1-1.fc10 - Update to 2.23.1 - Bump evo_major to 2.22. From 934ecd5808302e430ed443ffa0be13abafc6b290 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 May 2008 16:43:03 +0000 Subject: [PATCH 219/844] - Update to 2.23.2 - Remove enchant-devel requirement; it didn't help. - Remove patch for RH bug #437208 (fixed upstream). --- .cvsignore | 2 +- evolution-2.22.0-line-status.patch | 185 ----------------------------- evolution.spec | 15 ++- sources | 2 +- 4 files changed, 9 insertions(+), 195 deletions(-) delete mode 100644 evolution-2.22.0-line-status.patch diff --git a/.cvsignore b/.cvsignore index b2da284..03fba4e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.1.tar.bz2 +evolution-2.23.2.tar.bz2 diff --git a/evolution-2.22.0-line-status.patch b/evolution-2.22.0-line-status.patch deleted file mode 100644 index 8b13eb2..0000000 --- a/evolution-2.22.0-line-status.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff -up evolution-2.22.0/shell/e-shell-nm-glib.c.line-status evolution-2.22.0/shell/e-shell-nm-glib.c ---- evolution-2.22.0/shell/e-shell-nm-glib.c.line-status 2007-11-29 23:23:59.000000000 -0500 -+++ evolution-2.22.0/shell/e-shell-nm-glib.c 2008-03-14 12:13:29.000000000 -0400 -@@ -33,23 +33,40 @@ - static libnm_glib_ctx *nm_ctx = NULL; - static guint id = 0; - --static void e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) -+static void -+e_shell_glib_network_monitor (libnm_glib_ctx *ctx, gpointer user_data) - { - libnm_glib_state state; -- EShellLineStatus line_status; - EShellWindow *window = E_SHELL_WINDOW (user_data); - EShell *shell = e_shell_window_peek_shell (window); - GNOME_Evolution_ShellState shell_state; -+ gboolean shell_is_online; -+ gboolean shell_is_offline; - - g_return_if_fail (ctx != NULL); - - state = libnm_glib_get_network_state (ctx); -- line_status = e_shell_get_line_status (shell); - -- if (line_status == E_SHELL_LINE_STATUS_ONLINE && state == LIBNM_NO_NETWORK_CONNECTION) { -+ switch (e_shell_get_line_status (shell)) { -+ case E_SHELL_LINE_STATUS_ONLINE: -+ shell_is_online = TRUE; -+ shell_is_offline = FALSE; -+ break; -+ case E_SHELL_LINE_STATUS_OFFLINE: -+ case E_SHELL_LINE_STATUS_FORCED_OFFLINE: -+ shell_is_online = FALSE; -+ shell_is_offline = TRUE; -+ break; -+ default: /* in-between states */ -+ shell_is_online = FALSE; -+ shell_is_offline = FALSE; -+ } -+ -+ if (shell_is_online && state == LIBNM_NO_NETWORK_CONNECTION) { - shell_state = GNOME_Evolution_FORCED_OFFLINE; - e_shell_go_offline (shell, window, shell_state); -- } else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && state == LIBNM_ACTIVE_NETWORK_CONNECTION) { -+ -+ } else if (shell_is_offline && state == LIBNM_ACTIVE_NETWORK_CONNECTION) { - shell_state = GNOME_Evolution_USER_ONLINE; - e_shell_go_online (shell, window, shell_state); - } -@@ -58,15 +75,15 @@ static void e_shell_glib_network_monitor - int e_shell_nm_glib_initialise (EShellWindow *window); - void e_shell_nm_glib_dispose (EShellWindow *window); - --int e_shell_nm_glib_initialise (EShellWindow *window) -+int -+e_shell_nm_glib_initialise (EShellWindow *window) - { -- if (!nm_ctx) -- { -+ if (!nm_ctx) { - nm_ctx = libnm_glib_init (); - if (!nm_ctx) { -- fprintf (stderr, "Could not initialize libnm.\n"); -- return FALSE; -- } -+ g_warning ("Could not initialize libnm."); -+ return FALSE; -+ } - } - - id = libnm_glib_register_callback (nm_ctx, e_shell_glib_network_monitor, window, NULL); -@@ -74,7 +91,8 @@ int e_shell_nm_glib_initialise (EShellWi - return TRUE; - } - --void e_shell_nm_glib_dispose (EShellWindow *window) -+void -+e_shell_nm_glib_dispose (EShellWindow *window) - { - if (id != 0 && nm_ctx != NULL) { - libnm_glib_unregister_callback (nm_ctx, id); -@@ -83,4 +101,3 @@ void e_shell_nm_glib_dispose (EShellWind - id = 0; - } - } -- -diff -up evolution-2.22.0/shell/e-shell-nm.c.line-status evolution-2.22.0/shell/e-shell-nm.c ---- evolution-2.22.0/shell/e-shell-nm.c.line-status 2008-02-22 04:51:05.000000000 -0500 -+++ evolution-2.22.0/shell/e-shell-nm.c 2008-03-14 12:13:29.000000000 -0400 -@@ -35,17 +35,12 @@ - #include - #include - --typedef enum _ShellLineStatus { -- E_SHELL_LINE_DOWN, -- E_SHELL_LINE_UP --} ShellLineStatus; -- -- - static gboolean init_dbus (EShellWindow *window); -+int e_shell_dbus_initialise (EShellWindow *window); -+void e_shell_dbus_dispose (EShellWindow *window); - - static DBusConnection *dbus_connection = NULL; - -- - static gboolean - reinit_dbus (gpointer user_data) - { -@@ -63,11 +58,12 @@ e_shell_network_monitor (DBusConnection - { - DBusError error; - const char *object; -- ShellLineStatus status; - EShellWindow *window = NULL; - EShell *shell = NULL; - GNOME_Evolution_ShellState shell_state; -- EShellLineStatus line_status; -+ gboolean shell_is_online; -+ gboolean shell_is_offline; -+ gboolean network_device_active; - - if (!user_data || !E_IS_SHELL_WINDOW (user_data)) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; -@@ -89,9 +85,9 @@ e_shell_network_monitor (DBusConnection - } - - if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNoLongerActive")) -- status = E_SHELL_LINE_DOWN; -+ network_device_active = FALSE; - else if (dbus_message_is_signal (message, NM_DBUS_INTERFACE, "DeviceNowActive")) -- status = E_SHELL_LINE_UP; -+ network_device_active = TRUE; - else - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - -@@ -99,12 +95,26 @@ e_shell_network_monitor (DBusConnection - &object, DBUS_TYPE_INVALID)) - return DBUS_HANDLER_RESULT_NOT_YET_HANDLED; - -- line_status = e_shell_get_line_status (shell); -+ switch (e_shell_get_line_status (shell)) { -+ case E_SHELL_LINE_STATUS_ONLINE: -+ shell_is_online = TRUE; -+ shell_is_offline = FALSE; -+ break; -+ case E_SHELL_LINE_STATUS_OFFLINE: -+ case E_SHELL_LINE_STATUS_FORCED_OFFLINE: -+ shell_is_online = FALSE; -+ shell_is_offline = TRUE; -+ break; -+ default: /* in-between states */ -+ shell_is_online = FALSE; -+ shell_is_offline = FALSE; -+ } - -- if (line_status == E_SHELL_LINE_STATUS_ONLINE && status == E_SHELL_LINE_DOWN) { -+ if (shell_is_online && !network_device_active) { - shell_state = GNOME_Evolution_FORCED_OFFLINE; - e_shell_go_offline (shell, window, shell_state); -- } else if (line_status == E_SHELL_LINE_STATUS_OFFLINE && status == E_SHELL_LINE_UP) { -+ -+ } else if (shell_is_offline && network_device_active) { - shell_state = GNOME_Evolution_USER_ONLINE; - e_shell_go_online (shell, window, shell_state); - } -@@ -153,14 +163,16 @@ init_dbus (EShellWindow *window) - return FALSE; - } - --int e_shell_dbus_initialise (EShellWindow *window) -+int -+e_shell_dbus_initialise (EShellWindow *window) - { - g_type_init (); - - return init_dbus (window); - } - --void e_shell_dbus_dispose (EShellWindow *window) -+void -+e_shell_dbus_dispose (EShellWindow *window) - { - //FIXME - return; diff --git a/evolution.spec b/evolution.spec index bf18f57..0755a41 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.23.1 -Release: 2%{?dist} +Version: 2.23.2 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -77,9 +77,6 @@ Patch13: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch14: evolution-2.9.1-im-context-reset.patch -# RH bug #437208 / GNOME bug #518103 -Patch15: evolution-2.22.0-line-status.patch - ## Dependencies ### Requires(post): GConf2 @@ -105,7 +102,6 @@ BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils -BuildRequires: enchant-devel BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: flex BuildRequires: gettext @@ -225,7 +221,6 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch12 -p1 -b .fix-conduit-dir %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset -%patch15 -p1 -b .line-status mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -529,7 +524,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-face.eplug %{evo_plugin_dir}/liborg-gnome-face.so -%{evo_plugin_dir}/org-gnome-face-ui.xml %{evo_plugin_dir}/org-gnome-groupwise-features.eplug %{evo_plugin_dir}/liborg-gnome-groupwise-features.so @@ -649,6 +643,11 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon May 12 2008 Matthew Barnes - 2.23.2-1.fc10 +- Update to 2.23.2 +- Remove enchant-devel requirement; it didn't help. +- Remove patch for RH bug #437208 (fixed upstream). + * Mon Apr 28 2008 Matthew Barnes - 2.23.1-2.fc10 - Explicitly require enchant-devel, even though I shouldn't need to. diff --git a/sources b/sources index fbb6e26..75d77c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cb8193627f93648975675c3c908b929b evolution-2.23.1.tar.bz2 +c704478154e53d7e2421162ec42da875 evolution-2.23.2.tar.bz2 From 4672a0556b0721733b2253ba71d2b89a474ddb64 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 May 2008 18:11:01 +0000 Subject: [PATCH 220/844] Put the enchant-devel BR back, so Jesse can help me figure out what the hell's going on. --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 0755a41..d888b9e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -102,6 +102,7 @@ BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils +BuildRequires: enchant-devel BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: flex BuildRequires: gettext From 9fa3d56a85de5a7275a51a7ef786985029b33f6e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 12 May 2008 18:29:23 +0000 Subject: [PATCH 221/844] - Update to 2.23.2 - Remove enchant-devel requirement. - Remove patch for RH bug #437208 (fixed upstream). --- evolution.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index d888b9e..fadc9b2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -102,7 +102,6 @@ BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils -BuildRequires: enchant-devel BuildRequires: evolution-data-server-devel >= %{eds_version} BuildRequires: flex BuildRequires: gettext @@ -646,7 +645,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon May 12 2008 Matthew Barnes - 2.23.2-1.fc10 - Update to 2.23.2 -- Remove enchant-devel requirement; it didn't help. +- Remove enchant-devel requirement. - Remove patch for RH bug #437208 (fixed upstream). * Mon Apr 28 2008 Matthew Barnes - 2.23.1-2.fc10 From d5a05846f6a51e274be00fa2b60a19731a21d13c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 30 May 2008 12:28:11 +0000 Subject: [PATCH 222/844] Fix a minor rpmdiff complaint. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index fadc9b2..0ac8bbb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -166,7 +166,7 @@ personal information-management tool. %package devel Group: Development/Libraries Summary: Development files for building against %{name} -Requires: %{name} = %{version} +Requires: %{name} = %{version}-%{release} Requires: evolution-data-server-devel >= %{eds_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libsoup-devel >= %{soup_version} From 6a666ff1df2c111da692535451d84829ba5b78ba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 Jun 2008 21:57:45 +0000 Subject: [PATCH 223/844] - Update to 2.23.3.1 - Bump eds_version to 2.23.3. --- .cvsignore | 2 +- evolution.spec | 13 +++++++++++-- sources | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 03fba4e..c321b4d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.2.tar.bz2 +evolution-2.23.3.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 0ac8bbb..e4c1bd0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.23.1 +%define eds_version 2.23.3 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.23.2 +Version: 2.23.3.1 Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity @@ -357,6 +357,7 @@ scrollkeeper-update -q touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null 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 @@ -383,6 +384,7 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog NEWS README # GConf schemas: +%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas @@ -505,6 +507,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-default-source.eplug %{evo_plugin_dir}/liborg-gnome-default-source.so +%{evo_plugin_dir}/org-gnome-email-custom-header.eplug +%{evo_plugin_dir}/liborg-gnome-email-custom-header.so + %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so @@ -643,6 +648,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Jun 02 2008 Matthew Barnes - 2.23.3.1-1.fc10 +- Update to 2.23.3.1 +- Bump eds_version to 2.23.3. + * Mon May 12 2008 Matthew Barnes - 2.23.2-1.fc10 - Update to 2.23.2 - Remove enchant-devel requirement. diff --git a/sources b/sources index 75d77c2..c6c64a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c704478154e53d7e2421162ec42da875 evolution-2.23.2.tar.bz2 +e9b4d48ab7cd78bc4a3b5a75aff0c69c evolution-2.23.3.1.tar.bz2 From 12d30a5f9f8ed91ca588747fc86ce57265d81958 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 4 Jun 2008 09:56:11 +0000 Subject: [PATCH 224/844] - Add patches for RH bug #449925 (buffer overflow vulnerabilities). --- evolution-2.23.3.1-CVE-2008-1108.patch | 310 +++++++++++++++++++++++++ evolution-2.23.3.1-CVE-2008-1109.patch | 61 +++++ evolution.spec | 13 +- 3 files changed, 383 insertions(+), 1 deletion(-) create mode 100644 evolution-2.23.3.1-CVE-2008-1108.patch create mode 100644 evolution-2.23.3.1-CVE-2008-1109.patch diff --git a/evolution-2.23.3.1-CVE-2008-1108.patch b/evolution-2.23.3.1-CVE-2008-1108.patch new file mode 100644 index 0000000..d97f26a --- /dev/null +++ b/evolution-2.23.3.1-CVE-2008-1108.patch @@ -0,0 +1,310 @@ +diff -up evolution-2.23.3.1/calendar/gui/e-itip-control.c.CVE-2008-1108 evolution-2.23.3.1/calendar/gui/e-itip-control.c +--- evolution-2.23.3.1/calendar/gui/e-itip-control.c.CVE-2008-1108 2008-06-02 03:51:43.000000000 -0400 ++++ evolution-2.23.3.1/calendar/gui/e-itip-control.c 2008-06-03 16:37:10.000000000 -0400 +@@ -660,7 +660,7 @@ find_attendee (icalcomponent *ical_comp, + + static void + write_label_piece (EItipControl *itip, ECalComponentDateTime *dt, +- char *buffer, int size, ++ GString *buffer, + const char *stext, const char *etext, + gboolean just_date) + { +@@ -685,13 +685,13 @@ write_label_piece (EItipControl *itip, E + tmp_tm.tm_hour = tmp_tm.tm_min = tmp_tm.tm_sec = 0; + + if (stext != NULL) +- strcat (buffer, stext); ++ g_string_append (buffer, stext); + + e_time_format_date_and_time (&tmp_tm, + calendar_config_get_24_hour_format (), + FALSE, FALSE, + time_buf, sizeof (time_buf)); +- strcat (buffer, time_buf); ++ g_string_append (buffer, time_buf); + + if (!dt->value->is_utc && dt->tzid) { + zone = icalcomponent_get_timezone (priv->top_level, dt->tzid); +@@ -703,21 +703,21 @@ write_label_piece (EItipControl *itip, E + UTF-8. But it probably is not translated. */ + display_name = icaltimezone_get_display_name (zone); + if (display_name && *display_name) { +- strcat (buffer, " ["); ++ g_string_append_len (buffer, " [", 16); + + /* We check if it is one of our builtin timezone names, + in which case we call gettext to translate it. */ + if (icaltimezone_get_builtin_timezone (display_name)) { +- strcat (buffer, _(display_name)); ++ g_string_append_printf (buffer, "%s", _(display_name)); + } else { +- strcat (buffer, display_name); ++ g_string_append_printf (buffer, "%s", display_name); + } +- strcat (buffer, "]"); ++ g_string_append_len (buffer, "]", 8); + } + } + + if (etext != NULL) +- strcat (buffer, etext); ++ g_string_append (buffer, etext); + } + + static const char * +@@ -754,19 +754,17 @@ get_dayname (struct icalrecurrencetype * + + static void + write_recurrence_piece (EItipControl *itip, ECalComponent *comp, +- char *buffer, int size) ++ GString *buffer) + { + GSList *rrules; + struct icalrecurrencetype *r; +- int len, i; ++ int i; + +- strcpy (buffer, "Recurring: "); +- len = strlen (buffer); +- buffer += len; +- size -= len; ++ g_string_append_len (buffer, "Recurring: ", 18); + + if (!e_cal_component_has_simple_recurrence (comp)) { +- strcpy (buffer, _("Yes. (Complex Recurrence)")); ++ g_string_append_printf ( ++ buffer, "%s", _("Yes. (Complex Recurrence)")); + return; + } + +@@ -782,7 +780,10 @@ write_recurrence_piece (EItipControl *it + Every %d day/days" */ + /* For Translators : 'Every day' is event Recurring every day */ + /* For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit */ +- sprintf (buffer, ngettext("Every day", "Every %d days", r->interval), r->interval); ++ g_string_append_printf ( ++ buffer, ngettext ("Every day", ++ "Every %d days", r->interval), ++ r->interval); + break; + + case ICAL_WEEKLY_RECURRENCE: +@@ -792,29 +793,36 @@ write_recurrence_piece (EItipControl *it + Every %d week/weeks" */ + /* For Translators : 'Every week' is event Recurring every week */ + /* For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit */ +- sprintf (buffer, ngettext("Every week", "Every %d weeks", r->interval), r->interval); ++ g_string_append_printf ( ++ buffer, ngettext ("Every week", ++ "Every %d weeks", r->interval), ++ r->interval); + } else { + /* For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname) */ + /* For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit */ +- sprintf (buffer, ngettext("Every week on ", "Every %d weeks on ", r->interval), r->interval); ++ g_string_append_printf ( ++ buffer, ngettext ("Every week on ", ++ "Every %d weeks on ", r->interval), ++ r->interval); + + for (i = 1; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) { + if (i > 1) +- strcat (buffer, ", "); +- strcat (buffer, get_dayname (r, i - 1)); ++ g_string_append_len (buffer, ", ", 2); ++ g_string_append (buffer, get_dayname (r, i - 1)); + } + if (i > 1) + /* For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)' */ +- strcat (buffer, _(" and ")); +- strcat (buffer, get_dayname (r, i - 1)); ++ g_string_append_printf (buffer, "%s", _(" and ")); ++ g_string_append (buffer, get_dayname (r, i - 1)); + } + break; + + case ICAL_MONTHLY_RECURRENCE: + if (r->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { + /* For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.' */ +- sprintf (buffer, _("The %s day of "), +- nth (r->by_month_day[0])); ++ g_string_append_printf ( ++ buffer, _("The %s day of "), ++ nth (r->by_month_day[0])); + } else { + int pos; + +@@ -828,20 +836,21 @@ write_recurrence_piece (EItipControl *it + + /* For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.' + eg,third monday of every month */ +- sprintf (buffer, _("The %s %s of "), +- nth (pos), get_dayname (r, 0)); ++ g_string_append_printf ( ++ buffer, _("The %s %s of "), ++ nth (pos), get_dayname (r, 0)); + } + +- len = strlen (buffer); +- buffer += len; +- size -= len; + /* For Translators: In this can also be translated as "With the period of %d + month/months", where %d is a number. The entire sentence is of the form "Recurring: + Every %d month/months" */ + /* For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.' */ + /* For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.' + %d is a digit */ +- sprintf (buffer, ngettext("every month","every %d months", r->interval), r->interval); ++ g_string_append_printf ( ++ buffer, ngettext ("every month", ++ "every %d months", r->interval), ++ r->interval); + break; + + case ICAL_YEARLY_RECURRENCE: +@@ -850,20 +859,22 @@ write_recurrence_piece (EItipControl *it + Every %d year/years" */ + /* For Translators : 'Every year' is event Recurring every year */ + /* For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit */ +- sprintf (buffer, ngettext("Every year", "Every %d years", r->interval), r->interval); ++ g_string_append_printf ( ++ buffer, ngettext ("Every year", ++ "Every %d years", r->interval), ++ r->interval); + break; + + default: + g_return_if_reached (); + } + +- len = strlen (buffer); +- buffer += len; +- size -= len; + if (r->count) { + /* For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit*/ + /* For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit*/ +- sprintf (buffer, ngettext("a total of %d time", " a total of %d times", r->count), r->count); ++ g_string_append_printf ( ++ buffer, ngettext ("a total of %d time", ++ " a total of %d times", r->count), r->count); + } else if (!icaltime_is_null_time (r->until)) { + ECalComponentDateTime dt; + +@@ -871,12 +882,12 @@ write_recurrence_piece (EItipControl *it + dt.value = &r->until; + dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone); + +- write_label_piece (itip, &dt, buffer, size, ++ write_label_piece (itip, &dt, buffer, + /* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/ + _(", ending on "), NULL, TRUE); + } + +- strcat (buffer, "
"); ++ g_string_append_len (buffer, "
", 4); + } + + static void +@@ -884,47 +895,51 @@ set_date_label (EItipControl *itip, GtkH + ECalComponent *comp) + { + ECalComponentDateTime datetime; +- static char buffer[1024]; ++ GString *buffer; + gchar *str; + gboolean wrote = FALSE, task_completed = FALSE; + ECalComponentVType type; + ++ buffer = g_string_sized_new (1024); + type = e_cal_component_get_vtype (comp); + +- buffer[0] = '\0'; + e_cal_component_get_dtstart (comp, &datetime); + if (datetime.value) { + /* For Translators : 'starts' is starts:date implying a task starts on what date */ + str = g_strdup_printf ("%s:", _("Starts")); +- write_label_piece (itip, &datetime, buffer, 1024, +- str, +- "
", FALSE); +- gtk_html_write (html, html_stream, buffer, strlen(buffer)); ++ write_label_piece (itip, &datetime, buffer, str, "
", FALSE); ++ gtk_html_write (html, html_stream, buffer->str, buffer->len); + wrote = TRUE; + g_free (str); + } + e_cal_component_free_datetime (&datetime); + +- buffer[0] = '\0'; ++ /* Reset the buffer. */ ++ g_string_truncate (buffer, 0); ++ + e_cal_component_get_dtend (comp, &datetime); + if (datetime.value){ + /* For Translators : 'ends' is ends:date implying a task ends on what date */ + str = g_strdup_printf ("%s:", _("Ends")); +- write_label_piece (itip, &datetime, buffer, 1024, str, "
", FALSE); +- gtk_html_write (html, html_stream, buffer, strlen (buffer)); ++ write_label_piece (itip, &datetime, buffer, str, "
", FALSE); ++ gtk_html_write (html, html_stream, buffer->str, buffer->len); + wrote = TRUE; + g_free (str); + } + e_cal_component_free_datetime (&datetime); + +- buffer[0] = '\0'; ++ /* Reset the buffer. */ ++ g_string_truncate (buffer, 0); ++ + if (e_cal_component_has_recurrences (comp)) { +- write_recurrence_piece (itip, comp, buffer, 1024); +- gtk_html_write (html, html_stream, buffer, strlen (buffer)); ++ write_recurrence_piece (itip, comp, buffer); ++ gtk_html_write (html, html_stream, buffer->str, buffer->len); + wrote = TRUE; + } + +- buffer[0] = '\0'; ++ /* Reset the buffer. */ ++ g_string_truncate (buffer, 0); ++ + datetime.tzid = NULL; + e_cal_component_get_completed (comp, &datetime.value); + if (type == E_CAL_COMPONENT_TODO && datetime.value) { +@@ -932,20 +947,22 @@ set_date_label (EItipControl *itip, GtkH + timezone. */ + str = g_strdup_printf ("%s:", _("Completed")); + datetime.value->is_utc = TRUE; +- write_label_piece (itip, &datetime, buffer, 1024, str, "
", FALSE); +- gtk_html_write (html, html_stream, buffer, strlen (buffer)); ++ write_label_piece (itip, &datetime, buffer, str, "
", FALSE); ++ gtk_html_write (html, html_stream, buffer->str, buffer->len); + wrote = TRUE; + task_completed = TRUE; + g_free (str); + } + e_cal_component_free_datetime (&datetime); + +- buffer[0] = '\0'; ++ /* Reset the buffer. */ ++ g_string_truncate (buffer, 0); ++ + e_cal_component_get_due (comp, &datetime); + if (type == E_CAL_COMPONENT_TODO && !task_completed && datetime.value) { + str = g_strdup_printf ("%s:", _("Due")); +- write_label_piece (itip, &datetime, buffer, 1024, str, "
", FALSE); +- gtk_html_write (html, html_stream, buffer, strlen (buffer)); ++ write_label_piece (itip, &datetime, buffer, str, "
", FALSE); ++ gtk_html_write (html, html_stream, buffer->str, buffer->len); + wrote = TRUE; + g_free (str); + } +@@ -954,6 +971,8 @@ set_date_label (EItipControl *itip, GtkH + + if (wrote) + gtk_html_stream_printf (html_stream, "
"); ++ ++ g_string_free (buffer, TRUE); + } + + static void diff --git a/evolution-2.23.3.1-CVE-2008-1109.patch b/evolution-2.23.3.1-CVE-2008-1109.patch new file mode 100644 index 0000000..f8be42c --- /dev/null +++ b/evolution-2.23.3.1-CVE-2008-1109.patch @@ -0,0 +1,61 @@ +diff -up evolution-2.23.3.1/calendar/gui/itip-utils.c.CVE-2008-1109 evolution-2.23.3.1/calendar/gui/itip-utils.c +--- evolution-2.23.3.1/calendar/gui/itip-utils.c.CVE-2008-1109 2008-06-02 03:51:43.000000000 -0400 ++++ evolution-2.23.3.1/calendar/gui/itip-utils.c 2008-06-03 16:37:21.000000000 -0400 +@@ -172,50 +172,16 @@ get_attendee_if_attendee_sentby_is_user + } + + static char * +-html_new_lines_for (char *string) ++html_new_lines_for (const char *string) + { +- char *html_string = (char *) malloc (sizeof (char)* (3500)); +- int length = strlen (string); +- int index = 0; +- char *index_ptr = string; +- char *temp = string; ++ gchar **lines; ++ gchar *joined; + +- /*Find the first occurence*/ +- index_ptr = strstr ((const char *)temp, "\n"); ++ lines = g_strsplit_set (string, "\n", -1); ++ joined = g_strjoinv ("
", lines); ++ g_strfreev (lines); + +- /*Doesn't occur*/ +- if (index_ptr == NULL) { +- strcpy (html_string, (const char *)string); +- html_string[length] = '\0'; +- return html_string; +- } +- +- /*Split into chunks inserting
for \n */ +- do{ +- while (temp != index_ptr){ +- html_string[index++] = *temp; +- temp++; +- } +- temp++; +- +- html_string[index++] = '<'; +- html_string[index++] = 'b'; +- html_string[index++] = 'r'; +- html_string[index++] = '>'; +- +- index_ptr = strstr ((const char *)temp, "\n"); +- +- } while (index_ptr); +- +- /*Don't leave out the last chunk*/ +- while (*temp != '\0'){ +- html_string[index++] = *temp; +- temp++; +- } +- +- html_string[index] = '\0'; +- +- return html_string; ++ return joined; + } + + char * diff --git a/evolution.spec b/evolution.spec index e4c1bd0..c02f8e4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.23.3.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -77,6 +77,12 @@ Patch13: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch14: evolution-2.9.1-im-context-reset.patch +# RH bug #449925 / CVE-2008-1108 +Patch15: evolution-2.23.3.1-CVE-2008-1108.patch + +# RH bug #449925 / CVE-2008-1109 +Patch16: evolution-2.23.3.1-CVE-2008-1109.patch + ## Dependencies ### Requires(post): GConf2 @@ -221,6 +227,8 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch12 -p1 -b .fix-conduit-dir %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset +%patch15 -p1 -b .CVE-2008-1108 +%patch16 -p1 -b .CVE-2008-1109 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -648,6 +656,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Jun 03 2008 Matthew Barnes - 2.23.3.1-2.fc10 +- Add patches for RH bug #449925 (buffer overflow vulnerabilities). + * Mon Jun 02 2008 Matthew Barnes - 2.23.3.1-1.fc10 - Update to 2.23.3.1 - Bump eds_version to 2.23.3. From e0c87c94e989aa2604872263187085923599d2a6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 4 Jun 2008 10:05:14 +0000 Subject: [PATCH 225/844] Fix the date --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index c02f8e4..9d9f93a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -656,7 +656,7 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog -* Tue Jun 03 2008 Matthew Barnes - 2.23.3.1-2.fc10 +* Wed Jun 04 2008 Matthew Barnes - 2.23.3.1-2.fc10 - Add patches for RH bug #449925 (buffer overflow vulnerabilities). * Mon Jun 02 2008 Matthew Barnes - 2.23.3.1-1.fc10 From a3cf35b6a07392732106eafebc261e6d90e560db Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 6 Jun 2008 11:44:20 +0000 Subject: [PATCH 226/844] - Remove the gnome-spell requirement. --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9d9f93a..6fa8837 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.23.3.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: GNOME's next-generation groupware suite @@ -93,7 +93,6 @@ Requires(postun): scrollkeeper >= %{scrollkeeper_version} Requires: evolution-data-server >= %{eds_version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} -Requires: gnome-spell >= 1.0.2 Requires: gnome-themes ### Build Dependencies ### @@ -656,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Fri Jun 06 2008 Matthew Barnes - 2.23.3.1-3.fc10 +- Remove the gnome-spell requirement. + * Wed Jun 04 2008 Matthew Barnes - 2.23.3.1-2.fc10 - Add patches for RH bug #449925 (buffer overflow vulnerabilities). From 366ac29ba62acb8503c1105b7682cd9438cfff41 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 6 Jun 2008 15:23:52 +0000 Subject: [PATCH 227/844] - Use a less pretentious summary. --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6fa8837..0ded835 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,10 +45,10 @@ Name: evolution Version: 2.23.3.1 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity -Summary: GNOME's next-generation groupware suite +Summary: Mail and calendar client for GNOME URL: http://www.gnome.org/projects/evolution/ BuildRoot: %{_tmppath}/%{name}-%{version}-root Source: evolution-%{version}.tar.bz2 @@ -655,6 +655,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Fri Jun 06 2008 Matthew Barnes - 2.23.3.1-4.fc10 +- Use a less pretentious summary. + * Fri Jun 06 2008 Matthew Barnes - 2.23.3.1-3.fc10 - Remove the gnome-spell requirement. From ff68de758142de04eb0c8214b00e82187f884dec Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 Jun 2008 17:41:50 +0000 Subject: [PATCH 228/844] - Update to 2.23.4 - Remove patches for RH bug #449925 (fixed upstream). --- .cvsignore | 2 +- evolution-2.23.3.1-CVE-2008-1108.patch | 310 ------------------------- evolution-2.23.3.1-CVE-2008-1109.patch | 61 ----- evolution.spec | 16 +- sources | 2 +- 5 files changed, 8 insertions(+), 383 deletions(-) delete mode 100644 evolution-2.23.3.1-CVE-2008-1108.patch delete mode 100644 evolution-2.23.3.1-CVE-2008-1109.patch diff --git a/.cvsignore b/.cvsignore index c321b4d..fbcef1b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.3.1.tar.bz2 +evolution-2.23.4.tar.bz2 diff --git a/evolution-2.23.3.1-CVE-2008-1108.patch b/evolution-2.23.3.1-CVE-2008-1108.patch deleted file mode 100644 index d97f26a..0000000 --- a/evolution-2.23.3.1-CVE-2008-1108.patch +++ /dev/null @@ -1,310 +0,0 @@ -diff -up evolution-2.23.3.1/calendar/gui/e-itip-control.c.CVE-2008-1108 evolution-2.23.3.1/calendar/gui/e-itip-control.c ---- evolution-2.23.3.1/calendar/gui/e-itip-control.c.CVE-2008-1108 2008-06-02 03:51:43.000000000 -0400 -+++ evolution-2.23.3.1/calendar/gui/e-itip-control.c 2008-06-03 16:37:10.000000000 -0400 -@@ -660,7 +660,7 @@ find_attendee (icalcomponent *ical_comp, - - static void - write_label_piece (EItipControl *itip, ECalComponentDateTime *dt, -- char *buffer, int size, -+ GString *buffer, - const char *stext, const char *etext, - gboolean just_date) - { -@@ -685,13 +685,13 @@ write_label_piece (EItipControl *itip, E - tmp_tm.tm_hour = tmp_tm.tm_min = tmp_tm.tm_sec = 0; - - if (stext != NULL) -- strcat (buffer, stext); -+ g_string_append (buffer, stext); - - e_time_format_date_and_time (&tmp_tm, - calendar_config_get_24_hour_format (), - FALSE, FALSE, - time_buf, sizeof (time_buf)); -- strcat (buffer, time_buf); -+ g_string_append (buffer, time_buf); - - if (!dt->value->is_utc && dt->tzid) { - zone = icalcomponent_get_timezone (priv->top_level, dt->tzid); -@@ -703,21 +703,21 @@ write_label_piece (EItipControl *itip, E - UTF-8. But it probably is not translated. */ - display_name = icaltimezone_get_display_name (zone); - if (display_name && *display_name) { -- strcat (buffer, " ["); -+ g_string_append_len (buffer, " [", 16); - - /* We check if it is one of our builtin timezone names, - in which case we call gettext to translate it. */ - if (icaltimezone_get_builtin_timezone (display_name)) { -- strcat (buffer, _(display_name)); -+ g_string_append_printf (buffer, "%s", _(display_name)); - } else { -- strcat (buffer, display_name); -+ g_string_append_printf (buffer, "%s", display_name); - } -- strcat (buffer, "]"); -+ g_string_append_len (buffer, "]", 8); - } - } - - if (etext != NULL) -- strcat (buffer, etext); -+ g_string_append (buffer, etext); - } - - static const char * -@@ -754,19 +754,17 @@ get_dayname (struct icalrecurrencetype * - - static void - write_recurrence_piece (EItipControl *itip, ECalComponent *comp, -- char *buffer, int size) -+ GString *buffer) - { - GSList *rrules; - struct icalrecurrencetype *r; -- int len, i; -+ int i; - -- strcpy (buffer, "Recurring: "); -- len = strlen (buffer); -- buffer += len; -- size -= len; -+ g_string_append_len (buffer, "Recurring: ", 18); - - if (!e_cal_component_has_simple_recurrence (comp)) { -- strcpy (buffer, _("Yes. (Complex Recurrence)")); -+ g_string_append_printf ( -+ buffer, "%s", _("Yes. (Complex Recurrence)")); - return; - } - -@@ -782,7 +780,10 @@ write_recurrence_piece (EItipControl *it - Every %d day/days" */ - /* For Translators : 'Every day' is event Recurring every day */ - /* For Translators : 'Every %d days' is event Recurring every %d days. %d is a digit */ -- sprintf (buffer, ngettext("Every day", "Every %d days", r->interval), r->interval); -+ g_string_append_printf ( -+ buffer, ngettext ("Every day", -+ "Every %d days", r->interval), -+ r->interval); - break; - - case ICAL_WEEKLY_RECURRENCE: -@@ -792,29 +793,36 @@ write_recurrence_piece (EItipControl *it - Every %d week/weeks" */ - /* For Translators : 'Every week' is event Recurring every week */ - /* For Translators : 'Every %d weeks' is event Recurring every %d weeks. %d is a digit */ -- sprintf (buffer, ngettext("Every week", "Every %d weeks", r->interval), r->interval); -+ g_string_append_printf ( -+ buffer, ngettext ("Every week", -+ "Every %d weeks", r->interval), -+ r->interval); - } else { - /* For Translators : 'Every week on' is event Recurring every week on (dayname) and (dayname) and (dayname) */ - /* For Translators : 'Every %d weeks on' is event Recurring: every %d weeks on (dayname) and (dayname). %d is a digit */ -- sprintf (buffer, ngettext("Every week on ", "Every %d weeks on ", r->interval), r->interval); -+ g_string_append_printf ( -+ buffer, ngettext ("Every week on ", -+ "Every %d weeks on ", r->interval), -+ r->interval); - - for (i = 1; i < 8 && r->by_day[i] != ICAL_RECURRENCE_ARRAY_MAX; i++) { - if (i > 1) -- strcat (buffer, ", "); -- strcat (buffer, get_dayname (r, i - 1)); -+ g_string_append_len (buffer, ", ", 2); -+ g_string_append (buffer, get_dayname (r, i - 1)); - } - if (i > 1) - /* For Translators : 'and' is part of the sentence 'event recurring every week on (dayname) and (dayname)' */ -- strcat (buffer, _(" and ")); -- strcat (buffer, get_dayname (r, i - 1)); -+ g_string_append_printf (buffer, "%s", _(" and ")); -+ g_string_append (buffer, get_dayname (r, i - 1)); - } - break; - - case ICAL_MONTHLY_RECURRENCE: - if (r->by_month_day[0] != ICAL_RECURRENCE_ARRAY_MAX) { - /* For Translators : 'The %s day of' is part of the sentence 'event recurring on the (nth) day of every month.' */ -- sprintf (buffer, _("The %s day of "), -- nth (r->by_month_day[0])); -+ g_string_append_printf ( -+ buffer, _("The %s day of "), -+ nth (r->by_month_day[0])); - } else { - int pos; - -@@ -828,20 +836,21 @@ write_recurrence_piece (EItipControl *it - - /* For Translators : 'The %s %s of' is part of the sentence 'event recurring on the (nth) (dayname) of every month.' - eg,third monday of every month */ -- sprintf (buffer, _("The %s %s of "), -- nth (pos), get_dayname (r, 0)); -+ g_string_append_printf ( -+ buffer, _("The %s %s of "), -+ nth (pos), get_dayname (r, 0)); - } - -- len = strlen (buffer); -- buffer += len; -- size -= len; - /* For Translators: In this can also be translated as "With the period of %d - month/months", where %d is a number. The entire sentence is of the form "Recurring: - Every %d month/months" */ - /* For Translators : 'every month' is part of the sentence 'event recurring on the (nth) day of every month.' */ - /* For Translators : 'every %d months' is part of the sentence 'event recurring on the (nth) day of every %d months.' - %d is a digit */ -- sprintf (buffer, ngettext("every month","every %d months", r->interval), r->interval); -+ g_string_append_printf ( -+ buffer, ngettext ("every month", -+ "every %d months", r->interval), -+ r->interval); - break; - - case ICAL_YEARLY_RECURRENCE: -@@ -850,20 +859,22 @@ write_recurrence_piece (EItipControl *it - Every %d year/years" */ - /* For Translators : 'Every year' is event Recurring every year */ - /* For Translators : 'Every %d years' is event Recurring every %d years. %d is a digit */ -- sprintf (buffer, ngettext("Every year", "Every %d years", r->interval), r->interval); -+ g_string_append_printf ( -+ buffer, ngettext ("Every year", -+ "Every %d years", r->interval), -+ r->interval); - break; - - default: - g_return_if_reached (); - } - -- len = strlen (buffer); -- buffer += len; -- size -= len; - if (r->count) { - /* For Translators:'a total of %d time' is part of the sentence of the form 'event recurring every day,a total of % time.' %d is a digit*/ - /* For Translators:'a total of %d times' is part of the sentence of the form 'event recurring every day,a total of % times.' %d is a digit*/ -- sprintf (buffer, ngettext("a total of %d time", " a total of %d times", r->count), r->count); -+ g_string_append_printf ( -+ buffer, ngettext ("a total of %d time", -+ " a total of %d times", r->count), r->count); - } else if (!icaltime_is_null_time (r->until)) { - ECalComponentDateTime dt; - -@@ -871,12 +882,12 @@ write_recurrence_piece (EItipControl *it - dt.value = &r->until; - dt.tzid = icaltimezone_get_tzid ((icaltimezone *)r->until.zone); - -- write_label_piece (itip, &dt, buffer, size, -+ write_label_piece (itip, &dt, buffer, - /* For Translators : ', ending on' is part of the sentence of the form 'event recurring every day, ending on (date).'*/ - _(", ending on "), NULL, TRUE); - } - -- strcat (buffer, "
"); -+ g_string_append_len (buffer, "
", 4); - } - - static void -@@ -884,47 +895,51 @@ set_date_label (EItipControl *itip, GtkH - ECalComponent *comp) - { - ECalComponentDateTime datetime; -- static char buffer[1024]; -+ GString *buffer; - gchar *str; - gboolean wrote = FALSE, task_completed = FALSE; - ECalComponentVType type; - -+ buffer = g_string_sized_new (1024); - type = e_cal_component_get_vtype (comp); - -- buffer[0] = '\0'; - e_cal_component_get_dtstart (comp, &datetime); - if (datetime.value) { - /* For Translators : 'starts' is starts:date implying a task starts on what date */ - str = g_strdup_printf ("%s:", _("Starts")); -- write_label_piece (itip, &datetime, buffer, 1024, -- str, -- "
", FALSE); -- gtk_html_write (html, html_stream, buffer, strlen(buffer)); -+ write_label_piece (itip, &datetime, buffer, str, "
", FALSE); -+ gtk_html_write (html, html_stream, buffer->str, buffer->len); - wrote = TRUE; - g_free (str); - } - e_cal_component_free_datetime (&datetime); - -- buffer[0] = '\0'; -+ /* Reset the buffer. */ -+ g_string_truncate (buffer, 0); -+ - e_cal_component_get_dtend (comp, &datetime); - if (datetime.value){ - /* For Translators : 'ends' is ends:date implying a task ends on what date */ - str = g_strdup_printf ("%s:", _("Ends")); -- write_label_piece (itip, &datetime, buffer, 1024, str, "
", FALSE); -- gtk_html_write (html, html_stream, buffer, strlen (buffer)); -+ write_label_piece (itip, &datetime, buffer, str, "
", FALSE); -+ gtk_html_write (html, html_stream, buffer->str, buffer->len); - wrote = TRUE; - g_free (str); - } - e_cal_component_free_datetime (&datetime); - -- buffer[0] = '\0'; -+ /* Reset the buffer. */ -+ g_string_truncate (buffer, 0); -+ - if (e_cal_component_has_recurrences (comp)) { -- write_recurrence_piece (itip, comp, buffer, 1024); -- gtk_html_write (html, html_stream, buffer, strlen (buffer)); -+ write_recurrence_piece (itip, comp, buffer); -+ gtk_html_write (html, html_stream, buffer->str, buffer->len); - wrote = TRUE; - } - -- buffer[0] = '\0'; -+ /* Reset the buffer. */ -+ g_string_truncate (buffer, 0); -+ - datetime.tzid = NULL; - e_cal_component_get_completed (comp, &datetime.value); - if (type == E_CAL_COMPONENT_TODO && datetime.value) { -@@ -932,20 +947,22 @@ set_date_label (EItipControl *itip, GtkH - timezone. */ - str = g_strdup_printf ("%s:", _("Completed")); - datetime.value->is_utc = TRUE; -- write_label_piece (itip, &datetime, buffer, 1024, str, "
", FALSE); -- gtk_html_write (html, html_stream, buffer, strlen (buffer)); -+ write_label_piece (itip, &datetime, buffer, str, "
", FALSE); -+ gtk_html_write (html, html_stream, buffer->str, buffer->len); - wrote = TRUE; - task_completed = TRUE; - g_free (str); - } - e_cal_component_free_datetime (&datetime); - -- buffer[0] = '\0'; -+ /* Reset the buffer. */ -+ g_string_truncate (buffer, 0); -+ - e_cal_component_get_due (comp, &datetime); - if (type == E_CAL_COMPONENT_TODO && !task_completed && datetime.value) { - str = g_strdup_printf ("%s:", _("Due")); -- write_label_piece (itip, &datetime, buffer, 1024, str, "
", FALSE); -- gtk_html_write (html, html_stream, buffer, strlen (buffer)); -+ write_label_piece (itip, &datetime, buffer, str, "
", FALSE); -+ gtk_html_write (html, html_stream, buffer->str, buffer->len); - wrote = TRUE; - g_free (str); - } -@@ -954,6 +971,8 @@ set_date_label (EItipControl *itip, GtkH - - if (wrote) - gtk_html_stream_printf (html_stream, "
"); -+ -+ g_string_free (buffer, TRUE); - } - - static void diff --git a/evolution-2.23.3.1-CVE-2008-1109.patch b/evolution-2.23.3.1-CVE-2008-1109.patch deleted file mode 100644 index f8be42c..0000000 --- a/evolution-2.23.3.1-CVE-2008-1109.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -up evolution-2.23.3.1/calendar/gui/itip-utils.c.CVE-2008-1109 evolution-2.23.3.1/calendar/gui/itip-utils.c ---- evolution-2.23.3.1/calendar/gui/itip-utils.c.CVE-2008-1109 2008-06-02 03:51:43.000000000 -0400 -+++ evolution-2.23.3.1/calendar/gui/itip-utils.c 2008-06-03 16:37:21.000000000 -0400 -@@ -172,50 +172,16 @@ get_attendee_if_attendee_sentby_is_user - } - - static char * --html_new_lines_for (char *string) -+html_new_lines_for (const char *string) - { -- char *html_string = (char *) malloc (sizeof (char)* (3500)); -- int length = strlen (string); -- int index = 0; -- char *index_ptr = string; -- char *temp = string; -+ gchar **lines; -+ gchar *joined; - -- /*Find the first occurence*/ -- index_ptr = strstr ((const char *)temp, "\n"); -+ lines = g_strsplit_set (string, "\n", -1); -+ joined = g_strjoinv ("
", lines); -+ g_strfreev (lines); - -- /*Doesn't occur*/ -- if (index_ptr == NULL) { -- strcpy (html_string, (const char *)string); -- html_string[length] = '\0'; -- return html_string; -- } -- -- /*Split into chunks inserting
for \n */ -- do{ -- while (temp != index_ptr){ -- html_string[index++] = *temp; -- temp++; -- } -- temp++; -- -- html_string[index++] = '<'; -- html_string[index++] = 'b'; -- html_string[index++] = 'r'; -- html_string[index++] = '>'; -- -- index_ptr = strstr ((const char *)temp, "\n"); -- -- } while (index_ptr); -- -- /*Don't leave out the last chunk*/ -- while (*temp != '\0'){ -- html_string[index++] = *temp; -- temp++; -- } -- -- html_string[index] = '\0'; -- -- return html_string; -+ return joined; - } - - char * diff --git a/evolution.spec b/evolution.spec index 0ded835..1944093 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.23.3.1 -Release: 4%{?dist} +Version: 2.23.4 +Release: 1%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -77,12 +77,6 @@ Patch13: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch14: evolution-2.9.1-im-context-reset.patch -# RH bug #449925 / CVE-2008-1108 -Patch15: evolution-2.23.3.1-CVE-2008-1108.patch - -# RH bug #449925 / CVE-2008-1109 -Patch16: evolution-2.23.3.1-CVE-2008-1109.patch - ## Dependencies ### Requires(post): GConf2 @@ -226,8 +220,6 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch12 -p1 -b .fix-conduit-dir %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset -%patch15 -p1 -b .CVE-2008-1108 -%patch16 -p1 -b .CVE-2008-1109 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -655,6 +647,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Jun 16 2008 Matthew Barnes - 2.23.4-1.fc10 +- Update to 2.23.4 +- Remove patches for RH bug #449925 (fixed upstream). + * Fri Jun 06 2008 Matthew Barnes - 2.23.3.1-4.fc10 - Use a less pretentious summary. diff --git a/sources b/sources index c6c64a6..243813b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e9b4d48ab7cd78bc4a3b5a75aff0c69c evolution-2.23.3.1.tar.bz2 +5a6ceba4a7cdb33fb02fe32e1c58cb40 evolution-2.23.4.tar.bz2 From 1d0a55f759480cb59f9714890daeb384dbe16154 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 19 Jun 2008 13:00:31 +0000 Subject: [PATCH 229/844] - Don't ship the unfinished "Custom Header" plugin. --- evolution-2.0.2-fix-145552.patch | 26 ----------- evolution-2.21.92-CVE-2008-0072.patch | 48 --------------------- evolution-2.23.4-experimental-plugins.patch | 38 ++++++++++++++++ evolution.spec | 14 +++--- 4 files changed, 46 insertions(+), 80 deletions(-) delete mode 100644 evolution-2.0.2-fix-145552.patch delete mode 100644 evolution-2.21.92-CVE-2008-0072.patch create mode 100644 evolution-2.23.4-experimental-plugins.patch diff --git a/evolution-2.0.2-fix-145552.patch b/evolution-2.0.2-fix-145552.patch deleted file mode 100644 index 30972e2..0000000 --- a/evolution-2.0.2-fix-145552.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- evolution-2.0.2/mail/em-utils.c.fix-145552 2004-09-24 11:49:29.000000000 -0400 -+++ evolution-2.0.2/mail/em-utils.c 2005-08-02 22:42:04.000000000 -0400 -@@ -2176,10 +2176,22 @@ - * try to do better with the filename check. - */ - -+ /* RH bug 145552: code based on _gnome_vfs_get_mime_type_internal: -+ * So many file types come compressed by gzip -+ * that extensions are more reliable than magic -+ * typing. If the file has a suffix, then use -+ * the type from the suffix: -+ */ - if (magic_type) { - if (name_type - && (!strcmp(magic_type, "text/plain") -- || !strcmp(magic_type, "application/octet-stream"))) -+ || !strcmp(magic_type, "application/octet-stream") -+ || !strcmp(magic_type, "application/octet-stream") -+ || !strcmp(magic_type, "application/x-ole-storage") -+ || !strcmp(magic_type, "text/xml") -+ || !strcmp(magic_type, "application/x-bzip") -+ || !strcmp(magic_type, "application/x-gzip") -+ || !strcmp(magic_type, "application/zip"))) - return name_type; - else - return magic_type; diff --git a/evolution-2.21.92-CVE-2008-0072.patch b/evolution-2.21.92-CVE-2008-0072.patch deleted file mode 100644 index 7183312..0000000 --- a/evolution-2.21.92-CVE-2008-0072.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff -up evolution-2.21.92/mail/em-format.c.CVE-2008-0072 evolution-2.21.92/mail/em-format.c ---- evolution-2.21.92/mail/em-format.c.CVE-2008-0072 2008-01-27 22:59:48.000000000 -0500 -+++ evolution-2.21.92/mail/em-format.c 2008-03-04 15:40:29.000000000 -0500 -@@ -1193,7 +1193,7 @@ emf_application_xpkcs7mime(EMFormat *emf - opart = camel_mime_part_new(); - valid = camel_cipher_decrypt(context, part, opart, ex); - if (valid == NULL) { -- em_format_format_error(emf, stream, ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); -+ em_format_format_error(emf, stream, "%s", ex->desc?ex->desc:_("Could not parse S/MIME message: Unknown error")); - em_format_part_as(emf, stream, part, NULL); - } else { - if (emfc == NULL) -@@ -1350,7 +1350,7 @@ emf_multipart_encrypted(EMFormat *emf, C - if (valid == NULL) { - em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP/MIME message"):_("Could not parse PGP/MIME message: Unknown error")); - if (ex->desc) -- em_format_format_error(emf, stream, ex->desc); -+ em_format_format_error(emf, stream, "%s", ex->desc); - em_format_part_as(emf, stream, part, "multipart/mixed"); - } else { - if (emfc == NULL) -@@ -1515,7 +1515,7 @@ emf_multipart_signed(EMFormat *emf, Came - if (valid == NULL) { - em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); - if (ex->desc) -- em_format_format_error(emf, stream, ex->desc); -+ em_format_format_error(emf, stream, "%s", ex->desc); - em_format_part_as(emf, stream, part, "multipart/mixed"); - } else { - if (emfc == NULL) -@@ -1586,7 +1586,7 @@ emf_inlinepgp_signed(EMFormat *emf, Came - if (!valid) { - em_format_format_error(emf, stream, ex->desc?_("Error verifying signature"):_("Unknown error verifying signature")); - if (ex->desc) -- em_format_format_error(emf, stream, ex->desc); -+ em_format_format_error(emf, stream, "%s", ex->desc); - em_format_format_source(emf, stream, ipart); - /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ - camel_exception_free(ex); -@@ -1658,7 +1658,7 @@ emf_inlinepgp_encrypted(EMFormat *emf, C - if (!valid) { - em_format_format_error(emf, stream, ex->desc?_("Could not parse PGP message"):_("Could not parse PGP message: Unknown error")); - if (ex->desc) -- em_format_format_error(emf, stream, ex->desc); -+ em_format_format_error(emf, stream, "%s", ex->desc); - em_format_format_source(emf, stream, ipart); - /* I think this will loop: em_format_part_as(emf, stream, part, "text/plain"); */ - camel_exception_free(ex); diff --git a/evolution-2.23.4-experimental-plugins.patch b/evolution-2.23.4-experimental-plugins.patch new file mode 100644 index 0000000..038ec31 --- /dev/null +++ b/evolution-2.23.4-experimental-plugins.patch @@ -0,0 +1,38 @@ +diff -up evolution-2.23.4/configure.experimental-plugins evolution-2.23.4/configure +--- evolution-2.23.4/configure.experimental-plugins 2008-06-19 08:34:44.000000000 -0400 ++++ evolution-2.23.4/configure 2008-06-19 08:35:07.000000000 -0400 +@@ -38556,13 +38556,13 @@ plugins_base_always="calendar-file calen + plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " + all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" + +-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header" ++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore" + + plugins_standard="$plugins_standard_always" + all_plugins_standard="$plugins_standard" + + plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor" +-plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN" ++plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header" + all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" + + case x"$enable_plugins" in +diff -up evolution-2.23.4/configure.in.experimental-plugins evolution-2.23.4/configure.in +--- evolution-2.23.4/configure.in.experimental-plugins 2008-06-19 08:34:01.000000000 -0400 ++++ evolution-2.23.4/configure.in 2008-06-19 08:34:35.000000000 -0400 +@@ -1732,13 +1732,13 @@ plugins_base_always="calendar-file calen + plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " + all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" + +-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header" ++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore" + + plugins_standard="$plugins_standard_always" + all_plugins_standard="$plugins_standard" + + plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor" +-plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN" ++plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header" + all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" + + case x"$enable_plugins" in diff --git a/evolution.spec b/evolution.spec index 1944093..7e61574 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.23.4 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL+ Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -77,6 +77,9 @@ Patch13: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch14: evolution-2.9.1-im-context-reset.patch +# Don't ship broken plugins as stable +Patch15: evolution-2.23.4-experimental-plugins.patch + ## Dependencies ### Requires(post): GConf2 @@ -220,6 +223,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch12 -p1 -b .fix-conduit-dir %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset +%patch15 -p1 -b .experimental-plugins mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -356,7 +360,6 @@ scrollkeeper-update -q touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null 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 @@ -383,7 +386,6 @@ rm -rf $RPM_BUILD_ROOT %doc AUTHORS COPYING ChangeLog NEWS README # GConf schemas: -%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas @@ -506,9 +508,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-default-source.eplug %{evo_plugin_dir}/liborg-gnome-default-source.so -%{evo_plugin_dir}/org-gnome-email-custom-header.eplug -%{evo_plugin_dir}/liborg-gnome-email-custom-header.so - %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so @@ -647,6 +646,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Thu Jun 19 2008 Matthew Barnes - 2.23.4-2.fc10 +- Don't ship the unfinished "Custom Header" plugin. + * Mon Jun 16 2008 Matthew Barnes - 2.23.4-1.fc10 - Update to 2.23.4 - Remove patches for RH bug #449925 (fixed upstream). From f341de843c3e85f301765c24d73d900b8df48174 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 18 Jul 2008 13:16:37 +0000 Subject: [PATCH 230/844] fix license tag --- evolution-1.4.4-ldap-x86_64-hack.patch | 9 +- evolution-2.5.4-fix-conduit-dir.patch | 122 +++++++++++++------------ evolution.spec | 8 +- 3 files changed, 76 insertions(+), 63 deletions(-) diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch index 47cafbd..44cf1c7 100644 --- a/evolution-1.4.4-ldap-x86_64-hack.patch +++ b/evolution-1.4.4-ldap-x86_64-hack.patch @@ -1,11 +1,12 @@ ---- evolution-1.4.4/configure.ldaphack 2003-08-05 02:06:26.000000000 -0400 -+++ evolution-1.4.4/configure 2003-08-05 02:06:45.000000000 -0400 -@@ -12135,7 +12135,7 @@ +diff -up evolution-2.23.4/configure.ldaphack evolution-2.23.4/configure +--- evolution-2.23.4/configure.ldaphack 2008-06-16 07:12:17.000000000 -0400 ++++ evolution-2.23.4/configure 2008-07-18 09:08:21.000000000 -0400 +@@ -27729,7 +27729,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" +LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" cat >conftest.$ac_ext <<_ACEOF - #line $LINENO "configure" /* confdefs.h. */ + _ACEOF diff --git a/evolution-2.5.4-fix-conduit-dir.patch b/evolution-2.5.4-fix-conduit-dir.patch index 31726ab..334564b 100644 --- a/evolution-2.5.4-fix-conduit-dir.patch +++ b/evolution-2.5.4-fix-conduit-dir.patch @@ -1,6 +1,7 @@ ---- evolution-2.11.3/addressbook/conduit/Makefile.am.fix-conduit-dir 2007-06-03 11:07:44.000000000 -0400 -+++ evolution-2.11.3/addressbook/conduit/Makefile.am 2007-06-04 12:55:32.000000000 -0400 -@@ -28,7 +28,7 @@ e-address.conduit: e-address.conduit.in +diff -up evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.am +--- evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2008-06-15 23:20:16.000000000 -0400 ++++ evolution-2.23.4/addressbook/conduit/Makefile.am 2008-07-18 09:10:29.000000000 -0400 +@@ -25,7 +25,7 @@ e-address.conduit: e-address.conduit.in -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ @@ -9,9 +10,10 @@ conduit_DATA = e-address.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.11.3/addressbook/conduit/Makefile.in.fix-conduit-dir 2007-06-04 07:36:46.000000000 -0400 -+++ evolution-2.11.3/addressbook/conduit/Makefile.in 2007-06-04 12:55:53.000000000 -0400 -@@ -459,7 +459,7 @@ libeaddress_conduit_la_LIBADD = \ +diff -up evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.in +--- evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir 2008-06-16 07:11:50.000000000 -0400 ++++ evolution-2.23.4/addressbook/conduit/Makefile.in 2008-07-18 09:10:29.000000000 -0400 +@@ -421,7 +421,7 @@ libeaddress_conduit_la_LIBADD = \ $(top_builddir)/widgets/misc/libemiscwidgets.la \ $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) @@ -20,53 +22,10 @@ conduit_DATA = e-address.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.11.3/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/todo/Makefile.am 2007-06-04 12:56:19.000000000 -0400 -@@ -25,7 +25,7 @@ e-todo.conduit: e-todo.conduit.in - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit - - BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.11.3/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2007-06-04 07:36:51.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/todo/Makefile.in 2007-06-04 12:56:28.000000000 -0400 -@@ -456,7 +456,7 @@ libetodo_conduit_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.11.3/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/memo/Makefile.am 2007-06-04 12:56:49.000000000 -0400 -@@ -25,7 +25,7 @@ e-memo.conduit: e-memo.conduit.in - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo.conduit - - BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.11.3/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2007-06-04 07:36:50.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/memo/Makefile.in 2007-06-04 12:56:40.000000000 -0400 -@@ -456,7 +456,7 @@ libememo_conduit_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) ---- evolution-2.11.3/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2007-06-03 11:08:16.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/calendar/Makefile.am 2007-06-04 12:57:02.000000000 -0400 -@@ -25,7 +25,7 @@ e-calendar.conduit: e-calendar.conduit.i +diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.am +--- evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.am 2008-07-18 09:10:29.000000000 -0400 +@@ -28,7 +28,7 @@ e-calendar.conduit: e-calendar.conduit.i -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ $< > $@ @@ -75,10 +34,11 @@ conduit_DATA = e-calendar.conduit BUILT_SOURCES = $(conduit_DATA) ---- evolution-2.11.3/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2007-06-04 07:36:50.000000000 -0400 -+++ evolution-2.11.3/calendar/conduits/calendar/Makefile.in 2007-06-04 12:57:11.000000000 -0400 -@@ -458,7 +458,7 @@ libecalendar_conduit_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ +diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.in +--- evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/calendar/Makefile.in 2008-07-18 09:13:04.000000000 -0400 +@@ -426,7 +426,7 @@ libecalendar_conduit_la_LIBADD = \ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ $(EVOLUTION_CALENDAR_CONDUIT_LIBS) -conduitdir = $(datadir)/gnome-pilot/conduits/ @@ -86,3 +46,51 @@ conduit_DATA = e-calendar.conduit BUILT_SOURCES = $(conduit_DATA) CLEANFILES = $(BUILT_SOURCES) +diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.am +--- evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/memo/Makefile.am 2008-07-18 09:10:29.000000000 -0400 +@@ -28,7 +28,7 @@ e-memo.conduit: e-memo.conduit.in + -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ + $< > $@ + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-memo.conduit + + BUILT_SOURCES = $(conduit_DATA) +diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.in +--- evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/memo/Makefile.in 2008-07-18 09:12:17.000000000 -0400 +@@ -424,7 +424,7 @@ libememo_conduit_la_LIBADD = \ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-memo.conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) +diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.am +--- evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/todo/Makefile.am 2008-07-18 09:10:29.000000000 -0400 +@@ -28,7 +28,7 @@ e-todo.conduit: e-todo.conduit.in + -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ + $< > $@ + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-todo.conduit + + BUILT_SOURCES = $(conduit_DATA) +diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.in +--- evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 ++++ evolution-2.23.4/calendar/conduits/todo/Makefile.in 2008-07-18 09:11:53.000000000 -0400 +@@ -424,7 +424,7 @@ libetodo_conduit_la_LIBADD = \ + $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ + $(EVOLUTION_CALENDAR_CONDUIT_LIBS) + +-conduitdir = $(datadir)/gnome-pilot/conduits/ ++conduitdir = $(libdir)/gnome-pilot/conduits/ + conduit_DATA = e-todo.conduit + BUILT_SOURCES = $(conduit_DATA) + CLEANFILES = $(BUILT_SOURCES) diff --git a/evolution.spec b/evolution.spec index 7e61574..68d0c0f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,8 +45,8 @@ Name: evolution Version: 2.23.4 -Release: 2%{?dist} -License: GPLv2 and GFDL+ +Release: 3%{?dist} +License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME URL: http://www.gnome.org/projects/evolution/ @@ -646,6 +646,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Fri Jul 18 2008 Tom "spot" Callaway - 2.23.4-3.fc10 +- fix license tag +- fix patches to apply with fuzz=0 + * Thu Jun 19 2008 Matthew Barnes - 2.23.4-2.fc10 - Don't ship the unfinished "Custom Header" plugin. From 4aee6561f008a52580dfc8216e6606d1c1dd055a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 24 Jul 2008 04:02:15 +0000 Subject: [PATCH 231/844] - Update to 2.23.5 - Bump eds_version to 2.23.5. --- .cvsignore | 2 +- evolution-2.23.4-experimental-plugins.patch | 8 ++++---- evolution.spec | 16 +++++++++++++--- sources | 2 +- 4 files changed, 19 insertions(+), 9 deletions(-) diff --git a/.cvsignore b/.cvsignore index fbcef1b..7181959 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.4.tar.bz2 +evolution-2.23.5.tar.bz2 diff --git a/evolution-2.23.4-experimental-plugins.patch b/evolution-2.23.4-experimental-plugins.patch index 038ec31..5a3cb86 100644 --- a/evolution-2.23.4-experimental-plugins.patch +++ b/evolution-2.23.4-experimental-plugins.patch @@ -5,8 +5,8 @@ diff -up evolution-2.23.4/configure.experimental-plugins evolution-2.23.4/config plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" --plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header" -+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore" +-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" ++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates" plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" @@ -24,8 +24,8 @@ diff -up evolution-2.23.4/configure.in.experimental-plugins evolution-2.23.4/con plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" --plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header" -+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore" +-plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" ++plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates" plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" diff --git a/evolution.spec b/evolution.spec index 68d0c0f..0535bcd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.23.3 +%define eds_version 2.23.5 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.23.4 -Release: 3%{?dist} +Version: 2.23.5 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -366,6 +366,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.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/apps-evolution-template-placeholders.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null %post bogofilter @@ -392,6 +393,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas +%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas %{_sysconfdir}/gconf/schemas/evolution-mail.schemas # The main executable @@ -574,6 +576,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so +%{evo_plugin_dir}/templates.glade +%{evo_plugin_dir}/org-gnome-templates.eplug +%{evo_plugin_dir}/liborg-gnome-templates.so + %{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug %{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so @@ -646,6 +652,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Tue Jul 22 2008 Matthew Barnes - 2.23.5-1.fc10 +- Update to 2.23.5 +- Bump eds_version to 2.23.5. + * Fri Jul 18 2008 Tom "spot" Callaway - 2.23.4-3.fc10 - fix license tag - fix patches to apply with fuzz=0 diff --git a/sources b/sources index 243813b..ff9f24e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a6ceba4a7cdb33fb02fe32e1c58cb40 evolution-2.23.4.tar.bz2 +ea19190dec55a30b106ebb9da5de8b70 evolution-2.23.5.tar.bz2 From bd71c4e0875e8bc0f24f69f2bb71d17fd3e97df1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 Aug 2008 15:26:57 +0000 Subject: [PATCH 232/844] - Update to 2.23.6 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7181959..e2032ec 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.5.tar.bz2 +evolution-2.23.6.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 0535bcd..47bf1e8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.23.5 +Version: 2.23.6 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -652,6 +652,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Aug 04 2008 Matthew Barnes - 2.23.6-1.fc10 +- Update to 2.23.6 + * Tue Jul 22 2008 Matthew Barnes - 2.23.5-1.fc10 - Update to 2.23.5 - Bump eds_version to 2.23.5. diff --git a/sources b/sources index ff9f24e..b815011 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ea19190dec55a30b106ebb9da5de8b70 evolution-2.23.5.tar.bz2 +dffdac5928c01a16a80c638bd02ae871 evolution-2.23.6.tar.bz2 From fadf4915c54ee110478eab0ac090c942ea1c57c5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 Aug 2008 20:03:30 +0000 Subject: [PATCH 233/844] - Update to 2.23.6 --- evolution-2.23.4-experimental-plugins.patch | 4 +- ...23.6-deprecated-gnuc-pretty-function.patch | 84 +++++++++++++++++++ evolution.spec | 28 ++++--- 3 files changed, 102 insertions(+), 14 deletions(-) create mode 100644 evolution-2.23.6-deprecated-gnuc-pretty-function.patch diff --git a/evolution-2.23.4-experimental-plugins.patch b/evolution-2.23.4-experimental-plugins.patch index 5a3cb86..ed6689a 100644 --- a/evolution-2.23.4-experimental-plugins.patch +++ b/evolution-2.23.4-experimental-plugins.patch @@ -11,7 +11,7 @@ diff -up evolution-2.23.4/configure.experimental-plugins evolution-2.23.4/config plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" - plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor" + plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup" -plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN" +plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header" all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" @@ -30,7 +30,7 @@ diff -up evolution-2.23.4/configure.in.experimental-plugins evolution-2.23.4/con plugins_standard="$plugins_standard_always" all_plugins_standard="$plugins_standard" - plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor" + plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup" -plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN" +plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header" all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" diff --git a/evolution-2.23.6-deprecated-gnuc-pretty-function.patch b/evolution-2.23.6-deprecated-gnuc-pretty-function.patch new file mode 100644 index 0000000..286d633 --- /dev/null +++ b/evolution-2.23.6-deprecated-gnuc-pretty-function.patch @@ -0,0 +1,84 @@ +diff -U0 evolution-2.23.6/mail/ChangeLog.deprecated-gnuc-pretty-function evolution-2.23.6/mail/ChangeLog +diff -up evolution-2.23.6/mail/em-migrate.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-migrate.c +--- evolution-2.23.6/mail/em-migrate.c.deprecated-gnuc-pretty-function 2008-08-01 02:37:53.000000000 -0400 ++++ evolution-2.23.6/mail/em-migrate.c 2008-08-04 14:53:29.000000000 -0400 +@@ -2934,7 +2934,7 @@ migrate_to_db() + migrate_folders(store, info, account->name, &ex); + + } else +- printf("%s(%d):%s: failed to get folder infos \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION); ++ printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC); + camel_exception_clear(&ex); + + } +diff -up evolution-2.23.6/mail/em-network-prefs.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-network-prefs.c +--- evolution-2.23.6/mail/em-network-prefs.c.deprecated-gnuc-pretty-function 2008-08-01 02:37:52.000000000 -0400 ++++ evolution-2.23.6/mail/em-network-prefs.c 2008-08-04 14:53:29.000000000 -0400 +@@ -323,8 +323,7 @@ notify_proxy_type_changed (GtkWidget *wi + emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE); + emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, FALSE); + if (type == NETWORK_PROXY_SYS_SETTINGS) { +- d(g_print ("%s:%s:%d: Loading sys settings... \n", +- __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__)); ++ d(g_print ("%s:%s: Loading sys settings... \n", G_STRLOC, G_STRFUNC)); + emnp_load_sys_settings (prefs->gconf); + } + +@@ -357,11 +356,11 @@ widget_entry_changed_cb (GtkWidget *widg + if (GTK_IS_SPIN_BUTTON (widget)) { + port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)); + gconf_client_set_int (gconf, (const char *)data, port, NULL); +- d(g_print ("%s:%s:%d: %s is SpinButton: value = [%d]\n", __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, port)); ++ d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, (const char *)data, port)); + } else if (GTK_IS_ENTRY (widget)) { + value = gtk_entry_get_text (GTK_ENTRY (widget)); + gconf_client_set_string (gconf, (const char *)data, value, NULL); +- d(g_print ("%s:%s:%d: %s is Entry: value = [%s]\n", __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, value)); ++ d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, (const char *)data, value)); + } + + } +diff -up evolution-2.23.6/mail/em-subscribe-editor.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-subscribe-editor.c +--- evolution-2.23.6/mail/em-subscribe-editor.c.deprecated-gnuc-pretty-function 2008-07-18 02:19:05.000000000 -0400 ++++ evolution-2.23.6/mail/em-subscribe-editor.c 2008-08-04 14:53:29.000000000 -0400 +@@ -312,8 +312,8 @@ sub_fill_level(EMSubscribe *sub, CamelFo + e_dlist_addtail(&sub->pending, (EDListNode *)node); + } + } else { +- d(printf("%s:%d:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n", +- __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, fi->flags & CAMEL_FOLDER_NOINFERIORS, ++ d(printf("%s:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n", ++ G_STRLOC, G_STRFUNC, fi->flags & CAMEL_FOLDER_NOINFERIORS, + node->path)); + } + +@@ -408,7 +408,7 @@ sub_queue_fill_level(EMSubscribe *sub, E + struct _emse_folderinfo_msg *m; + int id; + +- d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, ++ d(printf("%s:%s: Starting get folderinfo of '%s'\n", G_STRLOC, G_STRFUNC, + node?node->info->full_name:"")); + + m = mail_msg_new (&sub_folderinfo_info); +@@ -501,7 +501,7 @@ sub_row_expanded(GtkTreeView *tree, GtkT + char *row_name; + + gtk_tree_model_get(model, iter, 1, &row_name, -1); +- d(printf("%s:%d:%s: row-expanded '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, ++ d(printf("%s:%s: row-expanded '%s'\n", G_STRLOC, G_STRFUNC, + row_name?row_name:"")); + + /* Do we really need to fetch the children for this row? */ +diff -up evolution-2.23.6/mail/mail-vfolder.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/mail-vfolder.c +--- evolution-2.23.6/mail/mail-vfolder.c.deprecated-gnuc-pretty-function 2008-07-18 02:19:05.000000000 -0400 ++++ evolution-2.23.6/mail/mail-vfolder.c 2008-08-04 14:53:29.000000000 -0400 +@@ -50,7 +50,7 @@ + #include "mail-tools.h" + #include "mail-vfolder.h" + +-#define d(x) /* (printf("%s(%d):%s: ", __FILE__, __LINE__, __PRETTY_FUNCTION__), (x))*/ ++#define d(x) /* (printf("%s:%s: ", G_STRLOC, G_STRFUNC), (x))*/ + + static EMVFolderContext *context; /* context remains open all time */ + CamelStore *vfolder_store; /* the 1 static vfolder store */ diff --git a/evolution.spec b/evolution.spec index 47bf1e8..992e2fb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -80,6 +80,9 @@ Patch14: evolution-2.9.1-im-context-reset.patch # Don't ship broken plugins as stable Patch15: evolution-2.23.4-experimental-plugins.patch +# The usual regressions... +Patch16: evolution-2.23.6-deprecated-gnuc-pretty-function.patch + ## Dependencies ### Requires(post): GConf2 @@ -224,6 +227,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset %patch15 -p1 -b .experimental-plugins +%patch16 -p1 -b .deprecated-gnuc-pretty-function mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -492,6 +496,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-backup-restore.xml %{evo_plugin_dir}/liborg-gnome-backup-restore.so +%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so + %{evo_plugin_dir}/org-gnome-calendar-file.eplug %{evo_plugin_dir}/liborg-gnome-calendar-file.so @@ -540,6 +547,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so +%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so + %{evo_plugin_dir}/org-gnome-itip-formatter.eplug %{evo_plugin_dir}/liborg-gnome-itip-formatter.so @@ -567,6 +577,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-prefer-plain.eplug %{evo_plugin_dir}/liborg-gnome-prefer-plain.so +%{evo_plugin_dir}/org-gnome-publish-calendar.eplug +%{evo_plugin_dir}/liborg-gnome-publish-calendar.so +%{evo_plugin_dir}/org-gnome-publish-calendar.xml + %{evo_plugin_dir}/org-gnome-save-calendar.eplug %{evo_plugin_dir}/liborg-gnome-save-calendar.so @@ -580,18 +594,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-templates.eplug %{evo_plugin_dir}/liborg-gnome-templates.so -%{evo_plugin_dir}/org-gnome-evolution-hula-account-setup.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-hula-account-setup.so - -%{evo_plugin_dir}/org-gnome-publish-calendar.eplug -%{evo_plugin_dir}/liborg-gnome-publish-calendar.so -%{evo_plugin_dir}/org-gnome-publish-calendar.xml - -%{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 +%{evo_plugin_dir}/org-gnome-evolution-webdav.eplug +%{evo_plugin_dir}/liborg-gnome-evolution-webdav.so %files devel %defattr(-, root, root) From cab211f055d2db0c48c063e4b3c0b8825f5122f3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 20 Aug 2008 21:30:43 +0000 Subject: [PATCH 234/844] - Update to 2.23.90 - Bump eds_version to 2.23.90.1 --- .cvsignore | 2 +- ...23.6-deprecated-gnuc-pretty-function.patch | 84 ------------------- evolution.spec | 24 +++--- sources | 2 +- 4 files changed, 14 insertions(+), 98 deletions(-) delete mode 100644 evolution-2.23.6-deprecated-gnuc-pretty-function.patch diff --git a/.cvsignore b/.cvsignore index e2032ec..cac5f87 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.6.tar.bz2 +evolution-2.23.90.tar.bz2 diff --git a/evolution-2.23.6-deprecated-gnuc-pretty-function.patch b/evolution-2.23.6-deprecated-gnuc-pretty-function.patch deleted file mode 100644 index 286d633..0000000 --- a/evolution-2.23.6-deprecated-gnuc-pretty-function.patch +++ /dev/null @@ -1,84 +0,0 @@ -diff -U0 evolution-2.23.6/mail/ChangeLog.deprecated-gnuc-pretty-function evolution-2.23.6/mail/ChangeLog -diff -up evolution-2.23.6/mail/em-migrate.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-migrate.c ---- evolution-2.23.6/mail/em-migrate.c.deprecated-gnuc-pretty-function 2008-08-01 02:37:53.000000000 -0400 -+++ evolution-2.23.6/mail/em-migrate.c 2008-08-04 14:53:29.000000000 -0400 -@@ -2934,7 +2934,7 @@ migrate_to_db() - migrate_folders(store, info, account->name, &ex); - - } else -- printf("%s(%d):%s: failed to get folder infos \n", __FILE__, __LINE__, G_GNUC_PRETTY_FUNCTION); -+ printf("%s:%s: failed to get folder infos \n", G_STRLOC, G_STRFUNC); - camel_exception_clear(&ex); - - } -diff -up evolution-2.23.6/mail/em-network-prefs.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-network-prefs.c ---- evolution-2.23.6/mail/em-network-prefs.c.deprecated-gnuc-pretty-function 2008-08-01 02:37:52.000000000 -0400 -+++ evolution-2.23.6/mail/em-network-prefs.c 2008-08-04 14:53:29.000000000 -0400 -@@ -323,8 +323,7 @@ notify_proxy_type_changed (GtkWidget *wi - emnp_set_sensitiveness (prefs, NETWORK_PROXY_MANUAL, FALSE); - emnp_set_sensitiveness (prefs, NETWORK_PROXY_AUTOCONFIG, FALSE); - if (type == NETWORK_PROXY_SYS_SETTINGS) { -- d(g_print ("%s:%s:%d: Loading sys settings... \n", -- __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__)); -+ d(g_print ("%s:%s: Loading sys settings... \n", G_STRLOC, G_STRFUNC)); - emnp_load_sys_settings (prefs->gconf); - } - -@@ -357,11 +356,11 @@ widget_entry_changed_cb (GtkWidget *widg - if (GTK_IS_SPIN_BUTTON (widget)) { - port = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (widget)); - gconf_client_set_int (gconf, (const char *)data, port, NULL); -- d(g_print ("%s:%s:%d: %s is SpinButton: value = [%d]\n", __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, port)); -+ d(g_print ("%s:%s: %s is SpinButton: value = [%d]\n", G_STRLOC, G_STRFUNC, (const char *)data, port)); - } else if (GTK_IS_ENTRY (widget)) { - value = gtk_entry_get_text (GTK_ENTRY (widget)); - gconf_client_set_string (gconf, (const char *)data, value, NULL); -- d(g_print ("%s:%s:%d: %s is Entry: value = [%s]\n", __FILE__,G_GNUC_PRETTY_FUNCTION, __LINE__, (const char *)data, value)); -+ d(g_print ("%s:%s: %s is Entry: value = [%s]\n", G_STRLOC, G_STRFUNC, (const char *)data, value)); - } - - } -diff -up evolution-2.23.6/mail/em-subscribe-editor.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/em-subscribe-editor.c ---- evolution-2.23.6/mail/em-subscribe-editor.c.deprecated-gnuc-pretty-function 2008-07-18 02:19:05.000000000 -0400 -+++ evolution-2.23.6/mail/em-subscribe-editor.c 2008-08-04 14:53:29.000000000 -0400 -@@ -312,8 +312,8 @@ sub_fill_level(EMSubscribe *sub, CamelFo - e_dlist_addtail(&sub->pending, (EDListNode *)node); - } - } else { -- d(printf("%s:%d:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n", -- __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, fi->flags & CAMEL_FOLDER_NOINFERIORS, -+ d(printf("%s:%s: fi->flags & CAMEL_FOLDER_NOINFERIORS=%d\t node->path=[%p]\n", -+ G_STRLOC, G_STRFUNC, fi->flags & CAMEL_FOLDER_NOINFERIORS, - node->path)); - } - -@@ -408,7 +408,7 @@ sub_queue_fill_level(EMSubscribe *sub, E - struct _emse_folderinfo_msg *m; - int id; - -- d(printf("%s:%d:%s: Starting get folderinfo of '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, -+ d(printf("%s:%s: Starting get folderinfo of '%s'\n", G_STRLOC, G_STRFUNC, - node?node->info->full_name:"")); - - m = mail_msg_new (&sub_folderinfo_info); -@@ -501,7 +501,7 @@ sub_row_expanded(GtkTreeView *tree, GtkT - char *row_name; - - gtk_tree_model_get(model, iter, 1, &row_name, -1); -- d(printf("%s:%d:%s: row-expanded '%s'\n", __FILE__, __LINE__, __GNUC_PRETTY_FUNCTION__, -+ d(printf("%s:%s: row-expanded '%s'\n", G_STRLOC, G_STRFUNC, - row_name?row_name:"")); - - /* Do we really need to fetch the children for this row? */ -diff -up evolution-2.23.6/mail/mail-vfolder.c.deprecated-gnuc-pretty-function evolution-2.23.6/mail/mail-vfolder.c ---- evolution-2.23.6/mail/mail-vfolder.c.deprecated-gnuc-pretty-function 2008-07-18 02:19:05.000000000 -0400 -+++ evolution-2.23.6/mail/mail-vfolder.c 2008-08-04 14:53:29.000000000 -0400 -@@ -50,7 +50,7 @@ - #include "mail-tools.h" - #include "mail-vfolder.h" - --#define d(x) /* (printf("%s(%d):%s: ", __FILE__, __LINE__, __PRETTY_FUNCTION__), (x))*/ -+#define d(x) /* (printf("%s:%s: ", G_STRLOC, G_STRFUNC), (x))*/ - - static EMVFolderContext *context; /* context remains open all time */ - CamelStore *vfolder_store; /* the 1 static vfolder store */ diff --git a/evolution.spec b/evolution.spec index 992e2fb..33f4719 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.23.5 +%define eds_version 2.23.90.1 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.23.6 +Version: 2.23.90 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -80,9 +80,6 @@ Patch14: evolution-2.9.1-im-context-reset.patch # Don't ship broken plugins as stable Patch15: evolution-2.23.4-experimental-plugins.patch -# The usual regressions... -Patch16: evolution-2.23.6-deprecated-gnuc-pretty-function.patch - ## Dependencies ### Requires(post): GConf2 @@ -227,7 +224,6 @@ This package contains the plugin to filter junk mail using SpamAssassin. %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset %patch15 -p1 -b .experimental-plugins -%patch16 -p1 -b .deprecated-gnuc-pretty-function mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -407,12 +403,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/evolution.desktop # Icons: -%{_datadir}/icons/hicolor/16x16/apps/evolution.png -%{_datadir}/icons/hicolor/22x22/apps/evolution.png -%{_datadir}/icons/hicolor/24x24/apps/evolution.png -%{_datadir}/icons/hicolor/32x32/apps/evolution.png -%{_datadir}/icons/hicolor/48x48/apps/evolution.png -%{_datadir}/icons/hicolor/scalable/apps/evolution.svg +%{_datadir}/icons/hicolor/16x16/apps/ +%{_datadir}/icons/hicolor/22x22/apps/ +%{_datadir}/icons/hicolor/24x24/apps/ +%{_datadir}/icons/hicolor/32x32/apps/ +%{_datadir}/icons/hicolor/48x48/apps/ +%{_datadir}/icons/hicolor/scalable/apps/ # IDL files (should this be in devel subpackage?) %{_datadir}/idl/evolution-%{evo_major} @@ -656,6 +652,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Wed Aug 20 2008 Matthew Barnes - 2.23.90-1.fc10 +- Update to 2.23.90 +- Bump eds_version to 2.23.90.1 + * Mon Aug 04 2008 Matthew Barnes - 2.23.6-1.fc10 - Update to 2.23.6 diff --git a/sources b/sources index b815011..819e296 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -dffdac5928c01a16a80c638bd02ae871 evolution-2.23.6.tar.bz2 +822234b835811a8abdacb1f865a5cb55 evolution-2.23.90.tar.bz2 From 948557767d8c8237d2b7a3e5aaf4fdff2c2aedd3 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Aug 2008 02:49:36 +0000 Subject: [PATCH 235/844] - Bump gtkhtml_version to 3.23.5 (RH bug #460076). --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 33f4719..d1c2523 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.12.0 -%define gtkhtml_version 3.19.1 +%define gtkhtml_version 3.23.5 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 @@ -652,6 +652,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Aug 25 2008 Matthew Barnes - 2.23.90-2.fc10 +- Bump gtkhtml_version to 3.23.5 (RH bug #460076). + * Wed Aug 20 2008 Matthew Barnes - 2.23.90-1.fc10 - Update to 2.23.90 - Bump eds_version to 2.23.90.1 From 6ef2a24e0b342a6e461ff381156050606c67ba18 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Aug 2008 02:50:48 +0000 Subject: [PATCH 236/844] Bump release. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index d1c2523..af64e0d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.23.90 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME From 9d85e165b361c730e7499ea200735f4fa0577289 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Sep 2008 13:30:13 +0000 Subject: [PATCH 237/844] - Update to 2.23.91 - Bump eds_version to 2.23.91 --- .cvsignore | 2 +- evolution.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index cac5f87..a2d1bb5 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.90.tar.bz2 +evolution-2.23.91.tar.bz2 diff --git a/evolution.spec b/evolution.spec index af64e0d..d85347d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.23.90.1 +%define eds_version 2.23.91 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.23.90 -Release: 2%{?dist} +Version: 2.23.91 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -652,6 +652,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Sep 01 2008 Matthew Barnes - 2.23.91-1.fc10 +- Update to 2.23.91 +- Bump eds_version to 2.23.91 + * Mon Aug 25 2008 Matthew Barnes - 2.23.90-2.fc10 - Bump gtkhtml_version to 3.23.5 (RH bug #460076). diff --git a/sources b/sources index 819e296..7472214 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -822234b835811a8abdacb1f865a5cb55 evolution-2.23.90.tar.bz2 +016dcb4db0d44ee3ca7ff4238a94ead8 evolution-2.23.91.tar.bz2 From 31e90bfbfe607cf8ee095ba0ea07b07e5e4d286f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 8 Sep 2008 12:41:50 +0000 Subject: [PATCH 238/844] - Update to 2.23.92 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index a2d1bb5..1c0c46f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.91.tar.bz2 +evolution-2.23.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index d85347d..36e13f4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.23.91 +Version: 2.23.92 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -652,6 +652,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Sep 08 2008 Matthew Barnes - 2.23.92-1.fc10 +- Update to 2.23.92 + * Mon Sep 01 2008 Matthew Barnes - 2.23.91-1.fc10 - Update to 2.23.91 - Bump eds_version to 2.23.91 diff --git a/sources b/sources index 7472214..3808e9e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -016dcb4db0d44ee3ca7ff4238a94ead8 evolution-2.23.91.tar.bz2 +f8bb33328b2e2d9fb3d3ff474e8ed1f8 evolution-2.23.92.tar.bz2 From 2f5971c3c6321b33ce0917f77e0c1ab7093a111a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 22 Sep 2008 11:18:24 +0000 Subject: [PATCH 239/844] - Update to 2.24.0 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1c0c46f..f030c97 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.23.92.tar.bz2 +evolution-2.24.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 36e13f4..18825c5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.23.92 +Version: 2.24.0 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -652,6 +652,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %changelog +* Mon Sep 22 2008 Matthew Barnes - 2.24.0-1.fc10 +- Update to 2.24.0 + * Mon Sep 08 2008 Matthew Barnes - 2.23.92-1.fc10 - Update to 2.23.92 diff --git a/sources b/sources index 3808e9e..473f095 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f8bb33328b2e2d9fb3d3ff474e8ed1f8 evolution-2.23.92.tar.bz2 +50784255d9da0987032c806fc0226b10 evolution-2.24.0.tar.bz2 From 2120e9989f34d3d497149c5f3c272f7eca0ecf64 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 25 Sep 2008 15:56:25 +0000 Subject: [PATCH 240/844] - Strip unneeded translations from .mo files (RH bug #463887). - Split Perl-based utilities into a "perl" subpackage (RH bug #462345). --- evolution.spec | 48 +++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 39 insertions(+), 9 deletions(-) diff --git a/evolution.spec b/evolution.spec index 18825c5..8018955 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.24.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -216,6 +216,14 @@ Requires: spamassassin %description spamassassin This package contains the plugin to filter junk mail using SpamAssassin. +%package perl +Group: Applications/Productivity +Summary: Supplemental utilities that require Perl +Requires: %{name} = %{version}-%{release} + +%description perl +This package contains supplemental utilities for %{name} that require Perl. + %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack @@ -308,15 +316,28 @@ CFLAGS="$CFLAGS \ %endif %configure \ - --enable-gtk-doc \ - --enable-ipv6 \ - --with-sub-version=" (%{version}-%{release})" \ - --with-kde-applnk-path=no \ - %ldap_flags %pilot_flags %krb5_flags %nntp_flags %ssl_flags %exchange_flags \ - --enable-plugins=all + --enable-gtk-doc \ + --enable-ipv6 \ + --with-sub-version=" (%{version}-%{release})" \ + --with-kde-applnk-path=no \ + %ldap_flags %pilot_flags %krb5_flags \ + %nntp_flags %ssl_flags %exchange_flags \ + --enable-plugins=all export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing" +# Strip unneeded translations from .mo files. +# This reduces the RPM size by several megabytes. +cd po +grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep +mv POTFILES.keep POTFILES.in +intltool-update --pot +for p in *.po; do + msgmerge $p evolution-%{evo_major}.pot > $p.out + msgfmt -o `basename $p .po`.gmo $p.out +done +cd - + %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 @@ -458,8 +479,6 @@ rm -rf $RPM_BUILD_ROOT # Various libexec programs: %dir %{_libexecdir}/evolution %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}/evolution-backup @@ -651,7 +670,18 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so +%files perl +%defattr(-, root, root) +%dir %{_libexecdir}/evolution +%dir %{_libexecdir}/evolution/%{evo_major} +%{_libexecdir}/evolution/%{evo_major}/csv2vcard +%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean + %changelog +* Thu Sep 25 2008 Matthew Barnes - 2.24.0-2.fc10 +- Strip unneeded translations from .mo files (RH bug #463887). +- Split Perl-based utilities into a "perl" subpackage (RH bug #462345). + * Mon Sep 22 2008 Matthew Barnes - 2.24.0-1.fc10 - Update to 2.24.0 From 3d63548be0fb670890fc90ac0987434df4c50f74 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 9 Oct 2008 02:57:43 +0000 Subject: [PATCH 241/844] save space --- evolution.spec | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 8018955..8cac490 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.24.0 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -338,6 +338,24 @@ for p in *.po; do done cd - +# Replace identical images in the help by links. +# This reduces the RPM size by several megabytes. +helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name} +for f in $helpdir/C/figures/*.png; do + b="$(basename $f)" + for d in $helpdir/*; do + if [ -d "$d" -a "$d" != "$helpdir/C" ]; then + g="$d/figures/$b" + if [ -f "$g" ]; then + if cmp -s $f $g; then + rm "$g"; ln -s "../../C/figures/$b" "$g" + fi + fi + fi + done +done + + %install rm -rf $RPM_BUILD_ROOT export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 @@ -678,6 +696,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Wed Oct 8 2008 Matthias Clasen - 2.24.0-3 +- Save space in the -help package by not shipping multiple copies + of each screenshot + * Thu Sep 25 2008 Matthew Barnes - 2.24.0-2.fc10 - Strip unneeded translations from .mo files (RH bug #463887). - Split Perl-based utilities into a "perl" subpackage (RH bug #462345). From e418201844b5aea239d1e38d02ef244eaf3fd459 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 21 Oct 2008 19:51:19 +0000 Subject: [PATCH 242/844] - Update to 2.24.1 --- .cvsignore | 2 +- evolution-1.4.4-ldap-x86_64-hack.patch | 10 ++--- evolution-2.7.1-no-gnome-common.patch | 51 +++++++++++++------------- evolution.spec | 7 +++- sources | 2 +- 5 files changed, 38 insertions(+), 34 deletions(-) diff --git a/.cvsignore b/.cvsignore index f030c97..c1c64de 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.24.0.tar.bz2 +evolution-2.24.1.tar.bz2 diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch index 44cf1c7..f37328b 100644 --- a/evolution-1.4.4-ldap-x86_64-hack.patch +++ b/evolution-1.4.4-ldap-x86_64-hack.patch @@ -1,8 +1,8 @@ -diff -up evolution-2.23.4/configure.ldaphack evolution-2.23.4/configure ---- evolution-2.23.4/configure.ldaphack 2008-06-16 07:12:17.000000000 -0400 -+++ evolution-2.23.4/configure 2008-07-18 09:08:21.000000000 -0400 -@@ -27729,7 +27729,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} - echo $ECHO_N "(cached) $ECHO_C" >&6 +diff -up evolution-2.24.1/configure.ldaphack evolution-2.24.1/configure +--- evolution-2.24.1/configure.ldaphack 2008-10-19 23:37:55.000000000 -0400 ++++ evolution-2.24.1/configure 2008-10-21 13:16:16.000000000 -0400 +@@ -28471,7 +28471,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" diff --git a/evolution-2.7.1-no-gnome-common.patch b/evolution-2.7.1-no-gnome-common.patch index a234736..a18ed48 100644 --- a/evolution-2.7.1-no-gnome-common.patch +++ b/evolution-2.7.1-no-gnome-common.patch @@ -1,7 +1,7 @@ -diff -up evolution-2.12.1/configure.in.no-gnome-common evolution-2.12.1/configure.in ---- evolution-2.12.1/configure.in.no-gnome-common 2007-10-15 08:30:42.000000000 +0200 -+++ evolution-2.12.1/configure.in 2007-10-15 17:54:01.000000000 +0200 -@@ -1282,9 +1282,6 @@ AC_SUBST_FILE(EVO_MARSHAL_RULE) +diff -up evolution-2.24.1/configure.in.no-gnome-common evolution-2.24.1/configure.in +--- evolution-2.24.1/configure.in.no-gnome-common 2008-10-19 23:27:24.000000000 -0400 ++++ evolution-2.24.1/configure.in 2008-10-21 13:16:54.000000000 -0400 +@@ -1332,9 +1332,6 @@ AC_SUBST_FILE(EVO_MARSHAL_RULE) dnl ************************* dnl CFLAGS and LIBS and stuff dnl ************************* @@ -11,10 +11,10 @@ diff -up evolution-2.12.1/configure.in.no-gnome-common evolution-2.12.1/configur case $CFLAGS in *-Wall*) # Turn off the annoying "comparison between signed and unsigned" -diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure ---- evolution-2.12.1/configure.no-gnome-common 2007-10-15 17:54:01.000000000 +0200 -+++ evolution-2.12.1/configure 2007-10-15 18:47:03.000000000 +0200 -@@ -31564,137 +31564,6 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk +diff -up evolution-2.24.1/configure.no-gnome-common evolution-2.24.1/configure +--- evolution-2.24.1/configure.no-gnome-common 2008-10-21 13:16:54.000000000 -0400 ++++ evolution-2.24.1/configure 2008-10-21 13:17:55.000000000 -0400 +@@ -33230,138 +33230,6 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk @@ -50,8 +50,8 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - for option in -Wno-sign-compare; do - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS $option" -- { echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 --echo $ECHO_N "checking whether gcc understands $option... $ECHO_C" >&6; } +- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 +-$as_echo_n "checking whether gcc understands $option... " >&6; } - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF @@ -73,20 +73,21 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac --eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 - (eval "$ac_compile") 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 -- echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest.$ac_objext; then - has_option=yes -else -- echo "$as_me: failed program was:" >&5 +- $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - has_option=no @@ -94,8 +95,8 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - CFLAGS="$SAVE_CFLAGS" -- { echo "$as_me:$LINENO: result: $has_option" >&5 --echo "${ECHO_T}$has_option" >&6; } +- { $as_echo "$as_me:$LINENO: result: $has_option" >&5 +-$as_echo "$has_option" >&6; } - if test $has_option = yes; then - warning_flags="$warning_flags $option" - fi @@ -108,16 +109,16 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - fi - ;; - *) -- { { echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 --echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} +- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 +-$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} - { (exit 1); exit 1; }; } - ;; - esac - CFLAGS="$realsave_CFLAGS" -- { echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what warning flags to pass to the C compiler... $ECHO_C" >&6; } -- { echo "$as_me:$LINENO: result: $warning_flags" >&5 --echo "${ECHO_T}$warning_flags" >&6; } +- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 +-$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } +- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 +-$as_echo "$warning_flags" >&6; } - - # Check whether --enable-iso-c was given. -if test "${enable_iso_c+set}" = set; then @@ -127,8 +128,8 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure -fi - - -- { echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 --echo $ECHO_N "checking what language compliance flags to pass to the C compiler... $ECHO_C" >&6; } +- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 +-$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } - complCFLAGS= - if test "x$enable_iso_c" != "xno"; then - if test "x$GCC" = "xyes"; then @@ -142,8 +143,8 @@ diff -up evolution-2.12.1/configure.no-gnome-common evolution-2.12.1/configure - esac - fi - fi -- { echo "$as_me:$LINENO: result: $complCFLAGS" >&5 --echo "${ECHO_T}$complCFLAGS" >&6; } +- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 +-$as_echo "$complCFLAGS" >&6; } - - WARN_CFLAGS="$warning_flags $complCFLAGS" - diff --git a/evolution.spec b/evolution.spec index 8cac490..6bb2f4c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.24.0 -Release: 3%{?dist} +Version: 2.24.1 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Oct 21 2008 Matthew Barnes - 2.24.1-1.fc10 +- Update to 2.24.1 + * Wed Oct 8 2008 Matthias Clasen - 2.24.0-3 - Save space in the -help package by not shipping multiple copies of each screenshot diff --git a/sources b/sources index 473f095..6892bd0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50784255d9da0987032c806fc0226b10 evolution-2.24.0.tar.bz2 +d770bfddf8a79b841c515f756cb5af4b evolution-2.24.1.tar.bz2 From 4e31b35251758233eb80ff93f9dbab657c49c4ab Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 21 Oct 2008 20:36:36 +0000 Subject: [PATCH 243/844] - Bump eds_version to 2.24.1 (unfortunately). --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6bb2f4c..fd87bc0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.23.91 +%define eds_version 2.24.1 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -45,7 +45,7 @@ Name: evolution Version: 2.24.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Oct 21 2008 Matthew Barnes - 2.24.1-2.fc10 +- Bump eds_version to 2.24.1 (unfortunately). + * Tue Oct 21 2008 Matthew Barnes - 2.24.1-1.fc10 - Update to 2.24.1 From 310ca1a1e40a52f97711e96b9825be4471117e35 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 3 Nov 2008 21:37:11 +0000 Subject: [PATCH 244/844] - Update to 2.25.1 - Bump evo_major to 2.26. - Bump eds_version to 2.25.1. --- .cvsignore | 2 +- evolution-2.23.4-experimental-plugins.patch | 38 --------------------- evolution.spec | 25 ++++++++------ sources | 2 +- 4 files changed, 16 insertions(+), 51 deletions(-) delete mode 100644 evolution-2.23.4-experimental-plugins.patch diff --git a/.cvsignore b/.cvsignore index c1c64de..2f97296 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.24.1.tar.bz2 +evolution-2.25.1.tar.bz2 diff --git a/evolution-2.23.4-experimental-plugins.patch b/evolution-2.23.4-experimental-plugins.patch deleted file mode 100644 index ed6689a..0000000 --- a/evolution-2.23.4-experimental-plugins.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -up evolution-2.23.4/configure.experimental-plugins evolution-2.23.4/configure ---- evolution-2.23.4/configure.experimental-plugins 2008-06-19 08:34:44.000000000 -0400 -+++ evolution-2.23.4/configure 2008-06-19 08:35:07.000000000 -0400 -@@ -38556,13 +38556,13 @@ plugins_base_always="calendar-file calen - plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " - all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" - --plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" -+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates" - - plugins_standard="$plugins_standard_always" - all_plugins_standard="$plugins_standard" - - plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup" --plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN" -+plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header" - all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" - - case x"$enable_plugins" in -diff -up evolution-2.23.4/configure.in.experimental-plugins evolution-2.23.4/configure.in ---- evolution-2.23.4/configure.in.experimental-plugins 2008-06-19 08:34:01.000000000 -0400 -+++ evolution-2.23.4/configure.in 2008-06-19 08:34:35.000000000 -0400 -@@ -1732,13 +1732,13 @@ plugins_base_always="calendar-file calen - plugins_base="$plugins_base_always $SA_JUNK_PLUGIN $BF_JUNK_PLUGIN $EXCHANGE_PLUGIN $MONO_PLUGIN " - all_plugins_base="$plugins_base_always sa-junk-plugin bogo-junk-plugin exchange-operations mono" - --plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore email-custom-header templates" -+plugins_standard_always="bbdb subject-thread save-calendar select-one-source copy-tool mail-to-task mark-calendar-offline audio-inline mailing-list-actions default-mailer import-ics-attachments prefer-plain mail-notification attachment-reminder face backup-restore templates" - - plugins_standard="$plugins_standard_always" - all_plugins_standard="$plugins_standard" - - plugins_experimental_always="folder-unsubscribe mail-to-meeting save-attachments external-editor hula-account-setup" --plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN" -+plugins_experimental="$plugins_experimental_always $IPOD_SYNC $TNEF_ATTACHMENTS $PYTHON_PLUGIN email-custom-header" - all_plugins_experimental="$plugins_experimental_always ipod-sync tnef-attachments" - - case x"$enable_plugins" in diff --git a/evolution.spec b/evolution.spec index fd87bc0..9f43d45 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.24.1 +%define eds_version 2.25.1 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -16,7 +16,7 @@ %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.24 +%define evo_major 2.26 %define exchange_support 1 %define inline_audio_support 1 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.24.1 -Release: 2%{?dist} +Version: 2.25.1 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -77,9 +77,6 @@ Patch13: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch14: evolution-2.9.1-im-context-reset.patch -# Don't ship broken plugins as stable -Patch15: evolution-2.23.4-experimental-plugins.patch - ## Dependencies ### Requires(post): GConf2 @@ -231,7 +228,6 @@ This package contains supplemental utilities for %{name} that require Perl. %patch12 -p1 -b .fix-conduit-dir %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset -%patch15 -p1 -b .experimental-plugins mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -406,6 +402,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- 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/apps-evolution-template-placeholders.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null %post bogofilter @@ -433,6 +430,7 @@ rm -rf $RPM_BUILD_ROOT %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas +%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas %{_sysconfdir}/gconf/schemas/evolution-mail.schemas # The main executable @@ -550,6 +548,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-default-source.eplug %{evo_plugin_dir}/liborg-gnome-default-source.so +%{evo_plugin_dir}/org-gnome-email-custom-header.eplug +%{evo_plugin_dir}/liborg-gnome-email-custom-header.so + %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so @@ -600,9 +601,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-mark-all-read.eplug %{evo_plugin_dir}/liborg-gnome-mark-all-read.so -%{evo_plugin_dir}/org-gnome-mark-calendar-offline.eplug -%{evo_plugin_dir}/liborg-gnome-mark-calendar-offline.so - %{evo_plugin_dir}/org-gnome-plugin-manager.eplug %{evo_plugin_dir}/liborg-gnome-plugin-manager.so %{evo_plugin_dir}/org-gnome-plugin-manager.xml @@ -696,6 +694,11 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Nov 03 2008 Matthew Barnes - 2.25.1-1.fc11 +- Update to 2.25.1 +- Bump evo_major to 2.26. +- Bump eds_version to 2.25.1. + * Tue Oct 21 2008 Matthew Barnes - 2.24.1-2.fc10 - Bump eds_version to 2.24.1 (unfortunately). diff --git a/sources b/sources index 6892bd0..24338d6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d770bfddf8a79b841c515f756cb5af4b evolution-2.24.1.tar.bz2 +c9623df3e930e5d775527bb8851183bc evolution-2.25.1.tar.bz2 From 3e574e048703795d962071fe22fd601983d3ebd2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 20 Nov 2008 15:11:32 +0000 Subject: [PATCH 245/844] - Fix a typo (RH bug #472358). --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9f43d45..882a505 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.25.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -185,7 +185,7 @@ This package contains user documentation for %{name}. %if %{build_conduits} %package conduits -Group: Applictions/Communications +Group: Applications/Communications Summary: gnome-pilot conduits for %{name} Requires: %{name} = %{version}-%{release} Requires: gnome-pilot >= %{gnome_pilot_version} @@ -694,6 +694,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Thu Nov 20 2008 Matthew Barnes - 2.25.1-2.fc11 +- Fix a typo (RH bug #472358). + * Mon Nov 03 2008 Matthew Barnes - 2.25.1-1.fc11 - Update to 2.25.1 - Bump evo_major to 2.26. From dc70b71edbd714a4c6ede1d0b33d253f892d5785 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 1 Dec 2008 22:49:20 +0000 Subject: [PATCH 246/844] - Update to 2.25.2 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 2f97296..4f0233e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.25.1.tar.bz2 +evolution-2.25.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 882a505..f42c9cb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.25.1 -Release: 2%{?dist} +Version: 2.25.2 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -694,6 +694,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Dec 01 2008 Matthew Barnes - 2.25.2-1.fc11 +- Update to 2.25.2 + * Thu Nov 20 2008 Matthew Barnes - 2.25.1-2.fc11 - Fix a typo (RH bug #472358). diff --git a/sources b/sources index 24338d6..b83a9e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c9623df3e930e5d775527bb8851183bc evolution-2.25.1.tar.bz2 +4f86cfd53102d673edc52643eb86c94c evolution-2.25.2.tar.bz2 From e877bca4f995b74cd0e48e57cddf9b36956e0185 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 2 Dec 2008 03:08:10 +0000 Subject: [PATCH 247/844] - Update to 2.25.2 - Bump eds_version to 2.25.2. --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index f42c9cb..24f45fd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.25.1 +%define eds_version 2.25.2 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -167,7 +167,9 @@ Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} Requires: evolution-data-server-devel >= %{eds_version} +Requires: gtk2-devel >= %{gtk2_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} +Requires: libbonobo-devel >= %{libbonobo_version} Requires: libsoup-devel >= %{soup_version} Requires: libxml2-devel Obsoletes: libgal2-devel <= %{last_libgal2_version} @@ -696,6 +698,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Dec 01 2008 Matthew Barnes - 2.25.2-1.fc11 - Update to 2.25.2 +- Bump eds_version to 2.25.2. * Thu Nov 20 2008 Matthew Barnes - 2.25.1-2.fc11 - Fix a typo (RH bug #472358). From 42aa128ab808257d682dc90dc86b39f3978d9138 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 9 Dec 2008 17:30:20 +0000 Subject: [PATCH 248/844] - Add patch for GNOME bug #552583 (fix account URI comparisons). --- evolution-2.25.2-broken-account-uris.patch | 155 +++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 163 insertions(+), 1 deletion(-) create mode 100644 evolution-2.25.2-broken-account-uris.patch diff --git a/evolution-2.25.2-broken-account-uris.patch b/evolution-2.25.2-broken-account-uris.patch new file mode 100644 index 0000000..db331b4 --- /dev/null +++ b/evolution-2.25.2-broken-account-uris.patch @@ -0,0 +1,155 @@ +diff -up evolution-2.25.2/mail/mail-config.c.broken-account-uris evolution-2.25.2/mail/mail-config.c +--- evolution-2.25.2/mail/mail-config.c.broken-account-uris 2008-11-27 04:41:49.000000000 -0500 ++++ evolution-2.25.2/mail/mail-config.c 2008-12-09 11:28:35.000000000 -0500 +@@ -800,53 +800,64 @@ mail_config_get_account_by_uid (const ch + return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid); + } + ++static gboolean ++mail_config_account_url_equal (const CamelURL *u1, ++ const CamelURL *u2) ++{ ++ /* For the purpose of matching a URL to an EAccount, only compare ++ * the protocol, user, host and port and disregard the rest. */ ++ ++ if (g_strcmp0 (u1->protocol, u2->protocol) != 0) ++ return FALSE; ++ ++ if (g_strcmp0 (u1->user, u2->user) != 0) ++ return FALSE; ++ ++ if (g_strcmp0 (u1->host, u2->host) != 0) ++ return FALSE; ++ ++ return (u1->port == u2->port); ++} ++ + EAccount * + mail_config_get_account_by_source_url (const char *source_url) + { + EAccount *account = NULL; + EIterator *iter; ++ CamelURL *url; + + g_return_val_if_fail (source_url != NULL, NULL); + ++ url = camel_url_new (source_url, NULL); ++ g_return_val_if_fail (url != NULL, NULL); ++ + iter = e_list_get_iterator ((EList *) config->accounts); +- while (e_iterator_is_valid (iter)) { +- CamelURL *url; +- gchar *string; ++ while (account == NULL && e_iterator_is_valid (iter)) { ++ CamelURL *account_url; + + account = (EAccount *) e_iterator_get (iter); + + e_iterator_next (iter); + +- if (account->source == NULL) +- continue; +- +- else if (account->source->url == NULL) +- continue; +- +- else if (*account->source->url == '\0') ++ if ( !account || (account->source == NULL) || ++ (account->source->url == NULL) || (*account->source->url == '\0')) { ++ account = NULL; + continue; ++ } + +- url = camel_url_new (account->source->url, NULL); +- if (url == NULL) ++ account_url = camel_url_new (account->source->url, NULL); ++ if (account_url == NULL) + continue; + +- /* Simplify the account URL for comparison. */ +- string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); +- if (string == NULL || strcmp (string, source_url) != 0) ++ if (!mail_config_account_url_equal (url, account_url)) + account = NULL; /* not a match */ + +- camel_url_free (url); +- g_free (string); +- +- if (account != NULL) { +- g_object_unref (iter); +- return account; +- } ++ camel_url_free (account_url); + } + + g_object_unref (iter); + +- return NULL; ++ return account; + } + + EAccount * +@@ -854,48 +865,40 @@ mail_config_get_account_by_transport_url + { + EAccount *account = NULL; + EIterator *iter; ++ CamelURL *url; + + g_return_val_if_fail (transport_url != NULL, NULL); + ++ url = camel_url_new (transport_url, NULL); ++ g_return_val_if_fail (url != NULL, NULL); ++ + iter = e_list_get_iterator ((EList *) config->accounts); +- while (e_iterator_is_valid (iter)) { +- CamelURL *url; +- gchar *string; ++ while (account == NULL && e_iterator_is_valid (iter)) { ++ CamelURL *account_url; + + account = (EAccount *) e_iterator_get (iter); + + e_iterator_next (iter); + +- if (account->transport == NULL) +- continue; +- +- else if (account->transport->url == NULL) +- continue; +- +- else if (*account->transport->url == '\0') +- continue; ++ if ( !account || (account->transport == NULL) || ++ (account->transport->url == NULL) || (*account->transport->url == '\0')) { ++ account = NULL; ++ continue; ++ } + +- url = camel_url_new (account->transport->url, NULL); +- if (url == NULL) ++ account_url = camel_url_new (account->transport->url, NULL); ++ if (account_url == NULL) + continue; + +- /* Simplify the account URL for comparison. */ +- string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); +- if (string == NULL || strcmp (string, transport_url) != 0) ++ if (!mail_config_account_url_equal (url, account_url)) + account = NULL; /* not a match */ + + camel_url_free (url); +- g_free (string); +- +- if (account != NULL) { +- g_object_unref (iter); +- return account; +- } + } + + g_object_unref (iter); + +- return NULL; ++ return account; + } + + int diff --git a/evolution.spec b/evolution.spec index 24f45fd..2ae059c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.25.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -77,6 +77,9 @@ Patch13: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch14: evolution-2.9.1-im-context-reset.patch +# GNOME bug #552583 +Patch15: evolution-2.25.2-broken-account-uris.patch + ## Dependencies ### Requires(post): GConf2 @@ -230,6 +233,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch12 -p1 -b .fix-conduit-dir %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset +%patch15 -p1 -b .broken-account-uris mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -696,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Dec 09 2008 Matthew Barnes - 2.25.2-2.fc11 +- Add patch for GNOME bug #552583 (fix account URI comparisons). + * Mon Dec 01 2008 Matthew Barnes - 2.25.2-1.fc11 - Update to 2.25.2 - Bump eds_version to 2.25.2. From fada31809588ccb12c5d76cef528db1ac9bce3e2 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Dec 2008 17:50:24 +0000 Subject: [PATCH 249/844] - Update to 2.25.3.1 - New BR: libgweather-devel - Remove patch for GNOME bug #552583 (fixed upstream). - Bump the gtkhtml and gtk2 minimum versions. --- .cvsignore | 2 +- evolution-2.25.3.1-libgweather.patch | 73 ++++++++++++++++++++++++++++ evolution.spec | 24 ++++++--- sources | 2 +- 4 files changed, 92 insertions(+), 9 deletions(-) create mode 100644 evolution-2.25.3.1-libgweather.patch diff --git a/.cvsignore b/.cvsignore index 4f0233e..84de757 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.25.2.tar.bz2 +evolution-2.25.3.1.tar.bz2 diff --git a/evolution-2.25.3.1-libgweather.patch b/evolution-2.25.3.1-libgweather.patch new file mode 100644 index 0000000..8392c5d --- /dev/null +++ b/evolution-2.25.3.1-libgweather.patch @@ -0,0 +1,73 @@ +diff -up evolution-2.25.3.1/configure.in.libgweather evolution-2.25.3.1/configure.in +--- evolution-2.25.3.1/configure.in.libgweather 2008-12-15 11:50:21.000000000 -0500 ++++ evolution-2.25.3.1/configure.in 2008-12-15 11:50:57.000000000 -0500 +@@ -43,7 +43,7 @@ m4_define([dbus_minimum_version], [1.0.0 + m4_define([hal_minimum_version], [0.5.4]) + m4_define([libnotify_minimum_version], [0.3.0]) + m4_define([gnome_pilot_minimum_version], [2.0.15]) +-m4_define([gweather_minimum_version], [2.25.3]) ++m4_define([gweather_minimum_version], [2.25.2]) + + # GNOME Documentation + GNOME_DOC_INIT +diff -up evolution-2.25.3.1/configure.libgweather evolution-2.25.3.1/configure +--- evolution-2.25.3.1/configure.libgweather 2008-12-15 11:50:26.000000000 -0500 ++++ evolution-2.25.3.1/configure 2008-12-15 11:52:43.000000000 -0500 +@@ -32935,11 +32935,11 @@ if test -n "$LIBGWEATHER_CFLAGS"; then + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.3") 2>&5 ++ ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.2") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= 2.25.3" 2>/dev/null` ++ pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= 2.25.2" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -32950,12 +32950,12 @@ if test -n "$LIBGWEATHER_LIBS"; then + pkg_cv_LIBGWEATHER_LIBS="$LIBGWEATHER_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\"") >&5 +- ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.3") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.2\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.2") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= 2.25.3" 2>/dev/null` ++ pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= 2.25.2" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -32973,21 +32973,21 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gweather >= 2.25.3" 2>&1` ++ LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gweather >= 2.25.2" 2>&1` + else +- LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gweather >= 2.25.3" 2>&1` ++ LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gweather >= 2.25.2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LIBGWEATHER_PKG_ERRORS" >&5 + + { $as_echo "$as_me:$LINENO: result: no" >&5 + $as_echo "no" >&6; } +- { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5 +-$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5 ++$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;} + { (exit 1); exit 1; }; } + elif test $pkg_failed = untried; then +- { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5 +-$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5 ++$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;} + { (exit 1); exit 1; }; } + else + LIBGWEATHER_CFLAGS=$pkg_cv_LIBGWEATHER_CFLAGS diff --git a/evolution.spec b/evolution.spec index 2ae059c..0f8e584 100644 --- a/evolution.spec +++ b/evolution.spec @@ -5,12 +5,13 @@ %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 -%define gtk2_version 2.12.0 -%define gtkhtml_version 3.23.5 +%define gtk2_version 2.14.0 +%define gtkhtml_version 3.25.3 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 %define libbonoboui_version 2.4.2 +%define libgweather_version 2.25.2 %define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 %define scrollkeeper_version 0.1.4 @@ -44,8 +45,8 @@ ### Abstract ### Name: evolution -Version: 2.25.2 -Release: 2%{?dist} +Version: 2.25.3.1 +Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -77,8 +78,9 @@ Patch13: evolution-2.7.1-no-gnome-common.patch # RH bug #176400 Patch14: evolution-2.9.1-im-context-reset.patch -# GNOME bug #552583 -Patch15: evolution-2.25.2-broken-account-uris.patch +# Back off the bleeding edge libgweather requirement. +# We can get by with libgweather-2.25.2 for now. +Patch15: evolution-2.25.3.1-libgweather.patch ## Dependencies ### @@ -119,6 +121,7 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 +BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel @@ -173,6 +176,7 @@ Requires: evolution-data-server-devel >= %{eds_version} Requires: gtk2-devel >= %{gtk2_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libbonobo-devel >= %{libbonobo_version} +Requires: libgweather-devel >= %{libgweather_version} Requires: libsoup-devel >= %{soup_version} Requires: libxml2-devel Obsoletes: libgal2-devel <= %{last_libgal2_version} @@ -233,7 +237,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch12 -p1 -b .fix-conduit-dir %patch13 -p1 -b .no-gnome-common %patch14 -p1 -b .im-context-reset -%patch15 -p1 -b .broken-account-uris +%patch15 -p1 -b .libgweather mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -700,6 +704,12 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Dec 15 2008 Matthew Barnes - 2.25.3.1-1.fc11 +- Update to 2.25.3.1 +- New BR: libgweather-devel +- Remove patch for GNOME bug #552583 (fixed upstream). +- Bump the gtkhtml and gtk2 minimum versions. + * Tue Dec 09 2008 Matthew Barnes - 2.25.2-2.fc11 - Add patch for GNOME bug #552583 (fix account URI comparisons). diff --git a/sources b/sources index b83a9e2..82befcb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f86cfd53102d673edc52643eb86c94c evolution-2.25.2.tar.bz2 +2d74ba6cf6dfca0cbe208c82f5726de9 evolution-2.25.3.1.tar.bz2 From 160fbaf3bf9646c28856e753140d875056b4fc9f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 6 Jan 2009 13:53:57 +0000 Subject: [PATCH 250/844] - Update to 2.25.4 - Bump eds_version to 2.25.4. - Bump libgweather_version to 2.25.4. --- .cvsignore | 2 +- evolution.spec | 11 ++++++++--- sources | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index 84de757..fa699c7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.25.3.1.tar.bz2 +evolution-2.25.4.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 0f8e584..8f880b4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.25.2 +%define eds_version 2.25.4 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -11,7 +11,7 @@ %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 %define libbonoboui_version 2.4.2 -%define libgweather_version 2.25.2 +%define libgweather_version 2.25.4 %define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 %define scrollkeeper_version 0.1.4 @@ -45,7 +45,7 @@ ### Abstract ### Name: evolution -Version: 2.25.3.1 +Version: 2.25.4 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -704,6 +704,11 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Jan 05 2009 Matthew Barnes - 2.25.4-1.fc11 +- Update to 2.25.4 +- Bump eds_version to 2.25.4. +- Bump libgweather_version to 2.25.4. + * Mon Dec 15 2008 Matthew Barnes - 2.25.3.1-1.fc11 - Update to 2.25.3.1 - New BR: libgweather-devel diff --git a/sources b/sources index 82befcb..64069fb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2d74ba6cf6dfca0cbe208c82f5726de9 evolution-2.25.3.1.tar.bz2 +8f9d4fb91c10c9d5ba8cc032c1129ee6 evolution-2.25.4.tar.bz2 From b42dea715610ca1f84002bc09f8077fdc5399153 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 20 Jan 2009 01:37:07 +0000 Subject: [PATCH 251/844] - Update to 2.25.5 - Ditch eds_version and use our own version. This will keep evolution and evolution-data-server versions in lockstep from now on. --- .cvsignore | 2 +- evolution.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index fa699c7..b660a84 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.25.4.tar.bz2 +evolution-2.25.5.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 8f880b4..b20bbe2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,5 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define eds_version 2.25.4 %define glib2_version 2.16.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -45,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.25.4 +Version: 2.25.5 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -89,7 +88,7 @@ Requires(post): scrollkeeper >= %{scrollkeeper_version} Requires(postun): scrollkeeper >= %{scrollkeeper_version} # Don't trust evolution-data-server to maintain accurate sonames. -Requires: evolution-data-server >= %{eds_version} +Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-themes @@ -106,7 +105,7 @@ BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{eds_version} +BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} @@ -172,7 +171,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= %{eds_version} +Requires: evolution-data-server-devel >= %{version} Requires: gtk2-devel >= %{gtk2_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libbonobo-devel >= %{libbonobo_version} @@ -704,6 +703,11 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Jan 19 2009 Matthew Barnes - 2.25.5-1.fc11 +- Update to 2.25.5 +- Ditch eds_version and use our own version. This will keep evolution + and evolution-data-server versions in lockstep from now on. + * Mon Jan 05 2009 Matthew Barnes - 2.25.4-1.fc11 - Update to 2.25.4 - Bump eds_version to 2.25.4. diff --git a/sources b/sources index 64069fb..deaedfc 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8f9d4fb91c10c9d5ba8cc032c1129ee6 evolution-2.25.4.tar.bz2 +99172fb2a973a35cb5d60b39a2a3683f evolution-2.25.5.tar.bz2 From 82a15cec2efe7148c7c4444afe9572962ca3c2d9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 Feb 2009 18:36:06 +0000 Subject: [PATCH 252/844] - Update to 2.25.90 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b660a84..f0542e1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.25.5.tar.bz2 +evolution-2.25.90.tar.bz2 diff --git a/evolution.spec b/evolution.spec index b20bbe2..fefac76 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.25.5 +Version: 2.25.90 Release: 1%{?dist} License: GPLv2 and GFDL Group: Applications/Productivity @@ -703,6 +703,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Feb 02 2009 Matthew Barnes - 2.25.90-1.fc11 +- Update to 2.25.90 + * Mon Jan 19 2009 Matthew Barnes - 2.25.5-1.fc11 - Update to 2.25.5 - Ditch eds_version and use our own version. This will keep evolution diff --git a/sources b/sources index deaedfc..a55fd3b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -99172fb2a973a35cb5d60b39a2a3683f evolution-2.25.5.tar.bz2 +fe0c7894da97f2cece0159de93370650 evolution-2.25.90.tar.bz2 From 6fe408a9b7f1b259de58f14b18a0c79be774575e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 6 Feb 2009 05:59:41 +0000 Subject: [PATCH 253/844] - Update BuildRoot, License, Source and URL tags. - Require gnome-common so we don't have to patch it out. --- evolution-2.25.2-broken-account-uris.patch | 155 ------- evolution-2.25.3.1-libgweather.patch | 73 --- evolution-2.5.4-fix-conduits.patch | 515 --------------------- evolution-2.7.1-no-gnome-common.patch | 155 ------- evolution.spec | 41 +- 5 files changed, 15 insertions(+), 924 deletions(-) delete mode 100644 evolution-2.25.2-broken-account-uris.patch delete mode 100644 evolution-2.25.3.1-libgweather.patch delete mode 100644 evolution-2.5.4-fix-conduits.patch delete mode 100644 evolution-2.7.1-no-gnome-common.patch diff --git a/evolution-2.25.2-broken-account-uris.patch b/evolution-2.25.2-broken-account-uris.patch deleted file mode 100644 index db331b4..0000000 --- a/evolution-2.25.2-broken-account-uris.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff -up evolution-2.25.2/mail/mail-config.c.broken-account-uris evolution-2.25.2/mail/mail-config.c ---- evolution-2.25.2/mail/mail-config.c.broken-account-uris 2008-11-27 04:41:49.000000000 -0500 -+++ evolution-2.25.2/mail/mail-config.c 2008-12-09 11:28:35.000000000 -0500 -@@ -800,53 +800,64 @@ mail_config_get_account_by_uid (const ch - return (EAccount *) e_account_list_find (config->accounts, E_ACCOUNT_FIND_UID, uid); - } - -+static gboolean -+mail_config_account_url_equal (const CamelURL *u1, -+ const CamelURL *u2) -+{ -+ /* For the purpose of matching a URL to an EAccount, only compare -+ * the protocol, user, host and port and disregard the rest. */ -+ -+ if (g_strcmp0 (u1->protocol, u2->protocol) != 0) -+ return FALSE; -+ -+ if (g_strcmp0 (u1->user, u2->user) != 0) -+ return FALSE; -+ -+ if (g_strcmp0 (u1->host, u2->host) != 0) -+ return FALSE; -+ -+ return (u1->port == u2->port); -+} -+ - EAccount * - mail_config_get_account_by_source_url (const char *source_url) - { - EAccount *account = NULL; - EIterator *iter; -+ CamelURL *url; - - g_return_val_if_fail (source_url != NULL, NULL); - -+ url = camel_url_new (source_url, NULL); -+ g_return_val_if_fail (url != NULL, NULL); -+ - iter = e_list_get_iterator ((EList *) config->accounts); -- while (e_iterator_is_valid (iter)) { -- CamelURL *url; -- gchar *string; -+ while (account == NULL && e_iterator_is_valid (iter)) { -+ CamelURL *account_url; - - account = (EAccount *) e_iterator_get (iter); - - e_iterator_next (iter); - -- if (account->source == NULL) -- continue; -- -- else if (account->source->url == NULL) -- continue; -- -- else if (*account->source->url == '\0') -+ if ( !account || (account->source == NULL) || -+ (account->source->url == NULL) || (*account->source->url == '\0')) { -+ account = NULL; - continue; -+ } - -- url = camel_url_new (account->source->url, NULL); -- if (url == NULL) -+ account_url = camel_url_new (account->source->url, NULL); -+ if (account_url == NULL) - continue; - -- /* Simplify the account URL for comparison. */ -- string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); -- if (string == NULL || strcmp (string, source_url) != 0) -+ if (!mail_config_account_url_equal (url, account_url)) - account = NULL; /* not a match */ - -- camel_url_free (url); -- g_free (string); -- -- if (account != NULL) { -- g_object_unref (iter); -- return account; -- } -+ camel_url_free (account_url); - } - - g_object_unref (iter); - -- return NULL; -+ return account; - } - - EAccount * -@@ -854,48 +865,40 @@ mail_config_get_account_by_transport_url - { - EAccount *account = NULL; - EIterator *iter; -+ CamelURL *url; - - g_return_val_if_fail (transport_url != NULL, NULL); - -+ url = camel_url_new (transport_url, NULL); -+ g_return_val_if_fail (url != NULL, NULL); -+ - iter = e_list_get_iterator ((EList *) config->accounts); -- while (e_iterator_is_valid (iter)) { -- CamelURL *url; -- gchar *string; -+ while (account == NULL && e_iterator_is_valid (iter)) { -+ CamelURL *account_url; - - account = (EAccount *) e_iterator_get (iter); - - e_iterator_next (iter); - -- if (account->transport == NULL) -- continue; -- -- else if (account->transport->url == NULL) -- continue; -- -- else if (*account->transport->url == '\0') -- continue; -+ if ( !account || (account->transport == NULL) || -+ (account->transport->url == NULL) || (*account->transport->url == '\0')) { -+ account = NULL; -+ continue; -+ } - -- url = camel_url_new (account->transport->url, NULL); -- if (url == NULL) -+ account_url = camel_url_new (account->transport->url, NULL); -+ if (account_url == NULL) - continue; - -- /* Simplify the account URL for comparison. */ -- string = camel_url_to_string (url, CAMEL_URL_HIDE_ALL); -- if (string == NULL || strcmp (string, transport_url) != 0) -+ if (!mail_config_account_url_equal (url, account_url)) - account = NULL; /* not a match */ - - camel_url_free (url); -- g_free (string); -- -- if (account != NULL) { -- g_object_unref (iter); -- return account; -- } - } - - g_object_unref (iter); - -- return NULL; -+ return account; - } - - int diff --git a/evolution-2.25.3.1-libgweather.patch b/evolution-2.25.3.1-libgweather.patch deleted file mode 100644 index 8392c5d..0000000 --- a/evolution-2.25.3.1-libgweather.patch +++ /dev/null @@ -1,73 +0,0 @@ -diff -up evolution-2.25.3.1/configure.in.libgweather evolution-2.25.3.1/configure.in ---- evolution-2.25.3.1/configure.in.libgweather 2008-12-15 11:50:21.000000000 -0500 -+++ evolution-2.25.3.1/configure.in 2008-12-15 11:50:57.000000000 -0500 -@@ -43,7 +43,7 @@ m4_define([dbus_minimum_version], [1.0.0 - m4_define([hal_minimum_version], [0.5.4]) - m4_define([libnotify_minimum_version], [0.3.0]) - m4_define([gnome_pilot_minimum_version], [2.0.15]) --m4_define([gweather_minimum_version], [2.25.3]) -+m4_define([gweather_minimum_version], [2.25.2]) - - # GNOME Documentation - GNOME_DOC_INIT -diff -up evolution-2.25.3.1/configure.libgweather evolution-2.25.3.1/configure ---- evolution-2.25.3.1/configure.libgweather 2008-12-15 11:50:26.000000000 -0500 -+++ evolution-2.25.3.1/configure 2008-12-15 11:52:43.000000000 -0500 -@@ -32935,11 +32935,11 @@ if test -n "$LIBGWEATHER_CFLAGS"; then - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ - { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\"") >&5 -- ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.3") 2>&5 -+ ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= 2.25.3" 2>/dev/null` -+ pkg_cv_LIBGWEATHER_CFLAGS=`$PKG_CONFIG --cflags "gweather >= 2.25.2" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -32950,12 +32950,12 @@ if test -n "$LIBGWEATHER_LIBS"; then - pkg_cv_LIBGWEATHER_LIBS="$LIBGWEATHER_LIBS" - elif test -n "$PKG_CONFIG"; then - if test -n "$PKG_CONFIG" && \ -- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.3\"") >&5 -- ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.3") 2>&5 -+ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gweather >= 2.25.2\"") >&5 -+ ($PKG_CONFIG --exists --print-errors "gweather >= 2.25.2") 2>&5 - ac_status=$? - $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; then -- pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= 2.25.3" 2>/dev/null` -+ pkg_cv_LIBGWEATHER_LIBS=`$PKG_CONFIG --libs "gweather >= 2.25.2" 2>/dev/null` - else - pkg_failed=yes - fi -@@ -32973,21 +32973,21 @@ else - _pkg_short_errors_supported=no - fi - if test $_pkg_short_errors_supported = yes; then -- LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gweather >= 2.25.3" 2>&1` -+ LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gweather >= 2.25.2" 2>&1` - else -- LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gweather >= 2.25.3" 2>&1` -+ LIBGWEATHER_PKG_ERRORS=`$PKG_CONFIG --print-errors "gweather >= 2.25.2" 2>&1` - fi - # Put the nasty error message in config.log where it belongs - echo "$LIBGWEATHER_PKG_ERRORS" >&5 - - { $as_echo "$as_me:$LINENO: result: no" >&5 - $as_echo "no" >&6; } -- { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5 --$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;} -+ { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5 -+$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;} - { (exit 1); exit 1; }; } - elif test $pkg_failed = untried; then -- { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5 --$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.3. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;} -+ { { $as_echo "$as_me:$LINENO: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&5 -+$as_echo "$as_me: error: The weather calendar setup plugin requires GWeather >= 2.25.2. Alternatively, you may specify --without-weather as a configure option to avoid building the plugin." >&2;} - { (exit 1); exit 1; }; } - else - LIBGWEATHER_CFLAGS=$pkg_cv_LIBGWEATHER_CFLAGS diff --git a/evolution-2.5.4-fix-conduits.patch b/evolution-2.5.4-fix-conduits.patch deleted file mode 100644 index d718ee2..0000000 --- a/evolution-2.5.4-fix-conduits.patch +++ /dev/null @@ -1,515 +0,0 @@ ---- evolution-2.5.4/addressbook/conduit/address-conduit.c.fix-conduits 2005-12-08 03:15:02.000000000 -0500 -+++ evolution-2.5.4/addressbook/conduit/address-conduit.c 2006-01-10 19:33:44.000000000 -0500 -@@ -462,14 +462,19 @@ - { - static char buff[ 4096 ]; - struct Address addr; -+ pi_buffer_t piBuf; - - if (remote == NULL) { - sprintf (buff, "[NULL]"); - return buff; - } - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&addr, 0, sizeof (struct Address)); -- unpack_Address (&addr, remote->record, remote->length); -+ unpack_Address (&addr, &piBuf, address_v1); - - g_snprintf (buff, 4096, "['%s' '%s' '%s']", - addr.entry[entryLastname] ? -@@ -791,7 +796,8 @@ - EAddrConduitContext *ctxt) - { - GnomePilotRecord p; -- static char record[0xffff]; -+ static unsigned char record[0xffff]; -+ pi_buffer_t piBuf; - - g_assert (local->addr != NULL ); - -@@ -803,9 +809,17 @@ - p.archived = local->local.archived; - p.secret = local->local.secret; - -+ memset (&piBuf, 0, sizeof (piBuf)); -+ memset (record, 0, sizeof (record)); -+ pack_Address (local->addr, &piBuf, address_v1); -+ - /* Generate pilot record structure */ -+ if (piBuf.used > 0) -+ memcpy (record, piBuf.data, piBuf.used); - p.record = record; -- p.length = pack_Address (local->addr, p.record, 0xffff); -+ p.length = piBuf.used; -+ if (piBuf.data) -+ free (piBuf.data); - - return p; - } -@@ -834,16 +848,16 @@ - */ - if (local->local.ID != 0) { - struct Address addr; -- char record[0xffff]; -+ pi_buffer_t *buffer = pi_buffer_new (0xffff); - int cat = 0; - - if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, - ctxt->dbi->db_handle, -- local->local.ID, &record, -- NULL, NULL, NULL, &cat) > 0) { -+ local->local.ID, buffer, -+ NULL, NULL, &cat) > 0) { - local->local.category = cat; - memset (&addr, 0, sizeof (struct Address)); -- unpack_Address (&addr, record, 0xffff); -+ unpack_Address (&addr, buffer, address_v1); - for (i = 0; i < 5; i++) { - if (addr.entry[entryPhone1 + i]) - local->addr->entry[entryPhone1 + i] = -@@ -858,6 +872,8 @@ - } - free_Address (&addr); - } -+ -+ pi_buffer_free (buffer); - } - - local->addr->entry[entryFirstname] = e_pilot_utf8_to_pchar (e_contact_get_const (contact, E_CONTACT_GIVEN_NAME)); -@@ -1019,10 +1035,16 @@ - EContactField next_mail, next_home, next_work, next_fax; - EContactField next_other, next_main, next_pager, next_mobile; - int i; -+ pi_buffer_t piBuf; - - g_return_val_if_fail(remote!=NULL,NULL); - memset (&address, 0, sizeof (struct Address)); -- unpack_Address (&address, remote->record, remote->length); -+ -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ -+ unpack_Address (&address, &piBuf, address_v1); - - if (in_contact == NULL) - contact = e_contact_new (); -@@ -1212,7 +1234,7 @@ - EBookQuery *query; - GList *l; - int len; -- unsigned char *buf; -+ pi_buffer_t *buffer; - char *filename; - char *change_id; - char *auth; -@@ -1302,9 +1324,9 @@ - gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); - gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); - -- buf = (unsigned char*)g_malloc (0xffff); -+ buffer = pi_buffer_new (0xffff); - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -- (unsigned char *)buf, 0xffff); -+ -1, buffer); - - if (len < 0) { - WARN (_("Could not read pilot's Address application block")); -@@ -1313,8 +1335,8 @@ - _("Could not read pilot's Address application block")); - return -1; - } -- unpack_AddressAppInfo (&(ctxt->ai), buf, len); -- g_free (buf); -+ unpack_AddressAppInfo (&(ctxt->ai), buffer->data, len); -+ pi_buffer_free (buffer); - - check_for_slow_setting (conduit, ctxt); - if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot ---- evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c.fix-conduits 2006-01-02 06:38:57.000000000 -0500 -+++ evolution-2.5.4/calendar/conduits/calendar/calendar-conduit.c 2006-01-10 19:33:44.000000000 -0500 -@@ -413,14 +413,20 @@ - { - static char buff[ 4096 ]; - struct Appointment appt; -+ pi_buffer_t piBuf; - - if (remote == NULL) { - sprintf (buff, "[NULL]"); - return buff; - } - -+ -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&appt, 0, sizeof (struct Appointment)); -- unpack_Appointment (&appt, remote->record, remote->length); -+ unpack_Appointment (&appt, &piBuf, datebook_v1); - - g_snprintf (buff, 4096, "[%ld %ld '%s' '%s']", - mktime (&appt.begin), -@@ -818,7 +824,8 @@ - ECalConduitContext *ctxt) - { - GnomePilotRecord p; -- static char record[0xffff]; -+ static unsigned char record[0xffff]; -+ pi_buffer_t piBuf; - - g_assert (local->comp != NULL); - g_assert (local->appt != NULL ); -@@ -829,9 +836,17 @@ - p.archived = local->local.archived; - p.secret = local->local.secret; - -+ memset (&piBuf, 0, sizeof (piBuf)); -+ memset (record, 0, sizeof (record)); -+ pack_Appointment (local->appt, &piBuf, datebook_v1); -+ - /* Generate pilot record structure */ -+ if (piBuf.used > 0) -+ memcpy (record, piBuf.data, piBuf.used); - p.record = record; -- p.length = pack_Appointment (local->appt, p.record, 0xffff); -+ p.length = piBuf.used; -+ if (piBuf.data) -+ free (piBuf.data); - - return p; - } -@@ -867,22 +882,24 @@ - * we don't overwrite them - */ - if (local->local.ID != 0) { -- struct Appointment appt; -- char record[0xffff]; -+ struct Appointment appt; -+ pi_buffer_t *buffer = pi_buffer_new (0xffff); - int cat = 0; - - if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, - ctxt->dbi->db_handle, -- local->local.ID, &record, -- NULL, NULL, NULL, &cat) > 0) { -+ local->local.ID, buffer, -+ NULL, NULL, &cat) > 0) { - local->local.category = cat; - memset (&appt, 0, sizeof (struct Appointment)); -- unpack_Appointment (&appt, record, 0xffff); -+ unpack_Appointment (&appt, buffer, datebook_v1); - local->appt->alarm = appt.alarm; - local->appt->advance = appt.advance; - local->appt->advanceUnits = appt.advanceUnits; - free_Appointment (&appt); - } -+ -+ pi_buffer_free (buffer); - } - - /* STOP: don't replace these with g_strdup, since free_Appointment -@@ -1140,11 +1157,17 @@ - GSList *edl = NULL; - char *txt; - int pos, i; -+ pi_buffer_t piBuf; - - g_return_val_if_fail (remote != NULL, NULL); - -+ -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&appt, 0, sizeof (struct Appointment)); -- unpack_Appointment (&appt, remote->record, remote->length); -+ unpack_Appointment (&appt, &piBuf, datebook_v1); - - if (in_comp == NULL) { - comp = e_cal_component_new (); -@@ -1409,7 +1432,7 @@ - GnomePilotConduitSyncAbs *abs_conduit; - GList *removed = NULL, *added = NULL, *l; - int len; -- unsigned char *buf; -+ pi_buffer_t *buffer; - char *filename, *change_id; - icalcomponent *icalcomp; - gint num_records, add_records = 0, mod_records = 0, del_records = 0; -@@ -1521,9 +1544,9 @@ - gnome_pilot_conduit_sync_abs_set_num_updated_local_records (abs_conduit, mod_records); - gnome_pilot_conduit_sync_abs_set_num_deleted_local_records(abs_conduit, del_records); - -- buf = (unsigned char*)g_malloc (0xffff); -+ buffer = pi_buffer_new (0xffff); - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -- (unsigned char *)buf, 0xffff); -+ -1, buffer); - - if (len < 0) { - WARN (_("Could not read pilot's Calendar application block")); -@@ -1532,8 +1555,8 @@ - _("Could not read pilot's Calendar application block")); - return -1; - } -- unpack_AppointmentAppInfo (&(ctxt->ai), buf, len); -- g_free (buf); -+ unpack_AppointmentAppInfo (&(ctxt->ai), buffer->data, len); -+ pi_buffer_free (buffer); - - check_for_slow_setting (conduit, ctxt); - if (ctxt->cfg->sync_type == GnomePilotConduitSyncTypeCopyToPilot ---- evolution-2.5.4/calendar/conduits/todo/todo-conduit.c.fix-conduits 2005-12-08 03:15:03.000000000 -0500 -+++ evolution-2.5.4/calendar/conduits/todo/todo-conduit.c 2006-01-10 19:33:44.000000000 -0500 -@@ -402,14 +402,19 @@ - { - static char buff[ 4096 ]; - struct ToDo todo; -+ pi_buffer_t piBuf; - - if (remote == NULL) { - sprintf (buff, "[NULL]"); - return buff; - } - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&todo, 0, sizeof (struct ToDo)); -- unpack_ToDo (&todo, remote->record, remote->length); -+ unpack_ToDo (&todo, &piBuf, todo_v1); - - g_snprintf (buff, 4096, "[%d %ld %d %d '%s' '%s' %d]", - todo.indefinite, -@@ -594,7 +599,8 @@ - EToDoConduitContext *ctxt) - { - GnomePilotRecord p; -- static char record[0xffff]; -+ static unsigned char record[0xffff]; -+ pi_buffer_t piBuf; - - g_assert (local->comp != NULL); - g_assert (local->todo != NULL ); -@@ -607,9 +613,17 @@ - p.archived = local->local.archived; - p.secret = local->local.secret; - -+ memset (&piBuf, 0, sizeof (piBuf)); -+ memset (record, 0, sizeof (record)); -+ pack_ToDo (local->todo, &piBuf, todo_v1); -+ - /* Generate pilot record structure */ -+ if (piBuf.used > 0) -+ memcpy (record, piBuf.data, piBuf.used); - p.record = record; -- p.length = pack_ToDo (local->todo, p.record, 0xffff); -+ p.length = piBuf.used; -+ if (piBuf.data) -+ free (piBuf.data); - - return p; - } -@@ -696,15 +710,17 @@ - - /* Don't overwrite the category */ - if (local->local.ID != 0) { -- char record[0xffff]; -+ pi_buffer_t *buffer = pi_buffer_new (0xffff); - int cat = 0; - - if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, - ctxt->dbi->db_handle, -- local->local.ID, &record, -- NULL, NULL, NULL, &cat) > 0) { -+ local->local.ID, buffer, -+ NULL, NULL, &cat) > 0) { - local->local.category = cat; - } -+ -+ pi_buffer_free (buffer); - } - - /* -@@ -859,12 +875,17 @@ - icaltimezone *utc_zone; - int priority; - char *txt; -+ pi_buffer_t piBuf; - char *category; - - g_return_val_if_fail (remote != NULL, NULL); - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&todo, 0, sizeof (struct ToDo)); -- unpack_ToDo (&todo, remote->record, remote->length); -+ unpack_ToDo (&todo, &piBuf, todo_v1); - - utc_zone = icaltimezone_get_utc_timezone (); - now = icaltime_from_timet_with_zone (time (NULL), FALSE, -@@ -1014,7 +1035,7 @@ - GnomePilotConduitSyncAbs *abs_conduit; - GList *l; - int len; -- unsigned char *buf; -+ pi_buffer_t *buffer; - char *filename, *change_id; - icalcomponent *icalcomp; - gint num_records, add_records = 0, mod_records = 0, del_records = 0; -@@ -1104,9 +1125,9 @@ - g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n", - num_records, add_records, mod_records, del_records); - -- buf = (unsigned char*)g_malloc (0xffff); -+ buffer = pi_buffer_new (0xffff); - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -- (unsigned char *)buf, 0xffff); -+ -1, buffer); - - if (len < 0) { - WARN (_("Could not read pilot's ToDo application block")); -@@ -1115,8 +1136,8 @@ - _("Could not read pilot's ToDo application block")); - return -1; - } -- unpack_ToDoAppInfo (&(ctxt->ai), buf, len); -- g_free (buf); -+ unpack_ToDoAppInfo (&(ctxt->ai), buffer->data, len); -+ pi_buffer_free (buffer); - - lastDesktopUniqueID = 128; - ---- evolution-2.5.4/calendar/conduits/memo/memo-conduit.c.fix-conduits 2006-01-10 22:52:28.000000000 -0500 -+++ evolution-2.5.4/calendar/conduits/memo/memo-conduit.c 2006-01-10 23:11:47.000000000 -0500 -@@ -331,14 +331,19 @@ - { - static char buff[ 64 ]; - struct Memo memo; -+ pi_buffer_t piBuf; - - if (remote == NULL) { - sprintf (buff, "[NULL]"); - return buff; - } - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&memo, 0, sizeof (struct Memo)); -- unpack_Memo (&memo, remote->record, remote->length); -+ unpack_Memo (&memo, &piBuf, memo_v1); - - g_snprintf (buff, 64, "['%s']", - memo.text ? -@@ -451,7 +456,8 @@ - EMemoConduitContext *ctxt) - { - GnomePilotRecord p; -- static char record[0xffff]; -+ static unsigned char record[0xffff]; -+ pi_buffer_t piBuf; - - g_assert (local->comp != NULL); - g_assert (local->memo != NULL ); -@@ -466,8 +472,14 @@ - - /* Generate pilot record structure */ - p.record = record; -- p.length = pack_Memo (local->memo, p.record, 0xffff); -- -+ memset (&piBuf, 0, sizeof (piBuf)); -+ memset (record, 0, sizeof (record)); -+ p.length = pack_Memo (local->memo, &piBuf, memo_v1); -+ if (piBuf.used > 0) -+ memcpy (record, piBuf.data, piBuf.used); -+ p.length = piBuf.used; -+ if (piBuf.data) -+ free (piBuf.data); - return p; - } - -@@ -568,16 +580,17 @@ - - /* Don't overwrite the category */ - if (local->local.ID != 0) { -- char record[0xffff]; -+ pi_buffer_t *buffer = pi_buffer_new (0xffff); - int cat = 0; - - LOG(fprintf(stderr, "local_record_from_comp: calling dlp_ReadRecordById\n")); - if (dlp_ReadRecordById (ctxt->dbi->pilot_socket, - ctxt->dbi->db_handle, -- local->local.ID, &record, -- NULL, NULL, NULL, &cat) > 0) { -+ local->local.ID, buffer, -+ NULL, NULL, &cat) > 0) { - local->local.category = cat; - } -+ pi_buffer_free (buffer); - LOG(fprintf(stderr, "local_record_from_comp: done calling dlp_ReadRecordById\n")); - } - -@@ -699,6 +712,7 @@ - { - ECalComponent *comp; - struct Memo memo; -+ pi_buffer_t piBuf; - struct icaltimetype now; - icaltimezone *utc_zone; - char *txt, *txt2, *txt3; -@@ -707,8 +721,12 @@ - - g_return_val_if_fail (remote != NULL, NULL); - -+ piBuf.data = remote->record; -+ piBuf.allocated = remote->length; -+ piBuf.used = remote->length; -+ - memset (&memo, 0, sizeof (struct Memo)); -- unpack_Memo (&memo, remote->record, remote->length); -+ unpack_Memo (&memo, &piBuf, memo_v1); - - utc_zone = icaltimezone_get_utc_timezone (); - now = icaltime_from_timet_with_zone (time (NULL), FALSE, -@@ -836,7 +854,7 @@ - GnomePilotConduitSyncAbs *abs_conduit; - GList *l; - int len; -- unsigned char *buf; -+ pi_buffer_t *buffer; - char *filename, *change_id; - icalcomponent *icalcomp; - gint num_records, add_records = 0, mod_records = 0, del_records = 0; -@@ -929,9 +947,9 @@ - g_message("num_records: %d\nadd_records: %d\nmod_records: %d\ndel_records: %d\n", - num_records, add_records, mod_records, del_records); - -- buf = (unsigned char*)g_malloc (0xffff); -+ buffer = pi_buffer_new (0xffff); - len = dlp_ReadAppBlock (dbi->pilot_socket, dbi->db_handle, 0, -- (unsigned char *)buf, 0xffff); -+ -1, buffer); - - if (len < 0) { - WARN (_("Could not read pilot's Memo application block")); -@@ -940,8 +958,8 @@ - _("Could not read pilot's Memo application block")); - return -1; - } -- unpack_MemoAppInfo (&(ctxt->ai), buf, len); -- g_free (buf); -+ unpack_MemoAppInfo (&(ctxt->ai), buffer->data, len); -+ pi_buffer_free (buffer); - - lastDesktopUniqueID = 128; - diff --git a/evolution-2.7.1-no-gnome-common.patch b/evolution-2.7.1-no-gnome-common.patch deleted file mode 100644 index a18ed48..0000000 --- a/evolution-2.7.1-no-gnome-common.patch +++ /dev/null @@ -1,155 +0,0 @@ -diff -up evolution-2.24.1/configure.in.no-gnome-common evolution-2.24.1/configure.in ---- evolution-2.24.1/configure.in.no-gnome-common 2008-10-19 23:27:24.000000000 -0400 -+++ evolution-2.24.1/configure.in 2008-10-21 13:16:54.000000000 -0400 -@@ -1332,9 +1332,6 @@ AC_SUBST_FILE(EVO_MARSHAL_RULE) - dnl ************************* - dnl CFLAGS and LIBS and stuff - dnl ************************* -- --GNOME_COMPILE_WARNINGS(yes) --CFLAGS="$CFLAGS $WARN_CFLAGS" - case $CFLAGS in - *-Wall*) - # Turn off the annoying "comparison between signed and unsigned" -diff -up evolution-2.24.1/configure.no-gnome-common evolution-2.24.1/configure ---- evolution-2.24.1/configure.no-gnome-common 2008-10-21 13:16:54.000000000 -0400 -+++ evolution-2.24.1/configure 2008-10-21 13:17:55.000000000 -0400 -@@ -33230,138 +33230,6 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk - - - -- # Check whether --enable-compile-warnings was given. --if test "${enable_compile_warnings+set}" = set; then -- enableval=$enable_compile_warnings; --else -- enable_compile_warnings="yes" --fi -- -- -- warnCFLAGS= -- if test "x$GCC" != xyes; then -- enable_compile_warnings=no -- fi -- -- warning_flags= -- realsave_CFLAGS="$CFLAGS" -- -- case "$enable_compile_warnings" in -- no) -- warning_flags= -- ;; -- minimum) -- warning_flags="-Wall" -- ;; -- yes) -- warning_flags="-Wall -Wmissing-prototypes" -- ;; -- maximum|error) -- warning_flags="-Wall -Wmissing-prototypes -Wnested-externs -Wpointer-arith" -- CFLAGS="$warning_flags $CFLAGS" -- for option in -Wno-sign-compare; do -- SAVE_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $option" -- { $as_echo "$as_me:$LINENO: checking whether gcc understands $option" >&5 --$as_echo_n "checking whether gcc understands $option... " >&6; } -- cat >conftest.$ac_ext <<_ACEOF --/* confdefs.h. */ --_ACEOF --cat confdefs.h >>conftest.$ac_ext --cat >>conftest.$ac_ext <<_ACEOF --/* end confdefs.h. */ -- --int --main () --{ -- -- ; -- return 0; --} --_ACEOF --rm -f conftest.$ac_objext --if { (ac_try="$ac_compile" --case "(($ac_try" in -- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; -- *) ac_try_echo=$ac_try;; --esac --eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" --$as_echo "$ac_try_echo") >&5 -- (eval "$ac_compile") 2>conftest.er1 -- ac_status=$? -- grep -v '^ *+' conftest.er1 >conftest.err -- rm -f conftest.er1 -- cat conftest.err >&5 -- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 -- (exit $ac_status); } && { -- test -z "$ac_c_werror_flag" || -- test ! -s conftest.err -- } && test -s conftest.$ac_objext; then -- has_option=yes --else -- $as_echo "$as_me: failed program was:" >&5 --sed 's/^/| /' conftest.$ac_ext >&5 -- -- has_option=no --fi -- --rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext -- CFLAGS="$SAVE_CFLAGS" -- { $as_echo "$as_me:$LINENO: result: $has_option" >&5 --$as_echo "$has_option" >&6; } -- if test $has_option = yes; then -- warning_flags="$warning_flags $option" -- fi -- unset has_option -- unset SAVE_CFLAGS -- done -- unset option -- if test "$enable_compile_warnings" = "error" ; then -- warning_flags="$warning_flags -Werror" -- fi -- ;; -- *) -- { { $as_echo "$as_me:$LINENO: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&5 --$as_echo "$as_me: error: Unknown argument '$enable_compile_warnings' to --enable-compile-warnings" >&2;} -- { (exit 1); exit 1; }; } -- ;; -- esac -- CFLAGS="$realsave_CFLAGS" -- { $as_echo "$as_me:$LINENO: checking what warning flags to pass to the C compiler" >&5 --$as_echo_n "checking what warning flags to pass to the C compiler... " >&6; } -- { $as_echo "$as_me:$LINENO: result: $warning_flags" >&5 --$as_echo "$warning_flags" >&6; } -- -- # Check whether --enable-iso-c was given. --if test "${enable_iso_c+set}" = set; then -- enableval=$enable_iso_c; --else -- enable_iso_c=no --fi -- -- -- { $as_echo "$as_me:$LINENO: checking what language compliance flags to pass to the C compiler" >&5 --$as_echo_n "checking what language compliance flags to pass to the C compiler... " >&6; } -- complCFLAGS= -- if test "x$enable_iso_c" != "xno"; then -- if test "x$GCC" = "xyes"; then -- case " $CFLAGS " in -- *\ \ -ansi\ \ *) ;; -- *) complCFLAGS="$complCFLAGS -ansi" ;; -- esac -- case " $CFLAGS " in -- *\ \ -pedantic\ \ *) ;; -- *) complCFLAGS="$complCFLAGS -pedantic" ;; -- esac -- fi -- fi -- { $as_echo "$as_me:$LINENO: result: $complCFLAGS" >&5 --$as_echo "$complCFLAGS" >&6; } -- -- WARN_CFLAGS="$warning_flags $complCFLAGS" -- -- --CFLAGS="$CFLAGS $WARN_CFLAGS" - case $CFLAGS in - *-Wall*) - # Turn off the annoying "comparison between signed and unsigned" diff --git a/evolution.spec b/evolution.spec index fefac76..b2886f9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,13 +45,13 @@ Name: evolution Version: 2.25.90 -Release: 1%{?dist} -License: GPLv2 and GFDL +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME -URL: http://www.gnome.org/projects/evolution/ -BuildRoot: %{_tmppath}/%{name}-%{version}-root -Source: evolution-%{version}.tar.bz2 +License: GPLv2+ and GFDL +URL: http://projects.gnome.org/evolution/ +BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) +Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -60,26 +60,13 @@ Obsoletes: libgal2 <= %{last_libgal2_version} # bad hack Patch10: evolution-1.4.4-ldap-x86_64-hack.patch -# Patches for conduits, based upon -# rh-161817-attach-116019-conduit_pilot_link_updates.diff -# (the latter patch was originally by Mark G. Adams): -# Patch11: evolution-2.5.4-fix-conduits.patch - -# Move .conduit files from share to lib (for the sake of multilib) +# Move .conduit files from share to lib (for the sake of multilib). # This patch effects other parts of evolution.spec and so is necessary # for a successful build. -Patch12: evolution-2.5.4-fix-conduit-dir.patch - -# Remove gnome-common macros from configure.in. -# We do not ship gnome-common (or at least we're not supposed to). -Patch13: evolution-2.7.1-no-gnome-common.patch +Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 -Patch14: evolution-2.9.1-im-context-reset.patch - -# Back off the bleeding edge libgweather requirement. -# We can get by with libgweather-2.25.2 for now. -Patch15: evolution-2.25.3.1-libgweather.patch +Patch12: evolution-2.9.1-im-context-reset.patch ## Dependencies ### @@ -109,6 +96,7 @@ BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: gnome-common BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gnutls-devel BuildRequires: gtk-doc @@ -232,11 +220,8 @@ This package contains supplemental utilities for %{name} that require Perl. %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack -#patch11 -p1 -b .fix-conduits # leave commented -%patch12 -p1 -b .fix-conduit-dir -%patch13 -p1 -b .no-gnome-common -%patch14 -p1 -b .im-context-reset -%patch15 -p1 -b .libgweather +%patch11 -p1 -b .fix-conduit-dir +%patch12 -p1 -b .im-context-reset mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -703,6 +688,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Fri Feb 06 2009 Matthew Barnes - 2.25.90-2.fc11 +- Update BuildRoot, License, Source and URL tags. +- Require gnome-common so we don't have to patch it out. + * Mon Feb 02 2009 Matthew Barnes - 2.25.90-1.fc11 - Update to 2.25.90 From 72577448150e2118347d83c7c200b0c2161e7ce7 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 15 Feb 2009 01:54:05 +0000 Subject: [PATCH 254/844] make the help subpackage noarch --- evolution.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index b2886f9..a9a582f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.25.90 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -175,6 +175,7 @@ Development files needed for building things which link against %{name}. Group: Applications/Productivity Summary: Help files for %{name} Requires: %{name} = %{version}-%{release} +BuildArch: noarch %description help This package contains user documentation for %{name}. @@ -688,6 +689,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Sat Feb 14 2009 Matthias Clasen - 2.25.90-3.fc11 +- Make the help subpackage noarch + * Fri Feb 06 2009 Matthew Barnes - 2.25.90-2.fc11 - Update BuildRoot, License, Source and URL tags. - Require gnome-common so we don't have to patch it out. From 1012331136c104fd3425d83459b2031ab9d0642a Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 15 Feb 2009 03:14:29 +0000 Subject: [PATCH 255/844] no noarch subpackages in koji yet --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index a9a582f..36d32dd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -175,7 +175,8 @@ Development files needed for building things which link against %{name}. Group: Applications/Productivity Summary: Help files for %{name} Requires: %{name} = %{version}-%{release} -BuildArch: noarch +# not enabled in koji yet +#BuildArch: noarch %description help This package contains user documentation for %{name}. From 90d879534434919a4f492a4c4b6d770a97d46d95 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 Feb 2009 18:26:47 +0000 Subject: [PATCH 256/844] - Update to 2.25.91 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index f0542e1..36070ee 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.25.90.tar.bz2 +evolution-2.25.91.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 36d32dd..bb24d2f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.25.90 -Release: 3%{?dist} +Version: 2.25.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -690,6 +690,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Feb 16 2009 Matthew Barnes - 2.25.91-1.fc11 +- Update to 2.25.91 + * Sat Feb 14 2009 Matthias Clasen - 2.25.90-3.fc11 - Make the help subpackage noarch diff --git a/sources b/sources index a55fd3b..5cc26e4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fe0c7894da97f2cece0159de93370650 evolution-2.25.90.tar.bz2 +d34ac084be104abe2ded2823bf53a76a evolution-2.25.91.tar.bz2 From 70aa8f56a159b47e74e83e1e7a147bf222ebab02 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 23 Feb 2009 02:39:17 +0000 Subject: [PATCH 257/844] make help noarch --- evolution.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index bb24d2f..0ee2d90 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.25.91 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -175,8 +175,7 @@ Development files needed for building things which link against %{name}. Group: Applications/Productivity Summary: Help files for %{name} Requires: %{name} = %{version}-%{release} -# not enabled in koji yet -#BuildArch: noarch +BuildArch: noarch %description help This package contains user documentation for %{name}. @@ -690,6 +689,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Sun Feb 22 2009 Matthias Clasen - 2.25.91-2.fc11 +- Actually make the help subpackage noarch + * Mon Feb 16 2009 Matthew Barnes - 2.25.91-1.fc11 - Update to 2.25.91 From f0b15cd6b92973e16d2ea871b364f8d0743575ba Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 24 Feb 2009 15:39:30 +0000 Subject: [PATCH 258/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 0ee2d90..a318ab0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.25.91 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -689,6 +689,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Sun Feb 22 2009 Matthias Clasen - 2.25.91-2.fc11 - Actually make the help subpackage noarch From 871d9c90a5d414d06224437389a4d7c298a19aea Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 Mar 2009 16:23:16 +0000 Subject: [PATCH 259/844] - Update to 2.25.92 --- .cvsignore | 1 - evolution.spec | 7 +++++-- sources | 1 - 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 36070ee..e69de29 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +0,0 @@ -evolution-2.25.91.tar.bz2 diff --git a/evolution.spec b/evolution.spec index a318ab0..4fe2474 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.25.91 -Release: 3%{?dist} +Version: 2.25.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -689,6 +689,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 +- Update to 2.25.92 + * Tue Feb 24 2009 Fedora Release Engineering - 2.25.91-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild diff --git a/sources b/sources index 5cc26e4..e69de29 100644 --- a/sources +++ b/sources @@ -1 +0,0 @@ -d34ac084be104abe2ded2823bf53a76a evolution-2.25.91.tar.bz2 From 0563d445429f53d3cfca8d412ea7a088112a6bd6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 2 Mar 2009 21:47:23 +0000 Subject: [PATCH 260/844] Tarball upload successful. --- .cvsignore | 1 + sources | 1 + 2 files changed, 2 insertions(+) diff --git a/.cvsignore b/.cvsignore index e69de29..3217784 100644 --- a/.cvsignore +++ b/.cvsignore @@ -0,0 +1 @@ +evolution-2.25.92.tar.bz2 diff --git a/sources b/sources index e69de29..8d51a96 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +0a79bf1f00e38c55df7b619b5f74b4c3 evolution-2.25.92.tar.bz2 From 4b4cdb980262d9f86a1c54ba5ad8fb673caea254 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 16 Mar 2009 11:47:21 +0000 Subject: [PATCH 261/844] - Update to 2.26.0 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3217784..ab7a5c1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.25.92.tar.bz2 +evolution-2.26.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 4fe2474..e94d4f2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ ### Abstract ### Name: evolution -Version: 2.25.92 +Version: 2.26.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -689,6 +689,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Mar 16 2009 Matthew Barnes - 2.26.0-1.fc11 +- Update to 2.26.0 + * Mon Mar 02 2009 Matthew Barnes - 2.25.92-1.fc11 - Update to 2.25.92 diff --git a/sources b/sources index 8d51a96..bfb36bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a79bf1f00e38c55df7b619b5f74b4c3 evolution-2.25.92.tar.bz2 +97234b1ecded0232a1b68d2fc03b0252 evolution-2.26.0.tar.bz2 From 33ae61cc554e4b555fe19897bb5b849dc07d3fa0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Apr 2009 16:05:11 +0000 Subject: [PATCH 262/844] - Require libpst. --- evolution.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index e94d4f2..06163bc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.0 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -77,8 +77,10 @@ Requires(postun): scrollkeeper >= %{scrollkeeper_version} # Don't trust evolution-data-server to maintain accurate sonames. Requires: evolution-data-server >= %{version} +# No devel package for libpst, despite the name. Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-themes +Requires: libpst ### Build Dependencies ### @@ -689,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Thu Apr 02 2009 Matthew Barnes - 2.26.0-2.fc11 +- Require libpst. + * Mon Mar 16 2009 Matthew Barnes - 2.26.0-1.fc11 - Update to 2.26.0 From 934eb642afcaf864b6cd2c85f900a4a256700057 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 11 Apr 2009 02:30:14 +0000 Subject: [PATCH 263/844] fix directory ownership --- evolution.spec | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/evolution.spec b/evolution.spec index 06163bc..5750106 100644 --- a/evolution.spec +++ b/evolution.spec @@ -24,7 +24,7 @@ %define libnotify_support 1 %define krb5_support 1 %define nntp_support 1 -%ifnarch s390 s390x +%ifnarch s390 s390x %define nm_support 1 %else %define nm_support 0 @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.0 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -437,12 +437,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/applications/evolution.desktop # Icons: -%{_datadir}/icons/hicolor/16x16/apps/ -%{_datadir}/icons/hicolor/22x22/apps/ -%{_datadir}/icons/hicolor/24x24/apps/ -%{_datadir}/icons/hicolor/32x32/apps/ -%{_datadir}/icons/hicolor/48x48/apps/ -%{_datadir}/icons/hicolor/scalable/apps/ +%{_datadir}/icons/hicolor/16x16/apps/* +%{_datadir}/icons/hicolor/22x22/apps/* +%{_datadir}/icons/hicolor/24x24/apps/* +%{_datadir}/icons/hicolor/32x32/apps/* +%{_datadir}/icons/hicolor/48x48/apps/* +%{_datadir}/icons/hicolor/scalable/apps/* # IDL files (should this be in devel subpackage?) %{_datadir}/idl/evolution-%{evo_major} @@ -691,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Fro Apr 10 2009 Matthias Clasen - 2.26.0-3.fc11 +- Fix directory ownership + * Thu Apr 02 2009 Matthew Barnes - 2.26.0-2.fc11 - Require libpst. From e51aded4ef6203c3d5625471dedeab10a19182b3 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 11 Apr 2009 02:36:46 +0000 Subject: [PATCH 264/844] fix spec --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 5750106..51cbcea 100644 --- a/evolution.spec +++ b/evolution.spec @@ -691,7 +691,7 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog -* Fro Apr 10 2009 Matthias Clasen - 2.26.0-3.fc11 +* Fri Apr 10 2009 Matthias Clasen - 2.26.0-3.fc11 - Fix directory ownership * Thu Apr 02 2009 Matthew Barnes - 2.26.0-2.fc11 From 626bcaab6326ffdfc9afd31214676b28a96dd50f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Apr 2009 03:01:30 +0000 Subject: [PATCH 265/844] - Update to 2.26.1 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index ab7a5c1..7491dd2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.26.0.tar.bz2 +evolution-2.26.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 51cbcea..c8e44c5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.26.0 -Release: 3%{?dist} +Version: 2.26.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -691,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Apr 13 2009 Matthew Barnes - 2.26.1-1.fc11 +- Update to 2.26.1 + * Fri Apr 10 2009 Matthias Clasen - 2.26.0-3.fc11 - Fix directory ownership diff --git a/sources b/sources index bfb36bd..94d77bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -97234b1ecded0232a1b68d2fc03b0252 evolution-2.26.0.tar.bz2 +7089171fe7e127f061f6722b33bf3107 evolution-2.26.1.tar.bz2 From 59bf1828684a8d16e46b674388fd03034643ba5c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 14 Apr 2009 16:53:51 +0000 Subject: [PATCH 266/844] - Add patch for GNOME bug #578685 (attachment bar crasher). --- evolution-2.26.1-attachment-bar-crasher.patch | 12 ++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 evolution-2.26.1-attachment-bar-crasher.patch diff --git a/evolution-2.26.1-attachment-bar-crasher.patch b/evolution-2.26.1-attachment-bar-crasher.patch new file mode 100644 index 0000000..4cc84d2 --- /dev/null +++ b/evolution-2.26.1-attachment-bar-crasher.patch @@ -0,0 +1,12 @@ +diff -up evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher evolution-2.26.1/widgets/misc/e-attachment-bar.c +--- evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher 2009-04-14 12:49:45.000000000 -0400 ++++ evolution-2.26.1/widgets/misc/e-attachment-bar.c 2009-04-14 12:50:54.000000000 -0400 +@@ -450,6 +450,8 @@ update (EAttachmentBar *bar) + if (desc) + desc = g_strdup (desc); + } ++ } else { ++ desc = g_strdup (desc); + } + + if (!desc) diff --git a/evolution.spec b/evolution.spec index c8e44c5..e79a08b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -68,6 +68,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# GNOME bug #578685 +Patch13: evolution-2.26.1-attachment-bar-crasher.patch + ## Dependencies ### Requires(post): GConf2 @@ -225,6 +228,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .attachment-bar-crasher mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -691,6 +695,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Apr 14 2009 Matthew Barnes - 2.26.1-2.fc11 +- Add patch for GNOME bug #578685 (attachment bar crasher). + * Mon Apr 13 2009 Matthew Barnes - 2.26.1-1.fc11 - Update to 2.26.1 From 57ff4dc06009a139e6ae694fad26fdf3149a859e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 15 Apr 2009 15:05:41 +0000 Subject: [PATCH 267/844] - Update to 2.26.1.1 - Remove patch for GNOME bug #578685 (fixed upstream). --- .cvsignore | 2 +- evolution.spec | 12 ++++++------ sources | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.cvsignore b/.cvsignore index 7491dd2..c8f4360 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.26.1.tar.bz2 +evolution-2.26.1.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index e79a08b..87a3060 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.26.1 -Release: 2%{?dist} +Version: 2.26.1.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -68,9 +68,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# GNOME bug #578685 -Patch13: evolution-2.26.1-attachment-bar-crasher.patch - ## Dependencies ### Requires(post): GConf2 @@ -228,7 +225,6 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .attachment-bar-crasher mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -695,6 +691,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Wed Apr 15 2009 Matthew Barnes - 2.26.1.1-1.fc11 +- Update to 2.26.1.1 +- Remove patch for GNOME bug #578685 (fixed upstream). + * Tue Apr 14 2009 Matthew Barnes - 2.26.1-2.fc11 - Add patch for GNOME bug #578685 (attachment bar crasher). diff --git a/sources b/sources index 94d77bd..3be289b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7089171fe7e127f061f6722b33bf3107 evolution-2.26.1.tar.bz2 +e24b8c13d350c17ab8332482f60aa144 evolution-2.26.1.1.tar.bz2 From 1e8f2538c40474c600474ac5cb424b6d7a65a3de Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 27 Apr 2009 06:18:21 +0000 Subject: [PATCH 268/844] don't drop schemas translations --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 87a3060..d1dc2f9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -45,7 +45,7 @@ Name: evolution Version: 2.26.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -322,7 +322,7 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. cd po -grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$\|.*[.]schemas[.]in$" POTFILES.in > POTFILES.keep +grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in intltool-update --pot for p in *.po; do @@ -691,6 +691,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Apr 27 2009 Matthias Clasen - 2.26.1-2.fc11 +- Don't drop schemas translations from po files + * Wed Apr 15 2009 Matthew Barnes - 2.26.1.1-1.fc11 - Update to 2.26.1.1 - Remove patch for GNOME bug #578685 (fixed upstream). From ecd207fb3663a3f853b2c8c507cca88b6d23d8a9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 May 2009 12:55:41 +0000 Subject: [PATCH 269/844] - Update to 2.27.1 - Bump evo_major to 2.28. --- .cvsignore | 2 +- evolution.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index c8f4360..817f8bc 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.26.1.1.tar.bz2 +evolution-data-server-2.27.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index d1dc2f9..7195351 100644 --- a/evolution.spec +++ b/evolution.spec @@ -16,7 +16,7 @@ %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.26 +%define evo_major 2.28 %define exchange_support 1 %define inline_audio_support 1 @@ -44,8 +44,8 @@ ### Abstract ### Name: evolution -Version: 2.26.1.1 -Release: 2%{?dist} +Version: 2.27.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -691,6 +691,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 +- Update to 2.27.1 +- Bump evo_major to 2.28. + * Mon Apr 27 2009 Matthias Clasen - 2.26.1-2.fc11 - Don't drop schemas translations from po files diff --git a/sources b/sources index 3be289b..0428037 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e24b8c13d350c17ab8332482f60aa144 evolution-2.26.1.1.tar.bz2 +aaba865951d49a337dc53a8d56f1f0ed evolution-data-server-2.27.1.tar.bz2 From a4a6ae825730299a56d4589078c9232d6655bce4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 May 2009 17:00:34 +0000 Subject: [PATCH 270/844] Helps to use the right tarball... --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 817f8bc..0e8e122 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-data-server-2.27.1.tar.bz2 +evolution-2.27.1.tar.bz2 diff --git a/sources b/sources index 0428037..402d0b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaba865951d49a337dc53a8d56f1f0ed evolution-data-server-2.27.1.tar.bz2 +4105442e30499740b493ce43a1302a70 evolution-2.27.1.tar.bz2 From 76fe09f40dde1c4854f95ae2b40ffbf3a9649304 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 May 2009 17:31:30 +0000 Subject: [PATCH 271/844] Fix a build break in 2.27.1. --- evolution-2.27.1-build-break.patch | 11 +++++++++++ evolution.spec | 3 +++ 2 files changed, 14 insertions(+) create mode 100644 evolution-2.27.1-build-break.patch diff --git a/evolution-2.27.1-build-break.patch b/evolution-2.27.1-build-break.patch new file mode 100644 index 0000000..23fe665 --- /dev/null +++ b/evolution-2.27.1-build-break.patch @@ -0,0 +1,11 @@ +diff -up evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c.build-break evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c +--- evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c.build-break 2009-05-04 13:27:14.000000000 -0400 ++++ evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c 2009-05-04 13:27:37.000000000 -0400 +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + #include + #include + #include diff --git a/evolution.spec b/evolution.spec index 7195351..a85fb5b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -68,6 +68,8 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +Patch13: evolution-2.27.1-build-break.patch + ## Dependencies ### Requires(post): GConf2 @@ -225,6 +227,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .build-break mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From f1fd6ce2a33fda14b05178b9a2c1cf9f622a41b4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 May 2009 19:10:10 +0000 Subject: [PATCH 272/844] - Update to 2.27.1 - Bump evo_major to 2.28. - Temporarily disable EDS_DISABLE_DEPRECATED due to GNOME bug #569652. --- evolution-2.27.1-build-break.patch | 11 ----------- evolution.spec | 6 ++---- 2 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 evolution-2.27.1-build-break.patch diff --git a/evolution-2.27.1-build-break.patch b/evolution-2.27.1-build-break.patch deleted file mode 100644 index 23fe665..0000000 --- a/evolution-2.27.1-build-break.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c.build-break evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c ---- evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c.build-break 2009-05-04 13:27:14.000000000 -0400 -+++ evolution-2.27.1/plugins/exchange-operations/exchange-contacts.c 2009-05-04 13:27:37.000000000 -0400 -@@ -25,6 +25,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/evolution.spec b/evolution.spec index a85fb5b..54f61d8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -68,8 +68,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -Patch13: evolution-2.27.1-build-break.patch - ## Dependencies ### Requires(post): GConf2 @@ -227,7 +225,6 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .build-break mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -305,10 +302,10 @@ CFLAGS="$CFLAGS \ -DPANGO_DISABLE_DEPRECATED=1 \ -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ -DGDK_DISABLE_DEPRECATED=1 \ - -DEDS_DISABLE_DEPRECATED=1 \ -Wdeclaration-after-statement \ -Werror-implicit-function-declaration" # TODO: Make -DCAMEL_DISABLE_DEPRECATED work. +# TODO: Make -DEDS_DISABLE_DEPRECATED work again. %endif %configure \ @@ -697,6 +694,7 @@ rm -rf $RPM_BUILD_ROOT * Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - Bump evo_major to 2.28. +- Temporarily disable EDS_DISABLE_DEPRECATED due to GNOME bug #569652. * Mon Apr 27 2009 Matthias Clasen - 2.26.1-2.fc11 - Don't drop schemas translations from po files From c0d01a912bb0d22301a0651c57274819f8b5e889 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 May 2009 19:36:54 +0000 Subject: [PATCH 273/844] Still trying to get this bugger to build... --- evolution.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 54f61d8..ee33523 100644 --- a/evolution.spec +++ b/evolution.spec @@ -578,9 +578,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so -%{evo_plugin_dir}/org-gnome-evolution-mail-attachments-import-ics.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-mail-attachments-import-ics.so - %{evo_plugin_dir}/org-gnome-itip-formatter.eplug %{evo_plugin_dir}/liborg-gnome-itip-formatter.so From 5f8d20c34cf3aeeac8129dd0d500c14fd85366ee Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 May 2009 02:49:17 +0000 Subject: [PATCH 274/844] - Update to 2.27.2 - Remove strict_build_settings since the settings are used upstream now. --- .cvsignore | 2 +- evolution.spec | 28 +++++----------------------- sources | 2 +- 3 files changed, 7 insertions(+), 25 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0e8e122..010f8d8 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.1.tar.bz2 +evolution-2.27.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index ee33523..259e15f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -36,15 +36,12 @@ %endif %define use_mozilla_nss 1 -# Use stricter build settings than required by upstream. -%define strict_build_settings 1 - %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins ### Abstract ### Name: evolution -Version: 2.27.1 +Version: 2.27.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -289,25 +286,6 @@ if pkg-config openssl ; then fi %endif -# Add stricter build settings here as the source code gets cleaned up. -# We want to make sure things like compiler warnings and avoiding deprecated -# functions in the GNOME/GTK+ libraries stay fixed. -# -# Please file a bug report at bugzilla.gnome.org if these settings break -# compilation, and encourage the upstream developers to use them. - -%if %{strict_build_settings} -CFLAGS="$CFLAGS \ - -DG_DISABLE_DEPRECATED=1 \ - -DPANGO_DISABLE_DEPRECATED=1 \ - -DGDK_PIXBUF_DISABLE_DEPRECATED=1 \ - -DGDK_DISABLE_DEPRECATED=1 \ - -Wdeclaration-after-statement \ - -Werror-implicit-function-declaration" -# TODO: Make -DCAMEL_DISABLE_DEPRECATED work. -# TODO: Make -DEDS_DISABLE_DEPRECATED work again. -%endif - %configure \ --enable-gtk-doc \ --enable-ipv6 \ @@ -688,6 +666,10 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon May 25 2009 Matthew Barnes - 2.27.2-1.fc12 +- Update to 2.27.2 +- Remove strict_build_settings since the settings are used upstream now. + * Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 - Update to 2.27.1 - Bump evo_major to 2.28. diff --git a/sources b/sources index 402d0b0..8642e5b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4105442e30499740b493ce43a1302a70 evolution-2.27.1.tar.bz2 +0720be28447da86b1971d64a9e11d4b1 evolution-2.27.2.tar.bz2 From e1407d08766749bac08562db6204422aa7df5c78 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 29 May 2009 14:31:18 +0000 Subject: [PATCH 275/844] - Update to 2.27.2 - Patch broken libevolution-mail-shared library. - Remove strict_build_settings since the settings are used upstream now. --- evolution-2.27.2-fix-shared-mail.patch | 44 ++++++++++++++++++++++++++ evolution.spec | 12 ++++++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 evolution-2.27.2-fix-shared-mail.patch diff --git a/evolution-2.27.2-fix-shared-mail.patch b/evolution-2.27.2-fix-shared-mail.patch new file mode 100644 index 0000000..c45f7bc --- /dev/null +++ b/evolution-2.27.2-fix-shared-mail.patch @@ -0,0 +1,44 @@ +diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail/Makefile.am +--- evolution-2.27.2/mail/Makefile.am.fix-shared-mail 2009-05-24 13:35:00.000000000 -0400 ++++ evolution-2.27.2/mail/Makefile.am 2009-05-29 10:23:51.000000000 -0400 +@@ -31,9 +31,8 @@ INCLUDES = \ + -DPREFIX=\""$(prefix)"\" \ + -DG_LOG_DOMAIN=\"evolution-mail\" + +-component_LTLIBRARIES = libevolution-mail-shared.la \ +- libevolution-mail.la +- ++privsolib_LTLIBRARIES = libevolution-mail-shared.la ++component_LTLIBRARIES = libevolution-mail.la + + # Mail.idl + MAIL_IDL = Evolution-Mail.idl +@@ -172,9 +171,9 @@ libevolution_mail_la_LIBADD = \ + libevolution_mail_la_LDFLAGS = \ + -avoid-version -module $(NO_UNDEFINED) + +-libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h +- +-# .server files ++libevolution_mail_la_DEPENDENCIES = \ ++ em-filter-i18n.h \ ++ libevolution-mail-shared.la + + libevolution_mail_shared_la_SOURCES = \ + em-account-editor.c \ +@@ -252,10 +251,13 @@ libevolution_mail_shared_la_LIBADD = + $(SMIME_LIBS) \ + $(THREADS_LIBS) + +-libevolution_mail_shared_la_LDFLAGS = \ +- -avoid-version -module $(NO_UNDEFINED) ++libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED) + ++# This forces the shared library to be installed before ++# the component library, so libtool relinking will work. ++install-componentLTLIBRARIES: install-privsolibLTLIBRARIES + ++# .server files + + server_in_files = GNOME_Evolution_Mail.server.in.in + server_DATA = $(server_in_files:.server.in.in=.server) diff --git a/evolution.spec b/evolution.spec index 259e15f..b432947 100644 --- a/evolution.spec +++ b/evolution.spec @@ -65,6 +65,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# Fix broken libevolution-mail-shared. +Patch13: evolution-2.27.2-fix-shared-mail.patch + ## Dependencies ### Requires(post): GConf2 @@ -222,6 +225,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .fix-shared-mail mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -286,6 +290,9 @@ if pkg-config openssl ; then fi %endif +# Regenerate mail/Makefile.in (this is temporary). +automake + %configure \ --enable-gtk-doc \ --enable-ipv6 \ @@ -462,6 +469,7 @@ rm -rf $RPM_BUILD_ROOT %{_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-mail-shared.so.* %{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* %{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so.* %{_libdir}/evolution/%{evo_major}/libfilter.so.* @@ -623,6 +631,7 @@ rm -rf $RPM_BUILD_ROOT %{_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-mail-shared.so %{_libdir}/evolution/%{evo_major}/libevolution-smime.so %{_libdir}/evolution/%{evo_major}/libevolution-widgets-a11y.so %{_libdir}/evolution/%{evo_major}/libfilter.so @@ -666,8 +675,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog -* Mon May 25 2009 Matthew Barnes - 2.27.2-1.fc12 +* Mon May 29 2009 Matthew Barnes - 2.27.2-1.fc12 - Update to 2.27.2 +- Patch broken libevolution-mail-shared library. - Remove strict_build_settings since the settings are used upstream now. * Mon May 04 2009 Matthew Barnes - 2.27.1-1.fc12 From 07a69727c8a4f2df8afbc656b7026d83869b7712 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 29 May 2009 16:08:16 +0000 Subject: [PATCH 276/844] Try again. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index b432947..b29d44c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -291,7 +291,7 @@ fi %endif # Regenerate mail/Makefile.in (this is temporary). -automake +autoreconf --force %configure \ --enable-gtk-doc \ From 73463c00f5522e058a45d8a5ced9f61fabd0099a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 29 May 2009 18:56:37 +0000 Subject: [PATCH 277/844] Try yet again... --- evolution-2.27.2-fix-shared-mail.patch | 55 ++++++++++++++++++++++---- evolution.spec | 3 -- 2 files changed, 48 insertions(+), 10 deletions(-) diff --git a/evolution-2.27.2-fix-shared-mail.patch b/evolution-2.27.2-fix-shared-mail.patch index c45f7bc..4dfcef5 100644 --- a/evolution-2.27.2-fix-shared-mail.patch +++ b/evolution-2.27.2-fix-shared-mail.patch @@ -1,6 +1,6 @@ diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail/Makefile.am --- evolution-2.27.2/mail/Makefile.am.fix-shared-mail 2009-05-24 13:35:00.000000000 -0400 -+++ evolution-2.27.2/mail/Makefile.am 2009-05-29 10:23:51.000000000 -0400 ++++ evolution-2.27.2/mail/Makefile.am 2009-05-29 14:34:24.000000000 -0400 @@ -31,9 +31,8 @@ INCLUDES = \ -DPREFIX=\""$(prefix)"\" \ -DG_LOG_DOMAIN=\"evolution-mail\" @@ -13,7 +13,15 @@ diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail # Mail.idl MAIL_IDL = Evolution-Mail.idl -@@ -172,9 +171,9 @@ libevolution_mail_la_LIBADD = \ +@@ -148,7 +147,6 @@ SMIME_LIBS = \ + $(top_builddir)/smime/gui/libevolution-smime.la + endif + +- + libevolution_mail_la_LIBADD = \ + $(top_builddir)/mail/libevolution-mail-shared.la \ + $(top_builddir)/e-util/libeutil.la \ +@@ -172,11 +170,11 @@ libevolution_mail_la_LIBADD = \ libevolution_mail_la_LDFLAGS = \ -avoid-version -module $(NO_UNDEFINED) @@ -24,9 +32,26 @@ diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail + em-filter-i18n.h \ + libevolution-mail-shared.la - libevolution_mail_shared_la_SOURCES = \ +-libevolution_mail_shared_la_SOURCES = \ ++libevolution_mail_shared_la_SOURCES = \ em-account-editor.c \ -@@ -252,10 +251,13 @@ libevolution_mail_shared_la_LIBADD = + em-account-editor.h \ + em-event.c \ +@@ -238,12 +236,7 @@ libevolution_mail_shared_la_SOURCES = + message-tag-followup.c \ + message-tag-followup.h + +- +- +- +- +- +-libevolution_mail_shared_la_LIBADD = \ ++libevolution_mail_shared_la_LIBADD = \ + $(top_builddir)/e-util/libeutil.la \ + $(top_builddir)/widgets/misc/libemiscwidgets.la \ + $(top_builddir)/composer/libcomposer.la \ +@@ -252,10 +245,29 @@ libevolution_mail_shared_la_LIBADD = $(SMIME_LIBS) \ $(THREADS_LIBS) @@ -34,9 +59,25 @@ diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail - -avoid-version -module $(NO_UNDEFINED) +libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED) -+# This forces the shared library to be installed before -+# the component library, so libtool relinking will work. -+install-componentLTLIBRARIES: install-privsolibLTLIBRARIES ++# --- BIG NASTY AUTOMAKE HACK --- ++# ++# Automake apparently sorts Makefile.am rules alphabetically. And ++# since component_LTLIBRARIES < privsolib_LTLIBRARIES, it tries to ++# install libevolution-mail.la before libevolution-mail-shared.la, ++# which fails when libtool tries to relink libevolution-mail.la ++# against the not-yet-installed libevolution-mail-shared.la. ++install-data-am: \ ++ install-privsolibLTLIBRARIES \ ++ install-componentLTLIBRARIES \ ++ install-data-local \ ++ install-errorDATA \ ++ install-etspecDATA \ ++ install-filterDATA \ ++ install-gladeDATA \ ++ install-idlDATA \ ++ install-mailincludeHEADERS \ ++ install-schemaDATA \ ++ install-serverDATA +# .server files diff --git a/evolution.spec b/evolution.spec index b29d44c..01d5091 100644 --- a/evolution.spec +++ b/evolution.spec @@ -551,9 +551,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-folder-permissions.xml %{evo_plugin_dir}/org-gnome-folder-subscription.xml -%{evo_plugin_dir}/org-gnome-face.eplug -%{evo_plugin_dir}/liborg-gnome-face.so - %{evo_plugin_dir}/org-gnome-groupwise-features.eplug %{evo_plugin_dir}/liborg-gnome-groupwise-features.so %{evo_plugin_dir}/org-gnome-compose-send-options.xml From 0e7614b4872a44ce9252d8194c7a33eb12d01539 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 29 May 2009 19:23:17 +0000 Subject: [PATCH 278/844] Not my day... --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index 01d5091..671b1db 100644 --- a/evolution.spec +++ b/evolution.spec @@ -602,6 +602,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-templates.eplug %{evo_plugin_dir}/liborg-gnome-templates.so +%{evo_plugin_dir}/org-gnome-vcard-inline.eplug +%{evo_plugin_dir}/liborg-gnome-vcard-inline.so + %{evo_plugin_dir}/org-gnome-evolution-webdav.eplug %{evo_plugin_dir}/liborg-gnome-evolution-webdav.so From 447a39d072692c3c5b4de1b0db26f63dd347297d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sun, 14 Jun 2009 21:45:59 +0000 Subject: [PATCH 279/844] Minor directory ownership cleanup --- evolution.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 671b1db..5929e6b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ Name: evolution Version: 2.27.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -669,12 +669,13 @@ rm -rf $RPM_BUILD_ROOT %files perl %defattr(-, root, root) -%dir %{_libexecdir}/evolution -%dir %{_libexecdir}/evolution/%{evo_major} %{_libexecdir}/evolution/%{evo_major}/csv2vcard %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Sun Jun 14 2009 Matthias Clasen - 2.27.2-2.fc12 +- Don't make -perl own directories that are already owned by the base package + * Mon May 29 2009 Matthew Barnes - 2.27.2-1.fc12 - Update to 2.27.2 - Patch broken libevolution-mail-shared library. From ef796d85eb0471be85c9d691c985e50f04ceb96f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 15 Jun 2009 15:48:29 +0000 Subject: [PATCH 280/844] - Update to 2.27.3 --- .cvsignore | 2 +- evolution-2.27.2-fix-shared-mail.patch | 85 -------------------------- evolution.spec | 11 ++-- sources | 2 +- 4 files changed, 7 insertions(+), 93 deletions(-) delete mode 100644 evolution-2.27.2-fix-shared-mail.patch diff --git a/.cvsignore b/.cvsignore index 010f8d8..a092b61 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.2.tar.bz2 +evolution-2.27.3.tar.bz2 diff --git a/evolution-2.27.2-fix-shared-mail.patch b/evolution-2.27.2-fix-shared-mail.patch deleted file mode 100644 index 4dfcef5..0000000 --- a/evolution-2.27.2-fix-shared-mail.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff -up evolution-2.27.2/mail/Makefile.am.fix-shared-mail evolution-2.27.2/mail/Makefile.am ---- evolution-2.27.2/mail/Makefile.am.fix-shared-mail 2009-05-24 13:35:00.000000000 -0400 -+++ evolution-2.27.2/mail/Makefile.am 2009-05-29 14:34:24.000000000 -0400 -@@ -31,9 +31,8 @@ INCLUDES = \ - -DPREFIX=\""$(prefix)"\" \ - -DG_LOG_DOMAIN=\"evolution-mail\" - --component_LTLIBRARIES = libevolution-mail-shared.la \ -- libevolution-mail.la -- -+privsolib_LTLIBRARIES = libevolution-mail-shared.la -+component_LTLIBRARIES = libevolution-mail.la - - # Mail.idl - MAIL_IDL = Evolution-Mail.idl -@@ -148,7 +147,6 @@ SMIME_LIBS = \ - $(top_builddir)/smime/gui/libevolution-smime.la - endif - -- - libevolution_mail_la_LIBADD = \ - $(top_builddir)/mail/libevolution-mail-shared.la \ - $(top_builddir)/e-util/libeutil.la \ -@@ -172,11 +170,11 @@ libevolution_mail_la_LIBADD = \ - libevolution_mail_la_LDFLAGS = \ - -avoid-version -module $(NO_UNDEFINED) - --libevolution_mail_la_DEPENDENCIES = em-filter-i18n.h -- --# .server files -+libevolution_mail_la_DEPENDENCIES = \ -+ em-filter-i18n.h \ -+ libevolution-mail-shared.la - --libevolution_mail_shared_la_SOURCES = \ -+libevolution_mail_shared_la_SOURCES = \ - em-account-editor.c \ - em-account-editor.h \ - em-event.c \ -@@ -238,12 +236,7 @@ libevolution_mail_shared_la_SOURCES = - message-tag-followup.c \ - message-tag-followup.h - -- -- -- -- -- --libevolution_mail_shared_la_LIBADD = \ -+libevolution_mail_shared_la_LIBADD = \ - $(top_builddir)/e-util/libeutil.la \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(top_builddir)/composer/libcomposer.la \ -@@ -252,10 +245,29 @@ libevolution_mail_shared_la_LIBADD = - $(SMIME_LIBS) \ - $(THREADS_LIBS) - --libevolution_mail_shared_la_LDFLAGS = \ -- -avoid-version -module $(NO_UNDEFINED) -+libevolution_mail_shared_la_LDFLAGS = $(NO_UNDEFINED) - -+# --- BIG NASTY AUTOMAKE HACK --- -+# -+# Automake apparently sorts Makefile.am rules alphabetically. And -+# since component_LTLIBRARIES < privsolib_LTLIBRARIES, it tries to -+# install libevolution-mail.la before libevolution-mail-shared.la, -+# which fails when libtool tries to relink libevolution-mail.la -+# against the not-yet-installed libevolution-mail-shared.la. -+install-data-am: \ -+ install-privsolibLTLIBRARIES \ -+ install-componentLTLIBRARIES \ -+ install-data-local \ -+ install-errorDATA \ -+ install-etspecDATA \ -+ install-filterDATA \ -+ install-gladeDATA \ -+ install-idlDATA \ -+ install-mailincludeHEADERS \ -+ install-schemaDATA \ -+ install-serverDATA - -+# .server files - - server_in_files = GNOME_Evolution_Mail.server.in.in - server_DATA = $(server_in_files:.server.in.in=.server) diff --git a/evolution.spec b/evolution.spec index 5929e6b..a3c6d6d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -41,8 +41,8 @@ ### Abstract ### Name: evolution -Version: 2.27.2 -Release: 2%{?dist} +Version: 2.27.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -65,9 +65,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Fix broken libevolution-mail-shared. -Patch13: evolution-2.27.2-fix-shared-mail.patch - ## Dependencies ### Requires(post): GConf2 @@ -225,7 +222,6 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .fix-shared-mail mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -673,6 +669,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Mon Jun 15 2009 Matthew Barnes - 2.27.3-1.fc12 +- Update to 2.27.3 + * Sun Jun 14 2009 Matthias Clasen - 2.27.2-2.fc12 - Don't make -perl own directories that are already owned by the base package diff --git a/sources b/sources index 8642e5b..03f347e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0720be28447da86b1971d64a9e11d4b1 evolution-2.27.2.tar.bz2 +31d95df4c3a8f078443ec22a57742aea evolution-2.27.3.tar.bz2 From 3de59719ac5ae88d870a5ab99ce62324aff2eaa8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 23 Jun 2009 14:39:48 +0000 Subject: [PATCH 281/844] - Add patch to allow Anjal to build. --- evolution-2.26.1-attachment-bar-crasher.patch | 12 ------ evolution-2.27.3-anjal-support.patch | 37 +++++++++++++++++++ evolution.spec | 9 ++++- 3 files changed, 45 insertions(+), 13 deletions(-) delete mode 100644 evolution-2.26.1-attachment-bar-crasher.patch create mode 100644 evolution-2.27.3-anjal-support.patch diff --git a/evolution-2.26.1-attachment-bar-crasher.patch b/evolution-2.26.1-attachment-bar-crasher.patch deleted file mode 100644 index 4cc84d2..0000000 --- a/evolution-2.26.1-attachment-bar-crasher.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher evolution-2.26.1/widgets/misc/e-attachment-bar.c ---- evolution-2.26.1/widgets/misc/e-attachment-bar.c.attachment-bar-crasher 2009-04-14 12:49:45.000000000 -0400 -+++ evolution-2.26.1/widgets/misc/e-attachment-bar.c 2009-04-14 12:50:54.000000000 -0400 -@@ -450,6 +450,8 @@ update (EAttachmentBar *bar) - if (desc) - desc = g_strdup (desc); - } -+ } else { -+ desc = g_strdup (desc); - } - - if (!desc) diff --git a/evolution-2.27.3-anjal-support.patch b/evolution-2.27.3-anjal-support.patch new file mode 100644 index 0000000..442ec16 --- /dev/null +++ b/evolution-2.27.3-anjal-support.patch @@ -0,0 +1,37 @@ +diff -up evolution-2.27.3/mail/e-mail-attachment-bar.h.anjal-support evolution-2.27.3/mail/e-mail-attachment-bar.h +--- evolution-2.27.3/mail/e-mail-attachment-bar.h.anjal-support 2009-06-12 10:54:40.000000000 -0400 ++++ evolution-2.27.3/mail/e-mail-attachment-bar.h 2009-06-23 10:37:33.000000000 -0400 +@@ -23,7 +23,7 @@ + #define E_MAIL_ATTACHMENT_BAR_H + + #include +-#include ++#include + + /* Standard GObject macros */ + #define E_TYPE_MAIL_ATTACHMENT_BAR \ +diff -up evolution-2.27.3/mail/Makefile.am.anjal-support evolution-2.27.3/mail/Makefile.am +--- evolution-2.27.3/mail/Makefile.am.anjal-support 2009-06-12 10:54:40.000000000 -0400 ++++ evolution-2.27.3/mail/Makefile.am 2009-06-23 10:37:33.000000000 -0400 +@@ -105,10 +105,6 @@ mailinclude_HEADERS = \ + libevolution_mail_la_SOURCES = \ + $(MAIL_IDL_GENERATED) \ + $(mailinclude_HEADERS) \ +- e-attachment-handler-mail.c \ +- e-attachment-handler-mail.h \ +- e-mail-attachment-bar.c \ +- e-mail-search-bar.c \ + e-searching-tokenizer.c \ + em-account-prefs.c \ + em-account-prefs.h \ +@@ -174,6 +170,10 @@ libevolution_mail_la_DEPENDENCIES = \ + libevolution-mail-shared.la + + libevolution_mail_shared_la_SOURCES = \ ++ e-attachment-handler-mail.c \ ++ e-attachment-handler-mail.h \ ++ e-mail-attachment-bar.c \ ++ e-mail-search-bar.c \ + em-account-editor.c \ + em-account-editor.h \ + em-event.c \ diff --git a/evolution.spec b/evolution.spec index a3c6d6d..5d1350d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ Name: evolution Version: 2.27.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -65,6 +65,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# Support for building Anjal. +Patch13: evolution-2.27.3-anjal-support.patch + ## Dependencies ### Requires(post): GConf2 @@ -222,6 +225,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .anjal-support mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -669,6 +673,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Tue Jun 23 2009 Matthew Barnes - 2.27.3-2.fc12 +- Add patch to allow Anjal to build. + * Mon Jun 15 2009 Matthew Barnes - 2.27.3-1.fc12 - Update to 2.27.3 From c4e1c80c7bb22dce2235a7db258903d7618b569d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 1 Jul 2009 10:32:21 +0000 Subject: [PATCH 282/844] Rebuild against newer gcc --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 5d1350d..df58602 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ Name: evolution Version: 2.27.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -673,6 +673,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Wed Jul 01 2009 Milan Crha - 2.27.3-3.fc12 +- Rebuild against newer gcc + * Tue Jun 23 2009 Matthew Barnes - 2.27.3-2.fc12 - Add patch to allow Anjal to build. From 2b905f861187f942a8e86ca16308212b7f94607a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 19:31:09 +0000 Subject: [PATCH 283/844] - Add BR for libpst-devel and libytnef-devel (RH bug #493049). --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index df58602..e69796f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ Name: evolution Version: 2.27.3 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -77,10 +77,8 @@ Requires(postun): scrollkeeper >= %{scrollkeeper_version} # Don't trust evolution-data-server to maintain accurate sonames. Requires: evolution-data-server >= %{version} -# No devel package for libpst, despite the name. Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-themes -Requires: libpst ### Build Dependencies ### @@ -111,9 +109,11 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libgweather-devel >= %{libgweather_version} +BuildRequires: libpst-devel BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel +BuildRequires: libytnef-devel BuildRequires: pkgconfig %if %{use_mozilla_nss} @@ -673,6 +673,9 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean %changelog +* Thu Jul 02 2009 Matthew Barnes - 2.27.3-4.fc12 +- Add BR for libpst-devel and libytnef-devel (RH bug #493049). + * Wed Jul 01 2009 Milan Crha - 2.27.3-3.fc12 - Rebuild against newer gcc From f75cfb4934c6419dcafa5491f43b3e020f489649 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 20:22:06 +0000 Subject: [PATCH 284/844] - Add BR for libpst-devel and libytnef-devel (RH bug #493049). - Add patch to build pst-import plugin against current libpst. --- evolution-2.27.3-pst-import.patch | 654 ++++++++++++++++++++++++++++++ evolution.spec | 5 + 2 files changed, 659 insertions(+) create mode 100644 evolution-2.27.3-pst-import.patch diff --git a/evolution-2.27.3-pst-import.patch b/evolution-2.27.3-pst-import.patch new file mode 100644 index 0000000..216fc06 --- /dev/null +++ b/evolution-2.27.3-pst-import.patch @@ -0,0 +1,654 @@ +diff -up evolution-2.27.3/plugins/pst-import/pst-importer.c.pst-import evolution-2.27.3/plugins/pst-import/pst-importer.c +--- evolution-2.27.3/plugins/pst-import/pst-importer.c.pst-import 2009-06-12 10:54:40.000000000 -0400 ++++ evolution-2.27.3/plugins/pst-import/pst-importer.c 2009-07-02 16:18:08.000000000 -0400 +@@ -66,7 +66,6 @@ + #include + #include + +-#include + #include + #include + +@@ -75,8 +74,8 @@ typedef struct _PstImporter PstImporter; + gint pst_init (pst_file *pst, gchar *filename); + gchar *get_pst_rootname (pst_file *pst, gchar *filename); + static void pst_error_msg (const gchar *fmt, ...); +-static void pst_import_folders (PstImporter *m, pst_desc_ll *topitem); +-static void pst_process_item (PstImporter *m, pst_desc_ll *d_ptr); ++static void pst_import_folders (PstImporter *m, pst_desc_tree *topitem); ++static void pst_process_item (PstImporter *m, pst_desc_tree *d_ptr); + static void pst_process_folder (PstImporter *m, pst_item *item); + static void pst_process_email (PstImporter *m, pst_item *item); + static void pst_process_contact (PstImporter *m, pst_item *item); +@@ -89,7 +88,6 @@ gchar *foldername_to_utf8 (const gchar * + gchar *string_to_utf8(const gchar *string); + void contact_set_date (EContact *contact, EContactField id, FILETIME *date); + struct icaltimetype get_ical_date (FILETIME *date, gboolean is_date); +-gchar *rfc2445_datetime_format (FILETIME *ft); + + gboolean org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target); + GtkWidget *org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im); +@@ -449,7 +447,7 @@ pst_import_file (PstImporter *m) + gint ret; + gchar *filename; + pst_item *item = NULL; +- pst_desc_ll *d_ptr; ++ pst_desc_tree *d_ptr; + + filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); + m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); /* Destination folder, was set in our widget */ +@@ -472,7 +470,7 @@ pst_import_file (PstImporter *m) + + camel_operation_progress_count (NULL, 1); + +- if ((item = pst_parse_item (&m->pst, m->pst.d_head)) == NULL) { ++ if ((item = pst_parse_item (&m->pst, m->pst.d_head, NULL)) == NULL) { + pst_error_msg ("Could not get root record"); + return; + } +@@ -496,9 +494,9 @@ pst_import_file (PstImporter *m) + } + + static void +-pst_import_folders (PstImporter *m, pst_desc_ll *topitem) ++pst_import_folders (PstImporter *m, pst_desc_tree *topitem) + { +- pst_desc_ll *d_ptr; ++ pst_desc_tree *d_ptr; + gchar *seperator; + + d_ptr = topitem->child; +@@ -540,14 +538,14 @@ pst_import_folders (PstImporter *m, pst_ + } + + static void +-pst_process_item (PstImporter *m, pst_desc_ll *d_ptr) ++pst_process_item (PstImporter *m, pst_desc_tree *d_ptr) + { + pst_item *item = NULL; + + if (d_ptr->desc == NULL) + return; + +- item = pst_parse_item (&m->pst, d_ptr); ++ item = pst_parse_item (&m->pst, d_ptr, NULL); + + if (item == NULL) + return; +@@ -560,7 +558,7 @@ pst_process_item (PstImporter *m, pst_de + + if (item->folder != NULL) { + pst_process_folder (m, item); +- camel_operation_start (NULL, _("Importing `%s'"), item->file_as); ++ camel_operation_start (NULL, _("Importing `%s'"), item->file_as.str); + } else { + if (m->folder_count && (m->current_item < m->folder_count)) { + camel_operation_progress (NULL, (m->current_item * 100) / m->folder_count); +@@ -661,10 +659,10 @@ pst_process_folder (PstImporter *m, pst_ + g_free (m->folder_name); + g_free (m->folder_uri); + +- if (item->file_as != NULL) { +- m->folder_name = foldername_to_utf8 (item->file_as); ++ if (item->file_as.str != NULL) { ++ m->folder_name = foldername_to_utf8 (item->file_as.str); + } else { +- g_critical ("Folder: No name! item->file_as=%s", item->file_as); ++ g_critical ("Folder: No name! item->file_as=%s", item->file_as.str); + m->folder_name = g_strdup ("unknown_name"); + } + +@@ -676,7 +674,7 @@ pst_process_folder (PstImporter *m, pst_ + m->folder = NULL; + } + +- m->folder_count = item->folder->email_count; ++ m->folder_count = item->folder->item_count; + m->current_item = 0; + } + +@@ -737,22 +735,22 @@ attachment_to_part (PstImporter *m, pst_ + + part = camel_mime_part_new (); + +- if (attach->filename2 || attach->filename1) { +- camel_mime_part_set_filename (part, (attach->filename2 ? attach->filename2 : attach->filename1)); ++ if (attach->filename2.str || attach->filename1.str) { ++ camel_mime_part_set_filename (part, (attach->filename2.str ? attach->filename2.str : attach->filename1.str)); + camel_mime_part_set_disposition (part, "attachment"); + camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BASE64); + } else { + camel_mime_part_set_disposition (part, "inline"); + } + +- if (attach->mimetype != NULL) { +- mimetype = attach->mimetype; ++ if (attach->mimetype.str != NULL) { ++ mimetype = attach->mimetype.str; + } else { + mimetype = "application/octet-stream"; + } + +- if (attach->data != NULL) { +- camel_mime_part_set_content (part, attach->data, strlen (attach->data), mimetype); ++ if (attach->data.data != NULL) { ++ camel_mime_part_set_content (part, attach->data.data, strlen (attach->data.data), mimetype); + } else { + gchar *buf = NULL; + gsize size; +@@ -773,21 +771,23 @@ pst_process_email (PstImporter *m, pst_i + CamelMultipart *mp; + CamelMimePart *part; + CamelMessageInfo *info; ++ pst_item_attach *attach; + + if (m->folder == NULL) { + pst_create_folder (m); ++ + } + + camel_folder_freeze (m->folder); + + msg = camel_mime_message_new (); + +- if (item->email->subject != NULL) { ++ if (item->subject.str != NULL) { + gchar *subj; + +- subj = string_to_utf8 (item->email->subject->subj); ++ subj = string_to_utf8 (item->subject.str); + if (subj == NULL) { +- g_warning ("Could not convert email subject to utf8: %s", item->email->subject->subj); ++ g_warning ("Could not convert email subject to utf8: %s", item->subject.str); + camel_mime_message_set_subject (msg, "(lost subject)"); + } else { + camel_mime_message_set_subject (msg, subj); +@@ -797,12 +797,12 @@ pst_process_email (PstImporter *m, pst_i + + addr = camel_internet_address_new (); + +- if (item->email->outlook_sender_name != NULL && item->email->outlook_sender != NULL) { +- camel_internet_address_add (addr, item->email->outlook_sender_name, item->email->outlook_sender); +- } else if (item->email->outlook_sender_name != NULL) { +- camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender_name); +- } else if (item->email->outlook_sender != NULL) { +- camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender); ++ if (item->email->outlook_sender_name.str != NULL && item->email->outlook_sender.str != NULL) { ++ camel_internet_address_add (addr, item->email->outlook_sender_name.str, item->email->outlook_sender.str); ++ } else if (item->email->outlook_sender_name.str != NULL) { ++ camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender_name.str); ++ } else if (item->email->outlook_sender.str != NULL) { ++ camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender.str); + } else { + /* Evo prints a warning if no from is set, so supply an empty address */ + camel_internet_address_add (addr, "", ""); +@@ -812,38 +812,38 @@ pst_process_email (PstImporter *m, pst_i + camel_object_unref (addr); + + if (item->email->sent_date != NULL) { +- camel_mime_message_set_date (msg, fileTimeToUnixTime (item->email->sent_date, 0), 0); ++ camel_mime_message_set_date (msg, pst_fileTimeToUnixTime (item->email->sent_date), 0); + } + +- if (item->email->messageid != NULL) { +- camel_mime_message_set_message_id (msg, item->email->messageid); ++ if (item->email->messageid.str != NULL) { ++ camel_mime_message_set_message_id (msg, item->email->messageid.str); + } + +- if (item->email->header != NULL) { ++ if (item->email->header.str != NULL) { + /* Use mime parser to read headers */ + CamelStream *stream; + /*g_debug (" Email headers length=%zd", strlen (item->email->header));*/ + /*g_message (" Email headers... %s...", item->email->header);*/ + +- stream = camel_stream_mem_new_with_buffer (item->email->header, strlen (item->email->header)); ++ stream = camel_stream_mem_new_with_buffer (item->email->header.str, strlen (item->email->header.str)); + if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)msg, stream) == -1) + g_warning ("Error reading headers, skipped"); + + } else { + +- if (item->email->sentto_address != NULL) { ++ if (item->email->sentto_address.str != NULL) { + addr = camel_internet_address_new (); + +- if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address) > 0); ++ if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address.str) > 0) + camel_mime_message_set_recipients (msg, "To", addr); + + camel_object_unref (addr); + } + +- if (item->email->cc_address != NULL) { ++ if (item->email->cc_address.str != NULL) { + addr = camel_internet_address_new (); + +- if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address) > 0); ++ if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address.str) > 0) + camel_mime_message_set_recipients (msg, "CC", addr); + + camel_object_unref (addr); +@@ -856,11 +856,11 @@ pst_process_email (PstImporter *m, pst_i + + camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/mixed"); + +- } else if (item->email->htmlbody && item->email->body) { ++ } else if (item->email->htmlbody.str && item->body.str) { + + camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/alternate"); + +- } else if (item->email->htmlbody) { ++ } else if (item->email->htmlbody.str) { + + camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "text/html"); + +@@ -868,62 +868,56 @@ pst_process_email (PstImporter *m, pst_i + + camel_multipart_set_boundary (mp, NULL); + +- if (item->email->body != NULL) { ++ if (item->body.str != NULL) { + /* Read internet headers */ + + /*g_debug (" Email body length=%zd", strlen (item->email->body)); + g_message (" Email body %100s...", item->email->body);*/ + + part = camel_mime_part_new (); +- camel_mime_part_set_content (part, item->email->body, strlen (item->email->body), "text/plain"); ++ camel_mime_part_set_content (part, item->body.str, strlen (item->body.str), "text/plain"); + camel_multipart_add_part (mp, part); + camel_object_unref (part); + } + +- if (item->email->htmlbody != NULL) { ++ if (item->email->htmlbody.str != NULL) { + /*g_debug (" HTML body length=%zd", strlen (item->email->htmlbody));*/ + part = camel_mime_part_new (); +- camel_mime_part_set_content (part, item->email->htmlbody, strlen (item->email->htmlbody), "text/html"); ++ camel_mime_part_set_content (part, item->email->htmlbody.str, strlen (item->email->htmlbody.str), "text/html"); + camel_multipart_add_part (mp, part); + camel_object_unref (part); + } + +- item->current_attach = item->attach; +- +- while (item->current_attach != NULL) { +- pst_item_attach *attach; +- +- attach = item->current_attach; +- part = attachment_to_part(m, attach); +- +- camel_multipart_add_part (mp, part); +- camel_object_unref (part); +- +- item->current_attach = item->current_attach->next; ++ for (attach = item->attach; attach; attach = attach->next) { ++ if (attach->data.data || attach->i_id) { ++ part = attachment_to_part(m, attach); ++ camel_multipart_add_part (mp, part); ++ camel_object_unref (part); ++ } + } + + /*camel_mime_message_dump (msg, TRUE);*/ + +- if (item->email->htmlbody || item->attach) { ++ if (item->email->htmlbody.str || item->attach) { + camel_medium_set_content_object (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp)); +- } else if (item->email->body) { +- camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->email->body, strlen (item->email->body), "text/plain"); ++ } else if (item->body.str) { ++ camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->body.str, strlen (item->body.str), "text/plain"); + } else { + g_warning ("Email without body. Subject:%s", +- (item->email->subject->subj ? item->email->subject->subj : "(empty)")); ++ (item->subject.str ? item->subject.str : "(empty)")); + camel_mime_part_set_content (CAMEL_MIME_PART (msg), "\n", 1, "text/plain"); + } + + info = camel_message_info_new (NULL); + + /* Read message flags (see comments in libpst.c */ +- if(item->email->flag && 0x01) ++ if(item->flags && 0x01) + camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0); + + if(item->email->importance == 2) + camel_message_info_set_flags (info, CAMEL_MESSAGE_FLAGGED, ~0); + +- if(item->email->flag && 0x08) ++ if(item->flags && 0x08) + camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0); + + camel_folder_append_message (m->folder, msg, info, NULL, &m->ex); +@@ -1003,7 +997,7 @@ contact_set_date (EContact *contact, ECo + EContactDate *bday; + bday = e_contact_date_new (); + +- t1 = fileTimeToUnixTime (date, 0); ++ t1 = pst_fileTimeToUnixTime (date); + gmtime_r (&t1, &tm); + + bday->year = tm.tm_year + 1900; +@@ -1026,84 +1020,84 @@ pst_process_contact (PstImporter *m, pst + + ec = e_contact_new (); + /* pst's fullname field only contains first, middle, surname */ +- if (c->display_name_prefix || c->suffix) { ++ if (c->display_name_prefix.str || c->suffix.str) { + GString *name = g_string_sized_new (128); + +- if (c->display_name_prefix) { +- g_string_assign (name, c->display_name_prefix); ++ if (c->display_name_prefix.str) { ++ g_string_assign (name, c->display_name_prefix.str); + } + +- if (c->first_name) { +- g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->first_name); ++ if (c->first_name.str) { ++ g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->first_name.str); + } + +- if (c->middle_name) { +- g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->middle_name); ++ if (c->middle_name.str) { ++ g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->middle_name.str); + } + +- if (c->surname) { +- g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->surname); ++ if (c->surname.str) { ++ g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->surname.str); + } + +- if (c->suffix) { +- g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->suffix); ++ if (c->suffix.str) { ++ g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->suffix.str); + } + + contact_set_string (ec, E_CONTACT_FULL_NAME, name->str); + g_string_free (name, TRUE); + + } else { +- contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname); ++ contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname.str); + } + + /* unknown_field (ec, notes, "initials", c->initials); */ + +- contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname); ++ contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname.str); + +- contact_set_string (ec, E_CONTACT_ORG, c->company_name); +- contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department); +- contact_set_string (ec, E_CONTACT_TITLE, c->job_title); ++ contact_set_string (ec, E_CONTACT_ORG, c->company_name.str); ++ contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department.str); ++ contact_set_string (ec, E_CONTACT_TITLE, c->job_title.str); + + contact_set_address (ec,E_CONTACT_ADDRESS_WORK, +- c->business_address, c->business_city, c->business_country, +- c->business_po_box, c->business_postal_code, c->business_state, c->business_street); ++ c->business_address.str, c->business_city.str, c->business_country.str, ++ c->business_po_box.str, c->business_postal_code.str, c->business_state.str, c->business_street.str); + + contact_set_address (ec,E_CONTACT_ADDRESS_HOME, +- c->home_address, c->home_city, c->home_country, +- c->home_po_box, c->home_postal_code, c->home_state, c->home_street); ++ c->home_address.str, c->home_city.str, c->home_country.str, ++ c->home_po_box.str, c->home_postal_code.str, c->home_state.str, c->home_street.str); + + contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, +- c->other_address, c->other_city, c->other_country, +- c->other_po_box, c->other_postal_code, c->other_state, c->other_street); ++ c->other_address.str, c->other_city.str, c->other_country.str, ++ c->other_po_box.str, c->other_postal_code.str, c->other_state.str, c->other_street.str); + +- contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone); +- contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax); +- contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone); +- contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_2, c->business_phone2); +- contact_set_string (ec, E_CONTACT_PHONE_CALLBACK, c->callback_phone); +- contact_set_string (ec, E_CONTACT_PHONE_CAR, c->car_phone); +- contact_set_string (ec, E_CONTACT_PHONE_COMPANY, c->company_main_phone); +- contact_set_string (ec, E_CONTACT_PHONE_HOME_FAX, c->home_fax); +- contact_set_string (ec, E_CONTACT_PHONE_HOME, c->home_phone); +- contact_set_string (ec, E_CONTACT_PHONE_HOME_2, c->home_phone2); +- contact_set_string (ec, E_CONTACT_PHONE_ISDN, c->isdn_phone); +- contact_set_string (ec, E_CONTACT_PHONE_MOBILE, c->mobile_phone); +- contact_set_string (ec, E_CONTACT_PHONE_OTHER_FAX, c->primary_fax); /* ? */ +- contact_set_string (ec, E_CONTACT_PHONE_PAGER, c->pager_phone); +- contact_set_string (ec, E_CONTACT_PHONE_PRIMARY, c->primary_phone); +- contact_set_string (ec, E_CONTACT_PHONE_RADIO, c->radio_phone); +- contact_set_string (ec, E_CONTACT_PHONE_TTYTDD, c->ttytdd_phone); +- contact_set_string (ec, E_CONTACT_PHONE_TELEX, c->telex); +- unknown_field (ec, notes, "account_name", c->account_name); ++ contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax.str); ++ contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_2, c->business_phone2.str); ++ contact_set_string (ec, E_CONTACT_PHONE_CALLBACK, c->callback_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_CAR, c->car_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_COMPANY, c->company_main_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_HOME_FAX, c->home_fax.str); ++ contact_set_string (ec, E_CONTACT_PHONE_HOME, c->home_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_HOME_2, c->home_phone2.str); ++ contact_set_string (ec, E_CONTACT_PHONE_ISDN, c->isdn_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_MOBILE, c->mobile_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_OTHER_FAX, c->primary_fax.str); /* ? */ ++ contact_set_string (ec, E_CONTACT_PHONE_PAGER, c->pager_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_PRIMARY, c->primary_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_RADIO, c->radio_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_TTYTDD, c->ttytdd_phone.str); ++ contact_set_string (ec, E_CONTACT_PHONE_TELEX, c->telex.str); ++ unknown_field (ec, notes, "account_name", c->account_name.str); + contact_set_date (ec, E_CONTACT_ANNIVERSARY, c->wedding_anniversary); +- contact_set_string (ec, E_CONTACT_ASSISTANT, c->assistant_name); +- unknown_field (ec, notes, "billing_information", c->billing_information); ++ contact_set_string (ec, E_CONTACT_ASSISTANT, c->assistant_name.str); ++ unknown_field (ec, notes, "billing_information", c->billing_information.str); + contact_set_date (ec, E_CONTACT_BIRTH_DATE, c->birthday); + /* contact_set_string (ec, E_CONTACT_CATEGORIES, c->??); */ + +- contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1); +- contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2); +- contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3); ++ contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1.str); ++ contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2.str); ++ contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3.str); + + /*unknown_field (ec, notes, "address1_desc" , c->address1_desc); + unknown_field (ec, notes, "address1_transport" , c->address1_transport); +@@ -1115,43 +1109,43 @@ pst_process_contact (PstImporter *m, pst + /*unknown_field (ec, notes, "def_postal_address", c->def_postal_address);*/ + + /* unknown_field (ec, ??, c->gender); */ +- unknown_field (ec, notes, "access_method", c->access_method); +- unknown_field (ec, notes, "gov_id", c->gov_id); +- unknown_field (ec, notes, "customer_id", c->customer_id); +- unknown_field (ec, notes, "hobbies", c->hobbies); +- unknown_field (ec, notes, "followup", c->followup); ++ unknown_field (ec, notes, "access_method", c->access_method.str); ++ unknown_field (ec, notes, "gov_id", c->gov_id.str); ++ unknown_field (ec, notes, "customer_id", c->customer_id.str); ++ unknown_field (ec, notes, "hobbies", c->hobbies.str); ++ unknown_field (ec, notes, "followup", c->followup.str); + +- contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address); ++ contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address.str); + +- unknown_field (ec, notes, "keyword", c->keyword); +- unknown_field (ec, notes, "language", c->language); +- unknown_field (ec, notes, "location", c->location); +- contact_set_string (ec, E_CONTACT_OFFICE, c->office_loc); +- unknown_field (ec, notes, "computer_name", c->computer_name); +- unknown_field (ec, notes, "ftp_site", c->ftp_site); ++ unknown_field (ec, notes, "keyword", c->keyword.str); ++ unknown_field (ec, notes, "language", c->language.str); ++ unknown_field (ec, notes, "location", c->location.str); ++ contact_set_string (ec, E_CONTACT_OFFICE, c->office_loc.str); ++ unknown_field (ec, notes, "computer_name", c->computer_name.str); ++ unknown_field (ec, notes, "ftp_site", c->ftp_site.str); + +- contact_set_string (ec, E_CONTACT_MANAGER , c->manager_name); +- unknown_field (ec, notes, "mileage", c->mileage); +- unknown_field (ec, notes, "org_id", c->org_id); +- contact_set_string (ec, E_CONTACT_ROLE, c->profession); ++ contact_set_string (ec, E_CONTACT_MANAGER , c->manager_name.str); ++ unknown_field (ec, notes, "mileage", c->mileage.str); ++ unknown_field (ec, notes, "org_id", c->org_id.str); ++ contact_set_string (ec, E_CONTACT_ROLE, c->profession.str); + +- contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name); ++ contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name.str); + +- if (c->personal_homepage) { +- contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->personal_homepage); +- if (c->business_homepage) { +- unknown_field (ec, notes, "business_homepage", c->business_homepage); ++ if (c->personal_homepage.str) { ++ contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->personal_homepage.str); ++ if (c->business_homepage.str) { ++ unknown_field (ec, notes, "business_homepage", c->business_homepage.str); + } +- } else if (c->business_homepage) { +- contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage); ++ } else if (c->business_homepage.str) { ++ contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage.str); + } + +- if (item->comment) { +- g_string_append_printf (notes, "%s\n", item->comment); ++ if (item->comment.str) { ++ g_string_append_printf (notes, "%s\n", item->comment.str); + } + +- if (item->email && item->email->body) { +- g_string_append_printf (notes, "%s\n", item->email->body); ++ if (item->email && item->body.str) { ++ g_string_append_printf (notes, "%s\n", item->body.str); + } + + contact_set_string (ec, E_CONTACT_NOTE, notes->str); +@@ -1174,26 +1168,13 @@ get_ical_date (FILETIME *date, gboolean + if (date && (date->dwLowDateTime || date->dwHighDateTime) ) { + time_t t; + +- t = fileTimeToUnixTime (date, 0); ++ t = pst_fileTimeToUnixTime (date); + return icaltime_from_timet_with_zone (t, is_date, NULL); + } else { + return icaltime_null_date (); + } + } + +-gchar *rfc2445_datetime_format (FILETIME *ft) { +- static gchar * buffer = NULL; +- struct tm *stm = NULL; +- +- if (buffer == NULL) { +- buffer = malloc (30); // should be enough +- } +- +- stm = fileTimeToStructTM (ft); +- strftime (buffer, 30, "%Y%m%dT%H%M%SZ", stm); +- return buffer; +-} +- + static void + set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_attach *attach) + { +@@ -1315,19 +1296,19 @@ fill_calcomponent (PstImporter *m, pst_i + } + + if (e) { +- if (e->subject || e->proc_subject) { +- if (e->subject) { +- text.value = e->subject->subj; +- } else if (e->proc_subject) { +- text.value = e->proc_subject; ++ if (item->subject.str || e->processed_subject.str) { ++ if (item->subject.str) { ++ text.value = item->subject.str; ++ } else if (e->processed_subject.str) { ++ text.value = e->processed_subject.str; + } + + text.altrep = NULL; /* email->proc_subject? */ + e_cal_component_set_summary (ec, &text); + } +- if (e->body) { ++ if (item->body.str) { + GSList l; +- text.value = e->body; ++ text.value = item->body.str; + text.altrep = NULL; + l.data = &text; + l.next = NULL; +@@ -1337,8 +1318,8 @@ fill_calcomponent (PstImporter *m, pst_i + g_warning ("%s without subject / body!", type); + } + +- if (a->location) { +- e_cal_component_set_location (ec, a->location); ++ if (a->location.str) { ++ e_cal_component_set_location (ec, a->location.str); + } + + if (a->start) { +@@ -1405,7 +1386,7 @@ fill_calcomponent (PstImporter *m, pst_i + } + + if (a->alarm) { +- if (a->alarm_filename) { ++ if (a->alarm_filename.str) { + e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_AUDIO); + } else { + e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY); +@@ -1417,7 +1398,7 @@ fill_calcomponent (PstImporter *m, pst_i + + } + +- if (a->recurrence != PST_APP_RECUR_NONE) { ++ if (a->recurrence.str != PST_APP_RECUR_NONE) { + struct icalrecurrencetype r; + GSList recur_list; + +@@ -1706,7 +1687,6 @@ pst_init (pst_file *pst, gchar *filename + DEBUG_REGISTER_CLOSE (); + #endif + +- DEBUG_ENT ("main"); + if (pst_open (pst, filename) < 0) { + pst_error_msg ("Error opening PST file %s", filename); + return -1; +@@ -1737,7 +1717,7 @@ get_pst_rootname (pst_file *pst, gchar * + pst_item *item = NULL; + gchar *rootname = NULL; + +- if ((item = pst_parse_item (pst, pst->d_head)) == NULL) { ++ if ((item = pst_parse_item (pst, pst->d_head, NULL)) == NULL) { + pst_error_msg ("Could not get root record"); + return NULL; + } +@@ -1749,14 +1729,14 @@ get_pst_rootname (pst_file *pst, gchar * + } + + /* default the file_as to the same as the main filename if it doesn't exist */ +- if (item->file_as == NULL) { ++ if (item->file_as.str == NULL) { + if (filename == NULL) { + pst_freeItem (item); + return NULL; + } + rootname = g_path_get_basename (filename); + } else { +- rootname = g_strdup (item->file_as); ++ rootname = g_strdup (item->file_as.str); + } + + pst_freeItem (item); diff --git a/evolution.spec b/evolution.spec index e69796f..8a266da 100644 --- a/evolution.spec +++ b/evolution.spec @@ -68,6 +68,9 @@ Patch12: evolution-2.9.1-im-context-reset.patch # Support for building Anjal. Patch13: evolution-2.27.3-anjal-support.patch +# Let the pst-import plugin work with current libpst. +Patch14: evolution-2.27.3-pst-import.patch + ## Dependencies ### Requires(post): GConf2 @@ -226,6 +229,7 @@ This package contains supplemental utilities for %{name} that require Perl. %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .anjal-support +%patch14 -p1 -b .pst-import mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -675,6 +679,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Thu Jul 02 2009 Matthew Barnes - 2.27.3-4.fc12 - Add BR for libpst-devel and libytnef-devel (RH bug #493049). +- Add patch to build pst-import plugin against current libpst. * Wed Jul 01 2009 Milan Crha - 2.27.3-3.fc12 - Rebuild against newer gcc From ba26f4fa5f0e7d4928a8e087b1d2f66dbafb02d6 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 2 Jul 2009 21:22:17 +0000 Subject: [PATCH 285/844] - Add BR for libpst-devel and libytnef-devel (RH bug #493049). - Add patch to build pst-import plugin against current libpst. - libpst's API broke again so disable the BR's for now. - Specify the gettext package when calling intltool-update. --- evolution.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8a266da..ade784d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -112,11 +112,11 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libgweather-devel >= %{libgweather_version} -BuildRequires: libpst-devel +#BuildRequires: libpst-devel BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel -BuildRequires: libytnef-devel +#BuildRequires: libytnef-devel BuildRequires: pkgconfig %if %{use_mozilla_nss} @@ -313,9 +313,9 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE cd po grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in -intltool-update --pot +intltool-update --gettext-package=%{name}-%{evo-major} --pot for p in *.po; do - msgmerge $p evolution-%{evo_major}.pot > $p.out + msgmerge $p %{name}-%{evo_major}.pot > $p.out msgfmt -o `basename $p .po`.gmo $p.out done cd - @@ -680,6 +680,8 @@ rm -rf $RPM_BUILD_ROOT * Thu Jul 02 2009 Matthew Barnes - 2.27.3-4.fc12 - Add BR for libpst-devel and libytnef-devel (RH bug #493049). - Add patch to build pst-import plugin against current libpst. +- libpst's API broke again so disable the BR's for now. +- Specify the gettext package when calling intltool-update. * Wed Jul 01 2009 Milan Crha - 2.27.3-3.fc12 - Rebuild against newer gcc From 8405ca2c5e48f30647b3e9828a5f8b51caa20440 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 10 Jul 2009 15:03:47 +0000 Subject: [PATCH 286/844] - Add an evolution-pst subpackage for the PST importer plugin. - Disabled until libpst settles on an API. --- evolution.spec | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index ade784d..38f9ce2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -22,6 +22,7 @@ %define inline_audio_support 1 %define ldap_support 1 %define libnotify_support 1 +%define libpst_support 1 %define krb5_support 1 %define nntp_support 1 %ifnarch s390 s390x @@ -42,7 +43,7 @@ Name: evolution Version: 2.27.3 -Release: 4%{?dist} +Release: 5%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -112,11 +113,9 @@ BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 BuildRequires: libgweather-devel >= %{libgweather_version} -#BuildRequires: libpst-devel BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel -#BuildRequires: libytnef-devel BuildRequires: pkgconfig %if %{use_mozilla_nss} @@ -154,6 +153,11 @@ BuildRequires: NetworkManager-glib-devel BuildRequires: libnotify-devel %endif +%if %{libpst_support} +BuildRequires: libpst-devel +BuildRequires: libytnef-devel +%endif + %description Evolution is the GNOME mailer, calendar, contact manager and communications tool. The components which make up Evolution @@ -223,6 +227,19 @@ Requires: %{name} = %{version}-%{release} %description perl This package contains supplemental utilities for %{name} that require Perl. +%if %{libpst_support} +%package pst +Group: Applications/Productivity +Summary: PST importer plugin for Evolution +Requires: %{name} = %{version}-%{release} +Requires: libpst +Requires: libytnef + +%description pst +This package contains the plugin to import Microsoft Personal Storage Table +(PST) files used by Microsoft Outlook and Microsoft Exchange. +%endif + %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack @@ -676,7 +693,18 @@ rm -rf $RPM_BUILD_ROOT %{_libexecdir}/evolution/%{evo_major}/csv2vcard %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean +%if %{libpst_support} +%files pst +%defattr(-, root, root) +%{evo_plugin_dir}/org-gnome-pst-import.eplug +%{evo_plugin_dir}/liborg-gnome-pst-import.so +%endif + %changelog +* Fri Jul 10 2009 Matthew Barnes - 2.26.3-2.fc11 +- Add an evolution-pst subpackage for the PST importer plugin. +- Disabled until libpst settles on an API. + * Thu Jul 02 2009 Matthew Barnes - 2.27.3-4.fc12 - Add BR for libpst-devel and libytnef-devel (RH bug #493049). - Add patch to build pst-import plugin against current libpst. From 7b7a19d8ff883b5092203b65a1d098c6d8c47f72 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 10 Jul 2009 15:19:27 +0000 Subject: [PATCH 287/844] Actually disable the PST importer. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 38f9ce2..5b5f33f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -22,7 +22,7 @@ %define inline_audio_support 1 %define ldap_support 1 %define libnotify_support 1 -%define libpst_support 1 +%define libpst_support 0 %define krb5_support 1 %define nntp_support 1 %ifnarch s390 s390x From ef77a5f85140375f5260f75c3fd74062791f1348 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 10 Jul 2009 15:35:27 +0000 Subject: [PATCH 288/844] Fix a typo. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 5b5f33f..fd3bef6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -330,7 +330,7 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE cd po grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in -intltool-update --gettext-package=%{name}-%{evo-major} --pot +intltool-update --gettext-package=%{name}-%{evo_major} --pot for p in *.po; do msgmerge $p %{name}-%{evo_major}.pot > $p.out msgfmt -o `basename $p .po`.gmo $p.out From ea751f2d6d34a4b04591da35ec4f6954a200d756 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 13 Jul 2009 14:32:47 +0000 Subject: [PATCH 289/844] - Update to 2.27.4 --- .cvsignore | 2 +- evolution-2.27.3-anjal-support.patch | 37 ---------------------------- evolution.spec | 13 +++++----- sources | 2 +- 4 files changed, 8 insertions(+), 46 deletions(-) delete mode 100644 evolution-2.27.3-anjal-support.patch diff --git a/.cvsignore b/.cvsignore index a092b61..fa9c346 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.3.tar.bz2 +evolution-2.27.4.tar.bz2 diff --git a/evolution-2.27.3-anjal-support.patch b/evolution-2.27.3-anjal-support.patch deleted file mode 100644 index 442ec16..0000000 --- a/evolution-2.27.3-anjal-support.patch +++ /dev/null @@ -1,37 +0,0 @@ -diff -up evolution-2.27.3/mail/e-mail-attachment-bar.h.anjal-support evolution-2.27.3/mail/e-mail-attachment-bar.h ---- evolution-2.27.3/mail/e-mail-attachment-bar.h.anjal-support 2009-06-12 10:54:40.000000000 -0400 -+++ evolution-2.27.3/mail/e-mail-attachment-bar.h 2009-06-23 10:37:33.000000000 -0400 -@@ -23,7 +23,7 @@ - #define E_MAIL_ATTACHMENT_BAR_H - - #include --#include -+#include - - /* Standard GObject macros */ - #define E_TYPE_MAIL_ATTACHMENT_BAR \ -diff -up evolution-2.27.3/mail/Makefile.am.anjal-support evolution-2.27.3/mail/Makefile.am ---- evolution-2.27.3/mail/Makefile.am.anjal-support 2009-06-12 10:54:40.000000000 -0400 -+++ evolution-2.27.3/mail/Makefile.am 2009-06-23 10:37:33.000000000 -0400 -@@ -105,10 +105,6 @@ mailinclude_HEADERS = \ - libevolution_mail_la_SOURCES = \ - $(MAIL_IDL_GENERATED) \ - $(mailinclude_HEADERS) \ -- e-attachment-handler-mail.c \ -- e-attachment-handler-mail.h \ -- e-mail-attachment-bar.c \ -- e-mail-search-bar.c \ - e-searching-tokenizer.c \ - em-account-prefs.c \ - em-account-prefs.h \ -@@ -174,6 +170,10 @@ libevolution_mail_la_DEPENDENCIES = \ - libevolution-mail-shared.la - - libevolution_mail_shared_la_SOURCES = \ -+ e-attachment-handler-mail.c \ -+ e-attachment-handler-mail.h \ -+ e-mail-attachment-bar.c \ -+ e-mail-search-bar.c \ - em-account-editor.c \ - em-account-editor.h \ - em-event.c \ diff --git a/evolution.spec b/evolution.spec index fd3bef6..bc0e921 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.27.3 -Release: 5%{?dist} +Version: 2.27.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -66,9 +66,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Support for building Anjal. -Patch13: evolution-2.27.3-anjal-support.patch - # Let the pst-import plugin work with current libpst. Patch14: evolution-2.27.3-pst-import.patch @@ -245,7 +242,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .anjal-support %patch14 -p1 -b .pst-import mkdir -p krb5-fakeprefix/include @@ -701,7 +697,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Fri Jul 10 2009 Matthew Barnes - 2.26.3-2.fc11 +* Mon Jul 13 2009 Matthew Barnes - 2.27.4-1.fc12 +- Update to 2.27.4 + +* Fri Jul 10 2009 Matthew Barnes - 2.27.3-5.fc11 - Add an evolution-pst subpackage for the PST importer plugin. - Disabled until libpst settles on an API. diff --git a/sources b/sources index 03f347e..99b80da 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -31d95df4c3a8f078443ec22a57742aea evolution-2.27.3.tar.bz2 +4fc469d16b3fe8eefbb313f83f7a3f74 evolution-2.27.4.tar.bz2 From c65c354600bb15e2843a286079d6572bc259d5cf Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 13 Jul 2009 18:34:19 +0000 Subject: [PATCH 290/844] - Update to 2.27.4 - Work around deprecation of g_mount_unmount(). --- evolution-2.27.4-gmount-deprecation.patch | 27 +++++++++++++++++++++++ evolution.spec | 5 +++++ 2 files changed, 32 insertions(+) create mode 100644 evolution-2.27.4-gmount-deprecation.patch diff --git a/evolution-2.27.4-gmount-deprecation.patch b/evolution-2.27.4-gmount-deprecation.patch new file mode 100644 index 0000000..b917127 --- /dev/null +++ b/evolution-2.27.4-gmount-deprecation.patch @@ -0,0 +1,27 @@ +diff -up evolution-2.27.4/plugins/publish-calendar/publish-calendar.c.gmount-deprecation evolution-2.27.4/plugins/publish-calendar/publish-calendar.c +--- evolution-2.27.4/plugins/publish-calendar/publish-calendar.c.gmount-deprecation 2009-07-13 03:45:13.000000000 -0400 ++++ evolution-2.27.4/plugins/publish-calendar/publish-calendar.c 2009-07-13 14:32:58.000000000 -0400 +@@ -129,7 +129,11 @@ unmount_done_cb (GObject *source_object, + { + GError *error = NULL; + ++#if GLIB_CHECK_VERSION(2,21,4) ++ g_mount_unmount_with_operation_finish (G_MOUNT (source_object), res, &error); ++#else + g_mount_unmount_finish (G_MOUNT (source_object), res, &error); ++#endif + + if (error) { + g_warning ("Unmount failed: %s", error->message); +@@ -177,7 +181,11 @@ mount_ready_cb (GObject *source_object, + + mount = g_file_find_enclosing_mount (G_FILE (source_object), NULL, NULL); + if (mount) ++#if GLIB_CHECK_VERSION(2,21,4) ++ g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, unmount_done_cb, NULL); ++#else + g_mount_unmount (mount, G_MOUNT_UNMOUNT_NONE, NULL, unmount_done_cb, NULL); ++#endif + + g_object_unref (source_object); + } diff --git a/evolution.spec b/evolution.spec index bc0e921..1f34a42 100644 --- a/evolution.spec +++ b/evolution.spec @@ -69,6 +69,9 @@ Patch12: evolution-2.9.1-im-context-reset.patch # Let the pst-import plugin work with current libpst. Patch14: evolution-2.27.3-pst-import.patch +# Work around deprecation of g_mount_unmount(). +Patch15: evolution-2.27.4-gmount-deprecation.patch + ## Dependencies ### Requires(post): GConf2 @@ -243,6 +246,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset %patch14 -p1 -b .pst-import +%patch15 -p1 -b .gmount-deprecation mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -699,6 +703,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jul 13 2009 Matthew Barnes - 2.27.4-1.fc12 - Update to 2.27.4 +- Work around deprecation of g_mount_unmount(). * Fri Jul 10 2009 Matthew Barnes - 2.27.3-5.fc11 - Add an evolution-pst subpackage for the PST importer plugin. From b892b40ed418e709763804c92a62e46dae5e91ff Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Fri, 24 Jul 2009 22:22:08 +0000 Subject: [PATCH 291/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1f34a42..7b000c8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -701,6 +701,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jul 24 2009 Fedora Release Engineering - 2.27.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild + * Mon Jul 13 2009 Matthew Barnes - 2.27.4-1.fc12 - Update to 2.27.4 - Work around deprecation of g_mount_unmount(). From 6811d3a03fbf74ddccb31f4edf3e240d997026d8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Jul 2009 16:13:15 +0000 Subject: [PATCH 292/844] - Update to 2.27.5 - Remove pst import plugin patch (fixed upstream). - Remove work around deprecation of g_mount_unmount (fixed upstream). --- .cvsignore | 2 +- evolution-2.27.3-pst-import.patch | 654 ---------------------- evolution-2.27.4-gmount-deprecation.patch | 27 - evolution.spec | 17 +- sources | 2 +- 5 files changed, 9 insertions(+), 693 deletions(-) delete mode 100644 evolution-2.27.3-pst-import.patch delete mode 100644 evolution-2.27.4-gmount-deprecation.patch diff --git a/.cvsignore b/.cvsignore index fa9c346..cb28ba9 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.4.tar.bz2 +evolution-2.27.5.tar.bz2 diff --git a/evolution-2.27.3-pst-import.patch b/evolution-2.27.3-pst-import.patch deleted file mode 100644 index 216fc06..0000000 --- a/evolution-2.27.3-pst-import.patch +++ /dev/null @@ -1,654 +0,0 @@ -diff -up evolution-2.27.3/plugins/pst-import/pst-importer.c.pst-import evolution-2.27.3/plugins/pst-import/pst-importer.c ---- evolution-2.27.3/plugins/pst-import/pst-importer.c.pst-import 2009-06-12 10:54:40.000000000 -0400 -+++ evolution-2.27.3/plugins/pst-import/pst-importer.c 2009-07-02 16:18:08.000000000 -0400 -@@ -66,7 +66,6 @@ - #include - #include - --#include - #include - #include - -@@ -75,8 +74,8 @@ typedef struct _PstImporter PstImporter; - gint pst_init (pst_file *pst, gchar *filename); - gchar *get_pst_rootname (pst_file *pst, gchar *filename); - static void pst_error_msg (const gchar *fmt, ...); --static void pst_import_folders (PstImporter *m, pst_desc_ll *topitem); --static void pst_process_item (PstImporter *m, pst_desc_ll *d_ptr); -+static void pst_import_folders (PstImporter *m, pst_desc_tree *topitem); -+static void pst_process_item (PstImporter *m, pst_desc_tree *d_ptr); - static void pst_process_folder (PstImporter *m, pst_item *item); - static void pst_process_email (PstImporter *m, pst_item *item); - static void pst_process_contact (PstImporter *m, pst_item *item); -@@ -89,7 +88,6 @@ gchar *foldername_to_utf8 (const gchar * - gchar *string_to_utf8(const gchar *string); - void contact_set_date (EContact *contact, EContactField id, FILETIME *date); - struct icaltimetype get_ical_date (FILETIME *date, gboolean is_date); --gchar *rfc2445_datetime_format (FILETIME *ft); - - gboolean org_credativ_evolution_readpst_supported (EPlugin *epl, EImportTarget *target); - GtkWidget *org_credativ_evolution_readpst_getwidget (EImport *ei, EImportTarget *target, EImportImporter *im); -@@ -449,7 +447,7 @@ pst_import_file (PstImporter *m) - gint ret; - gchar *filename; - pst_item *item = NULL; -- pst_desc_ll *d_ptr; -+ pst_desc_tree *d_ptr; - - filename = g_filename_from_uri (((EImportTargetURI *)m->target)->uri_src, NULL, NULL); - m->parent_uri = g_strdup (((EImportTargetURI *)m->target)->uri_dest); /* Destination folder, was set in our widget */ -@@ -472,7 +470,7 @@ pst_import_file (PstImporter *m) - - camel_operation_progress_count (NULL, 1); - -- if ((item = pst_parse_item (&m->pst, m->pst.d_head)) == NULL) { -+ if ((item = pst_parse_item (&m->pst, m->pst.d_head, NULL)) == NULL) { - pst_error_msg ("Could not get root record"); - return; - } -@@ -496,9 +494,9 @@ pst_import_file (PstImporter *m) - } - - static void --pst_import_folders (PstImporter *m, pst_desc_ll *topitem) -+pst_import_folders (PstImporter *m, pst_desc_tree *topitem) - { -- pst_desc_ll *d_ptr; -+ pst_desc_tree *d_ptr; - gchar *seperator; - - d_ptr = topitem->child; -@@ -540,14 +538,14 @@ pst_import_folders (PstImporter *m, pst_ - } - - static void --pst_process_item (PstImporter *m, pst_desc_ll *d_ptr) -+pst_process_item (PstImporter *m, pst_desc_tree *d_ptr) - { - pst_item *item = NULL; - - if (d_ptr->desc == NULL) - return; - -- item = pst_parse_item (&m->pst, d_ptr); -+ item = pst_parse_item (&m->pst, d_ptr, NULL); - - if (item == NULL) - return; -@@ -560,7 +558,7 @@ pst_process_item (PstImporter *m, pst_de - - if (item->folder != NULL) { - pst_process_folder (m, item); -- camel_operation_start (NULL, _("Importing `%s'"), item->file_as); -+ camel_operation_start (NULL, _("Importing `%s'"), item->file_as.str); - } else { - if (m->folder_count && (m->current_item < m->folder_count)) { - camel_operation_progress (NULL, (m->current_item * 100) / m->folder_count); -@@ -661,10 +659,10 @@ pst_process_folder (PstImporter *m, pst_ - g_free (m->folder_name); - g_free (m->folder_uri); - -- if (item->file_as != NULL) { -- m->folder_name = foldername_to_utf8 (item->file_as); -+ if (item->file_as.str != NULL) { -+ m->folder_name = foldername_to_utf8 (item->file_as.str); - } else { -- g_critical ("Folder: No name! item->file_as=%s", item->file_as); -+ g_critical ("Folder: No name! item->file_as=%s", item->file_as.str); - m->folder_name = g_strdup ("unknown_name"); - } - -@@ -676,7 +674,7 @@ pst_process_folder (PstImporter *m, pst_ - m->folder = NULL; - } - -- m->folder_count = item->folder->email_count; -+ m->folder_count = item->folder->item_count; - m->current_item = 0; - } - -@@ -737,22 +735,22 @@ attachment_to_part (PstImporter *m, pst_ - - part = camel_mime_part_new (); - -- if (attach->filename2 || attach->filename1) { -- camel_mime_part_set_filename (part, (attach->filename2 ? attach->filename2 : attach->filename1)); -+ if (attach->filename2.str || attach->filename1.str) { -+ camel_mime_part_set_filename (part, (attach->filename2.str ? attach->filename2.str : attach->filename1.str)); - camel_mime_part_set_disposition (part, "attachment"); - camel_mime_part_set_encoding (part, CAMEL_TRANSFER_ENCODING_BASE64); - } else { - camel_mime_part_set_disposition (part, "inline"); - } - -- if (attach->mimetype != NULL) { -- mimetype = attach->mimetype; -+ if (attach->mimetype.str != NULL) { -+ mimetype = attach->mimetype.str; - } else { - mimetype = "application/octet-stream"; - } - -- if (attach->data != NULL) { -- camel_mime_part_set_content (part, attach->data, strlen (attach->data), mimetype); -+ if (attach->data.data != NULL) { -+ camel_mime_part_set_content (part, attach->data.data, strlen (attach->data.data), mimetype); - } else { - gchar *buf = NULL; - gsize size; -@@ -773,21 +771,23 @@ pst_process_email (PstImporter *m, pst_i - CamelMultipart *mp; - CamelMimePart *part; - CamelMessageInfo *info; -+ pst_item_attach *attach; - - if (m->folder == NULL) { - pst_create_folder (m); -+ - } - - camel_folder_freeze (m->folder); - - msg = camel_mime_message_new (); - -- if (item->email->subject != NULL) { -+ if (item->subject.str != NULL) { - gchar *subj; - -- subj = string_to_utf8 (item->email->subject->subj); -+ subj = string_to_utf8 (item->subject.str); - if (subj == NULL) { -- g_warning ("Could not convert email subject to utf8: %s", item->email->subject->subj); -+ g_warning ("Could not convert email subject to utf8: %s", item->subject.str); - camel_mime_message_set_subject (msg, "(lost subject)"); - } else { - camel_mime_message_set_subject (msg, subj); -@@ -797,12 +797,12 @@ pst_process_email (PstImporter *m, pst_i - - addr = camel_internet_address_new (); - -- if (item->email->outlook_sender_name != NULL && item->email->outlook_sender != NULL) { -- camel_internet_address_add (addr, item->email->outlook_sender_name, item->email->outlook_sender); -- } else if (item->email->outlook_sender_name != NULL) { -- camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender_name); -- } else if (item->email->outlook_sender != NULL) { -- camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender); -+ if (item->email->outlook_sender_name.str != NULL && item->email->outlook_sender.str != NULL) { -+ camel_internet_address_add (addr, item->email->outlook_sender_name.str, item->email->outlook_sender.str); -+ } else if (item->email->outlook_sender_name.str != NULL) { -+ camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender_name.str); -+ } else if (item->email->outlook_sender.str != NULL) { -+ camel_address_decode (CAMEL_ADDRESS (addr), item->email->outlook_sender.str); - } else { - /* Evo prints a warning if no from is set, so supply an empty address */ - camel_internet_address_add (addr, "", ""); -@@ -812,38 +812,38 @@ pst_process_email (PstImporter *m, pst_i - camel_object_unref (addr); - - if (item->email->sent_date != NULL) { -- camel_mime_message_set_date (msg, fileTimeToUnixTime (item->email->sent_date, 0), 0); -+ camel_mime_message_set_date (msg, pst_fileTimeToUnixTime (item->email->sent_date), 0); - } - -- if (item->email->messageid != NULL) { -- camel_mime_message_set_message_id (msg, item->email->messageid); -+ if (item->email->messageid.str != NULL) { -+ camel_mime_message_set_message_id (msg, item->email->messageid.str); - } - -- if (item->email->header != NULL) { -+ if (item->email->header.str != NULL) { - /* Use mime parser to read headers */ - CamelStream *stream; - /*g_debug (" Email headers length=%zd", strlen (item->email->header));*/ - /*g_message (" Email headers... %s...", item->email->header);*/ - -- stream = camel_stream_mem_new_with_buffer (item->email->header, strlen (item->email->header)); -+ stream = camel_stream_mem_new_with_buffer (item->email->header.str, strlen (item->email->header.str)); - if (camel_data_wrapper_construct_from_stream ((CamelDataWrapper *)msg, stream) == -1) - g_warning ("Error reading headers, skipped"); - - } else { - -- if (item->email->sentto_address != NULL) { -+ if (item->email->sentto_address.str != NULL) { - addr = camel_internet_address_new (); - -- if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address) > 0); -+ if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->sentto_address.str) > 0) - camel_mime_message_set_recipients (msg, "To", addr); - - camel_object_unref (addr); - } - -- if (item->email->cc_address != NULL) { -+ if (item->email->cc_address.str != NULL) { - addr = camel_internet_address_new (); - -- if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address) > 0); -+ if (camel_address_decode (CAMEL_ADDRESS (addr), item->email->cc_address.str) > 0) - camel_mime_message_set_recipients (msg, "CC", addr); - - camel_object_unref (addr); -@@ -856,11 +856,11 @@ pst_process_email (PstImporter *m, pst_i - - camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/mixed"); - -- } else if (item->email->htmlbody && item->email->body) { -+ } else if (item->email->htmlbody.str && item->body.str) { - - camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "multipart/alternate"); - -- } else if (item->email->htmlbody) { -+ } else if (item->email->htmlbody.str) { - - camel_data_wrapper_set_mime_type (CAMEL_DATA_WRAPPER (mp), "text/html"); - -@@ -868,62 +868,56 @@ pst_process_email (PstImporter *m, pst_i - - camel_multipart_set_boundary (mp, NULL); - -- if (item->email->body != NULL) { -+ if (item->body.str != NULL) { - /* Read internet headers */ - - /*g_debug (" Email body length=%zd", strlen (item->email->body)); - g_message (" Email body %100s...", item->email->body);*/ - - part = camel_mime_part_new (); -- camel_mime_part_set_content (part, item->email->body, strlen (item->email->body), "text/plain"); -+ camel_mime_part_set_content (part, item->body.str, strlen (item->body.str), "text/plain"); - camel_multipart_add_part (mp, part); - camel_object_unref (part); - } - -- if (item->email->htmlbody != NULL) { -+ if (item->email->htmlbody.str != NULL) { - /*g_debug (" HTML body length=%zd", strlen (item->email->htmlbody));*/ - part = camel_mime_part_new (); -- camel_mime_part_set_content (part, item->email->htmlbody, strlen (item->email->htmlbody), "text/html"); -+ camel_mime_part_set_content (part, item->email->htmlbody.str, strlen (item->email->htmlbody.str), "text/html"); - camel_multipart_add_part (mp, part); - camel_object_unref (part); - } - -- item->current_attach = item->attach; -- -- while (item->current_attach != NULL) { -- pst_item_attach *attach; -- -- attach = item->current_attach; -- part = attachment_to_part(m, attach); -- -- camel_multipart_add_part (mp, part); -- camel_object_unref (part); -- -- item->current_attach = item->current_attach->next; -+ for (attach = item->attach; attach; attach = attach->next) { -+ if (attach->data.data || attach->i_id) { -+ part = attachment_to_part(m, attach); -+ camel_multipart_add_part (mp, part); -+ camel_object_unref (part); -+ } - } - - /*camel_mime_message_dump (msg, TRUE);*/ - -- if (item->email->htmlbody || item->attach) { -+ if (item->email->htmlbody.str || item->attach) { - camel_medium_set_content_object (CAMEL_MEDIUM (msg), CAMEL_DATA_WRAPPER (mp)); -- } else if (item->email->body) { -- camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->email->body, strlen (item->email->body), "text/plain"); -+ } else if (item->body.str) { -+ camel_mime_part_set_content (CAMEL_MIME_PART (msg), item->body.str, strlen (item->body.str), "text/plain"); - } else { - g_warning ("Email without body. Subject:%s", -- (item->email->subject->subj ? item->email->subject->subj : "(empty)")); -+ (item->subject.str ? item->subject.str : "(empty)")); - camel_mime_part_set_content (CAMEL_MIME_PART (msg), "\n", 1, "text/plain"); - } - - info = camel_message_info_new (NULL); - - /* Read message flags (see comments in libpst.c */ -- if(item->email->flag && 0x01) -+ if(item->flags && 0x01) - camel_message_info_set_flags (info, CAMEL_MESSAGE_SEEN, ~0); - - if(item->email->importance == 2) - camel_message_info_set_flags (info, CAMEL_MESSAGE_FLAGGED, ~0); - -- if(item->email->flag && 0x08) -+ if(item->flags && 0x08) - camel_message_info_set_flags (info, CAMEL_MESSAGE_DRAFT, ~0); - - camel_folder_append_message (m->folder, msg, info, NULL, &m->ex); -@@ -1003,7 +997,7 @@ contact_set_date (EContact *contact, ECo - EContactDate *bday; - bday = e_contact_date_new (); - -- t1 = fileTimeToUnixTime (date, 0); -+ t1 = pst_fileTimeToUnixTime (date); - gmtime_r (&t1, &tm); - - bday->year = tm.tm_year + 1900; -@@ -1026,84 +1020,84 @@ pst_process_contact (PstImporter *m, pst - - ec = e_contact_new (); - /* pst's fullname field only contains first, middle, surname */ -- if (c->display_name_prefix || c->suffix) { -+ if (c->display_name_prefix.str || c->suffix.str) { - GString *name = g_string_sized_new (128); - -- if (c->display_name_prefix) { -- g_string_assign (name, c->display_name_prefix); -+ if (c->display_name_prefix.str) { -+ g_string_assign (name, c->display_name_prefix.str); - } - -- if (c->first_name) { -- g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->first_name); -+ if (c->first_name.str) { -+ g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->first_name.str); - } - -- if (c->middle_name) { -- g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->middle_name); -+ if (c->middle_name.str) { -+ g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->middle_name.str); - } - -- if (c->surname) { -- g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->surname); -+ if (c->surname.str) { -+ g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->surname.str); - } - -- if (c->suffix) { -- g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->suffix); -+ if (c->suffix.str) { -+ g_string_append_printf (name, "%s%s", (name->len ? " " : ""), c->suffix.str); - } - - contact_set_string (ec, E_CONTACT_FULL_NAME, name->str); - g_string_free (name, TRUE); - - } else { -- contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname); -+ contact_set_string (ec, E_CONTACT_FULL_NAME, c->fullname.str); - } - - /* unknown_field (ec, notes, "initials", c->initials); */ - -- contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname); -+ contact_set_string (ec, E_CONTACT_NICKNAME, c->nickname.str); - -- contact_set_string (ec, E_CONTACT_ORG, c->company_name); -- contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department); -- contact_set_string (ec, E_CONTACT_TITLE, c->job_title); -+ contact_set_string (ec, E_CONTACT_ORG, c->company_name.str); -+ contact_set_string (ec, E_CONTACT_ORG_UNIT, c->department.str); -+ contact_set_string (ec, E_CONTACT_TITLE, c->job_title.str); - - contact_set_address (ec,E_CONTACT_ADDRESS_WORK, -- c->business_address, c->business_city, c->business_country, -- c->business_po_box, c->business_postal_code, c->business_state, c->business_street); -+ c->business_address.str, c->business_city.str, c->business_country.str, -+ c->business_po_box.str, c->business_postal_code.str, c->business_state.str, c->business_street.str); - - contact_set_address (ec,E_CONTACT_ADDRESS_HOME, -- c->home_address, c->home_city, c->home_country, -- c->home_po_box, c->home_postal_code, c->home_state, c->home_street); -+ c->home_address.str, c->home_city.str, c->home_country.str, -+ c->home_po_box.str, c->home_postal_code.str, c->home_state.str, c->home_street.str); - - contact_set_address (ec,E_CONTACT_ADDRESS_OTHER, -- c->other_address, c->other_city, c->other_country, -- c->other_po_box, c->other_postal_code, c->other_state, c->other_street); -+ c->other_address.str, c->other_city.str, c->other_country.str, -+ c->other_po_box.str, c->other_postal_code.str, c->other_state.str, c->other_street.str); - -- contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone); -- contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax); -- contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone); -- contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_2, c->business_phone2); -- contact_set_string (ec, E_CONTACT_PHONE_CALLBACK, c->callback_phone); -- contact_set_string (ec, E_CONTACT_PHONE_CAR, c->car_phone); -- contact_set_string (ec, E_CONTACT_PHONE_COMPANY, c->company_main_phone); -- contact_set_string (ec, E_CONTACT_PHONE_HOME_FAX, c->home_fax); -- contact_set_string (ec, E_CONTACT_PHONE_HOME, c->home_phone); -- contact_set_string (ec, E_CONTACT_PHONE_HOME_2, c->home_phone2); -- contact_set_string (ec, E_CONTACT_PHONE_ISDN, c->isdn_phone); -- contact_set_string (ec, E_CONTACT_PHONE_MOBILE, c->mobile_phone); -- contact_set_string (ec, E_CONTACT_PHONE_OTHER_FAX, c->primary_fax); /* ? */ -- contact_set_string (ec, E_CONTACT_PHONE_PAGER, c->pager_phone); -- contact_set_string (ec, E_CONTACT_PHONE_PRIMARY, c->primary_phone); -- contact_set_string (ec, E_CONTACT_PHONE_RADIO, c->radio_phone); -- contact_set_string (ec, E_CONTACT_PHONE_TTYTDD, c->ttytdd_phone); -- contact_set_string (ec, E_CONTACT_PHONE_TELEX, c->telex); -- unknown_field (ec, notes, "account_name", c->account_name); -+ contact_set_string (ec, E_CONTACT_PHONE_ASSISTANT, c->assistant_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_FAX, c->business_fax.str); -+ contact_set_string (ec, E_CONTACT_PHONE_BUSINESS, c->business_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_BUSINESS_2, c->business_phone2.str); -+ contact_set_string (ec, E_CONTACT_PHONE_CALLBACK, c->callback_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_CAR, c->car_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_COMPANY, c->company_main_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_HOME_FAX, c->home_fax.str); -+ contact_set_string (ec, E_CONTACT_PHONE_HOME, c->home_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_HOME_2, c->home_phone2.str); -+ contact_set_string (ec, E_CONTACT_PHONE_ISDN, c->isdn_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_MOBILE, c->mobile_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_OTHER_FAX, c->primary_fax.str); /* ? */ -+ contact_set_string (ec, E_CONTACT_PHONE_PAGER, c->pager_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_PRIMARY, c->primary_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_RADIO, c->radio_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_TTYTDD, c->ttytdd_phone.str); -+ contact_set_string (ec, E_CONTACT_PHONE_TELEX, c->telex.str); -+ unknown_field (ec, notes, "account_name", c->account_name.str); - contact_set_date (ec, E_CONTACT_ANNIVERSARY, c->wedding_anniversary); -- contact_set_string (ec, E_CONTACT_ASSISTANT, c->assistant_name); -- unknown_field (ec, notes, "billing_information", c->billing_information); -+ contact_set_string (ec, E_CONTACT_ASSISTANT, c->assistant_name.str); -+ unknown_field (ec, notes, "billing_information", c->billing_information.str); - contact_set_date (ec, E_CONTACT_BIRTH_DATE, c->birthday); - /* contact_set_string (ec, E_CONTACT_CATEGORIES, c->??); */ - -- contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1); -- contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2); -- contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3); -+ contact_set_string (ec, E_CONTACT_EMAIL_1 , c->address1.str); -+ contact_set_string (ec, E_CONTACT_EMAIL_2 , c->address2.str); -+ contact_set_string (ec, E_CONTACT_EMAIL_3 , c->address3.str); - - /*unknown_field (ec, notes, "address1_desc" , c->address1_desc); - unknown_field (ec, notes, "address1_transport" , c->address1_transport); -@@ -1115,43 +1109,43 @@ pst_process_contact (PstImporter *m, pst - /*unknown_field (ec, notes, "def_postal_address", c->def_postal_address);*/ - - /* unknown_field (ec, ??, c->gender); */ -- unknown_field (ec, notes, "access_method", c->access_method); -- unknown_field (ec, notes, "gov_id", c->gov_id); -- unknown_field (ec, notes, "customer_id", c->customer_id); -- unknown_field (ec, notes, "hobbies", c->hobbies); -- unknown_field (ec, notes, "followup", c->followup); -+ unknown_field (ec, notes, "access_method", c->access_method.str); -+ unknown_field (ec, notes, "gov_id", c->gov_id.str); -+ unknown_field (ec, notes, "customer_id", c->customer_id.str); -+ unknown_field (ec, notes, "hobbies", c->hobbies.str); -+ unknown_field (ec, notes, "followup", c->followup.str); - -- contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address); -+ contact_set_string (ec, E_CONTACT_FREEBUSY_URL , c->free_busy_address.str); - -- unknown_field (ec, notes, "keyword", c->keyword); -- unknown_field (ec, notes, "language", c->language); -- unknown_field (ec, notes, "location", c->location); -- contact_set_string (ec, E_CONTACT_OFFICE, c->office_loc); -- unknown_field (ec, notes, "computer_name", c->computer_name); -- unknown_field (ec, notes, "ftp_site", c->ftp_site); -+ unknown_field (ec, notes, "keyword", c->keyword.str); -+ unknown_field (ec, notes, "language", c->language.str); -+ unknown_field (ec, notes, "location", c->location.str); -+ contact_set_string (ec, E_CONTACT_OFFICE, c->office_loc.str); -+ unknown_field (ec, notes, "computer_name", c->computer_name.str); -+ unknown_field (ec, notes, "ftp_site", c->ftp_site.str); - -- contact_set_string (ec, E_CONTACT_MANAGER , c->manager_name); -- unknown_field (ec, notes, "mileage", c->mileage); -- unknown_field (ec, notes, "org_id", c->org_id); -- contact_set_string (ec, E_CONTACT_ROLE, c->profession); -+ contact_set_string (ec, E_CONTACT_MANAGER , c->manager_name.str); -+ unknown_field (ec, notes, "mileage", c->mileage.str); -+ unknown_field (ec, notes, "org_id", c->org_id.str); -+ contact_set_string (ec, E_CONTACT_ROLE, c->profession.str); - -- contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name); -+ contact_set_string (ec, E_CONTACT_SPOUSE , c->spouse_name.str); - -- if (c->personal_homepage) { -- contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->personal_homepage); -- if (c->business_homepage) { -- unknown_field (ec, notes, "business_homepage", c->business_homepage); -+ if (c->personal_homepage.str) { -+ contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->personal_homepage.str); -+ if (c->business_homepage.str) { -+ unknown_field (ec, notes, "business_homepage", c->business_homepage.str); - } -- } else if (c->business_homepage) { -- contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage); -+ } else if (c->business_homepage.str) { -+ contact_set_string (ec, E_CONTACT_HOMEPAGE_URL , c->business_homepage.str); - } - -- if (item->comment) { -- g_string_append_printf (notes, "%s\n", item->comment); -+ if (item->comment.str) { -+ g_string_append_printf (notes, "%s\n", item->comment.str); - } - -- if (item->email && item->email->body) { -- g_string_append_printf (notes, "%s\n", item->email->body); -+ if (item->email && item->body.str) { -+ g_string_append_printf (notes, "%s\n", item->body.str); - } - - contact_set_string (ec, E_CONTACT_NOTE, notes->str); -@@ -1174,26 +1168,13 @@ get_ical_date (FILETIME *date, gboolean - if (date && (date->dwLowDateTime || date->dwHighDateTime) ) { - time_t t; - -- t = fileTimeToUnixTime (date, 0); -+ t = pst_fileTimeToUnixTime (date); - return icaltime_from_timet_with_zone (t, is_date, NULL); - } else { - return icaltime_null_date (); - } - } - --gchar *rfc2445_datetime_format (FILETIME *ft) { -- static gchar * buffer = NULL; -- struct tm *stm = NULL; -- -- if (buffer == NULL) { -- buffer = malloc (30); // should be enough -- } -- -- stm = fileTimeToStructTM (ft); -- strftime (buffer, 30, "%Y%m%dT%H%M%SZ", stm); -- return buffer; --} -- - static void - set_cal_attachments (ECal *cal, ECalComponent *ec, PstImporter *m, pst_item_attach *attach) - { -@@ -1315,19 +1296,19 @@ fill_calcomponent (PstImporter *m, pst_i - } - - if (e) { -- if (e->subject || e->proc_subject) { -- if (e->subject) { -- text.value = e->subject->subj; -- } else if (e->proc_subject) { -- text.value = e->proc_subject; -+ if (item->subject.str || e->processed_subject.str) { -+ if (item->subject.str) { -+ text.value = item->subject.str; -+ } else if (e->processed_subject.str) { -+ text.value = e->processed_subject.str; - } - - text.altrep = NULL; /* email->proc_subject? */ - e_cal_component_set_summary (ec, &text); - } -- if (e->body) { -+ if (item->body.str) { - GSList l; -- text.value = e->body; -+ text.value = item->body.str; - text.altrep = NULL; - l.data = &text; - l.next = NULL; -@@ -1337,8 +1318,8 @@ fill_calcomponent (PstImporter *m, pst_i - g_warning ("%s without subject / body!", type); - } - -- if (a->location) { -- e_cal_component_set_location (ec, a->location); -+ if (a->location.str) { -+ e_cal_component_set_location (ec, a->location.str); - } - - if (a->start) { -@@ -1405,7 +1386,7 @@ fill_calcomponent (PstImporter *m, pst_i - } - - if (a->alarm) { -- if (a->alarm_filename) { -+ if (a->alarm_filename.str) { - e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_AUDIO); - } else { - e_cal_component_alarm_set_action (alarm, E_CAL_COMPONENT_ALARM_DISPLAY); -@@ -1417,7 +1398,7 @@ fill_calcomponent (PstImporter *m, pst_i - - } - -- if (a->recurrence != PST_APP_RECUR_NONE) { -+ if (a->recurrence.str != PST_APP_RECUR_NONE) { - struct icalrecurrencetype r; - GSList recur_list; - -@@ -1706,7 +1687,6 @@ pst_init (pst_file *pst, gchar *filename - DEBUG_REGISTER_CLOSE (); - #endif - -- DEBUG_ENT ("main"); - if (pst_open (pst, filename) < 0) { - pst_error_msg ("Error opening PST file %s", filename); - return -1; -@@ -1737,7 +1717,7 @@ get_pst_rootname (pst_file *pst, gchar * - pst_item *item = NULL; - gchar *rootname = NULL; - -- if ((item = pst_parse_item (pst, pst->d_head)) == NULL) { -+ if ((item = pst_parse_item (pst, pst->d_head, NULL)) == NULL) { - pst_error_msg ("Could not get root record"); - return NULL; - } -@@ -1749,14 +1729,14 @@ get_pst_rootname (pst_file *pst, gchar * - } - - /* default the file_as to the same as the main filename if it doesn't exist */ -- if (item->file_as == NULL) { -+ if (item->file_as.str == NULL) { - if (filename == NULL) { - pst_freeItem (item); - return NULL; - } - rootname = g_path_get_basename (filename); - } else { -- rootname = g_strdup (item->file_as); -+ rootname = g_strdup (item->file_as.str); - } - - pst_freeItem (item); diff --git a/evolution-2.27.4-gmount-deprecation.patch b/evolution-2.27.4-gmount-deprecation.patch deleted file mode 100644 index b917127..0000000 --- a/evolution-2.27.4-gmount-deprecation.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -up evolution-2.27.4/plugins/publish-calendar/publish-calendar.c.gmount-deprecation evolution-2.27.4/plugins/publish-calendar/publish-calendar.c ---- evolution-2.27.4/plugins/publish-calendar/publish-calendar.c.gmount-deprecation 2009-07-13 03:45:13.000000000 -0400 -+++ evolution-2.27.4/plugins/publish-calendar/publish-calendar.c 2009-07-13 14:32:58.000000000 -0400 -@@ -129,7 +129,11 @@ unmount_done_cb (GObject *source_object, - { - GError *error = NULL; - -+#if GLIB_CHECK_VERSION(2,21,4) -+ g_mount_unmount_with_operation_finish (G_MOUNT (source_object), res, &error); -+#else - g_mount_unmount_finish (G_MOUNT (source_object), res, &error); -+#endif - - if (error) { - g_warning ("Unmount failed: %s", error->message); -@@ -177,7 +181,11 @@ mount_ready_cb (GObject *source_object, - - mount = g_file_find_enclosing_mount (G_FILE (source_object), NULL, NULL); - if (mount) -+#if GLIB_CHECK_VERSION(2,21,4) -+ g_mount_unmount_with_operation (mount, G_MOUNT_UNMOUNT_NONE, NULL, NULL, unmount_done_cb, NULL); -+#else - g_mount_unmount (mount, G_MOUNT_UNMOUNT_NONE, NULL, unmount_done_cb, NULL); -+#endif - - g_object_unref (source_object); - } diff --git a/evolution.spec b/evolution.spec index 7b000c8..d7293b9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.27.4 -Release: 2%{?dist} +Version: 2.27.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -66,12 +66,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Let the pst-import plugin work with current libpst. -Patch14: evolution-2.27.3-pst-import.patch - -# Work around deprecation of g_mount_unmount(). -Patch15: evolution-2.27.4-gmount-deprecation.patch - ## Dependencies ### Requires(post): GConf2 @@ -245,8 +239,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch14 -p1 -b .pst-import -%patch15 -p1 -b .gmount-deprecation mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -701,6 +693,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 27 2009 Milan Crha - 2.27.5-1.fc12 +- Update to 2.27.5 +- Remove pst import plugin patch (fixed upstream). +- Remove work around deprecation of g_mount_unmount (fixed upstream). + * Fri Jul 24 2009 Fedora Release Engineering - 2.27.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild diff --git a/sources b/sources index 99b80da..0e3b49c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4fc469d16b3fe8eefbb313f83f7a3f74 evolution-2.27.4.tar.bz2 +d8af57356e5dd818a419b9b5042f24d7 evolution-2.27.5.tar.bz2 From 61002b6c41e2f71f5687b5f72a1065205bd306a0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 28 Jul 2009 16:44:13 +0000 Subject: [PATCH 293/844] - Move libeconduit.so into the conduits subpackage to see if that untangles us from gnome-pilot. --- evolution.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index d7293b9..8ef9686 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -124,11 +124,11 @@ BuildRequires: openssl-devel BuildRequires: gstreamer-devel %endif -%if %{ldap_support} +%if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 %endif -%if %{build_conduits} +%if %{build_conduits} BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} %endif @@ -465,7 +465,6 @@ rm -rf $RPM_BUILD_ROOT # 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.* @@ -658,6 +657,7 @@ rm -rf $RPM_BUILD_ROOT %files conduits %defattr(-, root, root) %dir %{_libdir}/evolution/%{evo_major}/conduits +%{_libdir}/evolution/%{evo_major}/libeconduit.so.* %{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so %{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so @@ -693,6 +693,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 28 2009 Matthew Barnes - 2.27.5-2.fc12 +- Move libeconduit.so into the conduits subpackage to see if that + untangles us from gnome-pilot. + * Mon Jul 27 2009 Milan Crha - 2.27.5-1.fc12 - Update to 2.27.5 - Remove pst import plugin patch (fixed upstream). From a440b7309107d5cc93f0ae3273b90dc6f4e1385a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 28 Jul 2009 17:15:44 +0000 Subject: [PATCH 294/844] - Enable pst-import plugin (RH bug #493049) --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 8ef9686..3e69900 100644 --- a/evolution.spec +++ b/evolution.spec @@ -22,7 +22,7 @@ %define inline_audio_support 1 %define ldap_support 1 %define libnotify_support 1 -%define libpst_support 0 +%define libpst_support 1 %define krb5_support 1 %define nntp_support 1 %ifnarch s390 s390x @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.5 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -693,6 +693,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 28 2009 Milan Crha - 2.27.5-3.fc12 +- Enable pst-import plugin (RH bug #493049) + * Tue Jul 28 2009 Matthew Barnes - 2.27.5-2.fc12 - Move libeconduit.so into the conduits subpackage to see if that untangles us from gnome-pilot. From 677ceb9de1b9c2c16209999a63a1b344ee32c5d5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 10 Aug 2009 15:11:04 +0000 Subject: [PATCH 295/844] - Update to 2.27.90 --- .cvsignore | 2 +- evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index cb28ba9..c3948bb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.5.tar.bz2 +evolution-2.27.90.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 3e69900..c01a14e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -5,7 +5,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.14.0 -%define gtkhtml_version 3.25.3 +%define gtkhtml_version 3.27.90 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.27.5 -Release: 3%{?dist} +Version: 2.27.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -693,6 +693,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 10 2009 Milan Crha - 2.27.90-1.fc12 +- Update to 2.27.90 + * Tue Jul 28 2009 Milan Crha - 2.27.5-3.fc12 - Enable pst-import plugin (RH bug #493049) diff --git a/sources b/sources index 0e3b49c..85fc9ab 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d8af57356e5dd818a419b9b5042f24d7 evolution-2.27.5.tar.bz2 +4c42df966be237cf5043943af3e7faa8 evolution-2.27.90.tar.bz2 From d92338cba3d1c9af0a0449d5b29beca0d325c4bb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 11 Aug 2009 09:02:28 +0000 Subject: [PATCH 296/844] - Build requires gnome-desktop-devel >= 2.26 --- evolution.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index c01a14e..4618646 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -106,6 +106,7 @@ BuildRequires: libbonobo-devel >= %{libbonobo_version} BuildRequires: libbonoboui-devel >= %{libbonoboui_version} BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgnomeui-devel >= 2.0 +BuildRequires: gnome-desktop-devel >= 2.26 BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 @@ -693,6 +694,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Aug 11 2009 Milan Crha - 2.27.90-2.fc12 +- Build requires gnome-desktop-devel >= 2.26 + * Mon Aug 10 2009 Milan Crha - 2.27.90-1.fc12 - Update to 2.27.90 From 460bed0fbfc4ebc385172f06f7b5f99b03294bc5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 11 Aug 2009 10:07:43 +0000 Subject: [PATCH 297/844] - Build requires gnome-desktop-devel >= 2.26 - New library libevolution-cal-shared.so (trying to get back to 2.27.90-1) --- evolution.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/evolution.spec b/evolution.spec index 4618646..ed1a36b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.90 -Release: 2%{?dist} +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -641,6 +641,7 @@ rm -rf $RPM_BUILD_ROOT %{_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-cal-shared.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 @@ -694,11 +695,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Tue Aug 11 2009 Milan Crha - 2.27.90-2.fc12 -- Build requires gnome-desktop-devel >= 2.26 - -* Mon Aug 10 2009 Milan Crha - 2.27.90-1.fc12 +* Tue Aug 11 2009 Milan Crha - 2.27.90-1.fc12 - Update to 2.27.90 +- Build requires gnome-desktop-devel >= 2.26 +- New library libevolution-cal-shared.so * Tue Jul 28 2009 Milan Crha - 2.27.5-3.fc12 - Enable pst-import plugin (RH bug #493049) From 045756792b9a002b9c0740509c0a4a12d5f5c72e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 11 Aug 2009 10:16:20 +0000 Subject: [PATCH 298/844] hrm, cannot go back with a tag, thus using 2.27.90-2 --- evolution.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index ed1a36b..26279b5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -695,11 +695,13 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Tue Aug 11 2009 Milan Crha - 2.27.90-1.fc12 -- Update to 2.27.90 +* Tue Aug 11 2009 Milan Crha - 2.27.90-2.fc12 - Build requires gnome-desktop-devel >= 2.26 - New library libevolution-cal-shared.so +* Mon Aug 10 2009 Milan Crha - 2.27.90-1.fc12 +- Update to 2.27.90 + * Tue Jul 28 2009 Milan Crha - 2.27.5-3.fc12 - Enable pst-import plugin (RH bug #493049) From 61199cf63589011bdc153640d157df7172aa9dcc Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 14 Aug 2009 21:55:02 +0000 Subject: [PATCH 299/844] - Add patch for GNOME bug #591414 (calendar library linked as module). --- ...-2.27.90-fix-libevolution-cal-shared.patch | 24 +++++++++++++++++++ evolution.spec | 10 +++++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 evolution-2.27.90-fix-libevolution-cal-shared.patch diff --git a/evolution-2.27.90-fix-libevolution-cal-shared.patch b/evolution-2.27.90-fix-libevolution-cal-shared.patch new file mode 100644 index 0000000..f0f1156 --- /dev/null +++ b/evolution-2.27.90-fix-libevolution-cal-shared.patch @@ -0,0 +1,24 @@ +diff -up evolution-2.27.90/calendar/gui/Makefile.am.fix-libevolution-cal-shared evolution-2.27.90/calendar/gui/Makefile.am +--- evolution-2.27.90/calendar/gui/Makefile.am.fix-libevolution-cal-shared 2009-08-14 17:47:01.000000000 -0400 ++++ evolution-2.27.90/calendar/gui/Makefile.am 2009-08-14 17:47:14.000000000 -0400 +@@ -279,7 +279,7 @@ libevolution_cal_shared_la_LIBADD = + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + +-libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) ++libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) + + + libevolution_calendar_la_LIBADD = \ +diff -up evolution-2.27.90/calendar/gui/Makefile.in.fix-libevolution-cal-shared evolution-2.27.90/calendar/gui/Makefile.in +--- evolution-2.27.90/calendar/gui/Makefile.in.fix-libevolution-cal-shared 2009-08-14 17:47:21.000000000 -0400 ++++ evolution-2.27.90/calendar/gui/Makefile.in 2009-08-14 17:47:34.000000000 -0400 +@@ -730,7 +730,7 @@ libevolution_cal_shared_la_LIBADD = \ + $(CAMEL_LIBS) \ + $(EVOLUTION_CALENDAR_LIBS) + +-libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) ++libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) + libevolution_calendar_la_LIBADD = \ + $(top_builddir)/calendar/gui/libevolution-cal-shared.la \ + $(WIN32_BOOTSTRAP_LIBS) \ diff --git a/evolution.spec b/evolution.spec index 26279b5..4dc47fb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.27.90 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -66,6 +66,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# GNOME bug #591414 +Patch13: evolution-2.27.90-fix-libevolution-cal-shared.patch + ## Dependencies ### Requires(post): GConf2 @@ -240,6 +243,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .fix-libevolution-cal-shared mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -479,6 +483,7 @@ rm -rf $RPM_BUILD_ROOT %{_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-cal-shared.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.* @@ -695,6 +700,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Aug 14 2009 Matthew Barnes - 2.27.90-3.fc12 +- Add patch for GNOME bug #591414 (calendar library linked as module). + * Tue Aug 11 2009 Milan Crha - 2.27.90-2.fc12 - Build requires gnome-desktop-devel >= 2.26 - New library libevolution-cal-shared.so From 31c8908cc009842a4751e525d923a42b18d7e741 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Aug 2009 11:07:27 +0000 Subject: [PATCH 300/844] - Update to 2.27.91 - Remove patch for GNOME bug #591414 (fixed upstream). --- .cvsignore | 2 +- ...-2.27.90-fix-libevolution-cal-shared.patch | 24 ------------------- evolution.spec | 14 +++++------ sources | 2 +- 4 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 evolution-2.27.90-fix-libevolution-cal-shared.patch diff --git a/.cvsignore b/.cvsignore index c3948bb..b3f2978 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.90.tar.bz2 +evolution-2.27.91.tar.bz2 diff --git a/evolution-2.27.90-fix-libevolution-cal-shared.patch b/evolution-2.27.90-fix-libevolution-cal-shared.patch deleted file mode 100644 index f0f1156..0000000 --- a/evolution-2.27.90-fix-libevolution-cal-shared.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up evolution-2.27.90/calendar/gui/Makefile.am.fix-libevolution-cal-shared evolution-2.27.90/calendar/gui/Makefile.am ---- evolution-2.27.90/calendar/gui/Makefile.am.fix-libevolution-cal-shared 2009-08-14 17:47:01.000000000 -0400 -+++ evolution-2.27.90/calendar/gui/Makefile.am 2009-08-14 17:47:14.000000000 -0400 -@@ -279,7 +279,7 @@ libevolution_cal_shared_la_LIBADD = - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) - --libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) -+libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) - - - libevolution_calendar_la_LIBADD = \ -diff -up evolution-2.27.90/calendar/gui/Makefile.in.fix-libevolution-cal-shared evolution-2.27.90/calendar/gui/Makefile.in ---- evolution-2.27.90/calendar/gui/Makefile.in.fix-libevolution-cal-shared 2009-08-14 17:47:21.000000000 -0400 -+++ evolution-2.27.90/calendar/gui/Makefile.in 2009-08-14 17:47:34.000000000 -0400 -@@ -730,7 +730,7 @@ libevolution_cal_shared_la_LIBADD = \ - $(CAMEL_LIBS) \ - $(EVOLUTION_CALENDAR_LIBS) - --libevolution_cal_shared_la_LDFLAGS = -avoid-version -module $(NO_UNDEFINED) -+libevolution_cal_shared_la_LDFLAGS = $(NO_UNDEFINED) - libevolution_calendar_la_LIBADD = \ - $(top_builddir)/calendar/gui/libevolution-cal-shared.la \ - $(WIN32_BOOTSTRAP_LIBS) \ diff --git a/evolution.spec b/evolution.spec index 4dc47fb..169040b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -5,7 +5,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.14.0 -%define gtkhtml_version 3.27.90 +%define gtkhtml_version 3.27.91 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 @@ -42,8 +42,8 @@ ### Abstract ### Name: evolution -Version: 2.27.90 -Release: 3%{?dist} +Version: 2.27.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -66,9 +66,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# GNOME bug #591414 -Patch13: evolution-2.27.90-fix-libevolution-cal-shared.patch - ## Dependencies ### Requires(post): GConf2 @@ -243,7 +240,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .fix-libevolution-cal-shared mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -700,6 +696,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 24 2009 Milan Crha - 2.27.91-1.fc12 +- Update to 2.27.91 +- Remove patch for GNOME bug #591414 (fixed upstream). + * Fri Aug 14 2009 Matthew Barnes - 2.27.90-3.fc12 - Add patch for GNOME bug #591414 (calendar library linked as module). diff --git a/sources b/sources index 85fc9ab..b7e07ee 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c42df966be237cf5043943af3e7faa8 evolution-2.27.90.tar.bz2 +4f28ce4302ec26ea1b3ecb93c920c07c evolution-2.27.91.tar.bz2 From 815ce5b828d2855884685ccd1e00c5c553e5fd82 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 31 Aug 2009 23:11:01 +0000 Subject: [PATCH 301/844] file evolution-override-eds-version.patch was initially added on branch private-mbarnes-kb. From 7dcc51dbb14a7c39af21475eb40ece9a8f3cda4d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 Sep 2009 19:06:40 +0000 Subject: [PATCH 302/844] file evolution-kb-override-version.patch was initially added on branch private-mbarnes-kb. From 99d8e524ac424027875d5680ae7a314561f16c4d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Sep 2009 16:13:34 +0000 Subject: [PATCH 303/844] - Update to 2.27.92 --- .cvsignore | 2 +- evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index b3f2978..0624cc6 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.91.tar.bz2 +evolution-2.27.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 169040b..58491f4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,7 +42,7 @@ ### Abstract ### Name: evolution -Version: 2.27.91 +Version: 2.27.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 07 2009 Milan Crha - 2.27.92-1.fc12 +- Update to 2.27.92 + * Mon Aug 24 2009 Milan Crha - 2.27.91-1.fc12 - Update to 2.27.91 - Remove patch for GNOME bug #591414 (fixed upstream). diff --git a/sources b/sources index b7e07ee..577a61f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4f28ce4302ec26ea1b3ecb93c920c07c evolution-2.27.91.tar.bz2 +75cf92e71dc6cb7d10c4a59b85c601e2 evolution-2.27.92.tar.bz2 From 158b78ff45013f866bd62d17bf94546d19f92079 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Sep 2009 12:33:52 +0000 Subject: [PATCH 304/844] - Update to 2.28.0 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0624cc6..57956be 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.27.92.tar.bz2 +evolution-2.28.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 58491f4..7ceb46b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -5,7 +5,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.14.0 -%define gtkhtml_version 3.27.91 +%define gtkhtml_version 3.28.0 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libbonobo_version 2.20.3 @@ -42,7 +42,7 @@ ### Abstract ### Name: evolution -Version: 2.27.92 +Version: 2.28.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -696,6 +696,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 21 2009 Milan Crha - 2.28.0-1.fc12 +- Update to 2.28.0 + * Mon Sep 07 2009 Milan Crha - 2.27.92-1.fc12 - Update to 2.27.92 diff --git a/sources b/sources index 577a61f..5f3122d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -75cf92e71dc6cb7d10c4a59b85c601e2 evolution-2.27.92.tar.bz2 +1a8ce4d794b3dea0d086d9809b6ddf0c evolution-2.28.0.tar.bz2 From f148d4d23f38c32ddf70385e5d0b181f1e00da9c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 17 Nov 2009 13:16:49 +0000 Subject: [PATCH 305/844] - Update to 2.29.2 - Synchronize spec file with my kill-bonobo test package. --- .cvsignore | 2 +- evolution.spec | 191 ++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 94 insertions(+), 101 deletions(-) diff --git a/.cvsignore b/.cvsignore index 57956be..898ceeb 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.28.0.tar.bz2 +evolution-2.29.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 7ceb46b..4783e9f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,22 +1,20 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 %define glib2_version 2.16.0 +%define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.14.0 -%define gtkhtml_version 3.28.0 +%define gtkhtml_version 3.29.2 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 -%define libbonobo_version 2.20.3 -%define libbonoboui_version 2.4.2 %define libgweather_version 2.25.4 -%define orbit2_version 2.9.8 %define pilot_link_version 2:0.12.1 %define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 -%define evo_major 2.28 +%define evo_major 2.30 %define exchange_support 1 %define inline_audio_support 1 @@ -35,21 +33,20 @@ %else %define build_conduits 1 %endif -%define use_mozilla_nss 1 %define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins ### Abstract ### Name: evolution -Version: 2.28.0 +Version: 2.29.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.25/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -68,7 +65,10 @@ Patch12: evolution-2.9.1-im-context-reset.patch ## Dependencies ### +Requires(pre): GConf2 Requires(post): GConf2 +Requires(preun): GConf2 + Requires(post): scrollkeeper >= %{scrollkeeper_version} Requires(postun): scrollkeeper >= %{scrollkeeper_version} @@ -81,7 +81,6 @@ Requires: gnome-themes ### Build Dependencies ### BuildRequires: GConf2-devel -BuildRequires: ORBit2-devel >= %{orbit2_version} BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -95,33 +94,28 @@ BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common +BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +BuildRequires: gtkimageview-devel BuildRequires: gvfs BuildRequires: intltool >= %{intltool_version} -BuildRequires: libbonobo-devel >= %{libbonobo_version} -BuildRequires: libbonoboui-devel >= %{libbonoboui_version} +BuildRequires: libcanberra-devel BuildRequires: libgnomecanvas-devel >= 2.0 -BuildRequires: libgnomeui-devel >= 2.0 -BuildRequires: gnome-desktop-devel >= 2.26 BuildRequires: libgweather-devel >= %{libgweather_version} +BuildRequires: libpst-devel BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel -BuildRequires: pkgconfig - -%if %{use_mozilla_nss} BuildRequires: nspr-devel BuildRequires: nss-devel -%else -BuildRequires: openssl-devel -%endif +BuildRequires: pkgconfig +BuildRequires: unique-devel %if %{inline_audio_support} -# audio-inline plugin requires gstreamer to build: BuildRequires: gstreamer-devel %endif @@ -166,7 +160,6 @@ Requires: %{name} = %{version}-%{release} Requires: evolution-data-server-devel >= %{version} Requires: gtk2-devel >= %{gtk2_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} -Requires: libbonobo-devel >= %{libbonobo_version} Requires: libgweather-devel >= %{libgweather_version} Requires: libsoup-devel >= %{soup_version} Requires: libxml2-devel @@ -276,18 +269,12 @@ done %define nntp_flags --disable-nntp %endif -%if %{use_mozilla_nss} %define ssl_flags --enable-nss=yes --enable-smime=yes -%else -%define ssl_flags --enable-openssl=yes -%endif -%if %{use_mozilla_nss} if ! pkg-config --exists nss; then echo "Unable to find suitable version of mozilla nss to use!" exit 1 fi -%endif %if %{exchange_support} %define exchange_flags --enable-exchange @@ -297,12 +284,6 @@ fi CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS 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`" - LDFLAGS="$LDFLAGS `pkg-config --libs-only-L openssl`" -fi -%endif # Regenerate mail/Makefile.in (this is temporary). autoreconf --force @@ -321,7 +302,7 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. cd po -grep -v ".*[.]desktop[.]in[.]in$\|.*[.]server[.]in[.]in$" POTFILES.in > POTFILES.keep +grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in intltool-update --gettext-package=%{name}-%{evo_major} --pot for p in *.po; do @@ -377,33 +358,69 @@ rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime -for serverfile in $RPM_BUILD_ROOT%{_libdir}/bonobo/servers/*.server; do - sed -i -e 's|location *= *"/usr/lib\(64\)*/|location="/usr/$LIB/|' $serverfile -done %find_lang evolution-%{evo_major} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang +%pre +if [ "$1" -gt 1 ] ; then +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : +fi + +%pre bogofilter +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : + %post /sbin/ldconfig scrollkeeper-update -q touch --no-create %{_datadir}/icons/hicolor || : %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : + 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.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/apps-evolution-template-placeholders.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null +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.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/apps-evolution-template-placeholders.schemas > /dev/null || : +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : %post bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : + +%preun +if [ "$1" -eq 0 ] ; then +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : +fi + +%preun bogofilter +if [ "$1" -eq 0 ] ; then +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : +fi %postun /sbin/ldconfig @@ -432,8 +449,12 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution +# The alarm notify daemon +%{_bindir}/evolution-alarm-notify + # Desktop files: %{_datadir}/applications/evolution.desktop +%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop # Icons: %{_datadir}/icons/hicolor/16x16/apps/* @@ -443,32 +464,22 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/48x48/apps/* %{_datadir}/icons/hicolor/scalable/apps/* -# IDL files (should this be in devel subpackage?) -%{_datadir}/idl/evolution-%{evo_major} - # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution %{_datadir}/evolution/%{evo_major} -# Bonobo components: -%{_libdir}/bonobo/servers/GNOME_Evolution_Addressbook.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Calendar_AlarmNotify.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Mail.server -%{_libdir}/bonobo/servers/GNOME_Evolution_Shell.server +# Modules: %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_major} -%dir %{_libdir}/evolution/%{evo_major}/components -%{_libdir}/evolution/%{evo_major}/components/libevolution-addressbook.so -%{_libdir}/evolution/%{evo_major}/components/libevolution-calendar.so -%{_libdir}/evolution/%{evo_major}/components/libevolution-mail.so +%{_libdir}/evolution/%{evo_major}/modules # Shared libraries: +%{_libdir}/evolution/%{evo_major}/libcomposer.so.* %{_libdir}/evolution/%{evo_major}/libeabutil.so.* %{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* %{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.* -%{_libdir}/evolution/%{evo_major}/libefilterbar.so.* +%{_libdir}/evolution/%{evo_major}/libemformat.so.* %{_libdir}/evolution/%{evo_major}/libemiscwidgets.so.* %{_libdir}/evolution/%{evo_major}/libeshell.so.* %{_libdir}/evolution/%{evo_major}/libessmime.so.* @@ -477,15 +488,12 @@ rm -rf $RPM_BUILD_ROOT %{_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-cal-shared.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-calendar.so.* %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.* %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so.* +%{_libdir}/evolution/%{evo_major}/libevolution-mail.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.* @@ -493,9 +501,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/evolution %dir %{_libexecdir}/evolution/%{evo_major} %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export -%{_libexecdir}/evolution/%{evo_major}/evolution-alarm-notify %{_libexecdir}/evolution/%{evo_major}/evolution-backup -%{_libexecdir}/evolution/%{evo_major}/killev # The plugin directory: %dir %{evo_plugin_dir} @@ -505,9 +511,6 @@ rm -rf $RPM_BUILD_ROOT # are built as part of specific plugins but which are currently packaged using # globs above; the purpose of the separation below is to be more explicit about # which plugins we ship) -%{evo_plugin_dir}/org-gnome-mail-account-disable.eplug -%{evo_plugin_dir}/libmail-account-disable.so - %{evo_plugin_dir}/org-gnome-addressbook-file.eplug %{evo_plugin_dir}/liborg-gnome-addressbook-file.so @@ -521,7 +524,6 @@ rm -rf $RPM_BUILD_ROOT %endif %{evo_plugin_dir}/org-gnome-backup-restore.eplug -%{evo_plugin_dir}/org-gnome-backup-restore.xml %{evo_plugin_dir}/liborg-gnome-backup-restore.so %{evo_plugin_dir}/org-gnome-evolution-caldav.eplug @@ -536,9 +538,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-calendar-weather.eplug %{evo_plugin_dir}/liborg-gnome-calendar-weather.so -%{evo_plugin_dir}/org-gnome-copy-tool.eplug -%{evo_plugin_dir}/liborg-gnome-copy-tool.so - %{evo_plugin_dir}/org-gnome-default-mailer.eplug %{evo_plugin_dir}/liborg-gnome-default-mailer.so @@ -557,21 +556,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug %{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so -%{evo_plugin_dir}/org-gnome-exchange-operations.eplug -%{evo_plugin_dir}/liborg-gnome-exchange-operations.so -%{evo_plugin_dir}/org-gnome-exchange-ab-subscription.xml -%{evo_plugin_dir}/org-gnome-exchange-cal-subscription.xml -%{evo_plugin_dir}/org-gnome-exchange-tasks-subscription.xml -%{evo_plugin_dir}/org-gnome-folder-permissions.xml -%{evo_plugin_dir}/org-gnome-folder-subscription.xml - %{evo_plugin_dir}/org-gnome-groupwise-features.eplug %{evo_plugin_dir}/liborg-gnome-groupwise-features.so %{evo_plugin_dir}/org-gnome-compose-send-options.xml -%{evo_plugin_dir}/org-gnome-gw-account-setup.eplug -%{evo_plugin_dir}/liborg-gnome-gw-account-setup.so - %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so @@ -580,35 +568,28 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug %{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so -%{evo_plugin_dir}/org-gnome-mailing-list-actions.xml %{evo_plugin_dir}/org-gnome-mail-notification.eplug %{evo_plugin_dir}/liborg-gnome-mail-notification.so %{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 %{evo_plugin_dir}/org-gnome-plugin-manager.eplug %{evo_plugin_dir}/liborg-gnome-plugin-manager.so -%{evo_plugin_dir}/org-gnome-plugin-manager.xml %{evo_plugin_dir}/org-gnome-prefer-plain.eplug %{evo_plugin_dir}/liborg-gnome-prefer-plain.so %{evo_plugin_dir}/org-gnome-publish-calendar.eplug %{evo_plugin_dir}/liborg-gnome-publish-calendar.so -%{evo_plugin_dir}/org-gnome-publish-calendar.xml %{evo_plugin_dir}/org-gnome-save-calendar.eplug %{evo_plugin_dir}/liborg-gnome-save-calendar.so -%{evo_plugin_dir}/org-gnome-select-one-source.eplug -%{evo_plugin_dir}/liborg-gnome-select-one-source.so - %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so @@ -624,14 +605,18 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) +%{_datadir}/gtk-doc/html/eshell %{_includedir}/evolution-%{evo_major} +%{_libdir}/pkgconfig/evolution-calendar.pc +%{_libdir}/pkgconfig/evolution-mail.pc %{_libdir}/pkgconfig/evolution-plugin.pc %{_libdir}/pkgconfig/evolution-shell.pc +%{_libdir}/evolution/%{evo_major}/libcomposer.so %{_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}/libemformat.so %{_libdir}/evolution/%{evo_major}/libemiscwidgets.so %{_libdir}/evolution/%{evo_major}/libeshell.so %{_libdir}/evolution/%{evo_major}/libessmime.so @@ -640,15 +625,12 @@ rm -rf $RPM_BUILD_ROOT %{_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-cal-shared.so -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-a11y.so +%{_libdir}/evolution/%{evo_major}/libevolution-calendar.so %{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so %{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so -%{_libdir}/evolution/%{evo_major}/libevolution-mail-shared.so +%{_libdir}/evolution/%{evo_major}/libevolution-mail.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 @@ -696,6 +678,17 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Nov 17 2009 Matthew Barnes - 2.29.2-1.fc13 +- Update to 2.29.2 +- Synchronize spec file with my kill-bonobo test package. + +* Tue Oct 27 2009 Matthew Barnes - 2.29.1-1.fc13 +- Update to 2.29.1 +- Bump evo_major to 2.30. +- Drop Bonobo + ORBit dependency (yay!). +- Remove option to use OpenSSL instead of NSS. +- Uninstall GConf schemas during %%pre and %%preun. + * Mon Sep 21 2009 Milan Crha - 2.28.0-1.fc12 - Update to 2.28.0 diff --git a/sources b/sources index 5f3122d..463f23e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1a8ce4d794b3dea0d086d9809b6ddf0c evolution-2.28.0.tar.bz2 +962d08181a7f0e890bf83150174d090e evolution-2.29.1.tar.bz2 From f5fd1ddd8bca34c8565b99ee65d399971432af6c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 17 Nov 2009 13:33:13 +0000 Subject: [PATCH 306/844] Update sources. --- .cvsignore | 2 +- sources | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.cvsignore b/.cvsignore index 898ceeb..bf83097 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.1.tar.bz2 +evolution-2.29.2.tar.bz2 diff --git a/sources b/sources index 463f23e..a599be7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -962d08181a7f0e890bf83150174d090e evolution-2.29.1.tar.bz2 +fc9fe732e482b108a8395a9f127d41c1 evolution-2.29.2.tar.bz2 From 56e11bfd5629a1c0ab2983ad6b2c5d127d847d5d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 17 Nov 2009 14:14:44 +0000 Subject: [PATCH 307/844] Update files list. --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index 4783e9f..2173763 100644 --- a/evolution.spec +++ b/evolution.spec @@ -560,6 +560,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-groupwise-features.so %{evo_plugin_dir}/org-gnome-compose-send-options.xml +%{evo_plugin_dir}/org-gnome-image-inline.eplug +%{evo_plugin_dir}/liborg-gnome-image-inline.so + %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so From 3eeed5053be5c5b2102f3628e6d71b072c87b1cc Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:50:05 +0000 Subject: [PATCH 308/844] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index dd23cb0..c22b7db 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: evolution -# $Id: Makefile,v 1.1 2004/09/09 04:34:33 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting Exp $ NAME := evolution SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 583b1bec288547833a7f0a9e5dc66c0c3e139834 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Nov 2009 14:30:39 +0000 Subject: [PATCH 309/844] - Update to 2.29.3 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index bf83097..42555f2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.2.tar.bz2 +evolution-2.29.3.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 2173763..747cc4a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.14.0 -%define gtkhtml_version 3.29.2 +%define gtkhtml_version 3.29.3 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libgweather_version 2.25.4 @@ -39,7 +39,7 @@ ### Abstract ### Name: evolution -Version: 2.29.2 +Version: 2.29.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -681,6 +681,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 +- Update to 2.29.3 + * Tue Nov 17 2009 Matthew Barnes - 2.29.2-1.fc13 - Update to 2.29.2 - Synchronize spec file with my kill-bonobo test package. diff --git a/sources b/sources index a599be7..e4fdd01 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -fc9fe732e482b108a8395a9f127d41c1 evolution-2.29.2.tar.bz2 +cadd4949b95b04355c4070ad44e3fdb1 evolution-2.29.3.tar.bz2 From fe755627e75d3d6ada57822bc563d82b2605c41f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Nov 2009 17:08:47 +0000 Subject: [PATCH 310/844] - Add patch for missing m4 files from tarball. --- evolution-2.29.3-missing-m4-files.patch | 8309 +++++++++++++++++++++++ evolution.spec | 5 + 2 files changed, 8314 insertions(+) create mode 100644 evolution-2.29.3-missing-m4-files.patch diff --git a/evolution-2.29.3-missing-m4-files.patch b/evolution-2.29.3-missing-m4-files.patch new file mode 100644 index 0000000..6f220bc --- /dev/null +++ b/evolution-2.29.3-missing-m4-files.patch @@ -0,0 +1,8309 @@ +diff -ru evolution-2.29.3/m4/gnome-doc-utils.m4 evolution-2.29.3.new/m4/gnome-doc-utils.m4 +--- evolution-2.29.3/m4/gnome-doc-utils.m4 2009-11-30 18:02:32.000000000 +0100 ++++ evolution-2.29.3.new/m4/gnome-doc-utils.m4 2009-11-14 19:44:15.000000000 +0100 +@@ -0,0 +1,56 @@ ++dnl Do not call GNOME_DOC_DEFINES directly. It is split out from ++dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. ++AC_DEFUN([GNOME_DOC_DEFINES], ++[ ++AC_ARG_WITH([help-dir], ++ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, ++ [with_help_dir='${datadir}/gnome/help']) ++HELP_DIR="$with_help_dir" ++AC_SUBST(HELP_DIR) ++ ++AC_ARG_WITH([omf-dir], ++ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, ++ [with_omf_dir='${datadir}/omf']) ++OMF_DIR="$with_omf_dir" ++AC_SUBST(OMF_DIR) ++ ++AC_ARG_WITH([help-formats], ++ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, ++ [with_help_formats='']) ++DOC_USER_FORMATS="$with_help_formats" ++AC_SUBST(DOC_USER_FORMATS) ++ ++AC_ARG_ENABLE([scrollkeeper], ++ [AC_HELP_STRING([--disable-scrollkeeper], ++ [do not make updates to the scrollkeeper database])],, ++ enable_scrollkeeper=yes) ++AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) ++ ++dnl disable scrollkeeper automatically for distcheck ++DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" ++AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) ++ ++AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) ++]) ++ ++# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) ++# ++AC_DEFUN([GNOME_DOC_INIT], ++[AC_REQUIRE([AC_PROG_LN_S])dnl ++ ++ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) ++ ++AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) ++PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], ++ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) ++ ++if test "$gdu_cv_have_gdu" = "yes"; then ++ AC_MSG_RESULT([yes]) ++ ifelse([$2],,[:],[$2]) ++else ++ AC_MSG_RESULT([no]) ++ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) ++fi ++ ++GNOME_DOC_DEFINES ++]) +diff -ru evolution-2.29.3/m4/gtk-doc.m4 evolution-2.29.3.new/m4/gtk-doc.m4 +--- evolution-2.29.3/m4/gtk-doc.m4 2009-11-30 18:02:37.000000000 +0100 ++++ evolution-2.29.3.new/m4/gtk-doc.m4 2009-11-14 19:44:15.000000000 +0100 +@@ -0,0 +1,39 @@ ++dnl -*- mode: autoconf -*- ++ ++# serial 1 ++ ++dnl Usage: ++dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) ++AC_DEFUN([GTK_DOC_CHECK], ++[ ++ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first ++ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first ++ dnl for overriding the documentation installation directory ++ AC_ARG_WITH([html-dir], ++ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, ++ [with_html_dir='${datadir}/gtk-doc/html']) ++ HTML_DIR="$with_html_dir" ++ AC_SUBST([HTML_DIR]) ++ ++ dnl enable/disable documentation building ++ AC_ARG_ENABLE([gtk-doc], ++ AS_HELP_STRING([--enable-gtk-doc], ++ [use gtk-doc to build documentation [[default=no]]]),, ++ [enable_gtk_doc=no]) ++ ++ if test x$enable_gtk_doc = xyes; then ++ ifelse([$1],[], ++ [PKG_CHECK_EXISTS([gtk-doc],, ++ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], ++ [PKG_CHECK_EXISTS([gtk-doc >= $1],, ++ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) ++ fi ++ ++ AC_MSG_CHECKING([whether to build gtk-doc documentation]) ++ AC_MSG_RESULT($enable_gtk_doc) ++ ++ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) ++ ++ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) ++ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) ++]) +diff -ru evolution-2.29.3/m4/intltool.m4 evolution-2.29.3.new/m4/intltool.m4 +--- evolution-2.29.3/m4/intltool.m4 2009-11-30 18:02:43.000000000 +0100 ++++ evolution-2.29.3.new/m4/intltool.m4 2009-11-14 19:44:14.000000000 +0100 +@@ -0,0 +1,216 @@ ++## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- ++## Copyright (C) 2001 Eazel, Inc. ++## Author: Maciej Stachowiak ++## Kenneth Christiansen ++## ++## This program is free software; you can redistribute it and/or modify ++## it under the terms of the GNU General Public License as published by ++## the Free Software Foundation; either version 2 of the License, or ++## (at your option) any later version. ++## ++## This program is distributed in the hope that it will be useful, but ++## WITHOUT ANY WARRANTY; without even the implied warranty of ++## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++## General Public License for more details. ++## ++## You should have received a copy of the GNU General Public License ++## along with this program; if not, write to the Free Software ++## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ++## ++## As a special exception to the GNU General Public License, if you ++## distribute this file as part of a program that contains a ++## configuration script generated by Autoconf, you may include it under ++## the same distribution terms that you use for the rest of that program. ++ ++dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) ++# serial 40 IT_PROG_INTLTOOL ++AC_DEFUN([IT_PROG_INTLTOOL], [ ++AC_PREREQ([2.50])dnl ++AC_REQUIRE([AM_NLS])dnl ++ ++case "$am__api_version" in ++ 1.[01234]) ++ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) ++ ;; ++ *) ++ ;; ++esac ++ ++if test -n "$1"; then ++ AC_MSG_CHECKING([for intltool >= $1]) ++ ++ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` ++ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` ++ ] ++ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) ++ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || ++ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) ++fi ++ ++AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) ++AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) ++AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) ++if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then ++ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) ++fi ++ ++ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' ++ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' ++ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' ++ ++_IT_SUBST(INTLTOOL_DESKTOP_RULE) ++_IT_SUBST(INTLTOOL_DIRECTORY_RULE) ++_IT_SUBST(INTLTOOL_KEYS_RULE) ++_IT_SUBST(INTLTOOL_PROP_RULE) ++_IT_SUBST(INTLTOOL_OAF_RULE) ++_IT_SUBST(INTLTOOL_PONG_RULE) ++_IT_SUBST(INTLTOOL_SERVER_RULE) ++_IT_SUBST(INTLTOOL_SHEET_RULE) ++_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) ++_IT_SUBST(INTLTOOL_UI_RULE) ++_IT_SUBST(INTLTOOL_XAM_RULE) ++_IT_SUBST(INTLTOOL_KBD_RULE) ++_IT_SUBST(INTLTOOL_XML_RULE) ++_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) ++_IT_SUBST(INTLTOOL_CAVES_RULE) ++_IT_SUBST(INTLTOOL_SCHEMAS_RULE) ++_IT_SUBST(INTLTOOL_THEME_RULE) ++_IT_SUBST(INTLTOOL_SERVICE_RULE) ++_IT_SUBST(INTLTOOL_POLICY_RULE) ++ ++# Check the gettext tools to make sure they are GNU ++AC_PATH_PROG(XGETTEXT, xgettext) ++AC_PATH_PROG(MSGMERGE, msgmerge) ++AC_PATH_PROG(MSGFMT, msgfmt) ++AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) ++if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" ++mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" ++mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" ++if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then ++ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) ++fi ++ ++AC_PATH_PROG(INTLTOOL_PERL, perl) ++if test -z "$INTLTOOL_PERL"; then ++ AC_MSG_ERROR([perl not found]) ++fi ++AC_MSG_CHECKING([for perl >= 5.8.1]) ++$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 ++if test $? -ne 0; then ++ AC_MSG_ERROR([perl 5.8.1 is required for intltool]) ++else ++ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" ++ AC_MSG_RESULT([$IT_PERL_VERSION]) ++fi ++if test "x$2" != "xno-xml"; then ++ AC_MSG_CHECKING([for XML::Parser]) ++ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then ++ AC_MSG_RESULT([ok]) ++ else ++ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) ++ fi ++fi ++ ++# Substitute ALL_LINGUAS so we can use it in po/Makefile ++AC_SUBST(ALL_LINGUAS) ++ ++# Set DATADIRNAME correctly if it is not set yet ++# (copied from glib-gettext.m4) ++if test -z "$DATADIRNAME"; then ++ AC_LINK_IFELSE( ++ [AC_LANG_PROGRAM([[]], ++ [[extern int _nl_msg_cat_cntr; ++ return _nl_msg_cat_cntr]])], ++ [DATADIRNAME=share], ++ [case $host in ++ *-*-solaris*) ++ dnl On Solaris, if bind_textdomain_codeset is in libc, ++ dnl GNU format message catalog is always supported, ++ dnl since both are added to the libc all together. ++ dnl Hence, we'd like to go with DATADIRNAME=share ++ dnl in this case. ++ AC_CHECK_FUNC(bind_textdomain_codeset, ++ [DATADIRNAME=share], [DATADIRNAME=lib]) ++ ;; ++ *) ++ [DATADIRNAME=lib] ++ ;; ++ esac]) ++fi ++AC_SUBST(DATADIRNAME) ++ ++IT_PO_SUBDIR([po]) ++ ++]) ++ ++ ++# IT_PO_SUBDIR(DIRNAME) ++# --------------------- ++# All po subdirs have to be declared with this macro; the subdir "po" is ++# declared by IT_PROG_INTLTOOL. ++# ++AC_DEFUN([IT_PO_SUBDIR], ++[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. ++dnl ++dnl The following CONFIG_COMMANDS should be exetuted at the very end ++dnl of config.status. ++AC_CONFIG_COMMANDS_PRE([ ++ AC_CONFIG_COMMANDS([$1/stamp-it], [ ++ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then ++ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) ++ fi ++ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" ++ >"$1/stamp-it.tmp" ++ [sed '/^#/d ++ s/^[[].*] *// ++ /^[ ]*$/d ++ '"s|^| $ac_top_srcdir/|" \ ++ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" ++ ] ++ [sed '/^POTFILES =/,/[^\\]$/ { ++ /^POTFILES =/!d ++ r $1/POTFILES ++ } ++ ' "$1/Makefile.in" >"$1/Makefile"] ++ rm -f "$1/Makefile.tmp" ++ mv "$1/stamp-it.tmp" "$1/stamp-it" ++ ]) ++])dnl ++]) ++ ++# _IT_SUBST(VARIABLE) ++# ------------------- ++# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST ++# ++AC_DEFUN([_IT_SUBST], ++[ ++AC_SUBST([$1]) ++m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) ++] ++) ++ ++# deprecated macros ++AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) ++# A hint is needed for aclocal from Automake <= 1.9.4: ++# AC_DEFUN([AC_PROG_INTLTOOL], ...) ++ +diff -ru evolution-2.29.3/m4/libtool.m4 evolution-2.29.3.new/m4/libtool.m4 +--- evolution-2.29.3/m4/libtool.m4 2009-11-30 18:02:49.000000000 +0100 ++++ evolution-2.29.3.new/m4/libtool.m4 2009-11-14 19:44:14.000000000 +0100 +@@ -0,0 +1,7360 @@ ++# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- ++# ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++m4_define([_LT_COPYING], [dnl ++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, ++# 2006, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gordon Matzigkeit, 1996 ++# ++# This file is part of GNU Libtool. ++# ++# GNU Libtool is free software; you can redistribute it and/or ++# modify it under the terms of the GNU General Public License as ++# published by the Free Software Foundation; either version 2 of ++# the License, or (at your option) any later version. ++# ++# As a special exception to the GNU General Public License, ++# if you distribute this file as part of a program or library that ++# is built using GNU Libtool, you may include this file under the ++# same distribution terms that you use for the rest of that program. ++# ++# GNU Libtool is distributed in the hope that it will be useful, ++# but WITHOUT ANY WARRANTY; without even the implied warranty of ++# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++# GNU General Public License for more details. ++# ++# You should have received a copy of the GNU General Public License ++# along with GNU Libtool; see the file COPYING. If not, a copy ++# can be downloaded from http://www.gnu.org/licenses/gpl.html, or ++# obtained by writing to the Free Software Foundation, Inc., ++# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. ++]) ++ ++# serial 56 LT_INIT ++ ++ ++# LT_PREREQ(VERSION) ++# ------------------ ++# Complain and exit if this libtool version is less that VERSION. ++m4_defun([LT_PREREQ], ++[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, ++ [m4_default([$3], ++ [m4_fatal([Libtool version $1 or higher is required], ++ 63)])], ++ [$2])]) ++ ++ ++# _LT_CHECK_BUILDDIR ++# ------------------ ++# Complain if the absolute build directory name contains unusual characters ++m4_defun([_LT_CHECK_BUILDDIR], ++[case `pwd` in ++ *\ * | *\ *) ++ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; ++esac ++]) ++ ++ ++# LT_INIT([OPTIONS]) ++# ------------------ ++AC_DEFUN([LT_INIT], ++[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT ++AC_BEFORE([$0], [LT_LANG])dnl ++AC_BEFORE([$0], [LT_OUTPUT])dnl ++AC_BEFORE([$0], [LTDL_INIT])dnl ++m4_require([_LT_CHECK_BUILDDIR])dnl ++ ++dnl Autoconf doesn't catch unexpanded LT_ macros by default: ++m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl ++m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl ++dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 ++dnl unless we require an AC_DEFUNed macro: ++AC_REQUIRE([LTOPTIONS_VERSION])dnl ++AC_REQUIRE([LTSUGAR_VERSION])dnl ++AC_REQUIRE([LTVERSION_VERSION])dnl ++AC_REQUIRE([LTOBSOLETE_VERSION])dnl ++m4_require([_LT_PROG_LTMAIN])dnl ++ ++dnl Parse OPTIONS ++_LT_SET_OPTIONS([$0], [$1]) ++ ++# This can be used to rebuild libtool when needed ++LIBTOOL_DEPS="$ltmain" ++ ++# Always use our own libtool. ++LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++AC_SUBST(LIBTOOL)dnl ++ ++_LT_SETUP ++ ++# Only expand once: ++m4_define([LT_INIT]) ++])# LT_INIT ++ ++# Old names: ++AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) ++AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PROG_LIBTOOL], []) ++dnl AC_DEFUN([AM_PROG_LIBTOOL], []) ++ ++ ++# _LT_CC_BASENAME(CC) ++# ------------------- ++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. ++m4_defun([_LT_CC_BASENAME], ++[for cc_temp in $1""; do ++ case $cc_temp in ++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; ++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; ++ \-*) ;; ++ *) break;; ++ esac ++done ++cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` ++]) ++ ++ ++# _LT_FILEUTILS_DEFAULTS ++# ---------------------- ++# It is okay to use these file commands and assume they have been set ++# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. ++m4_defun([_LT_FILEUTILS_DEFAULTS], ++[: ${CP="cp -f"} ++: ${MV="mv -f"} ++: ${RM="rm -f"} ++])# _LT_FILEUTILS_DEFAULTS ++ ++ ++# _LT_SETUP ++# --------- ++m4_defun([_LT_SETUP], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++_LT_DECL([], [host_alias], [0], [The host system])dnl ++_LT_DECL([], [host], [0])dnl ++_LT_DECL([], [host_os], [0])dnl ++dnl ++_LT_DECL([], [build_alias], [0], [The build system])dnl ++_LT_DECL([], [build], [0])dnl ++_LT_DECL([], [build_os], [0])dnl ++dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++dnl ++AC_REQUIRE([AC_PROG_LN_S])dnl ++test -z "$LN_S" && LN_S="ln -s" ++_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl ++dnl ++AC_REQUIRE([LT_CMD_MAX_LEN])dnl ++_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl ++_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl ++dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_CHECK_SHELL_FEATURES])dnl ++m4_require([_LT_CMD_RELOAD])dnl ++m4_require([_LT_CHECK_MAGIC_METHOD])dnl ++m4_require([_LT_CMD_OLD_ARCHIVE])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++ ++_LT_CONFIG_LIBTOOL_INIT([ ++# See if we are running on zsh, and set the options which allow our ++# commands through without removal of \ escapes INIT. ++if test -n "\${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++]) ++if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++fi ++ ++_LT_CHECK_OBJDIR ++ ++m4_require([_LT_TAG_COMPILER])dnl ++_LT_PROG_ECHO_BACKSLASH ++ ++case $host_os in ++aix3*) ++ # AIX sometimes has problems with the GCC collect2 program. For some ++ # reason, if we set the COLLECT_NAMES environment variable, the problems ++ # vanish in a puff of smoke. ++ if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++ fi ++ ;; ++esac ++ ++# Sed substitution that helps us do robust quoting. It backslashifies ++# metacharacters that are still active within double-quoted strings. ++sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' ++ ++# Same as above, but do not quote variable references. ++double_quote_subst='s/\([["`\\]]\)/\\\1/g' ++ ++# Sed substitution to delay expansion of an escaped shell variable in a ++# double_quote_subst'ed string. ++delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' ++ ++# Sed substitution to delay expansion of an escaped single quote. ++delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' ++ ++# Sed substitution to avoid accidental globbing in evaled expressions ++no_glob_subst='s/\*/\\\*/g' ++ ++# Global variables: ++ofile=libtool ++can_build_shared=yes ++ ++# All known linkers require a `.a' archive for static linking (except MSVC, ++# which needs '.lib'). ++libext=a ++ ++with_gnu_ld="$lt_cv_prog_gnu_ld" ++ ++old_CC="$CC" ++old_CFLAGS="$CFLAGS" ++ ++# Set sane defaults for various variables ++test -z "$CC" && CC=cc ++test -z "$LTCC" && LTCC=$CC ++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS ++test -z "$LD" && LD=ld ++test -z "$ac_objext" && ac_objext=o ++ ++_LT_CC_BASENAME([$compiler]) ++ ++# Only perform the check for file, if the check method requires it ++test -z "$MAGIC_CMD" && MAGIC_CMD=file ++case $deplibs_check_method in ++file_magic*) ++ if test "$file_magic_cmd" = '$MAGIC_CMD'; then ++ _LT_PATH_MAGIC ++ fi ++ ;; ++esac ++ ++# Use C for the default configuration in the libtool script ++LT_SUPPORTED_TAG([CC]) ++_LT_LANG_C_CONFIG ++_LT_LANG_DEFAULT_CONFIG ++_LT_CONFIG_COMMANDS ++])# _LT_SETUP ++ ++ ++# _LT_PROG_LTMAIN ++# --------------- ++# Note that this code is called both from `configure', and `config.status' ++# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, ++# `config.status' has no value for ac_aux_dir unless we are using Automake, ++# so we pass a copy along to make sure it has a sensible value anyway. ++m4_defun([_LT_PROG_LTMAIN], ++[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl ++_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) ++ltmain="$ac_aux_dir/ltmain.sh" ++])# _LT_PROG_LTMAIN ++ ++ ++## ------------------------------------- ## ++## Accumulate code for creating libtool. ## ++## ------------------------------------- ## ++ ++# So that we can recreate a full libtool script including additional ++# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS ++# in macros and then make a single call at the end using the `libtool' ++# label. ++ ++ ++# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) ++# ---------------------------------------- ++# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL_INIT], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_INIT]) ++ ++ ++# _LT_CONFIG_LIBTOOL([COMMANDS]) ++# ------------------------------ ++# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. ++m4_define([_LT_CONFIG_LIBTOOL], ++[m4_ifval([$1], ++ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], ++ [$1 ++])])]) ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) ++ ++ ++# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) ++# ----------------------------------------------------- ++m4_defun([_LT_CONFIG_SAVE_COMMANDS], ++[_LT_CONFIG_LIBTOOL([$1]) ++_LT_CONFIG_LIBTOOL_INIT([$2]) ++]) ++ ++ ++# _LT_FORMAT_COMMENT([COMMENT]) ++# ----------------------------- ++# Add leading comment marks to the start of each line, and a trailing ++# full-stop to the whole comment if one is not present already. ++m4_define([_LT_FORMAT_COMMENT], ++[m4_ifval([$1], [ ++m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], ++ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) ++)]) ++ ++ ++ ++## ------------------------ ## ++## FIXME: Eliminate VARNAME ## ++## ------------------------ ## ++ ++ ++# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) ++# ------------------------------------------------------------------- ++# CONFIGNAME is the name given to the value in the libtool script. ++# VARNAME is the (base) name used in the configure script. ++# VALUE may be 0, 1 or 2 for a computed quote escaped value based on ++# VARNAME. Any other value will be used directly. ++m4_define([_LT_DECL], ++[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], ++ [m4_ifval([$1], [$1], [$2])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) ++ m4_ifval([$4], ++ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) ++ lt_dict_add_subkey([lt_decl_dict], [$2], ++ [tagged?], [m4_ifval([$5], [yes], [no])])]) ++]) ++ ++ ++# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) ++# -------------------------------------------------------- ++m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) ++ ++ ++# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_tag_varnames], ++[_lt_decl_filter([tagged?], [yes], $@)]) ++ ++ ++# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) ++# --------------------------------------------------------- ++m4_define([_lt_decl_filter], ++[m4_case([$#], ++ [0], [m4_fatal([$0: too few arguments: $#])], ++ [1], [m4_fatal([$0: too few arguments: $#: $1])], ++ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], ++ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], ++ [lt_dict_filter([lt_decl_dict], $@)])[]dnl ++]) ++ ++ ++# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) ++# -------------------------------------------------- ++m4_define([lt_decl_quote_varnames], ++[_lt_decl_filter([value], [1], $@)]) ++ ++ ++# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_dquote_varnames], ++[_lt_decl_filter([value], [2], $@)]) ++ ++ ++# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) ++# --------------------------------------------------- ++m4_define([lt_decl_varnames_tagged], ++[m4_assert([$# <= 2])dnl ++_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), ++ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) ++m4_define([_lt_decl_varnames_tagged], ++[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) ++ ++ ++# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) ++# ------------------------------------------------ ++m4_define([lt_decl_all_varnames], ++[_$0(m4_quote(m4_default([$1], [[, ]])), ++ m4_if([$2], [], ++ m4_quote(lt_decl_varnames), ++ m4_quote(m4_shift($@))))[]dnl ++]) ++m4_define([_lt_decl_all_varnames], ++[lt_join($@, lt_decl_varnames_tagged([$1], ++ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl ++]) ++ ++ ++# _LT_CONFIG_STATUS_DECLARE([VARNAME]) ++# ------------------------------------ ++# Quote a variable value, and forward it to `config.status' so that its ++# declaration there will have the same value as in `configure'. VARNAME ++# must have a single quote delimited value for this to work. ++m4_define([_LT_CONFIG_STATUS_DECLARE], ++[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) ++ ++ ++# _LT_CONFIG_STATUS_DECLARATIONS ++# ------------------------------ ++# We delimit libtool config variables with single quotes, so when ++# we write them to config.status, we have to be sure to quote all ++# embedded single quotes properly. In configure, this macro expands ++# each variable declared with _LT_DECL (and _LT_TAGDECL) into: ++# ++# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' ++m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), ++ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAGS ++# ---------------- ++# Output comment and list of tags supported by the script ++m4_defun([_LT_LIBTOOL_TAGS], ++[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl ++available_tags="_LT_TAGS"dnl ++]) ++ ++ ++# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) ++# ----------------------------------- ++# Extract the dictionary values for VARNAME (optionally with TAG) and ++# expand to a commented shell variable setting: ++# ++# # Some comment about what VAR is for. ++# visible_name=$lt_internal_name ++m4_define([_LT_LIBTOOL_DECLARE], ++[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], ++ [description])))[]dnl ++m4_pushdef([_libtool_name], ++ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl ++m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), ++ [0], [_libtool_name=[$]$1], ++ [1], [_libtool_name=$lt_[]$1], ++ [2], [_libtool_name=$lt_[]$1], ++ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl ++m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl ++]) ++ ++ ++# _LT_LIBTOOL_CONFIG_VARS ++# ----------------------- ++# Produce commented declarations of non-tagged libtool config variables ++# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' ++# script. Tagged libtool config variables (even for the LIBTOOL CONFIG ++# section) are produced by _LT_LIBTOOL_TAG_VARS. ++m4_defun([_LT_LIBTOOL_CONFIG_VARS], ++[m4_foreach([_lt_var], ++ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) ++ ++ ++# _LT_LIBTOOL_TAG_VARS(TAG) ++# ------------------------- ++m4_define([_LT_LIBTOOL_TAG_VARS], ++[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), ++ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) ++ ++ ++# _LT_TAGVAR(VARNAME, [TAGNAME]) ++# ------------------------------ ++m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) ++ ++ ++# _LT_CONFIG_COMMANDS ++# ------------------- ++# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of ++# variables for single and double quote escaping we saved from calls ++# to _LT_DECL, we can put quote escaped variables declarations ++# into `config.status', and then the shell code to quote escape them in ++# for loops in `config.status'. Finally, any additional code accumulated ++# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. ++m4_defun([_LT_CONFIG_COMMANDS], ++[AC_PROVIDE_IFELSE([LT_OUTPUT], ++ dnl If the libtool generation code has been placed in $CONFIG_LT, ++ dnl instead of duplicating it all over again into config.status, ++ dnl then we will have config.status run $CONFIG_LT later, so it ++ dnl needs to know what name is stored there: ++ [AC_CONFIG_COMMANDS([libtool], ++ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], ++ dnl If the libtool generation code is destined for config.status, ++ dnl expand the accumulated commands and init code now: ++ [AC_CONFIG_COMMANDS([libtool], ++ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) ++])#_LT_CONFIG_COMMANDS ++ ++ ++# Initialize. ++m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], ++[ ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++sed_quote_subst='$sed_quote_subst' ++double_quote_subst='$double_quote_subst' ++delay_variable_subst='$delay_variable_subst' ++_LT_CONFIG_STATUS_DECLARATIONS ++LTCC='$LTCC' ++LTCFLAGS='$LTCFLAGS' ++compiler='$compiler_DEFAULT' ++ ++# Quote evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_quote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Double-quote double-evaled strings. ++for var in lt_decl_all_varnames([[ \ ++]], lt_decl_dquote_varnames); do ++ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in ++ *[[\\\\\\\`\\"\\\$]]*) ++ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ++ ;; ++ *) ++ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" ++ ;; ++ esac ++done ++ ++# Fix-up fallback echo if it was mangled by the above quoting rules. ++case \$lt_ECHO in ++*'\\\[$]0 --fallback-echo"')dnl " ++ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` ++ ;; ++esac ++ ++_LT_OUTPUT_LIBTOOL_INIT ++]) ++ ++ ++# LT_OUTPUT ++# --------- ++# This macro allows early generation of the libtool script (before ++# AC_OUTPUT is called), incase it is used in configure for compilation ++# tests. ++AC_DEFUN([LT_OUTPUT], ++[: ${CONFIG_LT=./config.lt} ++AC_MSG_NOTICE([creating $CONFIG_LT]) ++cat >"$CONFIG_LT" <<_LTEOF ++#! $SHELL ++# Generated by $as_me. ++# Run this file to recreate a libtool stub with the current configuration. ++ ++lt_cl_silent=false ++SHELL=\${CONFIG_SHELL-$SHELL} ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AS_SHELL_SANITIZE ++_AS_PREPARE ++ ++exec AS_MESSAGE_FD>&1 ++exec AS_MESSAGE_LOG_FD>>config.log ++{ ++ echo ++ AS_BOX([Running $as_me.]) ++} >&AS_MESSAGE_LOG_FD ++ ++lt_cl_help="\ ++\`$as_me' creates a local libtool stub from the current configuration, ++for use in further configure time tests before the real libtool is ++generated. ++ ++Usage: $[0] [[OPTIONS]] ++ ++ -h, --help print this help, then exit ++ -V, --version print version number, then exit ++ -q, --quiet do not print progress messages ++ -d, --debug don't remove temporary files ++ ++Report bugs to ." ++ ++lt_cl_version="\ ++m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl ++m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) ++configured by $[0], generated by m4_PACKAGE_STRING. ++ ++Copyright (C) 2008 Free Software Foundation, Inc. ++This config.lt script is free software; the Free Software Foundation ++gives unlimited permision to copy, distribute and modify it." ++ ++while test $[#] != 0 ++do ++ case $[1] in ++ --version | --v* | -V ) ++ echo "$lt_cl_version"; exit 0 ;; ++ --help | --h* | -h ) ++ echo "$lt_cl_help"; exit 0 ;; ++ --debug | --d* | -d ) ++ debug=: ;; ++ --quiet | --q* | --silent | --s* | -q ) ++ lt_cl_silent=: ;; ++ ++ -*) AC_MSG_ERROR([unrecognized option: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ ++ *) AC_MSG_ERROR([unrecognized argument: $[1] ++Try \`$[0] --help' for more information.]) ;; ++ esac ++ shift ++done ++ ++if $lt_cl_silent; then ++ exec AS_MESSAGE_FD>/dev/null ++fi ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<_LTEOF ++_LT_OUTPUT_LIBTOOL_COMMANDS_INIT ++_LTEOF ++ ++cat >>"$CONFIG_LT" <<\_LTEOF ++AC_MSG_NOTICE([creating $ofile]) ++_LT_OUTPUT_LIBTOOL_COMMANDS ++AS_EXIT(0) ++_LTEOF ++chmod +x "$CONFIG_LT" ++ ++# configure is writing to config.log, but config.lt does its own redirection, ++# appending to config.log, which fails on DOS, as config.log is still kept ++# open by configure. Here we exec the FD to /dev/null, effectively closing ++# config.log, so it can be properly (re)opened and appended to by config.lt. ++if test "$no_create" != yes; then ++ lt_cl_success=: ++ test "$silent" = yes && ++ lt_config_lt_args="$lt_config_lt_args --quiet" ++ exec AS_MESSAGE_LOG_FD>/dev/null ++ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false ++ exec AS_MESSAGE_LOG_FD>>config.log ++ $lt_cl_success || AS_EXIT(1) ++fi ++])# LT_OUTPUT ++ ++ ++# _LT_CONFIG(TAG) ++# --------------- ++# If TAG is the built-in tag, create an initial libtool script with a ++# default configuration from the untagged config vars. Otherwise add code ++# to config.status for appending the configuration named by TAG from the ++# matching tagged config vars. ++m4_defun([_LT_CONFIG], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_CONFIG_SAVE_COMMANDS([ ++ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl ++ m4_if(_LT_TAG, [C], [ ++ # See if we are running on zsh, and set the options which allow our ++ # commands through without removal of \ escapes. ++ if test -n "${ZSH_VERSION+set}" ; then ++ setopt NO_GLOB_SUBST ++ fi ++ ++ cfgfile="${ofile}T" ++ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 ++ $RM "$cfgfile" ++ ++ cat <<_LT_EOF >> "$cfgfile" ++#! $SHELL ++ ++# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. ++# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION ++# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: ++# NOTE: Changes made to this file will be lost: look at ltmain.sh. ++# ++_LT_COPYING ++_LT_LIBTOOL_TAGS ++ ++# ### BEGIN LIBTOOL CONFIG ++_LT_LIBTOOL_CONFIG_VARS ++_LT_LIBTOOL_TAG_VARS ++# ### END LIBTOOL CONFIG ++ ++_LT_EOF ++ ++ case $host_os in ++ aix3*) ++ cat <<\_LT_EOF >> "$cfgfile" ++# AIX sometimes has problems with the GCC collect2 program. For some ++# reason, if we set the COLLECT_NAMES environment variable, the problems ++# vanish in a puff of smoke. ++if test "X${COLLECT_NAMES+set}" != Xset; then ++ COLLECT_NAMES= ++ export COLLECT_NAMES ++fi ++_LT_EOF ++ ;; ++ esac ++ ++ _LT_PROG_LTMAIN ++ ++ # We use sed instead of cat because bash on DJGPP gets confused if ++ # if finds mixed CR/LF and LF-only lines. Since sed operates in ++ # text mode, it properly converts lines to CR/LF. This bash problem ++ # is reportedly fixed, but why not run on old versions too? ++ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ _LT_PROG_XSI_SHELLFNS ++ ++ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ ++ || (rm -f "$cfgfile"; exit 1) ++ ++ mv -f "$cfgfile" "$ofile" || ++ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") ++ chmod +x "$ofile" ++], ++[cat <<_LT_EOF >> "$ofile" ++ ++dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded ++dnl in a comment (ie after a #). ++# ### BEGIN LIBTOOL TAG CONFIG: $1 ++_LT_LIBTOOL_TAG_VARS(_LT_TAG) ++# ### END LIBTOOL TAG CONFIG: $1 ++_LT_EOF ++])dnl /m4_if ++], ++[m4_if([$1], [], [ ++ PACKAGE='$PACKAGE' ++ VERSION='$VERSION' ++ TIMESTAMP='$TIMESTAMP' ++ RM='$RM' ++ ofile='$ofile'], []) ++])dnl /_LT_CONFIG_SAVE_COMMANDS ++])# _LT_CONFIG ++ ++ ++# LT_SUPPORTED_TAG(TAG) ++# --------------------- ++# Trace this macro to discover what tags are supported by the libtool ++# --tag option, using: ++# autoconf --trace 'LT_SUPPORTED_TAG:$1' ++AC_DEFUN([LT_SUPPORTED_TAG], []) ++ ++ ++# C support is built-in for now ++m4_define([_LT_LANG_C_enabled], []) ++m4_define([_LT_TAGS], []) ++ ++ ++# LT_LANG(LANG) ++# ------------- ++# Enable libtool support for the given language if not already enabled. ++AC_DEFUN([LT_LANG], ++[AC_BEFORE([$0], [LT_OUTPUT])dnl ++m4_case([$1], ++ [C], [_LT_LANG(C)], ++ [C++], [_LT_LANG(CXX)], ++ [Java], [_LT_LANG(GCJ)], ++ [Fortran 77], [_LT_LANG(F77)], ++ [Fortran], [_LT_LANG(FC)], ++ [Windows Resource], [_LT_LANG(RC)], ++ [m4_ifdef([_LT_LANG_]$1[_CONFIG], ++ [_LT_LANG($1)], ++ [m4_fatal([$0: unsupported language: "$1"])])])dnl ++])# LT_LANG ++ ++ ++# _LT_LANG(LANGNAME) ++# ------------------ ++m4_defun([_LT_LANG], ++[m4_ifdef([_LT_LANG_]$1[_enabled], [], ++ [LT_SUPPORTED_TAG([$1])dnl ++ m4_append([_LT_TAGS], [$1 ])dnl ++ m4_define([_LT_LANG_]$1[_enabled], [])dnl ++ _LT_LANG_$1_CONFIG($1)])dnl ++])# _LT_LANG ++ ++ ++# _LT_LANG_DEFAULT_CONFIG ++# ----------------------- ++m4_defun([_LT_LANG_DEFAULT_CONFIG], ++[AC_PROVIDE_IFELSE([AC_PROG_CXX], ++ [LT_LANG(CXX)], ++ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_F77], ++ [LT_LANG(F77)], ++ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) ++ ++AC_PROVIDE_IFELSE([AC_PROG_FC], ++ [LT_LANG(FC)], ++ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) ++ ++dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal ++dnl pulling things in needlessly. ++AC_PROVIDE_IFELSE([AC_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], ++ [LT_LANG(GCJ)], ++ [m4_ifdef([AC_PROG_GCJ], ++ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([A][M_PROG_GCJ], ++ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) ++ m4_ifdef([LT_PROG_GCJ], ++ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) ++ ++AC_PROVIDE_IFELSE([LT_PROG_RC], ++ [LT_LANG(RC)], ++ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) ++])# _LT_LANG_DEFAULT_CONFIG ++ ++# Obsolete macros: ++AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) ++AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) ++AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) ++AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_CXX], []) ++dnl AC_DEFUN([AC_LIBTOOL_F77], []) ++dnl AC_DEFUN([AC_LIBTOOL_FC], []) ++dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) ++ ++ ++# _LT_TAG_COMPILER ++# ---------------- ++m4_defun([_LT_TAG_COMPILER], ++[AC_REQUIRE([AC_PROG_CC])dnl ++ ++_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl ++_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl ++_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl ++_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl ++ ++# If no C compiler was specified, use CC. ++LTCC=${LTCC-"$CC"} ++ ++# If no C compiler flags were specified, use CFLAGS. ++LTCFLAGS=${LTCFLAGS-"$CFLAGS"} ++ ++# Allow CC to be a program name with arguments. ++compiler=$CC ++])# _LT_TAG_COMPILER ++ ++ ++# _LT_COMPILER_BOILERPLATE ++# ------------------------ ++# Check for compiler boilerplate output or warnings with ++# the simple compiler test code. ++m4_defun([_LT_COMPILER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_compile_test_code" >conftest.$ac_ext ++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_compiler_boilerplate=`cat conftest.err` ++$RM conftest* ++])# _LT_COMPILER_BOILERPLATE ++ ++ ++# _LT_LINKER_BOILERPLATE ++# ---------------------- ++# Check for linker boilerplate output or warnings with ++# the simple link test code. ++m4_defun([_LT_LINKER_BOILERPLATE], ++[m4_require([_LT_DECL_SED])dnl ++ac_outfile=conftest.$ac_objext ++echo "$lt_simple_link_test_code" >conftest.$ac_ext ++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err ++_lt_linker_boilerplate=`cat conftest.err` ++$RM -r conftest* ++])# _LT_LINKER_BOILERPLATE ++ ++# _LT_REQUIRED_DARWIN_CHECKS ++# ------------------------- ++m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ ++ case $host_os in ++ rhapsody* | darwin*) ++ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) ++ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) ++ AC_CHECK_TOOL([LIPO], [lipo], [:]) ++ AC_CHECK_TOOL([OTOOL], [otool], [:]) ++ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) ++ _LT_DECL([], [DSYMUTIL], [1], ++ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) ++ _LT_DECL([], [NMEDIT], [1], ++ [Tool to change global to local symbols on Mac OS X]) ++ _LT_DECL([], [LIPO], [1], ++ [Tool to manipulate fat objects and archives on Mac OS X]) ++ _LT_DECL([], [OTOOL], [1], ++ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) ++ _LT_DECL([], [OTOOL64], [1], ++ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) ++ ++ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], ++ [lt_cv_apple_cc_single_mod=no ++ if test -z "${LT_MULTI_MODULE}"; then ++ # By default we will add the -single_module flag. You can override ++ # by either setting the environment variable LT_MULTI_MODULE ++ # non-empty at configure time, or by adding -multi_module to the ++ # link flags. ++ rm -rf libconftest.dylib* ++ echo "int foo(void){return 1;}" > conftest.c ++ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD ++ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ ++ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err ++ _lt_result=$? ++ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then ++ lt_cv_apple_cc_single_mod=yes ++ else ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ fi ++ rm -rf libconftest.dylib* ++ rm -f conftest.* ++ fi]) ++ AC_CACHE_CHECK([for -exported_symbols_list linker flag], ++ [lt_cv_ld_exported_symbols_list], ++ [lt_cv_ld_exported_symbols_list=no ++ save_LDFLAGS=$LDFLAGS ++ echo "_main" > conftest.sym ++ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [lt_cv_ld_exported_symbols_list=yes], ++ [lt_cv_ld_exported_symbols_list=no]) ++ LDFLAGS="$save_LDFLAGS" ++ ]) ++ case $host_os in ++ rhapsody* | darwin1.[[012]]) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; ++ darwin1.*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ darwin*) # darwin 5.x on ++ # if running on 10.5 or later, the deployment target defaults ++ # to the OS version, if on x86, and 10.4, the deployment ++ # target defaults to 10.4. Don't you love it? ++ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in ++ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ 10.[[012]]*) ++ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; ++ 10.*) ++ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; ++ esac ++ ;; ++ esac ++ if test "$lt_cv_apple_cc_single_mod" = "yes"; then ++ _lt_dar_single_mod='$single_module' ++ fi ++ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then ++ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' ++ else ++ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' ++ fi ++ if test "$DSYMUTIL" != ":"; then ++ _lt_dsymutil='~$DSYMUTIL $lib || :' ++ else ++ _lt_dsymutil= ++ fi ++ ;; ++ esac ++]) ++ ++ ++# _LT_DARWIN_LINKER_FEATURES ++# -------------------------- ++# Checks for linker and compiler features on darwin ++m4_defun([_LT_DARWIN_LINKER_FEATURES], ++[ ++ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_automatic, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" ++ case $cc_basename in ++ ifort*) _lt_dar_can_shared=yes ;; ++ *) _lt_dar_can_shared=$GCC ;; ++ esac ++ if test "$_lt_dar_can_shared" = "yes"; then ++ output_verbose_link_cmd=echo ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" ++ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" ++ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" ++ m4_if([$1], [CXX], ++[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then ++ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" ++ fi ++],[]) ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++]) ++ ++# _LT_SYS_MODULE_PATH_AIX ++# ----------------------- ++# Links a minimal program and checks the executable ++# for the system default hardcoded library path. In most cases, ++# this is /usr/lib:/lib, but when the MPI compilers are used ++# the location of the communication and MPI libs are included too. ++# If we don't find anything, use the default library path according ++# to the aix ld manual. ++m4_defun([_LT_SYS_MODULE_PATH_AIX], ++[m4_require([_LT_DECL_SED])dnl ++AC_LINK_IFELSE(AC_LANG_PROGRAM,[ ++lt_aix_libpath_sed=' ++ /Import File Strings/,/^$/ { ++ /^0/ { ++ s/^0 *\(.*\)$/\1/ ++ p ++ } ++ }' ++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++# Check for a 64-bit object if we didn't find anything. ++if test -z "$aix_libpath"; then ++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` ++fi],[]) ++if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi ++])# _LT_SYS_MODULE_PATH_AIX ++ ++ ++# _LT_SHELL_INIT(ARG) ++# ------------------- ++m4_define([_LT_SHELL_INIT], ++[ifdef([AC_DIVERSION_NOTICE], ++ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], ++ [AC_DIVERT_PUSH(NOTICE)]) ++$1 ++AC_DIVERT_POP ++])# _LT_SHELL_INIT ++ ++ ++# _LT_PROG_ECHO_BACKSLASH ++# ----------------------- ++# Add some code to the start of the generated configure script which ++# will find an echo command which doesn't interpret backslashes. ++m4_defun([_LT_PROG_ECHO_BACKSLASH], ++[_LT_SHELL_INIT([ ++# Check that we are running under the correct shell. ++SHELL=${CONFIG_SHELL-/bin/sh} ++ ++case X$lt_ECHO in ++X*--fallback-echo) ++ # Remove one level of quotation (which was required for Make). ++ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` ++ ;; ++esac ++ ++ECHO=${lt_ECHO-echo} ++if test "X[$]1" = X--no-reexec; then ++ # Discard the --no-reexec flag, and continue. ++ shift ++elif test "X[$]1" = X--fallback-echo; then ++ # Avoid inline document here, it may be left over ++ : ++elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then ++ # Yippee, $ECHO works! ++ : ++else ++ # Restart under the correct shell. ++ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} ++fi ++ ++if test "X[$]1" = X--fallback-echo; then ++ # used as fallback echo ++ shift ++ cat <<_LT_EOF ++[$]* ++_LT_EOF ++ exit 0 ++fi ++ ++# The HP-UX ksh and POSIX shell print the target directory to stdout ++# if CDPATH is set. ++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH ++ ++if test -z "$lt_ECHO"; then ++ if test "X${echo_test_string+set}" != Xset; then ++ # find a string as large as possible, as long as the shell can cope with it ++ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do ++ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... ++ if { echo_test_string=`eval $cmd`; } 2>/dev/null && ++ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null ++ then ++ break ++ fi ++ done ++ fi ++ ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ : ++ else ++ # The Solaris, AIX, and Digital Unix default echo programs unquote ++ # backslashes. This makes it impossible to quote backslashes using ++ # echo "$something" | sed 's/\\/\\\\/g' ++ # ++ # So, first we look for a working echo in the user's PATH. ++ ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for dir in $PATH /usr/ucb; do ++ IFS="$lt_save_ifs" ++ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && ++ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$dir/echo" ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ++ if test "X$ECHO" = Xecho; then ++ # We didn't find a better echo, so look for alternatives. ++ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # This shell has a builtin print -r that does the trick. ++ ECHO='print -r' ++ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && ++ test "X$CONFIG_SHELL" != X/bin/ksh; then ++ # If we have ksh, try running configure again with it. ++ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} ++ export ORIGINAL_CONFIG_SHELL ++ CONFIG_SHELL=/bin/ksh ++ export CONFIG_SHELL ++ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} ++ else ++ # Try using printf. ++ ECHO='printf %s\n' ++ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && ++ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ # Cool, printf works ++ : ++ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL ++ export CONFIG_SHELL ++ SHELL="$CONFIG_SHELL" ++ export SHELL ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && ++ test "X$echo_testing_string" = 'X\t' && ++ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && ++ test "X$echo_testing_string" = "X$echo_test_string"; then ++ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" ++ else ++ # maybe with a smaller string... ++ prev=: ++ ++ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do ++ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null ++ then ++ break ++ fi ++ prev="$cmd" ++ done ++ ++ if test "$prev" != 'sed 50q "[$]0"'; then ++ echo_test_string=`eval $prev` ++ export echo_test_string ++ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} ++ else ++ # Oops. We lost completely, so just stick with echo. ++ ECHO=echo ++ fi ++ fi ++ fi ++ fi ++ fi ++fi ++ ++# Copy echo and quote the copy suitably for passing to libtool from ++# the Makefile, instead of quoting the original, which is used later. ++lt_ECHO=$ECHO ++if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then ++ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" ++fi ++ ++AC_SUBST(lt_ECHO) ++]) ++_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) ++_LT_DECL([], [ECHO], [1], ++ [An echo program that does not interpret backslashes]) ++])# _LT_PROG_ECHO_BACKSLASH ++ ++ ++# _LT_ENABLE_LOCK ++# --------------- ++m4_defun([_LT_ENABLE_LOCK], ++[AC_ARG_ENABLE([libtool-lock], ++ [AS_HELP_STRING([--disable-libtool-lock], ++ [avoid locking (might break parallel builds)])]) ++test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes ++ ++# Some flags need to be propagated to the compiler or linker for good ++# libtool support. ++case $host in ++ia64-*-hpux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *ELF-32*) ++ HPUX_IA64_MODE="32" ++ ;; ++ *ELF-64*) ++ HPUX_IA64_MODE="64" ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++*-*-irix6*) ++ # Find out which ABI we are using. ++ echo '[#]line __oline__ "configure"' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -melf32bsmip" ++ ;; ++ *N32*) ++ LD="${LD-ld} -melf32bmipn32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -melf64bmip" ++ ;; ++ esac ++ else ++ case `/usr/bin/file conftest.$ac_objext` in ++ *32-bit*) ++ LD="${LD-ld} -32" ++ ;; ++ *N32*) ++ LD="${LD-ld} -n32" ++ ;; ++ *64-bit*) ++ LD="${LD-ld} -64" ++ ;; ++ esac ++ fi ++ fi ++ rm -rf conftest* ++ ;; ++ ++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ ++s390*-*linux*|s390*-*tpf*|sparc*-*linux*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *32-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_i386_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_i386" ++ ;; ++ ppc64-*linux*|powerpc64-*linux*) ++ LD="${LD-ld} -m elf32ppclinux" ++ ;; ++ s390x-*linux*) ++ LD="${LD-ld} -m elf_s390" ++ ;; ++ sparc64-*linux*) ++ LD="${LD-ld} -m elf32_sparc" ++ ;; ++ esac ++ ;; ++ *64-bit*) ++ case $host in ++ x86_64-*kfreebsd*-gnu) ++ LD="${LD-ld} -m elf_x86_64_fbsd" ++ ;; ++ x86_64-*linux*) ++ LD="${LD-ld} -m elf_x86_64" ++ ;; ++ ppc*-*linux*|powerpc*-*linux*) ++ LD="${LD-ld} -m elf64ppc" ++ ;; ++ s390*-*linux*|s390*-*tpf*) ++ LD="${LD-ld} -m elf64_s390" ++ ;; ++ sparc*-*linux*) ++ LD="${LD-ld} -m elf64_sparc" ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++ ++*-*-sco3.2v5*) ++ # On SCO OpenServer 5, we need -belf to get full-featured binaries. ++ SAVE_CFLAGS="$CFLAGS" ++ CFLAGS="$CFLAGS -belf" ++ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, ++ [AC_LANG_PUSH(C) ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) ++ AC_LANG_POP]) ++ if test x"$lt_cv_cc_needs_belf" != x"yes"; then ++ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf ++ CFLAGS="$SAVE_CFLAGS" ++ fi ++ ;; ++sparc*-*solaris*) ++ # Find out which ABI we are using. ++ echo 'int i;' > conftest.$ac_ext ++ if AC_TRY_EVAL(ac_compile); then ++ case `/usr/bin/file conftest.o` in ++ *64-bit*) ++ case $lt_cv_prog_gnu_ld in ++ yes*) LD="${LD-ld} -m elf64_sparc" ;; ++ *) ++ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then ++ LD="${LD-ld} -64" ++ fi ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ rm -rf conftest* ++ ;; ++esac ++ ++need_locks="$enable_libtool_lock" ++])# _LT_ENABLE_LOCK ++ ++ ++# _LT_CMD_OLD_ARCHIVE ++# ------------------- ++m4_defun([_LT_CMD_OLD_ARCHIVE], ++[AC_CHECK_TOOL(AR, ar, false) ++test -z "$AR" && AR=ar ++test -z "$AR_FLAGS" && AR_FLAGS=cru ++_LT_DECL([], [AR], [1], [The archiver]) ++_LT_DECL([], [AR_FLAGS], [1]) ++ ++AC_CHECK_TOOL(STRIP, strip, :) ++test -z "$STRIP" && STRIP=: ++_LT_DECL([], [STRIP], [1], [A symbol stripping program]) ++ ++AC_CHECK_TOOL(RANLIB, ranlib, :) ++test -z "$RANLIB" && RANLIB=: ++_LT_DECL([], [RANLIB], [1], ++ [Commands used to install an old-style archive]) ++ ++# Determine commands to create old-style static archives. ++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' ++old_postinstall_cmds='chmod 644 $oldlib' ++old_postuninstall_cmds= ++ ++if test -n "$RANLIB"; then ++ case $host_os in ++ openbsd*) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" ++ ;; ++ *) ++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" ++ ;; ++ esac ++ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" ++fi ++_LT_DECL([], [old_postinstall_cmds], [2]) ++_LT_DECL([], [old_postuninstall_cmds], [2]) ++_LT_TAGDECL([], [old_archive_cmds], [2], ++ [Commands used to build an old-style archive]) ++])# _LT_CMD_OLD_ARCHIVE ++ ++ ++# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------------------- ++# Check whether the given compiler option works ++AC_DEFUN([_LT_COMPILER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ lt_compiler_flag="$3" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ # The option is referenced via a variable to avoid confusing sed. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>conftest.err) ++ ac_status=$? ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s "$ac_outfile"; then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings other than the usual output. ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ fi ++ $RM conftest* ++]) ++ ++if test x"[$]$2" = xyes; then ++ m4_if([$5], , :, [$5]) ++else ++ m4_if([$6], , :, [$6]) ++fi ++])# _LT_COMPILER_OPTION ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) ++ ++ ++# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, ++# [ACTION-SUCCESS], [ACTION-FAILURE]) ++# ---------------------------------------------------- ++# Check whether the given linker option works ++AC_DEFUN([_LT_LINKER_OPTION], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_CACHE_CHECK([$1], [$2], ++ [$2=no ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS $3" ++ echo "$lt_simple_link_test_code" > conftest.$ac_ext ++ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then ++ # The linker can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ if test -s conftest.err; then ++ # Append any errors to the config.log. ++ cat conftest.err 1>&AS_MESSAGE_LOG_FD ++ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp ++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 ++ if diff conftest.exp conftest.er2 >/dev/null; then ++ $2=yes ++ fi ++ else ++ $2=yes ++ fi ++ fi ++ $RM -r conftest* ++ LDFLAGS="$save_LDFLAGS" ++]) ++ ++if test x"[$]$2" = xyes; then ++ m4_if([$4], , :, [$4]) ++else ++ m4_if([$5], , :, [$5]) ++fi ++])# _LT_LINKER_OPTION ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) ++ ++ ++# LT_CMD_MAX_LEN ++#--------------- ++AC_DEFUN([LT_CMD_MAX_LEN], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++# find the maximum length of command line arguments ++AC_MSG_CHECKING([the maximum length of command line arguments]) ++AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl ++ i=0 ++ teststring="ABCD" ++ ++ case $build_os in ++ msdosdjgpp*) ++ # On DJGPP, this test can blow up pretty badly due to problems in libc ++ # (any single argument exceeding 2000 bytes causes a buffer overrun ++ # during glob expansion). Even if it were fixed, the result of this ++ # check would be larger than it should be. ++ lt_cv_sys_max_cmd_len=12288; # 12K is about right ++ ;; ++ ++ gnu*) ++ # Under GNU Hurd, this test is not required because there is ++ # no limit to the length of command line arguments. ++ # Libtool will interpret -1 as no limit whatsoever ++ lt_cv_sys_max_cmd_len=-1; ++ ;; ++ ++ cygwin* | mingw* | cegcc*) ++ # On Win9x/ME, this test blows up -- it succeeds, but takes ++ # about 5 minutes as the teststring grows exponentially. ++ # Worse, since 9x/ME are not pre-emptively multitasking, ++ # you end up with a "frozen" computer, even though with patience ++ # the test eventually succeeds (with a max line length of 256k). ++ # Instead, let's just punt: use the minimum linelength reported by ++ # all of the supported platforms: 8192 (on NT/2K/XP). ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ amigaos*) ++ # On AmigaOS with pdksh, this test takes hours, literally. ++ # So we just punt and use a minimum line length of 8192. ++ lt_cv_sys_max_cmd_len=8192; ++ ;; ++ ++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) ++ # This has been around since 386BSD, at least. Likely further. ++ if test -x /sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` ++ elif test -x /usr/sbin/sysctl; then ++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` ++ else ++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs ++ fi ++ # And add a safety zone ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ ;; ++ ++ interix*) ++ # We know the value 262144 and hardcode it with a safety zone (like BSD) ++ lt_cv_sys_max_cmd_len=196608 ++ ;; ++ ++ osf*) ++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure ++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not ++ # nice to cause kernel panics so lets avoid the loop below. ++ # First set a reasonable default. ++ lt_cv_sys_max_cmd_len=16384 ++ # ++ if test -x /sbin/sysconfig; then ++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in ++ *1*) lt_cv_sys_max_cmd_len=-1 ;; ++ esac ++ fi ++ ;; ++ sco3.2v5*) ++ lt_cv_sys_max_cmd_len=102400 ++ ;; ++ sysv5* | sco5v6* | sysv4.2uw2*) ++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` ++ if test -n "$kargmax"; then ++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` ++ else ++ lt_cv_sys_max_cmd_len=32768 ++ fi ++ ;; ++ *) ++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` ++ if test -n "$lt_cv_sys_max_cmd_len"; then ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` ++ else ++ # Make teststring a little bigger before we do anything with it. ++ # a 1K string should be a reasonable start. ++ for i in 1 2 3 4 5 6 7 8 ; do ++ teststring=$teststring$teststring ++ done ++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} ++ # If test is not a shell built-in, we'll probably end up computing a ++ # maximum length that is only half of the actual maximum length, but ++ # we can't tell. ++ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ ++ = "XX$teststring$teststring"; } >/dev/null 2>&1 && ++ test $i != 17 # 1/2 MB should be enough ++ do ++ i=`expr $i + 1` ++ teststring=$teststring$teststring ++ done ++ # Only check the string length outside the loop. ++ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` ++ teststring= ++ # Add a significant safety factor because C++ compilers can tack on ++ # massive amounts of additional arguments before passing them to the ++ # linker. It appears as though 1/2 is a usable value. ++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` ++ fi ++ ;; ++ esac ++]) ++if test -n $lt_cv_sys_max_cmd_len ; then ++ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) ++else ++ AC_MSG_RESULT(none) ++fi ++max_cmd_len=$lt_cv_sys_max_cmd_len ++_LT_DECL([], [max_cmd_len], [0], ++ [What is the maximum length of a command?]) ++])# LT_CMD_MAX_LEN ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) ++ ++ ++# _LT_HEADER_DLFCN ++# ---------------- ++m4_defun([_LT_HEADER_DLFCN], ++[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl ++])# _LT_HEADER_DLFCN ++ ++ ++# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, ++# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) ++# ---------------------------------------------------------------- ++m4_defun([_LT_TRY_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl ++if test "$cross_compiling" = yes; then : ++ [$4] ++else ++ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 ++ lt_status=$lt_dlunknown ++ cat > conftest.$ac_ext <<_LT_EOF ++[#line __oline__ "configure" ++#include "confdefs.h" ++ ++#if HAVE_DLFCN_H ++#include ++#endif ++ ++#include ++ ++#ifdef RTLD_GLOBAL ++# define LT_DLGLOBAL RTLD_GLOBAL ++#else ++# ifdef DL_GLOBAL ++# define LT_DLGLOBAL DL_GLOBAL ++# else ++# define LT_DLGLOBAL 0 ++# endif ++#endif ++ ++/* We may have to define LT_DLLAZY_OR_NOW in the command line if we ++ find out it does not work in some platform. */ ++#ifndef LT_DLLAZY_OR_NOW ++# ifdef RTLD_LAZY ++# define LT_DLLAZY_OR_NOW RTLD_LAZY ++# else ++# ifdef DL_LAZY ++# define LT_DLLAZY_OR_NOW DL_LAZY ++# else ++# ifdef RTLD_NOW ++# define LT_DLLAZY_OR_NOW RTLD_NOW ++# else ++# ifdef DL_NOW ++# define LT_DLLAZY_OR_NOW DL_NOW ++# else ++# define LT_DLLAZY_OR_NOW 0 ++# endif ++# endif ++# endif ++# endif ++#endif ++ ++void fnord() { int i=42;} ++int main () ++{ ++ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); ++ int status = $lt_dlunknown; ++ ++ if (self) ++ { ++ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; ++ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; ++ /* dlclose (self); */ ++ } ++ else ++ puts (dlerror ()); ++ ++ return status; ++}] ++_LT_EOF ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then ++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null ++ lt_status=$? ++ case x$lt_status in ++ x$lt_dlno_uscore) $1 ;; ++ x$lt_dlneed_uscore) $2 ;; ++ x$lt_dlunknown|x*) $3 ;; ++ esac ++ else : ++ # compilation failed ++ $3 ++ fi ++fi ++rm -fr conftest* ++])# _LT_TRY_DLOPEN_SELF ++ ++ ++# LT_SYS_DLOPEN_SELF ++# ------------------ ++AC_DEFUN([LT_SYS_DLOPEN_SELF], ++[m4_require([_LT_HEADER_DLFCN])dnl ++if test "x$enable_dlopen" != xyes; then ++ enable_dlopen=unknown ++ enable_dlopen_self=unknown ++ enable_dlopen_self_static=unknown ++else ++ lt_cv_dlopen=no ++ lt_cv_dlopen_libs= ++ ++ case $host_os in ++ beos*) ++ lt_cv_dlopen="load_add_on" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ;; ++ ++ mingw* | pw32* | cegcc*) ++ lt_cv_dlopen="LoadLibrary" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ cygwin*) ++ lt_cv_dlopen="dlopen" ++ lt_cv_dlopen_libs= ++ ;; ++ ++ darwin*) ++ # if libdl is installed we need to link against it ++ AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ ++ lt_cv_dlopen="dyld" ++ lt_cv_dlopen_libs= ++ lt_cv_dlopen_self=yes ++ ]) ++ ;; ++ ++ *) ++ AC_CHECK_FUNC([shl_load], ++ [lt_cv_dlopen="shl_load"], ++ [AC_CHECK_LIB([dld], [shl_load], ++ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], ++ [AC_CHECK_FUNC([dlopen], ++ [lt_cv_dlopen="dlopen"], ++ [AC_CHECK_LIB([dl], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], ++ [AC_CHECK_LIB([svld], [dlopen], ++ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], ++ [AC_CHECK_LIB([dld], [dld_link], ++ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ]) ++ ;; ++ esac ++ ++ if test "x$lt_cv_dlopen" != xno; then ++ enable_dlopen=yes ++ else ++ enable_dlopen=no ++ fi ++ ++ case $lt_cv_dlopen in ++ dlopen) ++ save_CPPFLAGS="$CPPFLAGS" ++ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" ++ ++ save_LDFLAGS="$LDFLAGS" ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" ++ ++ save_LIBS="$LIBS" ++ LIBS="$lt_cv_dlopen_libs $LIBS" ++ ++ AC_CACHE_CHECK([whether a program can dlopen itself], ++ lt_cv_dlopen_self, [dnl ++ _LT_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, ++ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) ++ ]) ++ ++ if test "x$lt_cv_dlopen_self" = xyes; then ++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" ++ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], ++ lt_cv_dlopen_self_static, [dnl ++ _LT_TRY_DLOPEN_SELF( ++ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, ++ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) ++ ]) ++ fi ++ ++ CPPFLAGS="$save_CPPFLAGS" ++ LDFLAGS="$save_LDFLAGS" ++ LIBS="$save_LIBS" ++ ;; ++ esac ++ ++ case $lt_cv_dlopen_self in ++ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; ++ *) enable_dlopen_self=unknown ;; ++ esac ++ ++ case $lt_cv_dlopen_self_static in ++ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; ++ *) enable_dlopen_self_static=unknown ;; ++ esac ++fi ++_LT_DECL([dlopen_support], [enable_dlopen], [0], ++ [Whether dlopen is supported]) ++_LT_DECL([dlopen_self], [enable_dlopen_self], [0], ++ [Whether dlopen of programs is supported]) ++_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], ++ [Whether dlopen of statically linked programs is supported]) ++])# LT_SYS_DLOPEN_SELF ++ ++# Old name: ++AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) ++ ++ ++# _LT_COMPILER_C_O([TAGNAME]) ++# --------------------------- ++# Check to see if options -c and -o are simultaneously supported by compiler. ++# This macro does not hard code the compiler like AC_PROG_CC_C_O. ++m4_defun([_LT_COMPILER_C_O], ++[m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_TAG_COMPILER])dnl ++AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], ++ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no ++ $RM -r conftest 2>/dev/null ++ mkdir conftest ++ cd conftest ++ mkdir out ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ lt_compiler_flag="-o out/conftest2.$ac_objext" ++ # Insert the option either (1) after the last *FLAGS variable, or ++ # (2) before a word containing "conftest.", or (3) at the end. ++ # Note that $ac_compile itself does not contain backslashes and begins ++ # with a dollar sign (not a hyphen), so the echo should work correctly. ++ lt_compile=`echo "$ac_compile" | $SED \ ++ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ ++ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ ++ -e 's:$: $lt_compiler_flag:'` ++ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$lt_compile" 2>out/conftest.err) ++ ac_status=$? ++ cat out/conftest.err >&AS_MESSAGE_LOG_FD ++ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD ++ if (exit $ac_status) && test -s out/conftest2.$ac_objext ++ then ++ # The compiler can only warn and ignore the option if not recognized ++ # So say no if there are warnings ++ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp ++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 ++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then ++ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ fi ++ fi ++ chmod u+w . 2>&AS_MESSAGE_LOG_FD ++ $RM conftest* ++ # SGI C++ compiler will create directory out/ii_files/ for ++ # template instantiation ++ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files ++ $RM out/* && rmdir out ++ cd .. ++ $RM -r conftest ++ $RM conftest* ++]) ++_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], ++ [Does compiler simultaneously support -c and -o options?]) ++])# _LT_COMPILER_C_O ++ ++ ++# _LT_COMPILER_FILE_LOCKS([TAGNAME]) ++# ---------------------------------- ++# Check to see if we can do hard links to lock some files if needed ++m4_defun([_LT_COMPILER_FILE_LOCKS], ++[m4_require([_LT_ENABLE_LOCK])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++_LT_COMPILER_C_O([$1]) ++ ++hard_links="nottested" ++if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then ++ # do not overwrite the value of need_locks provided by the user ++ AC_MSG_CHECKING([if we can lock with hard links]) ++ hard_links=yes ++ $RM conftest* ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ touch conftest.a ++ ln conftest.a conftest.b 2>&5 || hard_links=no ++ ln conftest.a conftest.b 2>/dev/null && hard_links=no ++ AC_MSG_RESULT([$hard_links]) ++ if test "$hard_links" = no; then ++ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) ++ need_locks=warn ++ fi ++else ++ need_locks=no ++fi ++_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) ++])# _LT_COMPILER_FILE_LOCKS ++ ++ ++# _LT_CHECK_OBJDIR ++# ---------------- ++m4_defun([_LT_CHECK_OBJDIR], ++[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], ++[rm -f .libs 2>/dev/null ++mkdir .libs 2>/dev/null ++if test -d .libs; then ++ lt_cv_objdir=.libs ++else ++ # MS-DOS does not allow filenames that begin with a dot. ++ lt_cv_objdir=_libs ++fi ++rmdir .libs 2>/dev/null]) ++objdir=$lt_cv_objdir ++_LT_DECL([], [objdir], [0], ++ [The name of the directory that contains temporary libtool files])dnl ++m4_pattern_allow([LT_OBJDIR])dnl ++AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", ++ [Define to the sub-directory in which libtool stores uninstalled libraries.]) ++])# _LT_CHECK_OBJDIR ++ ++ ++# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) ++# -------------------------------------- ++# Check hardcoding attributes. ++m4_defun([_LT_LINKER_HARDCODE_LIBPATH], ++[AC_MSG_CHECKING([how to hardcode library paths into programs]) ++_LT_TAGVAR(hardcode_action, $1)= ++if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || ++ test -n "$_LT_TAGVAR(runpath_var, $1)" || ++ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then ++ ++ # We can hardcode non-existent directories. ++ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && ++ # If the only mechanism to avoid hardcoding is shlibpath_var, we ++ # have to relink, otherwise we might link with an installed library ++ # when we should be linking with a yet-to-be-installed one ++ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && ++ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then ++ # Linking always hardcodes the temporary library directory. ++ _LT_TAGVAR(hardcode_action, $1)=relink ++ else ++ # We can link without hardcoding, and we can hardcode nonexisting dirs. ++ _LT_TAGVAR(hardcode_action, $1)=immediate ++ fi ++else ++ # We cannot hardcode anything, or else we can only hardcode existing ++ # directories. ++ _LT_TAGVAR(hardcode_action, $1)=unsupported ++fi ++AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) ++ ++if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || ++ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then ++ # Fast installation is not supported ++ enable_fast_install=no ++elif test "$shlibpath_overrides_runpath" = yes || ++ test "$enable_shared" = no; then ++ # Fast installation is not necessary ++ enable_fast_install=needless ++fi ++_LT_TAGDECL([], [hardcode_action], [0], ++ [How to hardcode a shared library path into an executable]) ++])# _LT_LINKER_HARDCODE_LIBPATH ++ ++ ++# _LT_CMD_STRIPLIB ++# ---------------- ++m4_defun([_LT_CMD_STRIPLIB], ++[m4_require([_LT_DECL_EGREP]) ++striplib= ++old_striplib= ++AC_MSG_CHECKING([whether stripping libraries is possible]) ++if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then ++ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" ++ test -z "$striplib" && striplib="$STRIP --strip-unneeded" ++ AC_MSG_RESULT([yes]) ++else ++# FIXME - insert some real tests, host_os isn't really good enough ++ case $host_os in ++ darwin*) ++ if test -n "$STRIP" ; then ++ striplib="$STRIP -x" ++ old_striplib="$STRIP -S" ++ AC_MSG_RESULT([yes]) ++ else ++ AC_MSG_RESULT([no]) ++ fi ++ ;; ++ *) ++ AC_MSG_RESULT([no]) ++ ;; ++ esac ++fi ++_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) ++_LT_DECL([], [striplib], [1]) ++])# _LT_CMD_STRIPLIB ++ ++ ++# _LT_SYS_DYNAMIC_LINKER([TAG]) ++# ----------------------------- ++# PORTME Fill in your ld.so characteristics ++m4_defun([_LT_SYS_DYNAMIC_LINKER], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_OBJDUMP])dnl ++m4_require([_LT_DECL_SED])dnl ++AC_MSG_CHECKING([dynamic linker characteristics]) ++m4_if([$1], ++ [], [ ++if test "$GCC" = yes; then ++ case $host_os in ++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; ++ *) lt_awk_arg="/^libraries:/" ;; ++ esac ++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then ++ # if the path contains ";" then we assume it to be the separator ++ # otherwise default to the standard path separator (i.e. ":") - it is ++ # assumed that no part of a normal pathname contains ";" but that should ++ # okay in the real world where ";" in dirpaths is itself problematic. ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ # Ok, now we have the path, separated by spaces, we can step through it ++ # and add multilib dir if necessary. ++ lt_tmp_lt_search_path_spec= ++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` ++ for lt_sys_path in $lt_search_path_spec; do ++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" ++ else ++ test -d "$lt_sys_path" && \ ++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" ++ fi ++ done ++ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' ++BEGIN {RS=" "; FS="/|\n";} { ++ lt_foo=""; ++ lt_count=0; ++ for (lt_i = NF; lt_i > 0; lt_i--) { ++ if ($lt_i != "" && $lt_i != ".") { ++ if ($lt_i == "..") { ++ lt_count++; ++ } else { ++ if (lt_count == 0) { ++ lt_foo="/" $lt_i lt_foo; ++ } else { ++ lt_count--; ++ } ++ } ++ } ++ } ++ if (lt_foo != "") { lt_freq[[lt_foo]]++; } ++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } ++}'` ++ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` ++else ++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" ++fi]) ++library_names_spec= ++libname_spec='lib$name' ++soname_spec= ++shrext_cmds=".so" ++postinstall_cmds= ++postuninstall_cmds= ++finish_cmds= ++finish_eval= ++shlibpath_var= ++shlibpath_overrides_runpath=unknown ++version_type=none ++dynamic_linker="$host_os ld.so" ++sys_lib_dlsearch_path_spec="/lib /usr/lib" ++need_lib_prefix=unknown ++hardcode_into_libs=no ++ ++# when you set need_version to no, make sure it does not cause -set_version ++# flags to be left without arguments ++need_version=unknown ++ ++case $host_os in ++aix3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' ++ shlibpath_var=LIBPATH ++ ++ # AIX 3 has no versioning support, so we append a major version to the name. ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ ++aix[[4-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ hardcode_into_libs=yes ++ if test "$host_cpu" = ia64; then ++ # AIX 5 supports IA64 ++ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ else ++ # With GCC up to 2.95.x, collect2 would create an import file ++ # for dependence libraries. The import file would start with ++ # the line `#! .'. This would cause the generated library to ++ # depend on `.', always an invalid library. This was fixed in ++ # development snapshots of GCC prior to 3.0. ++ case $host_os in ++ aix4 | aix4.[[01]] | aix4.[[01]].*) ++ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' ++ echo ' yes ' ++ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then ++ : ++ else ++ can_build_shared=no ++ fi ++ ;; ++ esac ++ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct ++ # soname into executable. Probably we can add versioning support to ++ # collect2, so additional links can be useful in future. ++ if test "$aix_use_runtimelinking" = yes; then ++ # If using run time linking (on AIX 4.2 or later) use lib.so ++ # instead of lib.a to let people know that these are not ++ # typical AIX shared libraries. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ else ++ # We preserve .a as extension for shared libraries through AIX4.2 ++ # and later when we are not doing run time linking. ++ library_names_spec='${libname}${release}.a $libname.a' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ fi ++ shlibpath_var=LIBPATH ++ fi ++ ;; ++ ++amigaos*) ++ case $host_cpu in ++ powerpc) ++ # Since July 2007 AmigaOS4 officially supports .so libraries. ++ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ ;; ++ m68k) ++ library_names_spec='$libname.ixlibrary $libname.a' ++ # Create ${libname}_ixlibrary.a entries in /sys/libs. ++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' ++ ;; ++ esac ++ ;; ++ ++beos*) ++ library_names_spec='${libname}${shared_ext}' ++ dynamic_linker="$host_os ld.so" ++ shlibpath_var=LIBRARY_PATH ++ ;; ++ ++bsdi[[45]]*) ++ version_type=linux ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" ++ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" ++ # the default ld.so.conf also contains /usr/contrib/lib and ++ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow ++ # libtool to hard-code these into programs ++ ;; ++ ++cygwin* | mingw* | pw32* | cegcc*) ++ version_type=windows ++ shrext_cmds=".dll" ++ need_version=no ++ need_lib_prefix=no ++ ++ case $GCC,$host_os in ++ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) ++ library_names_spec='$libname.dll.a' ++ # DLL is installed to $(libdir)/../bin by postinstall_cmds ++ postinstall_cmds='base_file=`basename \${file}`~ ++ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ ++ dldir=$destdir/`dirname \$dlpath`~ ++ test -d \$dldir || mkdir -p \$dldir~ ++ $install_prog $dir/$dlname \$dldir/$dlname~ ++ chmod a+x \$dldir/$dlname~ ++ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then ++ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; ++ fi' ++ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ ++ dlpath=$dir/\$dldll~ ++ $RM \$dlpath' ++ shlibpath_overrides_runpath=yes ++ ++ case $host_os in ++ cygwin*) ++ # Cygwin DLLs use 'cyg' prefix rather than 'lib' ++ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" ++ ;; ++ mingw* | cegcc*) ++ # MinGW DLLs use traditional 'lib' prefix ++ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` ++ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then ++ # It is most probably a Windows format PATH printed by ++ # mingw gcc, but we are running on Cygwin. Gcc prints its search ++ # path with ; separators, and with drive letters. We can handle the ++ # drive letters (cygwin fileutils understands them), so leave them, ++ # especially as we might pass files found there to a mingw objdump, ++ # which wouldn't understand a cygwinified path. Ahh. ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` ++ else ++ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` ++ fi ++ ;; ++ pw32*) ++ # pw32 DLLs use 'pw' prefix rather than 'lib' ++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' ++ ;; ++ esac ++ ;; ++ ++ *) ++ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' ++ ;; ++ esac ++ dynamic_linker='Win32 ld.exe' ++ # FIXME: first we should search . and the directory the executable is in ++ shlibpath_var=PATH ++ ;; ++ ++darwin* | rhapsody*) ++ dynamic_linker="$host_os dyld" ++ version_type=darwin ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' ++ soname_spec='${libname}${release}${major}$shared_ext' ++ shlibpath_overrides_runpath=yes ++ shlibpath_var=DYLD_LIBRARY_PATH ++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' ++m4_if([$1], [],[ ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) ++ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' ++ ;; ++ ++dgux*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++freebsd1*) ++ dynamic_linker=no ++ ;; ++ ++freebsd* | dragonfly*) ++ # DragonFly does not have aout. When/if they implement a new ++ # versioning mechanism, adjust this. ++ if test -x /usr/bin/objformat; then ++ objformat=`/usr/bin/objformat` ++ else ++ case $host_os in ++ freebsd[[123]]*) objformat=aout ;; ++ *) objformat=elf ;; ++ esac ++ fi ++ version_type=freebsd-$objformat ++ case $version_type in ++ freebsd-elf*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ need_version=no ++ need_lib_prefix=no ++ ;; ++ freebsd-*) ++ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' ++ need_version=yes ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_os in ++ freebsd2*) ++ shlibpath_overrides_runpath=yes ++ ;; ++ freebsd3.[[01]]* | freebsdelf3.[[01]]*) ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ ++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ *) # from 4.6 on, and DragonFly ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ esac ++ ;; ++ ++gnu*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ hardcode_into_libs=yes ++ ;; ++ ++hpux9* | hpux10* | hpux11*) ++ # Give a soname corresponding to the major version so that dld.sl refuses to ++ # link against other versions. ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ case $host_cpu in ++ ia64*) ++ shrext_cmds='.so' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.so" ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ if test "X$HPUX_IA64_MODE" = X32; then ++ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" ++ else ++ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" ++ fi ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ hppa*64*) ++ shrext_cmds='.sl' ++ hardcode_into_libs=yes ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH ++ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" ++ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec ++ ;; ++ *) ++ shrext_cmds='.sl' ++ dynamic_linker="$host_os dld.sl" ++ shlibpath_var=SHLIB_PATH ++ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ ;; ++ esac ++ # HP-UX runs *really* slowly unless shared libraries are mode 555. ++ postinstall_cmds='chmod 555 $lib' ++ ;; ++ ++interix[[3-9]]*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $host_os in ++ nonstopux*) version_type=nonstopux ;; ++ *) ++ if test "$lt_cv_prog_gnu_ld" = yes; then ++ version_type=linux ++ else ++ version_type=irix ++ fi ;; ++ esac ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' ++ case $host_os in ++ irix5* | nonstopux*) ++ libsuff= shlibsuff= ++ ;; ++ *) ++ case $LD in # libtool.m4 will add one of these switches to LD ++ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") ++ libsuff= shlibsuff= libmagic=32-bit;; ++ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") ++ libsuff=32 shlibsuff=N32 libmagic=N32;; ++ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") ++ libsuff=64 shlibsuff=64 libmagic=64-bit;; ++ *) libsuff= shlibsuff= libmagic=never-match;; ++ esac ++ ;; ++ esac ++ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" ++ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" ++ hardcode_into_libs=yes ++ ;; ++ ++# No shared lib support for Linux oldld, aout, or coff. ++linux*oldld* | linux*aout* | linux*coff*) ++ dynamic_linker=no ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ # Some binutils ld are patched to set DT_RUNPATH ++ save_LDFLAGS=$LDFLAGS ++ save_libdir=$libdir ++ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ ++ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], ++ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], ++ [shlibpath_overrides_runpath=yes])]) ++ LDFLAGS=$save_LDFLAGS ++ libdir=$save_libdir ++ ++ # This implies no fast_install, which is unacceptable. ++ # Some rework will be needed to allow for fast_install ++ # before this can be enabled. ++ hardcode_into_libs=yes ++ ++ # Add ABI-specific directories to the system library path. ++ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" ++ ++ # Append ld.so.conf contents to the search path ++ if test -f /etc/ld.so.conf; then ++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` ++ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" ++ fi ++ ++ # We used to test for /lib/ld.so.1 and disable shared libraries on ++ # powerpc, because MkLinux only supported shared libraries with the ++ # GNU dynamic linker. Since this was broken with cross compilers, ++ # most powerpc-linux boxes support dynamic linking these days and ++ # people can always --disable-shared, the test was removed, and we ++ # assume the GNU/Linux dynamic linker is in use. ++ dynamic_linker='GNU/Linux ld.so' ++ ;; ++ ++netbsd*) ++ version_type=sunos ++ need_lib_prefix=no ++ need_version=no ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ dynamic_linker='NetBSD (a.out) ld.so' ++ else ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ dynamic_linker='NetBSD ld.elf_so' ++ fi ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ ;; ++ ++newsos6) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ ;; ++ ++*nto* | *qnx*) ++ version_type=qnx ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ dynamic_linker='ldqnx.so' ++ ;; ++ ++openbsd*) ++ version_type=sunos ++ sys_lib_dlsearch_path_spec="/usr/lib" ++ need_lib_prefix=no ++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. ++ case $host_os in ++ openbsd3.3 | openbsd3.3.*) need_version=yes ;; ++ *) need_version=no ;; ++ esac ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ case $host_os in ++ openbsd2.[[89]] | openbsd2.[[89]].*) ++ shlibpath_overrides_runpath=no ++ ;; ++ *) ++ shlibpath_overrides_runpath=yes ++ ;; ++ esac ++ else ++ shlibpath_overrides_runpath=yes ++ fi ++ ;; ++ ++os2*) ++ libname_spec='$name' ++ shrext_cmds=".dll" ++ need_lib_prefix=no ++ library_names_spec='$libname${shared_ext} $libname.a' ++ dynamic_linker='OS/2 ld.exe' ++ shlibpath_var=LIBPATH ++ ;; ++ ++osf3* | osf4* | osf5*) ++ version_type=osf ++ need_lib_prefix=no ++ need_version=no ++ soname_spec='${libname}${release}${shared_ext}$major' ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" ++ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" ++ ;; ++ ++rdos*) ++ dynamic_linker=no ++ ;; ++ ++solaris*) ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ # ldd complains unless libraries are executable ++ postinstall_cmds='chmod +x $lib' ++ ;; ++ ++sunos4*) ++ version_type=sunos ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' ++ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ if test "$with_gnu_ld" = yes; then ++ need_lib_prefix=no ++ fi ++ need_version=yes ++ ;; ++ ++sysv4 | sysv4.3*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ case $host_vendor in ++ sni) ++ shlibpath_overrides_runpath=no ++ need_lib_prefix=no ++ runpath_var=LD_RUN_PATH ++ ;; ++ siemens) ++ need_lib_prefix=no ++ ;; ++ motorola) ++ need_lib_prefix=no ++ need_version=no ++ shlibpath_overrides_runpath=no ++ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' ++ ;; ++ esac ++ ;; ++ ++sysv4*MP*) ++ if test -d /usr/nec ;then ++ version_type=linux ++ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' ++ soname_spec='$libname${shared_ext}.$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ fi ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ version_type=freebsd-elf ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=yes ++ hardcode_into_libs=yes ++ if test "$with_gnu_ld" = yes; then ++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' ++ else ++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' ++ case $host_os in ++ sco3.2v5*) ++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" ++ ;; ++ esac ++ fi ++ sys_lib_dlsearch_path_spec='/usr/lib' ++ ;; ++ ++tpf*) ++ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. ++ version_type=linux ++ need_lib_prefix=no ++ need_version=no ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ shlibpath_var=LD_LIBRARY_PATH ++ shlibpath_overrides_runpath=no ++ hardcode_into_libs=yes ++ ;; ++ ++uts4*) ++ version_type=linux ++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' ++ soname_spec='${libname}${release}${shared_ext}$major' ++ shlibpath_var=LD_LIBRARY_PATH ++ ;; ++ ++*) ++ dynamic_linker=no ++ ;; ++esac ++AC_MSG_RESULT([$dynamic_linker]) ++test "$dynamic_linker" = no && can_build_shared=no ++ ++variables_saved_for_relink="PATH $shlibpath_var $runpath_var" ++if test "$GCC" = yes; then ++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" ++fi ++ ++if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then ++ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" ++fi ++if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then ++ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" ++fi ++ ++_LT_DECL([], [variables_saved_for_relink], [1], ++ [Variables whose values should be saved in libtool wrapper scripts and ++ restored at link time]) ++_LT_DECL([], [need_lib_prefix], [0], ++ [Do we need the "lib" prefix for modules?]) ++_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) ++_LT_DECL([], [version_type], [0], [Library versioning type]) ++_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) ++_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) ++_LT_DECL([], [shlibpath_overrides_runpath], [0], ++ [Is shlibpath searched before the hard-coded library search path?]) ++_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) ++_LT_DECL([], [library_names_spec], [1], ++ [[List of archive names. First name is the real one, the rest are links. ++ The last name is the one that the linker finds with -lNAME]]) ++_LT_DECL([], [soname_spec], [1], ++ [[The coded name of the library, if different from the real name]]) ++_LT_DECL([], [postinstall_cmds], [2], ++ [Command to use after installation of a shared archive]) ++_LT_DECL([], [postuninstall_cmds], [2], ++ [Command to use after uninstallation of a shared archive]) ++_LT_DECL([], [finish_cmds], [2], ++ [Commands used to finish a libtool library installation in a directory]) ++_LT_DECL([], [finish_eval], [1], ++ [[As "finish_cmds", except a single script fragment to be evaled but ++ not shown]]) ++_LT_DECL([], [hardcode_into_libs], [0], ++ [Whether we should hardcode library paths into libraries]) ++_LT_DECL([], [sys_lib_search_path_spec], [2], ++ [Compile-time system search path for libraries]) ++_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], ++ [Run-time system search path for libraries]) ++])# _LT_SYS_DYNAMIC_LINKER ++ ++ ++# _LT_PATH_TOOL_PREFIX(TOOL) ++# -------------------------- ++# find a file program which can recognize shared library ++AC_DEFUN([_LT_PATH_TOOL_PREFIX], ++[m4_require([_LT_DECL_EGREP])dnl ++AC_MSG_CHECKING([for $1]) ++AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, ++[case $MAGIC_CMD in ++[[\\/*] | ?:[\\/]*]) ++ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. ++ ;; ++*) ++ lt_save_MAGIC_CMD="$MAGIC_CMD" ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++dnl $ac_dummy forces splitting on constant user-supplied paths. ++dnl POSIX.2 word splitting is done only on the output of word expansions, ++dnl not every word. This closes a longstanding sh security hole. ++ ac_dummy="m4_if([$2], , $PATH, [$2])" ++ for ac_dir in $ac_dummy; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f $ac_dir/$1; then ++ lt_cv_path_MAGIC_CMD="$ac_dir/$1" ++ if test -n "$file_magic_test_file"; then ++ case $deplibs_check_method in ++ "file_magic "*) ++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` ++ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | ++ $EGREP "$file_magic_regex" > /dev/null; then ++ : ++ else ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the command libtool uses to detect shared libraries, ++*** $file_magic_cmd, produces output that libtool cannot recognize. ++*** The result is that libtool may fail to recognize shared libraries ++*** as such. This will affect the creation of libtool libraries that ++*** depend on shared libraries, but programs linked with such libtool ++*** libraries will work regardless of this problem. Nevertheless, you ++*** may want to report the problem to your system manager and/or to ++*** bug-libtool@gnu.org ++ ++_LT_EOF ++ fi ;; ++ esac ++ fi ++ break ++ fi ++ done ++ IFS="$lt_save_ifs" ++ MAGIC_CMD="$lt_save_MAGIC_CMD" ++ ;; ++esac]) ++MAGIC_CMD="$lt_cv_path_MAGIC_CMD" ++if test -n "$MAGIC_CMD"; then ++ AC_MSG_RESULT($MAGIC_CMD) ++else ++ AC_MSG_RESULT(no) ++fi ++_LT_DECL([], [MAGIC_CMD], [0], ++ [Used to examine libraries when file_magic_cmd begins with "file"])dnl ++])# _LT_PATH_TOOL_PREFIX ++ ++# Old name: ++AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) ++ ++ ++# _LT_PATH_MAGIC ++# -------------- ++# find a file program which can recognize a shared library ++m4_defun([_LT_PATH_MAGIC], ++[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) ++if test -z "$lt_cv_path_MAGIC_CMD"; then ++ if test -n "$ac_tool_prefix"; then ++ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) ++ else ++ MAGIC_CMD=: ++ fi ++fi ++])# _LT_PATH_MAGIC ++ ++ ++# LT_PATH_LD ++# ---------- ++# find the pathname to the GNU or non-GNU linker ++AC_DEFUN([LT_PATH_LD], ++[AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_CANONICAL_BUILD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++ ++AC_ARG_WITH([gnu-ld], ++ [AS_HELP_STRING([--with-gnu-ld], ++ [assume the C compiler uses GNU ld @<:@default=no@:>@])], ++ [test "$withval" = no || with_gnu_ld=yes], ++ [with_gnu_ld=no])dnl ++ ++ac_prog=ld ++if test "$GCC" = yes; then ++ # Check if gcc -print-prog-name=ld gives a path. ++ AC_MSG_CHECKING([for ld used by $CC]) ++ case $host in ++ *-*-mingw*) ++ # gcc leaves a trailing carriage return which upsets mingw ++ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; ++ *) ++ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; ++ esac ++ case $ac_prog in ++ # Accept absolute paths. ++ [[\\/]]* | ?:[[\\/]]*) ++ re_direlt='/[[^/]][[^/]]*/\.\./' ++ # Canonicalize the pathname of ld ++ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` ++ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do ++ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` ++ done ++ test -z "$LD" && LD="$ac_prog" ++ ;; ++ "") ++ # If it fails, then pretend we aren't using GCC. ++ ac_prog=ld ++ ;; ++ *) ++ # If it is relative, then search for the first ld in PATH. ++ with_gnu_ld=unknown ++ ;; ++ esac ++elif test "$with_gnu_ld" = yes; then ++ AC_MSG_CHECKING([for GNU ld]) ++else ++ AC_MSG_CHECKING([for non-GNU ld]) ++fi ++AC_CACHE_VAL(lt_cv_path_LD, ++[if test -z "$LD"; then ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then ++ lt_cv_path_LD="$ac_dir/$ac_prog" ++ # Check to see if the program is GNU ld. I'd rather use --version, ++ # but apparently some variants of GNU ld only accept -v. ++ # Break only if it was the GNU/non-GNU ld that we prefer. ++ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then ++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' ++ lt_cv_file_magic_cmd='func_win32_libid' ++ else ++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ fi ++ ;; ++ ++cegcc) ++ # use the weaker test based on 'objdump'. See mingw*. ++ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' ++ lt_cv_file_magic_cmd='$OBJDUMP -f' ++ ;; ++ ++darwin* | rhapsody*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++freebsd* | dragonfly*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++ case $host_cpu in ++ i*86 ) ++ # Not sure whether the presence of OpenBSD here was a mistake. ++ # Let's accept both of them until this is cleared up. ++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` ++ ;; ++ esac ++ else ++ lt_cv_deplibs_check_method=pass_all ++ fi ++ ;; ++ ++gnu*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++hpux10.20* | hpux11*) ++ lt_cv_file_magic_cmd=/usr/bin/file ++ case $host_cpu in ++ ia64*) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' ++ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so ++ ;; ++ hppa*64*) ++ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] ++ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl ++ ;; ++ *) ++ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' ++ lt_cv_file_magic_test_file=/usr/lib/libc.sl ++ ;; ++ esac ++ ;; ++ ++interix[[3-9]]*) ++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' ++ ;; ++ ++irix5* | irix6* | nonstopux*) ++ case $LD in ++ *-32|*"-32 ") libmagic=32-bit;; ++ *-n32|*"-n32 ") libmagic=N32;; ++ *-64|*"-64 ") libmagic=64-bit;; ++ *) libmagic=never-match;; ++ esac ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++# This must be Linux ELF. ++linux* | k*bsd*-gnu) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' ++ fi ++ ;; ++ ++newos6*) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' ++ lt_cv_file_magic_cmd=/usr/bin/file ++ lt_cv_file_magic_test_file=/usr/lib/libnls.so ++ ;; ++ ++*nto* | *qnx*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++openbsd*) ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' ++ else ++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' ++ fi ++ ;; ++ ++osf3* | osf4* | osf5*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++rdos*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++solaris*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ ++sysv4 | sysv4.3*) ++ case $host_vendor in ++ motorola) ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' ++ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` ++ ;; ++ ncr) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ sequent) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ++ ;; ++ sni) ++ lt_cv_file_magic_cmd='/bin/file' ++ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" ++ lt_cv_file_magic_test_file=/lib/libc.so ++ ;; ++ siemens) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ pc) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++ esac ++ ;; ++ ++tpf*) ++ lt_cv_deplibs_check_method=pass_all ++ ;; ++esac ++]) ++file_magic_cmd=$lt_cv_file_magic_cmd ++deplibs_check_method=$lt_cv_deplibs_check_method ++test -z "$deplibs_check_method" && deplibs_check_method=unknown ++ ++_LT_DECL([], [deplibs_check_method], [1], ++ [Method to check whether dependent libraries are shared objects]) ++_LT_DECL([], [file_magic_cmd], [1], ++ [Command to use when deplibs_check_method == "file_magic"]) ++])# _LT_CHECK_MAGIC_METHOD ++ ++ ++# LT_PATH_NM ++# ---------- ++# find the pathname to a BSD- or MS-compatible name lister ++AC_DEFUN([LT_PATH_NM], ++[AC_REQUIRE([AC_PROG_CC])dnl ++AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, ++[if test -n "$NM"; then ++ # Let the user override the test. ++ lt_cv_path_NM="$NM" ++else ++ lt_nm_to_check="${ac_tool_prefix}nm" ++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then ++ lt_nm_to_check="$lt_nm_to_check nm" ++ fi ++ for lt_tmp_nm in $lt_nm_to_check; do ++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR ++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do ++ IFS="$lt_save_ifs" ++ test -z "$ac_dir" && ac_dir=. ++ tmp_nm="$ac_dir/$lt_tmp_nm" ++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then ++ # Check to see if the nm accepts a BSD-compat flag. ++ # Adding the `sed 1q' prevents false positives on HP-UX, which says: ++ # nm: unknown option "B" ignored ++ # Tru64's nm complains that /dev/null is an invalid object file ++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in ++ */dev/null* | *'Invalid file or object type'*) ++ lt_cv_path_NM="$tmp_nm -B" ++ break ++ ;; ++ *) ++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in ++ */dev/null*) ++ lt_cv_path_NM="$tmp_nm -p" ++ break ++ ;; ++ *) ++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but ++ continue # so that we can try to find one that supports BSD flags ++ ;; ++ esac ++ ;; ++ esac ++ fi ++ done ++ IFS="$lt_save_ifs" ++ done ++ : ${lt_cv_path_NM=no} ++fi]) ++if test "$lt_cv_path_NM" != "no"; then ++ NM="$lt_cv_path_NM" ++else ++ # Didn't find any BSD compatible name lister, look for dumpbin. ++ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) ++ AC_SUBST([DUMPBIN]) ++ if test "$DUMPBIN" != ":"; then ++ NM="$DUMPBIN" ++ fi ++fi ++test -z "$NM" && NM=nm ++AC_SUBST([NM]) ++_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl ++ ++AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], ++ [lt_cv_nm_interface="BSD nm" ++ echo "int some_variable = 0;" > conftest.$ac_ext ++ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$ac_compile" 2>conftest.err) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) ++ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) ++ cat conftest.err >&AS_MESSAGE_LOG_FD ++ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) ++ cat conftest.out >&AS_MESSAGE_LOG_FD ++ if $GREP 'External.*some_variable' conftest.out > /dev/null; then ++ lt_cv_nm_interface="MS dumpbin" ++ fi ++ rm -f conftest*]) ++])# LT_PATH_NM ++ ++# Old names: ++AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) ++AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_PROG_NM], []) ++dnl AC_DEFUN([AC_PROG_NM], []) ++ ++ ++# LT_LIB_M ++# -------- ++# check for math library ++AC_DEFUN([LT_LIB_M], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++LIBM= ++case $host in ++*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) ++ # These system don't have libm, or don't need it ++ ;; ++*-ncr-sysv4.3*) ++ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") ++ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") ++ ;; ++*) ++ AC_CHECK_LIB(m, cos, LIBM="-lm") ++ ;; ++esac ++AC_SUBST([LIBM]) ++])# LT_LIB_M ++ ++# Old name: ++AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_CHECK_LIBM], []) ++ ++ ++# _LT_COMPILER_NO_RTTI([TAGNAME]) ++# ------------------------------- ++m4_defun([_LT_COMPILER_NO_RTTI], ++[m4_require([_LT_TAG_COMPILER])dnl ++ ++_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++ ++if test "$GCC" = yes; then ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ ++ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], ++ lt_cv_prog_compiler_rtti_exceptions, ++ [-fno-rtti -fno-exceptions], [], ++ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) ++fi ++_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], ++ [Compiler flag to turn off builtin functions]) ++])# _LT_COMPILER_NO_RTTI ++ ++ ++# _LT_CMD_GLOBAL_SYMBOLS ++# ---------------------- ++m4_defun([_LT_CMD_GLOBAL_SYMBOLS], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++AC_REQUIRE([AC_PROG_CC])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++AC_REQUIRE([LT_PATH_LD])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_TAG_COMPILER])dnl ++ ++# Check for command to grab the raw symbol name followed by C symbol from nm. ++AC_MSG_CHECKING([command to parse $NM output from $compiler object]) ++AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], ++[ ++# These are sane defaults that work on at least a few old systems. ++# [They come from Ultrix. What could be older than Ultrix?!! ;)] ++ ++# Character class describing NM global symbol codes. ++symcode='[[BCDEGRST]]' ++ ++# Regexp to match symbols that can be accessed directly from C. ++sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' ++ ++# Define system-specific variables. ++case $host_os in ++aix*) ++ symcode='[[BCDT]]' ++ ;; ++cygwin* | mingw* | pw32* | cegcc*) ++ symcode='[[ABCDGISTW]]' ++ ;; ++hpux*) ++ if test "$host_cpu" = ia64; then ++ symcode='[[ABCDEGRST]]' ++ fi ++ ;; ++irix* | nonstopux*) ++ symcode='[[BCDEGRST]]' ++ ;; ++osf*) ++ symcode='[[BCDEGQRST]]' ++ ;; ++solaris*) ++ symcode='[[BDRT]]' ++ ;; ++sco3.2v5*) ++ symcode='[[DT]]' ++ ;; ++sysv4.2uw2*) ++ symcode='[[DT]]' ++ ;; ++sysv5* | sco5v6* | unixware* | OpenUNIX*) ++ symcode='[[ABDT]]' ++ ;; ++sysv4) ++ symcode='[[DFNSTU]]' ++ ;; ++esac ++ ++# If we're using GNU nm, then use its standard symbol codes. ++case `$NM -V 2>&1` in ++*GNU* | *'with BFD'*) ++ symcode='[[ABCDGIRSTW]]' ;; ++esac ++ ++# Transform an extracted symbol line into a proper C declaration. ++# Some systems (esp. on ia64) link data and code symbols differently, ++# so use this general approach. ++lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" ++ ++# Transform an extracted symbol line into symbol name and symbol address ++lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" ++lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" ++ ++# Handle CRLF in mingw tool chain ++opt_cr= ++case $build_os in ++mingw*) ++ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp ++ ;; ++esac ++ ++# Try without a prefix underscore, then with it. ++for ac_symprfx in "" "_"; do ++ ++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. ++ symxfrm="\\1 $ac_symprfx\\2 \\2" ++ ++ # Write the raw and C identifiers. ++ if test "$lt_cv_nm_interface" = "MS dumpbin"; then ++ # Fake it for dumpbin and say T for any non-static function ++ # and D for any global variable. ++ # Also find C++ and __fastcall symbols from MSVC++, ++ # which start with @ or ?. ++ lt_cv_sys_global_symbol_pipe="$AWK ['"\ ++" {last_section=section; section=\$ 3};"\ ++" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ ++" \$ 0!~/External *\|/{next};"\ ++" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ ++" {if(hide[section]) next};"\ ++" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ ++" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ ++" s[1]~/^[@?]/{print s[1], s[1]; next};"\ ++" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ ++" ' prfx=^$ac_symprfx]" ++ else ++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" ++ fi ++ ++ # Check to see that the pipe works correctly. ++ pipe_works=no ++ ++ rm -f conftest* ++ cat > conftest.$ac_ext <<_LT_EOF ++#ifdef __cplusplus ++extern "C" { ++#endif ++char nm_test_var; ++void nm_test_func(void); ++void nm_test_func(void){} ++#ifdef __cplusplus ++} ++#endif ++int main(){nm_test_var='a';nm_test_func();return(0);} ++_LT_EOF ++ ++ if AC_TRY_EVAL(ac_compile); then ++ # Now try to grab the symbols. ++ nlist=conftest.nm ++ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then ++ # Try sorting and uniquifying the output. ++ if sort "$nlist" | uniq > "$nlist"T; then ++ mv -f "$nlist"T "$nlist" ++ else ++ rm -f "$nlist"T ++ fi ++ ++ # Make sure that we snagged all the symbols we need. ++ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then ++ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then ++ cat <<_LT_EOF > conftest.$ac_ext ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++_LT_EOF ++ # Now generate the symbol file. ++ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' ++ ++ cat <<_LT_EOF >> conftest.$ac_ext ++ ++/* The mapping between symbol names and symbols. */ ++const struct { ++ const char *name; ++ void *address; ++} ++lt__PROGRAM__LTX_preloaded_symbols[[]] = ++{ ++ { "@PROGRAM@", (void *) 0 }, ++_LT_EOF ++ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext ++ cat <<\_LT_EOF >> conftest.$ac_ext ++ {0, (void *) 0} ++}; ++ ++/* This works around a problem in FreeBSD linker */ ++#ifdef FREEBSD_WORKAROUND ++static const void *lt_preloaded_setup() { ++ return lt__PROGRAM__LTX_preloaded_symbols; ++} ++#endif ++ ++#ifdef __cplusplus ++} ++#endif ++_LT_EOF ++ # Now try linking the two files. ++ mv conftest.$ac_objext conftstm.$ac_objext ++ lt_save_LIBS="$LIBS" ++ lt_save_CFLAGS="$CFLAGS" ++ LIBS="conftstm.$ac_objext" ++ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" ++ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then ++ pipe_works=yes ++ fi ++ LIBS="$lt_save_LIBS" ++ CFLAGS="$lt_save_CFLAGS" ++ else ++ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD ++ fi ++ else ++ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD ++ cat conftest.$ac_ext >&5 ++ fi ++ rm -rf conftest* conftst* ++ ++ # Do not use the global_symbol_pipe unless it works. ++ if test "$pipe_works" = yes; then ++ break ++ else ++ lt_cv_sys_global_symbol_pipe= ++ fi ++done ++]) ++if test -z "$lt_cv_sys_global_symbol_pipe"; then ++ lt_cv_sys_global_symbol_to_cdecl= ++fi ++if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then ++ AC_MSG_RESULT(failed) ++else ++ AC_MSG_RESULT(ok) ++fi ++ ++_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], ++ [Take the output of nm and produce a listing of raw symbols and C names]) ++_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], ++ [Transform the output of nm in a proper C declaration]) ++_LT_DECL([global_symbol_to_c_name_address], ++ [lt_cv_sys_global_symbol_to_c_name_address], [1], ++ [Transform the output of nm in a C name address pair]) ++_LT_DECL([global_symbol_to_c_name_address_lib_prefix], ++ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], ++ [Transform the output of nm in a C name address pair when lib prefix is needed]) ++]) # _LT_CMD_GLOBAL_SYMBOLS ++ ++ ++# _LT_COMPILER_PIC([TAGNAME]) ++# --------------------------- ++m4_defun([_LT_COMPILER_PIC], ++[m4_require([_LT_TAG_COMPILER])dnl ++_LT_TAGVAR(lt_prog_compiler_wl, $1)= ++_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++_LT_TAGVAR(lt_prog_compiler_static, $1)= ++ ++AC_MSG_CHECKING([for $compiler option to produce PIC]) ++m4_if([$1], [CXX], [ ++ # C++ specific cases for pic, static, wl, etc. ++ if test "$GXX" = yes; then ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ mingw* | cygwin* | os2* | pw32* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ *djgpp*) ++ # DJGPP does not support shared libraries at all ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ case $host_os in ++ aix[[4-9]]*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ chorus*) ++ case $cc_basename in ++ cxch68*) ++ # Green Hills C++ Compiler ++ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" ++ ;; ++ esac ++ ;; ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ freebsd* | dragonfly*) ++ # FreeBSD uses GNU C++ ++ ;; ++ hpux9* | hpux10* | hpux11*) ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ if test "$host_cpu" != ia64; then ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ fi ++ ;; ++ aCC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ interix*) ++ # This is c89, which is MS Visual C++ (no shared libs) ++ # Anyone wants to do a port? ++ ;; ++ irix5* | irix6* | nonstopux*) ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ # CC pic flag -KPIC is the default. ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # KAI C++ Compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ ecpc* ) ++ # old Intel C++ for x86_64 which still supported -KPIC. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ icpc* ) ++ # Intel C++, used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ cxx*) ++ # Compaq C++ ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ xlc* | xlC*) ++ # IBM XL 8.0 on PPC ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ lynxos*) ++ ;; ++ m88k*) ++ ;; ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ netbsd*) ++ ;; ++ *qnx* | *nto*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ cxx*) ++ # Digital/Compaq C++ ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # Make sure the PIC flag is empty. It appears that all Alpha ++ # Linux and Compaq Tru64 Unix objects are PIC. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ psos*) ++ ;; ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ lcc*) ++ # Lucid ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ esac ++ ;; ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ ;; ++ *) ++ ;; ++ esac ++ ;; ++ vxworks*) ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++], ++[ ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ++ case $host_os in ++ aix*) ++ # All AIX code is PIC. ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ m68k) ++ # FIXME: we need at least 68020 code to build shared libraries, but ++ # adding the `-m68020' flag to GCC prevents building anything better, ++ # like `-m68040'. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' ++ ;; ++ esac ++ ;; ++ ++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) ++ # PIC is the default for these OSes. ++ ;; ++ ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ # Although the cygwin gcc ignores -fPIC, still need this for old-style ++ # (--disable-auto-import) libraries ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; ++ ++ darwin* | rhapsody*) ++ # PIC is the default on this platform ++ # Common symbols not allowed in MH_DYLIB files ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' ++ ;; ++ ++ hpux*) ++ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit ++ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag ++ # sets the default TLS model and affects inlining. ++ case $host_cpu in ++ hppa*64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ ;; ++ ++ interix[[3-9]]*) ++ # Interix 3.x gcc -fpic/-fPIC options generate broken code. ++ # Instead, we relocate shared libraries at runtime. ++ ;; ++ ++ msdosdjgpp*) ++ # Just because we use GCC doesn't mean we suddenly get shared libraries ++ # on systems that don't support them. ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ enable_shared=no ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic ++ fi ++ ;; ++ ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ ;; ++ esac ++ else ++ # PORTME Check for flag to pass linker flags through the system compiler. ++ case $host_os in ++ aix*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ if test "$host_cpu" = ia64; then ++ # AIX 5 now supports IA64 processor ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ else ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' ++ fi ++ ;; ++ ++ mingw* | cygwin* | pw32* | os2* | cegcc*) ++ # This hack is so that the source file can tell whether it is being ++ # built for inclusion in a dll (and should export symbols for example). ++ m4_if([$1], [GCJ], [], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) ++ ;; ++ ++ hpux9* | hpux10* | hpux11*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but ++ # not for PA HP-UX. ++ case $host_cpu in ++ hppa*64*|ia64*) ++ # +Z the default ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' ++ ;; ++ esac ++ # Is there a better lt_prog_compiler_static that works with the bundled CC? ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # PIC (with -KPIC) is the default. ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ # old Intel for x86_64 which still supported -KPIC. ++ ecc*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ # icc used to be incompatible with GCC. ++ # ICC 10 doesn't accept -KPIC any more. ++ icc* | ifort*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' ++ ;; ++ # Lahey Fortran 8.1. ++ lf95*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' ++ ;; ++ pgcc* | pgf77* | pgf90* | pgf95*) ++ # Portland Group compilers (*not* the Pentium gcc compiler, ++ # which looks to be a dead project) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ccc*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All Alpha code is PIC. ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ xl*) ++ # IBM XL C 8.0/Fortran 10.1 on PPC ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C 5.9 ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ ;; ++ *Sun\ F*) ++ # Sun Fortran 8.3 passes all unrecognized flags to the linker ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ newsos6) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ *nto* | *qnx*) ++ # QNX uses GNU C++, but need to define -shared option too, otherwise ++ # it will coredump. ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ # All OSF/1 code is PIC. ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ rdos*) ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' ++ ;; ++ ++ solaris*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ case $cc_basename in ++ f77* | f90* | f95*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4 | sysv4.2uw2* | sysv4.3*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec ;then ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ fi ++ ;; ++ ++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ unicos*) ++ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ ++ uts4*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' ++ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' ++ ;; ++ ++ *) ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no ++ ;; ++ esac ++ fi ++]) ++case $host_os in ++ # For platforms which do not support PIC, -DPIC is meaningless: ++ *djgpp*) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ ;; ++ *) ++ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" ++ ;; ++esac ++AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) ++_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], ++ [How to pass a linker flag through the compiler]) ++ ++# ++# Check to make sure the PIC flag actually works. ++# ++if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then ++ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], ++ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], ++ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], ++ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in ++ "" | " "*) ;; ++ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; ++ esac], ++ [_LT_TAGVAR(lt_prog_compiler_pic, $1)= ++ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) ++fi ++_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], ++ [Additional compiler flags for building library objects]) ++ ++# ++# Check to make sure the static flag actually works. ++# ++wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" ++_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], ++ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), ++ $lt_tmp_static_flag, ++ [], ++ [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) ++_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], ++ [Compiler flag to prevent dynamic linking]) ++])# _LT_COMPILER_PIC ++ ++ ++# _LT_LINKER_SHLIBS([TAGNAME]) ++# ---------------------------- ++# See if the linker supports building shared libraries. ++m4_defun([_LT_LINKER_SHLIBS], ++[AC_REQUIRE([LT_PATH_LD])dnl ++AC_REQUIRE([LT_PATH_NM])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_EGREP])dnl ++m4_require([_LT_DECL_SED])dnl ++m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl ++m4_require([_LT_TAG_COMPILER])dnl ++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++m4_if([$1], [CXX], [ ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ case $host_os in ++ aix[[4-9]]*) ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ fi ++ ;; ++ pw32*) ++ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" ++ ;; ++ cygwin* | mingw* | cegcc*) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ *) ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ ;; ++ esac ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++], [ ++ runpath_var= ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(archive_cmds, $1)= ++ _LT_TAGVAR(archive_expsym_cmds, $1)= ++ _LT_TAGVAR(compiler_needs_object, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' ++ _LT_TAGVAR(hardcode_automatic, $1)=no ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ _LT_TAGVAR(hardcode_minus_L, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++ _LT_TAGVAR(inherit_rpath, $1)=no ++ _LT_TAGVAR(link_all_deplibs, $1)=unknown ++ _LT_TAGVAR(module_cmds, $1)= ++ _LT_TAGVAR(module_expsym_cmds, $1)= ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)= ++ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= ++ _LT_TAGVAR(thread_safe_flag_spec, $1)= ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ # include_expsyms should be a list of space-separated symbols to be *always* ++ # included in the symbol list ++ _LT_TAGVAR(include_expsyms, $1)= ++ # exclude_expsyms can be an extended regexp of symbols to exclude ++ # it will be wrapped by ` (' and `)$', so one must not match beginning or ++ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', ++ # as well as any symbol that contains `d'. ++ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] ++ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out ++ # platforms (ab)use it in PIC code, but their linkers get confused if ++ # the symbol is explicitly referenced. Since portable code cannot ++ # rely on this symbol name, it's probably fine to never include it in ++ # preloaded symbol tables. ++ # Exclude shared library initialization/finalization symbols. ++dnl Note also adjust exclude_expsyms for C++ above. ++ extract_expsyms_cmds= ++ ++ case $host_os in ++ cygwin* | mingw* | pw32* | cegcc*) ++ # FIXME: the MSVC++ port hasn't been tested in a loooong time ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ if test "$GCC" != yes; then ++ with_gnu_ld=no ++ fi ++ ;; ++ interix*) ++ # we just hope/assume this is gcc and not c89 (= MSVC++) ++ with_gnu_ld=yes ++ ;; ++ openbsd*) ++ with_gnu_ld=no ++ ;; ++ esac ++ ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ if test "$with_gnu_ld" = yes; then ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ wlarc='${wl}' ++ ++ # Set some defaults for GNU ld with shared library support. These ++ # are reset later if shared libraries are not supported. Putting them ++ # here allows them to be overridden if necessary. ++ runpath_var=LD_RUN_PATH ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ supports_anon_versioning=no ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 ++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... ++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... ++ *\ 2.11.*) ;; # other 2.11 versions ++ *) supports_anon_versioning=yes ;; ++ esac ++ ++ # See if GNU ld supports shared libraries. ++ case $host_os in ++ aix[[3-9]]*) ++ # On AIX/PPC, the GNU linker is very broken ++ if test "$host_cpu" != ia64; then ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: the GNU linker, at least up to release 2.9.1, is reported ++*** to be unable to reliably create shared libraries on AIX. ++*** Therefore, libtool is disabling shared libraries support. If you ++*** really care for shared libraries, you may want to modify your PATH ++*** so that a non-GNU linker is found, and then restart. ++ ++_LT_EOF ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='' ++ ;; ++ m68k) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ interix[[3-9]]*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ ++ gnu* | linux* | tpf* | k*bsd*-gnu) ++ tmp_diet=no ++ if test "$host_os" = linux-dietlibc; then ++ case $cc_basename in ++ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) ++ esac ++ fi ++ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ ++ && test "$tmp_diet" = no ++ then ++ tmp_addflag= ++ tmp_sharedflag='-shared' ++ case $cc_basename,$host_cpu in ++ pgcc*) # Portland Group C compiler ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag' ++ ;; ++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ tmp_addflag=' $pic_flag -Mnomain' ;; ++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 ++ tmp_addflag=' -i_dynamic' ;; ++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 ++ tmp_addflag=' -i_dynamic -nofor_main' ;; ++ ifc* | ifort*) # Intel Fortran compiler ++ tmp_addflag=' -nofor_main' ;; ++ lf95*) # Lahey Fortran 8.1 ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ tmp_sharedflag='--shared' ;; ++ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) ++ tmp_sharedflag='-qmkshrobj' ++ tmp_addflag= ;; ++ esac ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) # Sun C 5.9 ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(compiler_needs_object, $1)=yes ++ tmp_sharedflag='-G' ;; ++ *Sun\ F*) # Sun Fortran 8.3 ++ tmp_sharedflag='-G' ;; ++ esac ++ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ++ case $cc_basename in ++ xlf*) ++ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ esac ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' ++ wlarc= ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ fi ++ ;; ++ ++ solaris*) ++ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: The releases 2.8.* of the GNU linker cannot reliably ++*** create shared libraries on Solaris systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.9.1 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) ++ case `$LD -v 2>&1` in ++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ cat <<_LT_EOF 1>&2 ++ ++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not ++*** reliably create shared libraries on SCO systems. Therefore, libtool ++*** is disabling shared libraries support. We urge you to upgrade GNU ++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify ++*** your PATH or compiler configuration so that the native linker is ++*** used, and then restart. ++ ++_LT_EOF ++ ;; ++ *) ++ # For security reasons, it is highly recommended that you always ++ # use absolute paths for naming shared libraries, and exclude the ++ # DT_RUNPATH tag from executables and libraries. But doing so ++ # requires that you compile everything twice, which is a pain. ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ sunos4*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ wlarc= ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ++ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then ++ runpath_var= ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)= ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ # PORTME fill in a description of your system's linker (not GNU ld) ++ case $host_os in ++ aix3*) ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' ++ # Note: this linker hardcodes the directories in LIBPATH if there ++ # are no directories specified by -L. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then ++ # Neither direct hardcoding nor static linking is supported with a ++ # broken collect2. ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ fi ++ ;; ++ ++ aix[[4-9]]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ # If we're using GNU nm, then we don't want the "-C" option. ++ # -C means demangle to AIX nm, but means don't demangle with GNU nm ++ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ else ++ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' ++ fi ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++ for ld_flag in $LDFLAGS; do ++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then ++ aix_use_runtimelinking=yes ++ break ++ fi ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_TAGVAR(archive_cmds, $1)='' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++ ++ if test "$GCC" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ ;; ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to export. ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared libraries. ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ amigaos*) ++ case $host_cpu in ++ powerpc) ++ # see comment about AmigaOS4 .so support ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='' ++ ;; ++ m68k) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac ++ ;; ++ ++ bsdi[[45]]*) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # When not using gcc, we currently assume that we are using ++ # Microsoft Visual C++. ++ # hardcode_libdir_flag_spec is actually meaningless, as there is ++ # no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Tell ltmain to make .lib files, not .a files. ++ libext=lib ++ # Tell ltmain to make .dll files, not .so files. ++ shrext_cmds=".dll" ++ # FIXME: Setting linknames here is a bad hack. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' ++ # The linker will automatically build a .lib file if we build a DLL. ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' ++ # FIXME: Should let the user specify the lib program. ++ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' ++ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ;; ++ ++ darwin* | rhapsody*) ++ _LT_DARWIN_LINKER_FEATURES($1) ++ ;; ++ ++ dgux*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ freebsd1*) ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor ++ # support. Future versions do this automatically, but an explicit c++rt0.o ++ # does not break anything, and helps significantly (at the cost of a little ++ # extra space). ++ freebsd2.2*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # Unfortunately, older versions of FreeBSD 2 do not have this feature. ++ freebsd2*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. ++ freebsd* | dragonfly*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ hpux9*) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ fi ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ ++ hpux10*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ fi ++ ;; ++ ++ hpux11*) ++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ else ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ fi ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ++ # hardcode_minus_L: Not really in the search PATH, ++ # but as the default location of the library. ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ ;; ++ esac ++ fi ++ ;; ++ ++ irix5* | irix6* | nonstopux*) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ # Try to use the -exported_symbol ld option, if it does not ++ # work, assume that -exports_file does not work either and ++ # implicitly export all symbols. ++ save_LDFLAGS="$LDFLAGS" ++ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" ++ AC_LINK_IFELSE(int foo(void) {}, ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' ++ ) ++ LDFLAGS="$save_LDFLAGS" ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' ++ fi ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(inherit_rpath, $1)=yes ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF ++ fi ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ newsos6) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *nto* | *qnx*) ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ else ++ case $host_os in ++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ ;; ++ esac ++ fi ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ os2*) ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' ++ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' ++ ;; ++ ++ osf3*) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ fi ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ ++ osf4* | osf5*) # as osf3* with the addition of -msym flag ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ else ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ ++ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' ++ ++ # Both c and cxx compiler support -rpath directly ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ fi ++ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ;; ++ ++ solaris*) ++ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' ++ if test "$GCC" = yes; then ++ wlarc='${wl}' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ else ++ case `$CC -V 2>&1` in ++ *"Compilers 5.0"*) ++ wlarc='' ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' ++ ;; ++ *) ++ wlarc='${wl}' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' ++ ;; ++ esac ++ fi ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. GCC discards it without `$wl', ++ # but is careful enough not to reorder. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ fi ++ ;; ++ esac ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ ++ sunos4*) ++ if test "x$host_vendor" = xsequent; then ++ # Use $CC to link under sequent, because it throws in some extra .o ++ # files that make .init and .fini sections work. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' ++ fi ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ sysv4) ++ case $host_vendor in ++ sni) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? ++ ;; ++ siemens) ++ ## LD is ld it makes a PLAMLIB ++ ## CC just makes a GrossModule. ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ ;; ++ motorola) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie ++ ;; ++ esac ++ runpath_var='LD_RUN_PATH' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ sysv4.3*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' ++ ;; ++ ++ sysv4*MP*) ++ if test -d /usr/nec; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var=LD_RUN_PATH ++ hardcode_runpath_var=yes ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ fi ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ if test "$GCC" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ fi ++ ;; ++ ++ uts4*) ++ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ ++ *) ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ++ if test x$host_vendor = xsni; then ++ case $host in ++ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' ++ ;; ++ esac ++ fi ++ fi ++]) ++AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld ++ ++_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl ++_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl ++_LT_DECL([], [extract_expsyms_cmds], [2], ++ [The commands to extract the exported symbol list from a shared archive]) ++ ++# ++# Do we need to explicitly link libc? ++# ++case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in ++x|xyes) ++ # Assume -lc should be added ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ ++ if test "$enable_shared" = yes && test "$GCC" = yes; then ++ case $_LT_TAGVAR(archive_cmds, $1) in ++ *'~'*) ++ # FIXME: we may have to deal with multi-command sequences. ++ ;; ++ '$CC '*) ++ # Test whether the compiler implicitly links with -lc since on some ++ # systems, -lgcc has to come before -lc. If gcc already passes -lc ++ # to ld, don't add -lc before -lgcc. ++ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) ++ $RM conftest* ++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext ++ ++ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then ++ soname=conftest ++ lib=conftest ++ libobjs=conftest.$ac_objext ++ deplibs= ++ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) ++ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) ++ compiler_flags=-v ++ linker_flags=-v ++ verstring= ++ output_objdir=. ++ libname=conftest ++ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) ++ _LT_TAGVAR(allow_undefined_flag, $1)= ++ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) ++ then ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ else ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ fi ++ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag ++ else ++ cat conftest.err 1>&5 ++ fi ++ $RM conftest* ++ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) ++ ;; ++ esac ++ fi ++ ;; ++esac ++ ++_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], ++ [Whether or not to add -lc for building shared libraries]) ++_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], ++ [enable_shared_with_static_runtimes], [0], ++ [Whether or not to disallow shared libs when runtime libs are static]) ++_LT_TAGDECL([], [export_dynamic_flag_spec], [1], ++ [Compiler flag to allow reflexive dlopens]) ++_LT_TAGDECL([], [whole_archive_flag_spec], [1], ++ [Compiler flag to generate shared objects directly from archives]) ++_LT_TAGDECL([], [compiler_needs_object], [1], ++ [Whether the compiler copes with passing no objects directly]) ++_LT_TAGDECL([], [old_archive_from_new_cmds], [2], ++ [Create an old-style archive from a shared archive]) ++_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], ++ [Create a temporary old-style archive to link instead of a shared archive]) ++_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) ++_LT_TAGDECL([], [archive_expsym_cmds], [2]) ++_LT_TAGDECL([], [module_cmds], [2], ++ [Commands used to build a loadable module if different from building ++ a shared archive.]) ++_LT_TAGDECL([], [module_expsym_cmds], [2]) ++_LT_TAGDECL([], [with_gnu_ld], [1], ++ [Whether we are building with GNU ld or not]) ++_LT_TAGDECL([], [allow_undefined_flag], [1], ++ [Flag that allows shared libraries with undefined symbols to be built]) ++_LT_TAGDECL([], [no_undefined_flag], [1], ++ [Flag that enforces no undefined symbols]) ++_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], ++ [Flag to hardcode $libdir into a binary during linking. ++ This must work even if $libdir does not exist]) ++_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], ++ [[If ld is used when linking, flag to hardcode $libdir into a binary ++ during linking. This must work even if $libdir does not exist]]) ++_LT_TAGDECL([], [hardcode_libdir_separator], [1], ++ [Whether we need a single "-rpath" flag with a separated argument]) ++_LT_TAGDECL([], [hardcode_direct], [0], ++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ DIR into the resulting binary]) ++_LT_TAGDECL([], [hardcode_direct_absolute], [0], ++ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes ++ DIR into the resulting binary and the resulting library dependency is ++ "absolute", i.e impossible to change by setting ${shlibpath_var} if the ++ library is relocated]) ++_LT_TAGDECL([], [hardcode_minus_L], [0], ++ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR ++ into the resulting binary]) ++_LT_TAGDECL([], [hardcode_shlibpath_var], [0], ++ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR ++ into the resulting binary]) ++_LT_TAGDECL([], [hardcode_automatic], [0], ++ [Set to "yes" if building a shared library automatically hardcodes DIR ++ into the library and all subsequent libraries and executables linked ++ against it]) ++_LT_TAGDECL([], [inherit_rpath], [0], ++ [Set to yes if linker adds runtime paths of dependent libraries ++ to runtime path list]) ++_LT_TAGDECL([], [link_all_deplibs], [0], ++ [Whether libtool must link a program against all its dependency libraries]) ++_LT_TAGDECL([], [fix_srcfile_path], [1], ++ [Fix the shell variable $srcfile for the compiler]) ++_LT_TAGDECL([], [always_export_symbols], [0], ++ [Set to "yes" if exported symbols are required]) ++_LT_TAGDECL([], [export_symbols_cmds], [2], ++ [The commands to list exported symbols]) ++_LT_TAGDECL([], [exclude_expsyms], [1], ++ [Symbols that should not be listed in the preloaded symbols]) ++_LT_TAGDECL([], [include_expsyms], [1], ++ [Symbols that must always be exported]) ++_LT_TAGDECL([], [prelink_cmds], [2], ++ [Commands necessary for linking programs (against libraries) with templates]) ++_LT_TAGDECL([], [file_list_spec], [1], ++ [Specify filename containing input files]) ++dnl FIXME: Not yet implemented ++dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], ++dnl [Compiler flag to generate thread safe objects]) ++])# _LT_LINKER_SHLIBS ++ ++ ++# _LT_LANG_C_CONFIG([TAG]) ++# ------------------------ ++# Ensure that the configuration variables for a C compiler are suitably ++# defined. These variables are subsequently used by _LT_CONFIG to write ++# the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_C_CONFIG], ++[m4_require([_LT_DECL_EGREP])dnl ++lt_save_CC="$CC" ++AC_LANG_PUSH(C) ++ ++# Source file extension for C test sources. ++ac_ext=c ++ ++# Object file extension for compiled C test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="int some_variable = 0;" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='int main(){return(0);}' ++ ++_LT_TAG_COMPILER ++# Save the default compiler, since it gets overwritten when the other ++# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. ++compiler_DEFAULT=$CC ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++## CAVEAT EMPTOR: ++## There is no encapsulation within the following macros, do not change ++## the running order or otherwise move them around unless you know exactly ++## what you are doing... ++if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ LT_SYS_DLOPEN_SELF ++ _LT_CMD_STRIPLIB ++ ++ # Report which library types will actually be built ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) ++ ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ ++ aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT([$enable_shared]) ++ ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) ++ ++ _LT_CONFIG($1) ++fi ++AC_LANG_POP ++CC="$lt_save_CC" ++])# _LT_LANG_C_CONFIG ++ ++ ++# _LT_PROG_CXX ++# ------------ ++# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ ++# compiler, we have our own version here. ++m4_defun([_LT_PROG_CXX], ++[ ++pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) ++AC_PROG_CXX ++if test -n "$CXX" && ( test "X$CXX" != "Xno" && ++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || ++ (test "X$CXX" != "Xg++"))) ; then ++ AC_PROG_CXXCPP ++else ++ _lt_caught_CXX_error=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_CXX ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_CXX], []) ++ ++ ++# _LT_LANG_CXX_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for a C++ compiler are suitably ++# defined. These variables are subsequently used by _LT_CONFIG to write ++# the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_CXX_CONFIG], ++[AC_REQUIRE([_LT_PROG_CXX])dnl ++m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++m4_require([_LT_DECL_EGREP])dnl ++ ++AC_LANG_PUSH(C++) ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(compiler_needs_object, $1)=no ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for C++ test sources. ++ac_ext=cpp ++ ++# Object file extension for compiled C++ test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# No sense in running all these tests if we already determined that ++# the CXX compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_caught_CXX_error" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="int some_variable = 0;" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC=$CC ++ lt_save_LD=$LD ++ lt_save_GCC=$GCC ++ GCC=$GXX ++ lt_save_with_gnu_ld=$with_gnu_ld ++ lt_save_path_LD=$lt_cv_path_LD ++ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then ++ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx ++ else ++ $as_unset lt_cv_prog_gnu_ld ++ fi ++ if test -n "${lt_cv_path_LDCXX+set}"; then ++ lt_cv_path_LD=$lt_cv_path_LDCXX ++ else ++ $as_unset lt_cv_path_LD ++ fi ++ test -z "${LDCXX+set}" || LD=$LDCXX ++ CC=${CXX-"c++"} ++ compiler=$CC ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) ++ ++ if test -n "$compiler"; then ++ # We don't want -fno-exception when compiling C++ code, so set the ++ # no_builtin_flag separately ++ if test "$GXX" = yes; then ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ++ else ++ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= ++ fi ++ ++ if test "$GXX" = yes; then ++ # Set up default GNU C++ configuration ++ ++ LT_PATH_LD ++ ++ # Check if GNU C++ uses GNU ld as the underlying linker, since the ++ # archiving commands below assume that GNU ld is being used. ++ if test "$with_gnu_ld" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # If archive_cmds runs LD, not CC, wlarc should be empty ++ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to ++ # investigate it a little bit more. (MM) ++ wlarc='${wl}' ++ ++ # ancient GNU ld didn't support --whole-archive et. al. ++ if eval "`$CC -print-prog-name=ld` --help 2>&1" | ++ $GREP 'no-whole-archive' > /dev/null; then ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ else ++ _LT_TAGVAR(whole_archive_flag_spec, $1)= ++ fi ++ else ++ with_gnu_ld=no ++ wlarc= ++ ++ # A generic and very simple default shared library creation ++ # command for GNU C++ for the case where it uses the native ++ # linker, instead of GNU ld. If possible, this setting should ++ # overridden to take advantage of the native linker features on ++ # the platform it is being used on. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ fi ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ ++ else ++ GXX=no ++ with_gnu_ld=no ++ wlarc= ++ fi ++ ++ # PORTME: fill in a description of your system's C++ link characteristics ++ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ case $host_os in ++ aix3*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" = ia64; then ++ # On IA64, the linker does run time linking by default, so we don't ++ # have to do anything special. ++ aix_use_runtimelinking=no ++ exp_sym_flag='-Bexport' ++ no_entry_flag="" ++ else ++ aix_use_runtimelinking=no ++ ++ # Test if we are trying to use run time linking or normal ++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we ++ # need to do runtime linking. ++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) ++ for ld_flag in $LDFLAGS; do ++ case $ld_flag in ++ *-brtl*) ++ aix_use_runtimelinking=yes ++ break ++ ;; ++ esac ++ done ++ ;; ++ esac ++ ++ exp_sym_flag='-bexport' ++ no_entry_flag='-bnoentry' ++ fi ++ ++ # When large executables or shared objects are built, AIX ld can ++ # have problems creating the table of contents. If linking a library ++ # or program results in "error TOC overflow" add -mminimal-toc to ++ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not ++ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. ++ ++ _LT_TAGVAR(archive_cmds, $1)='' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' ++ ++ if test "$GXX" = yes; then ++ case $host_os in aix4.[[012]]|aix4.[[012]].*) ++ # We only want to do this on AIX 4.2 and lower, the check ++ # below for broken collect2 doesn't work under 4.3+ ++ collect2name=`${CC} -print-prog-name=collect2` ++ if test -f "$collect2name" && ++ strings "$collect2name" | $GREP resolve_lib_name >/dev/null ++ then ++ # We have reworked collect2 ++ : ++ else ++ # We have old collect2 ++ _LT_TAGVAR(hardcode_direct, $1)=unsupported ++ # It fails to find uninstalled libraries when the uninstalled ++ # path is not listed in the libpath. Setting hardcode_minus_L ++ # to unsupported forces relinking ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)= ++ fi ++ esac ++ shared_flag='-shared' ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag="$shared_flag "'${wl}-G' ++ fi ++ else ++ # not using gcc ++ if test "$host_cpu" = ia64; then ++ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release ++ # chokes on -Wl,-G. The following line is correct: ++ shared_flag='-G' ++ else ++ if test "$aix_use_runtimelinking" = yes; then ++ shared_flag='${wl}-G' ++ else ++ shared_flag='${wl}-bM:SRE' ++ fi ++ fi ++ fi ++ ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' ++ # It seems that -bexpall does not export symbols beginning with ++ # underscore (_), so it is better to generate a list of symbols to ++ # export. ++ _LT_TAGVAR(always_export_symbols, $1)=yes ++ if test "$aix_use_runtimelinking" = yes; then ++ # Warning - without using the other runtime loading flags (-brtl), ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' ++ # Determine the default libpath from the value encoded in an empty ++ # executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" ++ else ++ if test "$host_cpu" = ia64; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' ++ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" ++ else ++ # Determine the default libpath from the value encoded in an ++ # empty executable. ++ _LT_SYS_MODULE_PATH_AIX ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" ++ # Warning - without using the other run time loading flags, ++ # -berok will link without error, but may produce a broken library. ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' ++ # Exported symbols can be pulled into shared objects from archives ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes ++ # This is similar to how AIX traditionally builds its shared ++ # libraries. ++ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' ++ fi ++ fi ++ ;; ++ ++ beos*) ++ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ # Joseph Beckenbach says some releases of gcc ++ # support --undefined. This deserves some investigation. FIXME ++ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ chorus*) ++ case $cc_basename in ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ cygwin* | mingw* | pw32* | cegcc*) ++ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, ++ # as there is no search path for DLLs. ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' ++ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported ++ _LT_TAGVAR(always_export_symbols, $1)=no ++ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes ++ ++ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ # If the export-symbols file already is a .def file (1st line ++ # is EXPORTS), use it as is; otherwise, prepend... ++ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then ++ cp $export_symbols $output_objdir/$soname.def; ++ else ++ echo EXPORTS > $output_objdir/$soname.def; ++ cat $export_symbols >> $output_objdir/$soname.def; ++ fi~ ++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ darwin* | rhapsody*) ++ _LT_DARWIN_LINKER_FEATURES($1) ++ ;; ++ ++ dgux*) ++ case $cc_basename in ++ ec++*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ghcx*) ++ # Green Hills C++ Compiler ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ freebsd[[12]]*) ++ # C++ shared libraries reported to be fairly broken before ++ # switch to ELF ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ freebsd-elf*) ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ ;; ++ ++ freebsd* | dragonfly*) ++ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF ++ # conventions ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ ++ gnu*) ++ ;; ++ ++ hpux9*) ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ hpux10*|hpux11*) ++ if test $with_gnu_ld = no; then ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ case $host_cpu in ++ hppa*64*|ia64*) ++ ;; ++ *) ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ ;; ++ esac ++ fi ++ case $host_cpu in ++ hppa*64*|ia64*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ ;; ++ *) ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, ++ # but as the default ++ # location of the library. ++ ;; ++ esac ++ ++ case $cc_basename in ++ CC*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ aCC*) ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test $with_gnu_ld = no; then ++ case $host_cpu in ++ hppa*64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ ia64*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ ;; ++ esac ++ fi ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ interix[[3-9]]*) ++ _LT_TAGVAR(hardcode_direct, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. ++ # Instead, shared libraries are loaded at an image base (0x10000000 by ++ # default) and relocated if they conflict, which is a slow very memory ++ # consuming and fragmenting process. To avoid this, we pick a random, ++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link ++ # time. Moving up from 0x10000000 also allows more sbrk(2) space. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' ++ ;; ++ irix5* | irix6*) ++ case $cc_basename in ++ CC*) ++ # SGI C++ ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -ar", where "CC" is the IRIX C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' ++ ;; ++ *) ++ if test "$GXX" = yes; then ++ if test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ else ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' ++ fi ++ fi ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ;; ++ esac ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ _LT_TAGVAR(inherit_rpath, $1)=yes ++ ;; ++ ++ linux* | k*bsd*-gnu) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -Bstatic", where "CC" is the KAI C++ compiler. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ++ ;; ++ icpc* | ecpc* ) ++ # Intel C++ ++ with_gnu_ld=yes ++ # version 8.0 and above of icpc choke on multiply defined symbols ++ # if we add $predep_objects and $postdep_objects, however 7.1 and ++ # earlier do not add the objects themselves. ++ case `$CC -V 2>&1` in ++ *"Version 7."*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ *) # Version 8.0 or newer ++ tmp_idyn= ++ case $host_cpu in ++ ia64*) tmp_idyn=' -i_dynamic';; ++ esac ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' ++ ;; ++ esac ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' ++ ;; ++ pgCC* | pgcpp*) ++ # Portland Group C++ compiler ++ case `$CC -V` in ++ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) ++ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ ++ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' ++ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ ++ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ ++ $RANLIB $oldlib' ++ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ ++ rm -rf $tpldir~ ++ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ ++ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ *) # Version 6 will use weak symbols ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' ++ ;; ++ esac ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ ;; ++ cxx*) ++ # Compaq C++ ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' ++ ++ runpath_var=LD_RUN_PATH ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ xl*) ++ # IBM XL 8.0 on PPC, with GNU ld ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' ++ if test "x$supports_anon_versioning" = xyes; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ ++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ ++ echo "local: *; };" >> $output_objdir/$libname.ver~ ++ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' ++ fi ++ ;; ++ *) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' ++ _LT_TAGVAR(compiler_needs_object, $1)=yes ++ ++ # Not sure whether something based on ++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 ++ # would be better. ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ esac ++ ;; ++ esac ++ ;; ++ ++ lynxos*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ m88k*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ mvs*) ++ case $cc_basename in ++ cxx*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ netbsd*) ++ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' ++ wlarc= ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ fi ++ # Workaround some broken pre-1.5 toolchains ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' ++ ;; ++ ++ *nto* | *qnx*) ++ _LT_TAGVAR(ld_shlibs, $1)=yes ++ ;; ++ ++ openbsd2*) ++ # C++ shared libraries are fairly broken ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ openbsd*) ++ if test -f /usr/libexec/ld.so; then ++ _LT_TAGVAR(hardcode_direct, $1)=yes ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' ++ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' ++ fi ++ output_verbose_link_cmd=echo ++ else ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ ++ osf3* | osf4* | osf5*) ++ case $cc_basename in ++ KCC*) ++ # Kuck and Associates, Inc. (KAI) C++ Compiler ++ ++ # KCC will only create a shared library if the output file ++ # ends with ".so" (or ".sl" for HP-UX), so rename the library ++ # to its proper name (with version) after linking. ++ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Archives containing C++ object files must be created using ++ # the KAI C++ compiler. ++ case $host in ++ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; ++ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; ++ esac ++ ;; ++ RCC*) ++ # Rational C++ 2.4.1 ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ cxx*) ++ case $host in ++ osf3*) ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ ;; ++ *) ++ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ ++ echo "-hidden">> $lib.exp~ ++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ ++ $RM $lib.exp' ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' ++ ;; ++ esac ++ ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ # ++ # There doesn't appear to be a way to prevent this compiler from ++ # explicitly linking system object files so we need to strip them ++ # from the output so that they don't get included in the library ++ # dependencies. ++ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' ++ ;; ++ *) ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' ++ case $host in ++ osf3*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' ++ ;; ++ esac ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=: ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ ++ else ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ fi ++ ;; ++ esac ++ ;; ++ ++ psos*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ sunos4*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.x ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ lcc*) ++ # Lucid ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ solaris*) ++ case $cc_basename in ++ CC*) ++ # Sun C++ 4.2, 5.x and Centerline C++ ++ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes ++ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ # The compiler driver will combine and reorder linker options, ++ # but understands `-z linker_flag'. ++ # Supported since Solaris 2.6 (maybe 2.5.1?) ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ++ ;; ++ esac ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ ++ output_verbose_link_cmd='echo' ++ ++ # Archives containing C++ object files must be created using ++ # "CC -xar", where "CC" is the Sun C++ compiler. This is ++ # necessary to make sure instantiated templates are included ++ # in the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' ++ ;; ++ gcx*) ++ # Green Hills C++ Compiler ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ ++ # The C++ compiler must be used to create the archive. ++ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' ++ ;; ++ *) ++ # GNU C++ compiler with Solaris linker ++ if test "$GXX" = yes && test "$with_gnu_ld" = no; then ++ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' ++ if $CC --version | $GREP -v '^2\.7' > /dev/null; then ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ else ++ # g++ 2.7 appears to require `-G' NOT `-shared' on this ++ # platform. ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ ++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' ++ ++ # Commands to make compiler produce verbose output that lists ++ # what "hidden" libraries, object files and flags are used when ++ # linking a shared library. ++ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' ++ fi ++ ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' ++ case $host_os in ++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; ++ *) ++ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' ++ ;; ++ esac ++ fi ++ ;; ++ esac ++ ;; ++ ++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ sysv5* | sco3.2v5* | sco5v6*) ++ # Note: We can NOT use -z defs as we might desire, because we do not ++ # link with -lc, and that would cause any symbols used from libc to ++ # always be unresolved, which means just about no library would ++ # ever link correctly. If we're not using GNU ld we use -z text ++ # though, which does catch some bad symbols but isn't as heavy-handed ++ # as -z defs. ++ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' ++ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' ++ _LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no ++ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' ++ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' ++ _LT_TAGVAR(link_all_deplibs, $1)=yes ++ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' ++ runpath_var='LD_RUN_PATH' ++ ++ case $cc_basename in ++ CC*) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ *) ++ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' ++ ;; ++ esac ++ ;; ++ ++ tandem*) ++ case $cc_basename in ++ NCC*) ++ # NonStop-UX NCC 3.20 ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ;; ++ ++ vxworks*) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ ++ *) ++ # FIXME: insert proper C++ library support ++ _LT_TAGVAR(ld_shlibs, $1)=no ++ ;; ++ esac ++ ++ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) ++ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no ++ ++ _LT_TAGVAR(GCC, $1)="$GXX" ++ _LT_TAGVAR(LD, $1)="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_SYS_HIDDEN_LIBDEPS($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ CC=$lt_save_CC ++ LDCXX=$LD ++ LD=$lt_save_LD ++ GCC=$lt_save_GCC ++ with_gnu_ld=$lt_save_with_gnu_ld ++ lt_cv_path_LDCXX=$lt_cv_path_LD ++ lt_cv_path_LD=$lt_save_path_LD ++ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld ++ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld ++fi # test "$_lt_caught_CXX_error" != yes ++ ++AC_LANG_POP ++])# _LT_LANG_CXX_CONFIG ++ ++ ++# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) ++# --------------------------------- ++# Figure out "hidden" library dependencies from verbose ++# compiler output when linking a shared library. ++# Parse the compiler output and extract the necessary ++# objects, libraries and library flags. ++m4_defun([_LT_SYS_HIDDEN_LIBDEPS], ++[m4_require([_LT_FILEUTILS_DEFAULTS])dnl ++# Dependencies to place before and after the object being linked: ++_LT_TAGVAR(predep_objects, $1)= ++_LT_TAGVAR(postdep_objects, $1)= ++_LT_TAGVAR(predeps, $1)= ++_LT_TAGVAR(postdeps, $1)= ++_LT_TAGVAR(compiler_lib_search_path, $1)= ++ ++dnl we can't use the lt_simple_compile_test_code here, ++dnl because it contains code intended for an executable, ++dnl not a library. It's possible we should let each ++dnl tag define a new lt_????_link_test_code variable, ++dnl but it's only used here... ++m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF ++int a; ++void foo (void) { a = 0; } ++_LT_EOF ++], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF ++class Foo ++{ ++public: ++ Foo (void) { a = 0; } ++private: ++ int a; ++}; ++_LT_EOF ++], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF ++ subroutine foo ++ implicit none ++ integer*4 a ++ a=0 ++ return ++ end ++_LT_EOF ++], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF ++ subroutine foo ++ implicit none ++ integer a ++ a=0 ++ return ++ end ++_LT_EOF ++], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF ++public class foo { ++ private int a; ++ public void bar (void) { ++ a = 0; ++ } ++}; ++_LT_EOF ++]) ++dnl Parse the compiler output and extract the necessary ++dnl objects, libraries and library flags. ++if AC_TRY_EVAL(ac_compile); then ++ # Parse the compiler output and extract the necessary ++ # objects, libraries and library flags. ++ ++ # Sentinel used to keep track of whether or not we are before ++ # the conftest object file. ++ pre_test_object_deps_done=no ++ ++ for p in `eval "$output_verbose_link_cmd"`; do ++ case $p in ++ ++ -L* | -R* | -l*) ++ # Some compilers place space between "-{L,R}" and the path. ++ # Remove the space. ++ if test $p = "-L" || ++ test $p = "-R"; then ++ prev=$p ++ continue ++ else ++ prev= ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ case $p in ++ -L* | -R*) ++ # Internal compiler library paths should come after those ++ # provided the user. The postdeps already come after the ++ # user supplied libs so there is no need to process them. ++ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then ++ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" ++ else ++ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" ++ fi ++ ;; ++ # The "-l" case would never come before the object being ++ # linked, so don't bother handling this case. ++ esac ++ else ++ if test -z "$_LT_TAGVAR(postdeps, $1)"; then ++ _LT_TAGVAR(postdeps, $1)="${prev}${p}" ++ else ++ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" ++ fi ++ fi ++ ;; ++ ++ *.$objext) ++ # This assumes that the test object file only shows up ++ # once in the compiler output. ++ if test "$p" = "conftest.$objext"; then ++ pre_test_object_deps_done=yes ++ continue ++ fi ++ ++ if test "$pre_test_object_deps_done" = no; then ++ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then ++ _LT_TAGVAR(predep_objects, $1)="$p" ++ else ++ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" ++ fi ++ else ++ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then ++ _LT_TAGVAR(postdep_objects, $1)="$p" ++ else ++ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" ++ fi ++ fi ++ ;; ++ ++ *) ;; # Ignore the rest. ++ ++ esac ++ done ++ ++ # Clean up. ++ rm -f a.out a.exe ++else ++ echo "libtool.m4: error: problem compiling $1 test program" ++fi ++ ++$RM -f confest.$objext ++ ++# PORTME: override above test on systems where it is broken ++m4_if([$1], [CXX], ++[case $host_os in ++interix[[3-9]]*) ++ # Interix 3.5 installs completely hosed .la files for C++, so rather than ++ # hack all around it, let's just trust "g++" to DTRT. ++ _LT_TAGVAR(predep_objects,$1)= ++ _LT_TAGVAR(postdep_objects,$1)= ++ _LT_TAGVAR(postdeps,$1)= ++ ;; ++ ++linux*) ++ case `$CC -V 2>&1 | sed 5q` in ++ *Sun\ C*) ++ # Sun C++ 5.9 ++ ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++ ++solaris*) ++ case $cc_basename in ++ CC*) ++ # The more standards-conforming stlport4 library is ++ # incompatible with the Cstd library. Avoid specifying ++ # it if it's in CXXFLAGS. Ignore libCrun as ++ # -library=stlport4 depends on it. ++ case " $CXX $CXXFLAGS " in ++ *" -library=stlport4 "*) ++ solaris_use_stlport4=yes ++ ;; ++ esac ++ ++ # Adding this requires a known-good setup of shared libraries for ++ # Sun compiler versions before 5.6, else PIC objects from an old ++ # archive will be linked into the output, leading to subtle bugs. ++ if test "$solaris_use_stlport4" != yes; then ++ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' ++ fi ++ ;; ++ esac ++ ;; ++esac ++]) ++ ++case " $_LT_TAGVAR(postdeps, $1) " in ++*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; ++esac ++ _LT_TAGVAR(compiler_lib_search_dirs, $1)= ++if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then ++ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` ++fi ++_LT_TAGDECL([], [compiler_lib_search_dirs], [1], ++ [The directories searched by this compiler when creating a shared library]) ++_LT_TAGDECL([], [predep_objects], [1], ++ [Dependencies to place before and after the objects being linked to ++ create a shared library]) ++_LT_TAGDECL([], [postdep_objects], [1]) ++_LT_TAGDECL([], [predeps], [1]) ++_LT_TAGDECL([], [postdeps], [1]) ++_LT_TAGDECL([], [compiler_lib_search_path], [1], ++ [The library search path used internally by the compiler when linking ++ a shared library]) ++])# _LT_SYS_HIDDEN_LIBDEPS ++ ++ ++# _LT_PROG_F77 ++# ------------ ++# Since AC_PROG_F77 is broken, in that it returns the empty string ++# if there is no fortran compiler, we have our own version here. ++m4_defun([_LT_PROG_F77], ++[ ++pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) ++AC_PROG_F77 ++if test -z "$F77" || test "X$F77" = "Xno"; then ++ _lt_disable_F77=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_F77 ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_F77], []) ++ ++ ++# _LT_LANG_F77_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for a Fortran 77 compiler are ++# suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_F77_CONFIG], ++[AC_REQUIRE([_LT_PROG_F77])dnl ++AC_LANG_PUSH(Fortran 77) ++ ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for f77 test sources. ++ac_ext=f ++ ++# Object file extension for compiled f77 test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# No sense in running all these tests if we already determined that ++# the F77 compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_disable_F77" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code="\ ++ program t ++ end ++" ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC="$CC" ++ lt_save_GCC=$GCC ++ CC=${F77-"f77"} ++ compiler=$CC ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) ++ GCC=$G77 ++ if test -n "$compiler"; then ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) ++ ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT([$enable_shared]) ++ ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) ++ ++ _LT_TAGVAR(GCC, $1)="$G77" ++ _LT_TAGVAR(LD, $1)="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ GCC=$lt_save_GCC ++ CC="$lt_save_CC" ++fi # test "$_lt_disable_F77" != yes ++ ++AC_LANG_POP ++])# _LT_LANG_F77_CONFIG ++ ++ ++# _LT_PROG_FC ++# ----------- ++# Since AC_PROG_FC is broken, in that it returns the empty string ++# if there is no fortran compiler, we have our own version here. ++m4_defun([_LT_PROG_FC], ++[ ++pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) ++AC_PROG_FC ++if test -z "$FC" || test "X$FC" = "Xno"; then ++ _lt_disable_FC=yes ++fi ++popdef([AC_MSG_ERROR]) ++])# _LT_PROG_FC ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([_LT_PROG_FC], []) ++ ++ ++# _LT_LANG_FC_CONFIG([TAG]) ++# ------------------------- ++# Ensure that the configuration variables for a Fortran compiler are ++# suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_FC_CONFIG], ++[AC_REQUIRE([_LT_PROG_FC])dnl ++AC_LANG_PUSH(Fortran) ++ ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++_LT_TAGVAR(allow_undefined_flag, $1)= ++_LT_TAGVAR(always_export_symbols, $1)=no ++_LT_TAGVAR(archive_expsym_cmds, $1)= ++_LT_TAGVAR(export_dynamic_flag_spec, $1)= ++_LT_TAGVAR(hardcode_direct, $1)=no ++_LT_TAGVAR(hardcode_direct_absolute, $1)=no ++_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= ++_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= ++_LT_TAGVAR(hardcode_libdir_separator, $1)= ++_LT_TAGVAR(hardcode_minus_L, $1)=no ++_LT_TAGVAR(hardcode_automatic, $1)=no ++_LT_TAGVAR(inherit_rpath, $1)=no ++_LT_TAGVAR(module_cmds, $1)= ++_LT_TAGVAR(module_expsym_cmds, $1)= ++_LT_TAGVAR(link_all_deplibs, $1)=unknown ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++_LT_TAGVAR(no_undefined_flag, $1)= ++_LT_TAGVAR(whole_archive_flag_spec, $1)= ++_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no ++ ++# Source file extension for fc test sources. ++ac_ext=${ac_fc_srcext-f} ++ ++# Object file extension for compiled fc test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# No sense in running all these tests if we already determined that ++# the FC compiler isn't working. Some variables (like enable_shared) ++# are currently assumed to apply to all compilers on this platform, ++# and will be corrupted by setting them based on a non-working compiler. ++if test "$_lt_disable_FC" != yes; then ++ # Code to be used in simple compile tests ++ lt_simple_compile_test_code="\ ++ subroutine t ++ return ++ end ++" ++ ++ # Code to be used in simple link tests ++ lt_simple_link_test_code="\ ++ program t ++ end ++" ++ ++ # ltmain only uses $CC for tagged configurations so make sure $CC is set. ++ _LT_TAG_COMPILER ++ ++ # save warnings/boilerplate of simple test code ++ _LT_COMPILER_BOILERPLATE ++ _LT_LINKER_BOILERPLATE ++ ++ # Allow CC to be a program name with arguments. ++ lt_save_CC="$CC" ++ lt_save_GCC=$GCC ++ CC=${FC-"f95"} ++ compiler=$CC ++ GCC=$ac_cv_fc_compiler_gnu ++ ++ _LT_TAGVAR(compiler, $1)=$CC ++ _LT_CC_BASENAME([$compiler]) ++ ++ if test -n "$compiler"; then ++ AC_MSG_CHECKING([if libtool supports shared libraries]) ++ AC_MSG_RESULT([$can_build_shared]) ++ ++ AC_MSG_CHECKING([whether to build shared libraries]) ++ test "$can_build_shared" = "no" && enable_shared=no ++ ++ # On AIX, shared libraries and static libraries use the same namespace, and ++ # are all built from PIC. ++ case $host_os in ++ aix3*) ++ test "$enable_shared" = yes && enable_static=no ++ if test -n "$RANLIB"; then ++ archive_cmds="$archive_cmds~\$RANLIB \$lib" ++ postinstall_cmds='$RANLIB $lib' ++ fi ++ ;; ++ aix[[4-9]]*) ++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then ++ test "$enable_shared" = yes && enable_static=no ++ fi ++ ;; ++ esac ++ AC_MSG_RESULT([$enable_shared]) ++ ++ AC_MSG_CHECKING([whether to build static libraries]) ++ # Make sure either enable_shared or enable_static is yes. ++ test "$enable_shared" = yes || enable_static=yes ++ AC_MSG_RESULT([$enable_static]) ++ ++ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" ++ _LT_TAGVAR(LD, $1)="$LD" ++ ++ ## CAVEAT EMPTOR: ++ ## There is no encapsulation within the following macros, do not change ++ ## the running order or otherwise move them around unless you know exactly ++ ## what you are doing... ++ _LT_SYS_HIDDEN_LIBDEPS($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_SYS_DYNAMIC_LINKER($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++ fi # test -n "$compiler" ++ ++ GCC=$lt_save_GCC ++ CC="$lt_save_CC" ++fi # test "$_lt_disable_FC" != yes ++ ++AC_LANG_POP ++])# _LT_LANG_FC_CONFIG ++ ++ ++# _LT_LANG_GCJ_CONFIG([TAG]) ++# -------------------------- ++# Ensure that the configuration variables for the GNU Java Compiler compiler ++# are suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_GCJ_CONFIG], ++[AC_REQUIRE([LT_PROG_GCJ])dnl ++AC_LANG_SAVE ++ ++# Source file extension for Java test sources. ++ac_ext=java ++ ++# Object file extension for compiled Java test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code="class foo {}" ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_TAG_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++lt_save_GCC=$GCC ++GCC=yes ++CC=${GCJ-"gcj"} ++compiler=$CC ++_LT_TAGVAR(compiler, $1)=$CC ++_LT_TAGVAR(LD, $1)="$LD" ++_LT_CC_BASENAME([$compiler]) ++ ++# GCJ did not exist at the time GCC didn't implicitly link libc in. ++_LT_TAGVAR(archive_cmds_need_lc, $1)=no ++ ++_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds ++ ++## CAVEAT EMPTOR: ++## There is no encapsulation within the following macros, do not change ++## the running order or otherwise move them around unless you know exactly ++## what you are doing... ++if test -n "$compiler"; then ++ _LT_COMPILER_NO_RTTI($1) ++ _LT_COMPILER_PIC($1) ++ _LT_COMPILER_C_O($1) ++ _LT_COMPILER_FILE_LOCKS($1) ++ _LT_LINKER_SHLIBS($1) ++ _LT_LINKER_HARDCODE_LIBPATH($1) ++ ++ _LT_CONFIG($1) ++fi ++ ++AC_LANG_RESTORE ++ ++GCC=$lt_save_GCC ++CC="$lt_save_CC" ++])# _LT_LANG_GCJ_CONFIG ++ ++ ++# _LT_LANG_RC_CONFIG([TAG]) ++# ------------------------- ++# Ensure that the configuration variables for the Windows resource compiler ++# are suitably defined. These variables are subsequently used by _LT_CONFIG ++# to write the compiler configuration to `libtool'. ++m4_defun([_LT_LANG_RC_CONFIG], ++[AC_REQUIRE([LT_PROG_RC])dnl ++AC_LANG_SAVE ++ ++# Source file extension for RC test sources. ++ac_ext=rc ++ ++# Object file extension for compiled RC test sources. ++objext=o ++_LT_TAGVAR(objext, $1)=$objext ++ ++# Code to be used in simple compile tests ++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' ++ ++# Code to be used in simple link tests ++lt_simple_link_test_code="$lt_simple_compile_test_code" ++ ++# ltmain only uses $CC for tagged configurations so make sure $CC is set. ++_LT_TAG_COMPILER ++ ++# save warnings/boilerplate of simple test code ++_LT_COMPILER_BOILERPLATE ++_LT_LINKER_BOILERPLATE ++ ++# Allow CC to be a program name with arguments. ++lt_save_CC="$CC" ++lt_save_GCC=$GCC ++GCC= ++CC=${RC-"windres"} ++compiler=$CC ++_LT_TAGVAR(compiler, $1)=$CC ++_LT_CC_BASENAME([$compiler]) ++_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes ++ ++if test -n "$compiler"; then ++ : ++ _LT_CONFIG($1) ++fi ++ ++GCC=$lt_save_GCC ++AC_LANG_RESTORE ++CC="$lt_save_CC" ++])# _LT_LANG_RC_CONFIG ++ ++ ++# LT_PROG_GCJ ++# ----------- ++AC_DEFUN([LT_PROG_GCJ], ++[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], ++ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], ++ [AC_CHECK_TOOL(GCJ, gcj,) ++ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" ++ AC_SUBST(GCJFLAGS)])])[]dnl ++]) ++ ++# Old name: ++AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_GCJ], []) ++ ++ ++# LT_PROG_RC ++# ---------- ++AC_DEFUN([LT_PROG_RC], ++[AC_CHECK_TOOL(RC, windres,) ++]) ++ ++# Old name: ++AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_RC], []) ++ ++ ++# _LT_DECL_EGREP ++# -------------- ++# If we don't have a new enough Autoconf to choose the best grep ++# available, choose the one first in the user's PATH. ++m4_defun([_LT_DECL_EGREP], ++[AC_REQUIRE([AC_PROG_EGREP])dnl ++AC_REQUIRE([AC_PROG_FGREP])dnl ++test -z "$GREP" && GREP=grep ++_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) ++_LT_DECL([], [EGREP], [1], [An ERE matcher]) ++_LT_DECL([], [FGREP], [1], [A literal string matcher]) ++dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too ++AC_SUBST([GREP]) ++]) ++ ++ ++# _LT_DECL_OBJDUMP ++# -------------- ++# If we don't have a new enough Autoconf to choose the best objdump ++# available, choose the one first in the user's PATH. ++m4_defun([_LT_DECL_OBJDUMP], ++[AC_CHECK_TOOL(OBJDUMP, objdump, false) ++test -z "$OBJDUMP" && OBJDUMP=objdump ++_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) ++AC_SUBST([OBJDUMP]) ++]) ++ ++ ++# _LT_DECL_SED ++# ------------ ++# Check for a fully-functional sed program, that truncates ++# as few characters as possible. Prefer GNU sed if found. ++m4_defun([_LT_DECL_SED], ++[AC_PROG_SED ++test -z "$SED" && SED=sed ++Xsed="$SED -e 1s/^X//" ++_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) ++_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], ++ [Sed that helps us avoid accidentally triggering echo(1) options like -n]) ++])# _LT_DECL_SED ++ ++m4_ifndef([AC_PROG_SED], [ ++############################################################ ++# NOTE: This macro has been submitted for inclusion into # ++# GNU Autoconf as AC_PROG_SED. When it is available in # ++# a released version of Autoconf we should remove this # ++# macro and use it instead. # ++############################################################ ++ ++m4_defun([AC_PROG_SED], ++[AC_MSG_CHECKING([for a sed that does not truncate output]) ++AC_CACHE_VAL(lt_cv_path_SED, ++[# Loop through the user's path and test for sed and gsed. ++# Then use that list of sed's as ones to test for truncation. ++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR ++for as_dir in $PATH ++do ++ IFS=$as_save_IFS ++ test -z "$as_dir" && as_dir=. ++ for lt_ac_prog in sed gsed; do ++ for ac_exec_ext in '' $ac_executable_extensions; do ++ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then ++ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" ++ fi ++ done ++ done ++done ++IFS=$as_save_IFS ++lt_ac_max=0 ++lt_ac_count=0 ++# Add /usr/xpg4/bin/sed as it is typically found on Solaris ++# along with /bin/sed that truncates output. ++for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do ++ test ! -f $lt_ac_sed && continue ++ cat /dev/null > conftest.in ++ lt_ac_count=0 ++ echo $ECHO_N "0123456789$ECHO_C" >conftest.in ++ # Check for GNU sed and select it if it is found. ++ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then ++ lt_cv_path_SED=$lt_ac_sed ++ break ++ fi ++ while true; do ++ cat conftest.in conftest.in >conftest.tmp ++ mv conftest.tmp conftest.in ++ cp conftest.in conftest.nl ++ echo >>conftest.nl ++ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break ++ cmp -s conftest.out conftest.nl || break ++ # 10000 chars as input seems more than enough ++ test $lt_ac_count -gt 10 && break ++ lt_ac_count=`expr $lt_ac_count + 1` ++ if test $lt_ac_count -gt $lt_ac_max; then ++ lt_ac_max=$lt_ac_count ++ lt_cv_path_SED=$lt_ac_sed ++ fi ++ done ++done ++]) ++SED=$lt_cv_path_SED ++AC_SUBST([SED]) ++AC_MSG_RESULT([$SED]) ++])#AC_PROG_SED ++])#m4_ifndef ++ ++# Old name: ++AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([LT_AC_PROG_SED], []) ++ ++ ++# _LT_CHECK_SHELL_FEATURES ++# ------------------------ ++# Find out whether the shell is Bourne or XSI compatible, ++# or has some other useful features. ++m4_defun([_LT_CHECK_SHELL_FEATURES], ++[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) ++# Try some XSI features ++xsi_shell=no ++( _lt_dummy="a/b/c" ++ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ ++ = c,a/b,, \ ++ && eval 'test $(( 1 + 1 )) -eq 2 \ ++ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ ++ && xsi_shell=yes ++AC_MSG_RESULT([$xsi_shell]) ++_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) ++ ++AC_MSG_CHECKING([whether the shell understands "+="]) ++lt_shell_append=no ++( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ ++ >/dev/null 2>&1 \ ++ && lt_shell_append=yes ++AC_MSG_RESULT([$lt_shell_append]) ++_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) ++ ++if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then ++ lt_unset=unset ++else ++ lt_unset=false ++fi ++_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl ++ ++# test EBCDIC or ASCII ++case `echo X|tr X '\101'` in ++ A) # ASCII based system ++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr ++ lt_SP2NL='tr \040 \012' ++ lt_NL2SP='tr \015\012 \040\040' ++ ;; ++ *) # EBCDIC based system ++ lt_SP2NL='tr \100 \n' ++ lt_NL2SP='tr \r\n \100\100' ++ ;; ++esac ++_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl ++_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl ++])# _LT_CHECK_SHELL_FEATURES ++ ++ ++# _LT_PROG_XSI_SHELLFNS ++# --------------------- ++# Bourne and XSI compatible variants of some useful shell functions. ++m4_defun([_LT_PROG_XSI_SHELLFNS], ++[case $xsi_shell in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result="${1##*/}" ++} ++ ++# func_dirname_and_basename file append nondir_replacement ++# perform func_basename and func_dirname in a single function ++# call: ++# dirname: Compute the dirname of FILE. If nonempty, ++# add APPEND to the result, otherwise set result ++# to NONDIR_REPLACEMENT. ++# value returned in "$func_dirname_result" ++# basename: Compute filename of FILE. ++# value retuned in "$func_basename_result" ++# Implementation must be kept synchronized with func_dirname ++# and func_basename. For efficiency, we do not delegate to ++# those functions but instead duplicate the functionality here. ++func_dirname_and_basename () ++{ ++ case ${1} in ++ */*) func_dirname_result="${1%/*}${2}" ;; ++ * ) func_dirname_result="${3}" ;; ++ esac ++ func_basename_result="${1##*/}" ++} ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++func_stripname () ++{ ++ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are ++ # positional parameters, so assign one to ordinary parameter first. ++ func_stripname_result=${3} ++ func_stripname_result=${func_stripname_result#"${1}"} ++ func_stripname_result=${func_stripname_result%"${2}"} ++} ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=${1%%=*} ++ func_opt_split_arg=${1#*=} ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ case ${1} in ++ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; ++ *) func_lo2o_result=${1} ;; ++ esac ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=${1%.*}.lo ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=$(( $[*] )) ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=${#1} ++} ++ ++_LT_EOF ++ ;; ++ *) # Bourne compatible functions. ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_dirname file append nondir_replacement ++# Compute the dirname of FILE. If nonempty, add APPEND to the result, ++# otherwise set result to NONDIR_REPLACEMENT. ++func_dirname () ++{ ++ # Extract subdirectory from the argument. ++ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` ++ if test "X$func_dirname_result" = "X${1}"; then ++ func_dirname_result="${3}" ++ else ++ func_dirname_result="$func_dirname_result${2}" ++ fi ++} ++ ++# func_basename file ++func_basename () ++{ ++ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` ++} ++ ++dnl func_dirname_and_basename ++dnl A portable version of this function is already defined in general.m4sh ++dnl so there is no need for it here. ++ ++# func_stripname prefix suffix name ++# strip PREFIX and SUFFIX off of NAME. ++# PREFIX and SUFFIX must not contain globbing or regex special ++# characters, hashes, percent signs, but SUFFIX may contain a leading ++# dot (in which case that matches only a dot). ++# func_strip_suffix prefix name ++func_stripname () ++{ ++ case ${2} in ++ .*) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; ++ *) func_stripname_result=`$ECHO "X${3}" \ ++ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; ++ esac ++} ++ ++# sed scripts: ++my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' ++my_sed_long_arg='1s/^-[[^=]]*=//' ++ ++# func_opt_split ++func_opt_split () ++{ ++ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` ++ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` ++} ++ ++# func_lo2o object ++func_lo2o () ++{ ++ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` ++} ++ ++# func_xform libobj-or-source ++func_xform () ++{ ++ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` ++} ++ ++# func_arith arithmetic-term... ++func_arith () ++{ ++ func_arith_result=`expr "$[@]"` ++} ++ ++# func_len string ++# STRING may not start with a hyphen. ++func_len () ++{ ++ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` ++} ++ ++_LT_EOF ++esac ++ ++case $lt_shell_append in ++ yes) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$[1]+=\$[2]" ++} ++_LT_EOF ++ ;; ++ *) ++ cat << \_LT_EOF >> "$cfgfile" ++ ++# func_append var value ++# Append VALUE to the end of shell variable VAR. ++func_append () ++{ ++ eval "$[1]=\$$[1]\$[2]" ++} ++ ++_LT_EOF ++ ;; ++ esac ++]) +diff -ru evolution-2.29.3/m4/lt~obsolete.m4 evolution-2.29.3.new/m4/lt~obsolete.m4 +--- evolution-2.29.3/m4/lt~obsolete.m4 2009-11-30 18:02:54.000000000 +0100 ++++ evolution-2.29.3.new/m4/lt~obsolete.m4 2009-11-14 19:44:14.000000000 +0100 +@@ -0,0 +1,92 @@ ++# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- ++# ++# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. ++# Written by Scott James Remnant, 2004. ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++# serial 4 lt~obsolete.m4 ++ ++# These exist entirely to fool aclocal when bootstrapping libtool. ++# ++# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) ++# which have later been changed to m4_define as they aren't part of the ++# exported API, or moved to Autoconf or Automake where they belong. ++# ++# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN ++# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us ++# using a macro with the same name in our local m4/libtool.m4 it'll ++# pull the old libtool.m4 in (it doesn't see our shiny new m4_define ++# and doesn't know about Autoconf macros at all.) ++# ++# So we provide this file, which has a silly filename so it's always ++# included after everything else. This provides aclocal with the ++# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything ++# because those macros already exist, or will be overwritten later. ++# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. ++# ++# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. ++# Yes, that means every name once taken will need to remain here until ++# we give up compatibility with versions before 1.7, at which point ++# we need to keep only those names which we still refer to. ++ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) ++ ++m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) ++m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) ++m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) ++m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) ++m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) ++m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) ++m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) ++m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) ++m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) ++m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) ++m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) ++m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) ++m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) ++m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) ++m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) ++m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) ++m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) ++m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) ++m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) ++m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) ++m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) ++m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) ++m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) ++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) ++m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) ++m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) ++m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) ++m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) ++m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) ++m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) ++m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) ++m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) ++m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) ++m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) ++m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) ++m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) ++m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) ++m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) ++m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) ++m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) ++m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) ++m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) ++m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) ++m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) ++m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) ++m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) ++m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +diff -ru evolution-2.29.3/m4/ltoptions.m4 evolution-2.29.3.new/m4/ltoptions.m4 +--- evolution-2.29.3/m4/ltoptions.m4 2009-11-30 18:02:58.000000000 +0100 ++++ evolution-2.29.3.new/m4/ltoptions.m4 2009-11-14 19:44:14.000000000 +0100 +@@ -0,0 +1,368 @@ ++# Helper functions for option handling. -*- Autoconf -*- ++# ++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gary V. Vaughan, 2004 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++# serial 6 ltoptions.m4 ++ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) ++ ++ ++# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) ++# ------------------------------------------ ++m4_define([_LT_MANGLE_OPTION], ++[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) ++ ++ ++# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) ++# --------------------------------------- ++# Set option OPTION-NAME for macro MACRO-NAME, and if there is a ++# matching handler defined, dispatch to it. Other OPTION-NAMEs are ++# saved as a flag. ++m4_define([_LT_SET_OPTION], ++[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl ++m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), ++ _LT_MANGLE_DEFUN([$1], [$2]), ++ [m4_warning([Unknown $1 option `$2'])])[]dnl ++]) ++ ++ ++# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) ++# ------------------------------------------------------------ ++# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. ++m4_define([_LT_IF_OPTION], ++[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) ++ ++ ++# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) ++# ------------------------------------------------------- ++# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME ++# are set. ++m4_define([_LT_UNLESS_OPTIONS], ++[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), ++ [m4_define([$0_found])])])[]dnl ++m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 ++])[]dnl ++]) ++ ++ ++# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) ++# ---------------------------------------- ++# OPTION-LIST is a space-separated list of Libtool options associated ++# with MACRO-NAME. If any OPTION has a matching handler declared with ++# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about ++# the unknown option and exit. ++m4_defun([_LT_SET_OPTIONS], ++[# Set options ++m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), ++ [_LT_SET_OPTION([$1], _LT_Option)]) ++ ++m4_if([$1],[LT_INIT],[ ++ dnl ++ dnl Simply set some default values (i.e off) if boolean options were not ++ dnl specified: ++ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no ++ ]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no ++ ]) ++ dnl ++ dnl If no reference was made to various pairs of opposing options, then ++ dnl we run the default mode handler for the pair. For example, if neither ++ dnl `shared' nor `disable-shared' was passed, we enable building of shared ++ dnl archives by default: ++ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) ++ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], ++ [_LT_ENABLE_FAST_INSTALL]) ++ ]) ++])# _LT_SET_OPTIONS ++ ++ ++## --------------------------------- ## ++## Macros to handle LT_INIT options. ## ++## --------------------------------- ## ++ ++# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) ++# ----------------------------------------- ++m4_define([_LT_MANGLE_DEFUN], ++[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) ++ ++ ++# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) ++# ----------------------------------------------- ++m4_define([LT_OPTION_DEFINE], ++[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl ++])# LT_OPTION_DEFINE ++ ++ ++# dlopen ++# ------ ++LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes ++]) ++ ++AU_DEFUN([AC_LIBTOOL_DLOPEN], ++[_LT_SET_OPTION([LT_INIT], [dlopen]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `dlopen' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) ++ ++ ++# win32-dll ++# --------- ++# Declare package support for building win32 dll's. ++LT_OPTION_DEFINE([LT_INIT], [win32-dll], ++[enable_win32_dll=yes ++ ++case $host in ++*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) ++ AC_CHECK_TOOL(AS, as, false) ++ AC_CHECK_TOOL(DLLTOOL, dlltool, false) ++ AC_CHECK_TOOL(OBJDUMP, objdump, false) ++ ;; ++esac ++ ++test -z "$AS" && AS=as ++_LT_DECL([], [AS], [0], [Assembler program])dnl ++ ++test -z "$DLLTOOL" && DLLTOOL=dlltool ++_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl ++ ++test -z "$OBJDUMP" && OBJDUMP=objdump ++_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl ++])# win32-dll ++ ++AU_DEFUN([AC_LIBTOOL_WIN32_DLL], ++[AC_REQUIRE([AC_CANONICAL_HOST])dnl ++_LT_SET_OPTION([LT_INIT], [win32-dll]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `win32-dll' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) ++ ++ ++# _LT_ENABLE_SHARED([DEFAULT]) ++# ---------------------------- ++# implement the --enable-shared flag, and supports the `shared' and ++# `disable-shared' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_SHARED], ++[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([shared], ++ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], ++ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_shared=yes ;; ++ no) enable_shared=no ;; ++ *) ++ enable_shared=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_shared=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) ++ ++ _LT_DECL([build_libtool_libs], [enable_shared], [0], ++ [Whether or not to build shared libraries]) ++])# _LT_ENABLE_SHARED ++ ++LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) ++ ++# Old names: ++AC_DEFUN([AC_ENABLE_SHARED], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) ++]) ++ ++AC_DEFUN([AC_DISABLE_SHARED], ++[_LT_SET_OPTION([LT_INIT], [disable-shared]) ++]) ++ ++AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) ++AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_ENABLE_SHARED], []) ++dnl AC_DEFUN([AM_DISABLE_SHARED], []) ++ ++ ++ ++# _LT_ENABLE_STATIC([DEFAULT]) ++# ---------------------------- ++# implement the --enable-static flag, and support the `static' and ++# `disable-static' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_STATIC], ++[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([static], ++ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], ++ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_static=yes ;; ++ no) enable_static=no ;; ++ *) ++ enable_static=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_static=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_static=]_LT_ENABLE_STATIC_DEFAULT) ++ ++ _LT_DECL([build_old_libs], [enable_static], [0], ++ [Whether or not to build static libraries]) ++])# _LT_ENABLE_STATIC ++ ++LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) ++ ++# Old names: ++AC_DEFUN([AC_ENABLE_STATIC], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) ++]) ++ ++AC_DEFUN([AC_DISABLE_STATIC], ++[_LT_SET_OPTION([LT_INIT], [disable-static]) ++]) ++ ++AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) ++AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AM_ENABLE_STATIC], []) ++dnl AC_DEFUN([AM_DISABLE_STATIC], []) ++ ++ ++ ++# _LT_ENABLE_FAST_INSTALL([DEFAULT]) ++# ---------------------------------- ++# implement the --enable-fast-install flag, and support the `fast-install' ++# and `disable-fast-install' LT_INIT options. ++# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. ++m4_define([_LT_ENABLE_FAST_INSTALL], ++[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl ++AC_ARG_ENABLE([fast-install], ++ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], ++ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], ++ [p=${PACKAGE-default} ++ case $enableval in ++ yes) enable_fast_install=yes ;; ++ no) enable_fast_install=no ;; ++ *) ++ enable_fast_install=no ++ # Look at the argument we got. We use all the common list separators. ++ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," ++ for pkg in $enableval; do ++ IFS="$lt_save_ifs" ++ if test "X$pkg" = "X$p"; then ++ enable_fast_install=yes ++ fi ++ done ++ IFS="$lt_save_ifs" ++ ;; ++ esac], ++ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) ++ ++_LT_DECL([fast_install], [enable_fast_install], [0], ++ [Whether or not to optimize for fast installation])dnl ++])# _LT_ENABLE_FAST_INSTALL ++ ++LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) ++ ++# Old names: ++AU_DEFUN([AC_ENABLE_FAST_INSTALL], ++[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `fast-install' option into LT_INIT's first parameter.]) ++]) ++ ++AU_DEFUN([AC_DISABLE_FAST_INSTALL], ++[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you put ++the `disable-fast-install' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) ++dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) ++ ++ ++# _LT_WITH_PIC([MODE]) ++# -------------------- ++# implement the --with-pic flag, and support the `pic-only' and `no-pic' ++# LT_INIT options. ++# MODE is either `yes' or `no'. If omitted, it defaults to `both'. ++m4_define([_LT_WITH_PIC], ++[AC_ARG_WITH([pic], ++ [AS_HELP_STRING([--with-pic], ++ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], ++ [pic_mode="$withval"], ++ [pic_mode=default]) ++ ++test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) ++ ++_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl ++])# _LT_WITH_PIC ++ ++LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) ++LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) ++ ++# Old name: ++AU_DEFUN([AC_LIBTOOL_PICMODE], ++[_LT_SET_OPTION([LT_INIT], [pic-only]) ++AC_DIAGNOSE([obsolete], ++[$0: Remove this warning and the call to _LT_SET_OPTION when you ++put the `pic-only' option into LT_INIT's first parameter.]) ++]) ++ ++dnl aclocal-1.4 backwards compatibility: ++dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) ++ ++## ----------------- ## ++## LTDL_INIT Options ## ++## ----------------- ## ++ ++m4_define([_LTDL_MODE], []) ++LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], ++ [m4_define([_LTDL_MODE], [nonrecursive])]) ++LT_OPTION_DEFINE([LTDL_INIT], [recursive], ++ [m4_define([_LTDL_MODE], [recursive])]) ++LT_OPTION_DEFINE([LTDL_INIT], [subproject], ++ [m4_define([_LTDL_MODE], [subproject])]) ++ ++m4_define([_LTDL_TYPE], []) ++LT_OPTION_DEFINE([LTDL_INIT], [installable], ++ [m4_define([_LTDL_TYPE], [installable])]) ++LT_OPTION_DEFINE([LTDL_INIT], [convenience], ++ [m4_define([_LTDL_TYPE], [convenience])]) +diff -ru evolution-2.29.3/m4/ltsugar.m4 evolution-2.29.3.new/m4/ltsugar.m4 +--- evolution-2.29.3/m4/ltsugar.m4 2009-11-30 18:03:02.000000000 +0100 ++++ evolution-2.29.3.new/m4/ltsugar.m4 2009-11-14 19:44:14.000000000 +0100 +@@ -0,0 +1,123 @@ ++# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- ++# ++# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. ++# Written by Gary V. Vaughan, 2004 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++# serial 6 ltsugar.m4 ++ ++# This is to help aclocal find these macros, as it can't see m4_define. ++AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) ++ ++ ++# lt_join(SEP, ARG1, [ARG2...]) ++# ----------------------------- ++# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their ++# associated separator. ++# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier ++# versions in m4sugar had bugs. ++m4_define([lt_join], ++[m4_if([$#], [1], [], ++ [$#], [2], [[$2]], ++ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) ++m4_define([_lt_join], ++[m4_if([$#$2], [2], [], ++ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) ++ ++ ++# lt_car(LIST) ++# lt_cdr(LIST) ++# ------------ ++# Manipulate m4 lists. ++# These macros are necessary as long as will still need to support ++# Autoconf-2.59 which quotes differently. ++m4_define([lt_car], [[$1]]) ++m4_define([lt_cdr], ++[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], ++ [$#], 1, [], ++ [m4_dquote(m4_shift($@))])]) ++m4_define([lt_unquote], $1) ++ ++ ++# lt_append(MACRO-NAME, STRING, [SEPARATOR]) ++# ------------------------------------------ ++# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. ++# Note that neither SEPARATOR nor STRING are expanded; they are appended ++# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). ++# No SEPARATOR is output if MACRO-NAME was previously undefined (different ++# than defined and empty). ++# ++# This macro is needed until we can rely on Autoconf 2.62, since earlier ++# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. ++m4_define([lt_append], ++[m4_define([$1], ++ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) ++ ++ ++ ++# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) ++# ---------------------------------------------------------- ++# Produce a SEP delimited list of all paired combinations of elements of ++# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list ++# has the form PREFIXmINFIXSUFFIXn. ++# Needed until we can rely on m4_combine added in Autoconf 2.62. ++m4_define([lt_combine], ++[m4_if(m4_eval([$# > 3]), [1], ++ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl ++[[m4_foreach([_Lt_prefix], [$2], ++ [m4_foreach([_Lt_suffix], ++ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, ++ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) ++ ++ ++# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) ++# ----------------------------------------------------------------------- ++# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited ++# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. ++m4_define([lt_if_append_uniq], ++[m4_ifdef([$1], ++ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], ++ [lt_append([$1], [$2], [$3])$4], ++ [$5])], ++ [lt_append([$1], [$2], [$3])$4])]) ++ ++ ++# lt_dict_add(DICT, KEY, VALUE) ++# ----------------------------- ++m4_define([lt_dict_add], ++[m4_define([$1($2)], [$3])]) ++ ++ ++# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) ++# -------------------------------------------- ++m4_define([lt_dict_add_subkey], ++[m4_define([$1($2:$3)], [$4])]) ++ ++ ++# lt_dict_fetch(DICT, KEY, [SUBKEY]) ++# ---------------------------------- ++m4_define([lt_dict_fetch], ++[m4_ifval([$3], ++ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), ++ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) ++ ++ ++# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) ++# ----------------------------------------------------------------- ++m4_define([lt_if_dict_fetch], ++[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], ++ [$5], ++ [$6])]) ++ ++ ++# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) ++# -------------------------------------------------------------- ++m4_define([lt_dict_filter], ++[m4_if([$5], [], [], ++ [lt_join(m4_quote(m4_default([$4], [[, ]])), ++ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), ++ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl ++]) +diff -ru evolution-2.29.3/m4/ltversion.m4 evolution-2.29.3.new/m4/ltversion.m4 +--- evolution-2.29.3/m4/ltversion.m4 2009-11-30 18:03:07.000000000 +0100 ++++ evolution-2.29.3.new/m4/ltversion.m4 2009-11-14 19:44:14.000000000 +0100 +@@ -0,0 +1,23 @@ ++# ltversion.m4 -- version numbers -*- Autoconf -*- ++# ++# Copyright (C) 2004 Free Software Foundation, Inc. ++# Written by Scott James Remnant, 2004 ++# ++# This file is free software; the Free Software Foundation gives ++# unlimited permission to copy and/or distribute it, with or without ++# modifications, as long as this notice is preserved. ++ ++# Generated from ltversion.in. ++ ++# serial 3012 ltversion.m4 ++# This file is part of GNU Libtool ++ ++m4_define([LT_PACKAGE_VERSION], [2.2.6]) ++m4_define([LT_PACKAGE_REVISION], [1.3012]) ++ ++AC_DEFUN([LTVERSION_VERSION], ++[macro_version='2.2.6' ++macro_revision='1.3012' ++_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) ++_LT_DECL(, macro_revision, 0) ++]) diff --git a/evolution.spec b/evolution.spec index 747cc4a..c10a5d5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -63,6 +63,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# Temporary hack for missing m4 files from tarball +Patch13: evolution-2.29.3-missing-m4-files.patch + ## Dependencies ### Requires(pre): GConf2 @@ -233,6 +236,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .missing-m4-files mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -683,6 +687,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 - Update to 2.29.3 +- Add patch for missing m4 files from tarball. * Tue Nov 17 2009 Matthew Barnes - 2.29.2-1.fc13 - Update to 2.29.2 From 28a2bfe99d16a477d2314651760cfdb91bc094cb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Nov 2009 17:57:33 +0000 Subject: [PATCH 311/844] - Disable autoreconf call. --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index c10a5d5..7d33b51 100644 --- a/evolution.spec +++ b/evolution.spec @@ -290,7 +290,7 @@ CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS # Regenerate mail/Makefile.in (this is temporary). -autoreconf --force +% autoreconf --force %configure \ --enable-gtk-doc \ @@ -688,6 +688,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 - Update to 2.29.3 - Add patch for missing m4 files from tarball. +- Disable autoreconf call. * Tue Nov 17 2009 Matthew Barnes - 2.29.2-1.fc13 - Update to 2.29.2 From 078a0b74595c924a6a9c90929b19c500792a5177 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Nov 2009 18:22:09 +0000 Subject: [PATCH 312/844] Uae the correct comment sign actually. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 7d33b51..f902d43 100644 --- a/evolution.spec +++ b/evolution.spec @@ -290,7 +290,7 @@ CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS # Regenerate mail/Makefile.in (this is temporary). -% autoreconf --force +# autoreconf --force %configure \ --enable-gtk-doc \ From e8345f4c81b3ff05bf43cd3c4bb0bed45fa7bf80 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Nov 2009 19:04:00 +0000 Subject: [PATCH 313/844] Remove obsolete glade files references. --- evolution.spec | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index f902d43..149f81d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -511,14 +511,13 @@ rm -rf $RPM_BUILD_ROOT %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 +# (note that there are various resources such as ui and pixmap files that # are built as part of specific plugins but which are currently packaged using # globs above; the purpose of the separation below is to be more explicit about # which plugins we ship) %{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 @@ -600,7 +599,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-subject-thread.eplug %{evo_plugin_dir}/liborg-gnome-subject-thread.so -%{evo_plugin_dir}/templates.glade %{evo_plugin_dir}/org-gnome-templates.eplug %{evo_plugin_dir}/liborg-gnome-templates.so From aac48978e4de8a64f4f3475baa6783d3ecb38e17 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Nov 2009 20:28:05 +0000 Subject: [PATCH 314/844] A new killev missing in spec file. --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 149f81d..bde4aa4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -506,6 +506,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/evolution/%{evo_major} %{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export %{_libexecdir}/evolution/%{evo_major}/evolution-backup +%{_libexecdir}/evolution/%{evo_major}/killev # The plugin directory: %dir %{evo_plugin_dir} From 4b4690d64b9dfec245fe431afe904601c5d616c3 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 2 Dec 2009 18:21:46 +0000 Subject: [PATCH 315/844] Disable bogofilter subpackage if EL6+ --- evolution.spec | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/evolution.spec b/evolution.spec index bde4aa4..2da5170 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,3 +1,6 @@ +# Variable must exist even if unused +%{?!rhel:%define rhel 0} + %define dbus_glib_version 0.70 %define dbus_version 1.0 %define glib2_version 2.16.0 @@ -192,6 +195,8 @@ This package contains conduits for synchronizing PalmPilot or other PalmOS devices with %{name}. %endif +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %package bogofilter Group: Applications/Productivity Summary: Bogofilter plugin for Evolution @@ -200,6 +205,7 @@ Requires: bogofilter %description bogofilter This package contains the plugin to filter junk mail using Bogofilter. +%endif %package spamassassin Group: Applications/Productivity @@ -367,6 +373,13 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ +rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug +rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so +rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas +%endif + %pre if [ "$1" -gt 1 ] ; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -381,9 +394,12 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : fi +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %pre bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : +%endif %post /sbin/ldconfig @@ -402,9 +418,12 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %post bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : +%endif %preun if [ "$1" -eq 0 ] ; then @@ -420,11 +439,14 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : fi +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %preun bogofilter if [ "$1" -eq 0 ] ; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : fi +%endif %postun /sbin/ldconfig @@ -660,11 +682,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gnome-pilot/conduits/e-todo.conduit %endif +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ %files bogofilter %defattr(-, root, root) %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas +%endif %files spamassassin %defattr(-, root, root) @@ -684,6 +709,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Dec 02 2009 Warren Togami - 2.29.3-1 +- Disable bogofilter subpackage if EL6+ + * Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 - Update to 2.29.3 - Add patch for missing m4 files from tarball. From 93079e84c129f88dfcab3d32fda89ba3877cfb14 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 2 Dec 2009 18:22:46 +0000 Subject: [PATCH 316/844] bump --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 2da5170..4b382dd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -43,7 +43,7 @@ Name: evolution Version: 2.29.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -709,7 +709,7 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Wed Dec 02 2009 Warren Togami - 2.29.3-1 +* Wed Dec 02 2009 Warren Togami - 2.29.3-2 - Disable bogofilter subpackage if EL6+ * Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 From afb6ec60170ae567777cb28e2471cd12bf204527 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 2 Dec 2009 18:55:43 +0000 Subject: [PATCH 317/844] Fix logic --- evolution.spec | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/evolution.spec b/evolution.spec index 4b382dd..4085bea 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,11 @@ # Variable must exist even if unused %{?!rhel:%define rhel 0} +%define disable_bogofilter 0 + +%if 0%{?rhel} >= 6 +# Disable bogofilter subpackage if EL6+ +%define disable_bogofilter 1 +%endif %define dbus_glib_version 0.70 %define dbus_version 1.0 @@ -43,7 +49,7 @@ Name: evolution Version: 2.29.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -195,7 +201,7 @@ This package contains conduits for synchronizing PalmPilot or other PalmOS devices with %{name}. %endif -%if 0%{?rhel} >= 6 +%if ! %{disable_bogofilter} # Disable bogofilter subpackage if EL6+ %package bogofilter Group: Applications/Productivity @@ -373,7 +379,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang -%if 0%{?rhel} >= 6 +%if ! %{disable_bogofilter} # Disable bogofilter subpackage if EL6+ rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so @@ -394,7 +400,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : fi -%if 0%{?rhel} >= 6 +%if ! %{disable_bogofilter} # Disable bogofilter subpackage if EL6+ %pre bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -418,7 +424,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : -%if 0%{?rhel} >= 6 +%if ! %{disable_bogofilter} # Disable bogofilter subpackage if EL6+ %post bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -439,7 +445,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : fi -%if 0%{?rhel} >= 6 +%if ! %{disable_bogofilter} # Disable bogofilter subpackage if EL6+ %preun bogofilter if [ "$1" -eq 0 ] ; then @@ -682,7 +688,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gnome-pilot/conduits/e-todo.conduit %endif -%if 0%{?rhel} >= 6 +%if ! %{disable_bogofilter} # Disable bogofilter subpackage if EL6+ %files bogofilter %defattr(-, root, root) @@ -709,7 +715,7 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Wed Dec 02 2009 Warren Togami - 2.29.3-2 +* Wed Dec 02 2009 Warren Togami - 2.29.3-3 - Disable bogofilter subpackage if EL6+ * Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 From 24744d730a12af936d8648b3c2dc2bcfd52d59a0 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Wed, 2 Dec 2009 19:50:40 +0000 Subject: [PATCH 318/844] remove --- evolution.spec | 36 +----------------------------------- 1 file changed, 1 insertion(+), 35 deletions(-) diff --git a/evolution.spec b/evolution.spec index 4085bea..8da7285 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,12 +1,3 @@ -# Variable must exist even if unused -%{?!rhel:%define rhel 0} -%define disable_bogofilter 0 - -%if 0%{?rhel} >= 6 -# Disable bogofilter subpackage if EL6+ -%define disable_bogofilter 1 -%endif - %define dbus_glib_version 0.70 %define dbus_version 1.0 %define glib2_version 2.16.0 @@ -49,7 +40,7 @@ Name: evolution Version: 2.29.3 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -201,8 +192,6 @@ This package contains conduits for synchronizing PalmPilot or other PalmOS devices with %{name}. %endif -%if ! %{disable_bogofilter} -# Disable bogofilter subpackage if EL6+ %package bogofilter Group: Applications/Productivity Summary: Bogofilter plugin for Evolution @@ -211,7 +200,6 @@ Requires: bogofilter %description bogofilter This package contains the plugin to filter junk mail using Bogofilter. -%endif %package spamassassin Group: Applications/Productivity @@ -379,13 +367,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang -%if ! %{disable_bogofilter} -# Disable bogofilter subpackage if EL6+ -rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug -rm -f $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so -rm -f $RPM_BUILD_ROOT%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas -%endif - %pre if [ "$1" -gt 1 ] ; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` @@ -400,12 +381,9 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : fi -%if ! %{disable_bogofilter} -# Disable bogofilter subpackage if EL6+ %pre bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : -%endif %post /sbin/ldconfig @@ -424,12 +402,9 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : -%if ! %{disable_bogofilter} -# Disable bogofilter subpackage if EL6+ %post bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : -%endif %preun if [ "$1" -eq 0 ] ; then @@ -445,14 +420,11 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : fi -%if ! %{disable_bogofilter} -# Disable bogofilter subpackage if EL6+ %preun bogofilter if [ "$1" -eq 0 ] ; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : fi -%endif %postun /sbin/ldconfig @@ -688,14 +660,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/gnome-pilot/conduits/e-todo.conduit %endif -%if ! %{disable_bogofilter} -# Disable bogofilter subpackage if EL6+ %files bogofilter %defattr(-, root, root) %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas -%endif %files spamassassin %defattr(-, root, root) @@ -715,9 +684,6 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Wed Dec 02 2009 Warren Togami - 2.29.3-3 -- Disable bogofilter subpackage if EL6+ - * Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 - Update to 2.29.3 - Add patch for missing m4 files from tarball. From e61c454298d2d7f7a2e8def1d1bfa08de34cdd6e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Dec 2009 17:46:57 +0000 Subject: [PATCH 319/844] - Update to 2.29.4 - Remove patch for missing m4 files from tarball (fixed upstream). --- .cvsignore | 2 +- evolution-2.29.3-missing-m4-files.patch | 8309 ----------------------- evolution.spec | 12 +- sources | 2 +- 4 files changed, 8 insertions(+), 8317 deletions(-) delete mode 100644 evolution-2.29.3-missing-m4-files.patch diff --git a/.cvsignore b/.cvsignore index 42555f2..b5f6935 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.3.tar.bz2 +evolution-2.29.4.tar.bz2 diff --git a/evolution-2.29.3-missing-m4-files.patch b/evolution-2.29.3-missing-m4-files.patch deleted file mode 100644 index 6f220bc..0000000 --- a/evolution-2.29.3-missing-m4-files.patch +++ /dev/null @@ -1,8309 +0,0 @@ -diff -ru evolution-2.29.3/m4/gnome-doc-utils.m4 evolution-2.29.3.new/m4/gnome-doc-utils.m4 ---- evolution-2.29.3/m4/gnome-doc-utils.m4 2009-11-30 18:02:32.000000000 +0100 -+++ evolution-2.29.3.new/m4/gnome-doc-utils.m4 2009-11-14 19:44:15.000000000 +0100 -@@ -0,0 +1,56 @@ -+dnl Do not call GNOME_DOC_DEFINES directly. It is split out from -+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself. -+AC_DEFUN([GNOME_DOC_DEFINES], -+[ -+AC_ARG_WITH([help-dir], -+ AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),, -+ [with_help_dir='${datadir}/gnome/help']) -+HELP_DIR="$with_help_dir" -+AC_SUBST(HELP_DIR) -+ -+AC_ARG_WITH([omf-dir], -+ AC_HELP_STRING([--with-omf-dir=DIR], [path to OMF files]),, -+ [with_omf_dir='${datadir}/omf']) -+OMF_DIR="$with_omf_dir" -+AC_SUBST(OMF_DIR) -+ -+AC_ARG_WITH([help-formats], -+ AC_HELP_STRING([--with-help-formats=FORMATS], [list of formats]),, -+ [with_help_formats='']) -+DOC_USER_FORMATS="$with_help_formats" -+AC_SUBST(DOC_USER_FORMATS) -+ -+AC_ARG_ENABLE([scrollkeeper], -+ [AC_HELP_STRING([--disable-scrollkeeper], -+ [do not make updates to the scrollkeeper database])],, -+ enable_scrollkeeper=yes) -+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"]) -+ -+dnl disable scrollkeeper automatically for distcheck -+DISTCHECK_CONFIGURE_FLAGS="--disable-scrollkeeper $DISTCHECK_CONFIGURE_FLAGS" -+AC_SUBST(DISTCHECK_CONFIGURE_FLAGS) -+ -+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"]) -+]) -+ -+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND]) -+# -+AC_DEFUN([GNOME_DOC_INIT], -+[AC_REQUIRE([AC_PROG_LN_S])dnl -+ -+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1]) -+ -+AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required]) -+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required], -+ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no]) -+ -+if test "$gdu_cv_have_gdu" = "yes"; then -+ AC_MSG_RESULT([yes]) -+ ifelse([$2],,[:],[$2]) -+else -+ AC_MSG_RESULT([no]) -+ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3]) -+fi -+ -+GNOME_DOC_DEFINES -+]) -diff -ru evolution-2.29.3/m4/gtk-doc.m4 evolution-2.29.3.new/m4/gtk-doc.m4 ---- evolution-2.29.3/m4/gtk-doc.m4 2009-11-30 18:02:37.000000000 +0100 -+++ evolution-2.29.3.new/m4/gtk-doc.m4 2009-11-14 19:44:15.000000000 +0100 -@@ -0,0 +1,39 @@ -+dnl -*- mode: autoconf -*- -+ -+# serial 1 -+ -+dnl Usage: -+dnl GTK_DOC_CHECK([minimum-gtk-doc-version]) -+AC_DEFUN([GTK_DOC_CHECK], -+[ -+ AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first -+ AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first -+ dnl for overriding the documentation installation directory -+ AC_ARG_WITH([html-dir], -+ AS_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),, -+ [with_html_dir='${datadir}/gtk-doc/html']) -+ HTML_DIR="$with_html_dir" -+ AC_SUBST([HTML_DIR]) -+ -+ dnl enable/disable documentation building -+ AC_ARG_ENABLE([gtk-doc], -+ AS_HELP_STRING([--enable-gtk-doc], -+ [use gtk-doc to build documentation [[default=no]]]),, -+ [enable_gtk_doc=no]) -+ -+ if test x$enable_gtk_doc = xyes; then -+ ifelse([$1],[], -+ [PKG_CHECK_EXISTS([gtk-doc],, -+ AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))], -+ [PKG_CHECK_EXISTS([gtk-doc >= $1],, -+ AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build gtk-doc]))]) -+ fi -+ -+ AC_MSG_CHECKING([whether to build gtk-doc documentation]) -+ AC_MSG_RESULT($enable_gtk_doc) -+ -+ AC_PATH_PROGS(GTKDOC_CHECK,gtkdoc-check,) -+ -+ AM_CONDITIONAL([ENABLE_GTK_DOC], [test x$enable_gtk_doc = xyes]) -+ AM_CONDITIONAL([GTK_DOC_USE_LIBTOOL], [test -n "$LIBTOOL"]) -+]) -diff -ru evolution-2.29.3/m4/intltool.m4 evolution-2.29.3.new/m4/intltool.m4 ---- evolution-2.29.3/m4/intltool.m4 2009-11-30 18:02:43.000000000 +0100 -+++ evolution-2.29.3.new/m4/intltool.m4 2009-11-14 19:44:14.000000000 +0100 -@@ -0,0 +1,216 @@ -+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*- -+## Copyright (C) 2001 Eazel, Inc. -+## Author: Maciej Stachowiak -+## Kenneth Christiansen -+## -+## This program is free software; you can redistribute it and/or modify -+## it under the terms of the GNU General Public License as published by -+## the Free Software Foundation; either version 2 of the License, or -+## (at your option) any later version. -+## -+## This program is distributed in the hope that it will be useful, but -+## WITHOUT ANY WARRANTY; without even the implied warranty of -+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+## General Public License for more details. -+## -+## You should have received a copy of the GNU General Public License -+## along with this program; if not, write to the Free Software -+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. -+## -+## As a special exception to the GNU General Public License, if you -+## distribute this file as part of a program that contains a -+## configuration script generated by Autoconf, you may include it under -+## the same distribution terms that you use for the rest of that program. -+ -+dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml]) -+# serial 40 IT_PROG_INTLTOOL -+AC_DEFUN([IT_PROG_INTLTOOL], [ -+AC_PREREQ([2.50])dnl -+AC_REQUIRE([AM_NLS])dnl -+ -+case "$am__api_version" in -+ 1.[01234]) -+ AC_MSG_ERROR([Automake 1.5 or newer is required to use intltool]) -+ ;; -+ *) -+ ;; -+esac -+ -+if test -n "$1"; then -+ AC_MSG_CHECKING([for intltool >= $1]) -+ -+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -+ INTLTOOL_APPLIED_VERSION=`intltool-update --version | head -1 | cut -d" " -f3` -+ [INTLTOOL_APPLIED_VERSION_AS_INT=`echo $INTLTOOL_APPLIED_VERSION | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'` -+ ] -+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found]) -+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" || -+ AC_MSG_ERROR([Your intltool is too old. You need intltool $1 or later.]) -+fi -+ -+AC_PATH_PROG(INTLTOOL_UPDATE, [intltool-update]) -+AC_PATH_PROG(INTLTOOL_MERGE, [intltool-merge]) -+AC_PATH_PROG(INTLTOOL_EXTRACT, [intltool-extract]) -+if test -z "$INTLTOOL_UPDATE" -o -z "$INTLTOOL_MERGE" -o -z "$INTLTOOL_EXTRACT"; then -+ AC_MSG_ERROR([The intltool scripts were not found. Please install intltool.]) -+fi -+ -+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@' -+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< [$]@' -+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_SERVICE_RULE='%.service: %.service.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ INTLTOOL_POLICY_RULE='%.policy: %.policy.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@' -+ -+_IT_SUBST(INTLTOOL_DESKTOP_RULE) -+_IT_SUBST(INTLTOOL_DIRECTORY_RULE) -+_IT_SUBST(INTLTOOL_KEYS_RULE) -+_IT_SUBST(INTLTOOL_PROP_RULE) -+_IT_SUBST(INTLTOOL_OAF_RULE) -+_IT_SUBST(INTLTOOL_PONG_RULE) -+_IT_SUBST(INTLTOOL_SERVER_RULE) -+_IT_SUBST(INTLTOOL_SHEET_RULE) -+_IT_SUBST(INTLTOOL_SOUNDLIST_RULE) -+_IT_SUBST(INTLTOOL_UI_RULE) -+_IT_SUBST(INTLTOOL_XAM_RULE) -+_IT_SUBST(INTLTOOL_KBD_RULE) -+_IT_SUBST(INTLTOOL_XML_RULE) -+_IT_SUBST(INTLTOOL_XML_NOMERGE_RULE) -+_IT_SUBST(INTLTOOL_CAVES_RULE) -+_IT_SUBST(INTLTOOL_SCHEMAS_RULE) -+_IT_SUBST(INTLTOOL_THEME_RULE) -+_IT_SUBST(INTLTOOL_SERVICE_RULE) -+_IT_SUBST(INTLTOOL_POLICY_RULE) -+ -+# Check the gettext tools to make sure they are GNU -+AC_PATH_PROG(XGETTEXT, xgettext) -+AC_PATH_PROG(MSGMERGE, msgmerge) -+AC_PATH_PROG(MSGFMT, msgfmt) -+AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) -+if test -z "$XGETTEXT" -o -z "$MSGMERGE" -o -z "$MSGFMT"; then -+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -+fi -+xgversion="`$XGETTEXT --version|grep '(GNU ' 2> /dev/null`" -+mmversion="`$MSGMERGE --version|grep '(GNU ' 2> /dev/null`" -+mfversion="`$MSGFMT --version|grep '(GNU ' 2> /dev/null`" -+if test -z "$xgversion" -o -z "$mmversion" -o -z "$mfversion"; then -+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool]) -+fi -+ -+AC_PATH_PROG(INTLTOOL_PERL, perl) -+if test -z "$INTLTOOL_PERL"; then -+ AC_MSG_ERROR([perl not found]) -+fi -+AC_MSG_CHECKING([for perl >= 5.8.1]) -+$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1 -+if test $? -ne 0; then -+ AC_MSG_ERROR([perl 5.8.1 is required for intltool]) -+else -+ IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`" -+ AC_MSG_RESULT([$IT_PERL_VERSION]) -+fi -+if test "x$2" != "xno-xml"; then -+ AC_MSG_CHECKING([for XML::Parser]) -+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then -+ AC_MSG_RESULT([ok]) -+ else -+ AC_MSG_ERROR([XML::Parser perl module is required for intltool]) -+ fi -+fi -+ -+# Substitute ALL_LINGUAS so we can use it in po/Makefile -+AC_SUBST(ALL_LINGUAS) -+ -+# Set DATADIRNAME correctly if it is not set yet -+# (copied from glib-gettext.m4) -+if test -z "$DATADIRNAME"; then -+ AC_LINK_IFELSE( -+ [AC_LANG_PROGRAM([[]], -+ [[extern int _nl_msg_cat_cntr; -+ return _nl_msg_cat_cntr]])], -+ [DATADIRNAME=share], -+ [case $host in -+ *-*-solaris*) -+ dnl On Solaris, if bind_textdomain_codeset is in libc, -+ dnl GNU format message catalog is always supported, -+ dnl since both are added to the libc all together. -+ dnl Hence, we'd like to go with DATADIRNAME=share -+ dnl in this case. -+ AC_CHECK_FUNC(bind_textdomain_codeset, -+ [DATADIRNAME=share], [DATADIRNAME=lib]) -+ ;; -+ *) -+ [DATADIRNAME=lib] -+ ;; -+ esac]) -+fi -+AC_SUBST(DATADIRNAME) -+ -+IT_PO_SUBDIR([po]) -+ -+]) -+ -+ -+# IT_PO_SUBDIR(DIRNAME) -+# --------------------- -+# All po subdirs have to be declared with this macro; the subdir "po" is -+# declared by IT_PROG_INTLTOOL. -+# -+AC_DEFUN([IT_PO_SUBDIR], -+[AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS. -+dnl -+dnl The following CONFIG_COMMANDS should be exetuted at the very end -+dnl of config.status. -+AC_CONFIG_COMMANDS_PRE([ -+ AC_CONFIG_COMMANDS([$1/stamp-it], [ -+ if [ ! grep "^# INTLTOOL_MAKEFILE$" "$1/Makefile.in" > /dev/null ]; then -+ AC_MSG_ERROR([$1/Makefile.in.in was not created by intltoolize.]) -+ fi -+ rm -f "$1/stamp-it" "$1/stamp-it.tmp" "$1/POTFILES" "$1/Makefile.tmp" -+ >"$1/stamp-it.tmp" -+ [sed '/^#/d -+ s/^[[].*] *// -+ /^[ ]*$/d -+ '"s|^| $ac_top_srcdir/|" \ -+ "$srcdir/$1/POTFILES.in" | sed '$!s/$/ \\/' >"$1/POTFILES" -+ ] -+ [sed '/^POTFILES =/,/[^\\]$/ { -+ /^POTFILES =/!d -+ r $1/POTFILES -+ } -+ ' "$1/Makefile.in" >"$1/Makefile"] -+ rm -f "$1/Makefile.tmp" -+ mv "$1/stamp-it.tmp" "$1/stamp-it" -+ ]) -+])dnl -+]) -+ -+# _IT_SUBST(VARIABLE) -+# ------------------- -+# Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST -+# -+AC_DEFUN([_IT_SUBST], -+[ -+AC_SUBST([$1]) -+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])]) -+] -+) -+ -+# deprecated macros -+AU_ALIAS([AC_PROG_INTLTOOL], [IT_PROG_INTLTOOL]) -+# A hint is needed for aclocal from Automake <= 1.9.4: -+# AC_DEFUN([AC_PROG_INTLTOOL], ...) -+ -diff -ru evolution-2.29.3/m4/libtool.m4 evolution-2.29.3.new/m4/libtool.m4 ---- evolution-2.29.3/m4/libtool.m4 2009-11-30 18:02:49.000000000 +0100 -+++ evolution-2.29.3.new/m4/libtool.m4 2009-11-14 19:44:14.000000000 +0100 -@@ -0,0 +1,7360 @@ -+# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*- -+# -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+m4_define([_LT_COPYING], [dnl -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -+# 2006, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gordon Matzigkeit, 1996 -+# -+# This file is part of GNU Libtool. -+# -+# GNU Libtool is free software; you can redistribute it and/or -+# modify it under the terms of the GNU General Public License as -+# published by the Free Software Foundation; either version 2 of -+# the License, or (at your option) any later version. -+# -+# As a special exception to the GNU General Public License, -+# if you distribute this file as part of a program or library that -+# is built using GNU Libtool, you may include this file under the -+# same distribution terms that you use for the rest of that program. -+# -+# GNU Libtool is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+# -+# You should have received a copy of the GNU General Public License -+# along with GNU Libtool; see the file COPYING. If not, a copy -+# can be downloaded from http://www.gnu.org/licenses/gpl.html, or -+# obtained by writing to the Free Software Foundation, Inc., -+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -+]) -+ -+# serial 56 LT_INIT -+ -+ -+# LT_PREREQ(VERSION) -+# ------------------ -+# Complain and exit if this libtool version is less that VERSION. -+m4_defun([LT_PREREQ], -+[m4_if(m4_version_compare(m4_defn([LT_PACKAGE_VERSION]), [$1]), -1, -+ [m4_default([$3], -+ [m4_fatal([Libtool version $1 or higher is required], -+ 63)])], -+ [$2])]) -+ -+ -+# _LT_CHECK_BUILDDIR -+# ------------------ -+# Complain if the absolute build directory name contains unusual characters -+m4_defun([_LT_CHECK_BUILDDIR], -+[case `pwd` in -+ *\ * | *\ *) -+ AC_MSG_WARN([Libtool does not cope well with whitespace in `pwd`]) ;; -+esac -+]) -+ -+ -+# LT_INIT([OPTIONS]) -+# ------------------ -+AC_DEFUN([LT_INIT], -+[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT -+AC_BEFORE([$0], [LT_LANG])dnl -+AC_BEFORE([$0], [LT_OUTPUT])dnl -+AC_BEFORE([$0], [LTDL_INIT])dnl -+m4_require([_LT_CHECK_BUILDDIR])dnl -+ -+dnl Autoconf doesn't catch unexpanded LT_ macros by default: -+m4_pattern_forbid([^_?LT_[A-Z_]+$])dnl -+m4_pattern_allow([^(_LT_EOF|LT_DLGLOBAL|LT_DLLAZY_OR_NOW|LT_MULTI_MODULE)$])dnl -+dnl aclocal doesn't pull ltoptions.m4, ltsugar.m4, or ltversion.m4 -+dnl unless we require an AC_DEFUNed macro: -+AC_REQUIRE([LTOPTIONS_VERSION])dnl -+AC_REQUIRE([LTSUGAR_VERSION])dnl -+AC_REQUIRE([LTVERSION_VERSION])dnl -+AC_REQUIRE([LTOBSOLETE_VERSION])dnl -+m4_require([_LT_PROG_LTMAIN])dnl -+ -+dnl Parse OPTIONS -+_LT_SET_OPTIONS([$0], [$1]) -+ -+# This can be used to rebuild libtool when needed -+LIBTOOL_DEPS="$ltmain" -+ -+# Always use our own libtool. -+LIBTOOL='$(SHELL) $(top_builddir)/libtool' -+AC_SUBST(LIBTOOL)dnl -+ -+_LT_SETUP -+ -+# Only expand once: -+m4_define([LT_INIT]) -+])# LT_INIT -+ -+# Old names: -+AU_ALIAS([AC_PROG_LIBTOOL], [LT_INIT]) -+AU_ALIAS([AM_PROG_LIBTOOL], [LT_INIT]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_PROG_LIBTOOL], []) -+dnl AC_DEFUN([AM_PROG_LIBTOOL], []) -+ -+ -+# _LT_CC_BASENAME(CC) -+# ------------------- -+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix. -+m4_defun([_LT_CC_BASENAME], -+[for cc_temp in $1""; do -+ case $cc_temp in -+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;; -+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;; -+ \-*) ;; -+ *) break;; -+ esac -+done -+cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"` -+]) -+ -+ -+# _LT_FILEUTILS_DEFAULTS -+# ---------------------- -+# It is okay to use these file commands and assume they have been set -+# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'. -+m4_defun([_LT_FILEUTILS_DEFAULTS], -+[: ${CP="cp -f"} -+: ${MV="mv -f"} -+: ${RM="rm -f"} -+])# _LT_FILEUTILS_DEFAULTS -+ -+ -+# _LT_SETUP -+# --------- -+m4_defun([_LT_SETUP], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+_LT_DECL([], [host_alias], [0], [The host system])dnl -+_LT_DECL([], [host], [0])dnl -+_LT_DECL([], [host_os], [0])dnl -+dnl -+_LT_DECL([], [build_alias], [0], [The build system])dnl -+_LT_DECL([], [build], [0])dnl -+_LT_DECL([], [build_os], [0])dnl -+dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([LT_PATH_LD])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+dnl -+AC_REQUIRE([AC_PROG_LN_S])dnl -+test -z "$LN_S" && LN_S="ln -s" -+_LT_DECL([], [LN_S], [1], [Whether we need soft or hard links])dnl -+dnl -+AC_REQUIRE([LT_CMD_MAX_LEN])dnl -+_LT_DECL([objext], [ac_objext], [0], [Object file suffix (normally "o")])dnl -+_LT_DECL([], [exeext], [0], [Executable file suffix (normally "")])dnl -+dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_CHECK_SHELL_FEATURES])dnl -+m4_require([_LT_CMD_RELOAD])dnl -+m4_require([_LT_CHECK_MAGIC_METHOD])dnl -+m4_require([_LT_CMD_OLD_ARCHIVE])dnl -+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+ -+_LT_CONFIG_LIBTOOL_INIT([ -+# See if we are running on zsh, and set the options which allow our -+# commands through without removal of \ escapes INIT. -+if test -n "\${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+]) -+if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+fi -+ -+_LT_CHECK_OBJDIR -+ -+m4_require([_LT_TAG_COMPILER])dnl -+_LT_PROG_ECHO_BACKSLASH -+ -+case $host_os in -+aix3*) -+ # AIX sometimes has problems with the GCC collect2 program. For some -+ # reason, if we set the COLLECT_NAMES environment variable, the problems -+ # vanish in a puff of smoke. -+ if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+ fi -+ ;; -+esac -+ -+# Sed substitution that helps us do robust quoting. It backslashifies -+# metacharacters that are still active within double-quoted strings. -+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g' -+ -+# Same as above, but do not quote variable references. -+double_quote_subst='s/\([["`\\]]\)/\\\1/g' -+ -+# Sed substitution to delay expansion of an escaped shell variable in a -+# double_quote_subst'ed string. -+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g' -+ -+# Sed substitution to delay expansion of an escaped single quote. -+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g' -+ -+# Sed substitution to avoid accidental globbing in evaled expressions -+no_glob_subst='s/\*/\\\*/g' -+ -+# Global variables: -+ofile=libtool -+can_build_shared=yes -+ -+# All known linkers require a `.a' archive for static linking (except MSVC, -+# which needs '.lib'). -+libext=a -+ -+with_gnu_ld="$lt_cv_prog_gnu_ld" -+ -+old_CC="$CC" -+old_CFLAGS="$CFLAGS" -+ -+# Set sane defaults for various variables -+test -z "$CC" && CC=cc -+test -z "$LTCC" && LTCC=$CC -+test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS -+test -z "$LD" && LD=ld -+test -z "$ac_objext" && ac_objext=o -+ -+_LT_CC_BASENAME([$compiler]) -+ -+# Only perform the check for file, if the check method requires it -+test -z "$MAGIC_CMD" && MAGIC_CMD=file -+case $deplibs_check_method in -+file_magic*) -+ if test "$file_magic_cmd" = '$MAGIC_CMD'; then -+ _LT_PATH_MAGIC -+ fi -+ ;; -+esac -+ -+# Use C for the default configuration in the libtool script -+LT_SUPPORTED_TAG([CC]) -+_LT_LANG_C_CONFIG -+_LT_LANG_DEFAULT_CONFIG -+_LT_CONFIG_COMMANDS -+])# _LT_SETUP -+ -+ -+# _LT_PROG_LTMAIN -+# --------------- -+# Note that this code is called both from `configure', and `config.status' -+# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably, -+# `config.status' has no value for ac_aux_dir unless we are using Automake, -+# so we pass a copy along to make sure it has a sensible value anyway. -+m4_defun([_LT_PROG_LTMAIN], -+[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl -+_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir']) -+ltmain="$ac_aux_dir/ltmain.sh" -+])# _LT_PROG_LTMAIN -+ -+ -+## ------------------------------------- ## -+## Accumulate code for creating libtool. ## -+## ------------------------------------- ## -+ -+# So that we can recreate a full libtool script including additional -+# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS -+# in macros and then make a single call at the end using the `libtool' -+# label. -+ -+ -+# _LT_CONFIG_LIBTOOL_INIT([INIT-COMMANDS]) -+# ---------------------------------------- -+# Register INIT-COMMANDS to be passed to AC_CONFIG_COMMANDS later. -+m4_define([_LT_CONFIG_LIBTOOL_INIT], -+[m4_ifval([$1], -+ [m4_append([_LT_OUTPUT_LIBTOOL_INIT], -+ [$1 -+])])]) -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_INIT]) -+ -+ -+# _LT_CONFIG_LIBTOOL([COMMANDS]) -+# ------------------------------ -+# Register COMMANDS to be passed to AC_CONFIG_COMMANDS later. -+m4_define([_LT_CONFIG_LIBTOOL], -+[m4_ifval([$1], -+ [m4_append([_LT_OUTPUT_LIBTOOL_COMMANDS], -+ [$1 -+])])]) -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS]) -+ -+ -+# _LT_CONFIG_SAVE_COMMANDS([COMMANDS], [INIT_COMMANDS]) -+# ----------------------------------------------------- -+m4_defun([_LT_CONFIG_SAVE_COMMANDS], -+[_LT_CONFIG_LIBTOOL([$1]) -+_LT_CONFIG_LIBTOOL_INIT([$2]) -+]) -+ -+ -+# _LT_FORMAT_COMMENT([COMMENT]) -+# ----------------------------- -+# Add leading comment marks to the start of each line, and a trailing -+# full-stop to the whole comment if one is not present already. -+m4_define([_LT_FORMAT_COMMENT], -+[m4_ifval([$1], [ -+m4_bpatsubst([m4_bpatsubst([$1], [^ *], [# ])], -+ [['`$\]], [\\\&])]m4_bmatch([$1], [[!?.]$], [], [.]) -+)]) -+ -+ -+ -+## ------------------------ ## -+## FIXME: Eliminate VARNAME ## -+## ------------------------ ## -+ -+ -+# _LT_DECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION], [IS-TAGGED?]) -+# ------------------------------------------------------------------- -+# CONFIGNAME is the name given to the value in the libtool script. -+# VARNAME is the (base) name used in the configure script. -+# VALUE may be 0, 1 or 2 for a computed quote escaped value based on -+# VARNAME. Any other value will be used directly. -+m4_define([_LT_DECL], -+[lt_if_append_uniq([lt_decl_varnames], [$2], [, ], -+ [lt_dict_add_subkey([lt_decl_dict], [$2], [libtool_name], -+ [m4_ifval([$1], [$1], [$2])]) -+ lt_dict_add_subkey([lt_decl_dict], [$2], [value], [$3]) -+ m4_ifval([$4], -+ [lt_dict_add_subkey([lt_decl_dict], [$2], [description], [$4])]) -+ lt_dict_add_subkey([lt_decl_dict], [$2], -+ [tagged?], [m4_ifval([$5], [yes], [no])])]) -+]) -+ -+ -+# _LT_TAGDECL([CONFIGNAME], VARNAME, VALUE, [DESCRIPTION]) -+# -------------------------------------------------------- -+m4_define([_LT_TAGDECL], [_LT_DECL([$1], [$2], [$3], [$4], [yes])]) -+ -+ -+# lt_decl_tag_varnames([SEPARATOR], [VARNAME1...]) -+# ------------------------------------------------ -+m4_define([lt_decl_tag_varnames], -+[_lt_decl_filter([tagged?], [yes], $@)]) -+ -+ -+# _lt_decl_filter(SUBKEY, VALUE, [SEPARATOR], [VARNAME1..]) -+# --------------------------------------------------------- -+m4_define([_lt_decl_filter], -+[m4_case([$#], -+ [0], [m4_fatal([$0: too few arguments: $#])], -+ [1], [m4_fatal([$0: too few arguments: $#: $1])], -+ [2], [lt_dict_filter([lt_decl_dict], [$1], [$2], [], lt_decl_varnames)], -+ [3], [lt_dict_filter([lt_decl_dict], [$1], [$2], [$3], lt_decl_varnames)], -+ [lt_dict_filter([lt_decl_dict], $@)])[]dnl -+]) -+ -+ -+# lt_decl_quote_varnames([SEPARATOR], [VARNAME1...]) -+# -------------------------------------------------- -+m4_define([lt_decl_quote_varnames], -+[_lt_decl_filter([value], [1], $@)]) -+ -+ -+# lt_decl_dquote_varnames([SEPARATOR], [VARNAME1...]) -+# --------------------------------------------------- -+m4_define([lt_decl_dquote_varnames], -+[_lt_decl_filter([value], [2], $@)]) -+ -+ -+# lt_decl_varnames_tagged([SEPARATOR], [VARNAME1...]) -+# --------------------------------------------------- -+m4_define([lt_decl_varnames_tagged], -+[m4_assert([$# <= 2])dnl -+_$0(m4_quote(m4_default([$1], [[, ]])), -+ m4_ifval([$2], [[$2]], [m4_dquote(lt_decl_tag_varnames)]), -+ m4_split(m4_normalize(m4_quote(_LT_TAGS)), [ ]))]) -+m4_define([_lt_decl_varnames_tagged], -+[m4_ifval([$3], [lt_combine([$1], [$2], [_], $3)])]) -+ -+ -+# lt_decl_all_varnames([SEPARATOR], [VARNAME1...]) -+# ------------------------------------------------ -+m4_define([lt_decl_all_varnames], -+[_$0(m4_quote(m4_default([$1], [[, ]])), -+ m4_if([$2], [], -+ m4_quote(lt_decl_varnames), -+ m4_quote(m4_shift($@))))[]dnl -+]) -+m4_define([_lt_decl_all_varnames], -+[lt_join($@, lt_decl_varnames_tagged([$1], -+ lt_decl_tag_varnames([[, ]], m4_shift($@))))dnl -+]) -+ -+ -+# _LT_CONFIG_STATUS_DECLARE([VARNAME]) -+# ------------------------------------ -+# Quote a variable value, and forward it to `config.status' so that its -+# declaration there will have the same value as in `configure'. VARNAME -+# must have a single quote delimited value for this to work. -+m4_define([_LT_CONFIG_STATUS_DECLARE], -+[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`']) -+ -+ -+# _LT_CONFIG_STATUS_DECLARATIONS -+# ------------------------------ -+# We delimit libtool config variables with single quotes, so when -+# we write them to config.status, we have to be sure to quote all -+# embedded single quotes properly. In configure, this macro expands -+# each variable declared with _LT_DECL (and _LT_TAGDECL) into: -+# -+# ='`$ECHO "X$" | $Xsed -e "$delay_single_quote_subst"`' -+m4_defun([_LT_CONFIG_STATUS_DECLARATIONS], -+[m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames), -+ [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])]) -+ -+ -+# _LT_LIBTOOL_TAGS -+# ---------------- -+# Output comment and list of tags supported by the script -+m4_defun([_LT_LIBTOOL_TAGS], -+[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl -+available_tags="_LT_TAGS"dnl -+]) -+ -+ -+# _LT_LIBTOOL_DECLARE(VARNAME, [TAG]) -+# ----------------------------------- -+# Extract the dictionary values for VARNAME (optionally with TAG) and -+# expand to a commented shell variable setting: -+# -+# # Some comment about what VAR is for. -+# visible_name=$lt_internal_name -+m4_define([_LT_LIBTOOL_DECLARE], -+[_LT_FORMAT_COMMENT(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], -+ [description])))[]dnl -+m4_pushdef([_libtool_name], -+ m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [libtool_name])))[]dnl -+m4_case(m4_quote(lt_dict_fetch([lt_decl_dict], [$1], [value])), -+ [0], [_libtool_name=[$]$1], -+ [1], [_libtool_name=$lt_[]$1], -+ [2], [_libtool_name=$lt_[]$1], -+ [_libtool_name=lt_dict_fetch([lt_decl_dict], [$1], [value])])[]dnl -+m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl -+]) -+ -+ -+# _LT_LIBTOOL_CONFIG_VARS -+# ----------------------- -+# Produce commented declarations of non-tagged libtool config variables -+# suitable for insertion in the LIBTOOL CONFIG section of the `libtool' -+# script. Tagged libtool config variables (even for the LIBTOOL CONFIG -+# section) are produced by _LT_LIBTOOL_TAG_VARS. -+m4_defun([_LT_LIBTOOL_CONFIG_VARS], -+[m4_foreach([_lt_var], -+ m4_quote(_lt_decl_filter([tagged?], [no], [], lt_decl_varnames)), -+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var)])])]) -+ -+ -+# _LT_LIBTOOL_TAG_VARS(TAG) -+# ------------------------- -+m4_define([_LT_LIBTOOL_TAG_VARS], -+[m4_foreach([_lt_var], m4_quote(lt_decl_tag_varnames), -+ [m4_n([_LT_LIBTOOL_DECLARE(_lt_var, [$1])])])]) -+ -+ -+# _LT_TAGVAR(VARNAME, [TAGNAME]) -+# ------------------------------ -+m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])]) -+ -+ -+# _LT_CONFIG_COMMANDS -+# ------------------- -+# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of -+# variables for single and double quote escaping we saved from calls -+# to _LT_DECL, we can put quote escaped variables declarations -+# into `config.status', and then the shell code to quote escape them in -+# for loops in `config.status'. Finally, any additional code accumulated -+# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded. -+m4_defun([_LT_CONFIG_COMMANDS], -+[AC_PROVIDE_IFELSE([LT_OUTPUT], -+ dnl If the libtool generation code has been placed in $CONFIG_LT, -+ dnl instead of duplicating it all over again into config.status, -+ dnl then we will have config.status run $CONFIG_LT later, so it -+ dnl needs to know what name is stored there: -+ [AC_CONFIG_COMMANDS([libtool], -+ [$SHELL $CONFIG_LT || AS_EXIT(1)], [CONFIG_LT='$CONFIG_LT'])], -+ dnl If the libtool generation code is destined for config.status, -+ dnl expand the accumulated commands and init code now: -+ [AC_CONFIG_COMMANDS([libtool], -+ [_LT_OUTPUT_LIBTOOL_COMMANDS], [_LT_OUTPUT_LIBTOOL_COMMANDS_INIT])]) -+])#_LT_CONFIG_COMMANDS -+ -+ -+# Initialize. -+m4_define([_LT_OUTPUT_LIBTOOL_COMMANDS_INIT], -+[ -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+sed_quote_subst='$sed_quote_subst' -+double_quote_subst='$double_quote_subst' -+delay_variable_subst='$delay_variable_subst' -+_LT_CONFIG_STATUS_DECLARATIONS -+LTCC='$LTCC' -+LTCFLAGS='$LTCFLAGS' -+compiler='$compiler_DEFAULT' -+ -+# Quote evaled strings. -+for var in lt_decl_all_varnames([[ \ -+]], lt_decl_quote_varnames); do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[[\\\\\\\`\\"\\\$]]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done -+ -+# Double-quote double-evaled strings. -+for var in lt_decl_all_varnames([[ \ -+]], lt_decl_dquote_varnames); do -+ case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in -+ *[[\\\\\\\`\\"\\\$]]*) -+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" -+ ;; -+ *) -+ eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\"" -+ ;; -+ esac -+done -+ -+# Fix-up fallback echo if it was mangled by the above quoting rules. -+case \$lt_ECHO in -+*'\\\[$]0 --fallback-echo"')dnl " -+ lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\` -+ ;; -+esac -+ -+_LT_OUTPUT_LIBTOOL_INIT -+]) -+ -+ -+# LT_OUTPUT -+# --------- -+# This macro allows early generation of the libtool script (before -+# AC_OUTPUT is called), incase it is used in configure for compilation -+# tests. -+AC_DEFUN([LT_OUTPUT], -+[: ${CONFIG_LT=./config.lt} -+AC_MSG_NOTICE([creating $CONFIG_LT]) -+cat >"$CONFIG_LT" <<_LTEOF -+#! $SHELL -+# Generated by $as_me. -+# Run this file to recreate a libtool stub with the current configuration. -+ -+lt_cl_silent=false -+SHELL=\${CONFIG_SHELL-$SHELL} -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+AS_SHELL_SANITIZE -+_AS_PREPARE -+ -+exec AS_MESSAGE_FD>&1 -+exec AS_MESSAGE_LOG_FD>>config.log -+{ -+ echo -+ AS_BOX([Running $as_me.]) -+} >&AS_MESSAGE_LOG_FD -+ -+lt_cl_help="\ -+\`$as_me' creates a local libtool stub from the current configuration, -+for use in further configure time tests before the real libtool is -+generated. -+ -+Usage: $[0] [[OPTIONS]] -+ -+ -h, --help print this help, then exit -+ -V, --version print version number, then exit -+ -q, --quiet do not print progress messages -+ -d, --debug don't remove temporary files -+ -+Report bugs to ." -+ -+lt_cl_version="\ -+m4_ifset([AC_PACKAGE_NAME], [AC_PACKAGE_NAME ])config.lt[]dnl -+m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION]) -+configured by $[0], generated by m4_PACKAGE_STRING. -+ -+Copyright (C) 2008 Free Software Foundation, Inc. -+This config.lt script is free software; the Free Software Foundation -+gives unlimited permision to copy, distribute and modify it." -+ -+while test $[#] != 0 -+do -+ case $[1] in -+ --version | --v* | -V ) -+ echo "$lt_cl_version"; exit 0 ;; -+ --help | --h* | -h ) -+ echo "$lt_cl_help"; exit 0 ;; -+ --debug | --d* | -d ) -+ debug=: ;; -+ --quiet | --q* | --silent | --s* | -q ) -+ lt_cl_silent=: ;; -+ -+ -*) AC_MSG_ERROR([unrecognized option: $[1] -+Try \`$[0] --help' for more information.]) ;; -+ -+ *) AC_MSG_ERROR([unrecognized argument: $[1] -+Try \`$[0] --help' for more information.]) ;; -+ esac -+ shift -+done -+ -+if $lt_cl_silent; then -+ exec AS_MESSAGE_FD>/dev/null -+fi -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<_LTEOF -+_LT_OUTPUT_LIBTOOL_COMMANDS_INIT -+_LTEOF -+ -+cat >>"$CONFIG_LT" <<\_LTEOF -+AC_MSG_NOTICE([creating $ofile]) -+_LT_OUTPUT_LIBTOOL_COMMANDS -+AS_EXIT(0) -+_LTEOF -+chmod +x "$CONFIG_LT" -+ -+# configure is writing to config.log, but config.lt does its own redirection, -+# appending to config.log, which fails on DOS, as config.log is still kept -+# open by configure. Here we exec the FD to /dev/null, effectively closing -+# config.log, so it can be properly (re)opened and appended to by config.lt. -+if test "$no_create" != yes; then -+ lt_cl_success=: -+ test "$silent" = yes && -+ lt_config_lt_args="$lt_config_lt_args --quiet" -+ exec AS_MESSAGE_LOG_FD>/dev/null -+ $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false -+ exec AS_MESSAGE_LOG_FD>>config.log -+ $lt_cl_success || AS_EXIT(1) -+fi -+])# LT_OUTPUT -+ -+ -+# _LT_CONFIG(TAG) -+# --------------- -+# If TAG is the built-in tag, create an initial libtool script with a -+# default configuration from the untagged config vars. Otherwise add code -+# to config.status for appending the configuration named by TAG from the -+# matching tagged config vars. -+m4_defun([_LT_CONFIG], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+_LT_CONFIG_SAVE_COMMANDS([ -+ m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl -+ m4_if(_LT_TAG, [C], [ -+ # See if we are running on zsh, and set the options which allow our -+ # commands through without removal of \ escapes. -+ if test -n "${ZSH_VERSION+set}" ; then -+ setopt NO_GLOB_SUBST -+ fi -+ -+ cfgfile="${ofile}T" -+ trap "$RM \"$cfgfile\"; exit 1" 1 2 15 -+ $RM "$cfgfile" -+ -+ cat <<_LT_EOF >> "$cfgfile" -+#! $SHELL -+ -+# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services. -+# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION -+# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`: -+# NOTE: Changes made to this file will be lost: look at ltmain.sh. -+# -+_LT_COPYING -+_LT_LIBTOOL_TAGS -+ -+# ### BEGIN LIBTOOL CONFIG -+_LT_LIBTOOL_CONFIG_VARS -+_LT_LIBTOOL_TAG_VARS -+# ### END LIBTOOL CONFIG -+ -+_LT_EOF -+ -+ case $host_os in -+ aix3*) -+ cat <<\_LT_EOF >> "$cfgfile" -+# AIX sometimes has problems with the GCC collect2 program. For some -+# reason, if we set the COLLECT_NAMES environment variable, the problems -+# vanish in a puff of smoke. -+if test "X${COLLECT_NAMES+set}" != Xset; then -+ COLLECT_NAMES= -+ export COLLECT_NAMES -+fi -+_LT_EOF -+ ;; -+ esac -+ -+ _LT_PROG_LTMAIN -+ -+ # We use sed instead of cat because bash on DJGPP gets confused if -+ # if finds mixed CR/LF and LF-only lines. Since sed operates in -+ # text mode, it properly converts lines to CR/LF. This bash problem -+ # is reportedly fixed, but why not run on old versions too? -+ sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ _LT_PROG_XSI_SHELLFNS -+ -+ sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \ -+ || (rm -f "$cfgfile"; exit 1) -+ -+ mv -f "$cfgfile" "$ofile" || -+ (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile") -+ chmod +x "$ofile" -+], -+[cat <<_LT_EOF >> "$ofile" -+ -+dnl Unfortunately we have to use $1 here, since _LT_TAG is not expanded -+dnl in a comment (ie after a #). -+# ### BEGIN LIBTOOL TAG CONFIG: $1 -+_LT_LIBTOOL_TAG_VARS(_LT_TAG) -+# ### END LIBTOOL TAG CONFIG: $1 -+_LT_EOF -+])dnl /m4_if -+], -+[m4_if([$1], [], [ -+ PACKAGE='$PACKAGE' -+ VERSION='$VERSION' -+ TIMESTAMP='$TIMESTAMP' -+ RM='$RM' -+ ofile='$ofile'], []) -+])dnl /_LT_CONFIG_SAVE_COMMANDS -+])# _LT_CONFIG -+ -+ -+# LT_SUPPORTED_TAG(TAG) -+# --------------------- -+# Trace this macro to discover what tags are supported by the libtool -+# --tag option, using: -+# autoconf --trace 'LT_SUPPORTED_TAG:$1' -+AC_DEFUN([LT_SUPPORTED_TAG], []) -+ -+ -+# C support is built-in for now -+m4_define([_LT_LANG_C_enabled], []) -+m4_define([_LT_TAGS], []) -+ -+ -+# LT_LANG(LANG) -+# ------------- -+# Enable libtool support for the given language if not already enabled. -+AC_DEFUN([LT_LANG], -+[AC_BEFORE([$0], [LT_OUTPUT])dnl -+m4_case([$1], -+ [C], [_LT_LANG(C)], -+ [C++], [_LT_LANG(CXX)], -+ [Java], [_LT_LANG(GCJ)], -+ [Fortran 77], [_LT_LANG(F77)], -+ [Fortran], [_LT_LANG(FC)], -+ [Windows Resource], [_LT_LANG(RC)], -+ [m4_ifdef([_LT_LANG_]$1[_CONFIG], -+ [_LT_LANG($1)], -+ [m4_fatal([$0: unsupported language: "$1"])])])dnl -+])# LT_LANG -+ -+ -+# _LT_LANG(LANGNAME) -+# ------------------ -+m4_defun([_LT_LANG], -+[m4_ifdef([_LT_LANG_]$1[_enabled], [], -+ [LT_SUPPORTED_TAG([$1])dnl -+ m4_append([_LT_TAGS], [$1 ])dnl -+ m4_define([_LT_LANG_]$1[_enabled], [])dnl -+ _LT_LANG_$1_CONFIG($1)])dnl -+])# _LT_LANG -+ -+ -+# _LT_LANG_DEFAULT_CONFIG -+# ----------------------- -+m4_defun([_LT_LANG_DEFAULT_CONFIG], -+[AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [LT_LANG(CXX)], -+ [m4_define([AC_PROG_CXX], defn([AC_PROG_CXX])[LT_LANG(CXX)])]) -+ -+AC_PROVIDE_IFELSE([AC_PROG_F77], -+ [LT_LANG(F77)], -+ [m4_define([AC_PROG_F77], defn([AC_PROG_F77])[LT_LANG(F77)])]) -+ -+AC_PROVIDE_IFELSE([AC_PROG_FC], -+ [LT_LANG(FC)], -+ [m4_define([AC_PROG_FC], defn([AC_PROG_FC])[LT_LANG(FC)])]) -+ -+dnl The call to [A][M_PROG_GCJ] is quoted like that to stop aclocal -+dnl pulling things in needlessly. -+AC_PROVIDE_IFELSE([AC_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [AC_PROVIDE_IFELSE([A][M_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [AC_PROVIDE_IFELSE([LT_PROG_GCJ], -+ [LT_LANG(GCJ)], -+ [m4_ifdef([AC_PROG_GCJ], -+ [m4_define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[LT_LANG(GCJ)])]) -+ m4_ifdef([A][M_PROG_GCJ], -+ [m4_define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[LT_LANG(GCJ)])]) -+ m4_ifdef([LT_PROG_GCJ], -+ [m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])]) -+ -+AC_PROVIDE_IFELSE([LT_PROG_RC], -+ [LT_LANG(RC)], -+ [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])]) -+])# _LT_LANG_DEFAULT_CONFIG -+ -+# Obsolete macros: -+AU_DEFUN([AC_LIBTOOL_CXX], [LT_LANG(C++)]) -+AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)]) -+AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)]) -+AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_CXX], []) -+dnl AC_DEFUN([AC_LIBTOOL_F77], []) -+dnl AC_DEFUN([AC_LIBTOOL_FC], []) -+dnl AC_DEFUN([AC_LIBTOOL_GCJ], []) -+ -+ -+# _LT_TAG_COMPILER -+# ---------------- -+m4_defun([_LT_TAG_COMPILER], -+[AC_REQUIRE([AC_PROG_CC])dnl -+ -+_LT_DECL([LTCC], [CC], [1], [A C compiler])dnl -+_LT_DECL([LTCFLAGS], [CFLAGS], [1], [LTCC compiler flags])dnl -+_LT_TAGDECL([CC], [compiler], [1], [A language specific compiler])dnl -+_LT_TAGDECL([with_gcc], [GCC], [0], [Is the compiler the GNU compiler?])dnl -+ -+# If no C compiler was specified, use CC. -+LTCC=${LTCC-"$CC"} -+ -+# If no C compiler flags were specified, use CFLAGS. -+LTCFLAGS=${LTCFLAGS-"$CFLAGS"} -+ -+# Allow CC to be a program name with arguments. -+compiler=$CC -+])# _LT_TAG_COMPILER -+ -+ -+# _LT_COMPILER_BOILERPLATE -+# ------------------------ -+# Check for compiler boilerplate output or warnings with -+# the simple compiler test code. -+m4_defun([_LT_COMPILER_BOILERPLATE], -+[m4_require([_LT_DECL_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_compile_test_code" >conftest.$ac_ext -+eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_compiler_boilerplate=`cat conftest.err` -+$RM conftest* -+])# _LT_COMPILER_BOILERPLATE -+ -+ -+# _LT_LINKER_BOILERPLATE -+# ---------------------- -+# Check for linker boilerplate output or warnings with -+# the simple link test code. -+m4_defun([_LT_LINKER_BOILERPLATE], -+[m4_require([_LT_DECL_SED])dnl -+ac_outfile=conftest.$ac_objext -+echo "$lt_simple_link_test_code" >conftest.$ac_ext -+eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err -+_lt_linker_boilerplate=`cat conftest.err` -+$RM -r conftest* -+])# _LT_LINKER_BOILERPLATE -+ -+# _LT_REQUIRED_DARWIN_CHECKS -+# ------------------------- -+m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[ -+ case $host_os in -+ rhapsody* | darwin*) -+ AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:]) -+ AC_CHECK_TOOL([NMEDIT], [nmedit], [:]) -+ AC_CHECK_TOOL([LIPO], [lipo], [:]) -+ AC_CHECK_TOOL([OTOOL], [otool], [:]) -+ AC_CHECK_TOOL([OTOOL64], [otool64], [:]) -+ _LT_DECL([], [DSYMUTIL], [1], -+ [Tool to manipulate archived DWARF debug symbol files on Mac OS X]) -+ _LT_DECL([], [NMEDIT], [1], -+ [Tool to change global to local symbols on Mac OS X]) -+ _LT_DECL([], [LIPO], [1], -+ [Tool to manipulate fat objects and archives on Mac OS X]) -+ _LT_DECL([], [OTOOL], [1], -+ [ldd/readelf like tool for Mach-O binaries on Mac OS X]) -+ _LT_DECL([], [OTOOL64], [1], -+ [ldd/readelf like tool for 64 bit Mach-O binaries on Mac OS X 10.4]) -+ -+ AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod], -+ [lt_cv_apple_cc_single_mod=no -+ if test -z "${LT_MULTI_MODULE}"; then -+ # By default we will add the -single_module flag. You can override -+ # by either setting the environment variable LT_MULTI_MODULE -+ # non-empty at configure time, or by adding -multi_module to the -+ # link flags. -+ rm -rf libconftest.dylib* -+ echo "int foo(void){return 1;}" > conftest.c -+ echo "$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+-dynamiclib -Wl,-single_module conftest.c" >&AS_MESSAGE_LOG_FD -+ $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \ -+ -dynamiclib -Wl,-single_module conftest.c 2>conftest.err -+ _lt_result=$? -+ if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then -+ lt_cv_apple_cc_single_mod=yes -+ else -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ fi -+ rm -rf libconftest.dylib* -+ rm -f conftest.* -+ fi]) -+ AC_CACHE_CHECK([for -exported_symbols_list linker flag], -+ [lt_cv_ld_exported_symbols_list], -+ [lt_cv_ld_exported_symbols_list=no -+ save_LDFLAGS=$LDFLAGS -+ echo "_main" > conftest.sym -+ LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [lt_cv_ld_exported_symbols_list=yes], -+ [lt_cv_ld_exported_symbols_list=no]) -+ LDFLAGS="$save_LDFLAGS" -+ ]) -+ case $host_os in -+ rhapsody* | darwin1.[[012]]) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;; -+ darwin1.*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ darwin*) # darwin 5.x on -+ # if running on 10.5 or later, the deployment target defaults -+ # to the OS version, if on x86, and 10.4, the deployment -+ # target defaults to 10.4. Don't you love it? -+ case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in -+ 10.0,*86*-darwin8*|10.0,*-darwin[[91]]*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ 10.[[012]]*) -+ _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;; -+ 10.*) -+ _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;; -+ esac -+ ;; -+ esac -+ if test "$lt_cv_apple_cc_single_mod" = "yes"; then -+ _lt_dar_single_mod='$single_module' -+ fi -+ if test "$lt_cv_ld_exported_symbols_list" = "yes"; then -+ _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym' -+ else -+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}' -+ fi -+ if test "$DSYMUTIL" != ":"; then -+ _lt_dsymutil='~$DSYMUTIL $lib || :' -+ else -+ _lt_dsymutil= -+ fi -+ ;; -+ esac -+]) -+ -+ -+# _LT_DARWIN_LINKER_FEATURES -+# -------------------------- -+# Checks for linker and compiler features on darwin -+m4_defun([_LT_DARWIN_LINKER_FEATURES], -+[ -+ m4_require([_LT_REQUIRED_DARWIN_CHECKS]) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_automatic, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined" -+ case $cc_basename in -+ ifort*) _lt_dar_can_shared=yes ;; -+ *) _lt_dar_can_shared=$GCC ;; -+ esac -+ if test "$_lt_dar_can_shared" = "yes"; then -+ output_verbose_link_cmd=echo -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}" -+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}" -+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}" -+ m4_if([$1], [CXX], -+[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then -+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}" -+ fi -+],[]) -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+]) -+ -+# _LT_SYS_MODULE_PATH_AIX -+# ----------------------- -+# Links a minimal program and checks the executable -+# for the system default hardcoded library path. In most cases, -+# this is /usr/lib:/lib, but when the MPI compilers are used -+# the location of the communication and MPI libs are included too. -+# If we don't find anything, use the default library path according -+# to the aix ld manual. -+m4_defun([_LT_SYS_MODULE_PATH_AIX], -+[m4_require([_LT_DECL_SED])dnl -+AC_LINK_IFELSE(AC_LANG_PROGRAM,[ -+lt_aix_libpath_sed=' -+ /Import File Strings/,/^$/ { -+ /^0/ { -+ s/^0 *\(.*\)$/\1/ -+ p -+ } -+ }' -+aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+# Check for a 64-bit object if we didn't find anything. -+if test -z "$aix_libpath"; then -+ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"` -+fi],[]) -+if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi -+])# _LT_SYS_MODULE_PATH_AIX -+ -+ -+# _LT_SHELL_INIT(ARG) -+# ------------------- -+m4_define([_LT_SHELL_INIT], -+[ifdef([AC_DIVERSION_NOTICE], -+ [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)], -+ [AC_DIVERT_PUSH(NOTICE)]) -+$1 -+AC_DIVERT_POP -+])# _LT_SHELL_INIT -+ -+ -+# _LT_PROG_ECHO_BACKSLASH -+# ----------------------- -+# Add some code to the start of the generated configure script which -+# will find an echo command which doesn't interpret backslashes. -+m4_defun([_LT_PROG_ECHO_BACKSLASH], -+[_LT_SHELL_INIT([ -+# Check that we are running under the correct shell. -+SHELL=${CONFIG_SHELL-/bin/sh} -+ -+case X$lt_ECHO in -+X*--fallback-echo) -+ # Remove one level of quotation (which was required for Make). -+ ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','` -+ ;; -+esac -+ -+ECHO=${lt_ECHO-echo} -+if test "X[$]1" = X--no-reexec; then -+ # Discard the --no-reexec flag, and continue. -+ shift -+elif test "X[$]1" = X--fallback-echo; then -+ # Avoid inline document here, it may be left over -+ : -+elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then -+ # Yippee, $ECHO works! -+ : -+else -+ # Restart under the correct shell. -+ exec $SHELL "[$]0" --no-reexec ${1+"[$]@"} -+fi -+ -+if test "X[$]1" = X--fallback-echo; then -+ # used as fallback echo -+ shift -+ cat <<_LT_EOF -+[$]* -+_LT_EOF -+ exit 0 -+fi -+ -+# The HP-UX ksh and POSIX shell print the target directory to stdout -+# if CDPATH is set. -+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH -+ -+if test -z "$lt_ECHO"; then -+ if test "X${echo_test_string+set}" != Xset; then -+ # find a string as large as possible, as long as the shell can cope with it -+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do -+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ... -+ if { echo_test_string=`eval $cmd`; } 2>/dev/null && -+ { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null -+ then -+ break -+ fi -+ done -+ fi -+ -+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ : -+ else -+ # The Solaris, AIX, and Digital Unix default echo programs unquote -+ # backslashes. This makes it impossible to quote backslashes using -+ # echo "$something" | sed 's/\\/\\\\/g' -+ # -+ # So, first we look for a working echo in the user's PATH. -+ -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for dir in $PATH /usr/ucb; do -+ IFS="$lt_save_ifs" -+ if (test -f $dir/echo || test -f $dir/echo$ac_exeext) && -+ test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ ECHO="$dir/echo" -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ -+ if test "X$ECHO" = Xecho; then -+ # We didn't find a better echo, so look for alternatives. -+ if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # This shell has a builtin print -r that does the trick. -+ ECHO='print -r' -+ elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } && -+ test "X$CONFIG_SHELL" != X/bin/ksh; then -+ # If we have ksh, try running configure again with it. -+ ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh} -+ export ORIGINAL_CONFIG_SHELL -+ CONFIG_SHELL=/bin/ksh -+ export CONFIG_SHELL -+ exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"} -+ else -+ # Try using printf. -+ ECHO='printf %s\n' -+ if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' && -+ echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ # Cool, printf works -+ : -+ elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL -+ export CONFIG_SHELL -+ SHELL="$CONFIG_SHELL" -+ export SHELL -+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -+ elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` && -+ test "X$echo_testing_string" = 'X\t' && -+ echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` && -+ test "X$echo_testing_string" = "X$echo_test_string"; then -+ ECHO="$CONFIG_SHELL [$]0 --fallback-echo" -+ else -+ # maybe with a smaller string... -+ prev=: -+ -+ for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do -+ if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null -+ then -+ break -+ fi -+ prev="$cmd" -+ done -+ -+ if test "$prev" != 'sed 50q "[$]0"'; then -+ echo_test_string=`eval $prev` -+ export echo_test_string -+ exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"} -+ else -+ # Oops. We lost completely, so just stick with echo. -+ ECHO=echo -+ fi -+ fi -+ fi -+ fi -+ fi -+fi -+ -+# Copy echo and quote the copy suitably for passing to libtool from -+# the Makefile, instead of quoting the original, which is used later. -+lt_ECHO=$ECHO -+if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then -+ lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo" -+fi -+ -+AC_SUBST(lt_ECHO) -+]) -+_LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts]) -+_LT_DECL([], [ECHO], [1], -+ [An echo program that does not interpret backslashes]) -+])# _LT_PROG_ECHO_BACKSLASH -+ -+ -+# _LT_ENABLE_LOCK -+# --------------- -+m4_defun([_LT_ENABLE_LOCK], -+[AC_ARG_ENABLE([libtool-lock], -+ [AS_HELP_STRING([--disable-libtool-lock], -+ [avoid locking (might break parallel builds)])]) -+test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes -+ -+# Some flags need to be propagated to the compiler or linker for good -+# libtool support. -+case $host in -+ia64-*-hpux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *ELF-32*) -+ HPUX_IA64_MODE="32" -+ ;; -+ *ELF-64*) -+ HPUX_IA64_MODE="64" -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+*-*-irix6*) -+ # Find out which ABI we are using. -+ echo '[#]line __oline__ "configure"' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -melf32bsmip" -+ ;; -+ *N32*) -+ LD="${LD-ld} -melf32bmipn32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -melf64bmip" -+ ;; -+ esac -+ else -+ case `/usr/bin/file conftest.$ac_objext` in -+ *32-bit*) -+ LD="${LD-ld} -32" -+ ;; -+ *N32*) -+ LD="${LD-ld} -n32" -+ ;; -+ *64-bit*) -+ LD="${LD-ld} -64" -+ ;; -+ esac -+ fi -+ fi -+ rm -rf conftest* -+ ;; -+ -+x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \ -+s390*-*linux*|s390*-*tpf*|sparc*-*linux*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *32-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_i386_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_i386" -+ ;; -+ ppc64-*linux*|powerpc64-*linux*) -+ LD="${LD-ld} -m elf32ppclinux" -+ ;; -+ s390x-*linux*) -+ LD="${LD-ld} -m elf_s390" -+ ;; -+ sparc64-*linux*) -+ LD="${LD-ld} -m elf32_sparc" -+ ;; -+ esac -+ ;; -+ *64-bit*) -+ case $host in -+ x86_64-*kfreebsd*-gnu) -+ LD="${LD-ld} -m elf_x86_64_fbsd" -+ ;; -+ x86_64-*linux*) -+ LD="${LD-ld} -m elf_x86_64" -+ ;; -+ ppc*-*linux*|powerpc*-*linux*) -+ LD="${LD-ld} -m elf64ppc" -+ ;; -+ s390*-*linux*|s390*-*tpf*) -+ LD="${LD-ld} -m elf64_s390" -+ ;; -+ sparc*-*linux*) -+ LD="${LD-ld} -m elf64_sparc" -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+ -+*-*-sco3.2v5*) -+ # On SCO OpenServer 5, we need -belf to get full-featured binaries. -+ SAVE_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS -belf" -+ AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, -+ [AC_LANG_PUSH(C) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no]) -+ AC_LANG_POP]) -+ if test x"$lt_cv_cc_needs_belf" != x"yes"; then -+ # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf -+ CFLAGS="$SAVE_CFLAGS" -+ fi -+ ;; -+sparc*-*solaris*) -+ # Find out which ABI we are using. -+ echo 'int i;' > conftest.$ac_ext -+ if AC_TRY_EVAL(ac_compile); then -+ case `/usr/bin/file conftest.o` in -+ *64-bit*) -+ case $lt_cv_prog_gnu_ld in -+ yes*) LD="${LD-ld} -m elf64_sparc" ;; -+ *) -+ if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then -+ LD="${LD-ld} -64" -+ fi -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ rm -rf conftest* -+ ;; -+esac -+ -+need_locks="$enable_libtool_lock" -+])# _LT_ENABLE_LOCK -+ -+ -+# _LT_CMD_OLD_ARCHIVE -+# ------------------- -+m4_defun([_LT_CMD_OLD_ARCHIVE], -+[AC_CHECK_TOOL(AR, ar, false) -+test -z "$AR" && AR=ar -+test -z "$AR_FLAGS" && AR_FLAGS=cru -+_LT_DECL([], [AR], [1], [The archiver]) -+_LT_DECL([], [AR_FLAGS], [1]) -+ -+AC_CHECK_TOOL(STRIP, strip, :) -+test -z "$STRIP" && STRIP=: -+_LT_DECL([], [STRIP], [1], [A symbol stripping program]) -+ -+AC_CHECK_TOOL(RANLIB, ranlib, :) -+test -z "$RANLIB" && RANLIB=: -+_LT_DECL([], [RANLIB], [1], -+ [Commands used to install an old-style archive]) -+ -+# Determine commands to create old-style static archives. -+old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs' -+old_postinstall_cmds='chmod 644 $oldlib' -+old_postuninstall_cmds= -+ -+if test -n "$RANLIB"; then -+ case $host_os in -+ openbsd*) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib" -+ ;; -+ *) -+ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib" -+ ;; -+ esac -+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib" -+fi -+_LT_DECL([], [old_postinstall_cmds], [2]) -+_LT_DECL([], [old_postuninstall_cmds], [2]) -+_LT_TAGDECL([], [old_archive_cmds], [2], -+ [Commands used to build an old-style archive]) -+])# _LT_CMD_OLD_ARCHIVE -+ -+ -+# _LT_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------------------- -+# Check whether the given compiler option works -+AC_DEFUN([_LT_COMPILER_OPTION], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4]) -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ lt_compiler_flag="$3" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ # The option is referenced via a variable to avoid confusing sed. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>conftest.err) -+ ac_status=$? -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s "$ac_outfile"; then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings other than the usual output. -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ fi -+ $RM conftest* -+]) -+ -+if test x"[$]$2" = xyes; then -+ m4_if([$5], , :, [$5]) -+else -+ m4_if([$6], , :, [$6]) -+fi -+])# _LT_COMPILER_OPTION -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_COMPILER_OPTION], [_LT_COMPILER_OPTION]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION], []) -+ -+ -+# _LT_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS, -+# [ACTION-SUCCESS], [ACTION-FAILURE]) -+# ---------------------------------------------------- -+# Check whether the given linker option works -+AC_DEFUN([_LT_LINKER_OPTION], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_SED])dnl -+AC_CACHE_CHECK([$1], [$2], -+ [$2=no -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS $3" -+ echo "$lt_simple_link_test_code" > conftest.$ac_ext -+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then -+ # The linker can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ if test -s conftest.err; then -+ # Append any errors to the config.log. -+ cat conftest.err 1>&AS_MESSAGE_LOG_FD -+ $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp -+ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2 -+ if diff conftest.exp conftest.er2 >/dev/null; then -+ $2=yes -+ fi -+ else -+ $2=yes -+ fi -+ fi -+ $RM -r conftest* -+ LDFLAGS="$save_LDFLAGS" -+]) -+ -+if test x"[$]$2" = xyes; then -+ m4_if([$4], , :, [$4]) -+else -+ m4_if([$5], , :, [$5]) -+fi -+])# _LT_LINKER_OPTION -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_LINKER_OPTION], [_LT_LINKER_OPTION]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_LINKER_OPTION], []) -+ -+ -+# LT_CMD_MAX_LEN -+#--------------- -+AC_DEFUN([LT_CMD_MAX_LEN], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+# find the maximum length of command line arguments -+AC_MSG_CHECKING([the maximum length of command line arguments]) -+AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl -+ i=0 -+ teststring="ABCD" -+ -+ case $build_os in -+ msdosdjgpp*) -+ # On DJGPP, this test can blow up pretty badly due to problems in libc -+ # (any single argument exceeding 2000 bytes causes a buffer overrun -+ # during glob expansion). Even if it were fixed, the result of this -+ # check would be larger than it should be. -+ lt_cv_sys_max_cmd_len=12288; # 12K is about right -+ ;; -+ -+ gnu*) -+ # Under GNU Hurd, this test is not required because there is -+ # no limit to the length of command line arguments. -+ # Libtool will interpret -1 as no limit whatsoever -+ lt_cv_sys_max_cmd_len=-1; -+ ;; -+ -+ cygwin* | mingw* | cegcc*) -+ # On Win9x/ME, this test blows up -- it succeeds, but takes -+ # about 5 minutes as the teststring grows exponentially. -+ # Worse, since 9x/ME are not pre-emptively multitasking, -+ # you end up with a "frozen" computer, even though with patience -+ # the test eventually succeeds (with a max line length of 256k). -+ # Instead, let's just punt: use the minimum linelength reported by -+ # all of the supported platforms: 8192 (on NT/2K/XP). -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ amigaos*) -+ # On AmigaOS with pdksh, this test takes hours, literally. -+ # So we just punt and use a minimum line length of 8192. -+ lt_cv_sys_max_cmd_len=8192; -+ ;; -+ -+ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*) -+ # This has been around since 386BSD, at least. Likely further. -+ if test -x /sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax` -+ elif test -x /usr/sbin/sysctl; then -+ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax` -+ else -+ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs -+ fi -+ # And add a safety zone -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ ;; -+ -+ interix*) -+ # We know the value 262144 and hardcode it with a safety zone (like BSD) -+ lt_cv_sys_max_cmd_len=196608 -+ ;; -+ -+ osf*) -+ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure -+ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not -+ # nice to cause kernel panics so lets avoid the loop below. -+ # First set a reasonable default. -+ lt_cv_sys_max_cmd_len=16384 -+ # -+ if test -x /sbin/sysconfig; then -+ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in -+ *1*) lt_cv_sys_max_cmd_len=-1 ;; -+ esac -+ fi -+ ;; -+ sco3.2v5*) -+ lt_cv_sys_max_cmd_len=102400 -+ ;; -+ sysv5* | sco5v6* | sysv4.2uw2*) -+ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null` -+ if test -n "$kargmax"; then -+ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'` -+ else -+ lt_cv_sys_max_cmd_len=32768 -+ fi -+ ;; -+ *) -+ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null` -+ if test -n "$lt_cv_sys_max_cmd_len"; then -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4` -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3` -+ else -+ # Make teststring a little bigger before we do anything with it. -+ # a 1K string should be a reasonable start. -+ for i in 1 2 3 4 5 6 7 8 ; do -+ teststring=$teststring$teststring -+ done -+ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}} -+ # If test is not a shell built-in, we'll probably end up computing a -+ # maximum length that is only half of the actual maximum length, but -+ # we can't tell. -+ while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \ -+ = "XX$teststring$teststring"; } >/dev/null 2>&1 && -+ test $i != 17 # 1/2 MB should be enough -+ do -+ i=`expr $i + 1` -+ teststring=$teststring$teststring -+ done -+ # Only check the string length outside the loop. -+ lt_cv_sys_max_cmd_len=`expr "X$teststring" : ".*" 2>&1` -+ teststring= -+ # Add a significant safety factor because C++ compilers can tack on -+ # massive amounts of additional arguments before passing them to the -+ # linker. It appears as though 1/2 is a usable value. -+ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2` -+ fi -+ ;; -+ esac -+]) -+if test -n $lt_cv_sys_max_cmd_len ; then -+ AC_MSG_RESULT($lt_cv_sys_max_cmd_len) -+else -+ AC_MSG_RESULT(none) -+fi -+max_cmd_len=$lt_cv_sys_max_cmd_len -+_LT_DECL([], [max_cmd_len], [0], -+ [What is the maximum length of a command?]) -+])# LT_CMD_MAX_LEN -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_SYS_MAX_CMD_LEN], [LT_CMD_MAX_LEN]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN], []) -+ -+ -+# _LT_HEADER_DLFCN -+# ---------------- -+m4_defun([_LT_HEADER_DLFCN], -+[AC_CHECK_HEADERS([dlfcn.h], [], [], [AC_INCLUDES_DEFAULT])dnl -+])# _LT_HEADER_DLFCN -+ -+ -+# _LT_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE, -+# ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING) -+# ---------------------------------------------------------------- -+m4_defun([_LT_TRY_DLOPEN_SELF], -+[m4_require([_LT_HEADER_DLFCN])dnl -+if test "$cross_compiling" = yes; then : -+ [$4] -+else -+ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 -+ lt_status=$lt_dlunknown -+ cat > conftest.$ac_ext <<_LT_EOF -+[#line __oline__ "configure" -+#include "confdefs.h" -+ -+#if HAVE_DLFCN_H -+#include -+#endif -+ -+#include -+ -+#ifdef RTLD_GLOBAL -+# define LT_DLGLOBAL RTLD_GLOBAL -+#else -+# ifdef DL_GLOBAL -+# define LT_DLGLOBAL DL_GLOBAL -+# else -+# define LT_DLGLOBAL 0 -+# endif -+#endif -+ -+/* We may have to define LT_DLLAZY_OR_NOW in the command line if we -+ find out it does not work in some platform. */ -+#ifndef LT_DLLAZY_OR_NOW -+# ifdef RTLD_LAZY -+# define LT_DLLAZY_OR_NOW RTLD_LAZY -+# else -+# ifdef DL_LAZY -+# define LT_DLLAZY_OR_NOW DL_LAZY -+# else -+# ifdef RTLD_NOW -+# define LT_DLLAZY_OR_NOW RTLD_NOW -+# else -+# ifdef DL_NOW -+# define LT_DLLAZY_OR_NOW DL_NOW -+# else -+# define LT_DLLAZY_OR_NOW 0 -+# endif -+# endif -+# endif -+# endif -+#endif -+ -+void fnord() { int i=42;} -+int main () -+{ -+ void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW); -+ int status = $lt_dlunknown; -+ -+ if (self) -+ { -+ if (dlsym (self,"fnord")) status = $lt_dlno_uscore; -+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore; -+ /* dlclose (self); */ -+ } -+ else -+ puts (dlerror ()); -+ -+ return status; -+}] -+_LT_EOF -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then -+ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null -+ lt_status=$? -+ case x$lt_status in -+ x$lt_dlno_uscore) $1 ;; -+ x$lt_dlneed_uscore) $2 ;; -+ x$lt_dlunknown|x*) $3 ;; -+ esac -+ else : -+ # compilation failed -+ $3 -+ fi -+fi -+rm -fr conftest* -+])# _LT_TRY_DLOPEN_SELF -+ -+ -+# LT_SYS_DLOPEN_SELF -+# ------------------ -+AC_DEFUN([LT_SYS_DLOPEN_SELF], -+[m4_require([_LT_HEADER_DLFCN])dnl -+if test "x$enable_dlopen" != xyes; then -+ enable_dlopen=unknown -+ enable_dlopen_self=unknown -+ enable_dlopen_self_static=unknown -+else -+ lt_cv_dlopen=no -+ lt_cv_dlopen_libs= -+ -+ case $host_os in -+ beos*) -+ lt_cv_dlopen="load_add_on" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ;; -+ -+ mingw* | pw32* | cegcc*) -+ lt_cv_dlopen="LoadLibrary" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ cygwin*) -+ lt_cv_dlopen="dlopen" -+ lt_cv_dlopen_libs= -+ ;; -+ -+ darwin*) -+ # if libdl is installed we need to link against it -+ AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[ -+ lt_cv_dlopen="dyld" -+ lt_cv_dlopen_libs= -+ lt_cv_dlopen_self=yes -+ ]) -+ ;; -+ -+ *) -+ AC_CHECK_FUNC([shl_load], -+ [lt_cv_dlopen="shl_load"], -+ [AC_CHECK_LIB([dld], [shl_load], -+ [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"], -+ [AC_CHECK_FUNC([dlopen], -+ [lt_cv_dlopen="dlopen"], -+ [AC_CHECK_LIB([dl], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"], -+ [AC_CHECK_LIB([svld], [dlopen], -+ [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"], -+ [AC_CHECK_LIB([dld], [dld_link], -+ [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ]) -+ ;; -+ esac -+ -+ if test "x$lt_cv_dlopen" != xno; then -+ enable_dlopen=yes -+ else -+ enable_dlopen=no -+ fi -+ -+ case $lt_cv_dlopen in -+ dlopen) -+ save_CPPFLAGS="$CPPFLAGS" -+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H" -+ -+ save_LDFLAGS="$LDFLAGS" -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\" -+ -+ save_LIBS="$LIBS" -+ LIBS="$lt_cv_dlopen_libs $LIBS" -+ -+ AC_CACHE_CHECK([whether a program can dlopen itself], -+ lt_cv_dlopen_self, [dnl -+ _LT_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes, -+ lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross) -+ ]) -+ -+ if test "x$lt_cv_dlopen_self" = xyes; then -+ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" -+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself], -+ lt_cv_dlopen_self_static, [dnl -+ _LT_TRY_DLOPEN_SELF( -+ lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes, -+ lt_cv_dlopen_self_static=no, lt_cv_dlopen_self_static=cross) -+ ]) -+ fi -+ -+ CPPFLAGS="$save_CPPFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ LIBS="$save_LIBS" -+ ;; -+ esac -+ -+ case $lt_cv_dlopen_self in -+ yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;; -+ *) enable_dlopen_self=unknown ;; -+ esac -+ -+ case $lt_cv_dlopen_self_static in -+ yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;; -+ *) enable_dlopen_self_static=unknown ;; -+ esac -+fi -+_LT_DECL([dlopen_support], [enable_dlopen], [0], -+ [Whether dlopen is supported]) -+_LT_DECL([dlopen_self], [enable_dlopen_self], [0], -+ [Whether dlopen of programs is supported]) -+_LT_DECL([dlopen_self_static], [enable_dlopen_self_static], [0], -+ [Whether dlopen of statically linked programs is supported]) -+])# LT_SYS_DLOPEN_SELF -+ -+# Old name: -+AU_ALIAS([AC_LIBTOOL_DLOPEN_SELF], [LT_SYS_DLOPEN_SELF]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF], []) -+ -+ -+# _LT_COMPILER_C_O([TAGNAME]) -+# --------------------------- -+# Check to see if options -c and -o are simultaneously supported by compiler. -+# This macro does not hard code the compiler like AC_PROG_CC_C_O. -+m4_defun([_LT_COMPILER_C_O], -+[m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_TAG_COMPILER])dnl -+AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext], -+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)], -+ [_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no -+ $RM -r conftest 2>/dev/null -+ mkdir conftest -+ cd conftest -+ mkdir out -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ lt_compiler_flag="-o out/conftest2.$ac_objext" -+ # Insert the option either (1) after the last *FLAGS variable, or -+ # (2) before a word containing "conftest.", or (3) at the end. -+ # Note that $ac_compile itself does not contain backslashes and begins -+ # with a dollar sign (not a hyphen), so the echo should work correctly. -+ lt_compile=`echo "$ac_compile" | $SED \ -+ -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -+ -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \ -+ -e 's:$: $lt_compiler_flag:'` -+ (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$lt_compile" 2>out/conftest.err) -+ ac_status=$? -+ cat out/conftest.err >&AS_MESSAGE_LOG_FD -+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD -+ if (exit $ac_status) && test -s out/conftest2.$ac_objext -+ then -+ # The compiler can only warn and ignore the option if not recognized -+ # So say no if there are warnings -+ $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp -+ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2 -+ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then -+ _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ fi -+ fi -+ chmod u+w . 2>&AS_MESSAGE_LOG_FD -+ $RM conftest* -+ # SGI C++ compiler will create directory out/ii_files/ for -+ # template instantiation -+ test -d out/ii_files && $RM out/ii_files/* && rmdir out/ii_files -+ $RM out/* && rmdir out -+ cd .. -+ $RM -r conftest -+ $RM conftest* -+]) -+_LT_TAGDECL([compiler_c_o], [lt_cv_prog_compiler_c_o], [1], -+ [Does compiler simultaneously support -c and -o options?]) -+])# _LT_COMPILER_C_O -+ -+ -+# _LT_COMPILER_FILE_LOCKS([TAGNAME]) -+# ---------------------------------- -+# Check to see if we can do hard links to lock some files if needed -+m4_defun([_LT_COMPILER_FILE_LOCKS], -+[m4_require([_LT_ENABLE_LOCK])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+_LT_COMPILER_C_O([$1]) -+ -+hard_links="nottested" -+if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then -+ # do not overwrite the value of need_locks provided by the user -+ AC_MSG_CHECKING([if we can lock with hard links]) -+ hard_links=yes -+ $RM conftest* -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ touch conftest.a -+ ln conftest.a conftest.b 2>&5 || hard_links=no -+ ln conftest.a conftest.b 2>/dev/null && hard_links=no -+ AC_MSG_RESULT([$hard_links]) -+ if test "$hard_links" = no; then -+ AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe]) -+ need_locks=warn -+ fi -+else -+ need_locks=no -+fi -+_LT_DECL([], [need_locks], [1], [Must we lock files when doing compilation?]) -+])# _LT_COMPILER_FILE_LOCKS -+ -+ -+# _LT_CHECK_OBJDIR -+# ---------------- -+m4_defun([_LT_CHECK_OBJDIR], -+[AC_CACHE_CHECK([for objdir], [lt_cv_objdir], -+[rm -f .libs 2>/dev/null -+mkdir .libs 2>/dev/null -+if test -d .libs; then -+ lt_cv_objdir=.libs -+else -+ # MS-DOS does not allow filenames that begin with a dot. -+ lt_cv_objdir=_libs -+fi -+rmdir .libs 2>/dev/null]) -+objdir=$lt_cv_objdir -+_LT_DECL([], [objdir], [0], -+ [The name of the directory that contains temporary libtool files])dnl -+m4_pattern_allow([LT_OBJDIR])dnl -+AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/", -+ [Define to the sub-directory in which libtool stores uninstalled libraries.]) -+])# _LT_CHECK_OBJDIR -+ -+ -+# _LT_LINKER_HARDCODE_LIBPATH([TAGNAME]) -+# -------------------------------------- -+# Check hardcoding attributes. -+m4_defun([_LT_LINKER_HARDCODE_LIBPATH], -+[AC_MSG_CHECKING([how to hardcode library paths into programs]) -+_LT_TAGVAR(hardcode_action, $1)= -+if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" || -+ test -n "$_LT_TAGVAR(runpath_var, $1)" || -+ test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then -+ -+ # We can hardcode non-existent directories. -+ if test "$_LT_TAGVAR(hardcode_direct, $1)" != no && -+ # If the only mechanism to avoid hardcoding is shlibpath_var, we -+ # have to relink, otherwise we might link with an installed library -+ # when we should be linking with a yet-to-be-installed one -+ ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no && -+ test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then -+ # Linking always hardcodes the temporary library directory. -+ _LT_TAGVAR(hardcode_action, $1)=relink -+ else -+ # We can link without hardcoding, and we can hardcode nonexisting dirs. -+ _LT_TAGVAR(hardcode_action, $1)=immediate -+ fi -+else -+ # We cannot hardcode anything, or else we can only hardcode existing -+ # directories. -+ _LT_TAGVAR(hardcode_action, $1)=unsupported -+fi -+AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)]) -+ -+if test "$_LT_TAGVAR(hardcode_action, $1)" = relink || -+ test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then -+ # Fast installation is not supported -+ enable_fast_install=no -+elif test "$shlibpath_overrides_runpath" = yes || -+ test "$enable_shared" = no; then -+ # Fast installation is not necessary -+ enable_fast_install=needless -+fi -+_LT_TAGDECL([], [hardcode_action], [0], -+ [How to hardcode a shared library path into an executable]) -+])# _LT_LINKER_HARDCODE_LIBPATH -+ -+ -+# _LT_CMD_STRIPLIB -+# ---------------- -+m4_defun([_LT_CMD_STRIPLIB], -+[m4_require([_LT_DECL_EGREP]) -+striplib= -+old_striplib= -+AC_MSG_CHECKING([whether stripping libraries is possible]) -+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then -+ test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" -+ test -z "$striplib" && striplib="$STRIP --strip-unneeded" -+ AC_MSG_RESULT([yes]) -+else -+# FIXME - insert some real tests, host_os isn't really good enough -+ case $host_os in -+ darwin*) -+ if test -n "$STRIP" ; then -+ striplib="$STRIP -x" -+ old_striplib="$STRIP -S" -+ AC_MSG_RESULT([yes]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ ;; -+ *) -+ AC_MSG_RESULT([no]) -+ ;; -+ esac -+fi -+_LT_DECL([], [old_striplib], [1], [Commands to strip libraries]) -+_LT_DECL([], [striplib], [1]) -+])# _LT_CMD_STRIPLIB -+ -+ -+# _LT_SYS_DYNAMIC_LINKER([TAG]) -+# ----------------------------- -+# PORTME Fill in your ld.so characteristics -+m4_defun([_LT_SYS_DYNAMIC_LINKER], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_OBJDUMP])dnl -+m4_require([_LT_DECL_SED])dnl -+AC_MSG_CHECKING([dynamic linker characteristics]) -+m4_if([$1], -+ [], [ -+if test "$GCC" = yes; then -+ case $host_os in -+ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;; -+ *) lt_awk_arg="/^libraries:/" ;; -+ esac -+ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then -+ # if the path contains ";" then we assume it to be the separator -+ # otherwise default to the standard path separator (i.e. ":") - it is -+ # assumed that no part of a normal pathname contains ";" but that should -+ # okay in the real world where ";" in dirpaths is itself problematic. -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ # Ok, now we have the path, separated by spaces, we can step through it -+ # and add multilib dir if necessary. -+ lt_tmp_lt_search_path_spec= -+ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null` -+ for lt_sys_path in $lt_search_path_spec; do -+ if test -d "$lt_sys_path/$lt_multi_os_dir"; then -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir" -+ else -+ test -d "$lt_sys_path" && \ -+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path" -+ fi -+ done -+ lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk ' -+BEGIN {RS=" "; FS="/|\n";} { -+ lt_foo=""; -+ lt_count=0; -+ for (lt_i = NF; lt_i > 0; lt_i--) { -+ if ($lt_i != "" && $lt_i != ".") { -+ if ($lt_i == "..") { -+ lt_count++; -+ } else { -+ if (lt_count == 0) { -+ lt_foo="/" $lt_i lt_foo; -+ } else { -+ lt_count--; -+ } -+ } -+ } -+ } -+ if (lt_foo != "") { lt_freq[[lt_foo]]++; } -+ if (lt_freq[[lt_foo]] == 1) { print lt_foo; } -+}'` -+ sys_lib_search_path_spec=`$ECHO $lt_search_path_spec` -+else -+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib" -+fi]) -+library_names_spec= -+libname_spec='lib$name' -+soname_spec= -+shrext_cmds=".so" -+postinstall_cmds= -+postuninstall_cmds= -+finish_cmds= -+finish_eval= -+shlibpath_var= -+shlibpath_overrides_runpath=unknown -+version_type=none -+dynamic_linker="$host_os ld.so" -+sys_lib_dlsearch_path_spec="/lib /usr/lib" -+need_lib_prefix=unknown -+hardcode_into_libs=no -+ -+# when you set need_version to no, make sure it does not cause -set_version -+# flags to be left without arguments -+need_version=unknown -+ -+case $host_os in -+aix3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a' -+ shlibpath_var=LIBPATH -+ -+ # AIX 3 has no versioning support, so we append a major version to the name. -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ -+aix[[4-9]]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ hardcode_into_libs=yes -+ if test "$host_cpu" = ia64; then -+ # AIX 5 supports IA64 -+ library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ else -+ # With GCC up to 2.95.x, collect2 would create an import file -+ # for dependence libraries. The import file would start with -+ # the line `#! .'. This would cause the generated library to -+ # depend on `.', always an invalid library. This was fixed in -+ # development snapshots of GCC prior to 3.0. -+ case $host_os in -+ aix4 | aix4.[[01]] | aix4.[[01]].*) -+ if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)' -+ echo ' yes ' -+ echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then -+ : -+ else -+ can_build_shared=no -+ fi -+ ;; -+ esac -+ # AIX (on Power*) has no versioning support, so currently we can not hardcode correct -+ # soname into executable. Probably we can add versioning support to -+ # collect2, so additional links can be useful in future. -+ if test "$aix_use_runtimelinking" = yes; then -+ # If using run time linking (on AIX 4.2 or later) use lib.so -+ # instead of lib.a to let people know that these are not -+ # typical AIX shared libraries. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ else -+ # We preserve .a as extension for shared libraries through AIX4.2 -+ # and later when we are not doing run time linking. -+ library_names_spec='${libname}${release}.a $libname.a' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ fi -+ shlibpath_var=LIBPATH -+ fi -+ ;; -+ -+amigaos*) -+ case $host_cpu in -+ powerpc) -+ # Since July 2007 AmigaOS4 officially supports .so libraries. -+ # When compiling the executable, add -use-dynld -Lsobjs: to the compileline. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ ;; -+ m68k) -+ library_names_spec='$libname.ixlibrary $libname.a' -+ # Create ${libname}_ixlibrary.a entries in /sys/libs. -+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done' -+ ;; -+ esac -+ ;; -+ -+beos*) -+ library_names_spec='${libname}${shared_ext}' -+ dynamic_linker="$host_os ld.so" -+ shlibpath_var=LIBRARY_PATH -+ ;; -+ -+bsdi[[45]]*) -+ version_type=linux -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib" -+ sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib" -+ # the default ld.so.conf also contains /usr/contrib/lib and -+ # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow -+ # libtool to hard-code these into programs -+ ;; -+ -+cygwin* | mingw* | pw32* | cegcc*) -+ version_type=windows -+ shrext_cmds=".dll" -+ need_version=no -+ need_lib_prefix=no -+ -+ case $GCC,$host_os in -+ yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*) -+ library_names_spec='$libname.dll.a' -+ # DLL is installed to $(libdir)/../bin by postinstall_cmds -+ postinstall_cmds='base_file=`basename \${file}`~ -+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~ -+ dldir=$destdir/`dirname \$dlpath`~ -+ test -d \$dldir || mkdir -p \$dldir~ -+ $install_prog $dir/$dlname \$dldir/$dlname~ -+ chmod a+x \$dldir/$dlname~ -+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then -+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?; -+ fi' -+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~ -+ dlpath=$dir/\$dldll~ -+ $RM \$dlpath' -+ shlibpath_overrides_runpath=yes -+ -+ case $host_os in -+ cygwin*) -+ # Cygwin DLLs use 'cyg' prefix rather than 'lib' -+ soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib" -+ ;; -+ mingw* | cegcc*) -+ # MinGW DLLs use traditional 'lib' prefix -+ soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"` -+ if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then -+ # It is most probably a Windows format PATH printed by -+ # mingw gcc, but we are running on Cygwin. Gcc prints its search -+ # path with ; separators, and with drive letters. We can handle the -+ # drive letters (cygwin fileutils understands them), so leave them, -+ # especially as we might pass files found there to a mingw objdump, -+ # which wouldn't understand a cygwinified path. Ahh. -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'` -+ else -+ sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"` -+ fi -+ ;; -+ pw32*) -+ # pw32 DLLs use 'pw' prefix rather than 'lib' -+ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}' -+ ;; -+ esac -+ ;; -+ -+ *) -+ library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib' -+ ;; -+ esac -+ dynamic_linker='Win32 ld.exe' -+ # FIXME: first we should search . and the directory the executable is in -+ shlibpath_var=PATH -+ ;; -+ -+darwin* | rhapsody*) -+ dynamic_linker="$host_os dyld" -+ version_type=darwin -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext' -+ soname_spec='${libname}${release}${major}$shared_ext' -+ shlibpath_overrides_runpath=yes -+ shlibpath_var=DYLD_LIBRARY_PATH -+ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`' -+m4_if([$1], [],[ -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"]) -+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib' -+ ;; -+ -+dgux*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+freebsd1*) -+ dynamic_linker=no -+ ;; -+ -+freebsd* | dragonfly*) -+ # DragonFly does not have aout. When/if they implement a new -+ # versioning mechanism, adjust this. -+ if test -x /usr/bin/objformat; then -+ objformat=`/usr/bin/objformat` -+ else -+ case $host_os in -+ freebsd[[123]]*) objformat=aout ;; -+ *) objformat=elf ;; -+ esac -+ fi -+ version_type=freebsd-$objformat -+ case $version_type in -+ freebsd-elf*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ need_version=no -+ need_lib_prefix=no -+ ;; -+ freebsd-*) -+ library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix' -+ need_version=yes -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_os in -+ freebsd2*) -+ shlibpath_overrides_runpath=yes -+ ;; -+ freebsd3.[[01]]* | freebsdelf3.[[01]]*) -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \ -+ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1) -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ *) # from 4.6 on, and DragonFly -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ esac -+ ;; -+ -+gnu*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ hardcode_into_libs=yes -+ ;; -+ -+hpux9* | hpux10* | hpux11*) -+ # Give a soname corresponding to the major version so that dld.sl refuses to -+ # link against other versions. -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ case $host_cpu in -+ ia64*) -+ shrext_cmds='.so' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.so" -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ if test "X$HPUX_IA64_MODE" = X32; then -+ sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib" -+ else -+ sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64" -+ fi -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ hppa*64*) -+ shrext_cmds='.sl' -+ hardcode_into_libs=yes -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH -+ shlibpath_overrides_runpath=yes # Unless +noenvvar is specified. -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64" -+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec -+ ;; -+ *) -+ shrext_cmds='.sl' -+ dynamic_linker="$host_os dld.sl" -+ shlibpath_var=SHLIB_PATH -+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ ;; -+ esac -+ # HP-UX runs *really* slowly unless shared libraries are mode 555. -+ postinstall_cmds='chmod 555 $lib' -+ ;; -+ -+interix[[3-9]]*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $host_os in -+ nonstopux*) version_type=nonstopux ;; -+ *) -+ if test "$lt_cv_prog_gnu_ld" = yes; then -+ version_type=linux -+ else -+ version_type=irix -+ fi ;; -+ esac -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}' -+ case $host_os in -+ irix5* | nonstopux*) -+ libsuff= shlibsuff= -+ ;; -+ *) -+ case $LD in # libtool.m4 will add one of these switches to LD -+ *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ") -+ libsuff= shlibsuff= libmagic=32-bit;; -+ *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ") -+ libsuff=32 shlibsuff=N32 libmagic=N32;; -+ *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ") -+ libsuff=64 shlibsuff=64 libmagic=64-bit;; -+ *) libsuff= shlibsuff= libmagic=never-match;; -+ esac -+ ;; -+ esac -+ shlibpath_var=LD_LIBRARY${shlibsuff}_PATH -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}" -+ sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}" -+ hardcode_into_libs=yes -+ ;; -+ -+# No shared lib support for Linux oldld, aout, or coff. -+linux*oldld* | linux*aout* | linux*coff*) -+ dynamic_linker=no -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ # Some binutils ld are patched to set DT_RUNPATH -+ save_LDFLAGS=$LDFLAGS -+ save_libdir=$libdir -+ eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \ -+ LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\"" -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])], -+ [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null], -+ [shlibpath_overrides_runpath=yes])]) -+ LDFLAGS=$save_LDFLAGS -+ libdir=$save_libdir -+ -+ # This implies no fast_install, which is unacceptable. -+ # Some rework will be needed to allow for fast_install -+ # before this can be enabled. -+ hardcode_into_libs=yes -+ -+ # Add ABI-specific directories to the system library path. -+ sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib" -+ -+ # Append ld.so.conf contents to the search path -+ if test -f /etc/ld.so.conf; then -+ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '` -+ sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra" -+ fi -+ -+ # We used to test for /lib/ld.so.1 and disable shared libraries on -+ # powerpc, because MkLinux only supported shared libraries with the -+ # GNU dynamic linker. Since this was broken with cross compilers, -+ # most powerpc-linux boxes support dynamic linking these days and -+ # people can always --disable-shared, the test was removed, and we -+ # assume the GNU/Linux dynamic linker is in use. -+ dynamic_linker='GNU/Linux ld.so' -+ ;; -+ -+netbsd*) -+ version_type=sunos -+ need_lib_prefix=no -+ need_version=no -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ dynamic_linker='NetBSD (a.out) ld.so' -+ else -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ dynamic_linker='NetBSD ld.elf_so' -+ fi -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ ;; -+ -+newsos6) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ ;; -+ -+*nto* | *qnx*) -+ version_type=qnx -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ dynamic_linker='ldqnx.so' -+ ;; -+ -+openbsd*) -+ version_type=sunos -+ sys_lib_dlsearch_path_spec="/usr/lib" -+ need_lib_prefix=no -+ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs. -+ case $host_os in -+ openbsd3.3 | openbsd3.3.*) need_version=yes ;; -+ *) need_version=no ;; -+ esac -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ case $host_os in -+ openbsd2.[[89]] | openbsd2.[[89]].*) -+ shlibpath_overrides_runpath=no -+ ;; -+ *) -+ shlibpath_overrides_runpath=yes -+ ;; -+ esac -+ else -+ shlibpath_overrides_runpath=yes -+ fi -+ ;; -+ -+os2*) -+ libname_spec='$name' -+ shrext_cmds=".dll" -+ need_lib_prefix=no -+ library_names_spec='$libname${shared_ext} $libname.a' -+ dynamic_linker='OS/2 ld.exe' -+ shlibpath_var=LIBPATH -+ ;; -+ -+osf3* | osf4* | osf5*) -+ version_type=osf -+ need_lib_prefix=no -+ need_version=no -+ soname_spec='${libname}${release}${shared_ext}$major' -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib" -+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec" -+ ;; -+ -+rdos*) -+ dynamic_linker=no -+ ;; -+ -+solaris*) -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ # ldd complains unless libraries are executable -+ postinstall_cmds='chmod +x $lib' -+ ;; -+ -+sunos4*) -+ version_type=sunos -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' -+ finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ if test "$with_gnu_ld" = yes; then -+ need_lib_prefix=no -+ fi -+ need_version=yes -+ ;; -+ -+sysv4 | sysv4.3*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ case $host_vendor in -+ sni) -+ shlibpath_overrides_runpath=no -+ need_lib_prefix=no -+ runpath_var=LD_RUN_PATH -+ ;; -+ siemens) -+ need_lib_prefix=no -+ ;; -+ motorola) -+ need_lib_prefix=no -+ need_version=no -+ shlibpath_overrides_runpath=no -+ sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib' -+ ;; -+ esac -+ ;; -+ -+sysv4*MP*) -+ if test -d /usr/nec ;then -+ version_type=linux -+ library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}' -+ soname_spec='$libname${shared_ext}.$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ fi -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ version_type=freebsd-elf -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=yes -+ hardcode_into_libs=yes -+ if test "$with_gnu_ld" = yes; then -+ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib' -+ else -+ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib' -+ case $host_os in -+ sco3.2v5*) -+ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib" -+ ;; -+ esac -+ fi -+ sys_lib_dlsearch_path_spec='/usr/lib' -+ ;; -+ -+tpf*) -+ # TPF is a cross-target only. Preferred cross-host = GNU/Linux. -+ version_type=linux -+ need_lib_prefix=no -+ need_version=no -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ shlibpath_var=LD_LIBRARY_PATH -+ shlibpath_overrides_runpath=no -+ hardcode_into_libs=yes -+ ;; -+ -+uts4*) -+ version_type=linux -+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}' -+ soname_spec='${libname}${release}${shared_ext}$major' -+ shlibpath_var=LD_LIBRARY_PATH -+ ;; -+ -+*) -+ dynamic_linker=no -+ ;; -+esac -+AC_MSG_RESULT([$dynamic_linker]) -+test "$dynamic_linker" = no && can_build_shared=no -+ -+variables_saved_for_relink="PATH $shlibpath_var $runpath_var" -+if test "$GCC" = yes; then -+ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH" -+fi -+ -+if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then -+ sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec" -+fi -+if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then -+ sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec" -+fi -+ -+_LT_DECL([], [variables_saved_for_relink], [1], -+ [Variables whose values should be saved in libtool wrapper scripts and -+ restored at link time]) -+_LT_DECL([], [need_lib_prefix], [0], -+ [Do we need the "lib" prefix for modules?]) -+_LT_DECL([], [need_version], [0], [Do we need a version for libraries?]) -+_LT_DECL([], [version_type], [0], [Library versioning type]) -+_LT_DECL([], [runpath_var], [0], [Shared library runtime path variable]) -+_LT_DECL([], [shlibpath_var], [0],[Shared library path variable]) -+_LT_DECL([], [shlibpath_overrides_runpath], [0], -+ [Is shlibpath searched before the hard-coded library search path?]) -+_LT_DECL([], [libname_spec], [1], [Format of library name prefix]) -+_LT_DECL([], [library_names_spec], [1], -+ [[List of archive names. First name is the real one, the rest are links. -+ The last name is the one that the linker finds with -lNAME]]) -+_LT_DECL([], [soname_spec], [1], -+ [[The coded name of the library, if different from the real name]]) -+_LT_DECL([], [postinstall_cmds], [2], -+ [Command to use after installation of a shared archive]) -+_LT_DECL([], [postuninstall_cmds], [2], -+ [Command to use after uninstallation of a shared archive]) -+_LT_DECL([], [finish_cmds], [2], -+ [Commands used to finish a libtool library installation in a directory]) -+_LT_DECL([], [finish_eval], [1], -+ [[As "finish_cmds", except a single script fragment to be evaled but -+ not shown]]) -+_LT_DECL([], [hardcode_into_libs], [0], -+ [Whether we should hardcode library paths into libraries]) -+_LT_DECL([], [sys_lib_search_path_spec], [2], -+ [Compile-time system search path for libraries]) -+_LT_DECL([], [sys_lib_dlsearch_path_spec], [2], -+ [Run-time system search path for libraries]) -+])# _LT_SYS_DYNAMIC_LINKER -+ -+ -+# _LT_PATH_TOOL_PREFIX(TOOL) -+# -------------------------- -+# find a file program which can recognize shared library -+AC_DEFUN([_LT_PATH_TOOL_PREFIX], -+[m4_require([_LT_DECL_EGREP])dnl -+AC_MSG_CHECKING([for $1]) -+AC_CACHE_VAL(lt_cv_path_MAGIC_CMD, -+[case $MAGIC_CMD in -+[[\\/*] | ?:[\\/]*]) -+ lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path. -+ ;; -+*) -+ lt_save_MAGIC_CMD="$MAGIC_CMD" -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+dnl $ac_dummy forces splitting on constant user-supplied paths. -+dnl POSIX.2 word splitting is done only on the output of word expansions, -+dnl not every word. This closes a longstanding sh security hole. -+ ac_dummy="m4_if([$2], , $PATH, [$2])" -+ for ac_dir in $ac_dummy; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$1; then -+ lt_cv_path_MAGIC_CMD="$ac_dir/$1" -+ if test -n "$file_magic_test_file"; then -+ case $deplibs_check_method in -+ "file_magic "*) -+ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"` -+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null | -+ $EGREP "$file_magic_regex" > /dev/null; then -+ : -+ else -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: the command libtool uses to detect shared libraries, -+*** $file_magic_cmd, produces output that libtool cannot recognize. -+*** The result is that libtool may fail to recognize shared libraries -+*** as such. This will affect the creation of libtool libraries that -+*** depend on shared libraries, but programs linked with such libtool -+*** libraries will work regardless of this problem. Nevertheless, you -+*** may want to report the problem to your system manager and/or to -+*** bug-libtool@gnu.org -+ -+_LT_EOF -+ fi ;; -+ esac -+ fi -+ break -+ fi -+ done -+ IFS="$lt_save_ifs" -+ MAGIC_CMD="$lt_save_MAGIC_CMD" -+ ;; -+esac]) -+MAGIC_CMD="$lt_cv_path_MAGIC_CMD" -+if test -n "$MAGIC_CMD"; then -+ AC_MSG_RESULT($MAGIC_CMD) -+else -+ AC_MSG_RESULT(no) -+fi -+_LT_DECL([], [MAGIC_CMD], [0], -+ [Used to examine libraries when file_magic_cmd begins with "file"])dnl -+])# _LT_PATH_TOOL_PREFIX -+ -+# Old name: -+AU_ALIAS([AC_PATH_TOOL_PREFIX], [_LT_PATH_TOOL_PREFIX]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], []) -+ -+ -+# _LT_PATH_MAGIC -+# -------------- -+# find a file program which can recognize a shared library -+m4_defun([_LT_PATH_MAGIC], -+[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH) -+if test -z "$lt_cv_path_MAGIC_CMD"; then -+ if test -n "$ac_tool_prefix"; then -+ _LT_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH) -+ else -+ MAGIC_CMD=: -+ fi -+fi -+])# _LT_PATH_MAGIC -+ -+ -+# LT_PATH_LD -+# ---------- -+# find the pathname to the GNU or non-GNU linker -+AC_DEFUN([LT_PATH_LD], -+[AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_CANONICAL_BUILD])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_DECL_EGREP])dnl -+ -+AC_ARG_WITH([gnu-ld], -+ [AS_HELP_STRING([--with-gnu-ld], -+ [assume the C compiler uses GNU ld @<:@default=no@:>@])], -+ [test "$withval" = no || with_gnu_ld=yes], -+ [with_gnu_ld=no])dnl -+ -+ac_prog=ld -+if test "$GCC" = yes; then -+ # Check if gcc -print-prog-name=ld gives a path. -+ AC_MSG_CHECKING([for ld used by $CC]) -+ case $host in -+ *-*-mingw*) -+ # gcc leaves a trailing carriage return which upsets mingw -+ ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -+ *) -+ ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -+ esac -+ case $ac_prog in -+ # Accept absolute paths. -+ [[\\/]]* | ?:[[\\/]]*) -+ re_direlt='/[[^/]][[^/]]*/\.\./' -+ # Canonicalize the pathname of ld -+ ac_prog=`$ECHO "$ac_prog"| $SED 's%\\\\%/%g'` -+ while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do -+ ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"` -+ done -+ test -z "$LD" && LD="$ac_prog" -+ ;; -+ "") -+ # If it fails, then pretend we aren't using GCC. -+ ac_prog=ld -+ ;; -+ *) -+ # If it is relative, then search for the first ld in PATH. -+ with_gnu_ld=unknown -+ ;; -+ esac -+elif test "$with_gnu_ld" = yes; then -+ AC_MSG_CHECKING([for GNU ld]) -+else -+ AC_MSG_CHECKING([for non-GNU ld]) -+fi -+AC_CACHE_VAL(lt_cv_path_LD, -+[if test -z "$LD"; then -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -+ lt_cv_path_LD="$ac_dir/$ac_prog" -+ # Check to see if the program is GNU ld. I'd rather use --version, -+ # but apparently some variants of GNU ld only accept -v. -+ # Break only if it was the GNU/non-GNU ld that we prefer. -+ case `"$lt_cv_path_LD" -v 2>&1 &1 /dev/null 2>&1; then -+ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL' -+ lt_cv_file_magic_cmd='func_win32_libid' -+ else -+ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ fi -+ ;; -+ -+cegcc) -+ # use the weaker test based on 'objdump'. See mingw*. -+ lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?' -+ lt_cv_file_magic_cmd='$OBJDUMP -f' -+ ;; -+ -+darwin* | rhapsody*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+freebsd* | dragonfly*) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then -+ case $host_cpu in -+ i*86 ) -+ # Not sure whether the presence of OpenBSD here was a mistake. -+ # Let's accept both of them until this is cleared up. -+ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*` -+ ;; -+ esac -+ else -+ lt_cv_deplibs_check_method=pass_all -+ fi -+ ;; -+ -+gnu*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+hpux10.20* | hpux11*) -+ lt_cv_file_magic_cmd=/usr/bin/file -+ case $host_cpu in -+ ia64*) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64' -+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so -+ ;; -+ hppa*64*) -+ [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'] -+ lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl -+ ;; -+ *) -+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library' -+ lt_cv_file_magic_test_file=/usr/lib/libc.sl -+ ;; -+ esac -+ ;; -+ -+interix[[3-9]]*) -+ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$' -+ ;; -+ -+irix5* | irix6* | nonstopux*) -+ case $LD in -+ *-32|*"-32 ") libmagic=32-bit;; -+ *-n32|*"-n32 ") libmagic=N32;; -+ *-64|*"-64 ") libmagic=64-bit;; -+ *) libmagic=never-match;; -+ esac -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+# This must be Linux ELF. -+linux* | k*bsd*-gnu) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+netbsd*) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$' -+ fi -+ ;; -+ -+newos6*) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)' -+ lt_cv_file_magic_cmd=/usr/bin/file -+ lt_cv_file_magic_test_file=/usr/lib/libnls.so -+ ;; -+ -+*nto* | *qnx*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+openbsd*) -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$' -+ else -+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$' -+ fi -+ ;; -+ -+osf3* | osf4* | osf5*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+rdos*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+solaris*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ -+sysv4 | sysv4.3*) -+ case $host_vendor in -+ motorola) -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]' -+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*` -+ ;; -+ ncr) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ sequent) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' -+ ;; -+ sni) -+ lt_cv_file_magic_cmd='/bin/file' -+ lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib" -+ lt_cv_file_magic_test_file=/lib/libc.so -+ ;; -+ siemens) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ pc) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+ esac -+ ;; -+ -+tpf*) -+ lt_cv_deplibs_check_method=pass_all -+ ;; -+esac -+]) -+file_magic_cmd=$lt_cv_file_magic_cmd -+deplibs_check_method=$lt_cv_deplibs_check_method -+test -z "$deplibs_check_method" && deplibs_check_method=unknown -+ -+_LT_DECL([], [deplibs_check_method], [1], -+ [Method to check whether dependent libraries are shared objects]) -+_LT_DECL([], [file_magic_cmd], [1], -+ [Command to use when deplibs_check_method == "file_magic"]) -+])# _LT_CHECK_MAGIC_METHOD -+ -+ -+# LT_PATH_NM -+# ---------- -+# find the pathname to a BSD- or MS-compatible name lister -+AC_DEFUN([LT_PATH_NM], -+[AC_REQUIRE([AC_PROG_CC])dnl -+AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM, -+[if test -n "$NM"; then -+ # Let the user override the test. -+ lt_cv_path_NM="$NM" -+else -+ lt_nm_to_check="${ac_tool_prefix}nm" -+ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then -+ lt_nm_to_check="$lt_nm_to_check nm" -+ fi -+ for lt_tmp_nm in $lt_nm_to_check; do -+ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR -+ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do -+ IFS="$lt_save_ifs" -+ test -z "$ac_dir" && ac_dir=. -+ tmp_nm="$ac_dir/$lt_tmp_nm" -+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then -+ # Check to see if the nm accepts a BSD-compat flag. -+ # Adding the `sed 1q' prevents false positives on HP-UX, which says: -+ # nm: unknown option "B" ignored -+ # Tru64's nm complains that /dev/null is an invalid object file -+ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in -+ */dev/null* | *'Invalid file or object type'*) -+ lt_cv_path_NM="$tmp_nm -B" -+ break -+ ;; -+ *) -+ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in -+ */dev/null*) -+ lt_cv_path_NM="$tmp_nm -p" -+ break -+ ;; -+ *) -+ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but -+ continue # so that we can try to find one that supports BSD flags -+ ;; -+ esac -+ ;; -+ esac -+ fi -+ done -+ IFS="$lt_save_ifs" -+ done -+ : ${lt_cv_path_NM=no} -+fi]) -+if test "$lt_cv_path_NM" != "no"; then -+ NM="$lt_cv_path_NM" -+else -+ # Didn't find any BSD compatible name lister, look for dumpbin. -+ AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :) -+ AC_SUBST([DUMPBIN]) -+ if test "$DUMPBIN" != ":"; then -+ NM="$DUMPBIN" -+ fi -+fi -+test -z "$NM" && NM=nm -+AC_SUBST([NM]) -+_LT_DECL([], [NM], [1], [A BSD- or MS-compatible name lister])dnl -+ -+AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface], -+ [lt_cv_nm_interface="BSD nm" -+ echo "int some_variable = 0;" > conftest.$ac_ext -+ (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$ac_compile" 2>conftest.err) -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD) -+ (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out) -+ cat conftest.err >&AS_MESSAGE_LOG_FD -+ (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD) -+ cat conftest.out >&AS_MESSAGE_LOG_FD -+ if $GREP 'External.*some_variable' conftest.out > /dev/null; then -+ lt_cv_nm_interface="MS dumpbin" -+ fi -+ rm -f conftest*]) -+])# LT_PATH_NM -+ -+# Old names: -+AU_ALIAS([AM_PROG_NM], [LT_PATH_NM]) -+AU_ALIAS([AC_PROG_NM], [LT_PATH_NM]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_PROG_NM], []) -+dnl AC_DEFUN([AC_PROG_NM], []) -+ -+ -+# LT_LIB_M -+# -------- -+# check for math library -+AC_DEFUN([LT_LIB_M], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+LIBM= -+case $host in -+*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*) -+ # These system don't have libm, or don't need it -+ ;; -+*-ncr-sysv4.3*) -+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") -+ AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm") -+ ;; -+*) -+ AC_CHECK_LIB(m, cos, LIBM="-lm") -+ ;; -+esac -+AC_SUBST([LIBM]) -+])# LT_LIB_M -+ -+# Old name: -+AU_ALIAS([AC_CHECK_LIBM], [LT_LIB_M]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_CHECK_LIBM], []) -+ -+ -+# _LT_COMPILER_NO_RTTI([TAGNAME]) -+# ------------------------------- -+m4_defun([_LT_COMPILER_NO_RTTI], -+[m4_require([_LT_TAG_COMPILER])dnl -+ -+_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ -+if test "$GCC" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ -+ _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions], -+ lt_cv_prog_compiler_rtti_exceptions, -+ [-fno-rtti -fno-exceptions], [], -+ [_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"]) -+fi -+_LT_TAGDECL([no_builtin_flag], [lt_prog_compiler_no_builtin_flag], [1], -+ [Compiler flag to turn off builtin functions]) -+])# _LT_COMPILER_NO_RTTI -+ -+ -+# _LT_CMD_GLOBAL_SYMBOLS -+# ---------------------- -+m4_defun([_LT_CMD_GLOBAL_SYMBOLS], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+AC_REQUIRE([AC_PROG_CC])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+AC_REQUIRE([LT_PATH_LD])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_TAG_COMPILER])dnl -+ -+# Check for command to grab the raw symbol name followed by C symbol from nm. -+AC_MSG_CHECKING([command to parse $NM output from $compiler object]) -+AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe], -+[ -+# These are sane defaults that work on at least a few old systems. -+# [They come from Ultrix. What could be older than Ultrix?!! ;)] -+ -+# Character class describing NM global symbol codes. -+symcode='[[BCDEGRST]]' -+ -+# Regexp to match symbols that can be accessed directly from C. -+sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)' -+ -+# Define system-specific variables. -+case $host_os in -+aix*) -+ symcode='[[BCDT]]' -+ ;; -+cygwin* | mingw* | pw32* | cegcc*) -+ symcode='[[ABCDGISTW]]' -+ ;; -+hpux*) -+ if test "$host_cpu" = ia64; then -+ symcode='[[ABCDEGRST]]' -+ fi -+ ;; -+irix* | nonstopux*) -+ symcode='[[BCDEGRST]]' -+ ;; -+osf*) -+ symcode='[[BCDEGQRST]]' -+ ;; -+solaris*) -+ symcode='[[BDRT]]' -+ ;; -+sco3.2v5*) -+ symcode='[[DT]]' -+ ;; -+sysv4.2uw2*) -+ symcode='[[DT]]' -+ ;; -+sysv5* | sco5v6* | unixware* | OpenUNIX*) -+ symcode='[[ABDT]]' -+ ;; -+sysv4) -+ symcode='[[DFNSTU]]' -+ ;; -+esac -+ -+# If we're using GNU nm, then use its standard symbol codes. -+case `$NM -V 2>&1` in -+*GNU* | *'with BFD'*) -+ symcode='[[ABCDGIRSTW]]' ;; -+esac -+ -+# Transform an extracted symbol line into a proper C declaration. -+# Some systems (esp. on ia64) link data and code symbols differently, -+# so use this general approach. -+lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'" -+ -+# Transform an extracted symbol line into symbol name and symbol address -+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'" -+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'" -+ -+# Handle CRLF in mingw tool chain -+opt_cr= -+case $build_os in -+mingw*) -+ opt_cr=`$ECHO 'x\{0,1\}' | tr x '\015'` # option cr in regexp -+ ;; -+esac -+ -+# Try without a prefix underscore, then with it. -+for ac_symprfx in "" "_"; do -+ -+ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol. -+ symxfrm="\\1 $ac_symprfx\\2 \\2" -+ -+ # Write the raw and C identifiers. -+ if test "$lt_cv_nm_interface" = "MS dumpbin"; then -+ # Fake it for dumpbin and say T for any non-static function -+ # and D for any global variable. -+ # Also find C++ and __fastcall symbols from MSVC++, -+ # which start with @ or ?. -+ lt_cv_sys_global_symbol_pipe="$AWK ['"\ -+" {last_section=section; section=\$ 3};"\ -+" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\ -+" \$ 0!~/External *\|/{next};"\ -+" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\ -+" {if(hide[section]) next};"\ -+" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\ -+" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\ -+" s[1]~/^[@?]/{print s[1], s[1]; next};"\ -+" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\ -+" ' prfx=^$ac_symprfx]" -+ else -+ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'" -+ fi -+ -+ # Check to see that the pipe works correctly. -+ pipe_works=no -+ -+ rm -f conftest* -+ cat > conftest.$ac_ext <<_LT_EOF -+#ifdef __cplusplus -+extern "C" { -+#endif -+char nm_test_var; -+void nm_test_func(void); -+void nm_test_func(void){} -+#ifdef __cplusplus -+} -+#endif -+int main(){nm_test_var='a';nm_test_func();return(0);} -+_LT_EOF -+ -+ if AC_TRY_EVAL(ac_compile); then -+ # Now try to grab the symbols. -+ nlist=conftest.nm -+ if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then -+ # Try sorting and uniquifying the output. -+ if sort "$nlist" | uniq > "$nlist"T; then -+ mv -f "$nlist"T "$nlist" -+ else -+ rm -f "$nlist"T -+ fi -+ -+ # Make sure that we snagged all the symbols we need. -+ if $GREP ' nm_test_var$' "$nlist" >/dev/null; then -+ if $GREP ' nm_test_func$' "$nlist" >/dev/null; then -+ cat <<_LT_EOF > conftest.$ac_ext -+#ifdef __cplusplus -+extern "C" { -+#endif -+ -+_LT_EOF -+ # Now generate the symbol file. -+ eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | $GREP -v main >> conftest.$ac_ext' -+ -+ cat <<_LT_EOF >> conftest.$ac_ext -+ -+/* The mapping between symbol names and symbols. */ -+const struct { -+ const char *name; -+ void *address; -+} -+lt__PROGRAM__LTX_preloaded_symbols[[]] = -+{ -+ { "@PROGRAM@", (void *) 0 }, -+_LT_EOF -+ $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext -+ cat <<\_LT_EOF >> conftest.$ac_ext -+ {0, (void *) 0} -+}; -+ -+/* This works around a problem in FreeBSD linker */ -+#ifdef FREEBSD_WORKAROUND -+static const void *lt_preloaded_setup() { -+ return lt__PROGRAM__LTX_preloaded_symbols; -+} -+#endif -+ -+#ifdef __cplusplus -+} -+#endif -+_LT_EOF -+ # Now try linking the two files. -+ mv conftest.$ac_objext conftstm.$ac_objext -+ lt_save_LIBS="$LIBS" -+ lt_save_CFLAGS="$CFLAGS" -+ LIBS="conftstm.$ac_objext" -+ CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)" -+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then -+ pipe_works=yes -+ fi -+ LIBS="$lt_save_LIBS" -+ CFLAGS="$lt_save_CFLAGS" -+ else -+ echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD -+ fi -+ else -+ echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD -+ cat conftest.$ac_ext >&5 -+ fi -+ rm -rf conftest* conftst* -+ -+ # Do not use the global_symbol_pipe unless it works. -+ if test "$pipe_works" = yes; then -+ break -+ else -+ lt_cv_sys_global_symbol_pipe= -+ fi -+done -+]) -+if test -z "$lt_cv_sys_global_symbol_pipe"; then -+ lt_cv_sys_global_symbol_to_cdecl= -+fi -+if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then -+ AC_MSG_RESULT(failed) -+else -+ AC_MSG_RESULT(ok) -+fi -+ -+_LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1], -+ [Take the output of nm and produce a listing of raw symbols and C names]) -+_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1], -+ [Transform the output of nm in a proper C declaration]) -+_LT_DECL([global_symbol_to_c_name_address], -+ [lt_cv_sys_global_symbol_to_c_name_address], [1], -+ [Transform the output of nm in a C name address pair]) -+_LT_DECL([global_symbol_to_c_name_address_lib_prefix], -+ [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1], -+ [Transform the output of nm in a C name address pair when lib prefix is needed]) -+]) # _LT_CMD_GLOBAL_SYMBOLS -+ -+ -+# _LT_COMPILER_PIC([TAGNAME]) -+# --------------------------- -+m4_defun([_LT_COMPILER_PIC], -+[m4_require([_LT_TAG_COMPILER])dnl -+_LT_TAGVAR(lt_prog_compiler_wl, $1)= -+_LT_TAGVAR(lt_prog_compiler_pic, $1)= -+_LT_TAGVAR(lt_prog_compiler_static, $1)= -+ -+AC_MSG_CHECKING([for $compiler option to produce PIC]) -+m4_if([$1], [CXX], [ -+ # C++ specific cases for pic, static, wl, etc. -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ m68k) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ esac -+ ;; -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ mingw* | cygwin* | os2* | pw32* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ *djgpp*) -+ # DJGPP does not support shared libraries at all -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ hpux*) -+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -+ # sets the default TLS model and affects inlining. -+ case $host_cpu in -+ hppa*64*) -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ *qnx* | *nto*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ case $host_os in -+ aix[[4-9]]*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ chorus*) -+ case $cc_basename in -+ cxch68*) -+ # Green Hills C++ Compiler -+ # _LT_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a" -+ ;; -+ esac -+ ;; -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ freebsd* | dragonfly*) -+ # FreeBSD uses GNU C++ -+ ;; -+ hpux9* | hpux10* | hpux11*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ if test "$host_cpu" != ia64; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ fi -+ ;; -+ aCC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ interix*) -+ # This is c89, which is MS Visual C++ (no shared libs) -+ # Anyone wants to do a port? -+ ;; -+ irix5* | irix6* | nonstopux*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ # CC pic flag -KPIC is the default. -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # KAI C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ ecpc* ) -+ # old Intel C++ for x86_64 which still supported -KPIC. -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ icpc* ) -+ # Intel C++, used to be incompatible with GCC. -+ # ICC 10 doesn't accept -KPIC any more. -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ cxx*) -+ # Compaq C++ -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ xlc* | xlC*) -+ # IBM XL 8.0 on PPC -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ lynxos*) -+ ;; -+ m88k*) -+ ;; -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ netbsd*) -+ ;; -+ *qnx* | *nto*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,' -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ cxx*) -+ # Digital/Compaq C++ -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # Make sure the PIC flag is empty. It appears that all Alpha -+ # Linux and Compaq Tru64 Unix objects are PIC. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ psos*) -+ ;; -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ lcc*) -+ # Lucid -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ esac -+ ;; -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ ;; -+ *) -+ ;; -+ esac -+ ;; -+ vxworks*) -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+], -+[ -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ -+ case $host_os in -+ aix*) -+ # All AIX code is PIC. -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ m68k) -+ # FIXME: we need at least 68020 code to build shared libraries, but -+ # adding the `-m68020' flag to GCC prevents building anything better, -+ # like `-m68040'. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4' -+ ;; -+ esac -+ ;; -+ -+ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*) -+ # PIC is the default for these OSes. -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ # Although the cygwin gcc ignores -fPIC, still need this for old-style -+ # (--disable-auto-import) libraries -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; -+ -+ darwin* | rhapsody*) -+ # PIC is the default on this platform -+ # Common symbols not allowed in MH_DYLIB files -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common' -+ ;; -+ -+ hpux*) -+ # PIC is the default for 64-bit PA HP-UX, but not for 32-bit -+ # PA HP-UX. On IA64 HP-UX, PIC is the default but the pic flag -+ # sets the default TLS model and affects inlining. -+ case $host_cpu in -+ hppa*64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ ;; -+ -+ interix[[3-9]]*) -+ # Interix 3.x gcc -fpic/-fPIC options generate broken code. -+ # Instead, we relocate shared libraries at runtime. -+ ;; -+ -+ msdosdjgpp*) -+ # Just because we use GCC doesn't mean we suddenly get shared libraries -+ # on systems that don't support them. -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ enable_shared=no -+ ;; -+ -+ *nto* | *qnx*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic -+ fi -+ ;; -+ -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ ;; -+ esac -+ else -+ # PORTME Check for flag to pass linker flags through the system compiler. -+ case $host_os in -+ aix*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ if test "$host_cpu" = ia64; then -+ # AIX 5 now supports IA64 processor -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ else -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp' -+ fi -+ ;; -+ -+ mingw* | cygwin* | pw32* | os2* | cegcc*) -+ # This hack is so that the source file can tell whether it is being -+ # built for inclusion in a dll (and should export symbols for example). -+ m4_if([$1], [GCJ], [], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT']) -+ ;; -+ -+ hpux9* | hpux10* | hpux11*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but -+ # not for PA HP-UX. -+ case $host_cpu in -+ hppa*64*|ia64*) -+ # +Z the default -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z' -+ ;; -+ esac -+ # Is there a better lt_prog_compiler_static that works with the bundled CC? -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive' -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # PIC (with -KPIC) is the default. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ # old Intel for x86_64 which still supported -KPIC. -+ ecc*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ # icc used to be incompatible with GCC. -+ # ICC 10 doesn't accept -KPIC any more. -+ icc* | ifort*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static' -+ ;; -+ # Lahey Fortran 8.1. -+ lf95*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='--static' -+ ;; -+ pgcc* | pgf77* | pgf90* | pgf95*) -+ # Portland Group compilers (*not* the Pentium gcc compiler, -+ # which looks to be a dead project) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ ccc*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All Alpha code is PIC. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ xl*) -+ # IBM XL C 8.0/Fortran 10.1 on PPC -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink' -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C 5.9 -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ ;; -+ *Sun\ F*) -+ # Sun Fortran 8.3 passes all unrecognized flags to the linker -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ newsos6) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ *nto* | *qnx*) -+ # QNX uses GNU C++, but need to define -shared option too, otherwise -+ # it will coredump. -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC -shared' -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ # All OSF/1 code is PIC. -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ rdos*) -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared' -+ ;; -+ -+ solaris*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ case $cc_basename in -+ f77* | f90* | f95*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ sysv4 | sysv4.2uw2* | sysv4.3*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec ;then -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ fi -+ ;; -+ -+ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ unicos*) -+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,' -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ -+ uts4*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-pic' -+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic' -+ ;; -+ -+ *) -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no -+ ;; -+ esac -+ fi -+]) -+case $host_os in -+ # For platforms which do not support PIC, -DPIC is meaningless: -+ *djgpp*) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ ;; -+ *) -+ _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])" -+ ;; -+esac -+AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)]) -+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1], -+ [How to pass a linker flag through the compiler]) -+ -+# -+# Check to make sure the PIC flag actually works. -+# -+if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then -+ _LT_COMPILER_OPTION([if $compiler PIC flag $_LT_TAGVAR(lt_prog_compiler_pic, $1) works], -+ [_LT_TAGVAR(lt_cv_prog_compiler_pic_works, $1)], -+ [$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])], [], -+ [case $_LT_TAGVAR(lt_prog_compiler_pic, $1) in -+ "" | " "*) ;; -+ *) _LT_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_TAGVAR(lt_prog_compiler_pic, $1)" ;; -+ esac], -+ [_LT_TAGVAR(lt_prog_compiler_pic, $1)= -+ _LT_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no]) -+fi -+_LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1], -+ [Additional compiler flags for building library objects]) -+ -+# -+# Check to make sure the static flag actually works. -+# -+wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_TAGVAR(lt_prog_compiler_static, $1)\" -+_LT_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works], -+ _LT_TAGVAR(lt_cv_prog_compiler_static_works, $1), -+ $lt_tmp_static_flag, -+ [], -+ [_LT_TAGVAR(lt_prog_compiler_static, $1)=]) -+_LT_TAGDECL([link_static_flag], [lt_prog_compiler_static], [1], -+ [Compiler flag to prevent dynamic linking]) -+])# _LT_COMPILER_PIC -+ -+ -+# _LT_LINKER_SHLIBS([TAGNAME]) -+# ---------------------------- -+# See if the linker supports building shared libraries. -+m4_defun([_LT_LINKER_SHLIBS], -+[AC_REQUIRE([LT_PATH_LD])dnl -+AC_REQUIRE([LT_PATH_NM])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_EGREP])dnl -+m4_require([_LT_DECL_SED])dnl -+m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl -+m4_require([_LT_TAG_COMPILER])dnl -+AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+m4_if([$1], [CXX], [ -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ case $host_os in -+ aix[[4-9]]*) -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ fi -+ ;; -+ pw32*) -+ _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds" -+ ;; -+ cygwin* | mingw* | cegcc*) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ *) -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ ;; -+ esac -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -+], [ -+ runpath_var= -+ _LT_TAGVAR(allow_undefined_flag, $1)= -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(archive_cmds, $1)= -+ _LT_TAGVAR(archive_expsym_cmds, $1)= -+ _LT_TAGVAR(compiler_needs_object, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' -+ _LT_TAGVAR(hardcode_automatic, $1)=no -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ _LT_TAGVAR(hardcode_minus_L, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+ _LT_TAGVAR(inherit_rpath, $1)=no -+ _LT_TAGVAR(link_all_deplibs, $1)=unknown -+ _LT_TAGVAR(module_cmds, $1)= -+ _LT_TAGVAR(module_expsym_cmds, $1)= -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)= -+ _LT_TAGVAR(old_archive_from_expsyms_cmds, $1)= -+ _LT_TAGVAR(thread_safe_flag_spec, $1)= -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ # include_expsyms should be a list of space-separated symbols to be *always* -+ # included in the symbol list -+ _LT_TAGVAR(include_expsyms, $1)= -+ # exclude_expsyms can be an extended regexp of symbols to exclude -+ # it will be wrapped by ` (' and `)$', so one must not match beginning or -+ # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc', -+ # as well as any symbol that contains `d'. -+ _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'] -+ # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out -+ # platforms (ab)use it in PIC code, but their linkers get confused if -+ # the symbol is explicitly referenced. Since portable code cannot -+ # rely on this symbol name, it's probably fine to never include it in -+ # preloaded symbol tables. -+ # Exclude shared library initialization/finalization symbols. -+dnl Note also adjust exclude_expsyms for C++ above. -+ extract_expsyms_cmds= -+ -+ case $host_os in -+ cygwin* | mingw* | pw32* | cegcc*) -+ # FIXME: the MSVC++ port hasn't been tested in a loooong time -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ if test "$GCC" != yes; then -+ with_gnu_ld=no -+ fi -+ ;; -+ interix*) -+ # we just hope/assume this is gcc and not c89 (= MSVC++) -+ with_gnu_ld=yes -+ ;; -+ openbsd*) -+ with_gnu_ld=no -+ ;; -+ esac -+ -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ if test "$with_gnu_ld" = yes; then -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ wlarc='${wl}' -+ -+ # Set some defaults for GNU ld with shared library support. These -+ # are reset later if shared libraries are not supported. Putting them -+ # here allows them to be overridden if necessary. -+ runpath_var=LD_RUN_PATH -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ supports_anon_versioning=no -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11 -+ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ... -+ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ... -+ *\ 2.11.*) ;; # other 2.11 versions -+ *) supports_anon_versioning=yes ;; -+ esac -+ -+ # See if GNU ld supports shared libraries. -+ case $host_os in -+ aix[[3-9]]*) -+ # On AIX/PPC, the GNU linker is very broken -+ if test "$host_cpu" != ia64; then -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: the GNU linker, at least up to release 2.9.1, is reported -+*** to be unable to reliably create shared libraries on AIX. -+*** Therefore, libtool is disabling shared libraries support. If you -+*** really care for shared libraries, you may want to modify your PATH -+*** so that a non-GNU linker is found, and then restart. -+ -+_LT_EOF -+ fi -+ ;; -+ -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='' -+ ;; -+ m68k) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols' -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ interix[[3-9]]*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ -+ gnu* | linux* | tpf* | k*bsd*-gnu) -+ tmp_diet=no -+ if test "$host_os" = linux-dietlibc; then -+ case $cc_basename in -+ diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn) -+ esac -+ fi -+ if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \ -+ && test "$tmp_diet" = no -+ then -+ tmp_addflag= -+ tmp_sharedflag='-shared' -+ case $cc_basename,$host_cpu in -+ pgcc*) # Portland Group C compiler -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag' -+ ;; -+ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ tmp_addflag=' $pic_flag -Mnomain' ;; -+ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64 -+ tmp_addflag=' -i_dynamic' ;; -+ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64 -+ tmp_addflag=' -i_dynamic -nofor_main' ;; -+ ifc* | ifort*) # Intel Fortran compiler -+ tmp_addflag=' -nofor_main' ;; -+ lf95*) # Lahey Fortran 8.1 -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ tmp_sharedflag='--shared' ;; -+ xl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below) -+ tmp_sharedflag='-qmkshrobj' -+ tmp_addflag= ;; -+ esac -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) # Sun C 5.9 -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(compiler_needs_object, $1)=yes -+ tmp_sharedflag='-G' ;; -+ *Sun\ F*) # Sun Fortran 8.3 -+ tmp_sharedflag='-G' ;; -+ esac -+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ -+ case $cc_basename in -+ xlf*) -+ # IBM XL Fortran 10.1 on PPC cannot create shared libs itself -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib' -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib' -+ fi -+ ;; -+ esac -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib' -+ wlarc= -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ fi -+ ;; -+ -+ solaris*) -+ if $LD -v 2>&1 | $GREP 'BFD 2\.8' > /dev/null; then -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: The releases 2.8.* of the GNU linker cannot reliably -+*** create shared libraries on Solaris systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.9.1 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) -+ case `$LD -v 2>&1` in -+ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ cat <<_LT_EOF 1>&2 -+ -+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not -+*** reliably create shared libraries on SCO systems. Therefore, libtool -+*** is disabling shared libraries support. We urge you to upgrade GNU -+*** binutils to release 2.16.91.0.3 or newer. Another option is to modify -+*** your PATH or compiler configuration so that the native linker is -+*** used, and then restart. -+ -+_LT_EOF -+ ;; -+ *) -+ # For security reasons, it is highly recommended that you always -+ # use absolute paths for naming shared libraries, and exclude the -+ # DT_RUNPATH tag from executables and libraries. But doing so -+ # requires that you compile everything twice, which is a pain. -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ sunos4*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ wlarc= -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ -+ if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then -+ runpath_var= -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)= -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ # PORTME fill in a description of your system's linker (not GNU ld) -+ case $host_os in -+ aix3*) -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname' -+ # Note: this linker hardcodes the directories in LIBPATH if there -+ # are no directories specified by -L. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then -+ # Neither direct hardcoding nor static linking is supported with a -+ # broken collect2. -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ fi -+ ;; -+ -+ aix[[4-9]]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ # If we're using GNU nm, then we don't want the "-C" option. -+ # -C means demangle to AIX nm, but means don't demangle with GNU nm -+ if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ else -+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' -+ fi -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -+ for ld_flag in $LDFLAGS; do -+ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then -+ aix_use_runtimelinking=yes -+ break -+ fi -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_TAGVAR(archive_cmds, $1)='' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -+ -+ if test "$GCC" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && -+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ ;; -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to export. -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared libraries. -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ amigaos*) -+ case $host_cpu in -+ powerpc) -+ # see comment about AmigaOS4 .so support -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='' -+ ;; -+ m68k) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/a2ixlibrary.data~$ECHO "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$ECHO "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$ECHO "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$ECHO "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ ;; -+ -+ bsdi[[45]]*) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic -+ ;; -+ -+ cygwin* | mingw* | pw32* | cegcc*) -+ # When not using gcc, we currently assume that we are using -+ # Microsoft Visual C++. -+ # hardcode_libdir_flag_spec is actually meaningless, as there is -+ # no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' ' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Tell ltmain to make .lib files, not .a files. -+ libext=lib -+ # Tell ltmain to make .dll files, not .so files. -+ shrext_cmds=".dll" -+ # FIXME: Setting linknames here is a bad hack. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames=' -+ # The linker will automatically build a .lib file if we build a DLL. -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='true' -+ # FIXME: Should let the user specify the lib program. -+ _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs' -+ _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`' -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ ;; -+ -+ darwin* | rhapsody*) -+ _LT_DARWIN_LINKER_FEATURES($1) -+ ;; -+ -+ dgux*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ freebsd1*) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor -+ # support. Future versions do this automatically, but an explicit c++rt0.o -+ # does not break anything, and helps significantly (at the cost of a little -+ # extra space). -+ freebsd2.2*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ # Unfortunately, older versions of FreeBSD 2 do not have this feature. -+ freebsd2*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries. -+ freebsd* | dragonfly*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ hpux9*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ -+ hpux10*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ fi -+ ;; -+ -+ hpux11*) -+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ else -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ fi -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ -+ # hardcode_minus_L: Not really in the search PATH, -+ # but as the default location of the library. -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ ;; -+ esac -+ fi -+ ;; -+ -+ irix5* | irix6* | nonstopux*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ # Try to use the -exported_symbol ld option, if it does not -+ # work, assume that -exports_file does not work either and -+ # implicitly export all symbols. -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null" -+ AC_LINK_IFELSE(int foo(void) {}, -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib' -+ ) -+ LDFLAGS="$save_LDFLAGS" -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(inherit_rpath, $1)=yes -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags' # ELF -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ newsos6) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *nto* | *qnx*) -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ else -+ case $host_os in -+ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ ;; -+ esac -+ fi -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ os2*) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def' -+ _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def' -+ ;; -+ -+ osf3*) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ osf4* | osf5*) # as osf3* with the addition of -msym flag -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ else -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~ -+ $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp' -+ -+ # Both c and cxx compiler support -rpath directly -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ fi -+ _LT_TAGVAR(archive_cmds_need_lc, $1)='no' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ ;; -+ -+ solaris*) -+ _LT_TAGVAR(no_undefined_flag, $1)=' -z defs' -+ if test "$GCC" = yes; then -+ wlarc='${wl}' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ else -+ case `$CC -V 2>&1` in -+ *"Compilers 5.0"*) -+ wlarc='' -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp' -+ ;; -+ *) -+ wlarc='${wl}' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp' -+ ;; -+ esac -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. GCC discards it without `$wl', -+ # but is careful enough not to reorder. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ fi -+ ;; -+ esac -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ -+ sunos4*) -+ if test "x$host_vendor" = xsequent; then -+ # Use $CC to link under sequent, because it throws in some extra .o -+ # files that make .init and .fini sections work. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags' -+ fi -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ sysv4) -+ case $host_vendor in -+ sni) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=yes # is this really true??? -+ ;; -+ siemens) -+ ## LD is ld it makes a PLAMLIB -+ ## CC just makes a GrossModule. -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs' -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ ;; -+ motorola) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie -+ ;; -+ esac -+ runpath_var='LD_RUN_PATH' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ sysv4.3*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport' -+ ;; -+ -+ sysv4*MP*) -+ if test -d /usr/nec; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var=LD_RUN_PATH -+ hardcode_runpath_var=yes -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ fi -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ if test "$GCC" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ fi -+ ;; -+ -+ uts4*) -+ _LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ -+ *) -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ -+ if test x$host_vendor = xsni; then -+ case $host in -+ sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym' -+ ;; -+ esac -+ fi -+ fi -+]) -+AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -+test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ -+_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld -+ -+_LT_DECL([], [libext], [0], [Old archive suffix (normally "a")])dnl -+_LT_DECL([], [shrext_cmds], [1], [Shared library suffix (normally ".so")])dnl -+_LT_DECL([], [extract_expsyms_cmds], [2], -+ [The commands to extract the exported symbol list from a shared archive]) -+ -+# -+# Do we need to explicitly link libc? -+# -+case "x$_LT_TAGVAR(archive_cmds_need_lc, $1)" in -+x|xyes) -+ # Assume -lc should be added -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ -+ if test "$enable_shared" = yes && test "$GCC" = yes; then -+ case $_LT_TAGVAR(archive_cmds, $1) in -+ *'~'*) -+ # FIXME: we may have to deal with multi-command sequences. -+ ;; -+ '$CC '*) -+ # Test whether the compiler implicitly links with -lc since on some -+ # systems, -lgcc has to come before -lc. If gcc already passes -lc -+ # to ld, don't add -lc before -lgcc. -+ AC_MSG_CHECKING([whether -lc should be explicitly linked in]) -+ $RM conftest* -+ echo "$lt_simple_compile_test_code" > conftest.$ac_ext -+ -+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then -+ soname=conftest -+ lib=conftest -+ libobjs=conftest.$ac_objext -+ deplibs= -+ wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1) -+ pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1) -+ compiler_flags=-v -+ linker_flags=-v -+ verstring= -+ output_objdir=. -+ libname=conftest -+ lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1) -+ _LT_TAGVAR(allow_undefined_flag, $1)= -+ if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) -+ then -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ else -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ fi -+ _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag -+ else -+ cat conftest.err 1>&5 -+ fi -+ $RM conftest* -+ AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)]) -+ ;; -+ esac -+ fi -+ ;; -+esac -+ -+_LT_TAGDECL([build_libtool_need_lc], [archive_cmds_need_lc], [0], -+ [Whether or not to add -lc for building shared libraries]) -+_LT_TAGDECL([allow_libtool_libs_with_static_runtimes], -+ [enable_shared_with_static_runtimes], [0], -+ [Whether or not to disallow shared libs when runtime libs are static]) -+_LT_TAGDECL([], [export_dynamic_flag_spec], [1], -+ [Compiler flag to allow reflexive dlopens]) -+_LT_TAGDECL([], [whole_archive_flag_spec], [1], -+ [Compiler flag to generate shared objects directly from archives]) -+_LT_TAGDECL([], [compiler_needs_object], [1], -+ [Whether the compiler copes with passing no objects directly]) -+_LT_TAGDECL([], [old_archive_from_new_cmds], [2], -+ [Create an old-style archive from a shared archive]) -+_LT_TAGDECL([], [old_archive_from_expsyms_cmds], [2], -+ [Create a temporary old-style archive to link instead of a shared archive]) -+_LT_TAGDECL([], [archive_cmds], [2], [Commands used to build a shared archive]) -+_LT_TAGDECL([], [archive_expsym_cmds], [2]) -+_LT_TAGDECL([], [module_cmds], [2], -+ [Commands used to build a loadable module if different from building -+ a shared archive.]) -+_LT_TAGDECL([], [module_expsym_cmds], [2]) -+_LT_TAGDECL([], [with_gnu_ld], [1], -+ [Whether we are building with GNU ld or not]) -+_LT_TAGDECL([], [allow_undefined_flag], [1], -+ [Flag that allows shared libraries with undefined symbols to be built]) -+_LT_TAGDECL([], [no_undefined_flag], [1], -+ [Flag that enforces no undefined symbols]) -+_LT_TAGDECL([], [hardcode_libdir_flag_spec], [1], -+ [Flag to hardcode $libdir into a binary during linking. -+ This must work even if $libdir does not exist]) -+_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1], -+ [[If ld is used when linking, flag to hardcode $libdir into a binary -+ during linking. This must work even if $libdir does not exist]]) -+_LT_TAGDECL([], [hardcode_libdir_separator], [1], -+ [Whether we need a single "-rpath" flag with a separated argument]) -+_LT_TAGDECL([], [hardcode_direct], [0], -+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -+ DIR into the resulting binary]) -+_LT_TAGDECL([], [hardcode_direct_absolute], [0], -+ [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes -+ DIR into the resulting binary and the resulting library dependency is -+ "absolute", i.e impossible to change by setting ${shlibpath_var} if the -+ library is relocated]) -+_LT_TAGDECL([], [hardcode_minus_L], [0], -+ [Set to "yes" if using the -LDIR flag during linking hardcodes DIR -+ into the resulting binary]) -+_LT_TAGDECL([], [hardcode_shlibpath_var], [0], -+ [Set to "yes" if using SHLIBPATH_VAR=DIR during linking hardcodes DIR -+ into the resulting binary]) -+_LT_TAGDECL([], [hardcode_automatic], [0], -+ [Set to "yes" if building a shared library automatically hardcodes DIR -+ into the library and all subsequent libraries and executables linked -+ against it]) -+_LT_TAGDECL([], [inherit_rpath], [0], -+ [Set to yes if linker adds runtime paths of dependent libraries -+ to runtime path list]) -+_LT_TAGDECL([], [link_all_deplibs], [0], -+ [Whether libtool must link a program against all its dependency libraries]) -+_LT_TAGDECL([], [fix_srcfile_path], [1], -+ [Fix the shell variable $srcfile for the compiler]) -+_LT_TAGDECL([], [always_export_symbols], [0], -+ [Set to "yes" if exported symbols are required]) -+_LT_TAGDECL([], [export_symbols_cmds], [2], -+ [The commands to list exported symbols]) -+_LT_TAGDECL([], [exclude_expsyms], [1], -+ [Symbols that should not be listed in the preloaded symbols]) -+_LT_TAGDECL([], [include_expsyms], [1], -+ [Symbols that must always be exported]) -+_LT_TAGDECL([], [prelink_cmds], [2], -+ [Commands necessary for linking programs (against libraries) with templates]) -+_LT_TAGDECL([], [file_list_spec], [1], -+ [Specify filename containing input files]) -+dnl FIXME: Not yet implemented -+dnl _LT_TAGDECL([], [thread_safe_flag_spec], [1], -+dnl [Compiler flag to generate thread safe objects]) -+])# _LT_LINKER_SHLIBS -+ -+ -+# _LT_LANG_C_CONFIG([TAG]) -+# ------------------------ -+# Ensure that the configuration variables for a C compiler are suitably -+# defined. These variables are subsequently used by _LT_CONFIG to write -+# the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_C_CONFIG], -+[m4_require([_LT_DECL_EGREP])dnl -+lt_save_CC="$CC" -+AC_LANG_PUSH(C) -+ -+# Source file extension for C test sources. -+ac_ext=c -+ -+# Object file extension for compiled C test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="int some_variable = 0;" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='int main(){return(0);}' -+ -+_LT_TAG_COMPILER -+# Save the default compiler, since it gets overwritten when the other -+# tags are being tested, and _LT_TAGVAR(compiler, []) is a NOP. -+compiler_DEFAULT=$CC -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+if test -n "$compiler"; then -+ _LT_COMPILER_NO_RTTI($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ LT_SYS_DLOPEN_SELF -+ _LT_CMD_STRIPLIB -+ -+ # Report which library types will actually be built -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) -+ -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ -+ aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ AC_MSG_RESULT([$enable_shared]) -+ -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) -+ -+ _LT_CONFIG($1) -+fi -+AC_LANG_POP -+CC="$lt_save_CC" -+])# _LT_LANG_C_CONFIG -+ -+ -+# _LT_PROG_CXX -+# ------------ -+# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++ -+# compiler, we have our own version here. -+m4_defun([_LT_PROG_CXX], -+[ -+pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes]) -+AC_PROG_CXX -+if test -n "$CXX" && ( test "X$CXX" != "Xno" && -+ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || -+ (test "X$CXX" != "Xg++"))) ; then -+ AC_PROG_CXXCPP -+else -+ _lt_caught_CXX_error=yes -+fi -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_CXX -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_CXX], []) -+ -+ -+# _LT_LANG_CXX_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for a C++ compiler are suitably -+# defined. These variables are subsequently used by _LT_CONFIG to write -+# the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_CXX_CONFIG], -+[AC_REQUIRE([_LT_PROG_CXX])dnl -+m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+m4_require([_LT_DECL_EGREP])dnl -+ -+AC_LANG_PUSH(C++) -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(compiler_needs_object, $1)=no -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for C++ test sources. -+ac_ext=cpp -+ -+# Object file extension for compiled C++ test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# No sense in running all these tests if we already determined that -+# the CXX compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_caught_CXX_error" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="int some_variable = 0;" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }' -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC=$CC -+ lt_save_LD=$LD -+ lt_save_GCC=$GCC -+ GCC=$GXX -+ lt_save_with_gnu_ld=$with_gnu_ld -+ lt_save_path_LD=$lt_cv_path_LD -+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then -+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx -+ else -+ $as_unset lt_cv_prog_gnu_ld -+ fi -+ if test -n "${lt_cv_path_LDCXX+set}"; then -+ lt_cv_path_LD=$lt_cv_path_LDCXX -+ else -+ $as_unset lt_cv_path_LD -+ fi -+ test -z "${LDCXX+set}" || LD=$LDCXX -+ CC=${CXX-"c++"} -+ compiler=$CC -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) -+ -+ if test -n "$compiler"; then -+ # We don't want -fno-exception when compiling C++ code, so set the -+ # no_builtin_flag separately -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' -+ else -+ _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)= -+ fi -+ -+ if test "$GXX" = yes; then -+ # Set up default GNU C++ configuration -+ -+ LT_PATH_LD -+ -+ # Check if GNU C++ uses GNU ld as the underlying linker, since the -+ # archiving commands below assume that GNU ld is being used. -+ if test "$with_gnu_ld" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # If archive_cmds runs LD, not CC, wlarc should be empty -+ # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to -+ # investigate it a little bit more. (MM) -+ wlarc='${wl}' -+ -+ # ancient GNU ld didn't support --whole-archive et. al. -+ if eval "`$CC -print-prog-name=ld` --help 2>&1" | -+ $GREP 'no-whole-archive' > /dev/null; then -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ else -+ _LT_TAGVAR(whole_archive_flag_spec, $1)= -+ fi -+ else -+ with_gnu_ld=no -+ wlarc= -+ -+ # A generic and very simple default shared library creation -+ # command for GNU C++ for the case where it uses the native -+ # linker, instead of GNU ld. If possible, this setting should -+ # overridden to take advantage of the native linker features on -+ # the platform it is being used on. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ fi -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ -+ else -+ GXX=no -+ with_gnu_ld=no -+ wlarc= -+ fi -+ -+ # PORTME: fill in a description of your system's C++ link characteristics -+ AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries]) -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ case $host_os in -+ aix3*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" = ia64; then -+ # On IA64, the linker does run time linking by default, so we don't -+ # have to do anything special. -+ aix_use_runtimelinking=no -+ exp_sym_flag='-Bexport' -+ no_entry_flag="" -+ else -+ aix_use_runtimelinking=no -+ -+ # Test if we are trying to use run time linking or normal -+ # AIX style linking. If -brtl is somewhere in LDFLAGS, we -+ # need to do runtime linking. -+ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*) -+ for ld_flag in $LDFLAGS; do -+ case $ld_flag in -+ *-brtl*) -+ aix_use_runtimelinking=yes -+ break -+ ;; -+ esac -+ done -+ ;; -+ esac -+ -+ exp_sym_flag='-bexport' -+ no_entry_flag='-bnoentry' -+ fi -+ -+ # When large executables or shared objects are built, AIX ld can -+ # have problems creating the table of contents. If linking a library -+ # or program results in "error TOC overflow" add -mminimal-toc to -+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not -+ # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS. -+ -+ _LT_TAGVAR(archive_cmds, $1)='' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(file_list_spec, $1)='${wl}-f,' -+ -+ if test "$GXX" = yes; then -+ case $host_os in aix4.[[012]]|aix4.[[012]].*) -+ # We only want to do this on AIX 4.2 and lower, the check -+ # below for broken collect2 doesn't work under 4.3+ -+ collect2name=`${CC} -print-prog-name=collect2` -+ if test -f "$collect2name" && -+ strings "$collect2name" | $GREP resolve_lib_name >/dev/null -+ then -+ # We have reworked collect2 -+ : -+ else -+ # We have old collect2 -+ _LT_TAGVAR(hardcode_direct, $1)=unsupported -+ # It fails to find uninstalled libraries when the uninstalled -+ # path is not listed in the libpath. Setting hardcode_minus_L -+ # to unsupported forces relinking -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)= -+ fi -+ esac -+ shared_flag='-shared' -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag="$shared_flag "'${wl}-G' -+ fi -+ else -+ # not using gcc -+ if test "$host_cpu" = ia64; then -+ # VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release -+ # chokes on -Wl,-G. The following line is correct: -+ shared_flag='-G' -+ else -+ if test "$aix_use_runtimelinking" = yes; then -+ shared_flag='${wl}-G' -+ else -+ shared_flag='${wl}-bM:SRE' -+ fi -+ fi -+ fi -+ -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall' -+ # It seems that -bexpall does not export symbols beginning with -+ # underscore (_), so it is better to generate a list of symbols to -+ # export. -+ _LT_TAGVAR(always_export_symbols, $1)=yes -+ if test "$aix_use_runtimelinking" = yes; then -+ # Warning - without using the other runtime loading flags (-brtl), -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(allow_undefined_flag, $1)='-berok' -+ # Determine the default libpath from the value encoded in an empty -+ # executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag" -+ else -+ if test "$host_cpu" = ia64; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib' -+ _LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs" -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols" -+ else -+ # Determine the default libpath from the value encoded in an -+ # empty executable. -+ _LT_SYS_MODULE_PATH_AIX -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath" -+ # Warning - without using the other run time loading flags, -+ # -berok will link without error, but may produce a broken library. -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok' -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok' -+ # Exported symbols can be pulled into shared objects from archives -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=yes -+ # This is similar to how AIX traditionally builds its shared -+ # libraries. -+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname' -+ fi -+ fi -+ ;; -+ -+ beos*) -+ if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ # Joseph Beckenbach says some releases of gcc -+ # support --undefined. This deserves some investigation. FIXME -+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ chorus*) -+ case $cc_basename in -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ cygwin* | mingw* | pw32* | cegcc*) -+ # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless, -+ # as there is no search path for DLLs. -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir' -+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported -+ _LT_TAGVAR(always_export_symbols, $1)=no -+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes -+ -+ if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ # If the export-symbols file already is a .def file (1st line -+ # is EXPORTS), use it as is; otherwise, prepend... -+ _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then -+ cp $export_symbols $output_objdir/$soname.def; -+ else -+ echo EXPORTS > $output_objdir/$soname.def; -+ cat $export_symbols >> $output_objdir/$soname.def; -+ fi~ -+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib' -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ darwin* | rhapsody*) -+ _LT_DARWIN_LINKER_FEATURES($1) -+ ;; -+ -+ dgux*) -+ case $cc_basename in -+ ec++*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ ghcx*) -+ # Green Hills C++ Compiler -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ freebsd[[12]]*) -+ # C++ shared libraries reported to be fairly broken before -+ # switch to ELF -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ freebsd-elf*) -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ ;; -+ -+ freebsd* | dragonfly*) -+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF -+ # conventions -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ -+ gnu*) -+ ;; -+ -+ hpux9*) -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib' -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ hpux10*|hpux11*) -+ if test $with_gnu_ld = no; then -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ case $host_cpu in -+ hppa*64*|ia64*) -+ ;; -+ *) -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ ;; -+ esac -+ fi -+ case $host_cpu in -+ hppa*64*|ia64*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ ;; -+ *) -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH, -+ # but as the default -+ # location of the library. -+ ;; -+ esac -+ -+ case $cc_basename in -+ CC*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ aCC*) -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test $with_gnu_ld = no; then -+ case $host_cpu in -+ hppa*64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ ia64*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ ;; -+ esac -+ fi -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ interix[[3-9]]*) -+ _LT_TAGVAR(hardcode_direct, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc. -+ # Instead, shared libraries are loaded at an image base (0x10000000 by -+ # default) and relocated if they conflict, which is a slow very memory -+ # consuming and fragmenting process. To avoid this, we pick a random, -+ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link -+ # time. Moving up from 0x10000000 also allows more sbrk(2) space. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib' -+ ;; -+ irix5* | irix6*) -+ case $cc_basename in -+ CC*) -+ # SGI C++ -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs' -+ ;; -+ *) -+ if test "$GXX" = yes; then -+ if test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ else -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib' -+ fi -+ fi -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ ;; -+ esac -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ _LT_TAGVAR(inherit_rpath, $1)=yes -+ ;; -+ -+ linux* | k*bsd*-gnu) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib' -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -Bstatic", where "CC" is the KAI C++ compiler. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' -+ ;; -+ icpc* | ecpc* ) -+ # Intel C++ -+ with_gnu_ld=yes -+ # version 8.0 and above of icpc choke on multiply defined symbols -+ # if we add $predep_objects and $postdep_objects, however 7.1 and -+ # earlier do not add the objects themselves. -+ case `$CC -V 2>&1` in -+ *"Version 7."*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ *) # Version 8.0 or newer -+ tmp_idyn= -+ case $host_cpu in -+ ia64*) tmp_idyn=' -i_dynamic';; -+ esac -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' -+ ;; -+ esac -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive' -+ ;; -+ pgCC* | pgcpp*) -+ # Portland Group C++ compiler -+ case `$CC -V` in -+ *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*) -+ _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~ -+ compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"' -+ _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~ -+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~ -+ $RANLIB $oldlib' -+ _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~ -+ rm -rf $tpldir~ -+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~ -+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ ;; -+ *) # Version 6 will use weak symbols -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' -+ ;; -+ esac -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ ;; -+ cxx*) -+ # Compaq C++ -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols' -+ -+ runpath_var=LD_RUN_PATH -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ xl*) -+ # IBM XL 8.0 on PPC, with GNU ld -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' -+ if test "x$supports_anon_versioning" = xyes; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~ -+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ -+ echo "local: *; };" >> $output_objdir/$libname.ver~ -+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' -+ fi -+ ;; -+ *) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive' -+ _LT_TAGVAR(compiler_needs_object, $1)=yes -+ -+ # Not sure whether something based on -+ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 -+ # would be better. -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ esac -+ ;; -+ esac -+ ;; -+ -+ lynxos*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ m88k*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ mvs*) -+ case $cc_basename in -+ cxx*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ netbsd*) -+ if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags' -+ wlarc= -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ fi -+ # Workaround some broken pre-1.5 toolchains -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"' -+ ;; -+ -+ *nto* | *qnx*) -+ _LT_TAGVAR(ld_shlibs, $1)=yes -+ ;; -+ -+ openbsd2*) -+ # C++ shared libraries are fairly broken -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ openbsd*) -+ if test -f /usr/libexec/ld.so; then -+ _LT_TAGVAR(hardcode_direct, $1)=yes -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_direct_absolute, $1)=yes -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib' -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E' -+ _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive' -+ fi -+ output_verbose_link_cmd=echo -+ else -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ -+ osf3* | osf4* | osf5*) -+ case $cc_basename in -+ KCC*) -+ # Kuck and Associates, Inc. (KAI) C++ Compiler -+ -+ # KCC will only create a shared library if the output file -+ # ends with ".so" (or ".sl" for HP-UX), so rename the library -+ # to its proper name (with version) after linking. -+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Archives containing C++ object files must be created using -+ # the KAI C++ compiler. -+ case $host in -+ osf3*) _LT_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs' ;; -+ *) _LT_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs' ;; -+ esac -+ ;; -+ RCC*) -+ # Rational C++ 2.4.1 -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ cxx*) -+ case $host in -+ osf3*) -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ ;; -+ *) -+ _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~ -+ echo "-hidden">> $lib.exp~ -+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~ -+ $RM $lib.exp' -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir' -+ ;; -+ esac -+ -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ # -+ # There doesn't appear to be a way to prevent this compiler from -+ # explicitly linking system object files so we need to strip them -+ # from the output so that they don't get included in the library -+ # dependencies. -+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed' -+ ;; -+ *) -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*' -+ case $host in -+ osf3*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib' -+ ;; -+ esac -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=: -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ -+ else -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ fi -+ ;; -+ esac -+ ;; -+ -+ psos*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ sunos4*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.x -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ lcc*) -+ # Lucid -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ solaris*) -+ case $cc_basename in -+ CC*) -+ # Sun C++ 4.2, 5.x and Centerline C++ -+ _LT_TAGVAR(archive_cmds_need_lc,$1)=yes -+ _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs' -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir' -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ # The compiler driver will combine and reorder linker options, -+ # but understands `-z linker_flag'. -+ # Supported since Solaris 2.6 (maybe 2.5.1?) -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' -+ ;; -+ esac -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ -+ output_verbose_link_cmd='echo' -+ -+ # Archives containing C++ object files must be created using -+ # "CC -xar", where "CC" is the Sun C++ compiler. This is -+ # necessary to make sure instantiated templates are included -+ # in the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs' -+ ;; -+ gcx*) -+ # Green Hills C++ Compiler -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ -+ # The C++ compiler must be used to create the archive. -+ _LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs' -+ ;; -+ *) -+ # GNU C++ compiler with Solaris linker -+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then -+ _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs' -+ if $CC --version | $GREP -v '^2\.7' > /dev/null; then -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ else -+ # g++ 2.7 appears to require `-G' NOT `-shared' on this -+ # platform. -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~ -+ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp' -+ -+ # Commands to make compiler produce verbose output that lists -+ # what "hidden" libraries, object files and flags are used when -+ # linking a shared library. -+ output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"' -+ fi -+ -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir' -+ case $host_os in -+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;; -+ *) -+ _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract' -+ ;; -+ esac -+ fi -+ ;; -+ esac -+ ;; -+ -+ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*) -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ -+ sysv5* | sco3.2v5* | sco5v6*) -+ # Note: We can NOT use -z defs as we might desire, because we do not -+ # link with -lc, and that would cause any symbols used from libc to -+ # always be unresolved, which means just about no library would -+ # ever link correctly. If we're not using GNU ld we use -z text -+ # though, which does catch some bad symbols but isn't as heavy-handed -+ # as -z defs. -+ _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text' -+ _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs' -+ _LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ _LT_TAGVAR(hardcode_shlibpath_var, $1)=no -+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir' -+ _LT_TAGVAR(hardcode_libdir_separator, $1)=':' -+ _LT_TAGVAR(link_all_deplibs, $1)=yes -+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport' -+ runpath_var='LD_RUN_PATH' -+ -+ case $cc_basename in -+ CC*) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ *) -+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags' -+ ;; -+ esac -+ ;; -+ -+ tandem*) -+ case $cc_basename in -+ NCC*) -+ # NonStop-UX NCC 3.20 -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ ;; -+ -+ vxworks*) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ -+ *) -+ # FIXME: insert proper C++ library support -+ _LT_TAGVAR(ld_shlibs, $1)=no -+ ;; -+ esac -+ -+ AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)]) -+ test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no -+ -+ _LT_TAGVAR(GCC, $1)="$GXX" -+ _LT_TAGVAR(LD, $1)="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_SYS_HIDDEN_LIBDEPS($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ CC=$lt_save_CC -+ LDCXX=$LD -+ LD=$lt_save_LD -+ GCC=$lt_save_GCC -+ with_gnu_ld=$lt_save_with_gnu_ld -+ lt_cv_path_LDCXX=$lt_cv_path_LD -+ lt_cv_path_LD=$lt_save_path_LD -+ lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld -+ lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld -+fi # test "$_lt_caught_CXX_error" != yes -+ -+AC_LANG_POP -+])# _LT_LANG_CXX_CONFIG -+ -+ -+# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME]) -+# --------------------------------- -+# Figure out "hidden" library dependencies from verbose -+# compiler output when linking a shared library. -+# Parse the compiler output and extract the necessary -+# objects, libraries and library flags. -+m4_defun([_LT_SYS_HIDDEN_LIBDEPS], -+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl -+# Dependencies to place before and after the object being linked: -+_LT_TAGVAR(predep_objects, $1)= -+_LT_TAGVAR(postdep_objects, $1)= -+_LT_TAGVAR(predeps, $1)= -+_LT_TAGVAR(postdeps, $1)= -+_LT_TAGVAR(compiler_lib_search_path, $1)= -+ -+dnl we can't use the lt_simple_compile_test_code here, -+dnl because it contains code intended for an executable, -+dnl not a library. It's possible we should let each -+dnl tag define a new lt_????_link_test_code variable, -+dnl but it's only used here... -+m4_if([$1], [], [cat > conftest.$ac_ext <<_LT_EOF -+int a; -+void foo (void) { a = 0; } -+_LT_EOF -+], [$1], [CXX], [cat > conftest.$ac_ext <<_LT_EOF -+class Foo -+{ -+public: -+ Foo (void) { a = 0; } -+private: -+ int a; -+}; -+_LT_EOF -+], [$1], [F77], [cat > conftest.$ac_ext <<_LT_EOF -+ subroutine foo -+ implicit none -+ integer*4 a -+ a=0 -+ return -+ end -+_LT_EOF -+], [$1], [FC], [cat > conftest.$ac_ext <<_LT_EOF -+ subroutine foo -+ implicit none -+ integer a -+ a=0 -+ return -+ end -+_LT_EOF -+], [$1], [GCJ], [cat > conftest.$ac_ext <<_LT_EOF -+public class foo { -+ private int a; -+ public void bar (void) { -+ a = 0; -+ } -+}; -+_LT_EOF -+]) -+dnl Parse the compiler output and extract the necessary -+dnl objects, libraries and library flags. -+if AC_TRY_EVAL(ac_compile); then -+ # Parse the compiler output and extract the necessary -+ # objects, libraries and library flags. -+ -+ # Sentinel used to keep track of whether or not we are before -+ # the conftest object file. -+ pre_test_object_deps_done=no -+ -+ for p in `eval "$output_verbose_link_cmd"`; do -+ case $p in -+ -+ -L* | -R* | -l*) -+ # Some compilers place space between "-{L,R}" and the path. -+ # Remove the space. -+ if test $p = "-L" || -+ test $p = "-R"; then -+ prev=$p -+ continue -+ else -+ prev= -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ case $p in -+ -L* | -R*) -+ # Internal compiler library paths should come after those -+ # provided the user. The postdeps already come after the -+ # user supplied libs so there is no need to process them. -+ if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then -+ _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}" -+ else -+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}" -+ fi -+ ;; -+ # The "-l" case would never come before the object being -+ # linked, so don't bother handling this case. -+ esac -+ else -+ if test -z "$_LT_TAGVAR(postdeps, $1)"; then -+ _LT_TAGVAR(postdeps, $1)="${prev}${p}" -+ else -+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}" -+ fi -+ fi -+ ;; -+ -+ *.$objext) -+ # This assumes that the test object file only shows up -+ # once in the compiler output. -+ if test "$p" = "conftest.$objext"; then -+ pre_test_object_deps_done=yes -+ continue -+ fi -+ -+ if test "$pre_test_object_deps_done" = no; then -+ if test -z "$_LT_TAGVAR(predep_objects, $1)"; then -+ _LT_TAGVAR(predep_objects, $1)="$p" -+ else -+ _LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p" -+ fi -+ else -+ if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then -+ _LT_TAGVAR(postdep_objects, $1)="$p" -+ else -+ _LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p" -+ fi -+ fi -+ ;; -+ -+ *) ;; # Ignore the rest. -+ -+ esac -+ done -+ -+ # Clean up. -+ rm -f a.out a.exe -+else -+ echo "libtool.m4: error: problem compiling $1 test program" -+fi -+ -+$RM -f confest.$objext -+ -+# PORTME: override above test on systems where it is broken -+m4_if([$1], [CXX], -+[case $host_os in -+interix[[3-9]]*) -+ # Interix 3.5 installs completely hosed .la files for C++, so rather than -+ # hack all around it, let's just trust "g++" to DTRT. -+ _LT_TAGVAR(predep_objects,$1)= -+ _LT_TAGVAR(postdep_objects,$1)= -+ _LT_TAGVAR(postdeps,$1)= -+ ;; -+ -+linux*) -+ case `$CC -V 2>&1 | sed 5q` in -+ *Sun\ C*) -+ # Sun C++ 5.9 -+ -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+ -+solaris*) -+ case $cc_basename in -+ CC*) -+ # The more standards-conforming stlport4 library is -+ # incompatible with the Cstd library. Avoid specifying -+ # it if it's in CXXFLAGS. Ignore libCrun as -+ # -library=stlport4 depends on it. -+ case " $CXX $CXXFLAGS " in -+ *" -library=stlport4 "*) -+ solaris_use_stlport4=yes -+ ;; -+ esac -+ -+ # Adding this requires a known-good setup of shared libraries for -+ # Sun compiler versions before 5.6, else PIC objects from an old -+ # archive will be linked into the output, leading to subtle bugs. -+ if test "$solaris_use_stlport4" != yes; then -+ _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun' -+ fi -+ ;; -+ esac -+ ;; -+esac -+]) -+ -+case " $_LT_TAGVAR(postdeps, $1) " in -+*" -lc "*) _LT_TAGVAR(archive_cmds_need_lc, $1)=no ;; -+esac -+ _LT_TAGVAR(compiler_lib_search_dirs, $1)= -+if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then -+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'` -+fi -+_LT_TAGDECL([], [compiler_lib_search_dirs], [1], -+ [The directories searched by this compiler when creating a shared library]) -+_LT_TAGDECL([], [predep_objects], [1], -+ [Dependencies to place before and after the objects being linked to -+ create a shared library]) -+_LT_TAGDECL([], [postdep_objects], [1]) -+_LT_TAGDECL([], [predeps], [1]) -+_LT_TAGDECL([], [postdeps], [1]) -+_LT_TAGDECL([], [compiler_lib_search_path], [1], -+ [The library search path used internally by the compiler when linking -+ a shared library]) -+])# _LT_SYS_HIDDEN_LIBDEPS -+ -+ -+# _LT_PROG_F77 -+# ------------ -+# Since AC_PROG_F77 is broken, in that it returns the empty string -+# if there is no fortran compiler, we have our own version here. -+m4_defun([_LT_PROG_F77], -+[ -+pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes]) -+AC_PROG_F77 -+if test -z "$F77" || test "X$F77" = "Xno"; then -+ _lt_disable_F77=yes -+fi -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_F77 -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_F77], []) -+ -+ -+# _LT_LANG_F77_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for a Fortran 77 compiler are -+# suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_F77_CONFIG], -+[AC_REQUIRE([_LT_PROG_F77])dnl -+AC_LANG_PUSH(Fortran 77) -+ -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for f77 test sources. -+ac_ext=f -+ -+# Object file extension for compiled f77 test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# No sense in running all these tests if we already determined that -+# the F77 compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_disable_F77" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC="$CC" -+ lt_save_GCC=$GCC -+ CC=${F77-"f77"} -+ compiler=$CC -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) -+ GCC=$G77 -+ if test -n "$compiler"; then -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) -+ -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ AC_MSG_RESULT([$enable_shared]) -+ -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) -+ -+ _LT_TAGVAR(GCC, $1)="$G77" -+ _LT_TAGVAR(LD, $1)="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ GCC=$lt_save_GCC -+ CC="$lt_save_CC" -+fi # test "$_lt_disable_F77" != yes -+ -+AC_LANG_POP -+])# _LT_LANG_F77_CONFIG -+ -+ -+# _LT_PROG_FC -+# ----------- -+# Since AC_PROG_FC is broken, in that it returns the empty string -+# if there is no fortran compiler, we have our own version here. -+m4_defun([_LT_PROG_FC], -+[ -+pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes]) -+AC_PROG_FC -+if test -z "$FC" || test "X$FC" = "Xno"; then -+ _lt_disable_FC=yes -+fi -+popdef([AC_MSG_ERROR]) -+])# _LT_PROG_FC -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([_LT_PROG_FC], []) -+ -+ -+# _LT_LANG_FC_CONFIG([TAG]) -+# ------------------------- -+# Ensure that the configuration variables for a Fortran compiler are -+# suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_FC_CONFIG], -+[AC_REQUIRE([_LT_PROG_FC])dnl -+AC_LANG_PUSH(Fortran) -+ -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+_LT_TAGVAR(allow_undefined_flag, $1)= -+_LT_TAGVAR(always_export_symbols, $1)=no -+_LT_TAGVAR(archive_expsym_cmds, $1)= -+_LT_TAGVAR(export_dynamic_flag_spec, $1)= -+_LT_TAGVAR(hardcode_direct, $1)=no -+_LT_TAGVAR(hardcode_direct_absolute, $1)=no -+_LT_TAGVAR(hardcode_libdir_flag_spec, $1)= -+_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)= -+_LT_TAGVAR(hardcode_libdir_separator, $1)= -+_LT_TAGVAR(hardcode_minus_L, $1)=no -+_LT_TAGVAR(hardcode_automatic, $1)=no -+_LT_TAGVAR(inherit_rpath, $1)=no -+_LT_TAGVAR(module_cmds, $1)= -+_LT_TAGVAR(module_expsym_cmds, $1)= -+_LT_TAGVAR(link_all_deplibs, $1)=unknown -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+_LT_TAGVAR(no_undefined_flag, $1)= -+_LT_TAGVAR(whole_archive_flag_spec, $1)= -+_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no -+ -+# Source file extension for fc test sources. -+ac_ext=${ac_fc_srcext-f} -+ -+# Object file extension for compiled fc test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# No sense in running all these tests if we already determined that -+# the FC compiler isn't working. Some variables (like enable_shared) -+# are currently assumed to apply to all compilers on this platform, -+# and will be corrupted by setting them based on a non-working compiler. -+if test "$_lt_disable_FC" != yes; then -+ # Code to be used in simple compile tests -+ lt_simple_compile_test_code="\ -+ subroutine t -+ return -+ end -+" -+ -+ # Code to be used in simple link tests -+ lt_simple_link_test_code="\ -+ program t -+ end -+" -+ -+ # ltmain only uses $CC for tagged configurations so make sure $CC is set. -+ _LT_TAG_COMPILER -+ -+ # save warnings/boilerplate of simple test code -+ _LT_COMPILER_BOILERPLATE -+ _LT_LINKER_BOILERPLATE -+ -+ # Allow CC to be a program name with arguments. -+ lt_save_CC="$CC" -+ lt_save_GCC=$GCC -+ CC=${FC-"f95"} -+ compiler=$CC -+ GCC=$ac_cv_fc_compiler_gnu -+ -+ _LT_TAGVAR(compiler, $1)=$CC -+ _LT_CC_BASENAME([$compiler]) -+ -+ if test -n "$compiler"; then -+ AC_MSG_CHECKING([if libtool supports shared libraries]) -+ AC_MSG_RESULT([$can_build_shared]) -+ -+ AC_MSG_CHECKING([whether to build shared libraries]) -+ test "$can_build_shared" = "no" && enable_shared=no -+ -+ # On AIX, shared libraries and static libraries use the same namespace, and -+ # are all built from PIC. -+ case $host_os in -+ aix3*) -+ test "$enable_shared" = yes && enable_static=no -+ if test -n "$RANLIB"; then -+ archive_cmds="$archive_cmds~\$RANLIB \$lib" -+ postinstall_cmds='$RANLIB $lib' -+ fi -+ ;; -+ aix[[4-9]]*) -+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then -+ test "$enable_shared" = yes && enable_static=no -+ fi -+ ;; -+ esac -+ AC_MSG_RESULT([$enable_shared]) -+ -+ AC_MSG_CHECKING([whether to build static libraries]) -+ # Make sure either enable_shared or enable_static is yes. -+ test "$enable_shared" = yes || enable_static=yes -+ AC_MSG_RESULT([$enable_static]) -+ -+ _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu" -+ _LT_TAGVAR(LD, $1)="$LD" -+ -+ ## CAVEAT EMPTOR: -+ ## There is no encapsulation within the following macros, do not change -+ ## the running order or otherwise move them around unless you know exactly -+ ## what you are doing... -+ _LT_SYS_HIDDEN_LIBDEPS($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_SYS_DYNAMIC_LINKER($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+ fi # test -n "$compiler" -+ -+ GCC=$lt_save_GCC -+ CC="$lt_save_CC" -+fi # test "$_lt_disable_FC" != yes -+ -+AC_LANG_POP -+])# _LT_LANG_FC_CONFIG -+ -+ -+# _LT_LANG_GCJ_CONFIG([TAG]) -+# -------------------------- -+# Ensure that the configuration variables for the GNU Java Compiler compiler -+# are suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_GCJ_CONFIG], -+[AC_REQUIRE([LT_PROG_GCJ])dnl -+AC_LANG_SAVE -+ -+# Source file extension for Java test sources. -+ac_ext=java -+ -+# Object file extension for compiled Java test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code="class foo {}" -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }' -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_TAG_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+lt_save_GCC=$GCC -+GCC=yes -+CC=${GCJ-"gcj"} -+compiler=$CC -+_LT_TAGVAR(compiler, $1)=$CC -+_LT_TAGVAR(LD, $1)="$LD" -+_LT_CC_BASENAME([$compiler]) -+ -+# GCJ did not exist at the time GCC didn't implicitly link libc in. -+_LT_TAGVAR(archive_cmds_need_lc, $1)=no -+ -+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds -+ -+## CAVEAT EMPTOR: -+## There is no encapsulation within the following macros, do not change -+## the running order or otherwise move them around unless you know exactly -+## what you are doing... -+if test -n "$compiler"; then -+ _LT_COMPILER_NO_RTTI($1) -+ _LT_COMPILER_PIC($1) -+ _LT_COMPILER_C_O($1) -+ _LT_COMPILER_FILE_LOCKS($1) -+ _LT_LINKER_SHLIBS($1) -+ _LT_LINKER_HARDCODE_LIBPATH($1) -+ -+ _LT_CONFIG($1) -+fi -+ -+AC_LANG_RESTORE -+ -+GCC=$lt_save_GCC -+CC="$lt_save_CC" -+])# _LT_LANG_GCJ_CONFIG -+ -+ -+# _LT_LANG_RC_CONFIG([TAG]) -+# ------------------------- -+# Ensure that the configuration variables for the Windows resource compiler -+# are suitably defined. These variables are subsequently used by _LT_CONFIG -+# to write the compiler configuration to `libtool'. -+m4_defun([_LT_LANG_RC_CONFIG], -+[AC_REQUIRE([LT_PROG_RC])dnl -+AC_LANG_SAVE -+ -+# Source file extension for RC test sources. -+ac_ext=rc -+ -+# Object file extension for compiled RC test sources. -+objext=o -+_LT_TAGVAR(objext, $1)=$objext -+ -+# Code to be used in simple compile tests -+lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }' -+ -+# Code to be used in simple link tests -+lt_simple_link_test_code="$lt_simple_compile_test_code" -+ -+# ltmain only uses $CC for tagged configurations so make sure $CC is set. -+_LT_TAG_COMPILER -+ -+# save warnings/boilerplate of simple test code -+_LT_COMPILER_BOILERPLATE -+_LT_LINKER_BOILERPLATE -+ -+# Allow CC to be a program name with arguments. -+lt_save_CC="$CC" -+lt_save_GCC=$GCC -+GCC= -+CC=${RC-"windres"} -+compiler=$CC -+_LT_TAGVAR(compiler, $1)=$CC -+_LT_CC_BASENAME([$compiler]) -+_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes -+ -+if test -n "$compiler"; then -+ : -+ _LT_CONFIG($1) -+fi -+ -+GCC=$lt_save_GCC -+AC_LANG_RESTORE -+CC="$lt_save_CC" -+])# _LT_LANG_RC_CONFIG -+ -+ -+# LT_PROG_GCJ -+# ----------- -+AC_DEFUN([LT_PROG_GCJ], -+[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ], -+ [m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ], -+ [AC_CHECK_TOOL(GCJ, gcj,) -+ test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2" -+ AC_SUBST(GCJFLAGS)])])[]dnl -+]) -+ -+# Old name: -+AU_ALIAS([LT_AC_PROG_GCJ], [LT_PROG_GCJ]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_GCJ], []) -+ -+ -+# LT_PROG_RC -+# ---------- -+AC_DEFUN([LT_PROG_RC], -+[AC_CHECK_TOOL(RC, windres,) -+]) -+ -+# Old name: -+AU_ALIAS([LT_AC_PROG_RC], [LT_PROG_RC]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_RC], []) -+ -+ -+# _LT_DECL_EGREP -+# -------------- -+# If we don't have a new enough Autoconf to choose the best grep -+# available, choose the one first in the user's PATH. -+m4_defun([_LT_DECL_EGREP], -+[AC_REQUIRE([AC_PROG_EGREP])dnl -+AC_REQUIRE([AC_PROG_FGREP])dnl -+test -z "$GREP" && GREP=grep -+_LT_DECL([], [GREP], [1], [A grep program that handles long lines]) -+_LT_DECL([], [EGREP], [1], [An ERE matcher]) -+_LT_DECL([], [FGREP], [1], [A literal string matcher]) -+dnl Non-bleeding-edge autoconf doesn't subst GREP, so do it here too -+AC_SUBST([GREP]) -+]) -+ -+ -+# _LT_DECL_OBJDUMP -+# -------------- -+# If we don't have a new enough Autoconf to choose the best objdump -+# available, choose the one first in the user's PATH. -+m4_defun([_LT_DECL_OBJDUMP], -+[AC_CHECK_TOOL(OBJDUMP, objdump, false) -+test -z "$OBJDUMP" && OBJDUMP=objdump -+_LT_DECL([], [OBJDUMP], [1], [An object symbol dumper]) -+AC_SUBST([OBJDUMP]) -+]) -+ -+ -+# _LT_DECL_SED -+# ------------ -+# Check for a fully-functional sed program, that truncates -+# as few characters as possible. Prefer GNU sed if found. -+m4_defun([_LT_DECL_SED], -+[AC_PROG_SED -+test -z "$SED" && SED=sed -+Xsed="$SED -e 1s/^X//" -+_LT_DECL([], [SED], [1], [A sed program that does not truncate output]) -+_LT_DECL([], [Xsed], ["\$SED -e 1s/^X//"], -+ [Sed that helps us avoid accidentally triggering echo(1) options like -n]) -+])# _LT_DECL_SED -+ -+m4_ifndef([AC_PROG_SED], [ -+############################################################ -+# NOTE: This macro has been submitted for inclusion into # -+# GNU Autoconf as AC_PROG_SED. When it is available in # -+# a released version of Autoconf we should remove this # -+# macro and use it instead. # -+############################################################ -+ -+m4_defun([AC_PROG_SED], -+[AC_MSG_CHECKING([for a sed that does not truncate output]) -+AC_CACHE_VAL(lt_cv_path_SED, -+[# Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" -+ fi -+ done -+ done -+done -+IFS=$as_save_IFS -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break -+ fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+]) -+SED=$lt_cv_path_SED -+AC_SUBST([SED]) -+AC_MSG_RESULT([$SED]) -+])#AC_PROG_SED -+])#m4_ifndef -+ -+# Old name: -+AU_ALIAS([LT_AC_PROG_SED], [AC_PROG_SED]) -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([LT_AC_PROG_SED], []) -+ -+ -+# _LT_CHECK_SHELL_FEATURES -+# ------------------------ -+# Find out whether the shell is Bourne or XSI compatible, -+# or has some other useful features. -+m4_defun([_LT_CHECK_SHELL_FEATURES], -+[AC_MSG_CHECKING([whether the shell understands some XSI constructs]) -+# Try some XSI features -+xsi_shell=no -+( _lt_dummy="a/b/c" -+ test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \ -+ = c,a/b,, \ -+ && eval 'test $(( 1 + 1 )) -eq 2 \ -+ && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \ -+ && xsi_shell=yes -+AC_MSG_RESULT([$xsi_shell]) -+_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell']) -+ -+AC_MSG_CHECKING([whether the shell understands "+="]) -+lt_shell_append=no -+( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \ -+ >/dev/null 2>&1 \ -+ && lt_shell_append=yes -+AC_MSG_RESULT([$lt_shell_append]) -+_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append']) -+ -+if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then -+ lt_unset=unset -+else -+ lt_unset=false -+fi -+_LT_DECL([], [lt_unset], [0], [whether the shell understands "unset"])dnl -+ -+# test EBCDIC or ASCII -+case `echo X|tr X '\101'` in -+ A) # ASCII based system -+ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr -+ lt_SP2NL='tr \040 \012' -+ lt_NL2SP='tr \015\012 \040\040' -+ ;; -+ *) # EBCDIC based system -+ lt_SP2NL='tr \100 \n' -+ lt_NL2SP='tr \r\n \100\100' -+ ;; -+esac -+_LT_DECL([SP2NL], [lt_SP2NL], [1], [turn spaces into newlines])dnl -+_LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl -+])# _LT_CHECK_SHELL_FEATURES -+ -+ -+# _LT_PROG_XSI_SHELLFNS -+# --------------------- -+# Bourne and XSI compatible variants of some useful shell functions. -+m4_defun([_LT_PROG_XSI_SHELLFNS], -+[case $xsi_shell in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result="${1##*/}" -+} -+ -+# func_dirname_and_basename file append nondir_replacement -+# perform func_basename and func_dirname in a single function -+# call: -+# dirname: Compute the dirname of FILE. If nonempty, -+# add APPEND to the result, otherwise set result -+# to NONDIR_REPLACEMENT. -+# value returned in "$func_dirname_result" -+# basename: Compute filename of FILE. -+# value retuned in "$func_basename_result" -+# Implementation must be kept synchronized with func_dirname -+# and func_basename. For efficiency, we do not delegate to -+# those functions but instead duplicate the functionality here. -+func_dirname_and_basename () -+{ -+ case ${1} in -+ */*) func_dirname_result="${1%/*}${2}" ;; -+ * ) func_dirname_result="${3}" ;; -+ esac -+ func_basename_result="${1##*/}" -+} -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+func_stripname () -+{ -+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are -+ # positional parameters, so assign one to ordinary parameter first. -+ func_stripname_result=${3} -+ func_stripname_result=${func_stripname_result#"${1}"} -+ func_stripname_result=${func_stripname_result%"${2}"} -+} -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=${1%%=*} -+ func_opt_split_arg=${1#*=} -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ case ${1} in -+ *.lo) func_lo2o_result=${1%.lo}.${objext} ;; -+ *) func_lo2o_result=${1} ;; -+ esac -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=${1%.*}.lo -+} -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=$(( $[*] )) -+} -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=${#1} -+} -+ -+_LT_EOF -+ ;; -+ *) # Bourne compatible functions. -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_dirname file append nondir_replacement -+# Compute the dirname of FILE. If nonempty, add APPEND to the result, -+# otherwise set result to NONDIR_REPLACEMENT. -+func_dirname () -+{ -+ # Extract subdirectory from the argument. -+ func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"` -+ if test "X$func_dirname_result" = "X${1}"; then -+ func_dirname_result="${3}" -+ else -+ func_dirname_result="$func_dirname_result${2}" -+ fi -+} -+ -+# func_basename file -+func_basename () -+{ -+ func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"` -+} -+ -+dnl func_dirname_and_basename -+dnl A portable version of this function is already defined in general.m4sh -+dnl so there is no need for it here. -+ -+# func_stripname prefix suffix name -+# strip PREFIX and SUFFIX off of NAME. -+# PREFIX and SUFFIX must not contain globbing or regex special -+# characters, hashes, percent signs, but SUFFIX may contain a leading -+# dot (in which case that matches only a dot). -+# func_strip_suffix prefix name -+func_stripname () -+{ -+ case ${2} in -+ .*) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;; -+ *) func_stripname_result=`$ECHO "X${3}" \ -+ | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;; -+ esac -+} -+ -+# sed scripts: -+my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q' -+my_sed_long_arg='1s/^-[[^=]]*=//' -+ -+# func_opt_split -+func_opt_split () -+{ -+ func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"` -+ func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"` -+} -+ -+# func_lo2o object -+func_lo2o () -+{ -+ func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"` -+} -+ -+# func_xform libobj-or-source -+func_xform () -+{ -+ func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'` -+} -+ -+# func_arith arithmetic-term... -+func_arith () -+{ -+ func_arith_result=`expr "$[@]"` -+} -+ -+# func_len string -+# STRING may not start with a hyphen. -+func_len () -+{ -+ func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len` -+} -+ -+_LT_EOF -+esac -+ -+case $lt_shell_append in -+ yes) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$[1]+=\$[2]" -+} -+_LT_EOF -+ ;; -+ *) -+ cat << \_LT_EOF >> "$cfgfile" -+ -+# func_append var value -+# Append VALUE to the end of shell variable VAR. -+func_append () -+{ -+ eval "$[1]=\$$[1]\$[2]" -+} -+ -+_LT_EOF -+ ;; -+ esac -+]) -diff -ru evolution-2.29.3/m4/lt~obsolete.m4 evolution-2.29.3.new/m4/lt~obsolete.m4 ---- evolution-2.29.3/m4/lt~obsolete.m4 2009-11-30 18:02:54.000000000 +0100 -+++ evolution-2.29.3.new/m4/lt~obsolete.m4 2009-11-14 19:44:14.000000000 +0100 -@@ -0,0 +1,92 @@ -+# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -+# -+# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -+# Written by Scott James Remnant, 2004. -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 4 lt~obsolete.m4 -+ -+# These exist entirely to fool aclocal when bootstrapping libtool. -+# -+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -+# which have later been changed to m4_define as they aren't part of the -+# exported API, or moved to Autoconf or Automake where they belong. -+# -+# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -+# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -+# using a macro with the same name in our local m4/libtool.m4 it'll -+# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -+# and doesn't know about Autoconf macros at all.) -+# -+# So we provide this file, which has a silly filename so it's always -+# included after everything else. This provides aclocal with the -+# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -+# because those macros already exist, or will be overwritten later. -+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -+# -+# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -+# Yes, that means every name once taken will need to remain here until -+# we give up compatibility with versions before 1.7, at which point -+# we need to keep only those names which we still refer to. -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) -+ -+m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -+m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -+m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -+m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -+m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -+m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -+m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -+m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -+m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -+m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -+m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -+m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -+m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -+m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -+m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -+m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -+m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -+m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -+m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -+m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -+m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -+m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -+m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -+m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -+m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -+m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -+m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -+m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -+m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -+m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -+m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -+m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -+m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -+m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -+m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -+m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -+m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -+m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -+m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -+m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -+m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -+m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -+m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -+m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -+m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -+m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -diff -ru evolution-2.29.3/m4/ltoptions.m4 evolution-2.29.3.new/m4/ltoptions.m4 ---- evolution-2.29.3/m4/ltoptions.m4 2009-11-30 18:02:58.000000000 +0100 -+++ evolution-2.29.3.new/m4/ltoptions.m4 2009-11-14 19:44:14.000000000 +0100 -@@ -0,0 +1,368 @@ -+# Helper functions for option handling. -*- Autoconf -*- -+# -+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gary V. Vaughan, 2004 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 6 ltoptions.m4 -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) -+ -+ -+# _LT_MANGLE_OPTION(MACRO-NAME, OPTION-NAME) -+# ------------------------------------------ -+m4_define([_LT_MANGLE_OPTION], -+[[_LT_OPTION_]m4_bpatsubst($1__$2, [[^a-zA-Z0-9_]], [_])]) -+ -+ -+# _LT_SET_OPTION(MACRO-NAME, OPTION-NAME) -+# --------------------------------------- -+# Set option OPTION-NAME for macro MACRO-NAME, and if there is a -+# matching handler defined, dispatch to it. Other OPTION-NAMEs are -+# saved as a flag. -+m4_define([_LT_SET_OPTION], -+[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl -+m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]), -+ _LT_MANGLE_DEFUN([$1], [$2]), -+ [m4_warning([Unknown $1 option `$2'])])[]dnl -+]) -+ -+ -+# _LT_IF_OPTION(MACRO-NAME, OPTION-NAME, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------------------------ -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+m4_define([_LT_IF_OPTION], -+[m4_ifdef(_LT_MANGLE_OPTION([$1], [$2]), [$3], [$4])]) -+ -+ -+# _LT_UNLESS_OPTIONS(MACRO-NAME, OPTION-LIST, IF-NOT-SET) -+# ------------------------------------------------------- -+# Execute IF-NOT-SET unless all options in OPTION-LIST for MACRO-NAME -+# are set. -+m4_define([_LT_UNLESS_OPTIONS], -+[m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), -+ [m4_ifdef(_LT_MANGLE_OPTION([$1], _LT_Option), -+ [m4_define([$0_found])])])[]dnl -+m4_ifdef([$0_found], [m4_undefine([$0_found])], [$3 -+])[]dnl -+]) -+ -+ -+# _LT_SET_OPTIONS(MACRO-NAME, OPTION-LIST) -+# ---------------------------------------- -+# OPTION-LIST is a space-separated list of Libtool options associated -+# with MACRO-NAME. If any OPTION has a matching handler declared with -+# LT_OPTION_DEFINE, dispatch to that macro; otherwise complain about -+# the unknown option and exit. -+m4_defun([_LT_SET_OPTIONS], -+[# Set options -+m4_foreach([_LT_Option], m4_split(m4_normalize([$2])), -+ [_LT_SET_OPTION([$1], _LT_Option)]) -+ -+m4_if([$1],[LT_INIT],[ -+ dnl -+ dnl Simply set some default values (i.e off) if boolean options were not -+ dnl specified: -+ _LT_UNLESS_OPTIONS([LT_INIT], [dlopen], [enable_dlopen=no -+ ]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [win32-dll], [enable_win32_dll=no -+ ]) -+ dnl -+ dnl If no reference was made to various pairs of opposing options, then -+ dnl we run the default mode handler for the pair. For example, if neither -+ dnl `shared' nor `disable-shared' was passed, we enable building of shared -+ dnl archives by default: -+ _LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC]) -+ _LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install], -+ [_LT_ENABLE_FAST_INSTALL]) -+ ]) -+])# _LT_SET_OPTIONS -+ -+ -+## --------------------------------- ## -+## Macros to handle LT_INIT options. ## -+## --------------------------------- ## -+ -+# _LT_MANGLE_DEFUN(MACRO-NAME, OPTION-NAME) -+# ----------------------------------------- -+m4_define([_LT_MANGLE_DEFUN], -+[[_LT_OPTION_DEFUN_]m4_bpatsubst(m4_toupper([$1__$2]), [[^A-Z0-9_]], [_])]) -+ -+ -+# LT_OPTION_DEFINE(MACRO-NAME, OPTION-NAME, CODE) -+# ----------------------------------------------- -+m4_define([LT_OPTION_DEFINE], -+[m4_define(_LT_MANGLE_DEFUN([$1], [$2]), [$3])[]dnl -+])# LT_OPTION_DEFINE -+ -+ -+# dlopen -+# ------ -+LT_OPTION_DEFINE([LT_INIT], [dlopen], [enable_dlopen=yes -+]) -+ -+AU_DEFUN([AC_LIBTOOL_DLOPEN], -+[_LT_SET_OPTION([LT_INIT], [dlopen]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `dlopen' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_DLOPEN], []) -+ -+ -+# win32-dll -+# --------- -+# Declare package support for building win32 dll's. -+LT_OPTION_DEFINE([LT_INIT], [win32-dll], -+[enable_win32_dll=yes -+ -+case $host in -+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) -+ AC_CHECK_TOOL(AS, as, false) -+ AC_CHECK_TOOL(DLLTOOL, dlltool, false) -+ AC_CHECK_TOOL(OBJDUMP, objdump, false) -+ ;; -+esac -+ -+test -z "$AS" && AS=as -+_LT_DECL([], [AS], [0], [Assembler program])dnl -+ -+test -z "$DLLTOOL" && DLLTOOL=dlltool -+_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl -+ -+test -z "$OBJDUMP" && OBJDUMP=objdump -+_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl -+])# win32-dll -+ -+AU_DEFUN([AC_LIBTOOL_WIN32_DLL], -+[AC_REQUIRE([AC_CANONICAL_HOST])dnl -+_LT_SET_OPTION([LT_INIT], [win32-dll]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `win32-dll' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], []) -+ -+ -+# _LT_ENABLE_SHARED([DEFAULT]) -+# ---------------------------- -+# implement the --enable-shared flag, and supports the `shared' and -+# `disable-shared' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_SHARED], -+[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([shared], -+ [AS_HELP_STRING([--enable-shared@<:@=PKGS@:>@], -+ [build shared libraries @<:@default=]_LT_ENABLE_SHARED_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_shared=yes ;; -+ no) enable_shared=no ;; -+ *) -+ enable_shared=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_shared=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_shared=]_LT_ENABLE_SHARED_DEFAULT) -+ -+ _LT_DECL([build_libtool_libs], [enable_shared], [0], -+ [Whether or not to build shared libraries]) -+])# _LT_ENABLE_SHARED -+ -+LT_OPTION_DEFINE([LT_INIT], [shared], [_LT_ENABLE_SHARED([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-shared], [_LT_ENABLE_SHARED([no])]) -+ -+# Old names: -+AC_DEFUN([AC_ENABLE_SHARED], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[shared]) -+]) -+ -+AC_DEFUN([AC_DISABLE_SHARED], -+[_LT_SET_OPTION([LT_INIT], [disable-shared]) -+]) -+ -+AU_DEFUN([AM_ENABLE_SHARED], [AC_ENABLE_SHARED($@)]) -+AU_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_ENABLE_SHARED], []) -+dnl AC_DEFUN([AM_DISABLE_SHARED], []) -+ -+ -+ -+# _LT_ENABLE_STATIC([DEFAULT]) -+# ---------------------------- -+# implement the --enable-static flag, and support the `static' and -+# `disable-static' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_STATIC], -+[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([static], -+ [AS_HELP_STRING([--enable-static@<:@=PKGS@:>@], -+ [build static libraries @<:@default=]_LT_ENABLE_STATIC_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_static=yes ;; -+ no) enable_static=no ;; -+ *) -+ enable_static=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_static=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_static=]_LT_ENABLE_STATIC_DEFAULT) -+ -+ _LT_DECL([build_old_libs], [enable_static], [0], -+ [Whether or not to build static libraries]) -+])# _LT_ENABLE_STATIC -+ -+LT_OPTION_DEFINE([LT_INIT], [static], [_LT_ENABLE_STATIC([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-static], [_LT_ENABLE_STATIC([no])]) -+ -+# Old names: -+AC_DEFUN([AC_ENABLE_STATIC], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[static]) -+]) -+ -+AC_DEFUN([AC_DISABLE_STATIC], -+[_LT_SET_OPTION([LT_INIT], [disable-static]) -+]) -+ -+AU_DEFUN([AM_ENABLE_STATIC], [AC_ENABLE_STATIC($@)]) -+AU_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AM_ENABLE_STATIC], []) -+dnl AC_DEFUN([AM_DISABLE_STATIC], []) -+ -+ -+ -+# _LT_ENABLE_FAST_INSTALL([DEFAULT]) -+# ---------------------------------- -+# implement the --enable-fast-install flag, and support the `fast-install' -+# and `disable-fast-install' LT_INIT options. -+# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'. -+m4_define([_LT_ENABLE_FAST_INSTALL], -+[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl -+AC_ARG_ENABLE([fast-install], -+ [AS_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@], -+ [optimize for fast installation @<:@default=]_LT_ENABLE_FAST_INSTALL_DEFAULT[@:>@])], -+ [p=${PACKAGE-default} -+ case $enableval in -+ yes) enable_fast_install=yes ;; -+ no) enable_fast_install=no ;; -+ *) -+ enable_fast_install=no -+ # Look at the argument we got. We use all the common list separators. -+ lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," -+ for pkg in $enableval; do -+ IFS="$lt_save_ifs" -+ if test "X$pkg" = "X$p"; then -+ enable_fast_install=yes -+ fi -+ done -+ IFS="$lt_save_ifs" -+ ;; -+ esac], -+ [enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT) -+ -+_LT_DECL([fast_install], [enable_fast_install], [0], -+ [Whether or not to optimize for fast installation])dnl -+])# _LT_ENABLE_FAST_INSTALL -+ -+LT_OPTION_DEFINE([LT_INIT], [fast-install], [_LT_ENABLE_FAST_INSTALL([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [disable-fast-install], [_LT_ENABLE_FAST_INSTALL([no])]) -+ -+# Old names: -+AU_DEFUN([AC_ENABLE_FAST_INSTALL], -+[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you put -+the `fast-install' option into LT_INIT's first parameter.]) -+]) -+ -+AU_DEFUN([AC_DISABLE_FAST_INSTALL], -+[_LT_SET_OPTION([LT_INIT], [disable-fast-install]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you put -+the `disable-fast-install' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], []) -+dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], []) -+ -+ -+# _LT_WITH_PIC([MODE]) -+# -------------------- -+# implement the --with-pic flag, and support the `pic-only' and `no-pic' -+# LT_INIT options. -+# MODE is either `yes' or `no'. If omitted, it defaults to `both'. -+m4_define([_LT_WITH_PIC], -+[AC_ARG_WITH([pic], -+ [AS_HELP_STRING([--with-pic], -+ [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], -+ [pic_mode="$withval"], -+ [pic_mode=default]) -+ -+test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) -+ -+_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl -+])# _LT_WITH_PIC -+ -+LT_OPTION_DEFINE([LT_INIT], [pic-only], [_LT_WITH_PIC([yes])]) -+LT_OPTION_DEFINE([LT_INIT], [no-pic], [_LT_WITH_PIC([no])]) -+ -+# Old name: -+AU_DEFUN([AC_LIBTOOL_PICMODE], -+[_LT_SET_OPTION([LT_INIT], [pic-only]) -+AC_DIAGNOSE([obsolete], -+[$0: Remove this warning and the call to _LT_SET_OPTION when you -+put the `pic-only' option into LT_INIT's first parameter.]) -+]) -+ -+dnl aclocal-1.4 backwards compatibility: -+dnl AC_DEFUN([AC_LIBTOOL_PICMODE], []) -+ -+## ----------------- ## -+## LTDL_INIT Options ## -+## ----------------- ## -+ -+m4_define([_LTDL_MODE], []) -+LT_OPTION_DEFINE([LTDL_INIT], [nonrecursive], -+ [m4_define([_LTDL_MODE], [nonrecursive])]) -+LT_OPTION_DEFINE([LTDL_INIT], [recursive], -+ [m4_define([_LTDL_MODE], [recursive])]) -+LT_OPTION_DEFINE([LTDL_INIT], [subproject], -+ [m4_define([_LTDL_MODE], [subproject])]) -+ -+m4_define([_LTDL_TYPE], []) -+LT_OPTION_DEFINE([LTDL_INIT], [installable], -+ [m4_define([_LTDL_TYPE], [installable])]) -+LT_OPTION_DEFINE([LTDL_INIT], [convenience], -+ [m4_define([_LTDL_TYPE], [convenience])]) -diff -ru evolution-2.29.3/m4/ltsugar.m4 evolution-2.29.3.new/m4/ltsugar.m4 ---- evolution-2.29.3/m4/ltsugar.m4 2009-11-30 18:03:02.000000000 +0100 -+++ evolution-2.29.3.new/m4/ltsugar.m4 2009-11-14 19:44:14.000000000 +0100 -@@ -0,0 +1,123 @@ -+# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*- -+# -+# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. -+# Written by Gary V. Vaughan, 2004 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# serial 6 ltsugar.m4 -+ -+# This is to help aclocal find these macros, as it can't see m4_define. -+AC_DEFUN([LTSUGAR_VERSION], [m4_if([0.1])]) -+ -+ -+# lt_join(SEP, ARG1, [ARG2...]) -+# ----------------------------- -+# Produce ARG1SEPARG2...SEPARGn, omitting [] arguments and their -+# associated separator. -+# Needed until we can rely on m4_join from Autoconf 2.62, since all earlier -+# versions in m4sugar had bugs. -+m4_define([lt_join], -+[m4_if([$#], [1], [], -+ [$#], [2], [[$2]], -+ [m4_if([$2], [], [], [[$2]_])$0([$1], m4_shift(m4_shift($@)))])]) -+m4_define([_lt_join], -+[m4_if([$#$2], [2], [], -+ [m4_if([$2], [], [], [[$1$2]])$0([$1], m4_shift(m4_shift($@)))])]) -+ -+ -+# lt_car(LIST) -+# lt_cdr(LIST) -+# ------------ -+# Manipulate m4 lists. -+# These macros are necessary as long as will still need to support -+# Autoconf-2.59 which quotes differently. -+m4_define([lt_car], [[$1]]) -+m4_define([lt_cdr], -+[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])], -+ [$#], 1, [], -+ [m4_dquote(m4_shift($@))])]) -+m4_define([lt_unquote], $1) -+ -+ -+# lt_append(MACRO-NAME, STRING, [SEPARATOR]) -+# ------------------------------------------ -+# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'. -+# Note that neither SEPARATOR nor STRING are expanded; they are appended -+# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked). -+# No SEPARATOR is output if MACRO-NAME was previously undefined (different -+# than defined and empty). -+# -+# This macro is needed until we can rely on Autoconf 2.62, since earlier -+# versions of m4sugar mistakenly expanded SEPARATOR but not STRING. -+m4_define([lt_append], -+[m4_define([$1], -+ m4_ifdef([$1], [m4_defn([$1])[$3]])[$2])]) -+ -+ -+ -+# lt_combine(SEP, PREFIX-LIST, INFIX, SUFFIX1, [SUFFIX2...]) -+# ---------------------------------------------------------- -+# Produce a SEP delimited list of all paired combinations of elements of -+# PREFIX-LIST with SUFFIX1 through SUFFIXn. Each element of the list -+# has the form PREFIXmINFIXSUFFIXn. -+# Needed until we can rely on m4_combine added in Autoconf 2.62. -+m4_define([lt_combine], -+[m4_if(m4_eval([$# > 3]), [1], -+ [m4_pushdef([_Lt_sep], [m4_define([_Lt_sep], m4_defn([lt_car]))])]]dnl -+[[m4_foreach([_Lt_prefix], [$2], -+ [m4_foreach([_Lt_suffix], -+ ]m4_dquote(m4_dquote(m4_shift(m4_shift(m4_shift($@)))))[, -+ [_Lt_sep([$1])[]m4_defn([_Lt_prefix])[$3]m4_defn([_Lt_suffix])])])])]) -+ -+ -+# lt_if_append_uniq(MACRO-NAME, VARNAME, [SEPARATOR], [UNIQ], [NOT-UNIQ]) -+# ----------------------------------------------------------------------- -+# Iff MACRO-NAME does not yet contain VARNAME, then append it (delimited -+# by SEPARATOR if supplied) and expand UNIQ, else NOT-UNIQ. -+m4_define([lt_if_append_uniq], -+[m4_ifdef([$1], -+ [m4_if(m4_index([$3]m4_defn([$1])[$3], [$3$2$3]), [-1], -+ [lt_append([$1], [$2], [$3])$4], -+ [$5])], -+ [lt_append([$1], [$2], [$3])$4])]) -+ -+ -+# lt_dict_add(DICT, KEY, VALUE) -+# ----------------------------- -+m4_define([lt_dict_add], -+[m4_define([$1($2)], [$3])]) -+ -+ -+# lt_dict_add_subkey(DICT, KEY, SUBKEY, VALUE) -+# -------------------------------------------- -+m4_define([lt_dict_add_subkey], -+[m4_define([$1($2:$3)], [$4])]) -+ -+ -+# lt_dict_fetch(DICT, KEY, [SUBKEY]) -+# ---------------------------------- -+m4_define([lt_dict_fetch], -+[m4_ifval([$3], -+ m4_ifdef([$1($2:$3)], [m4_defn([$1($2:$3)])]), -+ m4_ifdef([$1($2)], [m4_defn([$1($2)])]))]) -+ -+ -+# lt_if_dict_fetch(DICT, KEY, [SUBKEY], VALUE, IF-TRUE, [IF-FALSE]) -+# ----------------------------------------------------------------- -+m4_define([lt_if_dict_fetch], -+[m4_if(lt_dict_fetch([$1], [$2], [$3]), [$4], -+ [$5], -+ [$6])]) -+ -+ -+# lt_dict_filter(DICT, [SUBKEY], VALUE, [SEPARATOR], KEY, [...]) -+# -------------------------------------------------------------- -+m4_define([lt_dict_filter], -+[m4_if([$5], [], [], -+ [lt_join(m4_quote(m4_default([$4], [[, ]])), -+ lt_unquote(m4_split(m4_normalize(m4_foreach(_Lt_key, lt_car([m4_shiftn(4, $@)]), -+ [lt_if_dict_fetch([$1], _Lt_key, [$2], [$3], [_Lt_key ])])))))])[]dnl -+]) -diff -ru evolution-2.29.3/m4/ltversion.m4 evolution-2.29.3.new/m4/ltversion.m4 ---- evolution-2.29.3/m4/ltversion.m4 2009-11-30 18:03:07.000000000 +0100 -+++ evolution-2.29.3.new/m4/ltversion.m4 2009-11-14 19:44:14.000000000 +0100 -@@ -0,0 +1,23 @@ -+# ltversion.m4 -- version numbers -*- Autoconf -*- -+# -+# Copyright (C) 2004 Free Software Foundation, Inc. -+# Written by Scott James Remnant, 2004 -+# -+# This file is free software; the Free Software Foundation gives -+# unlimited permission to copy and/or distribute it, with or without -+# modifications, as long as this notice is preserved. -+ -+# Generated from ltversion.in. -+ -+# serial 3012 ltversion.m4 -+# This file is part of GNU Libtool -+ -+m4_define([LT_PACKAGE_VERSION], [2.2.6]) -+m4_define([LT_PACKAGE_REVISION], [1.3012]) -+ -+AC_DEFUN([LTVERSION_VERSION], -+[macro_version='2.2.6' -+macro_revision='1.3012' -+_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) -+_LT_DECL(, macro_revision, 0) -+]) diff --git a/evolution.spec b/evolution.spec index 8da7285..f34b74b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,8 +39,8 @@ ### Abstract ### Name: evolution -Version: 2.29.3 -Release: 4%{?dist} +Version: 2.29.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -63,9 +63,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Temporary hack for missing m4 files from tarball -Patch13: evolution-2.29.3-missing-m4-files.patch - ## Dependencies ### Requires(pre): GConf2 @@ -236,7 +233,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .missing-m4-files mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -684,6 +680,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Dec 21 2009 Milan Crha - 2.29.4-1.fc13 +- Update to 2.29.4 +- Remove patch for missing m4 files from tarball (fixed upstream). + * Mon Nov 30 2009 Milan Crha - 2.29.3-1.fc13 - Update to 2.29.3 - Add patch for missing m4 files from tarball. diff --git a/sources b/sources index e4fdd01..f7ce49d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cadd4949b95b04355c4070ad44e3fdb1 evolution-2.29.3.tar.bz2 +24ee1af34ade7cab2a6116856ee7d63c evolution-2.29.4.tar.bz2 From fcf08e55bc7a3baf60c0358eecc56b9fc50bd1e7 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Dec 2009 17:09:23 +0000 Subject: [PATCH 320/844] - Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines. (see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets) --- evolution.spec | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/evolution.spec b/evolution.spec index f34b74b..48cfa7a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,7 +11,6 @@ %define last_libgal2_version 2:2.5.3-2 %define libgweather_version 2.25.4 %define pilot_link_version 2:0.12.1 -%define scrollkeeper_version 0.1.4 %define soup_version 2.2.2 %define evo_major 2.30 @@ -69,9 +68,6 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -Requires(post): scrollkeeper >= %{scrollkeeper_version} -Requires(postun): scrollkeeper >= %{scrollkeeper_version} - # Don't trust evolution-data-server to maintain accurate sonames. Requires: evolution-data-server >= %{version} @@ -352,9 +348,6 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so %endif -# scrollkeeper gets handled in %post -rm -rf $RPM_BUILD_ROOT/var/lib/scrollkeeper - rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime @@ -383,9 +376,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plu %post /sbin/ldconfig -scrollkeeper-update -q -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || : @@ -424,9 +415,13 @@ fi %postun /sbin/ldconfig -scrollkeeper-update -q -touch --no-create %{_datadir}/icons/hicolor || : -%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || : +if [ $1 -eq 0 ] ; then + touch --no-create %{_datadir}/icons/hicolor &>/dev/null + gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +fi + +%posttrans +gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT @@ -680,6 +675,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Dec 22 2009 Matthew Barnes - 2.29.4-2.fc13 +- Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines. + (see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets) + * Mon Dec 21 2009 Milan Crha - 2.29.4-1.fc13 - Update to 2.29.4 - Remove patch for missing m4 files from tarball (fixed upstream). From 19a75732cfa4546e2a3e3476c11515b619c87ddd Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Dec 2009 17:32:01 +0000 Subject: [PATCH 321/844] Bump release. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 48cfa7a..3442615 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.29.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL From 6dd9ff6dda6b3cb56f52ce6085eb6aabe5cbd7ee Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 12 Jan 2010 09:21:59 +0000 Subject: [PATCH 322/844] - Update to 2.29.5 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index b5f6935..d12de20 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.4.tar.bz2 +evolution-2.29.5.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 3442615..696a1cb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,8 +38,8 @@ ### Abstract ### Name: evolution -Version: 2.29.4 -Release: 2%{?dist} +Version: 2.29.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -675,6 +675,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jan 12 2010 Milan Crha - 2.29.5-1.fc13 +- Update to 2.29.5 + * Tue Dec 22 2009 Matthew Barnes - 2.29.4-2.fc13 - Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines. (see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets) diff --git a/sources b/sources index f7ce49d..42c662d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -24ee1af34ade7cab2a6116856ee7d63c evolution-2.29.4.tar.bz2 +aa88d120231c0e53f78a49ff7f520337 evolution-2.29.5.tar.bz2 From 5f222fa4d693edb8228806060472c5067b0988a9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 13 Jan 2010 17:35:18 +0000 Subject: [PATCH 323/844] Add patch for Gnome bug #606874 (mktemp removed in glibc-2.11.90-8) --- evolution-2.29.5-mktemp.patch | 50 +++++++++++++++++++++++++++++++++++ evolution.spec | 5 ++++ 2 files changed, 55 insertions(+) create mode 100644 evolution-2.29.5-mktemp.patch diff --git a/evolution-2.29.5-mktemp.patch b/evolution-2.29.5-mktemp.patch new file mode 100644 index 0000000..526e242 --- /dev/null +++ b/evolution-2.29.5-mktemp.patch @@ -0,0 +1,50 @@ +diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c +index 509b312..15b5668 100644 +--- a/e-util/e-mktemp.c ++++ b/e-util/e-mktemp.c +@@ -167,7 +167,7 @@ gchar * + e_mktemp (const gchar *template) + { + GString *path; +- gchar *ret; ++ gint fd; + + path = get_dir (TRUE); + if (!path) +@@ -179,10 +179,14 @@ e_mktemp (const gchar *template) + else + g_string_append (path, "unknown-XXXXXX"); + +- ret = mktemp (path->str); +- g_string_free(path, ret == NULL); ++ fd = g_mkstemp (path->str); + +- return ret; ++ if (fd != -1) { ++ close (fd); ++ g_unlink (path->str); ++ } ++ ++ return g_string_free (path, fd == -1); + } + + gint +@@ -226,7 +230,17 @@ e_mkdtemp (const gchar *template) + #ifdef HAVE_MKDTEMP + tmpdir = mkdtemp (path->str); + #else +- tmpdir = mktemp (path->str); ++ { ++ gint fd = g_mkstemp (path->str); ++ if (fd == -1) { ++ tmpdir = NULL; ++ } else { ++ close (fd); ++ tmpdir = path->str; ++ g_unlink (tmpdir); ++ } ++ } ++ + if (tmpdir) { + if (g_mkdir (tmpdir, S_IRWXU) == -1) + tmpdir = NULL; diff --git a/evolution.spec b/evolution.spec index 696a1cb..2dcbcaf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -62,6 +62,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# Gnome bug #606874 / RH bug #554643 +Patch13: evolution-2.29.5-mktemp.patch + ## Dependencies ### Requires(pre): GConf2 @@ -229,6 +232,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .mktemp mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -677,6 +681,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Jan 12 2010 Milan Crha - 2.29.5-1.fc13 - Update to 2.29.5 +- Add patch for Gnome bug #606874 (mktemp removed in glibc-2.11.90-8) * Tue Dec 22 2009 Matthew Barnes - 2.29.4-2.fc13 - Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines. From f1f28dada34524accd11ead4dc6abc0950958952 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 13 Jan 2010 18:05:23 +0000 Subject: [PATCH 324/844] forgotten mktemp call in composer code --- evolution-2.29.5-mktemp.patch | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/evolution-2.29.5-mktemp.patch b/evolution-2.29.5-mktemp.patch index 526e242..c3d0861 100644 --- a/evolution-2.29.5-mktemp.patch +++ b/evolution-2.29.5-mktemp.patch @@ -1,3 +1,34 @@ +diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c +index a289866..f783e6c 100644 +--- a/composer/e-composer-autosave.c ++++ b/composer/e-composer-autosave.c +@@ -91,6 +91,7 @@ static gboolean + composer_autosave_state_open (AutosaveState *state) + { + gchar *path; ++ gint fd; + + if (state->file != NULL) + return TRUE; +@@ -100,13 +101,16 @@ composer_autosave_state_open (AutosaveState *state) + + /* Since GIO doesn't have support for creating temporary files + * from a template (and in a given directory), we have to use +- * mktemp(), which brings a small risk of overwriting another ++ * g_mkstemp(), which brings a small risk of overwriting another + * autosave file. The risk is, however, miniscule. */ +- if (mktemp (path) == NULL) { ++ fd = g_mkstemp (path) ++ if (fd == -1) { + g_free (path); + return FALSE; + } + ++ close (fd); ++ + /* Create the GFile */ + state->file = g_file_new_for_path (path); + g_free (path); diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c index 509b312..15b5668 100644 --- a/e-util/e-mktemp.c From ebeca74cf663aba815b749c5263cb2d0a3e82218 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 13 Jan 2010 18:07:46 +0000 Subject: [PATCH 325/844] typo in a patch --- evolution-2.29.5-mktemp.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution-2.29.5-mktemp.patch b/evolution-2.29.5-mktemp.patch index c3d0861..7f44ecf 100644 --- a/evolution-2.29.5-mktemp.patch +++ b/evolution-2.29.5-mktemp.patch @@ -18,7 +18,7 @@ index a289866..f783e6c 100644 + * g_mkstemp(), which brings a small risk of overwriting another * autosave file. The risk is, however, miniscule. */ - if (mktemp (path) == NULL) { -+ fd = g_mkstemp (path) ++ fd = g_mkstemp (path); + if (fd == -1) { g_free (path); return FALSE; From 6fb3ad1535336a295446c0e51844bb164de621d5 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 18 Jan 2010 21:02:55 +0000 Subject: [PATCH 326/844] Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 2dcbcaf..ede1ef9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.29.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -679,6 +679,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jan 18 2010 Matthias Clasen - 2.29.5-2.fc13 +- Rebuild against new gnome-desktop + * Tue Jan 12 2010 Milan Crha - 2.29.5-1.fc13 - Update to 2.29.5 - Add patch for Gnome bug #606874 (mktemp removed in glibc-2.11.90-8) From 08f39756d4bde5c4101a4f2b53b8c200d89192ce Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 25 Jan 2010 10:42:16 +0000 Subject: [PATCH 327/844] - Update to 2.29.6 - Remove patch for Gnome bug #606874 (fixed upstream) --- .cvsignore | 2 +- evolution-2.29.5-mktemp.patch | 81 ----------------------------------- evolution.spec | 12 +++--- sources | 2 +- 4 files changed, 8 insertions(+), 89 deletions(-) delete mode 100644 evolution-2.29.5-mktemp.patch diff --git a/.cvsignore b/.cvsignore index d12de20..8c8610b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.5.tar.bz2 +evolution-2.29.6.tar.bz2 diff --git a/evolution-2.29.5-mktemp.patch b/evolution-2.29.5-mktemp.patch deleted file mode 100644 index 7f44ecf..0000000 --- a/evolution-2.29.5-mktemp.patch +++ /dev/null @@ -1,81 +0,0 @@ -diff --git a/composer/e-composer-autosave.c b/composer/e-composer-autosave.c -index a289866..f783e6c 100644 ---- a/composer/e-composer-autosave.c -+++ b/composer/e-composer-autosave.c -@@ -91,6 +91,7 @@ static gboolean - composer_autosave_state_open (AutosaveState *state) - { - gchar *path; -+ gint fd; - - if (state->file != NULL) - return TRUE; -@@ -100,13 +101,16 @@ composer_autosave_state_open (AutosaveState *state) - - /* Since GIO doesn't have support for creating temporary files - * from a template (and in a given directory), we have to use -- * mktemp(), which brings a small risk of overwriting another -+ * g_mkstemp(), which brings a small risk of overwriting another - * autosave file. The risk is, however, miniscule. */ -- if (mktemp (path) == NULL) { -+ fd = g_mkstemp (path); -+ if (fd == -1) { - g_free (path); - return FALSE; - } - -+ close (fd); -+ - /* Create the GFile */ - state->file = g_file_new_for_path (path); - g_free (path); -diff --git a/e-util/e-mktemp.c b/e-util/e-mktemp.c -index 509b312..15b5668 100644 ---- a/e-util/e-mktemp.c -+++ b/e-util/e-mktemp.c -@@ -167,7 +167,7 @@ gchar * - e_mktemp (const gchar *template) - { - GString *path; -- gchar *ret; -+ gint fd; - - path = get_dir (TRUE); - if (!path) -@@ -179,10 +179,14 @@ e_mktemp (const gchar *template) - else - g_string_append (path, "unknown-XXXXXX"); - -- ret = mktemp (path->str); -- g_string_free(path, ret == NULL); -+ fd = g_mkstemp (path->str); - -- return ret; -+ if (fd != -1) { -+ close (fd); -+ g_unlink (path->str); -+ } -+ -+ return g_string_free (path, fd == -1); - } - - gint -@@ -226,7 +230,17 @@ e_mkdtemp (const gchar *template) - #ifdef HAVE_MKDTEMP - tmpdir = mkdtemp (path->str); - #else -- tmpdir = mktemp (path->str); -+ { -+ gint fd = g_mkstemp (path->str); -+ if (fd == -1) { -+ tmpdir = NULL; -+ } else { -+ close (fd); -+ tmpdir = path->str; -+ g_unlink (tmpdir); -+ } -+ } -+ - if (tmpdir) { - if (g_mkdir (tmpdir, S_IRWXU) == -1) - tmpdir = NULL; diff --git a/evolution.spec b/evolution.spec index ede1ef9..6e130ab 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,8 +38,8 @@ ### Abstract ### Name: evolution -Version: 2.29.5 -Release: 2%{?dist} +Version: 2.29.6 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -62,9 +62,6 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch -# Gnome bug #606874 / RH bug #554643 -Patch13: evolution-2.29.5-mktemp.patch - ## Dependencies ### Requires(pre): GConf2 @@ -232,7 +229,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset -%patch13 -p1 -b .mktemp mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -679,6 +675,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jan 25 2010 Milan Crha - 2.29.6-1.fc13 +- Update to 2.29.6 +- Remove patch for Gnome bug #606874 (fixed upstream) + * Mon Jan 18 2010 Matthias Clasen - 2.29.5-2.fc13 - Rebuild against new gnome-desktop diff --git a/sources b/sources index 42c662d..d2c8d44 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa88d120231c0e53f78a49ff7f520337 evolution-2.29.5.tar.bz2 +a6e5054b9f5ad373e8ed545418637c33 evolution-2.29.6.tar.bz2 From 3938ced383266b4dcfc3369704a67cffe8f7b843 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 25 Jan 2010 12:33:13 +0000 Subject: [PATCH 328/844] - Add rarian-compat to BuildRequires for Scrollkeeper. --- evolution.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 6e130ab..2a9223f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -109,6 +109,7 @@ BuildRequires: libxml2-devel BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: pkgconfig +BuildRequires: rarian-compat BuildRequires: unique-devel %if %{inline_audio_support} @@ -677,7 +678,8 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jan 25 2010 Milan Crha - 2.29.6-1.fc13 - Update to 2.29.6 -- Remove patch for Gnome bug #606874 (fixed upstream) +- Remove patch for Gnome bug #606874 (fixed upstream). +- Add rarian-compat to BuildRequires for Scrollkeeper. * Mon Jan 18 2010 Matthias Clasen - 2.29.5-2.fc13 - Rebuild against new gnome-desktop From 4b4e7fc5e5d83ea07d86d74609bde744f9a6d27d Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 29 Jan 2010 19:08:26 +0000 Subject: [PATCH 329/844] - Bump gtkhtml3 requirement to 3.29.6. --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 2a9223f..4b3b047 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.14.0 -%define gtkhtml_version 3.29.3 +%define gtkhtml_version 3.29.6 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libgweather_version 2.25.4 @@ -39,7 +39,7 @@ Name: evolution Version: 2.29.6 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -676,6 +676,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jan 29 2010 Matthew Barnes - 2.29.6-2.fc13 +- Bump gtkhtml3 requirement to 3.29.6. + * Mon Jan 25 2010 Milan Crha - 2.29.6-1.fc13 - Update to 2.29.6 - Remove patch for Gnome bug #606874 (fixed upstream). From 0e1d4935dcf5f5e52c72eeac9a1df4629c3d3ee5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 8 Feb 2010 11:42:34 +0000 Subject: [PATCH 330/844] - Update to 2.29.90 - Removed unneeded BuildRequires. --- .cvsignore | 2 +- evolution.spec | 10 ++++++---- sources | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8c8610b..e4202c2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.6.tar.bz2 +evolution-2.29.90.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 4b3b047..d5a11f3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -38,8 +38,8 @@ ### Abstract ### Name: evolution -Version: 2.29.6 -Release: 2%{?dist} +Version: 2.29.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -81,12 +81,10 @@ BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 BuildRequires: bison -BuildRequires: byacc BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils BuildRequires: evolution-data-server-devel >= %{version} -BuildRequires: flex BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -676,6 +674,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 08 2010 Milan Crha - 2.29.90-1.fc13 +- Update to 2.29.90 +- Removed unneeded BuildRequires. + * Fri Jan 29 2010 Matthew Barnes - 2.29.6-2.fc13 - Bump gtkhtml3 requirement to 3.29.6. diff --git a/sources b/sources index d2c8d44..5bd04a3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a6e5054b9f5ad373e8ed545418637c33 evolution-2.29.6.tar.bz2 +bc62be6f295eef36da32ccbf28cc03da evolution-2.29.90.tar.bz2 From 802f6973af4b2e518a84d196e3b4f0888731c347 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 9 Feb 2010 19:23:15 +0000 Subject: [PATCH 331/844] - Rebuild against evolution-data-server-2.29.90-3 --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index d5a11f3..65fa43f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,7 +39,7 @@ Name: evolution Version: 2.29.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -674,6 +674,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Feb 09 2010 Milan Crha - 2.29.90-2.fc13 +- Rebuild against evolution-data-server-2.29.90-3 + * Mon Feb 08 2010 Milan Crha - 2.29.90-1.fc13 - Update to 2.29.90 - Removed unneeded BuildRequires. From 3c5fe2d1073f8a94d564d7d9f3ec22256caaf9aa Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 May 2010 17:38:31 +0000 Subject: [PATCH 332/844] - Update to 2.31.1 --- .cvsignore | 2 +- evolution-1.4.4-ldap-x86_64-hack.patch | 23 ++-- evolution.spec | 159 +++++++++++++------------ sources | 2 +- 4 files changed, 101 insertions(+), 85 deletions(-) diff --git a/.cvsignore b/.cvsignore index e4202c2..0729466 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.29.90.tar.bz2 +evolution-2.31.1.tar.bz2 diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch index f37328b..2a1946b 100644 --- a/evolution-1.4.4-ldap-x86_64-hack.patch +++ b/evolution-1.4.4-ldap-x86_64-hack.patch @@ -1,12 +1,21 @@ -diff -up evolution-2.24.1/configure.ldaphack evolution-2.24.1/configure ---- evolution-2.24.1/configure.ldaphack 2008-10-19 23:37:55.000000000 -0400 -+++ evolution-2.24.1/configure 2008-10-21 13:16:16.000000000 -0400 -@@ -28471,7 +28471,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} +diff -up evolution-2.31.1/configure.ldaphack evolution-2.31.1/configure +--- evolution-2.31.1/configure.ldaphack 2010-05-03 12:43:34.000000000 +0200 ++++ evolution-2.31.1/configure 2010-05-03 19:22:55.000000000 +0200 +@@ -15797,7 +15797,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" +LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" - cat >conftest.$ac_ext <<_ACEOF - /* confdefs.h. */ - _ACEOF + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + +@@ -16129,7 +16129,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} + $as_echo_n "(cached) " >&6 + else + ac_check_lib_save_LIBS=$LIBS +-LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" ++LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + diff --git a/evolution.spec b/evolution.spec index 65fa43f..21a716c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,19 +1,19 @@ %define dbus_glib_version 0.70 %define dbus_version 1.0 -%define glib2_version 2.16.0 +%define glib2_version 2.22.0 %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 -%define gtk2_version 2.14.0 -%define gtkhtml_version 3.29.6 +%define gtk2_version 2.20.0 +%define gtkhtml_version 3.31.1 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libgweather_version 2.25.4 %define pilot_link_version 2:0.12.1 -%define soup_version 2.2.2 +%define soup_version 2.4.0 -%define evo_major 2.30 +%define evo_base_version 3.0 %define exchange_support 1 %define inline_audio_support 1 @@ -33,19 +33,19 @@ %define build_conduits 1 %endif -%define evo_plugin_dir %{_libdir}/evolution/%{evo_major}/plugins +%define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins ### Abstract ### Name: evolution -Version: 2.29.90 -Release: 2%{?dist} +Version: 2.31.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.29/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2 Obsoletes: libgal2 <= %{last_libgal2_version} @@ -73,6 +73,7 @@ Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gnome-themes +Requires: gvfs ### Build Dependencies ### @@ -95,7 +96,6 @@ BuildRequires: gtk-doc BuildRequires: gtk2-devel >= %{gtk2_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: gtkimageview-devel -BuildRequires: gvfs BuildRequires: intltool >= %{intltool_version} BuildRequires: libcanberra-devel BuildRequires: libgnomecanvas-devel >= 2.0 @@ -216,7 +216,6 @@ Group: Applications/Productivity Summary: PST importer plugin for Evolution Requires: %{name} = %{version}-%{release} Requires: libpst -Requires: libytnef %description pst This package contains the plugin to import Microsoft Personal Storage Table @@ -299,9 +298,9 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DE cd po grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep mv POTFILES.keep POTFILES.in -intltool-update --gettext-package=%{name}-%{evo_major} --pot +intltool-update --gettext-package=%{name}-%{evo_base_version} --pot for p in *.po; do - msgmerge $p %{name}-%{evo_major}.pot > $p.out + msgmerge $p %{name}-%{evo_base_version}.pot > $p.out msgfmt -o `basename $p .po`.gmo $p.out done cd - @@ -350,10 +349,10 @@ rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime -%find_lang evolution-%{evo_major} --all-name --with-gnome +%find_lang evolution-%{evo_base_version} --all-name --with-gnome -grep "/usr/share/locale" evolution-%{evo_major}.lang > translations.lang -grep -v "/usr/share/locale" evolution-%{evo_major}.lang > help.lang +grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang +grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang %pre if [ "$1" -gt 1 ] ; then @@ -446,8 +445,11 @@ rm -rf $RPM_BUILD_ROOT # The alarm notify daemon %{_bindir}/evolution-alarm-notify +%{_bindir}/evolution-settings + # Desktop files: %{_datadir}/applications/evolution.desktop +%{_datadir}/applications/evolution-settings.desktop %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop # Icons: @@ -461,42 +463,43 @@ rm -rf $RPM_BUILD_ROOT # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution -%{_datadir}/evolution/%{evo_major} +%{_datadir}/evolution/%{evo_base_version} # Modules: %dir %{_libdir}/evolution -%dir %{_libdir}/evolution/%{evo_major} -%{_libdir}/evolution/%{evo_major}/modules +%dir %{_libdir}/evolution/%{evo_base_version} +%{_libdir}/evolution/%{evo_base_version}/modules # Shared libraries: -%{_libdir}/evolution/%{evo_major}/libcomposer.so.* -%{_libdir}/evolution/%{evo_major}/libeabutil.so.* -%{_libdir}/evolution/%{evo_major}/libecontacteditor.so.* -%{_libdir}/evolution/%{evo_major}/libecontactlisteditor.so.* -%{_libdir}/evolution/%{evo_major}/libemformat.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-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-calendar.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-mail.so.* -%{_libdir}/evolution/%{evo_major}/libevolution-smime.so.* -%{_libdir}/evolution/%{evo_major}/libfilter.so.* -%{_libdir}/evolution/%{evo_major}/libmenus.so.* +%{_libdir}/evolution/%{evo_base_version}/libcomposer.so.* +%{_libdir}/evolution/%{evo_base_version}/libeabutil.so.* +%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so.* +%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so.* +%{_libdir}/evolution/%{evo_base_version}/libemformat.so.* +%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so.* +%{_libdir}/evolution/%{evo_base_version}/libeshell.so.* +%{_libdir}/evolution/%{evo_base_version}/libessmime.so.* +%{_libdir}/evolution/%{evo_base_version}/libetable.so.* +%{_libdir}/evolution/%{evo_base_version}/libetext.so.* +%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so.* +%{_libdir}/evolution/%{evo_base_version}/libeutil.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.* +%{_libdir}/evolution/%{evo_base_version}/libfilter.so.* +%{_libdir}/evolution/%{evo_base_version}/libmenus.so.* # Various libexec programs: %dir %{_libexecdir}/evolution -%dir %{_libexecdir}/evolution/%{evo_major} -%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-export -%{_libexecdir}/evolution/%{evo_major}/evolution-backup -%{_libexecdir}/evolution/%{evo_major}/killev +%dir %{_libexecdir}/evolution/%{evo_base_version} +%{_libexecdir}/evolution/%{evo_base_version}/evolution-addressbook-export +%{_libexecdir}/evolution/%{evo_base_version}/evolution-backup +%{_libexecdir}/evolution/%{evo_base_version}/killev # The plugin directory: %dir %{evo_plugin_dir} @@ -602,33 +605,34 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) %{_datadir}/gtk-doc/html/eshell -%{_includedir}/evolution-%{evo_major} +%{_includedir}/evolution-%{evo_base_version} %{_libdir}/pkgconfig/evolution-calendar.pc %{_libdir}/pkgconfig/evolution-mail.pc %{_libdir}/pkgconfig/evolution-plugin.pc %{_libdir}/pkgconfig/evolution-shell.pc -%{_libdir}/evolution/%{evo_major}/libcomposer.so -%{_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}/libemformat.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-importers.so -%{_libdir}/evolution/%{evo_major}/libevolution-calendar.so -%{_libdir}/evolution/%{evo_major}/libevolution-calendar-importers.so -%{_libdir}/evolution/%{evo_major}/libevolution-mail-importers.so -%{_libdir}/evolution/%{evo_major}/libevolution-mail.so -%{_libdir}/evolution/%{evo_major}/libevolution-smime.so -%{_libdir}/evolution/%{evo_major}/libfilter.so -%{_libdir}/evolution/%{evo_major}/libmenus.so +%{_libdir}/evolution/%{evo_base_version}/libcomposer.so +%{_libdir}/evolution/%{evo_base_version}/libeabutil.so +%{_libdir}/evolution/%{evo_base_version}/libeconduit.so +%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so +%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so +%{_libdir}/evolution/%{evo_base_version}/libemformat.so +%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so +%{_libdir}/evolution/%{evo_base_version}/libeshell.so +%{_libdir}/evolution/%{evo_base_version}/libessmime.so +%{_libdir}/evolution/%{evo_base_version}/libetable.so +%{_libdir}/evolution/%{evo_base_version}/libetext.so +%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so +%{_libdir}/evolution/%{evo_base_version}/libeutil.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so +%{_libdir}/evolution/%{evo_base_version}/libfilter.so +%{_libdir}/evolution/%{evo_base_version}/libmenus.so %files help -f help.lang %defattr(-, root, root) @@ -637,13 +641,13 @@ rm -rf $RPM_BUILD_ROOT %if %{build_conduits} %files conduits %defattr(-, root, root) -%dir %{_libdir}/evolution/%{evo_major}/conduits -%{_libdir}/evolution/%{evo_major}/libeconduit.so.* -%{_libdir}/evolution/%{evo_major}/conduits/libeaddress_conduit.so -%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_common_conduit.so -%{_libdir}/evolution/%{evo_major}/conduits/libecalendar_conduit.so -%{_libdir}/evolution/%{evo_major}/conduits/libememo_conduit.so -%{_libdir}/evolution/%{evo_major}/conduits/libetodo_conduit.so +%dir %{_libdir}/evolution/%{evo_base_version}/conduits +%{_libdir}/evolution/%{evo_base_version}/libeconduit.so.* +%{_libdir}/evolution/%{evo_base_version}/conduits/libeaddress_conduit.so +%{_libdir}/evolution/%{evo_base_version}/conduits/libecalendar_common_conduit.so +%{_libdir}/evolution/%{evo_base_version}/conduits/libecalendar_conduit.so +%{_libdir}/evolution/%{evo_base_version}/conduits/libememo_conduit.so +%{_libdir}/evolution/%{evo_base_version}/conduits/libetodo_conduit.so %{_libdir}/gnome-pilot/conduits/e-address.conduit %{_libdir}/gnome-pilot/conduits/e-calendar.conduit %{_libdir}/gnome-pilot/conduits/e-memo.conduit @@ -663,8 +667,8 @@ rm -rf $RPM_BUILD_ROOT %files perl %defattr(-, root, root) -%{_libexecdir}/evolution/%{evo_major}/csv2vcard -%{_libexecdir}/evolution/%{evo_major}/evolution-addressbook-clean +%{_libexecdir}/evolution/%{evo_base_version}/csv2vcard +%{_libexecdir}/evolution/%{evo_base_version}/evolution-addressbook-clean %if %{libpst_support} %files pst @@ -674,6 +678,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 03 2010 Milan Crha - 2.31.1-1.fc14 +- Update to 2.31.1 + * Tue Feb 09 2010 Milan Crha - 2.29.90-2.fc13 - Rebuild against evolution-data-server-2.29.90-3 diff --git a/sources b/sources index 5bd04a3..55cbf70 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -bc62be6f295eef36da32ccbf28cc03da evolution-2.29.90.tar.bz2 +e71e4310e4c6566d3b244b15238ac35c evolution-2.31.1.tar.bz2 From 0396544ca63356bf57c7ee705a33587d4fb69dc9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 4 May 2010 09:19:54 +0000 Subject: [PATCH 333/844] Requires libgdata-devel, as it's not part of evolution-data-server anymore --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index 21a716c..a74e266 100644 --- a/evolution.spec +++ b/evolution.spec @@ -9,6 +9,7 @@ %define gtkhtml_version 3.31.1 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 +%define libgdata_version 0.6.3 %define libgweather_version 2.25.4 %define pilot_link_version 2:0.12.1 %define soup_version 2.4.0 @@ -99,6 +100,7 @@ BuildRequires: gtkimageview-devel BuildRequires: intltool >= %{intltool_version} BuildRequires: libcanberra-devel BuildRequires: libgnomecanvas-devel >= 2.0 +BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libpst-devel BuildRequires: libsoup-devel >= %{soup_version} @@ -155,6 +157,7 @@ Requires: %{name} = %{version}-%{release} Requires: evolution-data-server-devel >= %{version} Requires: gtk2-devel >= %{gtk2_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} +Requires: libgdata-devel >= %{libgdata_version} Requires: libgweather-devel >= %{libgweather_version} Requires: libsoup-devel >= %{soup_version} Requires: libxml2-devel From 96034db949c93817314bc9354a3a56e070ef727e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 8 May 2010 15:10:00 +0000 Subject: [PATCH 334/844] - Require yelp in evolution-help (RH bug #589555). - Add patch for RH bug #589555 (hide Help->Contents if evolution-help is not installed). --- evolution-2.30.1-help-contents.patch | 18 ++++++++++++++++++ evolution.spec | 12 +++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 evolution-2.30.1-help-contents.patch diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch new file mode 100644 index 0000000..e53d67a --- /dev/null +++ b/evolution-2.30.1-help-contents.patch @@ -0,0 +1,18 @@ +diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c +--- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents 2010-04-26 09:13:18.000000000 -0400 ++++ evolution-2.30.1.2/shell/e-shell-window-actions.c 2010-05-07 21:29:06.269059830 -0400 +@@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo + if (path == NULL) + gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE); + g_free (path); ++ ++ /* Viewing user documentation requires the evolution-help ++ * Fedora package. Look for one of the files it installs. */ ++ path = g_build_filename ( ++ EVOLUTION_DATADIR, "omf", PACKAGE, "evolution-C.omf", NULL); ++ if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) ++ gtk_action_set_visible (ACTION (CONTENTS), FALSE); ++ g_free (path); + } + + static GList * diff --git a/evolution.spec b/evolution.spec index a74e266..4a72fbd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ Name: evolution Version: 2.31.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -63,6 +63,9 @@ Patch11: evolution-2.5.4-fix-conduit-dir.patch # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch +# RH bug #589555 +Patch13: evolution-2.30.1-help-contents.patch + ## Dependencies ### Requires(pre): GConf2 @@ -170,6 +173,7 @@ Development files needed for building things which link against %{name}. Group: Applications/Productivity Summary: Help files for %{name} Requires: %{name} = %{version}-%{release} +Requires: yelp BuildArch: noarch %description help @@ -230,6 +234,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset +%patch13 -p1 -b .help-contents mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -681,6 +686,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri May 07 2010 Matthew Barnes - 2.31.1-2.fc14 +- Require yelp in evolution-help (RH bug #589555). +- Add patch for RH bug #589555 (hide Help->Contents if evolution-help + is not installed). + * Mon May 03 2010 Milan Crha - 2.31.1-1.fc14 - Update to 2.31.1 From f2eaf035156bd4c2085ea5262bb186fea589d36b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 May 2010 10:23:12 +0000 Subject: [PATCH 335/844] - Update to 2.31.2 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 0729466..e61c946 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.31.1.tar.bz2 +evolution-2.31.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 4a72fbd..5fe3e46 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,8 +39,8 @@ ### Abstract ### Name: evolution -Version: 2.31.1 -Release: 2%{?dist} +Version: 2.31.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -686,6 +686,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 24 2010 Milan Crha - 2.31.2-1.fc14 +- Update to 2.31.2 + * Fri May 07 2010 Matthew Barnes - 2.31.1-2.fc14 - Require yelp in evolution-help (RH bug #589555). - Add patch for RH bug #589555 (hide Help->Contents if evolution-help diff --git a/sources b/sources index 55cbf70..b44ffe9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e71e4310e4c6566d3b244b15238ac35c evolution-2.31.1.tar.bz2 +df2a754be6a5918c0d52928c23b5c8e1 evolution-2.31.2.tar.bz2 From 0b62a005e507989a9b3af5b01757cf8958d81ae9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 May 2010 10:29:50 +0000 Subject: [PATCH 336/844] - Bump gtkhtml3 requirement to 3.31.2 --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 5fe3e46..0ead01b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gnome_icon_theme_version 2.19.91 %define gnome_pilot_version 2.0.15 %define gtk2_version 2.20.0 -%define gtkhtml_version 3.31.1 +%define gtkhtml_version 3.31.2 %define intltool_version 0.35.5 %define last_libgal2_version 2:2.5.3-2 %define libgdata_version 0.6.3 @@ -688,6 +688,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon May 24 2010 Milan Crha - 2.31.2-1.fc14 - Update to 2.31.2 +- Bump gtkhtml3 requirement to 3.31.2 * Fri May 07 2010 Matthew Barnes - 2.31.1-2.fc14 - Require yelp in evolution-help (RH bug #589555). From 354c12d442843b9b168f20014abbd74bc57a38ab Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 May 2010 13:10:06 +0000 Subject: [PATCH 337/844] default-mailer plugin removed, evolution-alarm-notify moved elsewhere --- evolution.spec | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0ead01b..dfe6f1d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -450,9 +450,6 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution -# The alarm notify daemon -%{_bindir}/evolution-alarm-notify - %{_bindir}/evolution-settings # Desktop files: @@ -506,6 +503,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libexecdir}/evolution %dir %{_libexecdir}/evolution/%{evo_base_version} %{_libexecdir}/evolution/%{evo_base_version}/evolution-addressbook-export +%{_libexecdir}/evolution/%{evo_base_version}/evolution-alarm-notify %{_libexecdir}/evolution/%{evo_base_version}/evolution-backup %{_libexecdir}/evolution/%{evo_base_version}/killev @@ -543,9 +541,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-calendar-weather.eplug %{evo_plugin_dir}/liborg-gnome-calendar-weather.so -%{evo_plugin_dir}/org-gnome-default-mailer.eplug -%{evo_plugin_dir}/liborg-gnome-default-mailer.so - %{evo_plugin_dir}/org-gnome-default-source.eplug %{evo_plugin_dir}/liborg-gnome-default-source.so From 11be6547d66a1d827bff731892a0d702e5627c84 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 May 2010 21:14:29 +0000 Subject: [PATCH 338/844] - Evolution Express supercedes Anjal. - No need to undefine GNOME_DISABLE_DEPRECATED. - Remove exchange_support flag; it's all in evolution-exchange now. --- evolution.spec | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/evolution.spec b/evolution.spec index dfe6f1d..a00c383 100644 --- a/evolution.spec +++ b/evolution.spec @@ -8,7 +8,6 @@ %define gtk2_version 2.20.0 %define gtkhtml_version 3.31.2 %define intltool_version 0.35.5 -%define last_libgal2_version 2:2.5.3-2 %define libgdata_version 0.6.3 %define libgweather_version 2.25.4 %define pilot_link_version 2:0.12.1 @@ -16,7 +15,9 @@ %define evo_base_version 3.0 -%define exchange_support 1 +%define last_anjal_version 0.3.2-3 +%define last_libgal2_version 2:2.5.3-2 + %define inline_audio_support 1 %define ldap_support 1 %define libnotify_support 1 @@ -40,7 +41,7 @@ Name: evolution Version: 2.31.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -48,6 +49,7 @@ URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2 +Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} ### Patches ### @@ -278,28 +280,19 @@ if ! pkg-config --exists nss; then exit 1 fi -%if %{exchange_support} -%define exchange_flags --enable-exchange -%else -%define exchange_flags --disable-exchange -%endif - CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS -# Regenerate mail/Makefile.in (this is temporary). -# autoreconf --force - %configure \ --enable-gtk-doc \ --enable-ipv6 \ --with-sub-version=" (%{version}-%{release})" \ --with-kde-applnk-path=no \ %ldap_flags %pilot_flags %krb5_flags \ - %nntp_flags %ssl_flags %exchange_flags \ + %nntp_flags %ssl_flags --enable-plugins=all export tagname=CC -make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -UGNOME_DISABLE_DEPRECATED -fno-strict-aliasing" +make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. @@ -681,6 +674,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri May 28 2010 Matthew Barnes - 2.31.2-2.fc14 +- Evolution Express supercedes Anjal. +- No need to undefine GNOME_DISABLE_DEPRECATED. +- Remove exchange_support flag; it's all in evolution-exchange now. + * Mon May 24 2010 Milan Crha - 2.31.2-1.fc14 - Update to 2.31.2 - Bump gtkhtml3 requirement to 3.31.2 From 5e66fe8a55eb7d893f4b6a4fdb1fb09520d2eae9 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 May 2010 21:25:44 +0000 Subject: [PATCH 339/844] - Evolution Express supercedes Anjal. - No need to undefine GNOME_DISABLE_DEPRECATED. - Remove nntp_support flag; that got moved to E-D-S ages ago. - Remove exchange_support flag; it's all in evolution-exchange now. --- evolution.spec | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/evolution.spec b/evolution.spec index a00c383..f1a5549 100644 --- a/evolution.spec +++ b/evolution.spec @@ -23,7 +23,6 @@ %define libnotify_support 1 %define libpst_support 1 %define krb5_support 1 -%define nntp_support 1 %ifnarch s390 s390x %define nm_support 1 %else @@ -267,12 +266,6 @@ done %define krb5_flags --without-krb5 %endif -%if %{nntp_support} -%define nntp_flags --enable-nntp -%else -%define nntp_flags --disable-nntp -%endif - %define ssl_flags --enable-nss=yes --enable-smime=yes if ! pkg-config --exists nss; then @@ -285,11 +278,9 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com %configure \ --enable-gtk-doc \ - --enable-ipv6 \ --with-sub-version=" (%{version}-%{release})" \ --with-kde-applnk-path=no \ - %ldap_flags %pilot_flags %krb5_flags \ - %nntp_flags %ssl_flags + %ldap_flags %pilot_flags %krb5_flags %ssl_flags \ --enable-plugins=all export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" @@ -677,6 +668,7 @@ rm -rf $RPM_BUILD_ROOT * Fri May 28 2010 Matthew Barnes - 2.31.2-2.fc14 - Evolution Express supercedes Anjal. - No need to undefine GNOME_DISABLE_DEPRECATED. +- Remove nntp_support flag; that got moved to E-D-S ages ago. - Remove exchange_support flag; it's all in evolution-exchange now. * Mon May 24 2010 Milan Crha - 2.31.2-1.fc14 From cc450c2ab6f9b3e9b2d6c86dba34af8ecd0d3f2d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Jun 2010 12:04:52 +0000 Subject: [PATCH 340/844] - Update to 2.31.3 --- .cvsignore | 2 +- evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index e61c946..819c992 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.31.2.tar.bz2 +evolution-2.31.3.tar.bz2 diff --git a/evolution.spec b/evolution.spec index f1a5549..44e3d5e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -39,8 +39,8 @@ ### Abstract ### Name: evolution -Version: 2.31.2 -Release: 2%{?dist} +Version: 2.31.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -665,6 +665,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 07 2010 Milan Crha - 2.31.3-1.fc14 +- Update to 2.31.3 + * Fri May 28 2010 Matthew Barnes - 2.31.2-2.fc14 - Evolution Express supercedes Anjal. - No need to undefine GNOME_DISABLE_DEPRECATED. diff --git a/sources b/sources index b44ffe9..ec4116f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -df2a754be6a5918c0d52928c23b5c8e1 evolution-2.31.2.tar.bz2 +006ae66cf24385195ad6bf439f79b0c9 evolution-2.31.3.tar.bz2 From bfcacd1f2388062d50ac34c00e3efc2879b68d53 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Jun 2010 16:53:35 +0000 Subject: [PATCH 341/844] startup wizard plugin gone --- evolution.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 44e3d5e..d07e171 100644 --- a/evolution.spec +++ b/evolution.spec @@ -537,9 +537,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-google.eplug %{evo_plugin_dir}/liborg-gnome-evolution-google.so -%{evo_plugin_dir}/org-gnome-evolution-startup-wizard.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-startup-wizard.so - %{evo_plugin_dir}/org-gnome-groupwise-features.eplug %{evo_plugin_dir}/liborg-gnome-groupwise-features.so %{evo_plugin_dir}/org-gnome-compose-send-options.xml From 74191a078e24e648ce72f647f39f4d7f9e1a542e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 13 Jul 2010 13:56:22 +0000 Subject: [PATCH 342/844] - Update to 2.31.5 - Remove 'conduit' (removed upstream) --- .cvsignore | 2 +- evolution-2.30.1-help-contents.patch | 2 +- evolution-2.5.4-fix-conduit-dir.patch | 96 --------------------------- evolution.spec | 64 ++---------------- sources | 2 +- 5 files changed, 9 insertions(+), 157 deletions(-) delete mode 100644 evolution-2.5.4-fix-conduit-dir.patch diff --git a/.cvsignore b/.cvsignore index 819c992..a151a6e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -evolution-2.31.3.tar.bz2 +evolution-2.31.5.tar.bz2 diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index e53d67a..1c90903 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -3,7 +3,7 @@ diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evoluti +++ evolution-2.30.1.2/shell/e-shell-window-actions.c 2010-05-07 21:29:06.269059830 -0400 @@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) - gtk_action_set_visible (ACTION (SYNC_OPTIONS), FALSE); + gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); + + /* Viewing user documentation requires the evolution-help diff --git a/evolution-2.5.4-fix-conduit-dir.patch b/evolution-2.5.4-fix-conduit-dir.patch deleted file mode 100644 index 334564b..0000000 --- a/evolution-2.5.4-fix-conduit-dir.patch +++ /dev/null @@ -1,96 +0,0 @@ -diff -up evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.am ---- evolution-2.23.4/addressbook/conduit/Makefile.am.fix-conduit-dir 2008-06-15 23:20:16.000000000 -0400 -+++ evolution-2.23.4/addressbook/conduit/Makefile.am 2008-07-18 09:10:29.000000000 -0400 -@@ -25,7 +25,7 @@ e-address.conduit: e-address.conduit.in - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-address.conduit - - BUILT_SOURCES = $(conduit_DATA) -diff -up evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir evolution-2.23.4/addressbook/conduit/Makefile.in ---- evolution-2.23.4/addressbook/conduit/Makefile.in.fix-conduit-dir 2008-06-16 07:11:50.000000000 -0400 -+++ evolution-2.23.4/addressbook/conduit/Makefile.in 2008-07-18 09:10:29.000000000 -0400 -@@ -421,7 +421,7 @@ libeaddress_conduit_la_LIBADD = \ - $(top_builddir)/widgets/misc/libemiscwidgets.la \ - $(EVOLUTION_ADDRESSBOOK_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-address.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.am ---- evolution-2.23.4/calendar/conduits/calendar/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/calendar/Makefile.am 2008-07-18 09:10:29.000000000 -0400 -@@ -28,7 +28,7 @@ e-calendar.conduit: e-calendar.conduit.i - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar.conduit - - BUILT_SOURCES = $(conduit_DATA) -diff -up evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/calendar/Makefile.in ---- evolution-2.23.4/calendar/conduits/calendar/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/calendar/Makefile.in 2008-07-18 09:13:04.000000000 -0400 -@@ -426,7 +426,7 @@ libecalendar_conduit_la_LIBADD = \ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-calendar.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.am ---- evolution-2.23.4/calendar/conduits/memo/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/memo/Makefile.am 2008-07-18 09:10:29.000000000 -0400 -@@ -28,7 +28,7 @@ e-memo.conduit: e-memo.conduit.in - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo.conduit - - BUILT_SOURCES = $(conduit_DATA) -diff -up evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/memo/Makefile.in ---- evolution-2.23.4/calendar/conduits/memo/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/memo/Makefile.in 2008-07-18 09:12:17.000000000 -0400 -@@ -424,7 +424,7 @@ libememo_conduit_la_LIBADD = \ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-memo.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) -diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.am ---- evolution-2.23.4/calendar/conduits/todo/Makefile.am.fix-conduit-dir 2008-06-15 23:22:48.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/todo/Makefile.am 2008-07-18 09:10:29.000000000 -0400 -@@ -28,7 +28,7 @@ e-todo.conduit: e-todo.conduit.in - -e 's^\@BASE_VERSION\@^$(BASE_VERSION)^g' \ - $< > $@ - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit - - BUILT_SOURCES = $(conduit_DATA) -diff -up evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir evolution-2.23.4/calendar/conduits/todo/Makefile.in ---- evolution-2.23.4/calendar/conduits/todo/Makefile.in.fix-conduit-dir 2008-06-16 07:11:53.000000000 -0400 -+++ evolution-2.23.4/calendar/conduits/todo/Makefile.in 2008-07-18 09:11:53.000000000 -0400 -@@ -424,7 +424,7 @@ libetodo_conduit_la_LIBADD = \ - $(top_builddir)/calendar/conduits/common/libecalendar_common_conduit.la \ - $(EVOLUTION_CALENDAR_CONDUIT_LIBS) - --conduitdir = $(datadir)/gnome-pilot/conduits/ -+conduitdir = $(libdir)/gnome-pilot/conduits/ - conduit_DATA = e-todo.conduit - BUILT_SOURCES = $(conduit_DATA) - CLEANFILES = $(BUILT_SOURCES) diff --git a/evolution.spec b/evolution.spec index d07e171..344c4b3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,13 +4,11 @@ %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 -%define gnome_pilot_version 2.0.15 %define gtk2_version 2.20.0 %define gtkhtml_version 3.31.2 %define intltool_version 0.35.5 %define libgdata_version 0.6.3 %define libgweather_version 2.25.4 -%define pilot_link_version 2:0.12.1 %define soup_version 2.4.0 %define evo_base_version 3.0 @@ -28,18 +26,13 @@ %else %define nm_support 0 %endif -%ifarch s390 s390x -%define build_conduits 0 -%else -%define build_conduits 1 -%endif %define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins ### Abstract ### Name: evolution -Version: 2.31.3 +Version: 2.31.5 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -56,11 +49,6 @@ Obsoletes: libgal2 <= %{last_libgal2_version} # bad hack Patch10: evolution-1.4.4-ldap-x86_64-hack.patch -# Move .conduit files from share to lib (for the sake of multilib). -# This patch effects other parts of evolution.spec and so is necessary -# for a successful build. -Patch11: evolution-2.5.4-fix-conduit-dir.patch - # RH bug #176400 Patch12: evolution-2.9.1-im-context-reset.patch @@ -124,10 +112,6 @@ BuildRequires: gstreamer-devel BuildRequires: openldap-devel >= 2.0.11 %endif -%if %{build_conduits} -BuildRequires: gnome-pilot-devel >= %{gnome_pilot_version} -%endif - %if %{krb5_support} BuildRequires: krb5-devel # tweak for krb5 1.2 vs 1.3 @@ -180,18 +164,6 @@ BuildArch: noarch %description help This package contains user documentation for %{name}. -%if %{build_conduits} -%package conduits -Group: Applications/Communications -Summary: gnome-pilot conduits for %{name} -Requires: %{name} = %{version}-%{release} -Requires: gnome-pilot >= %{gnome_pilot_version} - -%description conduits -This package contains conduits for synchronizing PalmPilot or other -PalmOS devices with %{name}. -%endif - %package bogofilter Group: Applications/Productivity Summary: Bogofilter plugin for Evolution @@ -233,7 +205,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack -%patch11 -p1 -b .fix-conduit-dir %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents @@ -254,12 +225,6 @@ done %define ldap_flags --without-openldap %endif -%if %{build_conduits} -%define pilot_flags --enable-pilot-conduits -%else -%define pilot_flags --disable-pilot-conduits -%endif - %if %{krb5_support} %define krb5_flags --with-krb5=%{krb5dir} %else @@ -280,7 +245,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com --enable-gtk-doc \ --with-sub-version=" (%{version}-%{release})" \ --with-kde-applnk-path=no \ - %ldap_flags %pilot_flags %krb5_flags %ssl_flags \ + %ldap_flags %krb5_flags %ssl_flags \ --enable-plugins=all export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" @@ -328,10 +293,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; -# pilot conduits static and libtool bits should go away too -rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.a -rm -f $RPM_BUILD_ROOT/%{_libdir}/gnome-pilot/conduits/*.la - # remove additional things we don't want %if ! %{inline_audio_support} %{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \ @@ -596,7 +557,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-shell.pc %{_libdir}/evolution/%{evo_base_version}/libcomposer.so %{_libdir}/evolution/%{evo_base_version}/libeabutil.so -%{_libdir}/evolution/%{evo_base_version}/libeconduit.so %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so %{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so %{_libdir}/evolution/%{evo_base_version}/libemformat.so @@ -622,22 +582,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %dir %{_datadir}/omf/evolution -%if %{build_conduits} -%files conduits -%defattr(-, root, root) -%dir %{_libdir}/evolution/%{evo_base_version}/conduits -%{_libdir}/evolution/%{evo_base_version}/libeconduit.so.* -%{_libdir}/evolution/%{evo_base_version}/conduits/libeaddress_conduit.so -%{_libdir}/evolution/%{evo_base_version}/conduits/libecalendar_common_conduit.so -%{_libdir}/evolution/%{evo_base_version}/conduits/libecalendar_conduit.so -%{_libdir}/evolution/%{evo_base_version}/conduits/libememo_conduit.so -%{_libdir}/evolution/%{evo_base_version}/conduits/libetodo_conduit.so -%{_libdir}/gnome-pilot/conduits/e-address.conduit -%{_libdir}/gnome-pilot/conduits/e-calendar.conduit -%{_libdir}/gnome-pilot/conduits/e-memo.conduit -%{_libdir}/gnome-pilot/conduits/e-todo.conduit -%endif - %files bogofilter %defattr(-, root, root) %{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug @@ -662,6 +606,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jul 13 2010 Milan Crha - 2.31.5-1.fc14 +- Update to 2.31.5 +- Remove 'conduit' (removed upstream) + * Mon Jun 07 2010 Milan Crha - 2.31.3-1.fc14 - Update to 2.31.3 diff --git a/sources b/sources index ec4116f..7cb2a79 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -006ae66cf24385195ad6bf439f79b0c9 evolution-2.31.3.tar.bz2 +59a9c75d808788fa9eacce4a757b04fe evolution-2.31.5.tar.bz2 From feb4cd8ff9ccaff2ff4941559ffbf1f12ce22bcc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 15 Jul 2010 10:03:32 +0000 Subject: [PATCH 343/844] Add missing files to spec file --- evolution.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/evolution.spec b/evolution.spec index 344c4b3..a4f5bf4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -421,6 +421,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules # Shared libraries: +%{_libdir}/evolution/%{evo_base_version}/libart_lgpl.so.* %{_libdir}/evolution/%{evo_base_version}/libcomposer.so.* %{_libdir}/evolution/%{evo_base_version}/libeabutil.so.* %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so.* @@ -442,6 +443,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.* %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.* %{_libdir}/evolution/%{evo_base_version}/libfilter.so.* +%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so.* %{_libdir}/evolution/%{evo_base_version}/libmenus.so.* # Various libexec programs: @@ -547,6 +549,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-webdav.eplug %{evo_plugin_dir}/liborg-gnome-evolution-webdav.so +%{evo_plugin_dir}/org-gnome-dbx-import.eplug +%{evo_plugin_dir}/liborg-gnome-dbx-import.so + + %files devel %defattr(-, root, root) %{_datadir}/gtk-doc/html/eshell @@ -555,6 +561,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-mail.pc %{_libdir}/pkgconfig/evolution-plugin.pc %{_libdir}/pkgconfig/evolution-shell.pc +%{_libdir}/evolution/%{evo_base_version}/libart_lgpl.so %{_libdir}/evolution/%{evo_base_version}/libcomposer.so %{_libdir}/evolution/%{evo_base_version}/libeabutil.so %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so @@ -576,6 +583,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so %{_libdir}/evolution/%{evo_base_version}/libfilter.so +%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so %{_libdir}/evolution/%{evo_base_version}/libmenus.so %files help -f help.lang From 3daaa5209d59c8a114939627b1fd349419b2dc7c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 22 Jul 2010 15:54:32 +0000 Subject: [PATCH 344/844] - Add patch to fix startup crash in gtk-compat macros. --- evolution-2.31.5-gtk-compat-crash.patch | 24 ++++++++++++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 evolution-2.31.5-gtk-compat-crash.patch diff --git a/evolution-2.31.5-gtk-compat-crash.patch b/evolution-2.31.5-gtk-compat-crash.patch new file mode 100644 index 0000000..bedcf0d --- /dev/null +++ b/evolution-2.31.5-gtk-compat-crash.patch @@ -0,0 +1,24 @@ +diff -up evolution-2.31.5/e-util/gtk-compat.h.gtk-compat-crash evolution-2.31.5/e-util/gtk-compat.h +--- evolution-2.31.5/e-util/gtk-compat.h.gtk-compat-crash 2010-07-11 18:26:08.000000000 -0400 ++++ evolution-2.31.5/e-util/gtk-compat.h 2010-07-22 11:51:55.076484868 -0400 +@@ -55,15 +55,15 @@ typedef enum { + #define gdk_region_get_rectangles(region, rectangles, n_rectangles) \ + G_STMT_START { \ + GdkRectangle *__rects; \ +- gint __i, __n; \ ++ gint __i, __nrects; \ + \ +- __n = cairo_region_num_rectangles (region); \ +- __rects = g_new (GdkRectangle, __n); \ ++ __nrects = cairo_region_num_rectangles (region); \ ++ __rects = g_new (GdkRectangle, __nrects); \ + \ +- for (__i = 0; __i < __n; __i++) \ ++ for (__i = 0; __i < __nrects; __i++) \ + cairo_region_get_rectangle ((region), __i, &__rects[__i]); \ + \ +- *(n_rectangles) = __n; \ ++ *(n_rectangles) = __nrects; \ + *(rectangles) = __rects; \ + } G_STMT_END + diff --git a/evolution.spec b/evolution.spec index a4f5bf4..6870f2b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,7 +33,7 @@ Name: evolution Version: 2.31.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -55,6 +55,9 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch +# Fixes a crash in gtk-compat.h macros +Patch14: evolution-2.31.5-gtk-compat-crash.patch + ## Dependencies ### Requires(pre): GConf2 @@ -207,6 +210,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents +%patch14 -p1 -b .gtk-compat-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -614,6 +618,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jul 22 2010 Matthew Barnes - 2.31.5-2.fc14 +- Add patch to fix startup crash in gtk-compat macros. + * Tue Jul 13 2010 Milan Crha - 2.31.5-1.fc14 - Update to 2.31.5 - Remove 'conduit' (removed upstream) From 07c8d48c4cc0bf47b6987d52b867ad482576bb5f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 14:01:47 +0000 Subject: [PATCH 345/844] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- 2 files changed, 21 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index c22b7db..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: evolution -# $Id: Makefile,v 1.2 2007/10/15 18:44:15 notting Exp $ -NAME := evolution -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) From ea52f9ee7d698e9a09bcd7941a347854ab44499b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Aug 2010 10:36:40 +0200 Subject: [PATCH 346/844] Update to 2.31.91 --- .gitignore | 1 + evolution-2.31.5-gtk-compat-crash.patch | 24 ------------------------ evolution.spec | 25 +++++++++++++++---------- sources | 2 +- 4 files changed, 17 insertions(+), 35 deletions(-) delete mode 100644 evolution-2.31.5-gtk-compat-crash.patch diff --git a/.gitignore b/.gitignore index a151a6e..acfbdc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ evolution-2.31.5.tar.bz2 +/evolution-2.31.91.tar.bz2 diff --git a/evolution-2.31.5-gtk-compat-crash.patch b/evolution-2.31.5-gtk-compat-crash.patch deleted file mode 100644 index bedcf0d..0000000 --- a/evolution-2.31.5-gtk-compat-crash.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -up evolution-2.31.5/e-util/gtk-compat.h.gtk-compat-crash evolution-2.31.5/e-util/gtk-compat.h ---- evolution-2.31.5/e-util/gtk-compat.h.gtk-compat-crash 2010-07-11 18:26:08.000000000 -0400 -+++ evolution-2.31.5/e-util/gtk-compat.h 2010-07-22 11:51:55.076484868 -0400 -@@ -55,15 +55,15 @@ typedef enum { - #define gdk_region_get_rectangles(region, rectangles, n_rectangles) \ - G_STMT_START { \ - GdkRectangle *__rects; \ -- gint __i, __n; \ -+ gint __i, __nrects; \ - \ -- __n = cairo_region_num_rectangles (region); \ -- __rects = g_new (GdkRectangle, __n); \ -+ __nrects = cairo_region_num_rectangles (region); \ -+ __rects = g_new (GdkRectangle, __nrects); \ - \ -- for (__i = 0; __i < __n; __i++) \ -+ for (__i = 0; __i < __nrects; __i++) \ - cairo_region_get_rectangle ((region), __i, &__rects[__i]); \ - \ -- *(n_rectangles) = __n; \ -+ *(n_rectangles) = __nrects; \ - *(rectangles) = __rects; \ - } G_STMT_END - diff --git a/evolution.spec b/evolution.spec index 6870f2b..635a981 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,5 @@ -%define dbus_glib_version 0.70 %define dbus_version 1.0 -%define glib2_version 2.22.0 +%define glib2_version 2.25.12 %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 @@ -9,9 +8,10 @@ %define intltool_version 0.35.5 %define libgdata_version 0.6.3 %define libgweather_version 2.25.4 +%define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 3.0 +%define evo_base_version 2.32 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -32,8 +32,8 @@ ### Abstract ### Name: evolution -Version: 2.31.5 -Release: 2%{?dist} +Version: 2.31.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -55,9 +55,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -# Fixes a crash in gtk-compat.h macros -Patch14: evolution-2.31.5-gtk-compat-crash.patch - ## Dependencies ### Requires(pre): GConf2 @@ -78,8 +75,8 @@ BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 BuildRequires: bison +BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-devel >= %{dbus_version} -BuildRequires: dbus-glib-devel >= %{dbus_glib_version} BuildRequires: desktop-file-utils BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext @@ -210,7 +207,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents -%patch14 -p1 -b .gtk-compat-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -618,6 +614,15 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 30 2010 Milan Crha - 2.31.91-1.fc15 +- Update to 2.31.91 +- Fix handling of migrated signature files. +- Drop dbus-glib requirement. +- Bump glib2 requirement to 2.25.12. +- Roll back evo_base_version to 2.32. +- Add clutter-gtk requirement (for express mode). +- Remove gtk-compat macro patch (fixed upstream). + * Thu Jul 22 2010 Matthew Barnes - 2.31.5-2.fc14 - Add patch to fix startup crash in gtk-compat macros. diff --git a/sources b/sources index 7cb2a79..bb4a999 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -59a9c75d808788fa9eacce4a757b04fe evolution-2.31.5.tar.bz2 +cd5ccfdccf48ec8a41f48d9ac4b3e983 evolution-2.31.91.tar.bz2 From 2003ff12b1cdff2a6e3d4430ad8a24d1df62f69e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Sep 2010 13:09:44 +0200 Subject: [PATCH 347/844] Update to 2.31.92 --- .gitignore | 1 + evolution.spec | 37 +++++++++++++++++++++++++------------ sources | 2 +- 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/.gitignore b/.gitignore index acfbdc8..ee8b9fd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ evolution-2.31.5.tar.bz2 /evolution-2.31.91.tar.bz2 +/evolution-2.31.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 635a981..b8a81ad 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,7 +4,7 @@ %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.19.91 %define gtk2_version 2.20.0 -%define gtkhtml_version 3.31.2 +%define gtkhtml_version 3.31.92 %define intltool_version 0.35.5 %define libgdata_version 0.6.3 %define libgweather_version 2.25.4 @@ -32,7 +32,7 @@ ### Abstract ### Name: evolution -Version: 2.31.91 +Version: 2.31.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -252,15 +252,16 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasi # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. -cd po -grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep -mv POTFILES.keep POTFILES.in -intltool-update --gettext-package=%{name}-%{evo_base_version} --pot -for p in *.po; do - msgmerge $p %{name}-%{evo_base_version}.pot > $p.out - msgfmt -o `basename $p .po`.gmo $p.out -done -cd - +#disabled since 2.31.91 because of a msgmerge floating point exception (see RH bug 628073) +#cd po +#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep +#mv POTFILES.keep POTFILES.in +#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot +#for p in *.po; do +# msgmerge $p %{name}-%{evo_base_version}.pot > $p.out +# msgfmt -o `basename $p .po`.gmo $p.out +#done +#cd - # Replace identical images in the help by links. # This reduces the RPM size by several megabytes. @@ -614,9 +615,21 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Aug 30 2010 Milan Crha - 2.31.91-1.fc15 +* Mon Sep 13 2010 Milan Crha - 2.31.92.fc15 +- Update to 2.31.92 + +* Mon Aug 30 2010 Milan Crha - 2.31.91-1.fc14 - Update to 2.31.91 +- Remove msgmerge calls due to a floating point exception there + +* Mon Aug 16 2010 Matthew Barnes - 2.31.90-1.fc14 +- Update to 2.31.90 + +* Fri Aug 06 2010 Matthew Barnes - 2.31.6-2.fc14 - Fix handling of migrated signature files. + +* Tue Aug 03 2010 Matthew Barnes - 2.31.6-1.fc14 +- Update to 2.31.6 - Drop dbus-glib requirement. - Bump glib2 requirement to 2.25.12. - Roll back evo_base_version to 2.32. diff --git a/sources b/sources index bb4a999..6e02d17 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cd5ccfdccf48ec8a41f48d9ac4b3e983 evolution-2.31.91.tar.bz2 +90d84ddb24daecd27bc5b1553064bc46 evolution-2.31.92.tar.bz2 From f570c5f10ca8eefaea57980afdd07d347660de1e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Sep 2010 16:05:05 +0200 Subject: [PATCH 348/844] Add patch for Gnome bug #626066 (login to NSS on demand) --- evolution-2.31.92-gn626066.patch | 137 +++++++++++++++++++++++++++++++ evolution.spec | 11 ++- 2 files changed, 146 insertions(+), 2 deletions(-) create mode 100644 evolution-2.31.92-gn626066.patch diff --git a/evolution-2.31.92-gn626066.patch b/evolution-2.31.92-gn626066.patch new file mode 100644 index 0000000..5d25293 --- /dev/null +++ b/evolution-2.31.92-gn626066.patch @@ -0,0 +1,137 @@ +From c33a84d443f6a340fc247531b6bc8c9997b52aba Mon Sep 17 00:00:00 2001 +From: David Woodhouse +Date: Mon, 13 Sep 2010 20:00:25 +0000 +Subject: Bug 626066 - log in to NSS database on demand for changing trust + +--- +diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c +index 9c87c66..66ce69b 100644 +--- a/smime/gui/cert-trust-dialog.c ++++ b/smime/gui/cert-trust-dialog.c +@@ -73,7 +73,7 @@ ctd_response(GtkWidget *w, guint id, CertTrustDialogData *data) + e_cert_trust_add_peer_trust (&trust, FALSE, + gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (data->trust_button)), + FALSE); +- CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust); ++ e_cert_db_change_cert_trust (icert, &trust); + break; + case GTK_RESPONSE_ACCEPT: { + /* just *what on earth* was chris thinking here!?!?! copied from certificate-manager.c */ +@@ -101,7 +101,7 @@ ctd_response(GtkWidget *w, guint id, CertTrustDialogData *data) + trust_email, + trust_objsign); + +- CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), icert, &trust); ++ e_cert_db_change_cert_trust (icert, &trust); + } + + gtk_widget_destroy (dialog); +diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c +index d0823b8..5a5b204 100644 +--- a/smime/gui/certificate-manager.c ++++ b/smime/gui/certificate-manager.c +@@ -679,7 +679,7 @@ edit_ca (GtkWidget *widget, CertificateManagerData *cfm) + trust_email, + trust_objsign); + +- CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust); ++ e_cert_db_change_cert_trust (icert, &trust); + } + + gtk_widget_destroy (dialog); +@@ -1097,18 +1097,13 @@ certificate_manager_config_new (EPreferencesWindow *window) + GtkWidget *parent; + GtkWidget *widget; + CertificateManagerData *cfm_data; +- PK11SlotInfo* slot; +- ECertDB *cert_db; + + shell = e_preferences_window_get_shell (window); + + g_return_val_if_fail (E_IS_SHELL (shell), NULL); + + /* We need to peek the db here to make sure it (and NSS) are fully initialized. */ +- +- cert_db = e_cert_db_peek(); +- slot = PK11_GetInternalKeySlot(); +- e_cert_db_login_to_slot(cert_db, slot); ++ e_cert_db_peek (); + + cfm_data = g_new0 (CertificateManagerData, 1); + +diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c +index 2e23df2..48458fa 100644 +--- a/smime/lib/e-cert-db.c ++++ b/smime/lib/e-cert-db.c +@@ -936,7 +936,18 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) + nickname, + &trust); + +- if (srv != SECSuccess && PORT_GetError() != SEC_ERROR_TOKEN_NOT_LOGGED_IN) { ++ /* ++ If this fails with SEC_ERROR_TOKEN_NOT_LOGGED_IN, it seems ++ that the import *has* worked, but the setting of trust bits ++ failed -- so only set the trust. This *has* to be an NSS bug? ++ */ ++ if (srv != SECSuccess && ++ PORT_GetError () == SEC_ERROR_TOKEN_NOT_LOGGED_IN && ++ e_cert_db_login_to_slot (NULL, PK11_GetInternalKeySlot())) ++ srv = CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), ++ tmpCert, &trust); ++ ++ if (srv != SECSuccess) { + set_nss_error (error); + return FALSE; + } +@@ -971,6 +982,27 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) + return TRUE; + } + } ++gboolean e_cert_db_change_cert_trust(CERTCertificate *cert, CERTCertTrust *trust) ++{ ++ SECStatus srv; ++ ++ srv = CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), ++ cert, trust); ++ if (srv != SECSuccess && ++ PORT_GetError () == SEC_ERROR_TOKEN_NOT_LOGGED_IN && ++ e_cert_db_login_to_slot (NULL, PK11_GetInternalKeySlot())) ++ srv = CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), ++ cert, trust); ++ ++ if (srv != SECSuccess) { ++ glong err = PORT_GetError (); ++ g_warning ("CERT_ChangeCertTrust() failed: %s\n", ++ nss_error_to_string(err)); ++ return FALSE; ++ } ++ return TRUE; ++} ++ + + /* deleting certificates */ + gboolean +@@ -998,8 +1030,7 @@ e_cert_db_delete_cert (ECertDB *certdb, + CERTCertTrust trust; + + e_cert_trust_init_with_values (&trust, 0, 0, 0); +- CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), +- cert, &trust); ++ e_cert_db_change_cert_trust (cert, &trust); + } + + return TRUE; +diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h +index 7d5f185..6e1bc5a 100644 +--- a/smime/lib/e-cert-db.h ++++ b/smime/lib/e-cert-db.h +@@ -142,4 +142,7 @@ gboolean e_cert_db_export_pkcs12_file (ECertDB *cert_db, + gboolean e_cert_db_login_to_slot (ECertDB *cert_db, + PK11SlotInfo *slot); + ++gboolean e_cert_db_change_cert_trust (CERTCertificate *cert, ++ CERTCertTrust *trust); ++ + #endif /* _E_CERT_DB_H_ */ +-- +cgit v0.8.3.1 diff --git a/evolution.spec b/evolution.spec index b8a81ad..aaabd5f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,7 +33,7 @@ Name: evolution Version: 2.31.92 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -55,6 +55,9 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch +# Gnome bug #626066 +Patch14: evolution-2.31.92-gn626066.patch + ## Dependencies ### Requires(pre): GConf2 @@ -207,6 +210,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents +%patch14 -p1 -b .gn626066 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -615,7 +619,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Sep 13 2010 Milan Crha - 2.31.92.fc15 +* Tue Sep 14 2010 Milan Crha - 2.31.92-2.fc15 +- Add patch for Gnome bug #626066 (login to NSS on demand) + +* Mon Sep 13 2010 Milan Crha - 2.31.92-1.fc15 - Update to 2.31.92 * Mon Aug 30 2010 Milan Crha - 2.31.91-1.fc14 From 232c3cf8c5c9f13654d19710e70f86f87fe70dc1 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 29 Sep 2010 14:09:29 -0700 Subject: [PATCH 349/844] - Rebuilt for gcc bug 634757 --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index aaabd5f..e71a863 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,7 +33,7 @@ Name: evolution Version: 2.31.92 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -619,6 +619,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Sep 29 2010 jkeating - 2.31.92-3 +- Rebuilt for gcc bug 634757 + * Tue Sep 14 2010 Milan Crha - 2.31.92-2.fc15 - Add patch for Gnome bug #626066 (login to NSS on demand) From 871767966eb047c25b512dc43484162ae0d2a4c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Hor=C3=A1k?= Date: Thu, 30 Sep 2010 16:51:48 +0200 Subject: [PATCH 350/844] don't exclude NM support on s390(x) --- evolution.spec | 4 ---- 1 file changed, 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index e71a863..b6b6bc2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -21,11 +21,7 @@ %define libnotify_support 1 %define libpst_support 1 %define krb5_support 1 -%ifnarch s390 s390x %define nm_support 1 -%else -%define nm_support 0 -%endif %define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins From efa9fae4bd8713a05412f7c22dc41e36b5de6cd2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 1 Oct 2010 08:29:08 +0200 Subject: [PATCH 351/844] Enable msgmerge to test bug #628073 --- evolution.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/evolution.spec b/evolution.spec index b6b6bc2..60f103b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -253,15 +253,15 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasi # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. #disabled since 2.31.91 because of a msgmerge floating point exception (see RH bug 628073) -#cd po -#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep -#mv POTFILES.keep POTFILES.in -#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot -#for p in *.po; do -# msgmerge $p %{name}-%{evo_base_version}.pot > $p.out -# msgfmt -o `basename $p .po`.gmo $p.out -#done -#cd - +cd po +grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep +mv POTFILES.keep POTFILES.in +intltool-update --gettext-package=%{name}-%{evo_base_version} --pot +for p in *.po; do + msgmerge $p %{name}-%{evo_base_version}.pot > $p.out + msgfmt -o `basename $p .po`.gmo $p.out +done +cd - # Replace identical images in the help by links. # This reduces the RPM size by several megabytes. From 78830a8a2360982f18b10151b1ba6629c6bd1e00 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 1 Oct 2010 09:22:36 +0200 Subject: [PATCH 352/844] Add libSM-devel to BuildRequires --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 60f103b..835245b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -94,6 +94,7 @@ BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libpst-devel +BuildRequires: libSM-devel BuildRequires: libsoup-devel >= %{soup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel From cb00596d07ba65956e2cd1e780d0ca1bfa28deff Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Oct 2010 11:28:39 +0200 Subject: [PATCH 353/844] Update to 2.91.0 --- .gitignore | 1 + evolution-2.31.92-gn626066.patch | 137 ------------------------- evolution-2.9.1-im-context-reset.patch | 9 +- evolution.spec | 16 +-- sources | 2 +- 5 files changed, 15 insertions(+), 150 deletions(-) delete mode 100644 evolution-2.31.92-gn626066.patch diff --git a/.gitignore b/.gitignore index ee8b9fd..ef8725f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.31.91.tar.bz2 /evolution-2.31.92.tar.bz2 +/evolution-2.91.0.tar.bz2 diff --git a/evolution-2.31.92-gn626066.patch b/evolution-2.31.92-gn626066.patch deleted file mode 100644 index 5d25293..0000000 --- a/evolution-2.31.92-gn626066.patch +++ /dev/null @@ -1,137 +0,0 @@ -From c33a84d443f6a340fc247531b6bc8c9997b52aba Mon Sep 17 00:00:00 2001 -From: David Woodhouse -Date: Mon, 13 Sep 2010 20:00:25 +0000 -Subject: Bug 626066 - log in to NSS database on demand for changing trust - ---- -diff --git a/smime/gui/cert-trust-dialog.c b/smime/gui/cert-trust-dialog.c -index 9c87c66..66ce69b 100644 ---- a/smime/gui/cert-trust-dialog.c -+++ b/smime/gui/cert-trust-dialog.c -@@ -73,7 +73,7 @@ ctd_response(GtkWidget *w, guint id, CertTrustDialogData *data) - e_cert_trust_add_peer_trust (&trust, FALSE, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON (data->trust_button)), - FALSE); -- CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust); -+ e_cert_db_change_cert_trust (icert, &trust); - break; - case GTK_RESPONSE_ACCEPT: { - /* just *what on earth* was chris thinking here!?!?! copied from certificate-manager.c */ -@@ -101,7 +101,7 @@ ctd_response(GtkWidget *w, guint id, CertTrustDialogData *data) - trust_email, - trust_objsign); - -- CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), icert, &trust); -+ e_cert_db_change_cert_trust (icert, &trust); - } - - gtk_widget_destroy (dialog); -diff --git a/smime/gui/certificate-manager.c b/smime/gui/certificate-manager.c -index d0823b8..5a5b204 100644 ---- a/smime/gui/certificate-manager.c -+++ b/smime/gui/certificate-manager.c -@@ -679,7 +679,7 @@ edit_ca (GtkWidget *widget, CertificateManagerData *cfm) - trust_email, - trust_objsign); - -- CERT_ChangeCertTrust (CERT_GetDefaultCertDB(), icert, &trust); -+ e_cert_db_change_cert_trust (icert, &trust); - } - - gtk_widget_destroy (dialog); -@@ -1097,18 +1097,13 @@ certificate_manager_config_new (EPreferencesWindow *window) - GtkWidget *parent; - GtkWidget *widget; - CertificateManagerData *cfm_data; -- PK11SlotInfo* slot; -- ECertDB *cert_db; - - shell = e_preferences_window_get_shell (window); - - g_return_val_if_fail (E_IS_SHELL (shell), NULL); - - /* We need to peek the db here to make sure it (and NSS) are fully initialized. */ -- -- cert_db = e_cert_db_peek(); -- slot = PK11_GetInternalKeySlot(); -- e_cert_db_login_to_slot(cert_db, slot); -+ e_cert_db_peek (); - - cfm_data = g_new0 (CertificateManagerData, 1); - -diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c -index 2e23df2..48458fa 100644 ---- a/smime/lib/e-cert-db.c -+++ b/smime/lib/e-cert-db.c -@@ -936,7 +936,18 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) - nickname, - &trust); - -- if (srv != SECSuccess && PORT_GetError() != SEC_ERROR_TOKEN_NOT_LOGGED_IN) { -+ /* -+ If this fails with SEC_ERROR_TOKEN_NOT_LOGGED_IN, it seems -+ that the import *has* worked, but the setting of trust bits -+ failed -- so only set the trust. This *has* to be an NSS bug? -+ */ -+ if (srv != SECSuccess && -+ PORT_GetError () == SEC_ERROR_TOKEN_NOT_LOGGED_IN && -+ e_cert_db_login_to_slot (NULL, PK11_GetInternalKeySlot())) -+ srv = CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), -+ tmpCert, &trust); -+ -+ if (srv != SECSuccess) { - set_nss_error (error); - return FALSE; - } -@@ -971,6 +982,27 @@ handle_ca_cert_download(ECertDB *cert_db, GList *certs, GError **error) - return TRUE; - } - } -+gboolean e_cert_db_change_cert_trust(CERTCertificate *cert, CERTCertTrust *trust) -+{ -+ SECStatus srv; -+ -+ srv = CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), -+ cert, trust); -+ if (srv != SECSuccess && -+ PORT_GetError () == SEC_ERROR_TOKEN_NOT_LOGGED_IN && -+ e_cert_db_login_to_slot (NULL, PK11_GetInternalKeySlot())) -+ srv = CERT_ChangeCertTrust (CERT_GetDefaultCertDB (), -+ cert, trust); -+ -+ if (srv != SECSuccess) { -+ glong err = PORT_GetError (); -+ g_warning ("CERT_ChangeCertTrust() failed: %s\n", -+ nss_error_to_string(err)); -+ return FALSE; -+ } -+ return TRUE; -+} -+ - - /* deleting certificates */ - gboolean -@@ -998,8 +1030,7 @@ e_cert_db_delete_cert (ECertDB *certdb, - CERTCertTrust trust; - - e_cert_trust_init_with_values (&trust, 0, 0, 0); -- CERT_ChangeCertTrust(CERT_GetDefaultCertDB(), -- cert, &trust); -+ e_cert_db_change_cert_trust (cert, &trust); - } - - return TRUE; -diff --git a/smime/lib/e-cert-db.h b/smime/lib/e-cert-db.h -index 7d5f185..6e1bc5a 100644 ---- a/smime/lib/e-cert-db.h -+++ b/smime/lib/e-cert-db.h -@@ -142,4 +142,7 @@ gboolean e_cert_db_export_pkcs12_file (ECertDB *cert_db, - gboolean e_cert_db_login_to_slot (ECertDB *cert_db, - PK11SlotInfo *slot); - -+gboolean e_cert_db_change_cert_trust (CERTCertificate *cert, -+ CERTCertTrust *trust); -+ - #endif /* _E_CERT_DB_H_ */ --- -cgit v0.8.3.1 diff --git a/evolution-2.9.1-im-context-reset.patch b/evolution-2.9.1-im-context-reset.patch index 76e9d98..519d0d6 100644 --- a/evolution-2.9.1-im-context-reset.patch +++ b/evolution-2.9.1-im-context-reset.patch @@ -1,6 +1,7 @@ ---- evolution-2.9.1/calendar/gui/e-day-view.c.im-context-reset 2006-11-06 10:14:26.000000000 -0500 -+++ evolution-2.9.1/calendar/gui/e-day-view.c 2006-11-06 10:15:39.000000000 -0500 -@@ -6928,6 +6928,9 @@ +diff -up evolution-2.91.0/calendar/gui/e-day-view.c.im-context-reset evolution-2.91.0/calendar/gui/e-day-view.c +--- evolution-2.91.0/calendar/gui/e-day-view.c.im-context-reset 2010-10-03 18:36:41.000000000 +0200 ++++ evolution-2.91.0/calendar/gui/e-day-view.c 2010-10-11 11:24:30.000000000 +0200 +@@ -6183,6 +6183,9 @@ e_day_view_start_editing_event (EDayView if (!event->canvas_item) return; @@ -9,4 +10,4 @@ + /* We must grab the focus before setting the initial text, since grabbing the focus will result in a call to - e_day_view_on_editing_started(), which will reset the text to get + e_day_view_on_editing_started (), which will reset the text to get diff --git a/evolution.spec b/evolution.spec index 835245b..1e4173f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,7 +11,7 @@ %define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 2.32 +%define evo_base_version 2.92 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 2.31.92 -Release: 3%{?dist} +Version: 2.91.0 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.31/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2 Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -51,9 +51,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -# Gnome bug #626066 -Patch14: evolution-2.31.92-gn626066.patch - ## Dependencies ### Requires(pre): GConf2 @@ -207,7 +204,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents -%patch14 -p1 -b .gn626066 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -616,6 +612,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 11 2010 Milan Crha - 2.91.0-1 +- Update to 2.91.0 +- Remove patch for Gnome bug #626066 (fixed upstream) + * Wed Sep 29 2010 jkeating - 2.31.92-3 - Rebuilt for gcc bug 634757 diff --git a/sources b/sources index 6e02d17..ec48a89 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -90d84ddb24daecd27bc5b1553064bc46 evolution-2.31.92.tar.bz2 +29cd32f9e9699d3ec757d7dff6b41b57 evolution-2.91.0.tar.bz2 From 6cb12de0b94ed6d67f409ccedb187b9446b3a614 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Oct 2010 11:49:26 +0200 Subject: [PATCH 354/844] Bump package version requirements --- evolution.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 1e4173f..bda7dfa 100644 --- a/evolution.spec +++ b/evolution.spec @@ -2,9 +2,9 @@ %define glib2_version 2.25.12 %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 -%define gnome_icon_theme_version 2.19.91 -%define gtk2_version 2.20.0 -%define gtkhtml_version 3.31.92 +%define gnome_icon_theme_version 2.30.2.1 +%define gtk2_version 2.22.0 +%define gtkhtml_version 3.91.0 %define intltool_version 0.35.5 %define libgdata_version 0.6.3 %define libgweather_version 2.25.4 From de90601e8d64245e63eacfe9adb447d73b137db5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Oct 2010 13:10:24 +0200 Subject: [PATCH 355/844] Two plugins dropped --- evolution.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index bda7dfa..11e18e7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -523,9 +523,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-mark-all-read.eplug %{evo_plugin_dir}/liborg-gnome-mark-all-read.so -%{evo_plugin_dir}/org-gnome-plugin-manager.eplug -%{evo_plugin_dir}/liborg-gnome-plugin-manager.so - %{evo_plugin_dir}/org-gnome-prefer-plain.eplug %{evo_plugin_dir}/liborg-gnome-prefer-plain.so @@ -535,9 +532,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-save-calendar.eplug %{evo_plugin_dir}/liborg-gnome-save-calendar.so -%{evo_plugin_dir}/org-gnome-subject-thread.eplug -%{evo_plugin_dir}/liborg-gnome-subject-thread.so - %{evo_plugin_dir}/org-gnome-templates.eplug %{evo_plugin_dir}/liborg-gnome-templates.so From fe6e4461c6429f94ed5860a5426d8219b99a7868 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Oct 2010 18:10:59 +0200 Subject: [PATCH 356/844] Update to 2.91.1 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ef8725f..f21917c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.31.91.tar.bz2 /evolution-2.31.92.tar.bz2 /evolution-2.91.0.tar.bz2 +/evolution-2.91.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 11e18e7..7456ce0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,5 +1,5 @@ %define dbus_version 1.0 -%define glib2_version 2.25.12 +%define glib2_version 2.26.0 %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.0 +Version: 2.91.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -606,6 +606,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 18 2010 Milan Crha - 2.91.1-1 +- Update to 2.91.1 + * Mon Oct 11 2010 Milan Crha - 2.91.0-1 - Update to 2.91.0 - Remove patch for Gnome bug #626066 (fixed upstream) diff --git a/sources b/sources index ec48a89..c5a7909 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -29cd32f9e9699d3ec757d7dff6b41b57 evolution-2.91.0.tar.bz2 +8b16624121466255ef92e18b0f2a4f89 evolution-2.91.1.tar.bz2 From fa242d827a91cc7aa26dbb8a37abba41ac18f08d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 3 Nov 2010 10:00:57 -0400 Subject: [PATCH 357/844] rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 7456ce0..7db3b60 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -606,6 +606,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Nov 3 2010 Matthias Clasen - 2.91.1-2 +- Rebuild against new libnotify + * Mon Oct 18 2010 Milan Crha - 2.91.1-1 - Update to 2.91.1 From e18922eb77e75ca6b7cb7fb26aea179fa19f86b7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Nov 2010 15:25:44 +0100 Subject: [PATCH 358/844] Rebuild against newer libxml2; Add patch for libnotify 0.7 --- evolution-2.91.1-libnotify07.patch | 103 +++++++++++++++++++++++++++++ evolution.spec | 9 ++- 2 files changed, 111 insertions(+), 1 deletion(-) create mode 100644 evolution-2.91.1-libnotify07.patch diff --git a/evolution-2.91.1-libnotify07.patch b/evolution-2.91.1-libnotify07.patch new file mode 100644 index 0000000..17b112b --- /dev/null +++ b/evolution-2.91.1-libnotify07.patch @@ -0,0 +1,103 @@ +commit 8854c727c1c05bc22a7757ffa93bc9533286525f +Author: Flo Gravo +Date: Fri Oct 22 18:54:27 2010 -0400 + + Bug 632903 - Support libnotify-0.7 + +diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c +index 7145a22..752ce37 100644 +--- a/calendar/gui/alarm-notify/alarm-queue.c ++++ b/calendar/gui/alarm-notify/alarm-queue.c +@@ -1606,7 +1606,11 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa, + body = g_strdup_printf ("%s %s", start_str, time_str); + } + ++#ifdef HAVE_LIBNOTIFY_07 ++ n = notify_notification_new (summary, body, "stock_appointment-reminder"); ++#else + n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); ++#endif /* HAVE_LIBNOTIFY_07 */ + if (!notify_notification_show (n, NULL)) + g_warning ("Could not send notification to daemon\n"); + +diff --git a/configure.ac b/configure.ac +index d7c2abe..133161e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1340,7 +1340,7 @@ LIBNOTIFY_CFLAGS= + LIBNOTIFY_LIBS= + PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $libnotify_minimum_version], [HAVE_LIBNOTIFY="yes"], [HAVE_LIBNOTIFY="no"]) + if test "x$HAVE_LIBNOTIFY" = "xyes"; then +- AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available]) ++ AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if you have libnotify]) + libnotify="libnotify" + else + libnotify="" +@@ -1348,6 +1348,10 @@ fi + AC_SUBST(LIBNOTIFY_CFLAGS) + AC_SUBST(LIBNOTIFY_LIBS) + ++if $PKG_CONFIG --atleast-version=0.7 libnotify; then ++ AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify >= 0.7]) ++fi ++ + dnl ************** + dnl Calendar Flags + dnl ************** +diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c +index f8fd766..961868a 100644 +--- a/plugins/mail-notification/mail-notification.c ++++ b/plugins/mail-notification/mail-notification.c +@@ -562,11 +562,15 @@ new_notify_status (EMEventTargetFolder *t) + if (!notify_init ("evolution-mail-notification")) + fprintf (stderr,"notify init error"); + ++#ifdef HAVE_LIBNOTIFY_07 + notify = notify_notification_new ( +- _("New email"), safetext, +- "mail-unread", NULL); ++ _("New email"), safetext, "mail-unread"); ++#else ++ notify = notify_notification_new ( ++ _("New email"), safetext, "mail-unread", NULL); + notify_notification_attach_to_status_icon ( + notify, status_icon); ++#endif /* HAVE_LIBNOTIFY_07 */ + + /* Check if actions are supported */ + if (can_support_actions ()) { +diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c +index d30a9b1..da93063 100644 +--- a/plugins/publish-calendar/publish-calendar.c ++++ b/plugins/publish-calendar/publish-calendar.c +@@ -140,7 +140,7 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) + gtk_status_icon_set_from_stock (status_icon, stock_name); + gtk_status_icon_set_tooltip_text (status_icon, actual_msg->str); + +- #ifdef HAVE_LIBNOTIFY ++#ifdef HAVE_LIBNOTIFY + if (can_notify) { + if (notify) { + notify_notification_update (notify, _("Calendar Publishing"), actual_msg->str, stock_name); +@@ -150,8 +150,12 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) + return; + } + ++#ifdef HAVE_LIBNOTIFY_07 ++ notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name); ++#else + notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL); + notify_notification_attach_to_status_icon (notify, status_icon); ++#endif /* HAVE_LIBNOTIFY_07 */ + notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); + notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); + g_timeout_add (500, show_notify_cb, NULL); +@@ -159,7 +163,7 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) + g_signal_connect (notify, "closed", G_CALLBACK (remove_notification), NULL); + } + } +- #endif ++#endif + + status_icon_timeout_id = g_timeout_add_seconds (15, remove_notification, NULL); + diff --git a/evolution.spec b/evolution.spec index 7db3b60..b93d557 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,6 +51,8 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch +Patch14: evolution-2.91.1-libnotify07.patch + ## Dependencies ### Requires(pre): GConf2 @@ -204,6 +206,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents +%patch14 -p1 -b .libnotify07 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -606,6 +609,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Nov 05 2010 Milan Crha - 2.91.1-3 +- Rebuild against newer libxml2 +- Add patch for libnotify 0.7 + * Wed Nov 3 2010 Matthias Clasen - 2.91.1-2 - Rebuild against new libnotify From 88421eef057b89c6974e151de724446eda2a8a01 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Nov 2010 17:12:49 +0100 Subject: [PATCH 359/844] Disable libnotify for now --- evolution-2.91.1-libnotify07.patch | 103 ----------------------------- evolution.spec | 7 +- 2 files changed, 2 insertions(+), 108 deletions(-) delete mode 100644 evolution-2.91.1-libnotify07.patch diff --git a/evolution-2.91.1-libnotify07.patch b/evolution-2.91.1-libnotify07.patch deleted file mode 100644 index 17b112b..0000000 --- a/evolution-2.91.1-libnotify07.patch +++ /dev/null @@ -1,103 +0,0 @@ -commit 8854c727c1c05bc22a7757ffa93bc9533286525f -Author: Flo Gravo -Date: Fri Oct 22 18:54:27 2010 -0400 - - Bug 632903 - Support libnotify-0.7 - -diff --git a/calendar/gui/alarm-notify/alarm-queue.c b/calendar/gui/alarm-notify/alarm-queue.c -index 7145a22..752ce37 100644 ---- a/calendar/gui/alarm-notify/alarm-queue.c -+++ b/calendar/gui/alarm-notify/alarm-queue.c -@@ -1606,7 +1606,11 @@ popup_notification (time_t trigger, CompQueuedAlarms *cqa, - body = g_strdup_printf ("%s %s", start_str, time_str); - } - -+#ifdef HAVE_LIBNOTIFY_07 -+ n = notify_notification_new (summary, body, "stock_appointment-reminder"); -+#else - n = notify_notification_new (summary, body, "stock_appointment-reminder", NULL); -+#endif /* HAVE_LIBNOTIFY_07 */ - if (!notify_notification_show (n, NULL)) - g_warning ("Could not send notification to daemon\n"); - -diff --git a/configure.ac b/configure.ac -index d7c2abe..133161e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1340,7 +1340,7 @@ LIBNOTIFY_CFLAGS= - LIBNOTIFY_LIBS= - PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $libnotify_minimum_version], [HAVE_LIBNOTIFY="yes"], [HAVE_LIBNOTIFY="no"]) - if test "x$HAVE_LIBNOTIFY" = "xyes"; then -- AC_DEFINE(HAVE_LIBNOTIFY, 1, [libnotify available]) -+ AC_DEFINE(HAVE_LIBNOTIFY, 1, [Define if you have libnotify]) - libnotify="libnotify" - else - libnotify="" -@@ -1348,6 +1348,10 @@ fi - AC_SUBST(LIBNOTIFY_CFLAGS) - AC_SUBST(LIBNOTIFY_LIBS) - -+if $PKG_CONFIG --atleast-version=0.7 libnotify; then -+ AC_DEFINE(HAVE_LIBNOTIFY_07, 1, [Define if you have libnotify >= 0.7]) -+fi -+ - dnl ************** - dnl Calendar Flags - dnl ************** -diff --git a/plugins/mail-notification/mail-notification.c b/plugins/mail-notification/mail-notification.c -index f8fd766..961868a 100644 ---- a/plugins/mail-notification/mail-notification.c -+++ b/plugins/mail-notification/mail-notification.c -@@ -562,11 +562,15 @@ new_notify_status (EMEventTargetFolder *t) - if (!notify_init ("evolution-mail-notification")) - fprintf (stderr,"notify init error"); - -+#ifdef HAVE_LIBNOTIFY_07 - notify = notify_notification_new ( -- _("New email"), safetext, -- "mail-unread", NULL); -+ _("New email"), safetext, "mail-unread"); -+#else -+ notify = notify_notification_new ( -+ _("New email"), safetext, "mail-unread", NULL); - notify_notification_attach_to_status_icon ( - notify, status_icon); -+#endif /* HAVE_LIBNOTIFY_07 */ - - /* Check if actions are supported */ - if (can_support_actions ()) { -diff --git a/plugins/publish-calendar/publish-calendar.c b/plugins/publish-calendar/publish-calendar.c -index d30a9b1..da93063 100644 ---- a/plugins/publish-calendar/publish-calendar.c -+++ b/plugins/publish-calendar/publish-calendar.c -@@ -140,7 +140,7 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) - gtk_status_icon_set_from_stock (status_icon, stock_name); - gtk_status_icon_set_tooltip_text (status_icon, actual_msg->str); - -- #ifdef HAVE_LIBNOTIFY -+#ifdef HAVE_LIBNOTIFY - if (can_notify) { - if (notify) { - notify_notification_update (notify, _("Calendar Publishing"), actual_msg->str, stock_name); -@@ -150,8 +150,12 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) - return; - } - -+#ifdef HAVE_LIBNOTIFY_07 -+ notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name); -+#else - notify = notify_notification_new (_("Calendar Publishing"), actual_msg->str, stock_name, NULL); - notify_notification_attach_to_status_icon (notify, status_icon); -+#endif /* HAVE_LIBNOTIFY_07 */ - notify_notification_set_urgency (notify, NOTIFY_URGENCY_NORMAL); - notify_notification_set_timeout (notify, NOTIFY_EXPIRES_DEFAULT); - g_timeout_add (500, show_notify_cb, NULL); -@@ -159,7 +163,7 @@ update_publish_notification (GtkMessageType msg_type, const gchar *msg_text) - g_signal_connect (notify, "closed", G_CALLBACK (remove_notification), NULL); - } - } -- #endif -+#endif - - status_icon_timeout_id = g_timeout_add_seconds (15, remove_notification, NULL); - diff --git a/evolution.spec b/evolution.spec index b93d557..931df5a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -18,7 +18,7 @@ %define inline_audio_support 1 %define ldap_support 1 -%define libnotify_support 1 +%define libnotify_support 0 %define libpst_support 1 %define krb5_support 1 %define nm_support 1 @@ -51,8 +51,6 @@ Patch12: evolution-2.9.1-im-context-reset.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -Patch14: evolution-2.91.1-libnotify07.patch - ## Dependencies ### Requires(pre): GConf2 @@ -206,7 +204,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents -%patch14 -p1 -b .libnotify07 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -611,7 +608,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Fri Nov 05 2010 Milan Crha - 2.91.1-3 - Rebuild against newer libxml2 -- Add patch for libnotify 0.7 +- Disable libnotify, it's gtk3 only, but evolution is not * Wed Nov 3 2010 Matthias Clasen - 2.91.1-2 - Rebuild against new libnotify From c0695c1a0026d93d28b6cd1d6826ab5ed3e50c30 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 5 Nov 2010 18:29:36 +0100 Subject: [PATCH 360/844] And disable msgmerge again --- evolution.spec | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/evolution.spec b/evolution.spec index 931df5a..152be2c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -250,15 +250,15 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasi # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. #disabled since 2.31.91 because of a msgmerge floating point exception (see RH bug 628073) -cd po -grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep -mv POTFILES.keep POTFILES.in -intltool-update --gettext-package=%{name}-%{evo_base_version} --pot -for p in *.po; do - msgmerge $p %{name}-%{evo_base_version}.pot > $p.out - msgfmt -o `basename $p .po`.gmo $p.out -done -cd - +#cd po +#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep +#mv POTFILES.keep POTFILES.in +#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot +#for p in *.po; do +# msgmerge $p %{name}-%{evo_base_version}.pot > $p.out +# msgfmt -o `basename $p .po`.gmo $p.out +#done +#cd - # Replace identical images in the help by links. # This reduces the RPM size by several megabytes. From 3ba58a9713a23e0954e2b38302ccfe62e98f49b2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 8 Nov 2010 09:23:53 +0100 Subject: [PATCH 361/844] Update to 2.91.2 --- .gitignore | 1 + evolution.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f21917c..11b4d3f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.31.92.tar.bz2 /evolution-2.91.0.tar.bz2 /evolution-2.91.1.tar.bz2 +/evolution-2.91.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 152be2c..aea53c6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 2.91.1 -Release: 3%{?dist} +Version: 2.91.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -71,6 +71,7 @@ BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 BuildRequires: bison +BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: desktop-file-utils @@ -606,6 +607,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 08 2010 Milan Crha - 2.91.2-1 +- Update to 2.91.2 + * Fri Nov 05 2010 Milan Crha - 2.91.1-3 - Rebuild against newer libxml2 - Disable libnotify, it's gtk3 only, but evolution is not diff --git a/sources b/sources index c5a7909..4b6f0bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8b16624121466255ef92e18b0f2a4f89 evolution-2.91.1.tar.bz2 +aa9b0d68842def673f13fbb8e7d40ea4 evolution-2.91.2.tar.bz2 From 6e9bdd7730ec2b59049c77c8054fdbc68d9cfc01 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 8 Nov 2010 12:11:39 +0100 Subject: [PATCH 362/844] libart removed --- evolution.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index aea53c6..d0e8de2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -420,7 +420,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules # Shared libraries: -%{_libdir}/evolution/%{evo_base_version}/libart_lgpl.so.* %{_libdir}/evolution/%{evo_base_version}/libcomposer.so.* %{_libdir}/evolution/%{evo_base_version}/libeabutil.so.* %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so.* @@ -554,7 +553,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-mail.pc %{_libdir}/pkgconfig/evolution-plugin.pc %{_libdir}/pkgconfig/evolution-shell.pc -%{_libdir}/evolution/%{evo_base_version}/libart_lgpl.so %{_libdir}/evolution/%{evo_base_version}/libcomposer.so %{_libdir}/evolution/%{evo_base_version}/libeabutil.so %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so From 7601d477fc6e738953bed135353a183cb18cf90c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Nov 2010 16:30:59 +0100 Subject: [PATCH 363/844] Update to 2.91.3 --- .gitignore | 1 + evolution-2.9.1-im-context-reset.patch | 13 ------------- evolution.spec | 12 ++++++------ sources | 2 +- 4 files changed, 8 insertions(+), 20 deletions(-) delete mode 100644 evolution-2.9.1-im-context-reset.patch diff --git a/.gitignore b/.gitignore index 11b4d3f..7d4d8fb 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.0.tar.bz2 /evolution-2.91.1.tar.bz2 /evolution-2.91.2.tar.bz2 +/evolution-2.91.3.tar.bz2 diff --git a/evolution-2.9.1-im-context-reset.patch b/evolution-2.9.1-im-context-reset.patch deleted file mode 100644 index 519d0d6..0000000 --- a/evolution-2.9.1-im-context-reset.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up evolution-2.91.0/calendar/gui/e-day-view.c.im-context-reset evolution-2.91.0/calendar/gui/e-day-view.c ---- evolution-2.91.0/calendar/gui/e-day-view.c.im-context-reset 2010-10-03 18:36:41.000000000 +0200 -+++ evolution-2.91.0/calendar/gui/e-day-view.c 2010-10-11 11:24:30.000000000 +0200 -@@ -6183,6 +6183,9 @@ e_day_view_start_editing_event (EDayView - if (!event->canvas_item) - return; - -+ /* Reset IM context. */ -+ gtk_im_context_reset (E_TEXT (event->canvas_item)->im_context); -+ - /* We must grab the focus before setting the initial text, since - grabbing the focus will result in a call to - e_day_view_on_editing_started (), which will reset the text to get diff --git a/evolution.spec b/evolution.spec index d0e8de2..e268f12 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,7 +4,7 @@ %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 %define gtk2_version 2.22.0 -%define gtkhtml_version 3.91.0 +%define gtkhtml_version 3.91.3 %define intltool_version 0.35.5 %define libgdata_version 0.6.3 %define libgweather_version 2.25.4 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.2 +Version: 2.91.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -45,9 +45,6 @@ Obsoletes: libgal2 <= %{last_libgal2_version} # bad hack Patch10: evolution-1.4.4-ldap-x86_64-hack.patch -# RH bug #176400 -Patch12: evolution-2.9.1-im-context-reset.patch - # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch @@ -203,7 +200,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %prep %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack -%patch12 -p1 -b .im-context-reset %patch13 -p1 -b .help-contents mkdir -p krb5-fakeprefix/include @@ -605,6 +601,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 29 2010 Milan Crha - 2.91.3-1 +- Update to 2.91.3 +- Remove patch for Red Hat bug #176400 (fixed upstream) + * Mon Nov 08 2010 Milan Crha - 2.91.2-1 - Update to 2.91.2 diff --git a/sources b/sources index 4b6f0bb..7852924 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aa9b0d68842def673f13fbb8e7d40ea4 evolution-2.91.2.tar.bz2 +e82c28acf99628e5f41f7cae4afaffbb evolution-2.91.3.tar.bz2 From 8dc03ea494329ef85f31b608cfe368664f22984b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 2 Dec 2010 14:06:33 +0100 Subject: [PATCH 364/844] - Do not create local_mbox when user denied maildir migration - Do not always ask for migration to maildir --- evolution-maildir-migrate.patch | 41 +++++++++++++++++++++++++++++++++ evolution.spec | 9 +++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 evolution-maildir-migrate.patch diff --git a/evolution-maildir-migrate.patch b/evolution-maildir-migrate.patch new file mode 100644 index 0000000..2b42dea --- /dev/null +++ b/evolution-maildir-migrate.patch @@ -0,0 +1,41 @@ +Do not create local_mbox when user denied maildir migration + +Do not always ask for migration to maildir + + One can downgrade GConf key /apps/evolution/last_version to something + below 2.92.0 and he/she will be asked again. + + +diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c +index ffecec1..24df694 100644 +--- a/mail/e-mail-migrate.c ++++ b/mail/e-mail-migrate.c +@@ -1046,11 +1046,12 @@ migrate_local_store (EShellBackend *shell_backend) + session = (EMMigrateSession *) em_migrate_session_new (data_dir); + camel_session_set_online ((CamelSession *) session, FALSE); + +- if (migrate == GTK_RESPONSE_YES) ++ if (migrate == GTK_RESPONSE_YES) { + ret = migrate_mbox_to_maildir (shell_backend, session); + +- if (ret) +- create_mbox_account (shell_backend, session); ++ if (ret) ++ create_mbox_account (shell_backend, session); ++ } + + g_unlink (migrating_file_flag); + +@@ -1165,8 +1165,10 @@ e_mail_migrate (EShellBackend *shell_backend, + em_ensure_proxy_ignore_hosts_being_list (); + } + +- if (!migrate_local_store (shell_backend)) +- return FALSE; ++ if (major < 2 || (major == 2 && minor < 92)) { ++ if (!migrate_local_store (shell_backend)) ++ return FALSE; ++ } + + return TRUE; + } diff --git a/evolution.spec b/evolution.spec index e268f12..44cb65d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -48,6 +48,8 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch +Patch14: evolution-maildir-migrate.patch + ## Dependencies ### Requires(pre): GConf2 @@ -201,6 +203,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents +%patch14 -p1 -b .maildir-migration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -601,6 +604,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Dec 02 2010 Milan Crha - 2.91.3-2 +- Do not create local_mbox when user denied maildir migration +- Do not always ask for migration to maildir + * Mon Nov 29 2010 Milan Crha - 2.91.3-1 - Update to 2.91.3 - Remove patch for Red Hat bug #176400 (fixed upstream) From 4c753acada92e1d9371394dfe8c40d8ec2f82cfb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 2 Dec 2010 16:03:31 +0100 Subject: [PATCH 365/844] Revert previous commit --- evolution-maildir-migrate.patch | 41 --------------------------------- evolution.spec | 9 +------- 2 files changed, 1 insertion(+), 49 deletions(-) delete mode 100644 evolution-maildir-migrate.patch diff --git a/evolution-maildir-migrate.patch b/evolution-maildir-migrate.patch deleted file mode 100644 index 2b42dea..0000000 --- a/evolution-maildir-migrate.patch +++ /dev/null @@ -1,41 +0,0 @@ -Do not create local_mbox when user denied maildir migration - -Do not always ask for migration to maildir - - One can downgrade GConf key /apps/evolution/last_version to something - below 2.92.0 and he/she will be asked again. - - -diff --git a/mail/e-mail-migrate.c b/mail/e-mail-migrate.c -index ffecec1..24df694 100644 ---- a/mail/e-mail-migrate.c -+++ b/mail/e-mail-migrate.c -@@ -1046,11 +1046,12 @@ migrate_local_store (EShellBackend *shell_backend) - session = (EMMigrateSession *) em_migrate_session_new (data_dir); - camel_session_set_online ((CamelSession *) session, FALSE); - -- if (migrate == GTK_RESPONSE_YES) -+ if (migrate == GTK_RESPONSE_YES) { - ret = migrate_mbox_to_maildir (shell_backend, session); - -- if (ret) -- create_mbox_account (shell_backend, session); -+ if (ret) -+ create_mbox_account (shell_backend, session); -+ } - - g_unlink (migrating_file_flag); - -@@ -1165,8 +1165,10 @@ e_mail_migrate (EShellBackend *shell_backend, - em_ensure_proxy_ignore_hosts_being_list (); - } - -- if (!migrate_local_store (shell_backend)) -- return FALSE; -+ if (major < 2 || (major == 2 && minor < 92)) { -+ if (!migrate_local_store (shell_backend)) -+ return FALSE; -+ } - - return TRUE; - } diff --git a/evolution.spec b/evolution.spec index 44cb65d..e268f12 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.3 -Release: 2%{?dist} +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -48,8 +48,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -Patch14: evolution-maildir-migrate.patch - ## Dependencies ### Requires(pre): GConf2 @@ -203,7 +201,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents -%patch14 -p1 -b .maildir-migration mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -604,10 +601,6 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Thu Dec 02 2010 Milan Crha - 2.91.3-2 -- Do not create local_mbox when user denied maildir migration -- Do not always ask for migration to maildir - * Mon Nov 29 2010 Milan Crha - 2.91.3-1 - Update to 2.91.3 - Remove patch for Red Hat bug #176400 (fixed upstream) From 392a13e526ad0191266e0635cee1374ff40cd7d5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Dec 2010 16:48:05 +0100 Subject: [PATCH 366/844] Update to 2.91.4 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7d4d8fb..b36bfd7 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.1.tar.bz2 /evolution-2.91.2.tar.bz2 /evolution-2.91.3.tar.bz2 +/evolution-2.91.4.tar.bz2 diff --git a/evolution.spec b/evolution.spec index e268f12..15e7fb1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.3 +Version: 2.91.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -601,6 +601,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Dec 20 2010 Milan Crha - 2.91.4-1 +- Update to 2.91.4 + * Mon Nov 29 2010 Milan Crha - 2.91.3-1 - Update to 2.91.3 - Remove patch for Red Hat bug #176400 (fixed upstream) diff --git a/sources b/sources index 7852924..ac227d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e82c28acf99628e5f41f7cae4afaffbb evolution-2.91.3.tar.bz2 +8a616382e7e707505116044deabfa695 evolution-2.91.4.tar.bz2 From 034503a54832b5061f37986912b16509ee40cd39 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 10 Jan 2011 11:44:59 +0100 Subject: [PATCH 367/844] Update to 2.91.5 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b36bfd7..3c96706 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.2.tar.bz2 /evolution-2.91.3.tar.bz2 /evolution-2.91.4.tar.bz2 +/evolution-2.91.5.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 15e7fb1..a30e695 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.4 +Version: 2.91.5 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -601,6 +601,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jan 10 2011 Milan Crha - 2.91.5-1 +- Update to 2.91.5 + * Mon Dec 20 2010 Milan Crha - 2.91.4-1 - Update to 2.91.4 diff --git a/sources b/sources index ac227d9..4319b73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8a616382e7e707505116044deabfa695 evolution-2.91.4.tar.bz2 +5ba706c38a6fa81699ce16e05e5471b8 evolution-2.91.5.tar.bz2 From de1f180048e0877157ab31ad139ffefc9e64e0f4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Thu, 13 Jan 2011 18:46:22 -0500 Subject: [PATCH 368/844] Drop gnome-themes dependency --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index a30e695..3c7a9a8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -58,7 +58,6 @@ Requires(preun): GConf2 Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} -Requires: gnome-themes Requires: gvfs ### Build Dependencies ### @@ -601,6 +600,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jan 13 2011 Matthias Clasen - 2.91.5-2 +- Drop gnome-themes dependency + * Mon Jan 10 2011 Milan Crha - 2.91.5-1 - Update to 2.91.5 From aec33242f0a24dd6cff2b4de15ed74b6d1010a93 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Tue, 18 Jan 2011 08:53:46 -0500 Subject: [PATCH 369/844] rebuild against newer libgdata --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 3c7a9a8..792445f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.5 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -600,6 +600,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jan 18 2011 Matthias Clasen - 2.91.5-3 +- Rebuild against newer libgdata + * Thu Jan 13 2011 Matthias Clasen - 2.91.5-2 - Drop gnome-themes dependency From 533a3d0ff7447e24914e5d518570c67d9578c66f Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 21 Jan 2011 09:46:57 -0600 Subject: [PATCH 370/844] Fix crash at shutdown by finishing tasks before cleaning up (rh #657254) --- evolution.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 792445f..5d405de 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.5 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -48,6 +48,9 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch +# RH bug #657254 bgo #638808 +Patch20: evo-2.91.5-finish-tasks-before-camel-shutdown.patch + ## Dependencies ### Requires(pre): GConf2 @@ -200,6 +203,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents +%patch20 -p1 -b .camel-shutdown-later mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -600,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jan 21 2011 Dan Williams - 2.91.5-4 +- Fix crash at shutdown by finishing tasks before cleaning up (rh #657254) + * Tue Jan 18 2011 Matthias Clasen - 2.91.5-3 - Rebuild against newer libgdata From 9cffa69fa8735e33aa6e6d0ce44876e51528fd6e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 21 Jan 2011 09:50:37 -0600 Subject: [PATCH 371/844] Actually commit patch --- ...5-finish-tasks-before-camel-shutdown.patch | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 evo-2.91.5-finish-tasks-before-camel-shutdown.patch diff --git a/evo-2.91.5-finish-tasks-before-camel-shutdown.patch b/evo-2.91.5-finish-tasks-before-camel-shutdown.patch new file mode 100644 index 0000000..28c7588 --- /dev/null +++ b/evo-2.91.5-finish-tasks-before-camel-shutdown.patch @@ -0,0 +1,48 @@ +diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c +index 740cf85..3ab7cbd 100644 +--- a/mail/e-mail-backend.c ++++ b/mail/e-mail-backend.c +@@ -226,7 +226,6 @@ mail_backend_poll_to_quit (EActivity *activity) + static void + mail_backend_ready_to_quit (EActivity *activity) + { +- camel_shutdown (); + emu_free_mail_cache (); + + /* Do this last. It may terminate the process. */ +@@ -429,6 +428,15 @@ mail_backend_dispose (GObject *object) + } + + static void ++mail_backend_finalize (GObject *object) ++{ ++ if (G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize) ++ G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize (object); ++ ++ camel_shutdown (); ++} ++ ++static void + mail_backend_constructed (GObject *object) + { + EMailBackendPrivate *priv; +@@ -515,6 +523,7 @@ e_mail_backend_class_init (EMailBackendClass *class) + object_class = G_OBJECT_CLASS (class); + object_class->get_property = mail_backend_get_property; + object_class->dispose = mail_backend_dispose; ++ object_class->finalize = mail_backend_finalize; + object_class->constructed = mail_backend_constructed; + + shell_backend_class = E_SHELL_BACKEND_CLASS (class); +diff --git a/shell/e-shell.c b/shell/e-shell.c +index b1891ce..123a975 100644 +--- a/shell/e-shell.c ++++ b/shell/e-shell.c +@@ -691,6 +691,7 @@ shell_finalize (GObject *object) + if (!unique_app_is_running (UNIQUE_APP (object))) + e_file_lock_destroy (); + ++ g_list_foreach (priv->loaded_backends, (GFunc) g_object_unref, NULL); + g_list_free (priv->loaded_backends); + + g_free (priv->geometry); From 559210996c445b36f135d484901b0b69c5a9b65a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 31 Jan 2011 15:12:05 +0100 Subject: [PATCH 372/844] Update to 2.91.6 --- .gitignore | 1 + ...5-finish-tasks-before-camel-shutdown.patch | 48 ------------------- evolution.spec | 25 +++++----- sources | 2 +- 4 files changed, 15 insertions(+), 61 deletions(-) delete mode 100644 evo-2.91.5-finish-tasks-before-camel-shutdown.patch diff --git a/.gitignore b/.gitignore index 3c96706..bc9be83 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.3.tar.bz2 /evolution-2.91.4.tar.bz2 /evolution-2.91.5.tar.bz2 +/evolution-2.91.6.tar.bz2 diff --git a/evo-2.91.5-finish-tasks-before-camel-shutdown.patch b/evo-2.91.5-finish-tasks-before-camel-shutdown.patch deleted file mode 100644 index 28c7588..0000000 --- a/evo-2.91.5-finish-tasks-before-camel-shutdown.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/mail/e-mail-backend.c b/mail/e-mail-backend.c -index 740cf85..3ab7cbd 100644 ---- a/mail/e-mail-backend.c -+++ b/mail/e-mail-backend.c -@@ -226,7 +226,6 @@ mail_backend_poll_to_quit (EActivity *activity) - static void - mail_backend_ready_to_quit (EActivity *activity) - { -- camel_shutdown (); - emu_free_mail_cache (); - - /* Do this last. It may terminate the process. */ -@@ -429,6 +428,15 @@ mail_backend_dispose (GObject *object) - } - - static void -+mail_backend_finalize (GObject *object) -+{ -+ if (G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize) -+ G_OBJECT_CLASS (e_mail_backend_parent_class)->finalize (object); -+ -+ camel_shutdown (); -+} -+ -+static void - mail_backend_constructed (GObject *object) - { - EMailBackendPrivate *priv; -@@ -515,6 +523,7 @@ e_mail_backend_class_init (EMailBackendClass *class) - object_class = G_OBJECT_CLASS (class); - object_class->get_property = mail_backend_get_property; - object_class->dispose = mail_backend_dispose; -+ object_class->finalize = mail_backend_finalize; - object_class->constructed = mail_backend_constructed; - - shell_backend_class = E_SHELL_BACKEND_CLASS (class); -diff --git a/shell/e-shell.c b/shell/e-shell.c -index b1891ce..123a975 100644 ---- a/shell/e-shell.c -+++ b/shell/e-shell.c -@@ -691,6 +691,7 @@ shell_finalize (GObject *object) - if (!unique_app_is_running (UNIQUE_APP (object))) - e_file_lock_destroy (); - -+ g_list_foreach (priv->loaded_backends, (GFunc) g_object_unref, NULL); - g_list_free (priv->loaded_backends); - - g_free (priv->geometry); diff --git a/evolution.spec b/evolution.spec index 5d405de..a3c0e6a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -3,11 +3,11 @@ %define gnome_desktop_version 2.26.0 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 -%define gtk2_version 2.22.0 -%define gtkhtml_version 3.91.3 +%define gtk3_version 2.99.2 +%define gtkhtml_version 3.91.6 %define intltool_version 0.35.5 -%define libgdata_version 0.6.3 -%define libgweather_version 2.25.4 +%define libgdata_version 0.7.0 +%define libgweather_version 2.91.0 %define clutter_gtk_version 0.10 %define soup_version 2.4.0 @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 2.91.5 -Release: 4%{?dist} +Version: 2.91.6 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -48,9 +48,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -# RH bug #657254 bgo #638808 -Patch20: evo-2.91.5-finish-tasks-before-camel-shutdown.patch - ## Dependencies ### Requires(pre): GConf2 @@ -82,7 +79,7 @@ BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gnutls-devel BuildRequires: gtk-doc -BuildRequires: gtk2-devel >= %{gtk2_version} +BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: gtkimageview-devel BuildRequires: intltool >= %{intltool_version} @@ -140,7 +137,7 @@ Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} Requires: evolution-data-server-devel >= %{version} -Requires: gtk2-devel >= %{gtk2_version} +Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} Requires: libgweather-devel >= %{libgweather_version} @@ -203,7 +200,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents -%patch20 -p1 -b .camel-shutdown-later mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -604,6 +600,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jan 31 2011 Milan Crha - 2.91.6-1 +- Update to 2.91.6 +- Require gtk3 +- Remove patch for Red Hat bug #657254 (fixed upstream) + * Fri Jan 21 2011 Dan Williams - 2.91.5-4 - Fix crash at shutdown by finishing tasks before cleaning up (rh #657254) diff --git a/sources b/sources index 4319b73..5cd97ed 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ba706c38a6fa81699ce16e05e5471b8 evolution-2.91.5.tar.bz2 +e8487863aa19cf8bfe386f2070c65f55 evolution-2.91.6.tar.bz2 From d1015a3544f660cb4321e682056204e8373b9c66 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 31 Jan 2011 15:20:04 +0100 Subject: [PATCH 373/844] Use --disable-image-inline configure parameter --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index a3c0e6a..6f63571 100644 --- a/evolution.spec +++ b/evolution.spec @@ -235,6 +235,7 @@ CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS %configure \ + --disable-image-inline \ --enable-gtk-doc \ --with-sub-version=" (%{version}-%{release})" \ --with-kde-applnk-path=no \ From 1f93e839907158c33117a777300d6e48337bab60 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 31 Jan 2011 16:51:03 +0100 Subject: [PATCH 374/844] Use gnome-desktop3 and unique3 --- evolution.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6f63571..c8c1898 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %define dbus_version 1.0 %define glib2_version 2.26.0 -%define gnome_desktop_version 2.26.0 +%define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 %define gtk3_version 2.99.2 @@ -75,7 +75,7 @@ BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common -BuildRequires: gnome-desktop-devel >= %{gnome_desktop_version} +BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gnutls-devel BuildRequires: gtk-doc @@ -96,7 +96,7 @@ BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: pkgconfig BuildRequires: rarian-compat -BuildRequires: unique-devel +BuildRequires: unique3-devel %if %{inline_audio_support} BuildRequires: gstreamer-devel From b17b2e93a41863207dfc43c1beac42654c6ce8c6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 31 Jan 2011 17:28:54 +0100 Subject: [PATCH 375/844] The image-inline plugin is disabled, actually --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index c8c1898..12d3413 100644 --- a/evolution.spec +++ b/evolution.spec @@ -498,8 +498,8 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-groupwise-features.so %{evo_plugin_dir}/org-gnome-compose-send-options.xml -%{evo_plugin_dir}/org-gnome-image-inline.eplug -%{evo_plugin_dir}/liborg-gnome-image-inline.so +#%{evo_plugin_dir}/org-gnome-image-inline.eplug +#%{evo_plugin_dir}/liborg-gnome-image-inline.so %{evo_plugin_dir}/org-gnome-imap-features.eplug %{evo_plugin_dir}/liborg-gnome-imap-features.so From b552364bd0ba0aa4b84cd07aa94b4d570afd5dad Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 31 Jan 2011 20:45:02 +0100 Subject: [PATCH 376/844] And .pc files are 3.0 now. --- evolution.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 12d3413..d67b817 100644 --- a/evolution.spec +++ b/evolution.spec @@ -545,10 +545,10 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %{_datadir}/gtk-doc/html/eshell %{_includedir}/evolution-%{evo_base_version} -%{_libdir}/pkgconfig/evolution-calendar.pc -%{_libdir}/pkgconfig/evolution-mail.pc -%{_libdir}/pkgconfig/evolution-plugin.pc -%{_libdir}/pkgconfig/evolution-shell.pc +%{_libdir}/pkgconfig/evolution-calendar-3.0.pc +%{_libdir}/pkgconfig/evolution-mail-3.0.pc +%{_libdir}/pkgconfig/evolution-plugin-3.0.pc +%{_libdir}/pkgconfig/evolution-shell-3.0.pc %{_libdir}/evolution/%{evo_base_version}/libcomposer.so %{_libdir}/evolution/%{evo_base_version}/libeabutil.so %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so From 3b064546d5fdd1ecc8afc2da5b12ca48c640944f Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Feb 2011 15:59:03 -0500 Subject: [PATCH 377/844] 2.91.6.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bc9be83..99e6881 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.4.tar.bz2 /evolution-2.91.5.tar.bz2 /evolution-2.91.6.tar.bz2 +/evolution-2.91.6.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index d67b817..323e6be 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.6 +Version: 2.91.6.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -601,6 +601,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Feb 2 2011 Matthias Clasen - 2.91.6.1-1 +- Update to 2.91.6.1 + * Mon Jan 31 2011 Milan Crha - 2.91.6-1 - Update to 2.91.6 - Require gtk3 diff --git a/sources b/sources index 5cd97ed..b4001ba 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e8487863aa19cf8bfe386f2070c65f55 evolution-2.91.6.tar.bz2 +d394f7b4cfe5c7634827020097e3763a evolution-2.91.6.1.tar.bz2 From bfcdac58e08f83a803a3e0acd3c47124e178098e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Feb 2011 16:17:02 -0500 Subject: [PATCH 378/844] fix eds dep --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 323e6be..f4ef12f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -55,7 +55,8 @@ Requires(post): GConf2 Requires(preun): GConf2 # Don't trust evolution-data-server to maintain accurate sonames. -Requires: evolution-data-server >= %{version} +# Requires: evolution-data-server >= %{version} +Requires: evolution-data-server >= 2.91.6 Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs From d6cf97f6f769fe08c835e4837fd982af567b9eb8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Feb 2011 16:32:43 -0500 Subject: [PATCH 379/844] Fix eds requirements --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index f4ef12f..d4be9e5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -72,7 +72,8 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{version} +#BuildRequires: evolution-data-server-devel >= %{version} +BuildRequires: evolution-data-server-devel >= 2.91.6 BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -137,7 +138,8 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= %{version} +#Requires: evolution-data-server-devel >= %{version} +Requires: evolution-data-server-devel >= 2.91.6 Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} From da03e7767bb347340705121a7197292a1514ed84 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 8 Feb 2011 10:20:21 -0500 Subject: [PATCH 380/844] Re-enable libnotify. --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index d4be9e5..1566e4f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -18,7 +18,7 @@ %define inline_audio_support 1 %define ldap_support 1 -%define libnotify_support 0 +%define libnotify_support 1 %define libpst_support 1 %define krb5_support 1 %define nm_support 1 @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.6.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -604,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Feb 08 2011 Matthew Barnes - 2.91.6.1-2 +- Evolution uses gtk3 now; re-enable libnotify. + * Wed Feb 2 2011 Matthias Clasen - 2.91.6.1-1 - Update to 2.91.6.1 From d4608c60f80770c31b05d0af1c1411515b7fb539 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Tue, 8 Feb 2011 12:48:25 -0600 Subject: [PATCH 381/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1566e4f..fffd757 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 2.91.6.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -604,6 +604,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Feb 08 2011 Fedora Release Engineering - 2.91.6.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + * Tue Feb 08 2011 Matthew Barnes - 2.91.6.1-2 - Evolution uses gtk3 now; re-enable libnotify. From 7efa2fadae65ec731392691e7f942f4055165721 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 11 Feb 2011 13:46:43 -0500 Subject: [PATCH 382/844] Update to 2.91.6.2 --- .gitignore | 1 + evolution.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99e6881..6aeb6d7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.5.tar.bz2 /evolution-2.91.6.tar.bz2 /evolution-2.91.6.1.tar.bz2 +/evolution-2.91.6.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index fffd757..bd4b457 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 2.91.6.1 -Release: 3%{?dist} +Version: 2.91.6.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -604,6 +604,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Feb 11 2011 Matthew Barnes - 2.91.6.2-1 +- Update to 2.91.6.2 +- Fixes build breakage when using GTK+ 3.0. + * Tue Feb 08 2011 Fedora Release Engineering - 2.91.6.1-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild diff --git a/sources b/sources index b4001ba..3d171b1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d394f7b4cfe5c7634827020097e3763a evolution-2.91.6.1.tar.bz2 +98ffbc6e1297f2fee914132f71ed6b8e evolution-2.91.6.2.tar.bz2 From 783e241e3034ecad3aa1f07683e699d55ba5d6fd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Feb 2011 15:09:22 +0100 Subject: [PATCH 383/844] Update to 2.91.90 --- .gitignore | 1 + evolution.spec | 20 +++++++++----------- sources | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 6aeb6d7..dbd6c44 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.6.tar.bz2 /evolution-2.91.6.1.tar.bz2 /evolution-2.91.6.2.tar.bz2 +/evolution-2.91.90.tar.bz2 diff --git a/evolution.spec b/evolution.spec index bd4b457..6fb0aef 100644 --- a/evolution.spec +++ b/evolution.spec @@ -3,8 +3,8 @@ %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 -%define gtk3_version 2.99.2 -%define gtkhtml_version 3.91.6 +%define gtk3_version 3.0.0 +%define gtkhtml_version 3.91.90 %define intltool_version 0.35.5 %define libgdata_version 0.7.0 %define libgweather_version 2.91.0 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.6.2 +Version: 2.91.90 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -54,10 +54,7 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -# Don't trust evolution-data-server to maintain accurate sonames. -# Requires: evolution-data-server >= %{version} -Requires: evolution-data-server >= 2.91.6 - +Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs @@ -72,8 +69,7 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-devel >= %{dbus_version} BuildRequires: desktop-file-utils -#BuildRequires: evolution-data-server-devel >= %{version} -BuildRequires: evolution-data-server-devel >= 2.91.6 +BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -138,8 +134,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -#Requires: evolution-data-server-devel >= %{version} -Requires: evolution-data-server-devel >= 2.91.6 +Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -604,6 +599,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 21 2011 Milan Crha - 2.91.90-1 +- Update to 2.91.90 + * Fri Feb 11 2011 Matthew Barnes - 2.91.6.2-1 - Update to 2.91.6.2 - Fixes build breakage when using GTK+ 3.0. diff --git a/sources b/sources index 3d171b1..6d3e8db 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -98ffbc6e1297f2fee914132f71ed6b8e evolution-2.91.6.2.tar.bz2 +43200fbaccdb1cee861336ec34a703bf evolution-2.91.90.tar.bz2 From ab82cba2371ce258e7454df6bc8a2245d8af2e07 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Feb 2011 16:57:47 +0100 Subject: [PATCH 384/844] Add face plugin files --- evolution.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/evolution.spec b/evolution.spec index 6fb0aef..d35b2df 100644 --- a/evolution.spec +++ b/evolution.spec @@ -308,6 +308,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : @@ -328,6 +329,7 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps-evolution- 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.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_eplugin_face.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/apps-evolution-template-placeholders.schemas > /dev/null || : gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : @@ -345,6 +347,7 @@ gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolutio gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || : gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : @@ -376,6 +379,7 @@ rm -rf $RPM_BUILD_ROOT # GConf schemas: %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas +%{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.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 @@ -492,6 +496,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-google.eplug %{evo_plugin_dir}/liborg-gnome-evolution-google.so +%{evo_plugin_dir}/org-gnome-face.eplug +%{evo_plugin_dir}/liborg-gnome-face.so + %{evo_plugin_dir}/org-gnome-groupwise-features.eplug %{evo_plugin_dir}/liborg-gnome-groupwise-features.so %{evo_plugin_dir}/org-gnome-compose-send-options.xml From 80bad349fe2ec6042fc1abb2427be15bf1ac31c6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Mar 2011 09:34:30 +0100 Subject: [PATCH 385/844] Update to 2.91.91 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index dbd6c44..6c0b871 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.6.1.tar.bz2 /evolution-2.91.6.2.tar.bz2 /evolution-2.91.90.tar.bz2 +/evolution-2.91.91.tar.bz2 diff --git a/evolution.spec b/evolution.spec index d35b2df..3fc7d72 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,7 +11,7 @@ %define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 2.92 +%define evo_base_version 3.0 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 2.91.90 +Version: 2.91.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -606,6 +606,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 07 2011 Milan Crha - 2.91.91-1 +- Update to 2.91.91 + * Mon Feb 21 2011 Milan Crha - 2.91.90-1 - Update to 2.91.90 diff --git a/sources b/sources index 6d3e8db..bb22494 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -43200fbaccdb1cee861336ec34a703bf evolution-2.91.90.tar.bz2 +b7fbbd81be9190749481c0b5eacc8755 evolution-2.91.91.tar.bz2 From 42f7e2f0dd518e5c4e2a69bb5d16b665df49a396 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 11 Mar 2011 09:28:43 -0500 Subject: [PATCH 386/844] Split off an evolution-NetworkManager subpackage. --- evolution.spec | 40 +++++++++++++++++++++++++++++++++------- 1 file changed, 33 insertions(+), 7 deletions(-) diff --git a/evolution.spec b/evolution.spec index 3fc7d72..d8d9022 100644 --- a/evolution.spec +++ b/evolution.spec @@ -21,7 +21,6 @@ %define libnotify_support 1 %define libpst_support 1 %define krb5_support 1 -%define nm_support 1 %define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins @@ -29,7 +28,7 @@ Name: evolution Version: 2.91.91 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -61,6 +60,7 @@ Requires: gvfs ### Build Dependencies ### BuildRequires: GConf2-devel +BuildRequires: NetworkManager-devel BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -111,10 +111,6 @@ BuildRequires: krb5-devel #define krb5dir `pwd`/krb5-fakeprefix %endif -%if %{nm_support} -BuildRequires: NetworkManager-glib-devel -%endif - %if %{libnotify_support} BuildRequires: libnotify-devel %endif @@ -165,6 +161,16 @@ Requires: bogofilter %description bogofilter This package contains the plugin to filter junk mail using Bogofilter. +%package NetworkManager +Group: Applications/Productivity +Summary: NetworkManager plugin for Evolution +Requires: %{name} = %{version}-%{release} +Requires: NetworkManager + +%description NetworkManager +This package contains the plugin to monitor network availability using +NetworkManager. + %package spamassassin Group: Applications/Productivity Summary: SpamAssassin plugin for Evolution @@ -413,9 +419,20 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/evolution/%{evo_base_version} # Modules: +# These must be listed individually because the NetworkManager +# module is split off into a separate NetworkManager subpackage. %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_base_version} -%{_libdir}/evolution/%{evo_base_version}/modules +%dir %{_libdir}/evolution/%{evo_base_version}/modules +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-addressbook.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-calendar.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-python.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so # Shared libraries: %{_libdir}/evolution/%{evo_base_version}/libcomposer.so.* @@ -588,6 +605,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas +%files NetworkManager +%defattr(-, root, root) +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-network-manager.so + %files spamassassin %defattr(-, root, root) %{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug @@ -606,6 +627,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Mar 11 2011 Matthew Barnes - 2.91.91-2 +- Split off an evolution-NetworkManager subpackage containing the NM + integration module. Users that choose to bypass NetworkManager can + uninstall this subpackage so Evolution doesn't insist it's offline. + * Mon Mar 07 2011 Milan Crha - 2.91.91-1 - Update to 2.91.91 From c0631312557928ff145c2ded046a01bd0c3975c8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 11 Mar 2011 10:01:21 -0500 Subject: [PATCH 387/844] Fix file list --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index d8d9022..bba1075 100644 --- a/evolution.spec +++ b/evolution.spec @@ -431,7 +431,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-python.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so # Shared libraries: From 5a834d035a555b416605098ab9548f0b58a6e8ef Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 11 Mar 2011 10:20:44 -0500 Subject: [PATCH 388/844] Fix file list --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index bba1075..d0a1c02 100644 --- a/evolution.spec +++ b/evolution.spec @@ -426,6 +426,7 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/evolution/%{evo_base_version}/modules %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-addressbook.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-calendar.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so From 7833b198caa81b9e3861d541697e082a3237ee3b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 14 Mar 2011 12:30:18 -0400 Subject: [PATCH 389/844] Remove some BRs. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index d0a1c02..ea1a55c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 2.91.91 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -79,10 +79,8 @@ BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} -BuildRequires: gtkimageview-devel BuildRequires: intltool >= %{intltool_version} BuildRequires: libcanberra-devel -BuildRequires: libgnomecanvas-devel >= 2.0 BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libpst-devel @@ -627,6 +625,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 14 2011 Matthew Barnes - 2.91.91-3 +- Remove some unnecessary BuildRequires: + gtkimageview-devel: No release available for gtk3. + libgnomecanvas-devel: Evolution bundles its own libgnomecanvas now. + * Fri Mar 11 2011 Matthew Barnes - 2.91.91-2 - Split off an evolution-NetworkManager subpackage containing the NM integration module. Users that choose to bypass NetworkManager can From 5ce2805cd640f3f8f0e77e8981794f8b4d13d575 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Mar 2011 17:42:03 +0100 Subject: [PATCH 390/844] Update to 2.91.92 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6c0b871..5cb70b9 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.6.2.tar.bz2 /evolution-2.91.90.tar.bz2 /evolution-2.91.91.tar.bz2 +/evolution-2.91.92.tar.bz2 diff --git a/evolution.spec b/evolution.spec index ea1a55c..31f6b8f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 2.91.91 -Release: 3%{?dist} +Version: 2.91.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -625,6 +625,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 21 2011 Milan Crha - 2.91.92-1 +- Update to 2.91.92 + * Mon Mar 14 2011 Matthew Barnes - 2.91.91-3 - Remove some unnecessary BuildRequires: gtkimageview-devel: No release available for gtk3. diff --git a/sources b/sources index bb22494..49570fa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b7fbbd81be9190749481c0b5eacc8755 evolution-2.91.91.tar.bz2 +5a95176673edbb970bd201c078632601 evolution-2.91.92.tar.bz2 From f64c0baa3ec9ec5df1341f506dbf9c0d2ef2550e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Apr 2011 08:54:43 +0200 Subject: [PATCH 391/844] Update to 3.0.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 5cb70b9..e479919 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.90.tar.bz2 /evolution-2.91.91.tar.bz2 /evolution-2.91.92.tar.bz2 +/evolution-3.0.0.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 31f6b8f..e14a96a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,14 +27,14 @@ ### Abstract ### Name: evolution -Version: 2.91.92 +Version: 3.0.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/2.91/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -625,6 +625,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Apr 04 2011 Milan Crha - 3.0.0-1 +- Update to 3.0.0 + * Mon Mar 21 2011 Milan Crha - 2.91.92-1 - Update to 2.91.92 diff --git a/sources b/sources index 49570fa..4e6e5e1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5a95176673edbb970bd201c078632601 evolution-2.91.92.tar.bz2 +1ba663469e9d9bd6ed93b4b5960c939f evolution-3.0.0.tar.bz2 From a4ec4be4d5757d5c7abf1d762ddaf00332548d66 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Apr 2011 10:39:32 +0200 Subject: [PATCH 392/844] Main application icon is in 256x256 now, not in scalable --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index e14a96a..843e947 100644 --- a/evolution.spec +++ b/evolution.spec @@ -409,7 +409,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/24x24/apps/* %{_datadir}/icons/hicolor/32x32/apps/* %{_datadir}/icons/hicolor/48x48/apps/* -%{_datadir}/icons/hicolor/scalable/apps/* +%{_datadir}/icons/hicolor/256x256/apps/* # The main data directory # (have not attempted to split this up into an explicit list) From 4959c5983fd628532458da45811cb008f9fac137 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 9 May 2011 09:43:01 +0200 Subject: [PATCH 393/844] Update to 3.1.1 --- .gitignore | 1 + evolution.spec | 16 ++++++++-------- sources | 2 +- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index e479919..4c672cb 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.91.tar.bz2 /evolution-2.91.92.tar.bz2 /evolution-3.0.0.tar.bz2 +/evolution-3.1.1.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 843e947..6a250a0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,14 +4,14 @@ %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 %define gtk3_version 3.0.0 -%define gtkhtml_version 3.91.90 +%define gtkhtml_version 4.1.1 %define intltool_version 0.35.5 %define libgdata_version 0.7.0 %define libgweather_version 2.91.0 %define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 3.0 +%define evo_base_version 3.1 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -27,14 +27,14 @@ ### Abstract ### Name: evolution -Version: 3.0.0 +Version: 3.1.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.bz2 Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -514,10 +514,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-face.eplug %{evo_plugin_dir}/liborg-gnome-face.so -%{evo_plugin_dir}/org-gnome-groupwise-features.eplug -%{evo_plugin_dir}/liborg-gnome-groupwise-features.so -%{evo_plugin_dir}/org-gnome-compose-send-options.xml - #%{evo_plugin_dir}/org-gnome-image-inline.eplug #%{evo_plugin_dir}/liborg-gnome-image-inline.so @@ -625,6 +621,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 09 2011 Milan Crha - 3.1.1-1 +- Update to 3.1.1 +- Drop groupwise plugin, as it was split out upstream + * Mon Apr 04 2011 Milan Crha - 3.0.0-1 - Update to 3.0.0 diff --git a/sources b/sources index 4e6e5e1..18a755b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1ba663469e9d9bd6ed93b4b5960c939f evolution-3.0.0.tar.bz2 +598ca06653b525a9737bcf3cc2b34e0c evolution-3.1.1.tar.bz2 From 894b5f1577a3cf918e920435f7885bc69375634c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 9 May 2011 12:20:51 +0200 Subject: [PATCH 394/844] New base version is 3.2 --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 6a250a0..3bd358a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,7 +11,7 @@ %define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 3.1 +%define evo_base_version 3.2 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 From 54f2caef64db1ff8094009839ade640d34ad2045 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 9 May 2011 15:21:34 -0400 Subject: [PATCH 395/844] Drop the "Email Settings" capplet. --- evolution.spec | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index 3bd358a..401845f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.1.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -299,6 +299,13 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime +# Remove the 'email-settings' capplet. The thing was added for MeeGo +# to complement Express mode and, frankly, looks horrible. It doesn't +# belong on a GNOME 3 desktop. +rm $RPM_BUILD_ROOT%{_bindir}/evolution-settings +rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop +rm $RPM_BUILD_ROOT%{_libdir}/evolution/${evo_base_version}/libevolution-mail-settings.* + %find_lang evolution-%{evo_base_version} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang @@ -396,11 +403,8 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution -%{_bindir}/evolution-settings - # Desktop files: %{_datadir}/applications/evolution.desktop -%{_datadir}/applications/evolution-settings.desktop %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop # Icons: @@ -451,7 +455,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so.* %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so.* %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.* %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.* %{_libdir}/evolution/%{evo_base_version}/libfilter.so.* %{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so.* @@ -583,7 +586,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so %{_libdir}/evolution/%{evo_base_version}/libfilter.so %{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so @@ -621,6 +623,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 09 2011 Matthew Barnes - 3.1.1-2 +- Drop the "Email Settings" capplet. + * Mon May 09 2011 Milan Crha - 3.1.1-1 - Update to 3.1.1 - Drop groupwise plugin, as it was split out upstream From 9d6f2b221c8dbd05c156fc8042d247d324379e37 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 9 May 2011 16:11:28 -0400 Subject: [PATCH 396/844] Fix a typo. --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 401845f..85b1dfe 100644 --- a/evolution.spec +++ b/evolution.spec @@ -304,7 +304,7 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime # belong on a GNOME 3 desktop. rm $RPM_BUILD_ROOT%{_bindir}/evolution-settings rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop -rm $RPM_BUILD_ROOT%{_libdir}/evolution/${evo_base_version}/libevolution-mail-settings.* +rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so* %find_lang evolution-%{evo_base_version} --all-name --with-gnome From 11779e2081058af380bde49406f99c1514e1effd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 17 May 2011 11:45:18 +0200 Subject: [PATCH 397/844] Revert part of previous change around libevolution-mail-settings --- evolution.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 85b1dfe..9c6a65f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.1.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -304,7 +304,6 @@ rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime # belong on a GNOME 3 desktop. rm $RPM_BUILD_ROOT%{_bindir}/evolution-settings rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop -rm $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so* %find_lang evolution-%{evo_base_version} --all-name --with-gnome @@ -455,6 +454,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so.* %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so.* %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so.* +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.* %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.* %{_libdir}/evolution/%{evo_base_version}/libfilter.so.* %{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so.* @@ -586,6 +586,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so %{_libdir}/evolution/%{evo_base_version}/libfilter.so %{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so @@ -623,6 +624,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue May 17 2011 Milan Crha - 3.1.1-3 +- Keep libevolution-mail-settings.so* from the previous change, + it is still used by other parts of evolution. + * Mon May 09 2011 Matthew Barnes - 3.1.1-2 - Drop the "Email Settings" capplet. From 7e093eea457461313f6c0f15f101c18e1954c632 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 06:14:20 +0200 Subject: [PATCH 398/844] Update to 3.1.2 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4c672cb..806a415 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ evolution-2.31.5.tar.bz2 /evolution-2.91.92.tar.bz2 /evolution-3.0.0.tar.bz2 /evolution-3.1.1.tar.bz2 +/evolution-3.1.2.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 9c6a65f..661870f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.1.1 -Release: 3%{?dist} +Version: 3.1.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -624,6 +624,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jun 14 2011 Milan Crha - 3.1.2-1 +- Update to 3.1.2 + * Tue May 17 2011 Milan Crha - 3.1.1-3 - Keep libevolution-mail-settings.so* from the previous change, it is still used by other parts of evolution. diff --git a/sources b/sources index 18a755b..885007a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -598ca06653b525a9737bcf3cc2b34e0c evolution-3.1.1.tar.bz2 +88a2f03c2b89b6085edce87ea4220702 evolution-3.1.2.tar.bz2 From a00837c9f6a57efa06032c2d7f736b31fb82d61c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 07:25:08 +0200 Subject: [PATCH 399/844] Add patch by Philip Withnall to build against libgdata-0.9.0 --- evolution-3.1.2-libgdata_0_9.patch | 59 ++++++++++++++++++++++++++++++ evolution.spec | 4 ++ 2 files changed, 63 insertions(+) create mode 100644 evolution-3.1.2-libgdata_0_9.patch diff --git a/evolution-3.1.2-libgdata_0_9.patch b/evolution-3.1.2-libgdata_0_9.patch new file mode 100644 index 0000000..424b82f --- /dev/null +++ b/evolution-3.1.2-libgdata_0_9.patch @@ -0,0 +1,59 @@ +diff --git a/configure.ac b/configure.ac +index 1078197..903e50e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1283,10 +1283,14 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-gnome-2.4 >= libsoup_minimum_version) + AC_SUBST(LIBSOUP_CFLAGS) + AC_SUBST(LIBSOUP_LIBS) + +-EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.4.0) ++EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.7.0) + AC_SUBST(GDATA_CFLAGS) + AC_SUBST(GDATA_LIBS) + ++if `$PKG_CONFIG --atleast-version=0.9 libgdata`; then ++ AC_DEFINE(HAVE_LIBGDATA_0_9,1,[libgdata is 0.9 or higher]) ++fi ++ + EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-4.0 libebook-1.2 libecal-1.2 libedataserverui-3.0 libebackend-1.2 $libnotify gtkhtml-editor-4.0) + AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) + AC_SUBST(EVOLUTION_CALENDAR_LIBS) +diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c +index 1fce985..1e54362 100644 +--- a/plugins/google-account-setup/google-source.c ++++ b/plugins/google-account-setup/google-source.c +@@ -418,6 +418,9 @@ static void + retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) + { + ESource *source; ++ #ifdef HAVE_LIBGDATA_0_9 ++ GDataClientLoginAuthorizer *authorizer; ++ #endif + GDataCalendarService *service; + GDataFeed *feed; + gchar *user, *password, *tmp; +@@ -448,8 +451,14 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) + return; + } + ++ #ifdef HAVE_LIBGDATA_0_9 ++ authorizer = gdata_client_login_authorizer_new ("evolution-client-0.1.0", GDATA_TYPE_CALENDAR_SERVICE); ++ service = gdata_calendar_service_new (GDATA_AUTHORIZER (authorizer)); ++ if (!gdata_client_login_authorizer_authenticate (authorizer, user, password, NULL, &error)) { ++ #else + service = gdata_calendar_service_new ("evolution-client-0.1.0"); + if (!gdata_service_authenticate (GDATA_SERVICE (service), user, password, NULL, &error)) { ++ #endif + /* Error! */ + claim_error (parent, error->message); + g_error_free (error); +@@ -559,6 +568,9 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) + } + + g_object_unref (service); ++ #ifdef HAVE_LIBGDATA_0_9 ++ g_object_unref (authorizer); ++ #endif + g_free (user); + } + diff --git a/evolution.spec b/evolution.spec index 661870f..575b841 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,6 +47,8 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch +Patch14: evolution-3.1.2-libgdata_0_9.patch + ## Dependencies ### Requires(pre): GConf2 @@ -202,6 +204,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents +%patch14 -p1 -b .libgdata_0_9 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -626,6 +629,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Tue Jun 14 2011 Milan Crha - 3.1.2-1 - Update to 3.1.2 +- Add patch by Philip Withnall to build against libgdata-0.9.0 * Tue May 17 2011 Milan Crha - 3.1.1-3 - Keep libevolution-mail-settings.so* from the previous change, From c0eaaa80b98d0b15fc9762aae236d7051f3acd3d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 11:29:15 +0200 Subject: [PATCH 400/844] Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation) --- evolution-3.1.2-g_const_return.patch | 13 +++++++++++++ evolution.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 evolution-3.1.2-g_const_return.patch diff --git a/evolution-3.1.2-g_const_return.patch b/evolution-3.1.2-g_const_return.patch new file mode 100644 index 0000000..02d30e8 --- /dev/null +++ b/evolution-3.1.2-g_const_return.patch @@ -0,0 +1,13 @@ +diff -up evolution-3.1.2/configure.ac.g_const_return evolution-3.1.2/configure.ac +--- evolution-3.1.2/configure.ac.g_const_return 2011-06-14 11:25:54.846138278 +0200 ++++ evolution-3.1.2/configure.ac 2011-06-14 11:26:20.818433258 +0200 +@@ -67,8 +67,7 @@ dnl ****************************** + dnl Compiler Warning Flags + dnl ****************************** + AS_COMPILER_FLAGS(WARNING_FLAGS, +- "-DG_DISABLE_DEPRECATED +- -DPANGO_DISABLE_DEPRECATED ++ "-DPANGO_DISABLE_DEPRECATED + -DGDK_PIXBUF_DISABLE_DEPRECATED + -DEDS_DISABLE_DEPRECATED + -DG_DISABLE_SINGLE_INCLUDES diff --git a/evolution.spec b/evolution.spec index 575b841..c26949b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -48,6 +48,7 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch Patch13: evolution-2.30.1-help-contents.patch Patch14: evolution-3.1.2-libgdata_0_9.patch +Patch15: evolution-3.1.2-g_const_return.patch ## Dependencies ### @@ -205,6 +206,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents %patch14 -p1 -b .libgdata_0_9 +%patch15 -p1 -b .g_const_return mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -630,6 +632,7 @@ rm -rf $RPM_BUILD_ROOT * Tue Jun 14 2011 Milan Crha - 3.1.2-1 - Update to 3.1.2 - Add patch by Philip Withnall to build against libgdata-0.9.0 +- Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation) * Tue May 17 2011 Milan Crha - 3.1.1-3 - Keep libevolution-mail-settings.so* from the previous change, From 0d7d31ffe9947dad16eb7fa793aa122d507f3dfc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 14 Jun 2011 12:51:43 +0200 Subject: [PATCH 401/844] Rebuild configure due to changes in configure.ac --- evolution.spec | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/evolution.spec b/evolution.spec index c26949b..54dcbdc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -241,6 +241,14 @@ fi CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS +# Regenerate configure to pick up configure.ac changes +aclocal -I m4 +autoheader +automake +libtoolize +intltoolize --force +autoconf + %configure \ --disable-image-inline \ --enable-gtk-doc \ From 080ecd47c35fd095500a1a95aff08b2456803319 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 15 Jun 2011 07:50:58 +0200 Subject: [PATCH 402/844] Rebuild against newer gnome-desktop3 --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 54dcbdc..3e98e2b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.1.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -637,6 +637,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jun 15 2011 Milan Crha - 3.1.2-2 +- Rebuild against newer gnome-desktop3 + * Tue Jun 14 2011 Milan Crha - 3.1.2-1 - Update to 3.1.2 - Add patch by Philip Withnall to build against libgdata-0.9.0 From eb8425bdb96c8ad6a438ee84295e93fd7663e026 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 4 Jul 2011 20:34:08 -0400 Subject: [PATCH 403/844] 3.1.3 --- .gitignore | 1 + evolution-3.1.2-libgdata_0_9.patch | 59 ------------------------------ evolution.spec | 16 +++++--- sources | 2 +- 4 files changed, 12 insertions(+), 66 deletions(-) delete mode 100644 evolution-3.1.2-libgdata_0_9.patch diff --git a/.gitignore b/.gitignore index 806a415..5a1177c 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.0.0.tar.bz2 /evolution-3.1.1.tar.bz2 /evolution-3.1.2.tar.bz2 +/evolution-3.1.3.tar.bz2 diff --git a/evolution-3.1.2-libgdata_0_9.patch b/evolution-3.1.2-libgdata_0_9.patch deleted file mode 100644 index 424b82f..0000000 --- a/evolution-3.1.2-libgdata_0_9.patch +++ /dev/null @@ -1,59 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 1078197..903e50e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1283,10 +1283,14 @@ EVO_SET_COMPILE_FLAGS(LIBSOUP, libsoup-gnome-2.4 >= libsoup_minimum_version) - AC_SUBST(LIBSOUP_CFLAGS) - AC_SUBST(LIBSOUP_LIBS) - --EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.4.0) -+EVO_SET_COMPILE_FLAGS(GDATA, libgdata >= 0.7.0) - AC_SUBST(GDATA_CFLAGS) - AC_SUBST(GDATA_LIBS) - -+if `$PKG_CONFIG --atleast-version=0.9 libgdata`; then -+ AC_DEFINE(HAVE_LIBGDATA_0_9,1,[libgdata is 0.9 or higher]) -+fi -+ - EVO_SET_COMPILE_FLAGS(EVOLUTION_CALENDAR, libgtkhtml-4.0 libebook-1.2 libecal-1.2 libedataserverui-3.0 libebackend-1.2 $libnotify gtkhtml-editor-4.0) - AC_SUBST(EVOLUTION_CALENDAR_CFLAGS) - AC_SUBST(EVOLUTION_CALENDAR_LIBS) -diff --git a/plugins/google-account-setup/google-source.c b/plugins/google-account-setup/google-source.c -index 1fce985..1e54362 100644 ---- a/plugins/google-account-setup/google-source.c -+++ b/plugins/google-account-setup/google-source.c -@@ -418,6 +418,9 @@ static void - retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) - { - ESource *source; -+ #ifdef HAVE_LIBGDATA_0_9 -+ GDataClientLoginAuthorizer *authorizer; -+ #endif - GDataCalendarService *service; - GDataFeed *feed; - gchar *user, *password, *tmp; -@@ -448,8 +451,14 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) - return; - } - -+ #ifdef HAVE_LIBGDATA_0_9 -+ authorizer = gdata_client_login_authorizer_new ("evolution-client-0.1.0", GDATA_TYPE_CALENDAR_SERVICE); -+ service = gdata_calendar_service_new (GDATA_AUTHORIZER (authorizer)); -+ if (!gdata_client_login_authorizer_authenticate (authorizer, user, password, NULL, &error)) { -+ #else - service = gdata_calendar_service_new ("evolution-client-0.1.0"); - if (!gdata_service_authenticate (GDATA_SERVICE (service), user, password, NULL, &error)) { -+ #endif - /* Error! */ - claim_error (parent, error->message); - g_error_free (error); -@@ -559,6 +568,9 @@ retrieve_list_clicked (GtkButton *button, GtkComboBox *combo) - } - - g_object_unref (service); -+ #ifdef HAVE_LIBGDATA_0_9 -+ g_object_unref (authorizer); -+ #endif - g_free (user); - } - diff --git a/evolution.spec b/evolution.spec index 3e98e2b..f822f4c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.1.2 -Release: 2%{?dist} +Version: 3.1.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -47,8 +47,7 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -Patch14: evolution-3.1.2-libgdata_0_9.patch -Patch15: evolution-3.1.2-g_const_return.patch +Patch14: evolution-3.1.2-g_const_return.patch ## Dependencies ### @@ -78,6 +77,7 @@ BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} +BuildRequires: gnome-online-accounts BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} @@ -205,8 +205,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents -%patch14 -p1 -b .libgdata_0_9 -%patch15 -p1 -b .g_const_return +%patch14 -p1 -b .g_const_return mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -444,6 +443,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so @@ -637,6 +637,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 04 2011 Matthew Barnes - 3.1.3-1 +- Update to 3.1.3 +- Remove patch for building against libgdata-0.9.0 (fixed upstream). + * Wed Jun 15 2011 Milan Crha - 3.1.2-2 - Rebuild against newer gnome-desktop3 diff --git a/sources b/sources index 885007a..00862d3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -88a2f03c2b89b6085edce87ea4220702 evolution-3.1.2.tar.bz2 +50d890b7ed7d431f68a5756b9e1be14e evolution-3.1.3.tar.bz2 From 0bac143f983857a4723eb6ea5091f2b58ec5ae67 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 23 Jul 2011 23:52:52 -0500 Subject: [PATCH 404/844] 3.1.4 --- .gitignore | 1 + evolution.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 5a1177c..1da36f8 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.1.1.tar.bz2 /evolution-3.1.2.tar.bz2 /evolution-3.1.3.tar.bz2 +/evolution-3.1.4.tar.bz2 diff --git a/evolution.spec b/evolution.spec index f822f4c..0d52f8f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.1.3 +Version: 3.1.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -611,9 +611,8 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %defattr(-, root, root) -%{evo_plugin_dir}/org-gnome-bogo-junk-plugin.eplug -%{evo_plugin_dir}/liborg-gnome-bogo-junk-plugin.so -%{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so +%{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas %files NetworkManager %defattr(-, root, root) @@ -621,8 +620,7 @@ rm -rf $RPM_BUILD_ROOT %files spamassassin %defattr(-, root, root) -%{evo_plugin_dir}/org-gnome-sa-junk-plugin.eplug -%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so %files perl %defattr(-, root, root) @@ -637,6 +635,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Jul 23 2011 Matthew Barnes - 3.1.4-1 +- Update to 3.1.4 + * Mon Jul 04 2011 Matthew Barnes - 3.1.3-1 - Update to 3.1.3 - Remove patch for building against libgdata-0.9.0 (fixed upstream). diff --git a/sources b/sources index 00862d3..81d6f06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50d890b7ed7d431f68a5756b9e1be14e evolution-3.1.3.tar.bz2 +eff3a714a3fa97a3ceb624a0a8fd1059 evolution-3.1.4.tar.bz2 From 903827d19ee305a08792345af160936fa4778a05 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 Jul 2011 00:04:17 -0500 Subject: [PATCH 405/844] Remove unnecessary patch. --- evolution-3.1.2-g_const_return.patch | 13 ------------- evolution.spec | 3 --- 2 files changed, 16 deletions(-) delete mode 100644 evolution-3.1.2-g_const_return.patch diff --git a/evolution-3.1.2-g_const_return.patch b/evolution-3.1.2-g_const_return.patch deleted file mode 100644 index 02d30e8..0000000 --- a/evolution-3.1.2-g_const_return.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up evolution-3.1.2/configure.ac.g_const_return evolution-3.1.2/configure.ac ---- evolution-3.1.2/configure.ac.g_const_return 2011-06-14 11:25:54.846138278 +0200 -+++ evolution-3.1.2/configure.ac 2011-06-14 11:26:20.818433258 +0200 -@@ -67,8 +67,7 @@ dnl ****************************** - dnl Compiler Warning Flags - dnl ****************************** - AS_COMPILER_FLAGS(WARNING_FLAGS, -- "-DG_DISABLE_DEPRECATED -- -DPANGO_DISABLE_DEPRECATED -+ "-DPANGO_DISABLE_DEPRECATED - -DGDK_PIXBUF_DISABLE_DEPRECATED - -DEDS_DISABLE_DEPRECATED - -DG_DISABLE_SINGLE_INCLUDES diff --git a/evolution.spec b/evolution.spec index 0d52f8f..d4e44d6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -47,8 +47,6 @@ Patch10: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch13: evolution-2.30.1-help-contents.patch -Patch14: evolution-3.1.2-g_const_return.patch - ## Dependencies ### Requires(pre): GConf2 @@ -205,7 +203,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch10 -p1 -b .ldaphack %patch13 -p1 -b .help-contents -%patch14 -p1 -b .g_const_return mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib From e04f12f11e15c27506651c46b46f602c7933b4f0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 24 Jul 2011 00:29:45 -0500 Subject: [PATCH 406/844] Fix an unpackaged file. --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index d4e44d6..448b1c7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -618,6 +618,7 @@ rm -rf $RPM_BUILD_ROOT %files spamassassin %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so +%{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas %files perl %defattr(-, root, root) From db3627ef0a675077a3bc99e19f75bb57fcbb6dcf Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Aug 2011 11:51:01 +0200 Subject: [PATCH 407/844] Update to 3.1.5 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1da36f8..6b98c3f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.1.2.tar.bz2 /evolution-3.1.3.tar.bz2 /evolution-3.1.4.tar.bz2 +/evolution-3.1.5.tar.bz2 diff --git a/evolution.spec b/evolution.spec index 448b1c7..82a21e2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.1.4 +Version: 3.1.5 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -633,6 +633,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 15 2011 Milan Crha - 3.1.5-1 +- Update to 3.1.5 + * Sat Jul 23 2011 Matthew Barnes - 3.1.4-1 - Update to 3.1.4 diff --git a/sources b/sources index 81d6f06..3f32bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eff3a714a3fa97a3ceb624a0a8fd1059 evolution-3.1.4.tar.bz2 +01d2534c78884a2a1982d202d8e7896a evolution-3.1.5.tar.bz2 From fb62e991adab337cbb1ff517361e81ad38745167 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Aug 2011 14:28:13 +0200 Subject: [PATCH 408/844] Help .omf files gone, try other directory for 'help' subpackage --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 82a21e2..87c3f2a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -604,7 +604,7 @@ rm -rf $RPM_BUILD_ROOT %files help -f help.lang %defattr(-, root, root) -%dir %{_datadir}/omf/evolution +%dir %{_datadir}/gnome/help/evolution %files bogofilter %defattr(-, root, root) From 36ea408b664d7e0f1548aed56a5bd827f22085c7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Aug 2011 08:31:08 +0200 Subject: [PATCH 409/844] Update to 3.1.90 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6b98c3f..8fe36a9 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.1.3.tar.bz2 /evolution-3.1.4.tar.bz2 /evolution-3.1.5.tar.bz2 +/evolution-3.1.90.tar.xz diff --git a/evolution.spec b/evolution.spec index 87c3f2a..a7545ce 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,14 +27,14 @@ ### Abstract ### Name: evolution -Version: 3.1.5 +Version: 3.1.90 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.bz2 +Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -633,6 +633,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 29 2011 Milan Crha - 3.1.90-1 +- Update to 3.1.90 + * Mon Aug 15 2011 Milan Crha - 3.1.5-1 - Update to 3.1.5 diff --git a/sources b/sources index 3f32bad..5eb5cc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01d2534c78884a2a1982d202d8e7896a evolution-3.1.5.tar.bz2 +73b0c97283c0a5d3756c60123fa8fd1f evolution-3.1.90.tar.xz From ab30098368c0196f518a82af916a1c45044d327f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 5 Sep 2011 08:39:17 +0200 Subject: [PATCH 410/844] Update to 3.1.91 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 8fe36a9..e8a020a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.1.4.tar.bz2 /evolution-3.1.5.tar.bz2 /evolution-3.1.90.tar.xz +/evolution-3.1.91.tar.xz diff --git a/evolution.spec b/evolution.spec index a7545ce..65a926f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.1.90 +Version: 3.1.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -633,6 +633,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 05 2011 Milan Crha - 3.1.91-1 +- Update to 3.1.91 + * Mon Aug 29 2011 Milan Crha - 3.1.90-1 - Update to 3.1.90 diff --git a/sources b/sources index 5eb5cc5..ca9a2b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73b0c97283c0a5d3756c60123fa8fd1f evolution-3.1.90.tar.xz +e1a5da45f18a4c5bc2f6a5f6e2eb443a evolution-3.1.91.tar.xz From 56a771662255f24c854ec480a6113c974cca9850 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Sep 2011 15:06:10 +0200 Subject: [PATCH 411/844] Update to 3.1.92 --- .gitignore | 1 + evolution.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e8a020a..3a50200 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.1.5.tar.bz2 /evolution-3.1.90.tar.xz /evolution-3.1.91.tar.xz +/evolution-3.1.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 65a926f..b3f08a2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.1.91 +Version: 3.1.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -246,6 +246,7 @@ intltoolize --force autoconf %configure \ + --disable-maintainer-mode \ --disable-image-inline \ --enable-gtk-doc \ --with-sub-version=" (%{version}-%{release})" \ @@ -633,6 +634,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 19 2011 Milan Crha - 3.1.92-1 +- Update to 3.1.92 + * Mon Sep 05 2011 Milan Crha - 3.1.91-1 - Update to 3.1.91 diff --git a/sources b/sources index ca9a2b2..1116eea 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e1a5da45f18a4c5bc2f6a5f6e2eb443a evolution-3.1.91.tar.xz +d4ce49224821c4f75805820df25d5382 evolution-3.1.92.tar.xz From 40e99ccc98fdc7d11a42f69852be22b881241e0c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 26 Sep 2011 08:03:57 +0200 Subject: [PATCH 412/844] Update to 3.2.0 --- .gitignore | 1 + evolution.spec | 28 +++++++++++++++++++++++----- sources | 2 +- 3 files changed, 25 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 3a50200..74c2528 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.1.90.tar.xz /evolution-3.1.91.tar.xz /evolution-3.1.92.tar.xz +/evolution-3.2.0.tar.xz diff --git a/evolution.spec b/evolution.spec index b3f08a2..9431a3d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,14 +27,14 @@ ### Abstract ### Name: evolution -Version: 3.1.92 +Version: 3.2.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.1/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -337,7 +337,11 @@ fi %pre bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || : + +%pre spamassassin +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || : %post /sbin/ldconfig @@ -357,7 +361,11 @@ gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail. %post bogofilter export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || : + +%post spamassassin +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || : %preun if [ "$1" -eq 0 ] ; then @@ -377,7 +385,13 @@ fi %preun bogofilter if [ "$1" -eq 0 ] ; then export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/bogo-junk-plugin.schemas > /dev/null || : +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || : +fi + +%preun spamassassin +if [ "$1" -eq 0 ] ; then +export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` +gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || : fi %postun @@ -634,6 +648,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 26 2011 Milan Crha - 3.2.0-1 +- Update to 3.2.0 +- Manage properly schemas files for evolution-bogofilter/spamassassin + * Mon Sep 19 2011 Milan Crha - 3.1.92-1 - Update to 3.1.92 diff --git a/sources b/sources index 1116eea..c0f9290 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d4ce49224821c4f75805820df25d5382 evolution-3.1.92.tar.xz +7c2143fe69343158ca220903b4f4b569 evolution-3.2.0.tar.xz From 6e146bbb0b381377c11cf28ecf10e61cc9b3f4db Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Oct 2011 09:03:47 +0200 Subject: [PATCH 413/844] Update to 3.3.1 --- .gitignore | 1 + evolution.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 74c2528..ab46b86 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.1.91.tar.xz /evolution-3.1.92.tar.xz /evolution-3.2.0.tar.xz +/evolution-3.3.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 9431a3d..59a2bfd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,17 +1,17 @@ %define dbus_version 1.0 -%define glib2_version 2.26.0 +%define glib2_version 2.30.0 %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 -%define gtk3_version 3.0.0 -%define gtkhtml_version 4.1.1 +%define gtk3_version 3.2.0 +%define gtkhtml_version 4.3.1 %define intltool_version 0.35.5 -%define libgdata_version 0.7.0 +%define libgdata_version 0.10.0 %define libgweather_version 2.91.0 %define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 3.2 +%define evo_base_version 3.4 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -27,14 +27,14 @@ ### Abstract ### Name: evolution -Version: 3.2.0 +Version: 3.3.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.2/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -648,6 +648,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 24 2011 Milan Crha - 3.3.1-1 +- Update to 3.3.1 + * Mon Sep 26 2011 Milan Crha - 3.2.0-1 - Update to 3.2.0 - Manage properly schemas files for evolution-bogofilter/spamassassin diff --git a/sources b/sources index c0f9290..65e3871 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7c2143fe69343158ca220903b4f4b569 evolution-3.2.0.tar.xz +b91e79a58ef446c340d9234e8f0b060d evolution-3.3.1.tar.xz From 23fd26fe9f95fd551b5e005ff5fdfd759e09c9de Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Oct 2011 09:48:29 +0200 Subject: [PATCH 414/844] Add patch to not call g_thread_init() --- evolution-3.3.1-no-g-thread-init.patch | 44 ++++++++++++++++++++++++++ evolution.spec | 12 ++++--- 2 files changed, 52 insertions(+), 4 deletions(-) create mode 100644 evolution-3.3.1-no-g-thread-init.patch diff --git a/evolution-3.3.1-no-g-thread-init.patch b/evolution-3.3.1-no-g-thread-init.patch new file mode 100644 index 0000000..27c3edf --- /dev/null +++ b/evolution-3.3.1-no-g-thread-init.patch @@ -0,0 +1,44 @@ +diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c +index 99e0b4a..91e3690 100644 +--- a/capplet/anjal-settings-main.c ++++ b/capplet/anjal-settings-main.c +@@ -167,8 +167,10 @@ main (gint argc, + if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error)) + g_error ("%s", error->message); + ++ #if !GLIB_CHECK_VERSION(2,31,0) + if (!g_thread_get_initialized ()) + g_thread_init (NULL); ++ #endif + + e_passwords_init (); + categories_icon_theme_hack (); +diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c +index 0b14494..0b15271 100644 +--- a/capplet/settings/mail-guess-servers.c ++++ b/capplet/settings/mail-guess-servers.c +@@ -343,7 +343,9 @@ main (gint argc, + gchar **argv) + { + EmailProvider *provider; ++ #if !GLIB_CHECK_VERSION(2,31,0) + g_thread_init (NULL); ++ #endif + g_type_init (); + + provider = g_new0 (EmailProvider, 1); +diff --git a/shell/main.c b/shell/main.c +index bb056e3..5b76a2e 100644 +--- a/shell/main.c ++++ b/shell/main.c +@@ -492,8 +492,10 @@ main (gint argc, + textdomain (GETTEXT_PACKAGE); + + g_type_init (); ++ #if !GLIB_CHECK_VERSION(2,31,0) + if (!g_thread_get_initialized ()) + g_thread_init (NULL); ++ #endif + + /* do not require Gtk+ for --force-shutdown */ + if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) { diff --git a/evolution.spec b/evolution.spec index 59a2bfd..cfa2168 100644 --- a/evolution.spec +++ b/evolution.spec @@ -42,10 +42,12 @@ Obsoletes: libgal2 <= %{last_libgal2_version} ### Patches ### # bad hack -Patch10: evolution-1.4.4-ldap-x86_64-hack.patch +Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 -Patch13: evolution-2.30.1-help-contents.patch +Patch02: evolution-2.30.1-help-contents.patch + +Patch03: evolution-3.3.1-no-g-thread-init.patch ## Dependencies ### @@ -201,8 +203,9 @@ This package contains the plugin to import Microsoft Personal Storage Table %prep %setup -q -n evolution-%{version} -%patch10 -p1 -b .ldaphack -%patch13 -p1 -b .help-contents +%patch01 -p1 -b .ldaphack +%patch02 -p1 -b .help-contents +%patch03 -p1 -b .no-g-thread-init mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -650,6 +653,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Oct 24 2011 Milan Crha - 3.3.1-1 - Update to 3.3.1 +- Add patch to not call g_thread_init() * Mon Sep 26 2011 Milan Crha - 3.2.0-1 - Update to 3.2.0 From 43fc9093ca147a578a2766b90e60be78b42ce728 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 28 Oct 2011 13:16:30 -0400 Subject: [PATCH 415/844] Fix detection of evolution-help package. --- evolution-2.30.1-help-contents.patch | 5 +++-- evolution.spec | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index 1c90903..e2b75a2 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c --- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents 2010-04-26 09:13:18.000000000 -0400 +++ evolution-2.30.1.2/shell/e-shell-window-actions.c 2010-05-07 21:29:06.269059830 -0400 -@@ -2001,6 +2001,14 @@ e_shell_window_actions_init (EShellWindo +@@ -2001,6 +2001,15 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); @@ -9,7 +9,8 @@ diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evoluti + /* Viewing user documentation requires the evolution-help + * Fedora package. Look for one of the files it installs. */ + path = g_build_filename ( -+ EVOLUTION_DATADIR, "omf", PACKAGE, "evolution-C.omf", NULL); ++ EVOLUTION_DATADIR, "gnome", "help", ++ PACKAGE, "C", "index.page", NULL); + if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) + gtk_action_set_visible (ACTION (CONTENTS), FALSE); + g_free (path); diff --git a/evolution.spec b/evolution.spec index cfa2168..2a7549b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -651,6 +651,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Oct 28 2011 Matthew Barnes - 3.3.1-2 +- Fix detection of evolution-help (not using OMF files anymore). + * Mon Oct 24 2011 Milan Crha - 3.3.1-1 - Update to 3.3.1 - Add patch to not call g_thread_init() From 33d5e36a91c1e396b5af2e34152558f49b2b433a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Nov 2011 09:13:12 +0100 Subject: [PATCH 416/844] Update to 3.3.2 --- .gitignore | 1 + evolution-3.3.1-no-g-thread-init.patch | 44 -------------------------- evolution.spec | 11 ++++--- sources | 2 +- 4 files changed, 8 insertions(+), 50 deletions(-) delete mode 100644 evolution-3.3.1-no-g-thread-init.patch diff --git a/.gitignore b/.gitignore index ab46b86..10651ac 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.1.92.tar.xz /evolution-3.2.0.tar.xz /evolution-3.3.1.tar.xz +/evolution-3.3.2.tar.xz diff --git a/evolution-3.3.1-no-g-thread-init.patch b/evolution-3.3.1-no-g-thread-init.patch deleted file mode 100644 index 27c3edf..0000000 --- a/evolution-3.3.1-no-g-thread-init.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/capplet/anjal-settings-main.c b/capplet/anjal-settings-main.c -index 99e0b4a..91e3690 100644 ---- a/capplet/anjal-settings-main.c -+++ b/capplet/anjal-settings-main.c -@@ -167,8 +167,10 @@ main (gint argc, - if (!gtk_init_with_args (&argc, &argv, NULL, entries, NULL, &error)) - g_error ("%s", error->message); - -+ #if !GLIB_CHECK_VERSION(2,31,0) - if (!g_thread_get_initialized ()) - g_thread_init (NULL); -+ #endif - - e_passwords_init (); - categories_icon_theme_hack (); -diff --git a/capplet/settings/mail-guess-servers.c b/capplet/settings/mail-guess-servers.c -index 0b14494..0b15271 100644 ---- a/capplet/settings/mail-guess-servers.c -+++ b/capplet/settings/mail-guess-servers.c -@@ -343,7 +343,9 @@ main (gint argc, - gchar **argv) - { - EmailProvider *provider; -+ #if !GLIB_CHECK_VERSION(2,31,0) - g_thread_init (NULL); -+ #endif - g_type_init (); - - provider = g_new0 (EmailProvider, 1); -diff --git a/shell/main.c b/shell/main.c -index bb056e3..5b76a2e 100644 ---- a/shell/main.c -+++ b/shell/main.c -@@ -492,8 +492,10 @@ main (gint argc, - textdomain (GETTEXT_PACKAGE); - - g_type_init (); -+ #if !GLIB_CHECK_VERSION(2,31,0) - if (!g_thread_get_initialized ()) - g_thread_init (NULL); -+ #endif - - /* do not require Gtk+ for --force-shutdown */ - if (argc == 2 && argv[1] && g_str_equal (argv[1], "--force-shutdown")) { diff --git a/evolution.spec b/evolution.spec index 2a7549b..1000a31 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.3.1 -Release: 2%{?dist} +Version: 3.3.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -47,8 +47,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -Patch03: evolution-3.3.1-no-g-thread-init.patch - ## Dependencies ### Requires(pre): GConf2 @@ -205,7 +203,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .no-g-thread-init mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -651,6 +648,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 21 2011 Milan Crha - 3.3.2-1 +- Update to 3.3.2 +- Remove patch to not call g_thread_init() (fixed upstream) + * Fri Oct 28 2011 Matthew Barnes - 3.3.1-2 - Fix detection of evolution-help (not using OMF files anymore). diff --git a/sources b/sources index 65e3871..104e847 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b91e79a58ef446c340d9234e8f0b060d evolution-3.3.1.tar.xz +584486250bb621f3cd545518de4c2fda evolution-3.3.2.tar.xz From 9ca5e02c5122cf49fa1893e74307beca5d843f08 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Dec 2011 16:53:07 +0100 Subject: [PATCH 417/844] Update to 3.3.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 10651ac..034b4db 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.2.0.tar.xz /evolution-3.3.1.tar.xz /evolution-3.3.2.tar.xz +/evolution-3.3.3.tar.xz diff --git a/evolution.spec b/evolution.spec index 1000a31..1073dae 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.3.2 +Version: 3.3.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -648,6 +648,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Dec 19 2011 Milan Crha - 3.3.3-1 +- Update to 3.3.3 + * Mon Nov 21 2011 Milan Crha - 3.3.2-1 - Update to 3.3.2 - Remove patch to not call g_thread_init() (fixed upstream) diff --git a/sources b/sources index 104e847..8fa8548 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -584486250bb621f3cd545518de4c2fda evolution-3.3.2.tar.xz +c1334fb0d2733681379bc15ab3cfe00d evolution-3.3.3.tar.xz From baaa8c999fd28de0f779ceb62a228cd882fee115 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Dec 2011 19:25:05 +0100 Subject: [PATCH 418/844] GConf to GSettings and a new module addition changes --- evolution.spec | 109 ++++++++++++------------------------------------- 1 file changed, 26 insertions(+), 83 deletions(-) diff --git a/evolution.spec b/evolution.spec index 1073dae..16435fc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -300,6 +300,9 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; +# remove old GConf schemas +find $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas -name '*.schemas' -exec rm {} \; + # remove additional things we don't want %if ! %{inline_audio_support} %{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \ @@ -320,89 +323,21 @@ rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang -%pre -if [ "$1" -gt 1 ] ; then -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : -fi - -%pre bogofilter -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || : - -%pre spamassassin -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || : - %post /sbin/ldconfig touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : -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.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_eplugin_face.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/apps-evolution-template-placeholders.schemas > /dev/null || : -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : - -%post bogofilter -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || : - -%post spamassassin -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || : - -%preun -if [ "$1" -eq 0 ] ; then -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-notification.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-mail-prompts-checkdefault.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_addressbook.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas > /dev/null || : -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-mail.schemas > /dev/null || : -fi - -%preun bogofilter -if [ "$1" -eq 0 ] ; then -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas > /dev/null || : -fi - -%preun spamassassin -if [ "$1" -eq 0 ] ; then -export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source` -gconftool-2 --makefile-uninstall-rule %{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas > /dev/null || : -fi - %postun /sbin/ldconfig if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : + glib-compile-schemas %{_datadir}/glib-2.0/schemas fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : +glib-compile-schemas %{_datadir}/glib-2.0/schemas %clean rm -rf $RPM_BUILD_ROOT @@ -411,17 +346,24 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %doc AUTHORS COPYING ChangeLog NEWS README -# GConf schemas: -%{_sysconfdir}/gconf/schemas/apps-evolution-attachment-reminder.schemas -%{_sysconfdir}/gconf/schemas/apps_evolution_eplugin_face.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 -%{_sysconfdir}/gconf/schemas/apps_evolution_calendar.schemas -%{_sysconfdir}/gconf/schemas/apps_evolution_shell.schemas -%{_sysconfdir}/gconf/schemas/apps-evolution-template-placeholders.schemas -%{_sysconfdir}/gconf/schemas/apps_evolution_email_custom_header.schemas -%{_sysconfdir}/gconf/schemas/evolution-mail.schemas +# GSettings schemas: +%{_datadir}/GConf/gsettings/evolution.convert + +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.shell.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.addressbook.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml # The main executable %{_bindir}/evolution @@ -454,6 +396,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mdn.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so @@ -624,7 +567,7 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so -%{_sysconfdir}/gconf/schemas/evolution-bogofilter.schemas +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml %files NetworkManager %defattr(-, root, root) @@ -633,7 +576,7 @@ rm -rf $RPM_BUILD_ROOT %files spamassassin %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so -%{_sysconfdir}/gconf/schemas/evolution-spamassassin.schemas +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml %files perl %defattr(-, root, root) From 54a2b44a489f33d89d92cb2406d9e273771d85d8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Thu, 12 Jan 2012 20:05:27 -0600 Subject: [PATCH 419/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 16435fc..58e2c5d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.3.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -591,6 +591,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jan 13 2012 Fedora Release Engineering - 3.3.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Mon Dec 19 2011 Milan Crha - 3.3.3-1 - Update to 3.3.3 From 6f5f3ae36bd089489722c2392ef79d57fc419c97 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jan 2012 19:14:35 +0100 Subject: [PATCH 420/844] Update to 3.3.4 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 034b4db..db3e626 100644 --- a/.gitignore +++ b/.gitignore @@ -26,3 +26,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.1.tar.xz /evolution-3.3.2.tar.xz /evolution-3.3.3.tar.xz +/evolution-3.3.4.tar.xz diff --git a/evolution.spec b/evolution.spec index 58e2c5d..6b4a5de 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.3.3 -Release: 2%{?dist} +Version: 3.3.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -591,6 +591,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jan 16 2012 Milan Crha - 3.3.4-1 +- Update to 3.3.4 + * Fri Jan 13 2012 Fedora Release Engineering - 3.3.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild diff --git a/sources b/sources index 8fa8548..64fda26 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1334fb0d2733681379bc15ab3cfe00d evolution-3.3.3.tar.xz +68e24000d005f95c80762c6c18066267 evolution-3.3.4.tar.xz From 819e6764da96a75bb6aedf91b365e3d5c545c689 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jan 2012 20:12:26 +0100 Subject: [PATCH 421/844] Remove dropped evolution-addressbook-clean --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 6b4a5de..2be43d4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -581,7 +581,6 @@ rm -rf $RPM_BUILD_ROOT %files perl %defattr(-, root, root) %{_libexecdir}/evolution/%{evo_base_version}/csv2vcard -%{_libexecdir}/evolution/%{evo_base_version}/evolution-addressbook-clean %if %{libpst_support} %files pst From ea13e4492a74262a04cf287d5665f5cea4c3a349 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Thu, 19 Jan 2012 09:24:42 -0500 Subject: [PATCH 422/844] Keep all GSettings schema files in the main evolution package. --- evolution.spec | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 2be43d4..db9f54f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.3.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -355,6 +355,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/glib-2.0/schemas/org.gnome.evolution.calendar.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.mail.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml @@ -567,7 +569,6 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so -%{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml %files NetworkManager %defattr(-, root, root) @@ -576,7 +577,6 @@ rm -rf $RPM_BUILD_ROOT %files spamassassin %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so -%{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml %files perl %defattr(-, root, root) @@ -590,6 +590,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jan 19 2012 Matthew Barnes - 3.3.4-2 +- Keep all GSettings schema files in the main evolution package, even the + ones for the Bogofilter and Spamassassin subpackages, since we just have + one .convert file and missing schemas makes gsettings-data-convert crash. + * Mon Jan 16 2012 Milan Crha - 3.3.4-1 - Update to 3.3.4 From 98cbf0c304d8b09831a63b7a654d134f009b6b0a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 6 Feb 2012 11:17:57 +0100 Subject: [PATCH 423/844] Update to 3.3.5 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index db3e626..5ef748e 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.2.tar.xz /evolution-3.3.3.tar.xz /evolution-3.3.4.tar.xz +/evolution-3.3.5.tar.xz diff --git a/evolution.spec b/evolution.spec index db9f54f..b13f960 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.3.4 -Release: 2%{?dist} +Version: 3.3.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -590,6 +590,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 06 2012 Milan Crha - 3.3.5-1 +- Update to 3.3.5 + * Thu Jan 19 2012 Matthew Barnes - 3.3.4-2 - Keep all GSettings schema files in the main evolution package, even the ones for the Bogofilter and Spamassassin subpackages, since we just have diff --git a/sources b/sources index 64fda26..2d25dc1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -68e24000d005f95c80762c6c18066267 evolution-3.3.4.tar.xz +7fb7309ab3c6371417f3ff009a26d43d evolution-3.3.5.tar.xz From 639270891ae381088e6d140239a88f5dbefa8513 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 6 Feb 2012 12:59:17 +0100 Subject: [PATCH 424/844] Add libemail files --- evolution.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/evolution.spec b/evolution.spec index b13f960..427e728 100644 --- a/evolution.spec +++ b/evolution.spec @@ -296,9 +296,13 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # remove libtool archives for importers and the like find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; +find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-engine.la' -exec rm {} \; +find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-utils.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; +find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-engine.a' -exec rm {} \; +find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-utils.a' -exec rm {} \; # remove old GConf schemas find $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas -name '*.schemas' -exec rm {} \; @@ -406,6 +410,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so # Shared libraries: +%{_libdir}/libemail-engine.so.* +%{_libdir}/libemail-utils.so.* %{_libdir}/evolution/%{evo_base_version}/libcomposer.so.* %{_libdir}/evolution/%{evo_base_version}/libeabutil.so.* %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so.* @@ -538,6 +544,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-mail-3.0.pc %{_libdir}/pkgconfig/evolution-plugin-3.0.pc %{_libdir}/pkgconfig/evolution-shell-3.0.pc +%{_libdir}/pkgconfig/libemail-engine.pc +%{_libdir}/pkgconfig/libemail-utils.pc +%{_libdir}/libemail-engine.so +%{_libdir}/libemail-utils.so %{_libdir}/evolution/%{evo_base_version}/libcomposer.so %{_libdir}/evolution/%{evo_base_version}/libeabutil.so %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so From 107d41994fe6264057da12efdd34a17648d0edca Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Feb 2012 13:27:56 +0100 Subject: [PATCH 425/844] Update to 3.3.90 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5ef748e..85d1639 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.3.tar.xz /evolution-3.3.4.tar.xz /evolution-3.3.5.tar.xz +/evolution-3.3.90.tar.xz diff --git a/evolution.spec b/evolution.spec index 427e728..b88c65a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.3.5 +Version: 3.3.90 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -600,6 +600,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 20 2012 Milan Crha - 3.3.90-1 +- Update to 3.3.90 + * Mon Feb 06 2012 Milan Crha - 3.3.5-1 - Update to 3.3.5 diff --git a/sources b/sources index 2d25dc1..154d09b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7fb7309ab3c6371417f3ff009a26d43d evolution-3.3.5.tar.xz +38a195368667488e7fb30e7182f1999c evolution-3.3.90.tar.xz From 667e3ddcc47cc183c707cc7fa752c15b97f1f7c4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Feb 2012 16:28:05 +0100 Subject: [PATCH 426/844] Shared libraries have been renamed --- evolution.spec | 54 +++++++++++++++++++++++--------------------------- 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/evolution.spec b/evolution.spec index b88c65a..84f7779 100644 --- a/evolution.spec +++ b/evolution.spec @@ -296,13 +296,9 @@ unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL # remove libtool archives for importers and the like find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; -find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-engine.la' -exec rm {} \; -find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-utils.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; -find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-engine.a' -exec rm {} \; -find $RPM_BUILD_ROOT/%{_libdir} -name 'libemail-utils.a' -exec rm {} \; # remove old GConf schemas find $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas -name '*.schemas' -exec rm {} \; @@ -410,31 +406,31 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so # Shared libraries: -%{_libdir}/libemail-engine.so.* -%{_libdir}/libemail-utils.so.* -%{_libdir}/evolution/%{evo_base_version}/libcomposer.so.* -%{_libdir}/evolution/%{evo_base_version}/libeabutil.so.* -%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so.* -%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so.* -%{_libdir}/evolution/%{evo_base_version}/libemformat.so.* -%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so.* -%{_libdir}/evolution/%{evo_base_version}/libeshell.so.* -%{_libdir}/evolution/%{evo_base_version}/libessmime.so.* -%{_libdir}/evolution/%{evo_base_version}/libetable.so.* -%{_libdir}/evolution/%{evo_base_version}/libetext.so.* -%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so.* -%{_libdir}/evolution/%{evo_base_version}/libeutil.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so.* -%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so.* -%{_libdir}/evolution/%{evo_base_version}/libfilter.so.* -%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so.* -%{_libdir}/evolution/%{evo_base_version}/libmenus.so.* +%{_libdir}/evolution/%{evo_base_version}/libcomposer.so +%{_libdir}/evolution/%{evo_base_version}/libeabutil.so +%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so +%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so +%{_libdir}/evolution/%{evo_base_version}/libemail-engine.so +%{_libdir}/evolution/%{evo_base_version}/libemail-utils.so +%{_libdir}/evolution/%{evo_base_version}/libemformat.so +%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so +%{_libdir}/evolution/%{evo_base_version}/libeshell.so +%{_libdir}/evolution/%{evo_base_version}/libessmime.so +%{_libdir}/evolution/%{evo_base_version}/libetable.so +%{_libdir}/evolution/%{evo_base_version}/libetext.so +%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so +%{_libdir}/evolution/%{evo_base_version}/libeutil.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so +%{_libdir}/evolution/%{evo_base_version}/libfilter.so +%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so +%{_libdir}/evolution/%{evo_base_version}/libmenus.so # Various libexec programs: %dir %{_libexecdir}/evolution From 269c1df92ed0ccbdd72fba7b4362ec12cdc4e4b0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Feb 2012 17:00:18 +0100 Subject: [PATCH 427/844] Shared libraries are not in -devel anymore, because they are not versioned --- evolution.spec | 25 ------------------------- 1 file changed, 25 deletions(-) diff --git a/evolution.spec b/evolution.spec index 84f7779..056cd12 100644 --- a/evolution.spec +++ b/evolution.spec @@ -542,31 +542,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-shell-3.0.pc %{_libdir}/pkgconfig/libemail-engine.pc %{_libdir}/pkgconfig/libemail-utils.pc -%{_libdir}/libemail-engine.so -%{_libdir}/libemail-utils.so -%{_libdir}/evolution/%{evo_base_version}/libcomposer.so -%{_libdir}/evolution/%{evo_base_version}/libeabutil.so -%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so -%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so -%{_libdir}/evolution/%{evo_base_version}/libemformat.so -%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so -%{_libdir}/evolution/%{evo_base_version}/libeshell.so -%{_libdir}/evolution/%{evo_base_version}/libessmime.so -%{_libdir}/evolution/%{evo_base_version}/libetable.so -%{_libdir}/evolution/%{evo_base_version}/libetext.so -%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so -%{_libdir}/evolution/%{evo_base_version}/libeutil.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so -%{_libdir}/evolution/%{evo_base_version}/libfilter.so -%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so -%{_libdir}/evolution/%{evo_base_version}/libmenus.so %files help -f help.lang %defattr(-, root, root) From 5b10054400ff35cef45d069fdabeb723f2a63bf2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 6 Mar 2012 08:01:03 +0100 Subject: [PATCH 428/844] Update to 3.3.91 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 85d1639..723d53e 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.4.tar.xz /evolution-3.3.5.tar.xz /evolution-3.3.90.tar.xz +/evolution-3.3.91.tar.xz diff --git a/evolution.spec b/evolution.spec index 056cd12..47349b6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.3.90 +Version: 3.3.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -571,6 +571,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Mar 06 2012 Milan Crha - 3.3.91-1 +- Update to 3.3.91 + * Mon Feb 20 2012 Milan Crha - 3.3.90-1 - Update to 3.3.90 diff --git a/sources b/sources index 154d09b..bcc635b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -38a195368667488e7fb30e7182f1999c evolution-3.3.90.tar.xz +51dd494e7824ae02776e7fc9d5ea541e evolution-3.3.91.tar.xz From 456246129c02bf8bbe70704f487d3634ebbcbd58 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 6 Mar 2012 09:51:27 +0100 Subject: [PATCH 429/844] Add libevolution-utils files --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 47349b6..d8d7404 100644 --- a/evolution.spec +++ b/evolution.spec @@ -428,6 +428,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-utils.so %{_libdir}/evolution/%{evo_base_version}/libfilter.so %{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so %{_libdir}/evolution/%{evo_base_version}/libmenus.so @@ -542,6 +543,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-shell-3.0.pc %{_libdir}/pkgconfig/libemail-engine.pc %{_libdir}/pkgconfig/libemail-utils.pc +%{_libdir}/pkgconfig/libevolution-utils.pc %files help -f help.lang %defattr(-, root, root) From 455ae5d04e7074c23a28ca94341ede6054df3a66 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Mar 2012 10:42:38 +0100 Subject: [PATCH 430/844] Update to 3.3.92 --- .gitignore | 1 + evolution.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 723d53e..b1c80b9 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.5.tar.xz /evolution-3.3.90.tar.xz /evolution-3.3.91.tar.xz +/evolution-3.3.92.tar.xz diff --git a/evolution.spec b/evolution.spec index d8d7404..ac4aa3d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,4 +1,3 @@ -%define dbus_version 1.0 %define glib2_version 2.30.0 %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 @@ -27,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.3.91 +Version: 3.3.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -67,7 +66,7 @@ BuildRequires: automake >= 1.9 BuildRequires: bison BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} -BuildRequires: dbus-devel >= %{dbus_version} +BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext @@ -573,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 19 2012 Milan Crha - 3.3.92-1 +- Update to 3.3.92 + * Tue Mar 06 2012 Milan Crha - 3.3.91-1 - Update to 3.3.91 diff --git a/sources b/sources index bcc635b..dac4054 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51dd494e7824ae02776e7fc9d5ea541e evolution-3.3.91.tar.xz +93e36409a3f59822ab97fe7cbf3f7fc9 evolution-3.3.92.tar.xz From b29bf68d30e8ae0f596aecd64a610079b4cecec8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 26 Mar 2012 10:55:14 +0200 Subject: [PATCH 431/844] Update to 3.4.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b1c80b9..e80396e 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.90.tar.xz /evolution-3.3.91.tar.xz /evolution-3.3.92.tar.xz +/evolution-3.4.0.tar.xz diff --git a/evolution.spec b/evolution.spec index ac4aa3d..ca16af8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,14 +26,14 @@ ### Abstract ### Name: evolution -Version: 3.3.92 +Version: 3.4.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.3/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -572,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 26 2012 Milan Crha - 3.4.0-1 +- Update to 3.4.0 + * Mon Mar 19 2012 Milan Crha - 3.3.92-1 - Update to 3.3.92 diff --git a/sources b/sources index dac4054..db35c57 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -93e36409a3f59822ab97fe7cbf3f7fc9 evolution-3.3.92.tar.xz +ac3514457b5d20fefd9a6385e0b8cd92 evolution-3.4.0.tar.xz From 5951642e5d51b336cd300ea3184244c49dce70cc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 27 Mar 2012 18:06:58 +0200 Subject: [PATCH 432/844] Update to 3.4.0.1 --- .gitignore | 1 + evolution.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e80396e..788d8af 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.91.tar.xz /evolution-3.3.92.tar.xz /evolution-3.4.0.tar.xz +/evolution-3.4.0.1.tar.xz diff --git a/evolution.spec b/evolution.spec index ca16af8..102e59b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.4.0 +Version: 3.4.0.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -572,8 +572,8 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog -* Mon Mar 26 2012 Milan Crha - 3.4.0-1 -- Update to 3.4.0 +* Tue Mar 27 2012 Milan Crha - 3.4.0.1-1 +- Update to 3.4.0.1 * Mon Mar 19 2012 Milan Crha - 3.3.92-1 - Update to 3.3.92 diff --git a/sources b/sources index db35c57..8a58173 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac3514457b5d20fefd9a6385e0b8cd92 evolution-3.4.0.tar.xz +e439ee3b13615a266612cf769ff38c6a evolution-3.4.0.1.tar.xz From ea0923d722e5ff362cad1f06dfc14b7ebe5bea40 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 27 Mar 2012 18:16:21 +0200 Subject: [PATCH 433/844] There is no evolution-data-server-3.4.0.1 --- evolution.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 102e59b..c60cc13 100644 --- a/evolution.spec +++ b/evolution.spec @@ -52,7 +52,7 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -Requires: evolution-data-server >= %{version} +Requires: evolution-data-server >= 3.4.0 Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs @@ -68,7 +68,7 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{version} +BuildRequires: evolution-data-server-devel >= 3.4.0 BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -128,7 +128,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= %{version} +Requires: evolution-data-server-devel >= 3.4.0 Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} From 3006e46b6c16d8d616e6a8c9dfef93abf43f5758 Mon Sep 17 00:00:00 2001 From: Richard Hughes Date: Mon, 16 Apr 2012 09:05:14 +0100 Subject: [PATCH 434/844] Update to 3.4.1 --- .gitignore | 1 + evolution.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 788d8af..3cf7936 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.3.92.tar.xz /evolution-3.4.0.tar.xz /evolution-3.4.0.1.tar.xz +/evolution-3.4.1.tar.xz diff --git a/evolution.spec b/evolution.spec index c60cc13..b4f1ef9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.4.0.1 +Version: 3.4.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -52,7 +52,7 @@ Requires(pre): GConf2 Requires(post): GConf2 Requires(preun): GConf2 -Requires: evolution-data-server >= 3.4.0 +Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs @@ -68,7 +68,7 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= 3.4.0 +BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -128,7 +128,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= 3.4.0 +Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -572,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Apr 16 2012 Milan Crha - 3.4.1-1 +- Update to 3.4.1 + * Tue Mar 27 2012 Milan Crha - 3.4.0.1-1 - Update to 3.4.0.1 diff --git a/sources b/sources index 8a58173..d1b7cb1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -e439ee3b13615a266612cf769ff38c6a evolution-3.4.0.1.tar.xz +d178b6a9869f92e66b2022d4e35077ee evolution-3.4.1.tar.xz From 65525771b1d3583c6370ab8595f33128d10a1f57 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 24 Apr 2012 20:29:56 +0300 Subject: [PATCH 435/844] Silence rpm scriptlet output Redirect it to /dev/null; end users aren't supposed to see the warnings generated by e.g. glib-compile-schemas. http://fedoraproject.org/wiki/Packaging:ScriptletSnippets --- evolution.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index b4f1ef9..2b793dc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -329,14 +329,14 @@ touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun /sbin/ldconfig if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null + touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - glib-compile-schemas %{_datadir}/glib-2.0/schemas + glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : fi %posttrans gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -glib-compile-schemas %{_datadir}/glib-2.0/schemas +glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT @@ -572,6 +572,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Apr 24 2012 Kalev Lember - 3.4.1-2 +- Silence rpm scriptlet output + * Mon Apr 16 2012 Milan Crha - 3.4.1-1 - Update to 3.4.1 From 5d4309a3990d81843a9288dc265e36c901f69cc0 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 29 Apr 2012 07:43:55 -0400 Subject: [PATCH 436/844] Update to 3.5.1 --- .gitignore | 1 + evolution.spec | 26 ++++++++------------------ sources | 2 +- 3 files changed, 10 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 3cf7936..86b9f07 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.4.0.tar.xz /evolution-3.4.0.1.tar.xz /evolution-3.4.1.tar.xz +/evolution-3.5.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 2b793dc..171cfcf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,10 +10,11 @@ %define clutter_gtk_version 0.10 %define soup_version 2.4.0 -%define evo_base_version 3.4 +%define evo_base_version 3.6 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 +%define last_evo_nm_version 3.4.3 %define inline_audio_support 1 %define ldap_support 1 @@ -26,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.4.1 -Release: 2%{?dist} +Version: 3.5.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -37,6 +38,7 @@ Source: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} +Obsoletes: evolution-NetworkManager <= %{last_evo_nm_version} ### Patches ### @@ -59,7 +61,6 @@ Requires: gvfs ### Build Dependencies ### BuildRequires: GConf2-devel -BuildRequires: NetworkManager-devel BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -159,16 +160,6 @@ Requires: bogofilter %description bogofilter This package contains the plugin to filter junk mail using Bogofilter. -%package NetworkManager -Group: Applications/Productivity -Summary: NetworkManager plugin for Evolution -Requires: %{name} = %{version}-%{release} -Requires: NetworkManager - -%description NetworkManager -This package contains the plugin to monitor network availability using -NetworkManager. - %package spamassassin Group: Applications/Productivity Summary: SpamAssassin plugin for Evolution @@ -552,10 +543,6 @@ rm -rf $RPM_BUILD_ROOT %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so -%files NetworkManager -%defattr(-, root, root) -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-network-manager.so - %files spamassassin %defattr(-, root, root) %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so @@ -572,6 +559,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sun Apr 29 2012 Matthew Barnes - 3.5.1-1 +- Update to 3.5.1 + * Tue Apr 24 2012 Kalev Lember - 3.4.1-2 - Silence rpm scriptlet output diff --git a/sources b/sources index d1b7cb1..2033be7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d178b6a9869f92e66b2022d4e35077ee evolution-3.4.1.tar.xz +a97349ce6ef3e7f3b0262fc104ccaf61 evolution-3.5.1.tar.xz From 6173d1db67f130c7c147798036f40f92dd1c0f3c Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 29 Apr 2012 08:22:02 -0400 Subject: [PATCH 437/844] Forgot BR: webkitgtk-devel --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 171cfcf..627e58b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -9,6 +9,7 @@ %define libgweather_version 2.91.0 %define clutter_gtk_version 0.10 %define soup_version 2.4.0 +%define webkit_version 1.8.0 %define evo_base_version 3.6 @@ -34,7 +35,7 @@ Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.4/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -94,6 +95,7 @@ BuildRequires: nss-devel BuildRequires: pkgconfig BuildRequires: rarian-compat BuildRequires: unique3-devel +BuildRequires: webkitgtk-devel >= %{webkit_version} %if %{inline_audio_support} BuildRequires: gstreamer-devel @@ -561,6 +563,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun Apr 29 2012 Matthew Barnes - 3.5.1-1 - Update to 3.5.1 +- Add BR: webkitgtk-devel * Tue Apr 24 2012 Kalev Lember - 3.4.1-2 - Silence rpm scriptlet output From 282f0f19b361454738ca34afd64fe3f42af534ad Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 29 Apr 2012 09:16:41 -0400 Subject: [PATCH 438/844] Bother... --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 627e58b..1799177 100644 --- a/evolution.spec +++ b/evolution.spec @@ -95,7 +95,7 @@ BuildRequires: nss-devel BuildRequires: pkgconfig BuildRequires: rarian-compat BuildRequires: unique3-devel -BuildRequires: webkitgtk-devel >= %{webkit_version} +BuildRequires: webkitgtk3-devel >= %{webkit_version} %if %{inline_audio_support} BuildRequires: gstreamer-devel @@ -563,7 +563,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sun Apr 29 2012 Matthew Barnes - 3.5.1-1 - Update to 3.5.1 -- Add BR: webkitgtk-devel +- Add BR: webkitgtk3-devel * Tue Apr 24 2012 Kalev Lember - 3.4.1-2 - Silence rpm scriptlet output From e208fd40e8feb464cf9151e7f110dcb798384607 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sun, 29 Apr 2012 09:32:50 -0400 Subject: [PATCH 439/844] Missed a file. --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 1799177..8d8cca1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -396,6 +396,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so %{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-web-inspector.so # Shared libraries: %{_libdir}/evolution/%{evo_base_version}/libcomposer.so From 8cd521353bd5e91e87f73f69e014bae0f1224b7c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Jun 2012 11:12:00 +0200 Subject: [PATCH 440/844] Update to 3.5.2 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 86b9f07..0ab7dd0 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.4.0.1.tar.xz /evolution-3.4.1.tar.xz /evolution-3.5.1.tar.xz +/evolution-3.5.2.tar.xz diff --git a/evolution.spec b/evolution.spec index 8d8cca1..be783c0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.5.1 +Version: 3.5.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -562,6 +562,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 04 2012 Milan Crha - 3.5.2-1 +- Update to 3.5.2 + * Sun Apr 29 2012 Matthew Barnes - 3.5.1-1 - Update to 3.5.1 - Add BR: webkitgtk3-devel diff --git a/sources b/sources index 2033be7..590280b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a97349ce6ef3e7f3b0262fc104ccaf61 evolution-3.5.1.tar.xz +3675737bb2b0f7d1661ed8024e16dd61 evolution-3.5.2.tar.xz From ddbe07c84be89c32a12ffd068da22a982f2e7367 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Jun 2012 12:24:18 +0200 Subject: [PATCH 441/844] Doesn't build evolution-settings --- evolution.spec | 6 ------ 1 file changed, 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index be783c0..48e7e69 100644 --- a/evolution.spec +++ b/evolution.spec @@ -304,12 +304,6 @@ find $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas -name '*.schemas' -exec rm {} rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime -# Remove the 'email-settings' capplet. The thing was added for MeeGo -# to complement Express mode and, frankly, looks horrible. It doesn't -# belong on a GNOME 3 desktop. -rm $RPM_BUILD_ROOT%{_bindir}/evolution-settings -rm $RPM_BUILD_ROOT%{_datadir}/applications/evolution-settings.desktop - %find_lang evolution-%{evo_base_version} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang From caf3ca789effa0301f812f4a7234cbb9dd21afa4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Jun 2012 12:44:26 +0200 Subject: [PATCH 442/844] Rename modules and remove libevolution-mail-settings.so --- evolution.spec | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/evolution.spec b/evolution.spec index 48e7e69..4007f78 100644 --- a/evolution.spec +++ b/evolution.spec @@ -379,18 +379,18 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_base_version} %dir %{_libdir}/evolution/%{evo_base_version}/modules -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-addressbook.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-calendar.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mdn.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-web-inspector.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-addressbook.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-mailto-handler.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-mdn.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-offline-alert.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-online-accounts.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so # Shared libraries: %{_libdir}/evolution/%{evo_base_version}/libcomposer.so @@ -413,7 +413,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-settings.so %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so %{_libdir}/evolution/%{evo_base_version}/libevolution-utils.so %{_libdir}/evolution/%{evo_base_version}/libfilter.so @@ -538,11 +537,11 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %defattr(-, root, root) -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-bogofilter.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-bogofilter.so %files spamassassin %defattr(-, root, root) -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-spamassassin.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-spamassassin.so %files perl %defattr(-, root, root) From fcb97582b3db5e5a943b1895720ccaa637229933 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Jun 2012 13:38:43 +0200 Subject: [PATCH 443/844] Package also External Editor plugin --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index 4007f78..7c5d169 100644 --- a/evolution.spec +++ b/evolution.spec @@ -473,6 +473,9 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-google.eplug %{evo_plugin_dir}/liborg-gnome-evolution-google.so +%{evo_plugin_dir}/org-gnome-external-editor.eplug +%{evo_plugin_dir}/liborg-gnome-external-editor.so + %{evo_plugin_dir}/org-gnome-face.eplug %{evo_plugin_dir}/liborg-gnome-face.so From e885af9dba7b3918d341fbf07ca669f03890d67d Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 8 Jun 2012 14:49:59 -0400 Subject: [PATCH 444/844] rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 7c5d169..2948729 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -558,6 +558,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jun 8 2012 Matthias Clasen - 3.5.2-2 +- Rebuild against new gnome-desktop + * Mon Jun 04 2012 Milan Crha - 3.5.2-1 - Update to 3.5.2 From 3b1ab139552c6a99106f6b09d1282cf649d7410a Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 Jun 2012 10:12:03 -0400 Subject: [PATCH 445/844] Update to 3.5.3 --- .gitignore | 1 + evolution.spec | 79 +++++++++++++++++++------------------------------- sources | 2 +- 3 files changed, 32 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index 0ab7dd0..803250d 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.4.1.tar.xz /evolution-3.5.1.tar.xz /evolution-3.5.2.tar.xz +/evolution-3.5.3.tar.xz diff --git a/evolution.spec b/evolution.spec index 2948729..0e9f23b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.2 -Release: 2%{?dist} +Version: 3.5.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -374,23 +374,34 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/evolution/%{evo_base_version} # Modules: -# These must be listed individually because the NetworkManager -# module is split off into a separate NetworkManager subpackage. %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_base_version} %dir %{_libdir}/evolution/%{evo_base_version}/modules -%{_libdir}/evolution/%{evo_base_version}/modules/module-addressbook.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mailto-handler.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mdn.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-offline-alert.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-online-accounts.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-addressbook.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-backup-restore.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-book-config-google.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-book-config-ldap.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-book-config-local.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-book-config-webdav.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-caldav.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-contacts.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-google.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-local.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-weather.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-webcal.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-calendar.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-imap-features.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail-config.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mdn.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so +%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-web-inspector.so # Shared libraries: %{_libdir}/evolution/%{evo_base_version}/libcomposer.so @@ -435,9 +446,6 @@ rm -rf $RPM_BUILD_ROOT # are built as part of specific plugins but which are currently packaged using # globs above; the purpose of the separation below is to be more explicit about # which plugins we ship) -%{evo_plugin_dir}/org-gnome-addressbook-file.eplug -%{evo_plugin_dir}/liborg-gnome-addressbook-file.so - %{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug %{evo_plugin_dir}/liborg-gnome-evolution-attachment-reminder.so @@ -446,45 +454,18 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-audio-inline.so %endif -%{evo_plugin_dir}/org-gnome-backup-restore.eplug -%{evo_plugin_dir}/liborg-gnome-backup-restore.so - -%{evo_plugin_dir}/org-gnome-evolution-caldav.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-caldav.so - -%{evo_plugin_dir}/org-gnome-calendar-file.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-file.so - -%{evo_plugin_dir}/org-gnome-calendar-http.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-http.so - -%{evo_plugin_dir}/org-gnome-calendar-weather.eplug -%{evo_plugin_dir}/liborg-gnome-calendar-weather.so - -%{evo_plugin_dir}/org-gnome-default-source.eplug -%{evo_plugin_dir}/liborg-gnome-default-source.so - %{evo_plugin_dir}/org-gnome-email-custom-header.eplug %{evo_plugin_dir}/liborg-gnome-email-custom-header.so %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so -%{evo_plugin_dir}/org-gnome-evolution-google.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-google.so - -%{evo_plugin_dir}/org-gnome-external-editor.eplug -%{evo_plugin_dir}/liborg-gnome-external-editor.so - %{evo_plugin_dir}/org-gnome-face.eplug %{evo_plugin_dir}/liborg-gnome-face.so #%{evo_plugin_dir}/org-gnome-image-inline.eplug #%{evo_plugin_dir}/liborg-gnome-image-inline.so -%{evo_plugin_dir}/org-gnome-imap-features.eplug -%{evo_plugin_dir}/liborg-gnome-imap-features.so - %{evo_plugin_dir}/org-gnome-itip-formatter.eplug %{evo_plugin_dir}/liborg-gnome-itip-formatter.so @@ -515,9 +496,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-vcard-inline.eplug %{evo_plugin_dir}/liborg-gnome-vcard-inline.so -%{evo_plugin_dir}/org-gnome-evolution-webdav.eplug -%{evo_plugin_dir}/liborg-gnome-evolution-webdav.so - %{evo_plugin_dir}/org-gnome-dbx-import.eplug %{evo_plugin_dir}/liborg-gnome-dbx-import.so @@ -558,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 25 2012 Matthew Barnes - 3.5.3-1 +- Update to 3.5.3 + * Fri Jun 8 2012 Matthias Clasen - 3.5.2-2 - Rebuild against new gnome-desktop diff --git a/sources b/sources index 590280b..961a0aa 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3675737bb2b0f7d1661ed8024e16dd61 evolution-3.5.2.tar.xz +1c5d778a5658726f55bce6160f0f4341 evolution-3.5.3.tar.xz From cb55615f3c5f055a157a74aa83c5b7a35bfa0d0b Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 Jun 2012 11:01:45 -0400 Subject: [PATCH 446/844] Drop BR: GConf2-devel --- evolution.spec | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0e9f23b..4956e57 100644 --- a/evolution.spec +++ b/evolution.spec @@ -51,17 +51,12 @@ Patch02: evolution-2.30.1-help-contents.patch ## Dependencies ### -Requires(pre): GConf2 -Requires(post): GConf2 -Requires(preun): GConf2 - Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs ### Build Dependencies ### -BuildRequires: GConf2-devel BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 @@ -292,9 +287,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; -# remove old GConf schemas -find $RPM_BUILD_ROOT/%{_sysconfdir}/gconf/schemas -name '*.schemas' -exec rm {} \; - # remove additional things we don't want %if ! %{inline_audio_support} %{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \ @@ -538,6 +530,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jun 25 2012 Matthew Barnes - 3.5.3-1 - Update to 3.5.3 +- Drop BR: GConf2-devel \o/ * Fri Jun 8 2012 Matthias Clasen - 3.5.2-2 - Rebuild against new gnome-desktop From e2014e0cb104dc3399488930b042c19157a6cf50 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 25 Jun 2012 23:38:54 -0400 Subject: [PATCH 447/844] 3.5.3.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 803250d..bbb58e0 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.1.tar.xz /evolution-3.5.2.tar.xz /evolution-3.5.3.tar.xz +/evolution-3.5.3.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 4956e57..f9edcaf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.5.3 +Version: 3.5.3.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -528,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 25 2012 Matthew Barnes - 3.5.3.1-1 +- Update to 3.5.3.1 (3.5.3, no build for you!) + * Mon Jun 25 2012 Matthew Barnes - 3.5.3-1 - Update to 3.5.3 - Drop BR: GConf2-devel \o/ diff --git a/sources b/sources index 961a0aa..3532099 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c5d778a5658726f55bce6160f0f4341 evolution-3.5.3.tar.xz +a4d483ab1a56f9808ad9bd76895326bf evolution-3.5.3.1.tar.xz From 5b1e74a0e4b8012c856486614193f36891baed9f Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Jun 2012 00:15:30 -0400 Subject: [PATCH 448/844] Hack around E-D-S req. --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index f9edcaf..1241305 100644 --- a/evolution.spec +++ b/evolution.spec @@ -65,7 +65,8 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{version} +#BuildRequires: evolution-data-server-devel >= %{version} +BuildRequires: evolution-data-server-devel >= 3.5.3 BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common From da0553bc81d1da1b03003449abbb153d0b0d36a8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Jun 2012 02:22:20 -0400 Subject: [PATCH 449/844] Fix file list. --- evolution.spec | 50 +++++++++++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/evolution.spec b/evolution.spec index 1241305..3b665c4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -370,31 +370,31 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/evolution %dir %{_libdir}/evolution/%{evo_base_version} %dir %{_libdir}/evolution/%{evo_base_version}/modules -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-addressbook.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-backup-restore.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-book-config-google.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-book-config-ldap.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-book-config-local.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-book-config-webdav.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-caldav.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-contacts.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-google.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-local.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-weather.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-cal-config-webcal.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-calendar.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-composer-autosave.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-imap-features.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail-config.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mail.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mailto-handler.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-mdn.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-offline-alert.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-online-accounts.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-lib.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-plugin-manager.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-startup-wizard.so -%{_libdir}/evolution/%{evo_base_version}/modules/libevolution-module-web-inspector.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-addressbook.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-backup-restore.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-google.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-ldap.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-local.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-webdav.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-caldav.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-contacts.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-google.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-local.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-weather.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-webcal.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-imap-features.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-mail-config.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-mailto-handler.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-mdn.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-offline-alert.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-online-accounts.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so # Shared libraries: %{_libdir}/evolution/%{evo_base_version}/libcomposer.so From 86641aae2b3d472dbd5eaa6c6547d6750934bef1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Jun 2012 08:01:35 -0400 Subject: [PATCH 450/844] Fix file list again. --- evolution.spec | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/evolution.spec b/evolution.spec index 3b665c4..98448b6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -288,15 +288,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; -# remove additional things we don't want -%if ! %{inline_audio_support} -%{__rm} -f $RPM_BUILD_ROOT%{evo_plugin_dir}/org-gnome-audio-inline.eplug \ - $RPM_BUILD_ROOT%{evo_plugin_dir}/liborg-gnome-audio-inline.so -%endif - -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.keys -rm -f $RPM_BUILD_ROOT%{_datadir}/mime-info/evolution.mime - %find_lang evolution-%{evo_base_version} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang @@ -442,11 +433,6 @@ rm -rf $RPM_BUILD_ROOT %{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 -%endif - %{evo_plugin_dir}/org-gnome-email-custom-header.eplug %{evo_plugin_dir}/liborg-gnome-email-custom-header.so @@ -486,9 +472,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-templates.eplug %{evo_plugin_dir}/liborg-gnome-templates.so -%{evo_plugin_dir}/org-gnome-vcard-inline.eplug -%{evo_plugin_dir}/liborg-gnome-vcard-inline.so - %{evo_plugin_dir}/org-gnome-dbx-import.eplug %{evo_plugin_dir}/liborg-gnome-dbx-import.so From 1c7d4244b524c0ac69f81874e4335657bec75beb Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Jun 2012 08:42:12 -0400 Subject: [PATCH 451/844] Fix file list again. --- evolution.spec | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 98448b6..7653cd2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -288,6 +288,11 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; +# remove additional things we don't want +%if ! %{inline_audio_support} +%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so +%endif + %find_lang evolution-%{evo_base_version} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang @@ -376,17 +381,25 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so %{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so %{_libdir}/evolution/%{evo_base_version}/modules/module-imap-features.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-itip-formatter.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mail-config.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mailto-handler.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mdn.so %{_libdir}/evolution/%{evo_base_version}/modules/module-offline-alert.so %{_libdir}/evolution/%{evo_base_version}/modules/module-online-accounts.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-prefer-plain.so %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so %{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-text-highlight.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so %{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so +%if %{inline_audio_support} +%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so +%endif + # Shared libraries: %{_libdir}/evolution/%{evo_base_version}/libcomposer.so %{_libdir}/evolution/%{evo_base_version}/libeabutil.so @@ -439,12 +452,12 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-evolution-bbdb.eplug %{evo_plugin_dir}/liborg-gnome-evolution-bbdb.so +%{evo_plugin_dir}/org-gnome-external-editor.eplug +%{evo_plugin_dir}/liborg-gnome-external-editor.so + %{evo_plugin_dir}/org-gnome-face.eplug %{evo_plugin_dir}/liborg-gnome-face.so -#%{evo_plugin_dir}/org-gnome-image-inline.eplug -#%{evo_plugin_dir}/liborg-gnome-image-inline.so - %{evo_plugin_dir}/org-gnome-itip-formatter.eplug %{evo_plugin_dir}/liborg-gnome-itip-formatter.so From 24a7edd4782f0f6bcebc3852e65bc2ff69c18077 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Jun 2012 09:31:37 -0400 Subject: [PATCH 452/844] Fix file list again. --- evolution.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7653cd2..ad3ae06 100644 --- a/evolution.spec +++ b/evolution.spec @@ -333,14 +333,15 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml -%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.external-editor.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.face-picture.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.itip.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml # The main executable %{_bindir}/evolution @@ -393,6 +394,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so %{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so %{_libdir}/evolution/%{evo_base_version}/modules/module-text-highlight.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-tnef-attachment.so %{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so %{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so From df58fa43bc2fb969865209e4dc6590733a31da0e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Jun 2012 12:22:54 -0400 Subject: [PATCH 453/844] Fix reqs. --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index ad3ae06..0751264 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.3.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,7 +51,6 @@ Patch02: evolution-2.30.1-help-contents.patch ## Dependencies ### -Requires: evolution-data-server >= %{version} Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs @@ -527,6 +526,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jun 26 2012 Matthew Barnes - 3.5.3.1-2 +- Remove unnecessary Requires: evolution-data-server. + * Mon Jun 25 2012 Matthew Barnes - 3.5.3.1-1 - Update to 3.5.3.1 (3.5.3, no build for you!) From 26349a8def2361fcc3cb552545170f147e4f7592 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 26 Jun 2012 14:45:32 -0400 Subject: [PATCH 454/844] Ugh. --- evolution.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0751264..bd446be 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.3.1 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -126,7 +126,8 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= %{version} +#Requires: evolution-data-server-devel >= %{version} +Requires: evolution-data-server-devel >= 3.5.3 Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -526,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Jun 26 2012 Matthew Barnes - 2.5.3.1-3 +- Temporarily change e-d-s req in devel subpackage. + * Tue Jun 26 2012 Matthew Barnes - 3.5.3.1-2 - Remove unnecessary Requires: evolution-data-server. From f82c3e04e73279e5e756db503ec109c2c0ea9f9b Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Jun 2012 08:48:26 -0400 Subject: [PATCH 455/844] temporarily disable weather plugin --- evolution.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index bd446be..395282b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.3.1 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -234,6 +234,7 @@ intltoolize --force autoconf %configure \ + --disable-weather \ --disable-maintainer-mode \ --disable-image-inline \ --enable-gtk-doc \ @@ -527,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jun 27 2012 Matthias Clasen - 2.5.3.1-4 +- Temporarily disable weather plugin (not ported to new libgweather yet) + * Tue Jun 26 2012 Matthew Barnes - 2.5.3.1-3 - Temporarily change e-d-s req in devel subpackage. From fc51a002ce85bdf63947dd338136dbb2be73a4e6 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 27 Jun 2012 09:16:00 -0400 Subject: [PATCH 456/844] fix file list --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 395282b..cc571d8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -378,7 +378,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-contacts.so %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-google.so %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-local.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-weather.so +# %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-weather.so %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-webcal.so %{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so %{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so From 5a536ee04b126fc76d1a0b3eb321d7b75650c2b0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jul 2012 09:50:44 +0200 Subject: [PATCH 457/844] Update to 3.5.4 --- .gitignore | 1 + evolution.spec | 17 +++++++++-------- sources | 2 +- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index bbb58e0..929fe69 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.2.tar.xz /evolution-3.5.3.tar.xz /evolution-3.5.3.1.tar.xz +/evolution-3.5.4.tar.xz diff --git a/evolution.spec b/evolution.spec index cc571d8..b22b529 100644 --- a/evolution.spec +++ b/evolution.spec @@ -6,7 +6,7 @@ %define gtkhtml_version 4.3.1 %define intltool_version 0.35.5 %define libgdata_version 0.10.0 -%define libgweather_version 2.91.0 +%define libgweather_version 3.5.0 %define clutter_gtk_version 0.10 %define soup_version 2.4.0 %define webkit_version 1.8.0 @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.3.1 -Release: 4%{?dist} +Version: 3.5.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -64,8 +64,7 @@ BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils -#BuildRequires: evolution-data-server-devel >= %{version} -BuildRequires: evolution-data-server-devel >= 3.5.3 +BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -126,8 +125,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -#Requires: evolution-data-server-devel >= %{version} -Requires: evolution-data-server-devel >= 3.5.3 +Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -234,7 +232,6 @@ intltoolize --force autoconf %configure \ - --disable-weather \ --disable-maintainer-mode \ --disable-image-inline \ --enable-gtk-doc \ @@ -528,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 16 2012 Milan Crha - 3.5.4-1 +- Update to 3.5.4 +- Enable weather plugin (fixed upstream) + * Wed Jun 27 2012 Matthias Clasen - 2.5.3.1-4 - Temporarily disable weather plugin (not ported to new libgweather yet) diff --git a/sources b/sources index 3532099..5e6290d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4d483ab1a56f9808ad9bd76895326bf evolution-3.5.3.1.tar.xz +30a5524ac51ad14e4efd582ddfce4099 evolution-3.5.4.tar.xz From 52e340b98acedab4cbac1e76ad8e51ef90074d9d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jul 2012 13:07:12 +0200 Subject: [PATCH 458/844] Forgot to enable module-cal-config-weather.so --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index b22b529..836bcdc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -375,7 +375,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-contacts.so %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-google.so %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-local.so -# %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-weather.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-weather.so %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-webcal.so %{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so %{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so From 4e4c677ceca5385c3d263ee0b11b1ccb3c68d8b1 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 18 Jul 2012 19:39:27 -0500 Subject: [PATCH 459/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 836bcdc..825525e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -525,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jul 19 2012 Fedora Release Engineering - 3.5.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + * Mon Jul 16 2012 Milan Crha - 3.5.4-1 - Update to 3.5.4 - Enable weather plugin (fixed upstream) From fe21b3d32869f80bbe1661db244b8fe904a5010f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 6 Aug 2012 09:17:54 +0200 Subject: [PATCH 460/844] Update to 3.5.5 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 929fe69..cdbab75 100644 --- a/.gitignore +++ b/.gitignore @@ -39,3 +39,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.3.tar.xz /evolution-3.5.3.1.tar.xz /evolution-3.5.4.tar.xz +/evolution-3.5.5.tar.xz diff --git a/evolution.spec b/evolution.spec index 825525e..e2abab6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.4 -Release: 2%{?dist} +Version: 3.5.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -525,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 06 2012 Milan Crha - 3.5.5-1 +- Update to 3.5.5 + * Thu Jul 19 2012 Fedora Release Engineering - 3.5.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild diff --git a/sources b/sources index 5e6290d..53994cb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -30a5524ac51ad14e4efd582ddfce4099 evolution-3.5.4.tar.xz +5c285b52a46f89b43a32af022c1bbdc2 evolution-3.5.5.tar.xz From c4d09a38f6160c4b36f8e11a2946c7671db0a098 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 15 Aug 2012 10:07:22 -0700 Subject: [PATCH 461/844] backport the fix for BGO #678408 --- evolution-3.5.5-bgo678408.patch | 26 ++++++++++++++++++++++++++ evolution.spec | 10 +++++++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 evolution-3.5.5-bgo678408.patch diff --git a/evolution-3.5.5-bgo678408.patch b/evolution-3.5.5-bgo678408.patch new file mode 100644 index 0000000..42fdcf5 --- /dev/null +++ b/evolution-3.5.5-bgo678408.patch @@ -0,0 +1,26 @@ +diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c +index 5a65ad7..0d9b5a3 100644 +--- a/widgets/misc/e-web-view.c ++++ b/widgets/misc/e-web-view.c +@@ -578,11 +578,20 @@ web_view_load_status_changed_cb (WebKitWebView *web_view, + gpointer user_data) + { + WebKitLoadStatus status; ++ GtkAllocation allocation, allocation_copy; + + status = webkit_web_view_get_load_status (web_view); + if (status != WEBKIT_LOAD_FINISHED) + return; + ++ /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ ++ gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); ++ allocation = allocation_copy; ++ allocation.width -= 10; ++ allocation.height -= 10; ++ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); ++ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); ++ + web_view_update_document_highlights (E_WEB_VIEW (web_view)); + } + + diff --git a/evolution.spec b/evolution.spec index e2abab6..b9130a2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,6 +49,10 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# BGO #678408: tiny pane used for non-multipart MIME mails. Upstream +# commit ad93908, will be in Evo 3.5.90 - adamw +Patch03: evolution-3.5.5-bgo678408.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -189,6 +193,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .bgo678408 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -525,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Aug 15 2012 Adam Williamson - 3.5.5-2 +- backport the fix for BGO #678408 + * Mon Aug 06 2012 Milan Crha - 3.5.5-1 - Update to 3.5.5 From 5c67ec72e5bacee0d4c308e306b4d499ffa7c2a3 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 15 Aug 2012 13:15:33 -0700 Subject: [PATCH 462/844] also backport an upstream fix for build against latest libxml2 --- evolution-3.5.5-libxml2.patch | 57 +++++++++++++++++++++++++++++++++++ evolution.spec | 6 +++- 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 evolution-3.5.5-libxml2.patch diff --git a/evolution-3.5.5-libxml2.patch b/evolution-3.5.5-libxml2.patch new file mode 100644 index 0000000..51ac89b --- /dev/null +++ b/evolution-3.5.5-libxml2.patch @@ -0,0 +1,57 @@ +From ff88d1f11176233438cace72da46a54c479495ab Mon Sep 17 00:00:00 2001 +From: Matthew Barnes +Date: Mon, 13 Aug 2012 15:41:10 +0000 +Subject: Bug 681321 - Support both old and new-buf libxml2 APIs + +libxml2 changed the API for xmlOutputBuffer incompatibly. +See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html +--- +diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c +index 55143f0..fa5c9b7 100644 +--- a/modules/cal-config-caldav/e-caldav-chooser.c ++++ b/modules/cal-config-caldav/e-caldav-chooser.c +@@ -111,6 +111,19 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED ( + E_TYPE_SOURCE_AUTHENTICATOR, + e_caldav_chooser_authenticator_init)) + ++static gconstpointer ++compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, ++ gsize *out_len) ++{ ++#ifdef LIBXML2_NEW_BUFFER ++ *out_len = xmlOutputBufferGetSize (buf); ++ return xmlOutputBufferGetContent (buf); ++#else ++ *out_len = buf->buffer->use; ++ return buf->buffer->content; ++#endif ++} ++ + static void + context_cancel_message (GCancellable *cancellable, + Context *context) +@@ -203,6 +216,8 @@ caldav_chooser_new_propfind (SoupSession *session, + xmlNodePtr node; + xmlNsPtr ns; + xmlOutputBufferPtr output; ++ gconstpointer content; ++ gsize length; + gpointer key; + va_list va; + +@@ -268,9 +283,11 @@ caldav_chooser_new_propfind (SoupSession *session, + xmlNodeDumpOutput (output, doc, root, 0, 1, NULL); + xmlOutputBufferFlush (output); + ++ content = compat_libxml_output_buffer_get_content (output, &length); ++ + soup_message_set_request ( + message, "application/xml", SOUP_MEMORY_COPY, +- (gchar *) output->buffer->content, output->buffer->use); ++ content, length); + + xmlOutputBufferClose (output); + +-- +cgit v0.9.0.2 + diff --git a/evolution.spec b/evolution.spec index b9130a2..44ad2c0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -53,6 +53,9 @@ Patch02: evolution-2.30.1-help-contents.patch # commit ad93908, will be in Evo 3.5.90 - adamw Patch03: evolution-3.5.5-bgo678408.patch +# Upstream ff88d1f11: fix build with new libxml2 +Patch04: evolution-3.5.5-libxml2.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -194,6 +197,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents %patch03 -p1 -b .bgo678408 +%patch04 -p1 -b .libxml2 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -531,7 +535,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Wed Aug 15 2012 Adam Williamson - 3.5.5-2 -- backport the fix for BGO #678408 +- backport the fix for BGO #678408 and #681321 (libxml2 build) * Mon Aug 06 2012 Milan Crha - 3.5.5-1 - Update to 3.5.5 From 2cbe1c6e6940fd42a46601c8f8aa2bb44d6c374c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Aug 2012 11:11:28 +0200 Subject: [PATCH 463/844] Update to 3.5.90 --- .gitignore | 1 + evolution-3.5.5-bgo678408.patch | 26 --------------- evolution-3.5.5-libxml2.patch | 57 --------------------------------- evolution.spec | 17 ++++------ sources | 2 +- 5 files changed, 8 insertions(+), 95 deletions(-) delete mode 100644 evolution-3.5.5-bgo678408.patch delete mode 100644 evolution-3.5.5-libxml2.patch diff --git a/.gitignore b/.gitignore index cdbab75..7ff5008 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.3.1.tar.xz /evolution-3.5.4.tar.xz /evolution-3.5.5.tar.xz +/evolution-3.5.90.tar.xz diff --git a/evolution-3.5.5-bgo678408.patch b/evolution-3.5.5-bgo678408.patch deleted file mode 100644 index 42fdcf5..0000000 --- a/evolution-3.5.5-bgo678408.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c -index 5a65ad7..0d9b5a3 100644 ---- a/widgets/misc/e-web-view.c -+++ b/widgets/misc/e-web-view.c -@@ -578,11 +578,20 @@ web_view_load_status_changed_cb (WebKitWebView *web_view, - gpointer user_data) - { - WebKitLoadStatus status; -+ GtkAllocation allocation, allocation_copy; - - status = webkit_web_view_get_load_status (web_view); - if (status != WEBKIT_LOAD_FINISHED) - return; - -+ /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ -+ gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); -+ allocation = allocation_copy; -+ allocation.width -= 10; -+ allocation.height -= 10; -+ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); -+ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); -+ - web_view_update_document_highlights (E_WEB_VIEW (web_view)); - } - - diff --git a/evolution-3.5.5-libxml2.patch b/evolution-3.5.5-libxml2.patch deleted file mode 100644 index 51ac89b..0000000 --- a/evolution-3.5.5-libxml2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ff88d1f11176233438cace72da46a54c479495ab Mon Sep 17 00:00:00 2001 -From: Matthew Barnes -Date: Mon, 13 Aug 2012 15:41:10 +0000 -Subject: Bug 681321 - Support both old and new-buf libxml2 APIs - -libxml2 changed the API for xmlOutputBuffer incompatibly. -See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html ---- -diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c -index 55143f0..fa5c9b7 100644 ---- a/modules/cal-config-caldav/e-caldav-chooser.c -+++ b/modules/cal-config-caldav/e-caldav-chooser.c -@@ -111,6 +111,19 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED ( - E_TYPE_SOURCE_AUTHENTICATOR, - e_caldav_chooser_authenticator_init)) - -+static gconstpointer -+compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, -+ gsize *out_len) -+{ -+#ifdef LIBXML2_NEW_BUFFER -+ *out_len = xmlOutputBufferGetSize (buf); -+ return xmlOutputBufferGetContent (buf); -+#else -+ *out_len = buf->buffer->use; -+ return buf->buffer->content; -+#endif -+} -+ - static void - context_cancel_message (GCancellable *cancellable, - Context *context) -@@ -203,6 +216,8 @@ caldav_chooser_new_propfind (SoupSession *session, - xmlNodePtr node; - xmlNsPtr ns; - xmlOutputBufferPtr output; -+ gconstpointer content; -+ gsize length; - gpointer key; - va_list va; - -@@ -268,9 +283,11 @@ caldav_chooser_new_propfind (SoupSession *session, - xmlNodeDumpOutput (output, doc, root, 0, 1, NULL); - xmlOutputBufferFlush (output); - -+ content = compat_libxml_output_buffer_get_content (output, &length); -+ - soup_message_set_request ( - message, "application/xml", SOUP_MEMORY_COPY, -- (gchar *) output->buffer->content, output->buffer->use); -+ content, length); - - xmlOutputBufferClose (output); - --- -cgit v0.9.0.2 - diff --git a/evolution.spec b/evolution.spec index 44ad2c0..1fc1285 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.5 -Release: 2%{?dist} +Version: 3.5.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,13 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# BGO #678408: tiny pane used for non-multipart MIME mails. Upstream -# commit ad93908, will be in Evo 3.5.90 - adamw -Patch03: evolution-3.5.5-bgo678408.patch - -# Upstream ff88d1f11: fix build with new libxml2 -Patch04: evolution-3.5.5-libxml2.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -196,8 +189,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .bgo678408 -%patch04 -p1 -b .libxml2 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -534,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 20 2012 Milan Crha - 3.5.90-1 +- Update to 3.5.90 +- Remove patches for BGO #678408 and #681321 (fixed upstream) + * Wed Aug 15 2012 Adam Williamson - 3.5.5-2 - backport the fix for BGO #678408 and #681321 (libxml2 build) diff --git a/sources b/sources index 53994cb..c762f4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c285b52a46f89b43a32af022c1bbdc2 evolution-3.5.5.tar.xz +4edb84ffa69c1dcb702c1c93a01c0130 evolution-3.5.90.tar.xz From 204d4a0a07beaa1336c698cb6d5831af9debb3f7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Aug 2012 11:52:54 +0200 Subject: [PATCH 464/844] Update to 3.5.90 --- .gitignore | 1 + evolution-3.5.5-bgo678408.patch | 26 --------------- evolution-3.5.5-libxml2.patch | 57 --------------------------------- evolution.spec | 17 ++++------ sources | 2 +- 5 files changed, 8 insertions(+), 95 deletions(-) delete mode 100644 evolution-3.5.5-bgo678408.patch delete mode 100644 evolution-3.5.5-libxml2.patch diff --git a/.gitignore b/.gitignore index cdbab75..7ff5008 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.3.1.tar.xz /evolution-3.5.4.tar.xz /evolution-3.5.5.tar.xz +/evolution-3.5.90.tar.xz diff --git a/evolution-3.5.5-bgo678408.patch b/evolution-3.5.5-bgo678408.patch deleted file mode 100644 index 42fdcf5..0000000 --- a/evolution-3.5.5-bgo678408.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c -index 5a65ad7..0d9b5a3 100644 ---- a/widgets/misc/e-web-view.c -+++ b/widgets/misc/e-web-view.c -@@ -578,11 +578,20 @@ web_view_load_status_changed_cb (WebKitWebView *web_view, - gpointer user_data) - { - WebKitLoadStatus status; -+ GtkAllocation allocation, allocation_copy; - - status = webkit_web_view_get_load_status (web_view); - if (status != WEBKIT_LOAD_FINISHED) - return; - -+ /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ -+ gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); -+ allocation = allocation_copy; -+ allocation.width -= 10; -+ allocation.height -= 10; -+ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); -+ gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); -+ - web_view_update_document_highlights (E_WEB_VIEW (web_view)); - } - - diff --git a/evolution-3.5.5-libxml2.patch b/evolution-3.5.5-libxml2.patch deleted file mode 100644 index 51ac89b..0000000 --- a/evolution-3.5.5-libxml2.patch +++ /dev/null @@ -1,57 +0,0 @@ -From ff88d1f11176233438cace72da46a54c479495ab Mon Sep 17 00:00:00 2001 -From: Matthew Barnes -Date: Mon, 13 Aug 2012 15:41:10 +0000 -Subject: Bug 681321 - Support both old and new-buf libxml2 APIs - -libxml2 changed the API for xmlOutputBuffer incompatibly. -See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html ---- -diff --git a/modules/cal-config-caldav/e-caldav-chooser.c b/modules/cal-config-caldav/e-caldav-chooser.c -index 55143f0..fa5c9b7 100644 ---- a/modules/cal-config-caldav/e-caldav-chooser.c -+++ b/modules/cal-config-caldav/e-caldav-chooser.c -@@ -111,6 +111,19 @@ G_DEFINE_DYNAMIC_TYPE_EXTENDED ( - E_TYPE_SOURCE_AUTHENTICATOR, - e_caldav_chooser_authenticator_init)) - -+static gconstpointer -+compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf, -+ gsize *out_len) -+{ -+#ifdef LIBXML2_NEW_BUFFER -+ *out_len = xmlOutputBufferGetSize (buf); -+ return xmlOutputBufferGetContent (buf); -+#else -+ *out_len = buf->buffer->use; -+ return buf->buffer->content; -+#endif -+} -+ - static void - context_cancel_message (GCancellable *cancellable, - Context *context) -@@ -203,6 +216,8 @@ caldav_chooser_new_propfind (SoupSession *session, - xmlNodePtr node; - xmlNsPtr ns; - xmlOutputBufferPtr output; -+ gconstpointer content; -+ gsize length; - gpointer key; - va_list va; - -@@ -268,9 +283,11 @@ caldav_chooser_new_propfind (SoupSession *session, - xmlNodeDumpOutput (output, doc, root, 0, 1, NULL); - xmlOutputBufferFlush (output); - -+ content = compat_libxml_output_buffer_get_content (output, &length); -+ - soup_message_set_request ( - message, "application/xml", SOUP_MEMORY_COPY, -- (gchar *) output->buffer->content, output->buffer->use); -+ content, length); - - xmlOutputBufferClose (output); - --- -cgit v0.9.0.2 - diff --git a/evolution.spec b/evolution.spec index 44ad2c0..1fc1285 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.5 -Release: 2%{?dist} +Version: 3.5.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,13 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# BGO #678408: tiny pane used for non-multipart MIME mails. Upstream -# commit ad93908, will be in Evo 3.5.90 - adamw -Patch03: evolution-3.5.5-bgo678408.patch - -# Upstream ff88d1f11: fix build with new libxml2 -Patch04: evolution-3.5.5-libxml2.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -196,8 +189,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .bgo678408 -%patch04 -p1 -b .libxml2 mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -534,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 20 2012 Milan Crha - 3.5.90-1 +- Update to 3.5.90 +- Remove patches for BGO #678408 and #681321 (fixed upstream) + * Wed Aug 15 2012 Adam Williamson - 3.5.5-2 - backport the fix for BGO #678408 and #681321 (libxml2 build) diff --git a/sources b/sources index 53994cb..c762f4f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5c285b52a46f89b43a32af022c1bbdc2 evolution-3.5.5.tar.xz +4edb84ffa69c1dcb702c1c93a01c0130 evolution-3.5.90.tar.xz From 940bae73fbff6d58617effba32f48b43360e5dcd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Aug 2012 13:45:21 +0200 Subject: [PATCH 465/844] Add itstool and yelp-tools into BuildRequires --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index 1fc1285..9999883 100644 --- a/evolution.spec +++ b/evolution.spec @@ -76,6 +76,7 @@ BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: intltool >= %{intltool_version} +BuildRequires: itstool BuildRequires: libcanberra-devel BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} @@ -90,6 +91,7 @@ BuildRequires: pkgconfig BuildRequires: rarian-compat BuildRequires: unique3-devel BuildRequires: webkitgtk3-devel >= %{webkit_version} +BuildRequires: yelp-tools %if %{inline_audio_support} BuildRequires: gstreamer-devel @@ -528,6 +530,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Aug 20 2012 Milan Crha - 3.5.90-1 - Update to 3.5.90 - Remove patches for BGO #678408 and #681321 (fixed upstream) +- Add itstool and yelp-tools into BuildRequires * Wed Aug 15 2012 Adam Williamson - 3.5.5-2 - backport the fix for BGO #678408 and #681321 (libxml2 build) From e0d005b7521d81fd14a63bfb5cab63fc8d96888c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Aug 2012 14:21:22 +0200 Subject: [PATCH 466/844] Folder for help files changed --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 9999883..bbcd54d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -505,7 +505,7 @@ rm -rf $RPM_BUILD_ROOT %files help -f help.lang %defattr(-, root, root) -%dir %{_datadir}/gnome/help/evolution +%dir %{_datadir}/help/*/evolution %files bogofilter %defattr(-, root, root) From 81c264acd92b3bbba61f5cbaee89bf0322e98354 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Aug 2012 14:47:48 +0200 Subject: [PATCH 467/844] Fix build-break due to changes in help compilation --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1fc1285..bbcd54d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -76,6 +76,7 @@ BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} BuildRequires: intltool >= %{intltool_version} +BuildRequires: itstool BuildRequires: libcanberra-devel BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} @@ -90,6 +91,7 @@ BuildRequires: pkgconfig BuildRequires: rarian-compat BuildRequires: unique3-devel BuildRequires: webkitgtk3-devel >= %{webkit_version} +BuildRequires: yelp-tools %if %{inline_audio_support} BuildRequires: gstreamer-devel @@ -503,7 +505,7 @@ rm -rf $RPM_BUILD_ROOT %files help -f help.lang %defattr(-, root, root) -%dir %{_datadir}/gnome/help/evolution +%dir %{_datadir}/help/*/evolution %files bogofilter %defattr(-, root, root) @@ -528,6 +530,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Aug 20 2012 Milan Crha - 3.5.90-1 - Update to 3.5.90 - Remove patches for BGO #678408 and #681321 (fixed upstream) +- Add itstool and yelp-tools into BuildRequires * Wed Aug 15 2012 Adam Williamson - 3.5.5-2 - backport the fix for BGO #678408 and #681321 (libxml2 build) From c4c147028d2eb35a6c00421c9561fe552d079fbf Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Sep 2012 08:21:54 +0200 Subject: [PATCH 468/844] Update to 3.5.91 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ff5008..119498e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.4.tar.xz /evolution-3.5.5.tar.xz /evolution-3.5.90.tar.xz +/evolution-3.5.91.tar.xz diff --git a/evolution.spec b/evolution.spec index bbcd54d..ad3fe30 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.5.90 +Version: 3.5.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 03 2012 Milan Crha - 3.5.91-1 +- Update to 3.5.91 + * Mon Aug 20 2012 Milan Crha - 3.5.90-1 - Update to 3.5.90 - Remove patches for BGO #678408 and #681321 (fixed upstream) diff --git a/sources b/sources index c762f4f..96a2978 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4edb84ffa69c1dcb702c1c93a01c0130 evolution-3.5.90.tar.xz +c1c6b5b2a86cc729094caef6d9d0fb68 evolution-3.5.91.tar.xz From ec18dd9bdf51714258b99d7f440f2390d3d3941a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Sep 2012 08:55:24 +0200 Subject: [PATCH 469/844] Update to 3.5.91 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7ff5008..119498e 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.4.tar.xz /evolution-3.5.5.tar.xz /evolution-3.5.90.tar.xz +/evolution-3.5.91.tar.xz diff --git a/evolution.spec b/evolution.spec index bbcd54d..ad3fe30 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.5.90 +Version: 3.5.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 03 2012 Milan Crha - 3.5.91-1 +- Update to 3.5.91 + * Mon Aug 20 2012 Milan Crha - 3.5.90-1 - Update to 3.5.90 - Remove patches for BGO #678408 and #681321 (fixed upstream) diff --git a/sources b/sources index c762f4f..96a2978 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4edb84ffa69c1dcb702c1c93a01c0130 evolution-3.5.90.tar.xz +c1c6b5b2a86cc729094caef6d9d0fb68 evolution-3.5.91.tar.xz From a5a2ee6551cf74fff074fbf687fc6b6168a92450 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Sep 2012 10:31:54 +0200 Subject: [PATCH 470/844] Update to 3.5.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 119498e..5bae153 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.5.tar.xz /evolution-3.5.90.tar.xz /evolution-3.5.91.tar.xz +/evolution-3.5.92.tar.xz diff --git a/evolution.spec b/evolution.spec index ad3fe30..04c593c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.5.91 +Version: 3.5.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 17 2012 Milan Crha - 3.5.92-1 +- Update to 3.5.92 + * Mon Sep 03 2012 Milan Crha - 3.5.91-1 - Update to 3.5.91 diff --git a/sources b/sources index 96a2978..0da0787 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1c6b5b2a86cc729094caef6d9d0fb68 evolution-3.5.91.tar.xz +d598d3d2c80f3db4c5c7f06f9f96148a evolution-3.5.92.tar.xz From 84ff17c5d84874b9c04f5a9ac5044ac8af9ff5b1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Sep 2012 10:41:07 +0200 Subject: [PATCH 471/844] Update to 3.5.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 119498e..5bae153 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.5.tar.xz /evolution-3.5.90.tar.xz /evolution-3.5.91.tar.xz +/evolution-3.5.92.tar.xz diff --git a/evolution.spec b/evolution.spec index ad3fe30..04c593c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.5.91 +Version: 3.5.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 17 2012 Milan Crha - 3.5.92-1 +- Update to 3.5.92 + * Mon Sep 03 2012 Milan Crha - 3.5.91-1 - Update to 3.5.91 diff --git a/sources b/sources index 96a2978..0da0787 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c1c6b5b2a86cc729094caef6d9d0fb68 evolution-3.5.91.tar.xz +d598d3d2c80f3db4c5c7f06f9f96148a evolution-3.5.92.tar.xz From 49770699934d2942933e71e71795376d7781a8f6 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 19 Sep 2012 16:11:44 +0200 Subject: [PATCH 472/844] Fix evolution-NetworkManager obsoletes Make sure to include all 3.4.x versions in the obsolete line. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 04c593c..d6d73f1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -15,7 +15,7 @@ %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 -%define last_evo_nm_version 3.4.3 +%define last_evo_nm_version 3.5.0 %define inline_audio_support 1 %define ldap_support 1 @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -39,7 +39,7 @@ Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} -Obsoletes: evolution-NetworkManager <= %{last_evo_nm_version} +Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Sep 19 2012 Kalev Lember - 3.5.92-2 +- Fix evolution-NetworkManager obsoletes + * Mon Sep 17 2012 Milan Crha - 3.5.92-1 - Update to 3.5.92 From f5d514c4b7c15e987d95d369111fcced4beab204 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 19 Sep 2012 16:11:44 +0200 Subject: [PATCH 473/844] Fix evolution-NetworkManager obsoletes Make sure to include all 3.4.x versions in the obsolete line. --- evolution.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 04c593c..d6d73f1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -15,7 +15,7 @@ %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 -%define last_evo_nm_version 3.4.3 +%define last_evo_nm_version 3.5.0 %define inline_audio_support 1 %define ldap_support 1 @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -39,7 +39,7 @@ Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} -Obsoletes: evolution-NetworkManager <= %{last_evo_nm_version} +Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Sep 19 2012 Kalev Lember - 3.5.92-2 +- Fix evolution-NetworkManager obsoletes + * Mon Sep 17 2012 Milan Crha - 3.5.92-1 - Update to 3.5.92 From bb4fe1d492d93ce76b517c7bb6b27709c5b877fa Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 22 Sep 2012 08:34:40 -0700 Subject: [PATCH 474/844] backport fix for BGO #678408 (broken message display) --- evolution-3.5.92-flatten.patch | 40 ++++++++++++++++++++++++++++++++++ evolution.spec | 9 +++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 evolution-3.5.92-flatten.patch diff --git a/evolution-3.5.92-flatten.patch b/evolution-3.5.92-flatten.patch new file mode 100644 index 0000000..509b394 --- /dev/null +++ b/evolution-3.5.92-flatten.patch @@ -0,0 +1,40 @@ +diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c +index b1d726d..520d0b1 100644 +--- a/widgets/misc/e-web-view.c ++++ b/widgets/misc/e-web-view.c +@@ -578,26 +578,23 @@ web_view_navigation_policy_decision_requested_cb (EWebView *web_view, + } + + static void +-web_view_load_status_changed_cb (WebKitWebView *web_view, ++web_view_load_status_changed_cb (WebKitWebView *webkit_web_view, + GParamSpec *pspec, + gpointer user_data) + { + WebKitLoadStatus status; +- GtkAllocation allocation, allocation_copy; ++ EWebView *web_view; + +- status = webkit_web_view_get_load_status (web_view); ++ status = webkit_web_view_get_load_status (webkit_web_view); + if (status != WEBKIT_LOAD_FINISHED) + return; + ++ web_view = E_WEB_VIEW (webkit_web_view); ++ web_view_update_document_highlights (web_view); ++ + /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ +- gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); +- allocation = allocation_copy; +- allocation.width -= 10; +- allocation.height -= 10; +- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); +- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); +- +- web_view_update_document_highlights (E_WEB_VIEW (web_view)); ++ e_web_view_zoom_in (web_view); ++ e_web_view_zoom_out (web_view); + } + + static void + diff --git a/evolution.spec b/evolution.spec index d6d73f1..9bf319a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,6 +49,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# BGO #678408 +Patch03: evolution-3.5.92-flatten.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -191,6 +194,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .flatten mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -527,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Sep 22 2012 Adam Williamson - 3.5.92-3 +- backport fix for BGO #678408 (broken message display) + * Wed Sep 19 2012 Kalev Lember - 3.5.92-2 - Fix evolution-NetworkManager obsoletes From 6a2b24184f44d3f2fa6f5bcc0d3ed3558c86032c Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Sat, 22 Sep 2012 08:34:40 -0700 Subject: [PATCH 475/844] backport fix for BGO #678408 (broken message display) --- evolution-3.5.92-flatten.patch | 40 ++++++++++++++++++++++++++++++++++ evolution.spec | 9 +++++++- 2 files changed, 48 insertions(+), 1 deletion(-) create mode 100644 evolution-3.5.92-flatten.patch diff --git a/evolution-3.5.92-flatten.patch b/evolution-3.5.92-flatten.patch new file mode 100644 index 0000000..509b394 --- /dev/null +++ b/evolution-3.5.92-flatten.patch @@ -0,0 +1,40 @@ +diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c +index b1d726d..520d0b1 100644 +--- a/widgets/misc/e-web-view.c ++++ b/widgets/misc/e-web-view.c +@@ -578,26 +578,23 @@ web_view_navigation_policy_decision_requested_cb (EWebView *web_view, + } + + static void +-web_view_load_status_changed_cb (WebKitWebView *web_view, ++web_view_load_status_changed_cb (WebKitWebView *webkit_web_view, + GParamSpec *pspec, + gpointer user_data) + { + WebKitLoadStatus status; +- GtkAllocation allocation, allocation_copy; ++ EWebView *web_view; + +- status = webkit_web_view_get_load_status (web_view); ++ status = webkit_web_view_get_load_status (webkit_web_view); + if (status != WEBKIT_LOAD_FINISHED) + return; + ++ web_view = E_WEB_VIEW (webkit_web_view); ++ web_view_update_document_highlights (web_view); ++ + /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ +- gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); +- allocation = allocation_copy; +- allocation.width -= 10; +- allocation.height -= 10; +- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); +- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); +- +- web_view_update_document_highlights (E_WEB_VIEW (web_view)); ++ e_web_view_zoom_in (web_view); ++ e_web_view_zoom_out (web_view); + } + + static void + diff --git a/evolution.spec b/evolution.spec index d6d73f1..9bf319a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,6 +49,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# BGO #678408 +Patch03: evolution-3.5.92-flatten.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -191,6 +194,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .flatten mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -527,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Sep 22 2012 Adam Williamson - 3.5.92-3 +- backport fix for BGO #678408 (broken message display) + * Wed Sep 19 2012 Kalev Lember - 3.5.92-2 - Fix evolution-NetworkManager obsoletes From 6930262c10ad15ef62a4457da1b7c6df13badd4d Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 24 Sep 2012 13:53:18 +0200 Subject: [PATCH 476/844] Use GStreamer 1.0 instead of 0.10 --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9bf319a..2efa6ce 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -97,7 +97,7 @@ BuildRequires: webkitgtk3-devel >= %{webkit_version} BuildRequires: yelp-tools %if %{inline_audio_support} -BuildRequires: gstreamer-devel +BuildRequires: gstreamer1-devel %endif %if %{ldap_support} @@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 24 2012 Bastien Nocera 3.5.92-4 +- Use GStreamer 1.0 instead of 0.10 + * Sat Sep 22 2012 Adam Williamson - 3.5.92-3 - backport fix for BGO #678408 (broken message display) From 51c35c872dd6a7b955020b8278d14b5ed5a86535 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 24 Sep 2012 13:53:18 +0200 Subject: [PATCH 477/844] Use GStreamer 1.0 instead of 0.10 --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9bf319a..2efa6ce 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.5.92 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -97,7 +97,7 @@ BuildRequires: webkitgtk3-devel >= %{webkit_version} BuildRequires: yelp-tools %if %{inline_audio_support} -BuildRequires: gstreamer-devel +BuildRequires: gstreamer1-devel %endif %if %{ldap_support} @@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 24 2012 Bastien Nocera 3.5.92-4 +- Use GStreamer 1.0 instead of 0.10 + * Sat Sep 22 2012 Adam Williamson - 3.5.92-3 - backport fix for BGO #678408 (broken message display) From cae36e1c5cd1ba968545ad70a7dfdd9e11c25448 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 Sep 2012 00:01:33 -0400 Subject: [PATCH 478/844] 3.6.0 --- .gitignore | 1 + evolution-3.5.92-flatten.patch | 40 ---------------------------------- evolution.spec | 12 +++++----- sources | 2 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 evolution-3.5.92-flatten.patch diff --git a/.gitignore b/.gitignore index 5bae153..ffb8d06 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.90.tar.xz /evolution-3.5.91.tar.xz /evolution-3.5.92.tar.xz +/evolution-3.6.0.tar.xz diff --git a/evolution-3.5.92-flatten.patch b/evolution-3.5.92-flatten.patch deleted file mode 100644 index 509b394..0000000 --- a/evolution-3.5.92-flatten.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c -index b1d726d..520d0b1 100644 ---- a/widgets/misc/e-web-view.c -+++ b/widgets/misc/e-web-view.c -@@ -578,26 +578,23 @@ web_view_navigation_policy_decision_requested_cb (EWebView *web_view, - } - - static void --web_view_load_status_changed_cb (WebKitWebView *web_view, -+web_view_load_status_changed_cb (WebKitWebView *webkit_web_view, - GParamSpec *pspec, - gpointer user_data) - { - WebKitLoadStatus status; -- GtkAllocation allocation, allocation_copy; -+ EWebView *web_view; - -- status = webkit_web_view_get_load_status (web_view); -+ status = webkit_web_view_get_load_status (webkit_web_view); - if (status != WEBKIT_LOAD_FINISHED) - return; - -+ web_view = E_WEB_VIEW (webkit_web_view); -+ web_view_update_document_highlights (web_view); -+ - /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ -- gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); -- allocation = allocation_copy; -- allocation.width -= 10; -- allocation.height -= 10; -- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); -- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); -- -- web_view_update_document_highlights (E_WEB_VIEW (web_view)); -+ e_web_view_zoom_in (web_view); -+ e_web_view_zoom_out (web_view); - } - - static void - diff --git a/evolution.spec b/evolution.spec index 2efa6ce..852ad0c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.92 -Release: 4%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,9 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# BGO #678408 -Patch03: evolution-3.5.92-flatten.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -194,7 +191,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .flatten mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -531,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 24 2012 Matthew Barnes - 3.6.0-1 +- Update to 3.6.0 +- Remove patch for GNOME #678408 (fixed upstream). + * Mon Sep 24 2012 Bastien Nocera 3.5.92-4 - Use GStreamer 1.0 instead of 0.10 diff --git a/sources b/sources index 0da0787..83fa0b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d598d3d2c80f3db4c5c7f06f9f96148a evolution-3.5.92.tar.xz +5ceb71ca0bcc1f706f1a3283585c048c evolution-3.6.0.tar.xz From e172530438685c360cbf653f2bb3c211abdb8c14 Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Thu, 27 Sep 2012 23:08:37 +0800 Subject: [PATCH 479/844] Update the desktop database in the scriptlets http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#desktop-database --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 852ad0c..939fcc5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -300,10 +300,12 @@ grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang %post /sbin/ldconfig +/usr/bin/update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun /sbin/ldconfig +/usr/bin/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : From 9f175884e0d3a542995029a2cf828e42959b6372 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 25 Sep 2012 00:01:33 -0400 Subject: [PATCH 480/844] 3.6.0 --- .gitignore | 1 + evolution-3.5.92-flatten.patch | 40 ---------------------------------- evolution.spec | 12 +++++----- sources | 2 +- 4 files changed, 8 insertions(+), 47 deletions(-) delete mode 100644 evolution-3.5.92-flatten.patch diff --git a/.gitignore b/.gitignore index 5bae153..ffb8d06 100644 --- a/.gitignore +++ b/.gitignore @@ -43,3 +43,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.90.tar.xz /evolution-3.5.91.tar.xz /evolution-3.5.92.tar.xz +/evolution-3.6.0.tar.xz diff --git a/evolution-3.5.92-flatten.patch b/evolution-3.5.92-flatten.patch deleted file mode 100644 index 509b394..0000000 --- a/evolution-3.5.92-flatten.patch +++ /dev/null @@ -1,40 +0,0 @@ -diff --git a/widgets/misc/e-web-view.c b/widgets/misc/e-web-view.c -index b1d726d..520d0b1 100644 ---- a/widgets/misc/e-web-view.c -+++ b/widgets/misc/e-web-view.c -@@ -578,26 +578,23 @@ web_view_navigation_policy_decision_requested_cb (EWebView *web_view, - } - - static void --web_view_load_status_changed_cb (WebKitWebView *web_view, -+web_view_load_status_changed_cb (WebKitWebView *webkit_web_view, - GParamSpec *pspec, - gpointer user_data) - { - WebKitLoadStatus status; -- GtkAllocation allocation, allocation_copy; -+ EWebView *web_view; - -- status = webkit_web_view_get_load_status (web_view); -+ status = webkit_web_view_get_load_status (webkit_web_view); - if (status != WEBKIT_LOAD_FINISHED) - return; - -+ web_view = E_WEB_VIEW (webkit_web_view); -+ web_view_update_document_highlights (web_view); -+ - /* Workaround webkit bug https://bugs.webkit.org/show_bug.cgi?id=89553 */ -- gtk_widget_get_allocation (GTK_WIDGET (web_view), &allocation_copy); -- allocation = allocation_copy; -- allocation.width -= 10; -- allocation.height -= 10; -- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation); -- gtk_widget_size_allocate (GTK_WIDGET (web_view), &allocation_copy); -- -- web_view_update_document_highlights (E_WEB_VIEW (web_view)); -+ e_web_view_zoom_in (web_view); -+ e_web_view_zoom_out (web_view); - } - - static void - diff --git a/evolution.spec b/evolution.spec index 2efa6ce..852ad0c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.5.92 -Release: 4%{?dist} +Version: 3.6.0 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -49,9 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# BGO #678408 -Patch03: evolution-3.5.92-flatten.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -194,7 +191,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .flatten mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -531,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 24 2012 Matthew Barnes - 3.6.0-1 +- Update to 3.6.0 +- Remove patch for GNOME #678408 (fixed upstream). + * Mon Sep 24 2012 Bastien Nocera 3.5.92-4 - Use GStreamer 1.0 instead of 0.10 diff --git a/sources b/sources index 0da0787..83fa0b3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d598d3d2c80f3db4c5c7f06f9f96148a evolution-3.5.92.tar.xz +5ceb71ca0bcc1f706f1a3283585c048c evolution-3.6.0.tar.xz From 53d67228306f6862e1ef22ce204814ef8fff2a0d Mon Sep 17 00:00:00 2001 From: Mathieu Bridon Date: Thu, 27 Sep 2012 23:08:37 +0800 Subject: [PATCH 481/844] Update the desktop database in the scriptlets http://fedoraproject.org/wiki/Packaging:ScriptletSnippets#desktop-database --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 852ad0c..939fcc5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -300,10 +300,12 @@ grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang %post /sbin/ldconfig +/usr/bin/update-desktop-database &> /dev/null || : touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : %postun /sbin/ldconfig +/usr/bin/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] ; then touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : From 97811fc5673c4e760df4b7c91003fe291fd33871 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Oct 2012 09:57:59 +0200 Subject: [PATCH 482/844] Update to 3.7.1 --- .gitignore | 1 + evolution.spec | 21 ++++++++++++--------- sources | 2 +- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index ffb8d06..3f30529 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.91.tar.xz /evolution-3.5.92.tar.xz /evolution-3.6.0.tar.xz +/evolution-3.7.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 939fcc5..0dcaacc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,17 +1,17 @@ -%define glib2_version 2.30.0 +%define glib2_version 2.32.0 +%define gtk3_version 3.4.0 +%define gtkhtml_version 4.5.2 %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define gnome_icon_theme_version 2.30.2.1 -%define gtk3_version 3.2.0 -%define gtkhtml_version 4.3.1 %define intltool_version 0.35.5 %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 +%define libsoup_version 2.38.1 %define clutter_gtk_version 0.10 -%define soup_version 2.4.0 %define webkit_version 1.8.0 -%define evo_base_version 3.6 +%define evo_base_version 3.8 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.6.0 +Version: 3.7.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.5/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.7/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -82,7 +82,7 @@ BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libpst-devel BuildRequires: libSM-devel -BuildRequires: libsoup-devel >= %{soup_version} +BuildRequires: libsoup-devel >= %{libsoup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel BuildRequires: nspr-devel @@ -132,7 +132,7 @@ Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} Requires: libgweather-devel >= %{libgweather_version} -Requires: libsoup-devel >= %{soup_version} +Requires: libsoup-devel >= %{libsoup_version} Requires: libxml2-devel Obsoletes: libgal2-devel <= %{last_libgal2_version} @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 22 2012 Milan Crha - 3.7.1-1 +- Update to 3.7.1 + * Mon Sep 24 2012 Matthew Barnes - 3.6.0-1 - Update to 3.6.0 - Remove patch for GNOME #678408 (fixed upstream). diff --git a/sources b/sources index 83fa0b3..c72244c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ceb71ca0bcc1f706f1a3283585c048c evolution-3.6.0.tar.xz +282b3134e4f170b203407c1b2953f43b evolution-3.7.1.tar.xz From c82ac7fb105ddc1872f1c8d4eca49f453a68072a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 23 Oct 2012 22:28:37 +0200 Subject: [PATCH 483/844] Add BuildRequires: nss-util-devel --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 0dcaacc..d2af3dd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -87,6 +87,7 @@ BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel BuildRequires: nspr-devel BuildRequires: nss-devel +BuildRequires: nss-util-devel BuildRequires: pkgconfig BuildRequires: rarian-compat BuildRequires: unique3-devel From f3c7c8fae72e4de66e13b59a84a048a5aa99a4a8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 24 Oct 2012 11:09:19 +0200 Subject: [PATCH 484/844] Revert add of BuildRequires: nss-util-devel Not needed after all, the missing header is supposed to be in nss-devel --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index d2af3dd..0dcaacc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -87,7 +87,6 @@ BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel BuildRequires: nspr-devel BuildRequires: nss-devel -BuildRequires: nss-util-devel BuildRequires: pkgconfig BuildRequires: rarian-compat BuildRequires: unique3-devel From d4585bb4b694ab30e87968934a38ade0fb78a86a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 24 Oct 2012 12:39:02 +0200 Subject: [PATCH 485/844] Add bogofilter and spamassassin to BuildRequires --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 0dcaacc..8de800e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -154,6 +154,7 @@ Group: Applications/Productivity Summary: Bogofilter plugin for Evolution Requires: %{name} = %{version}-%{release} Requires: bogofilter +BuildRequires: bogofilter %description bogofilter This package contains the plugin to filter junk mail using Bogofilter. @@ -163,6 +164,7 @@ Group: Applications/Productivity Summary: SpamAssassin plugin for Evolution Requires: %{name} = %{version}-%{release} Requires: spamassassin +BuildRequires: spamassassin %description spamassassin This package contains the plugin to filter junk mail using SpamAssassin. From 40430ad2b0cb435a5c1f050705c5ba8a591f54aa Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 24 Oct 2012 13:02:26 +0200 Subject: [PATCH 486/844] Also add highlight as build and package dependency --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 8de800e..b7da6e4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -53,6 +53,7 @@ Patch02: evolution-2.30.1-help-contents.patch Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs +Requires: highlight ### Build Dependencies ### @@ -75,6 +76,7 @@ BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} BuildRequires: itstool BuildRequires: libcanberra-devel From 3d4343a1dab5def9408093d8fdc8ac3d26bdd424 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 9 Nov 2012 09:48:04 -0500 Subject: [PATCH 487/844] Drop unique3-devel BR (no longer needed). --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index b7da6e4..a5d4980 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.7.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -91,7 +91,6 @@ BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: pkgconfig BuildRequires: rarian-compat -BuildRequires: unique3-devel BuildRequires: webkitgtk3-devel >= %{webkit_version} BuildRequires: yelp-tools @@ -533,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Nov 09 2012 Matthew Barnes - 3.7.1-2 +- Drop unique3-devel BR, it's an ancient artifact. + * Mon Oct 22 2012 Milan Crha - 3.7.1-1 - Update to 3.7.1 From ff1ed548d77f497047f09d2b990c9fd340450602 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Nov 2012 10:37:44 +0100 Subject: [PATCH 488/844] Update to 3.7.2 --- .gitignore | 1 + evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 3f30529..ca50b5b 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.5.92.tar.xz /evolution-3.6.0.tar.xz /evolution-3.7.1.tar.xz +/evolution-3.7.2.tar.xz diff --git a/evolution.spec b/evolution.spec index a5d4980..c988562 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,4 +1,4 @@ -%define glib2_version 2.32.0 +%define glib2_version 2.34.0 %define gtk3_version 3.4.0 %define gtkhtml_version 4.5.2 %define gnome_desktop_version 2.91.3 @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.7.1 -Release: 2%{?dist} +Version: 3.7.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -532,6 +532,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 19 2012 Milan Crha - 3.7.2-1 +- Update to 3.7.2 + * Fri Nov 09 2012 Matthew Barnes - 3.7.1-2 - Drop unique3-devel BR, it's an ancient artifact. diff --git a/sources b/sources index c72244c..d4f0506 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -282b3134e4f170b203407c1b2953f43b evolution-3.7.1.tar.xz +eb0d31465f7a88ff7713b161c78d2dcf evolution-3.7.2.tar.xz From 6e67ad9267dcbacc842a16c1efabde7ad91ad291 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 19 Dec 2012 15:12:26 -0500 Subject: [PATCH 489/844] 3.7.3.1 --- .gitignore | 1 + evolution.spec | 31 +++++++++++++------------------ sources | 2 +- 3 files changed, 15 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index ca50b5b..1ee4577 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.6.0.tar.xz /evolution-3.7.1.tar.xz /evolution-3.7.2.tar.xz +/evolution-3.7.3.1.tar.xz diff --git a/evolution.spec b/evolution.spec index c988562..632759d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.7.2 +Version: 3.7.3.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -60,12 +60,11 @@ Requires: highlight BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 -BuildRequires: bison BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} -BuildRequires: dbus-glib-devel BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{version} +#BuildRequires: evolution-data-server-devel >= %{version} +BuildRequires: evolution-data-server-devel >= 3.7.3 BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -83,14 +82,12 @@ BuildRequires: libcanberra-devel BuildRequires: libgdata-devel >= %{libgdata_version} BuildRequires: libgweather-devel >= %{libgweather_version} BuildRequires: libpst-devel -BuildRequires: libSM-devel BuildRequires: libsoup-devel >= %{libsoup_version} BuildRequires: libtool >= 1.5 BuildRequires: libxml2-devel BuildRequires: nspr-devel BuildRequires: nss-devel BuildRequires: pkgconfig -BuildRequires: rarian-compat BuildRequires: webkitgtk3-devel >= %{webkit_version} BuildRequires: yelp-tools @@ -413,26 +410,17 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so %{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so %{_libdir}/evolution/%{evo_base_version}/libemail-engine.so -%{_libdir}/evolution/%{evo_base_version}/libemail-utils.so %{_libdir}/evolution/%{evo_base_version}/libemformat.so -%{_libdir}/evolution/%{evo_base_version}/libemiscwidgets.so %{_libdir}/evolution/%{evo_base_version}/libeshell.so %{_libdir}/evolution/%{evo_base_version}/libessmime.so -%{_libdir}/evolution/%{evo_base_version}/libetable.so -%{_libdir}/evolution/%{evo_base_version}/libetext.so -%{_libdir}/evolution/%{evo_base_version}/libetimezonedialog.so %{_libdir}/evolution/%{evo_base_version}/libeutil.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-a11y.so %{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so %{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-utils.so -%{_libdir}/evolution/%{evo_base_version}/libfilter.so %{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so -%{_libdir}/evolution/%{evo_base_version}/libmenus.so # Various libexec programs: %dir %{_libexecdir}/evolution @@ -498,15 +486,14 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) -%{_datadir}/gtk-doc/html/eshell +%{_datadir}/gtk-doc/html/libeshell +%{_datadir}/gtk-doc/html/libeutil %{_includedir}/evolution-%{evo_base_version} %{_libdir}/pkgconfig/evolution-calendar-3.0.pc %{_libdir}/pkgconfig/evolution-mail-3.0.pc %{_libdir}/pkgconfig/evolution-plugin-3.0.pc %{_libdir}/pkgconfig/evolution-shell-3.0.pc %{_libdir}/pkgconfig/libemail-engine.pc -%{_libdir}/pkgconfig/libemail-utils.pc -%{_libdir}/pkgconfig/libevolution-utils.pc %files help -f help.lang %defattr(-, root, root) @@ -532,6 +519,14 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Dec 18 2012 Matthew Barnes - 3.7.3.1-1 +- Update to 3.7.3.1 +- Remove obsolete BuildRequires: + bison + dbus-glib-devel + libSM-devel + rarian-compat + * Mon Nov 19 2012 Milan Crha - 3.7.2-1 - Update to 3.7.2 diff --git a/sources b/sources index d4f0506..058346a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -eb0d31465f7a88ff7713b161c78d2dcf evolution-3.7.2.tar.xz +9165768f931c3dd58e724095b5dd1f53 evolution-3.7.3.1.tar.xz From 84a1254252edb3af0c5c64d21bf6ebbd05bfbd96 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 19 Dec 2012 15:30:18 -0500 Subject: [PATCH 490/844] Fix E-D-S req. --- evolution.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 632759d..80df408 100644 --- a/evolution.spec +++ b/evolution.spec @@ -63,8 +63,8 @@ BuildRequires: automake >= 1.9 BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: desktop-file-utils -#BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: evolution-data-server-devel >= 3.7.3 +#BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -125,7 +125,8 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= %{version} +Requires: evolution-data-server-devel >= 3.7.3 +#Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -518,6 +519,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif +# Milan: Revert the hard-coded E-D-S version on the next update. +# (evolution) BuildRequires: evolution-data-server-devel >= 3.7.3 +# (evolution-devel) Requires: evolution-data-server-devel >= 3.7.3 + %changelog * Tue Dec 18 2012 Matthew Barnes - 3.7.3.1-1 - Update to 3.7.3.1 From f7e7704d23adfbefafc3a8fa2f98333816223eba Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 19 Dec 2012 20:19:21 -0500 Subject: [PATCH 491/844] 3.7.3.2 --- .gitignore | 1 + evolution.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1ee4577..7e8f1ba 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.1.tar.xz /evolution-3.7.2.tar.xz /evolution-3.7.3.1.tar.xz +/evolution-3.7.3.2.tar.xz diff --git a/evolution.spec b/evolution.spec index 80df408..2487ee4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.7.3.1 +Version: 3.7.3.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -524,8 +524,8 @@ rm -rf $RPM_BUILD_ROOT # (evolution-devel) Requires: evolution-data-server-devel >= 3.7.3 %changelog -* Tue Dec 18 2012 Matthew Barnes - 3.7.3.1-1 -- Update to 3.7.3.1 +* Tue Dec 19 2012 Matthew Barnes - 3.7.3.2-1 +- Update to 3.7.3.2 - Remove obsolete BuildRequires: bison dbus-glib-devel diff --git a/sources b/sources index 058346a..abdbcb5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9165768f931c3dd58e724095b5dd1f53 evolution-3.7.3.1.tar.xz +14dfdf3c9b2c868d43e57d57175aa11d evolution-3.7.3.2.tar.xz From 82d7e5c0b3679689cc71d3d1bbefab2ad88eff2a Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 20 Dec 2012 21:53:25 +0100 Subject: [PATCH 492/844] Rebuilt for libgnome-desktop3 3.7.3 soname bump --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 2487ee4..67ef892 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.7.3.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -524,6 +524,9 @@ rm -rf $RPM_BUILD_ROOT # (evolution-devel) Requires: evolution-data-server-devel >= 3.7.3 %changelog +* Thu Dec 20 2012 Kalev Lember - 3.7.3.2-2 +- Rebuilt for libgnome-desktop3 3.7.3 soname bump + * Tue Dec 19 2012 Matthew Barnes - 3.7.3.2-1 - Update to 3.7.3.2 - Remove obsolete BuildRequires: From d0435de25b7d2a143a63c90d2f6659fb05ae5c89 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 Jan 2013 13:21:23 -0500 Subject: [PATCH 493/844] Remove obsolete --with-kde-applnk-path configure option. --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 67ef892..49b0f56 100644 --- a/evolution.spec +++ b/evolution.spec @@ -239,7 +239,6 @@ autoconf --disable-image-inline \ --enable-gtk-doc \ --with-sub-version=" (%{version}-%{release})" \ - --with-kde-applnk-path=no \ %ldap_flags %krb5_flags %ssl_flags \ --enable-plugins=all export tagname=CC From 4fa19208cfce47b97761e9938fccdf6b1a49400e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 Jan 2013 13:22:15 -0500 Subject: [PATCH 494/844] Remove --disable-image-inline configure option. It's disabled by default and I don't think it's coming back. I've seen no sign of movement in porting gtkimageview to gtk3. --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 49b0f56..7cad8c5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -236,7 +236,6 @@ autoconf %configure \ --disable-maintainer-mode \ - --disable-image-inline \ --enable-gtk-doc \ --with-sub-version=" (%{version}-%{release})" \ %ldap_flags %krb5_flags %ssl_flags \ From e7e5f0196ea3a974851636404f79a77629e96901 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 1 Jan 2013 13:32:21 -0500 Subject: [PATCH 495/844] Re-enable translation size reduction. --- evolution.spec | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7cad8c5..3a076c6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.7.3.2 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -245,16 +245,15 @@ make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasi # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. -#disabled since 2.31.91 because of a msgmerge floating point exception (see RH bug 628073) -#cd po -#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep -#mv POTFILES.keep POTFILES.in -#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot -#for p in *.po; do -# msgmerge $p %{name}-%{evo_base_version}.pot > $p.out -# msgfmt -o `basename $p .po`.gmo $p.out -#done -#cd - +cd po +grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep +mv POTFILES.keep POTFILES.in +intltool-update --gettext-package=%{name}-%{evo_base_version} --pot +for p in *.po; do + msgmerge $p %{name}-%{evo_base_version}.pot > $p.out + msgfmt -o `basename $p .po`.gmo $p.out +done +cd - # Replace identical images in the help by links. # This reduces the RPM size by several megabytes. @@ -522,6 +521,9 @@ rm -rf $RPM_BUILD_ROOT # (evolution-devel) Requires: evolution-data-server-devel >= 3.7.3 %changelog +* Tue Jan 01 2013 Matthew Barnes - 3.7.3.2-3 +- Re-enable translation size reduction (RH bug #628073 is long fixed). + * Thu Dec 20 2012 Kalev Lember - 3.7.3.2-2 - Rebuilt for libgnome-desktop3 3.7.3 soname bump From 873ba1e2a0bfefd0cdb7e2d3a4f06d917285f492 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Jan 2013 10:46:04 +0100 Subject: [PATCH 496/844] Update to 3.7.4 --- .gitignore | 1 + evolution.spec | 17 +++++++---------- sources | 2 +- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 7e8f1ba..7483327 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.2.tar.xz /evolution-3.7.3.1.tar.xz /evolution-3.7.3.2.tar.xz +/evolution-3.7.4.tar.xz diff --git a/evolution.spec b/evolution.spec index 3a076c6..6a9ce56 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.7.3.2 -Release: 3%{?dist} +Version: 3.7.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -63,8 +63,7 @@ BuildRequires: automake >= 1.9 BuildRequires: cairo-gobject-devel BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= 3.7.3 -#BuildRequires: evolution-data-server-devel >= %{version} +BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common @@ -125,8 +124,7 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= 3.7.3 -#Requires: evolution-data-server-devel >= %{version} +Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} Requires: libgdata-devel >= %{libgdata_version} @@ -516,11 +514,10 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif -# Milan: Revert the hard-coded E-D-S version on the next update. -# (evolution) BuildRequires: evolution-data-server-devel >= 3.7.3 -# (evolution-devel) Requires: evolution-data-server-devel >= 3.7.3 - %changelog +* Mon Jan 14 2013 Milan Crha - 3.7.4-1 +- Update to 3.7.4 + * Tue Jan 01 2013 Matthew Barnes - 3.7.3.2-3 - Re-enable translation size reduction (RH bug #628073 is long fixed). diff --git a/sources b/sources index abdbcb5..541fa95 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -14dfdf3c9b2c868d43e57d57175aa11d evolution-3.7.3.2.tar.xz +c70e5723196419bca7cf8806e8e7390e evolution-3.7.4.tar.xz From 5a216fc473998b1ac751ee04f31330c1551bcfd7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Jan 2013 13:04:33 +0100 Subject: [PATCH 497/844] Add --add-missing to automake call and remove legacy imap module --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 6a9ce56..66abd5b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -227,7 +227,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-com # Regenerate configure to pick up configure.ac changes aclocal -I m4 autoheader -automake +automake --add-missing libtoolize intltoolize --force autoconf @@ -379,7 +379,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-webcal.so %{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so %{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-imap-features.so %{_libdir}/evolution/%{evo_base_version}/modules/module-itip-formatter.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mail-config.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so @@ -517,6 +516,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jan 14 2013 Milan Crha - 3.7.4-1 - Update to 3.7.4 +- Add --add-missing to automake call * Tue Jan 01 2013 Matthew Barnes - 3.7.3.2-3 - Re-enable translation size reduction (RH bug #628073 is long fixed). From 2a4c23f56e15be4a9338b18515ffd813741f6666 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 18 Jan 2013 09:51:45 +0100 Subject: [PATCH 498/844] Correct help-context patch test path (Red Had bug #901341) --- evolution-2.30.1-help-contents.patch | 4 ++-- evolution.spec | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index e2b75a2..8586c4f 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -9,8 +9,8 @@ diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evoluti + /* Viewing user documentation requires the evolution-help + * Fedora package. Look for one of the files it installs. */ + path = g_build_filename ( -+ EVOLUTION_DATADIR, "gnome", "help", -+ PACKAGE, "C", "index.page", NULL); ++ EVOLUTION_DATADIR, "help", "C", ++ PACKAGE, "index.page", NULL); + if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) + gtk_action_set_visible (ACTION (CONTENTS), FALSE); + g_free (path); diff --git a/evolution.spec b/evolution.spec index 66abd5b..da3ccdd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -514,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jan 18 2013 Milan Crha - 3.7.4-1 +- Correct help-context patch test path (Red Had bug #901341) + * Mon Jan 14 2013 Milan Crha - 3.7.4-1 - Update to 3.7.4 - Add --add-missing to automake call From bc3b8c3a10e50be1403797383b11e1c6c1e44d64 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Feb 2013 08:27:45 +0100 Subject: [PATCH 499/844] Update to 3.7.5 --- .gitignore | 1 + evolution.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7483327..d9c30c6 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.3.1.tar.xz /evolution-3.7.3.2.tar.xz /evolution-3.7.4.tar.xz +/evolution-3.7.5.tar.xz diff --git a/evolution.spec b/evolution.spec index da3ccdd..5223858 100644 --- a/evolution.spec +++ b/evolution.spec @@ -7,7 +7,7 @@ %define intltool_version 0.35.5 %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 -%define libsoup_version 2.38.1 +%define libsoup_version 2.40.3 %define clutter_gtk_version 0.10 %define webkit_version 1.8.0 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.7.4 +Version: 3.7.5 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -389,6 +389,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-prefer-plain.so %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-settings.so %{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so %{_libdir}/evolution/%{evo_base_version}/modules/module-text-highlight.so %{_libdir}/evolution/%{evo_base_version}/modules/module-tnef-attachment.so @@ -514,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 04 2013 Milan Crha - 3.7.5-1 +- Update to 3.7.5 + * Fri Jan 18 2013 Milan Crha - 3.7.4-1 - Correct help-context patch test path (Red Had bug #901341) diff --git a/sources b/sources index 541fa95..3fd2d1a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c70e5723196419bca7cf8806e8e7390e evolution-3.7.4.tar.xz +3c65c9d88b84050d435f57d2654d107a evolution-3.7.5.tar.xz From b28833f49bf40300c18a8b222bf93f5d815a47b6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Feb 2013 09:06:47 +0100 Subject: [PATCH 500/844] Update to 3.7.90 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index d9c30c6..fb3a0e0 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.3.2.tar.xz /evolution-3.7.4.tar.xz /evolution-3.7.5.tar.xz +/evolution-3.7.90.tar.xz diff --git a/evolution.spec b/evolution.spec index 5223858..05703d9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.7.5 +Version: 3.7.90 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 18 2013 Milan Crha - 3.7.90-1 +- Update to 3.7.90 + * Mon Feb 04 2013 Milan Crha - 3.7.5-1 - Update to 3.7.5 diff --git a/sources b/sources index 3fd2d1a..fea3c21 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3c65c9d88b84050d435f57d2654d107a evolution-3.7.5.tar.xz +d0a53da4bea082dba241d8d39b8773ca evolution-3.7.90.tar.xz From 32b9c1c01d210d36ad95bda38bf64d8070d2b9b9 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 20 Feb 2013 13:40:31 +0100 Subject: [PATCH 501/844] Rebuilt for libgnome-desktop soname bump --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 05703d9..d2257c3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.7.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Feb 20 2013 Kalev Lember - 3.7.90-2 +- Rebuilt for libgnome-desktop soname bump + * Mon Feb 18 2013 Milan Crha - 3.7.90-1 - Update to 3.7.90 From e766ad1d195a3c3927e669af2fbdfb8e369f566c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Mar 2013 08:49:02 +0100 Subject: [PATCH 502/844] Update to 3.7.91 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fb3a0e0..ba5a492 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.4.tar.xz /evolution-3.7.5.tar.xz /evolution-3.7.90.tar.xz +/evolution-3.7.91.tar.xz diff --git a/evolution.spec b/evolution.spec index d2257c3..fc5dffc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.7.90 -Release: 2%{?dist} +Version: 3.7.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 04 2013 Milan Crha - 3.7.91-1 +- Update to 3.7.91 + * Wed Feb 20 2013 Kalev Lember - 3.7.90-2 - Rebuilt for libgnome-desktop soname bump diff --git a/sources b/sources index fea3c21..b841fe6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d0a53da4bea082dba241d8d39b8773ca evolution-3.7.90.tar.xz +51749a034e3990a93b4d0701d8fc0f1c evolution-3.7.91.tar.xz From 0b41d252941be96062f6e55cb97d185c5a18c2ff Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Mar 2013 08:25:34 +0100 Subject: [PATCH 503/844] Update to 3.7.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index ba5a492..7e01a24 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.5.tar.xz /evolution-3.7.90.tar.xz /evolution-3.7.91.tar.xz +/evolution-3.7.92.tar.xz diff --git a/evolution.spec b/evolution.spec index fc5dffc..630bccc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.7.91 +Version: 3.7.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 18 2013 Milan Crha - 3.7.92-1 +- Update to 3.7.92 + * Mon Mar 04 2013 Milan Crha - 3.7.91-1 - Update to 3.7.91 diff --git a/sources b/sources index b841fe6..7705a06 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -51749a034e3990a93b4d0701d8fc0f1c evolution-3.7.91.tar.xz +791ce4d466c6e46965a8d98b8dd0dcce evolution-3.7.92.tar.xz From 62bcbddaf655f8cfb1eaeb96f417f95b197b2859 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 25 Mar 2013 11:02:04 +0100 Subject: [PATCH 504/844] Update to 3.8.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7e01a24..1170d53 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.90.tar.xz /evolution-3.7.91.tar.xz /evolution-3.7.92.tar.xz +/evolution-3.8.0.tar.xz diff --git a/evolution.spec b/evolution.spec index 630bccc..221bd8e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.7.92 +Version: 3.8.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.7/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 25 2013 Milan Crha - 3.8.0-1 +- Update to 3.8.0 + * Mon Mar 18 2013 Milan Crha - 3.7.92-1 - Update to 3.7.92 diff --git a/sources b/sources index 7705a06..ffd1aa6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -791ce4d466c6e46965a8d98b8dd0dcce evolution-3.7.92.tar.xz +73391003d81db656a9e91814cbd08fe4 evolution-3.8.0.tar.xz From 025a610cba50c74ee62084520025116d96260bd4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Apr 2013 11:26:15 +0200 Subject: [PATCH 505/844] Update to 3.9.1 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 10 +++++----- evolution.spec | 9 ++++++--- sources | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 1170d53..26997ad 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.91.tar.xz /evolution-3.7.92.tar.xz /evolution-3.8.0.tar.xz +/evolution-3.9.1.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index 8586c4f..e0b27af 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ -diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evolution-2.30.1.2/shell/e-shell-window-actions.c ---- evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents 2010-04-26 09:13:18.000000000 -0400 -+++ evolution-2.30.1.2/shell/e-shell-window-actions.c 2010-05-07 21:29:06.269059830 -0400 -@@ -2001,6 +2001,15 @@ e_shell_window_actions_init (EShellWindo +diff -up evolution-3.9.1/shell/e-shell-window-actions.c.help-contents evolution-3.9.1/shell/e-shell-window-actions.c +--- evolution-3.9.1/shell/e-shell-window-actions.c.help-contents 2013-04-29 11:23:28.943063568 +0200 ++++ evolution-3.9.1/shell/e-shell-window-actions.c 2013-04-29 11:24:16.701599684 +0200 +@@ -1396,6 +1396,15 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); @@ -16,4 +16,4 @@ diff -up evolution-2.30.1.2/shell/e-shell-window-actions.c.help-contents evoluti + g_free (path); } - static GList * + GtkWidget * diff --git a/evolution.spec b/evolution.spec index 221bd8e..e06ded9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,7 +11,7 @@ %define clutter_gtk_version 0.10 %define webkit_version 1.8.0 -%define evo_base_version 3.8 +%define evo_base_version 3.10 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.8.0 +Version: 3.9.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.8/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.9/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Apr 29 2013 Milan Crha - 3.9.1-1 +- Update to 3.9.1 + * Mon Mar 25 2013 Milan Crha - 3.8.0-1 - Update to 3.8.0 diff --git a/sources b/sources index ffd1aa6..06a686c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73391003d81db656a9e91814cbd08fe4 evolution-3.8.0.tar.xz +cbde45383faa8bdaa2f595ef1fdda758 evolution-3.9.1.tar.xz From 8809d46c259218cd6e4764a0fa8c21fec7c80ca0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Apr 2013 14:37:31 +0200 Subject: [PATCH 506/844] Add/remove new/old modules --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index e06ded9..c1f018f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -379,13 +379,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-webcal.so %{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so %{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-contact-photos.so +%{_libdir}/evolution/%{evo_base_version}/modules/module-gravatar.so %{_libdir}/evolution/%{evo_base_version}/modules/module-itip-formatter.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mail-config.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mailto-handler.so %{_libdir}/evolution/%{evo_base_version}/modules/module-mdn.so %{_libdir}/evolution/%{evo_base_version}/modules/module-offline-alert.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-online-accounts.so %{_libdir}/evolution/%{evo_base_version}/modules/module-prefer-plain.so %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so %{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so From 02371f37962621c0b148c7ac97d7b3708b712f94 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 24 May 2013 12:56:31 -0500 Subject: [PATCH 507/844] rebuild (libical) --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index c1f018f..be43053 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.9.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -516,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri May 24 2013 Rex Dieter 3.9.1-2 +- rebuild (libical) + * Mon Apr 29 2013 Milan Crha - 3.9.1-1 - Update to 3.9.1 From 4673a529e7bb29437022a5aab0f74622cfd45d8d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 May 2013 09:45:00 +0200 Subject: [PATCH 508/844] Update to 3.9.2 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 26997ad..f5f120b 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.7.92.tar.xz /evolution-3.8.0.tar.xz /evolution-3.9.1.tar.xz +/evolution-3.9.2.tar.xz diff --git a/evolution.spec b/evolution.spec index be43053..eae4fed 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.9.1 -Release: 2%{?dist} +Version: 3.9.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -516,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 27 2013 Milan Crha - 3.9.2-1 +- Update to 3.9.2 + * Fri May 24 2013 Rex Dieter 3.9.1-2 - rebuild (libical) diff --git a/sources b/sources index 06a686c..33d50ca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cbde45383faa8bdaa2f595ef1fdda758 evolution-3.9.1.tar.xz +0905472df6509937ab9353c4395d943c evolution-3.9.2.tar.xz From 3330afad83e5f518689873568d928ab8a1fdad0c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 May 2013 09:48:40 +0200 Subject: [PATCH 509/844] Fix bogus dates in %changelog --- evolution.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index eae4fed..34efdbd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -556,7 +556,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Dec 20 2012 Kalev Lember - 3.7.3.2-2 - Rebuilt for libgnome-desktop3 3.7.3 soname bump -* Tue Dec 19 2012 Matthew Barnes - 3.7.3.2-1 +* Wed Dec 19 2012 Matthew Barnes - 3.7.3.2-1 - Update to 3.7.3.2 - Remove obsolete BuildRequires: bison @@ -962,7 +962,7 @@ rm -rf $RPM_BUILD_ROOT * Sun Jun 14 2009 Matthias Clasen - 2.27.2-2.fc12 - Don't make -perl own directories that are already owned by the base package -* Mon May 29 2009 Matthew Barnes - 2.27.2-1.fc12 +* Fri May 29 2009 Matthew Barnes - 2.27.2-1.fc12 - Update to 2.27.2 - Patch broken libevolution-mail-shared library. - Remove strict_build_settings since the settings are used upstream now. @@ -1205,7 +1205,7 @@ rm -rf $RPM_BUILD_ROOT evolution-spamassassin subpackages, each of which requires the necessary backend packages. (RH bug #377381) -* Mon Dec 05 2007 Matthew Barnes - 2.21.3-3.fc9 +* Wed Dec 05 2007 Matthew Barnes - 2.21.3-3.fc9 - Bump eds_version to 2.21.3 and gtkhtml_version to 3.17.3. * Tue Dec 4 2007 Matthias Clasen - 2.21.3-2 @@ -1555,7 +1555,7 @@ rm -rf $RPM_BUILD_ROOT * Mon Dec 11 2006 Matthew Barnes - 2.9.3-2.fc7 - Add patch for RH bug #215467 (missing meeting participants). -* Thu Dec 09 2006 Matthew Barnes - 2.9.3-1.fc7 +* Sat Dec 09 2006 Matthew Barnes - 2.9.3-1.fc7 - Update to 2.9.3 - Configure with scrollkeeper disabled. - Disable automake portability checking. @@ -1742,7 +1742,7 @@ rm -rf $RPM_BUILD_ROOT * Thu Jul 6 2006 Matthew Barnes - 2.7.3-8 - Add patch for RH bug #166231 (also addresses #131227 and #157391). -* Fri Jun 29 2006 Matthew Barnes - 2.7.3-7 +* Thu Jun 29 2006 Matthew Barnes - 2.7.3-7 - Add patch for RH bug #157400, reorder some patch #'s. * Thu Jun 29 2006 Matthew Barnes - 2.7.3-6 @@ -2513,7 +2513,7 @@ and run autoconf at the start of the build) (#156328) * Mon Jun 9 2003 Jeremy Katz 1.4.0-1 - 1.4.0 -* Wed Jun 5 2003 Elliot Lee +* Thu Jun 05 2003 Elliot Lee - rebuilt * Thu Jun 5 2003 Jeremy Katz 1.3.92-2 From de1d82068f341c51927a8023d72b1b02a648ab19 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 May 2013 11:10:43 +0200 Subject: [PATCH 510/844] mark-all-read plugin have been merged into the core code --- evolution.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 34efdbd..ca21096 100644 --- a/evolution.spec +++ b/evolution.spec @@ -462,9 +462,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-mail-to-task.eplug %{evo_plugin_dir}/liborg-gnome-mail-to-task.so -%{evo_plugin_dir}/org-gnome-mark-all-read.eplug -%{evo_plugin_dir}/liborg-gnome-mark-all-read.so - %{evo_plugin_dir}/org-gnome-prefer-plain.eplug %{evo_plugin_dir}/liborg-gnome-prefer-plain.so From eb5457e4fe2f20739c402cc71d8e7ba02d183853 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Jun 2013 11:32:32 +0200 Subject: [PATCH 511/844] Update to 3.9.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f5f120b..31c913f 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.8.0.tar.xz /evolution-3.9.1.tar.xz /evolution-3.9.2.tar.xz +/evolution-3.9.3.tar.xz diff --git a/evolution.spec b/evolution.spec index ca21096..8088a73 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.9.2 +Version: 3.9.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -513,6 +513,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 17 2013 Milan Crha - 3.9.3-1 +- Update to 3.9.3 + * Mon May 27 2013 Milan Crha - 3.9.2-1 - Update to 3.9.2 diff --git a/sources b/sources index 33d50ca..d5ab1b6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0905472df6509937ab9353c4395d943c evolution-3.9.2.tar.xz +8930ae35003096a685db0a224f5015a1 evolution-3.9.3.tar.xz From 4ddb98b6fae2eed2a92c1ad2321aec15faceb7f3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Jun 2013 12:58:22 +0200 Subject: [PATCH 512/844] Add BuildRequires: gnome-icon-theme-devel >= %{gnome_icon_theme_version} --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 8088a73..3ba6fa6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -69,6 +69,7 @@ BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} +BuildRequires: gnome-icon-theme-devel >= %{gnome_icon_theme_version} BuildRequires: gnome-online-accounts BuildRequires: gnutls-devel BuildRequires: gtk-doc From 2fb046d11f2d8cd9882860c5f6bfa76ea3d4386f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Jun 2013 13:29:07 +0200 Subject: [PATCH 513/844] Some libraries are renamed --- evolution.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index 3ba6fa6..e53eb4e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -403,15 +403,15 @@ rm -rf $RPM_BUILD_ROOT %endif # Shared libraries: -%{_libdir}/evolution/%{evo_base_version}/libcomposer.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-composer.so %{_libdir}/evolution/%{evo_base_version}/libeabutil.so %{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so %{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so %{_libdir}/evolution/%{evo_base_version}/libemail-engine.so -%{_libdir}/evolution/%{evo_base_version}/libemformat.so -%{_libdir}/evolution/%{evo_base_version}/libeshell.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-formatter.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-shell.so %{_libdir}/evolution/%{evo_base_version}/libessmime.so -%{_libdir}/evolution/%{evo_base_version}/libeutil.so +%{_libdir}/evolution/%{evo_base_version}/libevolution-util.so %{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so %{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so From ef7d669757ce42bf032501457f22372a90bd907a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Jun 2013 19:57:28 +0200 Subject: [PATCH 514/844] libevolution-shell/-util in -devel docs too --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index e53eb4e..7cc210f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -481,8 +481,8 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) -%{_datadir}/gtk-doc/html/libeshell -%{_datadir}/gtk-doc/html/libeutil +%{_datadir}/gtk-doc/html/libevolution-shell +%{_datadir}/gtk-doc/html/libevolution-util %{_includedir}/evolution-%{evo_base_version} %{_libdir}/pkgconfig/evolution-calendar-3.0.pc %{_libdir}/pkgconfig/evolution-mail-3.0.pc From 172e19331cb097c11759cbca7d387b3844533706 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Jun 2013 20:25:11 +0200 Subject: [PATCH 515/844] evolution-shell/-util in -devel docs, plus evolution-mail-composer/evolution-mail-formatter --- evolution.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7cc210f..1fbd990 100644 --- a/evolution.spec +++ b/evolution.spec @@ -481,8 +481,10 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) -%{_datadir}/gtk-doc/html/libevolution-shell -%{_datadir}/gtk-doc/html/libevolution-util +%{_datadir}/gtk-doc/html/evolution-mail-composer +%{_datadir}/gtk-doc/html/evolution-mail-formatter +%{_datadir}/gtk-doc/html/evolution-shell +%{_datadir}/gtk-doc/html/evolution-util %{_includedir}/evolution-%{evo_base_version} %{_libdir}/pkgconfig/evolution-calendar-3.0.pc %{_libdir}/pkgconfig/evolution-mail-3.0.pc From c29d3cec44ede5391f8bfbdc2c52bed6f1dca658 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Thu, 20 Jun 2013 23:18:16 +0200 Subject: [PATCH 516/844] Rebuilt for libgweather 3.9.3 soname bump --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1fbd990..b8b7ad4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.9.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -516,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jun 21 2013 Kalev Lember - 3.9.3-2 +- Rebuilt for libgweather 3.9.3 soname bump + * Mon Jun 17 2013 Milan Crha - 3.9.3-1 - Update to 3.9.3 From c26f9996de27c136927ec05182ab4c9367cb2b51 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Sat, 22 Jun 2013 09:38:32 -0400 Subject: [PATCH 517/844] Trim changelog --- evolution.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index b8b7ad4..c256820 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,3 +1,5 @@ +%global _changelog_trimtime %(date +%s -d "1 year ago") + %define glib2_version 2.34.0 %define gtk3_version 3.4.0 %define gtkhtml_version 4.5.2 @@ -29,7 +31,7 @@ Name: evolution Version: 3.9.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -516,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Jun 22 2013 Matthias Clasen - 3.9.3-3 +- Trim %%changelog + * Fri Jun 21 2013 Kalev Lember - 3.9.3-2 - Rebuilt for libgweather 3.9.3 soname bump From 06b4d9e9a818101fe42e87656f5835dbc4c65550 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Sun, 23 Jun 2013 11:08:23 +0200 Subject: [PATCH 518/844] Don't install ChangeLog This got accidentally left out when cherry-picking commit f4839ca91d from f19 to master branch. --- evolution.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index c256820..c9d95bc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -320,7 +320,7 @@ rm -rf $RPM_BUILD_ROOT %files -f translations.lang %defattr(-, root, root) -%doc AUTHORS COPYING ChangeLog NEWS README +%doc AUTHORS COPYING NEWS README # GSettings schemas: %{_datadir}/GConf/gsettings/evolution.convert @@ -519,6 +519,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Sat Jun 22 2013 Matthias Clasen - 3.9.3-3 +- Don't install ChangeLog - Trim %%changelog * Fri Jun 21 2013 Kalev Lember - 3.9.3-2 From 12423c229b90d3bfc22a6d9f474bc5957bdaaf3d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 8 Jul 2013 12:51:31 +0200 Subject: [PATCH 519/844] Update to 3.9.4 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 31c913f..d1d52db 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.1.tar.xz /evolution-3.9.2.tar.xz /evolution-3.9.3.tar.xz +/evolution-3.9.4.tar.xz diff --git a/evolution.spec b/evolution.spec index c9d95bc..1a12313 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.9.3 -Release: 3%{?dist} +Version: 3.9.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 08 2013 Milan Crha - 3.9.4-1 +- Update to 3.9.4 + * Sat Jun 22 2013 Matthias Clasen - 3.9.3-3 - Don't install ChangeLog - Trim %%changelog diff --git a/sources b/sources index d5ab1b6..de423f3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8930ae35003096a685db0a224f5015a1 evolution-3.9.3.tar.xz +b54aa0a49823eb2b6ad28b60a5b9fb22 evolution-3.9.4.tar.xz From e3cce79d24b50af0ce3b0328efe11621d640473b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Wed, 17 Jul 2013 16:09:35 +0200 Subject: [PATCH 520/844] Perl 5.18 rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1a12313..6793bf9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.9.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jul 17 2013 Petr Pisar - 3.9.4-2 +- Perl 5.18 rebuild + * Mon Jul 08 2013 Milan Crha - 3.9.4-1 - Update to 3.9.4 From 4ddf5c7f97980f53bd1c0a2b05927c74f38f08d5 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Wed, 17 Jul 2013 12:15:56 -0400 Subject: [PATCH 521/844] Work around a crash caught by -fstack-protector-strong. --- evolution-3.9.4-stack-protector-strong-crash.patch | 14 ++++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 evolution-3.9.4-stack-protector-strong-crash.patch diff --git a/evolution-3.9.4-stack-protector-strong-crash.patch b/evolution-3.9.4-stack-protector-strong-crash.patch new file mode 100644 index 0000000..b510594 --- /dev/null +++ b/evolution-3.9.4-stack-protector-strong-crash.patch @@ -0,0 +1,14 @@ +diff -up evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c.stack-protector-strong-crash evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c +--- evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c.stack-protector-strong-crash 2013-07-07 11:19:47.000000000 -0400 ++++ evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c 2013-07-17 12:13:48.981736397 -0400 +@@ -238,8 +238,8 @@ mail_config_smtp_backend_insert_widgets + priv->user_entry = widget; /* do not reference */ + gtk_widget_show (widget); + +- port = 0; +- g_object_get (G_OBJECT (settings), "port", &port, NULL); ++ port = camel_network_settings_get_port ( ++ CAMEL_NETWORK_SETTINGS (settings)); + + g_object_bind_property ( + settings, "host", diff --git a/evolution.spec b/evolution.spec index 6793bf9..5137253 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.9.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,6 +51,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# GNOME bug #703991 +Patch03: evolution-3.9.4-stack-protector-strong-crash.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -193,6 +196,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .stack-protector-strong-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -518,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Jul 17 2013 Matthew Barnes - 3.9.4-3 +- Work around a crash caught by -fstack-protector-strong. + * Wed Jul 17 2013 Petr Pisar - 3.9.4-2 - Perl 5.18 rebuild From 22c2ba4631afbe14bca6744497d8d44488a5c178 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Jul 2013 07:06:55 +0200 Subject: [PATCH 522/844] Update to 3.9.5 --- .gitignore | 1 + evolution-3.9.4-stack-protector-strong-crash.patch | 14 -------------- evolution.spec | 11 +++++------ sources | 2 +- 4 files changed, 7 insertions(+), 21 deletions(-) delete mode 100644 evolution-3.9.4-stack-protector-strong-crash.patch diff --git a/.gitignore b/.gitignore index d1d52db..b3d9e1c 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.2.tar.xz /evolution-3.9.3.tar.xz /evolution-3.9.4.tar.xz +/evolution-3.9.5.tar.xz diff --git a/evolution-3.9.4-stack-protector-strong-crash.patch b/evolution-3.9.4-stack-protector-strong-crash.patch deleted file mode 100644 index b510594..0000000 --- a/evolution-3.9.4-stack-protector-strong-crash.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c.stack-protector-strong-crash evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c ---- evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c.stack-protector-strong-crash 2013-07-07 11:19:47.000000000 -0400 -+++ evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c 2013-07-17 12:13:48.981736397 -0400 -@@ -238,8 +238,8 @@ mail_config_smtp_backend_insert_widgets - priv->user_entry = widget; /* do not reference */ - gtk_widget_show (widget); - -- port = 0; -- g_object_get (G_OBJECT (settings), "port", &port, NULL); -+ port = camel_network_settings_get_port ( -+ CAMEL_NETWORK_SETTINGS (settings)); - - g_object_bind_property ( - settings, "host", diff --git a/evolution.spec b/evolution.spec index 5137253..1df9222 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.9.4 -Release: 3%{?dist} +Version: 3.9.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,9 +51,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# GNOME bug #703991 -Patch03: evolution-3.9.4-stack-protector-strong-crash.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -196,7 +193,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .stack-protector-strong-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -522,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 29 2013 Milan Crha - 3.9.5-1 +- Update to 3.9.5 + * Wed Jul 17 2013 Matthew Barnes - 3.9.4-3 - Work around a crash caught by -fstack-protector-strong. diff --git a/sources b/sources index de423f3..45ef28e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b54aa0a49823eb2b6ad28b60a5b9fb22 evolution-3.9.4.tar.xz +f13c061585c9790d80a02f7b054c1aa1 evolution-3.9.5.tar.xz From 715f5285efe05d887f7231f27c33e908cab6b744 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Thu, 1 Aug 2013 15:04:58 +0200 Subject: [PATCH 523/844] Perl 5.18 rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 1df9222..22cb969 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.9.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Aug 01 2013 Petr Pisar - 3.9.5-2 +- Perl 5.18 rebuild + * Mon Jul 29 2013 Milan Crha - 3.9.5-1 - Update to 3.9.5 From 730503f605660664ba888f351ab9089359a0d6d0 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 6 Aug 2013 10:59:16 -0700 Subject: [PATCH 524/844] rebuild for new libgweather --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 22cb969..dd5bc7f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.9.5 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Aug 06 2013 Adam Williamson - 3.9.5-3 +- rebuild for new libgweather + * Thu Aug 01 2013 Petr Pisar - 3.9.5-2 - Perl 5.18 rebuild From bbc85fc0d48768db6f92340ca0074563d72830c3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Aug 2013 08:23:14 +0200 Subject: [PATCH 525/844] Update to 3.9.90 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b3d9e1c..357cd5b 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.3.tar.xz /evolution-3.9.4.tar.xz /evolution-3.9.5.tar.xz +/evolution-3.9.90.tar.xz diff --git a/evolution.spec b/evolution.spec index dd5bc7f..d911425 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.9.5 -Release: 3%{?dist} +Version: 3.9.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Aug 19 2013 Milan Crha - 3.9.90-1 +- Update to 3.9.90 + * Tue Aug 06 2013 Adam Williamson - 3.9.5-3 - rebuild for new libgweather diff --git a/sources b/sources index 45ef28e..e559d1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f13c061585c9790d80a02f7b054c1aa1 evolution-3.9.5.tar.xz +1152520aff50ce70a8f463a05e5de11b evolution-3.9.90.tar.xz From 64b6ac04e06348c182989bc7173329680e4d20c8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 23 Aug 2013 18:15:57 +0200 Subject: [PATCH 526/844] Split developer documentation into evolution-devel-docs subpackage --- evolution.spec | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/evolution.spec b/evolution.spec index d911425..551e70e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.9.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -139,6 +139,16 @@ Obsoletes: libgal2-devel <= %{last_libgal2_version} %description devel Development files needed for building things which link against %{name}. +%package devel-docs +Summary: Developer documentation for Evolution +Group: Development/Libraries +Requires: devhelp +Requires: evolution-devel = %{version}-%{release} +BuildArch: noarch + +%description devel-docs +This package contains developer documentation for Evolution. + %package help Group: Applications/Productivity Summary: Help files for %{name} @@ -483,10 +493,6 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) -%{_datadir}/gtk-doc/html/evolution-mail-composer -%{_datadir}/gtk-doc/html/evolution-mail-formatter -%{_datadir}/gtk-doc/html/evolution-shell -%{_datadir}/gtk-doc/html/evolution-util %{_includedir}/evolution-%{evo_base_version} %{_libdir}/pkgconfig/evolution-calendar-3.0.pc %{_libdir}/pkgconfig/evolution-mail-3.0.pc @@ -494,6 +500,13 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/evolution-shell-3.0.pc %{_libdir}/pkgconfig/libemail-engine.pc +%files devel-docs +%defattr(-,root,root,-) +%doc %{_datadir}/gtk-doc/html/evolution-mail-composer +%doc %{_datadir}/gtk-doc/html/evolution-mail-formatter +%doc %{_datadir}/gtk-doc/html/evolution-shell +%doc %{_datadir}/gtk-doc/html/evolution-util + %files help -f help.lang %defattr(-, root, root) %dir %{_datadir}/help/*/evolution @@ -518,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Aug 23 2013 Milan Crha - 3.9.90-2 +- Split developer documentation into evolution-devel-docs subpackage + * Mon Aug 19 2013 Milan Crha - 3.9.90-1 - Update to 3.9.90 From eee1aca2c6f38f2e326c1bda05e712299c18db96 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 2 Sep 2013 08:58:28 +0200 Subject: [PATCH 527/844] Update to 3.9.91 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 357cd5b..0357a0b 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.4.tar.xz /evolution-3.9.5.tar.xz /evolution-3.9.90.tar.xz +/evolution-3.9.91.tar.xz diff --git a/evolution.spec b/evolution.spec index 551e70e..0a7854b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.9.90 -Release: 2%{?dist} +Version: 3.9.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 02 2013 Milan Crha - 3.9.91-1 +- Update to 3.9.91 + * Fri Aug 23 2013 Milan Crha - 3.9.90-2 - Split developer documentation into evolution-devel-docs subpackage diff --git a/sources b/sources index e559d1d..b307c1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1152520aff50ce70a8f463a05e5de11b evolution-3.9.90.tar.xz +1c18eedf725fa62a3cd93593f8f022b1 evolution-3.9.91.tar.xz From 5fa59103547d716ab3412996af29538b33ecd651 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Tue, 3 Sep 2013 22:43:00 +0200 Subject: [PATCH 528/844] Rebuilt for libgnome-desktop soname bump --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 0a7854b..cb5f782 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.9.91 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Sep 03 2013 Kalev Lember - 3.9.91-2 +- Rebuilt for libgnome-desktop soname bump + * Mon Sep 02 2013 Milan Crha - 3.9.91-1 - Update to 3.9.91 From 26b7603a2c5683014470c63a7b1ad6c2c9229f30 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Sep 2013 08:26:11 +0200 Subject: [PATCH 529/844] Update to 3.9.92 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 0357a0b..6f95a64 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.5.tar.xz /evolution-3.9.90.tar.xz /evolution-3.9.91.tar.xz +/evolution-3.9.92.tar.xz diff --git a/evolution.spec b/evolution.spec index cb5f782..151f433 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.9.91 -Release: 2%{?dist} +Version: 3.9.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -531,6 +531,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 16 2013 Milan Crha - 3.9.92-1 +- Update to 3.9.92 + * Tue Sep 03 2013 Kalev Lember - 3.9.91-2 - Rebuilt for libgnome-desktop soname bump diff --git a/sources b/sources index b307c1b..48c4b12 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c18eedf725fa62a3cd93593f8f022b1 evolution-3.9.91.tar.xz +c25767ad5468f2f5de300ffd7503d7f7 evolution-3.9.92.tar.xz From 9357f9b91c75d4e89fd15c7c6844deea7a41d8a3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Sep 2013 10:27:19 +0200 Subject: [PATCH 530/844] Package evolution.appdata.xml file too --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 151f433..ce12b5b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -357,6 +357,8 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution +%{_datadir}/appdata/evolution.appdata.xml + # Desktop files: %{_datadir}/applications/evolution.desktop %{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop From 565fe492f8308ce66066cbcf8ae2c0899ebacfc7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 23 Sep 2013 11:22:19 +0200 Subject: [PATCH 531/844] Update to 3.10.0; Remove explicit Requires on libpst in pst subpackage --- .gitignore | 1 + evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6f95a64..124af6c 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.90.tar.xz /evolution-3.9.91.tar.xz /evolution-3.9.92.tar.xz +/evolution-3.10.0.tar.xz diff --git a/evolution.spec b/evolution.spec index ce12b5b..9f920f3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,14 +30,14 @@ ### Abstract ### Name: evolution -Version: 3.9.92 +Version: 3.10.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.9/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.10/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -192,7 +192,6 @@ This package contains supplemental utilities for %{name} that require Perl. Group: Applications/Productivity Summary: PST importer plugin for Evolution Requires: %{name} = %{version}-%{release} -Requires: libpst %description pst This package contains the plugin to import Microsoft Personal Storage Table @@ -533,6 +532,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 23 2013 Milan Crha - 3.10.0-1 +- Update to 3.10.0 +- Remove explicit Requires on libpst in pst subpackage + * Mon Sep 16 2013 Milan Crha - 3.9.92-1 - Update to 3.9.92 diff --git a/sources b/sources index 48c4b12..4fd31eb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c25767ad5468f2f5de300ffd7503d7f7 evolution-3.9.92.tar.xz +01c3f4f73bc236b95f74afedf9f463ca evolution-3.10.0.tar.xz From d599a29ba41d8aa0ac3651306467017224d172ab Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Oct 2013 10:18:08 +0200 Subject: [PATCH 532/844] - Update to 3.10.1 - Remove the dependency on libytnef, which apparently isn't needed for the PST importer and disable the experimental TNEF attachments plugin - Avoid help launch with F1 when evolution-help is not installed --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 12 +++++++----- evolution.spec | 10 +++++++--- sources | 2 +- 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 124af6c..7b80690 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.91.tar.xz /evolution-3.9.92.tar.xz /evolution-3.10.0.tar.xz +/evolution-3.10.1.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index e0b27af..650e6de 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ -diff -up evolution-3.9.1/shell/e-shell-window-actions.c.help-contents evolution-3.9.1/shell/e-shell-window-actions.c ---- evolution-3.9.1/shell/e-shell-window-actions.c.help-contents 2013-04-29 11:23:28.943063568 +0200 -+++ evolution-3.9.1/shell/e-shell-window-actions.c 2013-04-29 11:24:16.701599684 +0200 -@@ -1396,6 +1396,15 @@ e_shell_window_actions_init (EShellWindo +diff -up evolution-3.10.0/shell/e-shell-window-actions.c.help-contents evolution-3.10.0/shell/e-shell-window-actions.c +--- evolution-3.10.0/shell/e-shell-window-actions.c.help-contents 2013-09-07 18:34:59.000000000 +0200 ++++ evolution-3.10.0/shell/e-shell-window-actions.c 2013-10-10 08:51:03.863987108 +0200 +@@ -1414,6 +1414,17 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); @@ -11,8 +11,10 @@ diff -up evolution-3.9.1/shell/e-shell-window-actions.c.help-contents evolution- + path = g_build_filename ( + EVOLUTION_DATADIR, "help", "C", + PACKAGE, "index.page", NULL); -+ if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) ++ if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { + gtk_action_set_visible (ACTION (CONTENTS), FALSE); ++ gtk_action_set_sensitive (ACTION (CONTENTS), FALSE); ++ } + g_free (path); } diff --git a/evolution.spec b/evolution.spec index 9f920f3..a6ccd90 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ ### Abstract ### Name: evolution -Version: 3.10.0 +Version: 3.10.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -114,7 +114,6 @@ BuildRequires: libnotify-devel %if %{libpst_support} BuildRequires: libpst-devel -BuildRequires: libytnef-devel %endif %description @@ -407,7 +406,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-settings.so %{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so %{_libdir}/evolution/%{evo_base_version}/modules/module-text-highlight.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-tnef-attachment.so %{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so %{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so @@ -532,6 +530,12 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Oct 14 2013 Milan Crha - 3.10.1-1 +- Update to 3.10.1 +- Remove the dependency on libytnef, which apparently isn't needed for + the PST importer and disable the experimental TNEF attachments plugin +- Avoid help launch with F1 when evolution-help is not installed + * Mon Sep 23 2013 Milan Crha - 3.10.0-1 - Update to 3.10.0 - Remove explicit Requires on libpst in pst subpackage diff --git a/sources b/sources index 4fd31eb..1dfcd1c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01c3f4f73bc236b95f74afedf9f463ca evolution-3.10.0.tar.xz +53199a7863b23d177774362d33993774 evolution-3.10.1.tar.xz From 97f519297bf5ce4fcf9ecee6cd46f0c7537f1af8 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Oct 2013 11:48:54 -0400 Subject: [PATCH 533/844] 3.11.1 --- .gitignore | 1 + evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 7b80690..d23c43e 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.9.92.tar.xz /evolution-3.10.0.tar.xz /evolution-3.10.1.tar.xz +/evolution-3.11.1.tar.xz diff --git a/evolution.spec b/evolution.spec index a6ccd90..c3f00b4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,6 +1,6 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") -%define glib2_version 2.34.0 +%define glib2_version 2.36.0 %define gtk3_version 3.4.0 %define gtkhtml_version 4.5.2 %define gnome_desktop_version 2.91.3 @@ -13,7 +13,7 @@ %define clutter_gtk_version 0.10 %define webkit_version 1.8.0 -%define evo_base_version 3.10 +%define evo_base_version 3.12 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -30,7 +30,7 @@ ### Abstract ### Name: evolution -Version: 3.10.1 +Version: 3.11.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -530,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Tue Oct 22 2013 Matthew Barnes - 3.11.1-1 +- Update to 3.11.1 + * Mon Oct 14 2013 Milan Crha - 3.10.1-1 - Update to 3.10.1 - Remove the dependency on libytnef, which apparently isn't needed for diff --git a/sources b/sources index 1dfcd1c..33e2119 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -53199a7863b23d177774362d33993774 evolution-3.10.1.tar.xz +11f3e095c4577159184692b09f42ceca evolution-3.11.1.tar.xz From 15ce8297480efe814cb75a54588d6acfe89f4574 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Nov 2013 21:42:44 +0100 Subject: [PATCH 534/844] Hide more help-related widgets when evolution-help is not installed --- evolution-2.30.1-help-contents.patch | 156 +++++++++++++++++++++++++-- evolution.spec | 5 +- 2 files changed, 149 insertions(+), 12 deletions(-) diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index 650e6de..ffbc459 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,21 +1,155 @@ -diff -up evolution-3.10.0/shell/e-shell-window-actions.c.help-contents evolution-3.10.0/shell/e-shell-window-actions.c ---- evolution-3.10.0/shell/e-shell-window-actions.c.help-contents 2013-09-07 18:34:59.000000000 +0200 -+++ evolution-3.10.0/shell/e-shell-window-actions.c 2013-10-10 08:51:03.863987108 +0200 -@@ -1414,6 +1414,17 @@ e_shell_window_actions_init (EShellWindo +diff -up evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2013-10-20 16:23:21.000000000 +0200 ++++ evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c 2013-11-11 21:39:21.984600383 +0100 +@@ -4182,6 +4182,11 @@ e_contact_editor_init (EContactEditor *e + g_signal_connect ( + widget, "clicked", + G_CALLBACK (show_help_cb), e_contact_editor); ++ if (!e_misc_utils_is_help_package_installed ()) { ++ gtk_widget_set_sensitive (widget, FALSE); ++ gtk_widget_hide (widget); ++ } ++ + widget = e_builder_get_widget ( + e_contact_editor->builder, "button-web-expand"); + g_signal_connect_swapped ( +diff -up evolution-3.11.1/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.1/calendar/gui/dialogs/comp-editor.c +--- evolution-3.11.1/calendar/gui/dialogs/comp-editor.c.help-contents 2013-10-20 16:23:34.000000000 +0200 ++++ evolution-3.11.1/calendar/gui/dialogs/comp-editor.c 2013-11-11 21:39:21.986600383 +0100 +@@ -2152,6 +2152,12 @@ comp_editor_init (CompEditor *editor) + G_BINDING_SYNC_CREATE); + } + ++ action = gtk_action_group_get_action (action_group, "help"); ++ if (action && !e_misc_utils_is_help_package_installed ()) { ++ gtk_action_set_visible (action, FALSE); ++ gtk_action_set_sensitive (action, FALSE); ++ } ++ + action_group = gtk_action_group_new ("individual"); + gtk_action_group_set_translation_domain ( + action_group, GETTEXT_PACKAGE); +diff -up evolution-3.11.1/e-util/e-misc-utils.c.help-contents evolution-3.11.1/e-util/e-misc-utils.c +--- evolution-3.11.1/e-util/e-misc-utils.c.help-contents 2013-10-20 16:23:09.000000000 +0200 ++++ evolution-3.11.1/e-util/e-misc-utils.c 2013-11-11 21:39:21.987600383 +0100 +@@ -2097,3 +2097,20 @@ e_binding_transform_uid_to_source (GBind + + return success; + } ++ ++gboolean ++e_misc_utils_is_help_package_installed (void) ++{ ++ gboolean is_installed; ++ gchar *path; ++ ++ /* Viewing user documentation requires the evolution-help ++ * package. Look for one of the files it installs. */ ++ path = g_build_filename (EVOLUTION_DATADIR, "help", "C", PACKAGE, "index.page", NULL); ++ ++ is_installed = g_file_test (path, G_FILE_TEST_IS_REGULAR); ++ ++ g_free (path); ++ ++ return is_installed; ++} +diff -up evolution-3.11.1/e-util/e-misc-utils.h.help-contents evolution-3.11.1/e-util/e-misc-utils.h +--- evolution-3.11.1/e-util/e-misc-utils.h.help-contents 2013-10-20 16:23:08.000000000 +0200 ++++ evolution-3.11.1/e-util/e-misc-utils.h 2013-11-11 21:39:21.987600383 +0100 +@@ -185,6 +185,8 @@ gboolean e_binding_transform_uid_to_sour + GValue *target_value, + ESourceRegistry *registry); + ++gboolean e_misc_utils_is_help_package_installed (void); ++ + G_END_DECLS + + #endif /* E_MISC_UTILS_H */ +diff -up evolution-3.11.1/e-util/e-preferences-window.c.help-contents evolution-3.11.1/e-util/e-preferences-window.c +--- evolution-3.11.1/e-util/e-preferences-window.c.help-contents 2013-10-20 16:23:14.000000000 +0200 ++++ evolution-3.11.1/e-util/e-preferences-window.c 2013-11-11 21:39:21.987600383 +0100 +@@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW + GTK_BUTTON_BOX (container), widget, TRUE); + gtk_widget_show (widget); + ++ if (!e_misc_utils_is_help_package_installed ()) { ++ gtk_widget_set_sensitive (widget, FALSE); ++ gtk_widget_hide (widget); ++ } ++ + widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + g_signal_connect_swapped ( + widget, "clicked", +diff -up evolution-3.11.1/e-util/e-send-options.c.help-contents evolution-3.11.1/e-util/e-send-options.c +--- evolution-3.11.1/e-util/e-send-options.c.help-contents 2013-10-20 16:22:51.000000000 +0200 ++++ evolution-3.11.1/e-util/e-send-options.c 2013-11-11 21:39:21.988600383 +0100 +@@ -440,6 +440,7 @@ get_widgets (ESendOptionsDialog *sod) + { + ESendOptionsDialogPrivate *priv; + GtkBuilder *builder; ++ GtkWidget *helpbutton; + + priv = sod->priv; + builder = sod->priv->builder; +@@ -479,6 +480,12 @@ get_widgets (ESendOptionsDialog *sod) + priv->accepted_label = e_builder_get_widget (builder, "accepted-label"); + priv->completed_label = e_builder_get_widget (builder, "completed-label"); + ++ helpbutton = e_builder_get_widget (builder, "helpbutton1"); ++ if (helpbutton && !e_misc_utils_is_help_package_installed ()) { ++ gtk_widget_set_sensitive (helpbutton, FALSE); ++ gtk_widget_hide (helpbutton); ++ } ++ + return (priv->priority + && priv->security + && priv->status +diff -up evolution-3.11.1/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.1/plugins/email-custom-header/email-custom-header.c +--- evolution-3.11.1/plugins/email-custom-header/email-custom-header.c.help-contents 2013-10-20 16:22:22.000000000 +0200 ++++ evolution-3.11.1/plugins/email-custom-header/email-custom-header.c 2013-11-11 21:39:21.988600383 +0100 +@@ -27,6 +27,7 @@ + #include + #include + ++#include "e-util/e-util.h" + #include "mail/em-utils.h" + #include "mail/em-event.h" + #include "composer/e-msg-composer.h" +@@ -117,6 +118,8 @@ static gboolean + epech_get_widgets (CustomHeaderOptionsDialog *mch) + { + CustomHeaderOptionsDialogPrivate *priv; ++ GtkWidget *helpbutton; ++ + priv = mch->priv; + + #define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name) +@@ -127,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi + + priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); + priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); ++ ++ helpbutton = EMAIL_CUSTOM_HEADER ("helpbutton1"); ++ if (helpbutton && !e_misc_utils_is_help_package_installed ()) { ++ gtk_widget_set_sensitive (helpbutton, FALSE); ++ gtk_widget_hide (helpbutton); ++ } ++ + #undef EMAIL_CUSTOM_HEADER + + return (priv->page +diff -up evolution-3.11.1/shell/e-shell-window-actions.c.help-contents evolution-3.11.1/shell/e-shell-window-actions.c +--- evolution-3.11.1/shell/e-shell-window-actions.c.help-contents 2013-10-20 16:23:24.000000000 +0200 ++++ evolution-3.11.1/shell/e-shell-window-actions.c 2013-11-11 21:39:21.989600383 +0100 +@@ -1414,6 +1414,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); + -+ /* Viewing user documentation requires the evolution-help -+ * Fedora package. Look for one of the files it installs. */ -+ path = g_build_filename ( -+ EVOLUTION_DATADIR, "help", "C", -+ PACKAGE, "index.page", NULL); -+ if (!g_file_test (path, G_FILE_TEST_IS_REGULAR)) { ++ if (!e_misc_utils_is_help_package_installed ()) { + gtk_action_set_visible (ACTION (CONTENTS), FALSE); + gtk_action_set_sensitive (ACTION (CONTENTS), FALSE); + } -+ g_free (path); } GtkWidget * diff --git a/evolution.spec b/evolution.spec index c3f00b4..37ff567 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.11.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -530,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 11 2013 Milan Crha - 3.11.1-2 +- Hide more help-related widgets when evolution-help is not installed + * Tue Oct 22 2013 Matthew Barnes - 3.11.1-1 - Update to 3.11.1 From b131ef23e6d7143afd3321e1867f3d9a5cc0f26d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Nov 2013 11:24:05 +0100 Subject: [PATCH 535/844] - Update to 3.11.2 - Conditionally build help subpackage - Disable compiler warnings about deprecated symbols --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 54 ++++++++++++++-------------- evolution.spec | 31 +++++++++++++--- sources | 2 +- 4 files changed, 55 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index d23c43e..0e33ead 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.10.0.tar.xz /evolution-3.10.1.tar.xz /evolution-3.11.1.tar.xz +/evolution-3.11.2.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index ffbc459..9e179f1 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ -diff -up evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2013-10-20 16:23:21.000000000 +0200 -+++ evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c 2013-11-11 21:39:21.984600383 +0100 -@@ -4182,6 +4182,11 @@ e_contact_editor_init (EContactEditor *e +diff -up evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2013-11-17 01:24:01.000000000 +0100 ++++ evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c 2013-11-18 11:09:00.373861447 +0100 +@@ -4178,6 +4178,11 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); @@ -13,10 +13,10 @@ diff -up evolution-3.11.1/addressbook/gui/contact-editor/e-contact-editor.c.help widget = e_builder_get_widget ( e_contact_editor->builder, "button-web-expand"); g_signal_connect_swapped ( -diff -up evolution-3.11.1/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.1/calendar/gui/dialogs/comp-editor.c ---- evolution-3.11.1/calendar/gui/dialogs/comp-editor.c.help-contents 2013-10-20 16:23:34.000000000 +0200 -+++ evolution-3.11.1/calendar/gui/dialogs/comp-editor.c 2013-11-11 21:39:21.986600383 +0100 -@@ -2152,6 +2152,12 @@ comp_editor_init (CompEditor *editor) +diff -up evolution-3.11.2/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.2/calendar/gui/dialogs/comp-editor.c +--- evolution-3.11.2/calendar/gui/dialogs/comp-editor.c.help-contents 2013-11-17 01:24:01.000000000 +0100 ++++ evolution-3.11.2/calendar/gui/dialogs/comp-editor.c 2013-11-18 11:09:00.374861447 +0100 +@@ -2149,6 +2149,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,10 +29,10 @@ diff -up evolution-3.11.1/calendar/gui/dialogs/comp-editor.c.help-contents evolu action_group = gtk_action_group_new ("individual"); gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); -diff -up evolution-3.11.1/e-util/e-misc-utils.c.help-contents evolution-3.11.1/e-util/e-misc-utils.c ---- evolution-3.11.1/e-util/e-misc-utils.c.help-contents 2013-10-20 16:23:09.000000000 +0200 -+++ evolution-3.11.1/e-util/e-misc-utils.c 2013-11-11 21:39:21.987600383 +0100 -@@ -2097,3 +2097,20 @@ e_binding_transform_uid_to_source (GBind +diff -up evolution-3.11.2/e-util/e-misc-utils.c.help-contents evolution-3.11.2/e-util/e-misc-utils.c +--- evolution-3.11.2/e-util/e-misc-utils.c.help-contents 2013-11-17 01:24:01.000000000 +0100 ++++ evolution-3.11.2/e-util/e-misc-utils.c 2013-11-18 11:09:00.374861447 +0100 +@@ -2099,3 +2099,20 @@ e_binding_transform_uid_to_source (GBind return success; } @@ -53,9 +53,9 @@ diff -up evolution-3.11.1/e-util/e-misc-utils.c.help-contents evolution-3.11.1/e + + return is_installed; +} -diff -up evolution-3.11.1/e-util/e-misc-utils.h.help-contents evolution-3.11.1/e-util/e-misc-utils.h ---- evolution-3.11.1/e-util/e-misc-utils.h.help-contents 2013-10-20 16:23:08.000000000 +0200 -+++ evolution-3.11.1/e-util/e-misc-utils.h 2013-11-11 21:39:21.987600383 +0100 +diff -up evolution-3.11.2/e-util/e-misc-utils.h.help-contents evolution-3.11.2/e-util/e-misc-utils.h +--- evolution-3.11.2/e-util/e-misc-utils.h.help-contents 2013-10-30 23:08:03.000000000 +0100 ++++ evolution-3.11.2/e-util/e-misc-utils.h 2013-11-18 11:09:00.375861447 +0100 @@ -185,6 +185,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); @@ -65,9 +65,9 @@ diff -up evolution-3.11.1/e-util/e-misc-utils.h.help-contents evolution-3.11.1/e G_END_DECLS #endif /* E_MISC_UTILS_H */ -diff -up evolution-3.11.1/e-util/e-preferences-window.c.help-contents evolution-3.11.1/e-util/e-preferences-window.c ---- evolution-3.11.1/e-util/e-preferences-window.c.help-contents 2013-10-20 16:23:14.000000000 +0200 -+++ evolution-3.11.1/e-util/e-preferences-window.c 2013-11-11 21:39:21.987600383 +0100 +diff -up evolution-3.11.2/e-util/e-preferences-window.c.help-contents evolution-3.11.2/e-util/e-preferences-window.c +--- evolution-3.11.2/e-util/e-preferences-window.c.help-contents 2013-10-30 23:08:07.000000000 +0100 ++++ evolution-3.11.2/e-util/e-preferences-window.c 2013-11-18 11:09:00.375861447 +0100 @@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -80,9 +80,9 @@ diff -up evolution-3.11.1/e-util/e-preferences-window.c.help-contents evolution- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE); g_signal_connect_swapped ( widget, "clicked", -diff -up evolution-3.11.1/e-util/e-send-options.c.help-contents evolution-3.11.1/e-util/e-send-options.c ---- evolution-3.11.1/e-util/e-send-options.c.help-contents 2013-10-20 16:22:51.000000000 +0200 -+++ evolution-3.11.1/e-util/e-send-options.c 2013-11-11 21:39:21.988600383 +0100 +diff -up evolution-3.11.2/e-util/e-send-options.c.help-contents evolution-3.11.2/e-util/e-send-options.c +--- evolution-3.11.2/e-util/e-send-options.c.help-contents 2013-11-17 01:24:01.000000000 +0100 ++++ evolution-3.11.2/e-util/e-send-options.c 2013-11-18 11:09:00.375861447 +0100 @@ -440,6 +440,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; @@ -104,9 +104,9 @@ diff -up evolution-3.11.1/e-util/e-send-options.c.help-contents evolution-3.11.1 return (priv->priority && priv->security && priv->status -diff -up evolution-3.11.1/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.1/plugins/email-custom-header/email-custom-header.c ---- evolution-3.11.1/plugins/email-custom-header/email-custom-header.c.help-contents 2013-10-20 16:22:22.000000000 +0200 -+++ evolution-3.11.1/plugins/email-custom-header/email-custom-header.c 2013-11-11 21:39:21.988600383 +0100 +diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.2/plugins/email-custom-header/email-custom-header.c +--- evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help-contents 2013-11-17 01:24:01.000000000 +0100 ++++ evolution-3.11.2/plugins/email-custom-header/email-custom-header.c 2013-11-18 11:09:00.375861447 +0100 @@ -27,6 +27,7 @@ #include #include @@ -138,9 +138,9 @@ diff -up evolution-3.11.1/plugins/email-custom-header/email-custom-header.c.help #undef EMAIL_CUSTOM_HEADER return (priv->page -diff -up evolution-3.11.1/shell/e-shell-window-actions.c.help-contents evolution-3.11.1/shell/e-shell-window-actions.c ---- evolution-3.11.1/shell/e-shell-window-actions.c.help-contents 2013-10-20 16:23:24.000000000 +0200 -+++ evolution-3.11.1/shell/e-shell-window-actions.c 2013-11-11 21:39:21.989600383 +0100 +diff -up evolution-3.11.2/shell/e-shell-window-actions.c.help-contents evolution-3.11.2/shell/e-shell-window-actions.c +--- evolution-3.11.2/shell/e-shell-window-actions.c.help-contents 2013-10-30 23:08:15.000000000 +0100 ++++ evolution-3.11.2/shell/e-shell-window-actions.c 2013-11-18 11:09:00.376861447 +0100 @@ -1414,6 +1414,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); diff --git a/evolution.spec b/evolution.spec index 37ff567..7988b58 100644 --- a/evolution.spec +++ b/evolution.spec @@ -25,13 +25,16 @@ %define libpst_support 1 %define krb5_support 1 +# Coverity scan can override this to 0, to skip checking in gtk-doc generated code +%{!?with_docs: %define with_docs 1} + %define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins ### Abstract ### Name: evolution -Version: 3.11.1 -Release: 2%{?dist} +Version: 3.11.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -148,6 +151,7 @@ BuildArch: noarch %description devel-docs This package contains developer documentation for Evolution. +%if %{with_docs} %package help Group: Applications/Productivity Summary: Help files for %{name} @@ -157,6 +161,7 @@ BuildArch: noarch %description help This package contains user documentation for %{name}. +%endif %package bogofilter Group: Applications/Productivity @@ -232,8 +237,14 @@ if ! pkg-config --exists nss; then exit 1 fi +%if %{with_docs} +%define gtkdoc_flags --enable-gtk-doc +%else +%define gtkdoc_flags --disable-gtk-doc +%endif + CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS -CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare"; export CFLAGS +CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS # Regenerate configure to pick up configure.ac changes aclocal -I m4 @@ -245,13 +256,14 @@ autoconf %configure \ --disable-maintainer-mode \ - --enable-gtk-doc \ --with-sub-version=" (%{version}-%{release})" \ - %ldap_flags %krb5_flags %ssl_flags \ + %ldap_flags %krb5_flags %ssl_flags %gtkdoc_flags \ --enable-plugins=all export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" +%if %{with_docs} + # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. cd po @@ -281,6 +293,8 @@ for f in $helpdir/C/figures/*.png; do done done +# %{with_docs} +%endif %install rm -rf $RPM_BUILD_ROOT @@ -506,9 +520,11 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/evolution-shell %doc %{_datadir}/gtk-doc/html/evolution-util +%if %{with_docs} %files help -f help.lang %defattr(-, root, root) %dir %{_datadir}/help/*/evolution +%endif %files bogofilter %defattr(-, root, root) @@ -530,6 +546,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Nov 18 2013 Milan Crha - 3.11.2-1 +- Update to 3.11.2 +- Conditionally build help subpackage +- Disable compiler warnings about deprecated symbols + * Mon Nov 11 2013 Milan Crha - 3.11.1-2 - Hide more help-related widgets when evolution-help is not installed diff --git a/sources b/sources index 33e2119..20d3c63 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -11f3e095c4577159184692b09f42ceca evolution-3.11.1.tar.xz +c47d39795ff43dc13a7a2915e371f533 evolution-3.11.2.tar.xz From b83df0bfa8c4f78eb33ad28d23ad8b996659889b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Nov 2013 14:52:14 +0100 Subject: [PATCH 536/844] Add evolution-mail-engine documentation --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 7988b58..cd193d7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -516,6 +516,7 @@ rm -rf $RPM_BUILD_ROOT %files devel-docs %defattr(-,root,root,-) %doc %{_datadir}/gtk-doc/html/evolution-mail-composer +%doc %{_datadir}/gtk-doc/html/evolution-mail-engine %doc %{_datadir}/gtk-doc/html/evolution-mail-formatter %doc %{_datadir}/gtk-doc/html/evolution-shell %doc %{_datadir}/gtk-doc/html/evolution-util From f9ab9d10af77feb7c3f7de9f7e39236048d0fc77 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 19 Nov 2013 08:18:22 +0100 Subject: [PATCH 537/844] Fix a Source URL --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index cd193d7..48f9d31 100644 --- a/evolution.spec +++ b/evolution.spec @@ -40,7 +40,7 @@ Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: http://projects.gnome.org/evolution/ BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.10/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.11/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} From b3ba98e59060bf639efea2accf0759579e850408 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 21 Nov 2013 19:17:29 +0100 Subject: [PATCH 538/844] Rebuild for new libical (RH bug #1023020) --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 48f9d31..1be7d3c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -34,7 +34,7 @@ Name: evolution Version: 3.11.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -547,6 +547,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Nov 21 2013 Milan Crha - 3.11.2-2 +- Rebuild for new libical (RH bug #1023020) + * Mon Nov 18 2013 Milan Crha - 3.11.2-1 - Update to 3.11.2 - Conditionally build help subpackage From 321ca3704eee77f2343245756f726d8bbca83990 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Jan 2014 08:34:19 +0100 Subject: [PATCH 539/844] Update to 3.11.4 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 72 ++++++++++++++-------------- evolution.spec | 10 +++- sources | 2 +- 4 files changed, 46 insertions(+), 39 deletions(-) diff --git a/.gitignore b/.gitignore index 0e33ead..f87880e 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.10.1.tar.xz /evolution-3.11.1.tar.xz /evolution-3.11.2.tar.xz +/evolution-3.11.4.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index 9e179f1..ed6ba6c 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ -diff -up evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c 2013-11-18 11:09:00.373861447 +0100 -@@ -4178,6 +4178,11 @@ e_contact_editor_init (EContactEditor *e +diff -up evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-01-13 08:31:03.314822806 +0100 ++++ evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c 2014-01-13 08:32:38.787818761 +0100 +@@ -4282,6 +4282,11 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); @@ -11,12 +11,12 @@ diff -up evolution-3.11.2/addressbook/gui/contact-editor/e-contact-editor.c.help + } + widget = e_builder_get_widget ( - e_contact_editor->builder, "button-web-expand"); + e_contact_editor->priv->builder, "button-web-expand"); g_signal_connect_swapped ( -diff -up evolution-3.11.2/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.2/calendar/gui/dialogs/comp-editor.c ---- evolution-3.11.2/calendar/gui/dialogs/comp-editor.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/calendar/gui/dialogs/comp-editor.c 2013-11-18 11:09:00.374861447 +0100 -@@ -2149,6 +2149,12 @@ comp_editor_init (CompEditor *editor) +diff -up evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.4/calendar/gui/dialogs/comp-editor.c +--- evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents 2014-01-13 00:02:51.000000000 +0100 ++++ evolution-3.11.4/calendar/gui/dialogs/comp-editor.c 2014-01-13 08:31:03.315822806 +0100 +@@ -2169,6 +2169,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,10 +29,10 @@ diff -up evolution-3.11.2/calendar/gui/dialogs/comp-editor.c.help-contents evolu action_group = gtk_action_group_new ("individual"); gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); -diff -up evolution-3.11.2/e-util/e-misc-utils.c.help-contents evolution-3.11.2/e-util/e-misc-utils.c ---- evolution-3.11.2/e-util/e-misc-utils.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/e-util/e-misc-utils.c 2013-11-18 11:09:00.374861447 +0100 -@@ -2099,3 +2099,20 @@ e_binding_transform_uid_to_source (GBind +diff -up evolution-3.11.4/e-util/e-misc-utils.c.help-contents evolution-3.11.4/e-util/e-misc-utils.c +--- evolution-3.11.4/e-util/e-misc-utils.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/e-util/e-misc-utils.c 2014-01-13 08:31:03.315822806 +0100 +@@ -2098,3 +2098,20 @@ e_binding_transform_uid_to_source (GBind return success; } @@ -53,10 +53,10 @@ diff -up evolution-3.11.2/e-util/e-misc-utils.c.help-contents evolution-3.11.2/e + + return is_installed; +} -diff -up evolution-3.11.2/e-util/e-misc-utils.h.help-contents evolution-3.11.2/e-util/e-misc-utils.h ---- evolution-3.11.2/e-util/e-misc-utils.h.help-contents 2013-10-30 23:08:03.000000000 +0100 -+++ evolution-3.11.2/e-util/e-misc-utils.h 2013-11-18 11:09:00.375861447 +0100 -@@ -185,6 +185,8 @@ gboolean e_binding_transform_uid_to_sour +diff -up evolution-3.11.4/e-util/e-misc-utils.h.help-contents evolution-3.11.4/e-util/e-misc-utils.h +--- evolution-3.11.4/e-util/e-misc-utils.h.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/e-util/e-misc-utils.h 2014-01-13 08:31:03.316822806 +0100 +@@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); @@ -65,10 +65,10 @@ diff -up evolution-3.11.2/e-util/e-misc-utils.h.help-contents evolution-3.11.2/e G_END_DECLS #endif /* E_MISC_UTILS_H */ -diff -up evolution-3.11.2/e-util/e-preferences-window.c.help-contents evolution-3.11.2/e-util/e-preferences-window.c ---- evolution-3.11.2/e-util/e-preferences-window.c.help-contents 2013-10-30 23:08:07.000000000 +0100 -+++ evolution-3.11.2/e-util/e-preferences-window.c 2013-11-18 11:09:00.375861447 +0100 -@@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW +diff -up evolution-3.11.4/e-util/e-preferences-window.c.help-contents evolution-3.11.4/e-util/e-preferences-window.c +--- evolution-3.11.4/e-util/e-preferences-window.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/e-util/e-preferences-window.c 2014-01-13 08:31:03.316822806 +0100 +@@ -384,6 +384,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -80,10 +80,10 @@ diff -up evolution-3.11.2/e-util/e-preferences-window.c.help-contents evolution- widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE); g_signal_connect_swapped ( widget, "clicked", -diff -up evolution-3.11.2/e-util/e-send-options.c.help-contents evolution-3.11.2/e-util/e-send-options.c ---- evolution-3.11.2/e-util/e-send-options.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/e-util/e-send-options.c 2013-11-18 11:09:00.375861447 +0100 -@@ -440,6 +440,7 @@ get_widgets (ESendOptionsDialog *sod) +diff -up evolution-3.11.4/e-util/e-send-options.c.help-contents evolution-3.11.4/e-util/e-send-options.c +--- evolution-3.11.4/e-util/e-send-options.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/e-util/e-send-options.c 2014-01-13 08:31:03.316822806 +0100 +@@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; GtkBuilder *builder; @@ -91,7 +91,7 @@ diff -up evolution-3.11.2/e-util/e-send-options.c.help-contents evolution-3.11.2 priv = sod->priv; builder = sod->priv->builder; -@@ -479,6 +480,12 @@ get_widgets (ESendOptionsDialog *sod) +@@ -478,6 +479,12 @@ get_widgets (ESendOptionsDialog *sod) priv->accepted_label = e_builder_get_widget (builder, "accepted-label"); priv->completed_label = e_builder_get_widget (builder, "completed-label"); @@ -104,10 +104,10 @@ diff -up evolution-3.11.2/e-util/e-send-options.c.help-contents evolution-3.11.2 return (priv->priority && priv->security && priv->status -diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.2/plugins/email-custom-header/email-custom-header.c ---- evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help-contents 2013-11-17 01:24:01.000000000 +0100 -+++ evolution-3.11.2/plugins/email-custom-header/email-custom-header.c 2013-11-18 11:09:00.375861447 +0100 -@@ -27,6 +27,7 @@ +diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.4/plugins/email-custom-header/email-custom-header.c +--- evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.4/plugins/email-custom-header/email-custom-header.c 2014-01-13 08:31:03.316822806 +0100 +@@ -26,6 +26,7 @@ #include #include @@ -115,7 +115,7 @@ diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help #include "mail/em-utils.h" #include "mail/em-event.h" #include "composer/e-msg-composer.h" -@@ -117,6 +118,8 @@ static gboolean +@@ -116,6 +117,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { CustomHeaderOptionsDialogPrivate *priv; @@ -124,7 +124,7 @@ diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help priv = mch->priv; #define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name) -@@ -127,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi +@@ -126,6 +129,13 @@ epech_get_widgets (CustomHeaderOptionsDi priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); @@ -138,10 +138,10 @@ diff -up evolution-3.11.2/plugins/email-custom-header/email-custom-header.c.help #undef EMAIL_CUSTOM_HEADER return (priv->page -diff -up evolution-3.11.2/shell/e-shell-window-actions.c.help-contents evolution-3.11.2/shell/e-shell-window-actions.c ---- evolution-3.11.2/shell/e-shell-window-actions.c.help-contents 2013-10-30 23:08:15.000000000 +0100 -+++ evolution-3.11.2/shell/e-shell-window-actions.c 2013-11-18 11:09:00.376861447 +0100 -@@ -1414,6 +1414,11 @@ e_shell_window_actions_init (EShellWindo +diff -up evolution-3.11.4/shell/e-shell-window-actions.c.help-contents evolution-3.11.4/shell/e-shell-window-actions.c +--- evolution-3.11.4/shell/e-shell-window-actions.c.help-contents 2014-01-07 23:08:55.000000000 +0100 ++++ evolution-3.11.4/shell/e-shell-window-actions.c 2014-01-13 08:31:03.317822806 +0100 +@@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); diff --git a/evolution.spec b/evolution.spec index 1be7d3c..746ac27 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,8 +33,8 @@ ### Abstract ### Name: evolution -Version: 3.11.2 -Release: 2%{?dist} +Version: 3.11.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -58,6 +58,7 @@ Patch02: evolution-2.30.1-help-contents.patch Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs +Requires: gtkspell3 Requires: highlight ### Build Dependencies ### @@ -80,6 +81,7 @@ BuildRequires: gnutls-devel BuildRequires: gtk-doc BuildRequires: gtk3-devel >= %{gtk3_version} BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} +BuildRequires: gtkspell3-devel BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} BuildRequires: itstool @@ -132,6 +134,7 @@ Requires: %{name} = %{version}-%{release} Requires: evolution-data-server-devel >= %{version} Requires: gtk3-devel >= %{gtk3_version} Requires: gtkhtml3-devel >= %{gtkhtml_version} +Requires: gtkspell3-devel Requires: libgdata-devel >= %{libgdata_version} Requires: libgweather-devel >= %{libgweather_version} Requires: libsoup-devel >= %{libsoup_version} @@ -547,6 +550,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jan 13 2014 Milan Crha - 3.11.4-1 +- Update to 3.11.4 + * Thu Nov 21 2013 Milan Crha - 3.11.2-2 - Rebuild for new libical (RH bug #1023020) diff --git a/sources b/sources index 20d3c63..18c798b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c47d39795ff43dc13a7a2915e371f533 evolution-3.11.2.tar.xz +73e630eda6052130a0a6d6bc36bcb7f4 evolution-3.11.4.tar.xz From 2a8ac2178cacb9a0bca6328850f6c0b02a32d55e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Jan 2014 12:09:25 +0100 Subject: [PATCH 540/844] module-audio-inline was finally dropped, replaced by WebKit's UI --- evolution.spec | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/evolution.spec b/evolution.spec index 746ac27..21fe6d7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -19,7 +19,6 @@ %define last_libgal2_version 2:2.5.3-2 %define last_evo_nm_version 3.5.0 -%define inline_audio_support 1 %define ldap_support 1 %define libnotify_support 1 %define libpst_support 1 @@ -98,10 +97,6 @@ BuildRequires: pkgconfig BuildRequires: webkitgtk3-devel >= %{webkit_version} BuildRequires: yelp-tools -%if %{inline_audio_support} -BuildRequires: gstreamer1-devel -%endif - %if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 %endif @@ -312,11 +307,6 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; -# remove additional things we don't want -%if ! %{inline_audio_support} -%{__rm} -f $RPM_BUILD_ROOT%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so -%endif - %find_lang evolution-%{evo_base_version} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang @@ -426,10 +416,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so %{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so -%if %{inline_audio_support} -%{_libdir}/evolution/%{evo_base_version}/modules/module-audio-inline.so -%endif - # Shared libraries: %{_libdir}/evolution/%{evo_base_version}/libevolution-mail-composer.so %{_libdir}/evolution/%{evo_base_version}/libeabutil.so From 0fc190307948b99613573e01264e28b9ac521097 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Fri, 17 Jan 2014 09:28:54 -0800 Subject: [PATCH 541/844] backport a couple of crash fixes --- evolution-3.11.4-attachment_crash.patch | 37 ++++++++++++++++++++++ evolution-3.11.4-gsettings_crash.patch | 42 +++++++++++++++++++++++++ evolution.spec | 13 +++++++- 3 files changed, 91 insertions(+), 1 deletion(-) create mode 100644 evolution-3.11.4-attachment_crash.patch create mode 100644 evolution-3.11.4-gsettings_crash.patch diff --git a/evolution-3.11.4-attachment_crash.patch b/evolution-3.11.4-attachment_crash.patch new file mode 100644 index 0000000..373ff5f --- /dev/null +++ b/evolution-3.11.4-attachment_crash.patch @@ -0,0 +1,37 @@ +From d64150ab966cfd9d661aa06999573fe42fe2671e Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Fri, 17 Jan 2014 15:24:42 +0000 +Subject: Bug #702958 - Crash on attachment add or remove + +--- +diff --git a/e-util/e-attachment.c b/e-util/e-attachment.c +index ea4f39c..8230eab 100644 +--- a/e-util/e-attachment.c ++++ b/e-util/e-attachment.c +@@ -334,6 +334,9 @@ attachment_update_icon_column_idle_cb (gpointer weak_ref) + + if (file_info != NULL) { + icon = g_file_info_get_icon (file_info); ++ /* add the reference here, thus the create_system_thumbnail() can unref the *icon. */ ++ if (icon) ++ g_object_ref (icon); + thumbnail_path = g_file_info_get_attribute_byte_string ( + file_info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH); + } +@@ -351,11 +354,11 @@ attachment_update_icon_column_idle_cb (gpointer weak_ref) + /* Nothing to do, just use the icon. */ + + /* Else use the standard icon for the content type. */ +- } else if (icon != NULL) +- g_object_ref (icon); ++ } else if (icon != NULL) { ++ /* Nothing to do, just use the already reffed icon. */ + + /* Last ditch fallback. (GFileInfo not yet loaded?) */ +- else ++ } else + icon = g_themed_icon_new (DEFAULT_ICON_NAME); + + /* Pick an emblem, limit one. Choices listed by priority. */ +-- +cgit v0.9.2 diff --git a/evolution-3.11.4-gsettings_crash.patch b/evolution-3.11.4-gsettings_crash.patch new file mode 100644 index 0000000..53d2c47 --- /dev/null +++ b/evolution-3.11.4-gsettings_crash.patch @@ -0,0 +1,42 @@ +From 5a89422182cc9e5e75af808beef19479bab6e9de Mon Sep 17 00:00:00 2001 +From: Matthew Barnes +Date: Fri, 17 Jan 2014 02:09:20 +0000 +Subject: Prevent GSettings from freaking out over a missing junk filter. + +Boy does GSettings like to abort applications! The default value for +the 'junk-default-plugin' key is 'Bogofilter' but if the key's mapping +function cannot find Evolution's Bogofilter integration module (it is +optional after all, so may not be installed), then indicating failure +will make GSettings abort Evolution. So always indicate success. +--- +diff --git a/modules/settings/e-settings-mail-session.c b/modules/settings/e-settings-mail-session.c +index 4665731..188e325 100644 +--- a/modules/settings/e-settings-mail-session.c ++++ b/modules/settings/e-settings-mail-session.c +@@ -38,7 +38,6 @@ settings_mail_session_name_to_junk_filter (GValue *value, + gpointer user_data) + { + const gchar *filter_name; +- gboolean success = FALSE; + + filter_name = g_variant_get_string (variant, NULL); + +@@ -48,10 +47,14 @@ settings_mail_session_name_to_junk_filter (GValue *value, + junk_filter = e_mail_session_get_junk_filter_by_name ( + E_MAIL_SESSION (user_data), filter_name); + g_value_set_object (value, junk_filter); +- success = (junk_filter != NULL); + } + +- return success; ++ /* XXX Always return success, even if we cannot find a matching ++ * EMailJunkFilter. The default value is 'Bogofilter', but ++ * if the Bogofilter module is not installed then GSettings ++ * will actually abort the program. Nice. */ ++ ++ return TRUE; + } + + static GVariant * +-- +cgit v0.9.2 diff --git a/evolution.spec b/evolution.spec index 21fe6d7..5baf79c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,7 +33,7 @@ Name: evolution Version: 3.11.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -53,6 +53,12 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# Upstream 5a89422182, crashes if bogofilter is not present +Patch03: evolution-3.11.4-gsettings_crash.patch + +# Upstream d64150ab96, crashes on attachment add/remove +Patch04: evolution-3.11.4-attachment_crash.patch + ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -204,6 +210,8 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .gsettings_crash +%patch04 -p1 -b .attachment_crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -536,6 +544,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Fri Jan 17 2014 Adam Williamson - 3.11.4-2 +- backport a couple of crasher fixes from upstream master + * Mon Jan 13 2014 Milan Crha - 3.11.4-1 - Update to 3.11.4 From 46f37563a2a7af3fe4f30f5a44fc753bbee20af2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Feb 2014 09:20:41 +0100 Subject: [PATCH 542/844] Update to 3.11.5 --- .gitignore | 1 + evolution-3.11.4-attachment_crash.patch | 37 ---------------------- evolution-3.11.4-gsettings_crash.patch | 42 ------------------------- evolution.spec | 15 +++------ sources | 2 +- 5 files changed, 7 insertions(+), 90 deletions(-) delete mode 100644 evolution-3.11.4-attachment_crash.patch delete mode 100644 evolution-3.11.4-gsettings_crash.patch diff --git a/.gitignore b/.gitignore index f87880e..afef607 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.1.tar.xz /evolution-3.11.2.tar.xz /evolution-3.11.4.tar.xz +/evolution-3.11.5.tar.xz diff --git a/evolution-3.11.4-attachment_crash.patch b/evolution-3.11.4-attachment_crash.patch deleted file mode 100644 index 373ff5f..0000000 --- a/evolution-3.11.4-attachment_crash.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d64150ab966cfd9d661aa06999573fe42fe2671e Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Fri, 17 Jan 2014 15:24:42 +0000 -Subject: Bug #702958 - Crash on attachment add or remove - ---- -diff --git a/e-util/e-attachment.c b/e-util/e-attachment.c -index ea4f39c..8230eab 100644 ---- a/e-util/e-attachment.c -+++ b/e-util/e-attachment.c -@@ -334,6 +334,9 @@ attachment_update_icon_column_idle_cb (gpointer weak_ref) - - if (file_info != NULL) { - icon = g_file_info_get_icon (file_info); -+ /* add the reference here, thus the create_system_thumbnail() can unref the *icon. */ -+ if (icon) -+ g_object_ref (icon); - thumbnail_path = g_file_info_get_attribute_byte_string ( - file_info, G_FILE_ATTRIBUTE_THUMBNAIL_PATH); - } -@@ -351,11 +354,11 @@ attachment_update_icon_column_idle_cb (gpointer weak_ref) - /* Nothing to do, just use the icon. */ - - /* Else use the standard icon for the content type. */ -- } else if (icon != NULL) -- g_object_ref (icon); -+ } else if (icon != NULL) { -+ /* Nothing to do, just use the already reffed icon. */ - - /* Last ditch fallback. (GFileInfo not yet loaded?) */ -- else -+ } else - icon = g_themed_icon_new (DEFAULT_ICON_NAME); - - /* Pick an emblem, limit one. Choices listed by priority. */ --- -cgit v0.9.2 diff --git a/evolution-3.11.4-gsettings_crash.patch b/evolution-3.11.4-gsettings_crash.patch deleted file mode 100644 index 53d2c47..0000000 --- a/evolution-3.11.4-gsettings_crash.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 5a89422182cc9e5e75af808beef19479bab6e9de Mon Sep 17 00:00:00 2001 -From: Matthew Barnes -Date: Fri, 17 Jan 2014 02:09:20 +0000 -Subject: Prevent GSettings from freaking out over a missing junk filter. - -Boy does GSettings like to abort applications! The default value for -the 'junk-default-plugin' key is 'Bogofilter' but if the key's mapping -function cannot find Evolution's Bogofilter integration module (it is -optional after all, so may not be installed), then indicating failure -will make GSettings abort Evolution. So always indicate success. ---- -diff --git a/modules/settings/e-settings-mail-session.c b/modules/settings/e-settings-mail-session.c -index 4665731..188e325 100644 ---- a/modules/settings/e-settings-mail-session.c -+++ b/modules/settings/e-settings-mail-session.c -@@ -38,7 +38,6 @@ settings_mail_session_name_to_junk_filter (GValue *value, - gpointer user_data) - { - const gchar *filter_name; -- gboolean success = FALSE; - - filter_name = g_variant_get_string (variant, NULL); - -@@ -48,10 +47,14 @@ settings_mail_session_name_to_junk_filter (GValue *value, - junk_filter = e_mail_session_get_junk_filter_by_name ( - E_MAIL_SESSION (user_data), filter_name); - g_value_set_object (value, junk_filter); -- success = (junk_filter != NULL); - } - -- return success; -+ /* XXX Always return success, even if we cannot find a matching -+ * EMailJunkFilter. The default value is 'Bogofilter', but -+ * if the Bogofilter module is not installed then GSettings -+ * will actually abort the program. Nice. */ -+ -+ return TRUE; - } - - static GVariant * --- -cgit v0.9.2 diff --git a/evolution.spec b/evolution.spec index 5baf79c..7b5df6f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -32,8 +32,8 @@ ### Abstract ### Name: evolution -Version: 3.11.4 -Release: 2%{?dist} +Version: 3.11.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -53,12 +53,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# Upstream 5a89422182, crashes if bogofilter is not present -Patch03: evolution-3.11.4-gsettings_crash.patch - -# Upstream d64150ab96, crashes on attachment add/remove -Patch04: evolution-3.11.4-attachment_crash.patch - ## Dependencies ### Requires: gnome-icon-theme >= %{gnome_icon_theme_version} @@ -210,8 +204,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .gsettings_crash -%patch04 -p1 -b .attachment_crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -544,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 03 2014 Milan Crha - 3.11.5-1 +- Update to 3.11.5 + * Fri Jan 17 2014 Adam Williamson - 3.11.4-2 - backport a couple of crasher fixes from upstream master diff --git a/sources b/sources index 18c798b..7a40630 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -73e630eda6052130a0a6d6bc36bcb7f4 evolution-3.11.4.tar.xz +d42aef65bbc7418f7c73b4c1916d399d evolution-3.11.5.tar.xz From 0b4cc22c517be6a8be3b8d198407545f4f9aad61 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Feb 2014 12:55:34 +0100 Subject: [PATCH 543/844] Drop krb5 dependency --- evolution.spec | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/evolution.spec b/evolution.spec index 7b5df6f..00dbfdf 100644 --- a/evolution.spec +++ b/evolution.spec @@ -22,7 +22,6 @@ %define ldap_support 1 %define libnotify_support 1 %define libpst_support 1 -%define krb5_support 1 # Coverity scan can override this to 0, to skip checking in gtk-doc generated code %{!?with_docs: %define with_docs 1} @@ -33,7 +32,7 @@ Name: evolution Version: 3.11.5 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -101,13 +100,6 @@ BuildRequires: yelp-tools BuildRequires: openldap-devel >= 2.0.11 %endif -%if %{krb5_support} -BuildRequires: krb5-devel -# tweak for krb5 1.2 vs 1.3 -%define krb5dir /usr/kerberos -#define krb5dir `pwd`/krb5-fakeprefix -%endif - %if %{libnotify_support} BuildRequires: libnotify-devel %endif @@ -205,10 +197,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -mkdir -p krb5-fakeprefix/include -mkdir -p krb5-fakeprefix/lib -mkdir -p krb5-fakeprefix/%{_lib} - # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do echo -n "" > $inbox @@ -222,12 +210,6 @@ done %define ldap_flags --without-openldap %endif -%if %{krb5_support} -%define krb5_flags --with-krb5=%{krb5dir} -%else -%define krb5_flags --without-krb5 -%endif - %define ssl_flags --enable-nss=yes --enable-smime=yes if ! pkg-config --exists nss; then @@ -255,7 +237,7 @@ autoconf %configure \ --disable-maintainer-mode \ --with-sub-version=" (%{version}-%{release})" \ - %ldap_flags %krb5_flags %ssl_flags %gtkdoc_flags \ + %ldap_flags %ssl_flags %gtkdoc_flags \ --enable-plugins=all export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" @@ -536,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 03 2014 Milan Crha - 3.11.5-2 +- Drop krb5 dependency + * Mon Feb 03 2014 Milan Crha - 3.11.5-1 - Update to 3.11.5 From 00c8f531f5b9b8462d63f1d86a46c3d79ced4f2d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Feb 2014 09:19:15 +0100 Subject: [PATCH 544/844] Update to 3.11.90 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 68 ++++++++++++---------------- evolution.spec | 9 ++-- sources | 2 +- 4 files changed, 38 insertions(+), 42 deletions(-) diff --git a/.gitignore b/.gitignore index afef607..a4ca67b 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.2.tar.xz /evolution-3.11.4.tar.xz /evolution-3.11.5.tar.xz +/evolution-3.11.90.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index ed6ba6c..b3750f5 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ -diff -up evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-01-13 08:31:03.314822806 +0100 -+++ evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c 2014-01-13 08:32:38.787818761 +0100 -@@ -4282,6 +4282,11 @@ e_contact_editor_init (EContactEditor *e +diff -up evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-02-16 15:11:01.000000000 +0100 ++++ evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c 2014-02-17 09:11:15.407454286 +0100 +@@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); @@ -13,9 +13,9 @@ diff -up evolution-3.11.4/addressbook/gui/contact-editor/e-contact-editor.c.help widget = e_builder_get_widget ( e_contact_editor->priv->builder, "button-web-expand"); g_signal_connect_swapped ( -diff -up evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.4/calendar/gui/dialogs/comp-editor.c ---- evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents 2014-01-13 00:02:51.000000000 +0100 -+++ evolution-3.11.4/calendar/gui/dialogs/comp-editor.c 2014-01-13 08:31:03.315822806 +0100 +diff -up evolution-3.11.90/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.90/calendar/gui/dialogs/comp-editor.c +--- evolution-3.11.90/calendar/gui/dialogs/comp-editor.c.help-contents 2014-02-16 15:11:01.000000000 +0100 ++++ evolution-3.11.90/calendar/gui/dialogs/comp-editor.c 2014-02-17 09:11:15.408454286 +0100 @@ -2169,6 +2169,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,10 +29,10 @@ diff -up evolution-3.11.4/calendar/gui/dialogs/comp-editor.c.help-contents evolu action_group = gtk_action_group_new ("individual"); gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); -diff -up evolution-3.11.4/e-util/e-misc-utils.c.help-contents evolution-3.11.4/e-util/e-misc-utils.c ---- evolution-3.11.4/e-util/e-misc-utils.c.help-contents 2014-01-07 22:05:51.000000000 +0100 -+++ evolution-3.11.4/e-util/e-misc-utils.c 2014-01-13 08:31:03.315822806 +0100 -@@ -2098,3 +2098,20 @@ e_binding_transform_uid_to_source (GBind +diff -up evolution-3.11.90/e-util/e-misc-utils.c.help-contents evolution-3.11.90/e-util/e-misc-utils.c +--- evolution-3.11.90/e-util/e-misc-utils.c.help-contents 2014-02-11 14:39:16.000000000 +0100 ++++ evolution-3.11.90/e-util/e-misc-utils.c 2014-02-17 09:11:15.408454286 +0100 +@@ -2102,3 +2102,20 @@ e_binding_transform_uid_to_source (GBind return success; } @@ -53,9 +53,9 @@ diff -up evolution-3.11.4/e-util/e-misc-utils.c.help-contents evolution-3.11.4/e + + return is_installed; +} -diff -up evolution-3.11.4/e-util/e-misc-utils.h.help-contents evolution-3.11.4/e-util/e-misc-utils.h ---- evolution-3.11.4/e-util/e-misc-utils.h.help-contents 2014-01-07 22:05:51.000000000 +0100 -+++ evolution-3.11.4/e-util/e-misc-utils.h 2014-01-13 08:31:03.316822806 +0100 +diff -up evolution-3.11.90/e-util/e-misc-utils.h.help-contents evolution-3.11.90/e-util/e-misc-utils.h +--- evolution-3.11.90/e-util/e-misc-utils.h.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.90/e-util/e-misc-utils.h 2014-02-17 09:11:15.408454286 +0100 @@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); @@ -65,10 +65,10 @@ diff -up evolution-3.11.4/e-util/e-misc-utils.h.help-contents evolution-3.11.4/e G_END_DECLS #endif /* E_MISC_UTILS_H */ -diff -up evolution-3.11.4/e-util/e-preferences-window.c.help-contents evolution-3.11.4/e-util/e-preferences-window.c ---- evolution-3.11.4/e-util/e-preferences-window.c.help-contents 2014-01-07 22:05:51.000000000 +0100 -+++ evolution-3.11.4/e-util/e-preferences-window.c 2014-01-13 08:31:03.316822806 +0100 -@@ -384,6 +384,11 @@ e_preferences_window_init (EPreferencesW +diff -up evolution-3.11.90/e-util/e-preferences-window.c.help-contents evolution-3.11.90/e-util/e-preferences-window.c +--- evolution-3.11.90/e-util/e-preferences-window.c.help-contents 2014-02-17 09:11:15.408454286 +0100 ++++ evolution-3.11.90/e-util/e-preferences-window.c 2014-02-17 09:14:41.257445705 +0100 +@@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -77,12 +77,12 @@ diff -up evolution-3.11.4/e-util/e-preferences-window.c.help-contents evolution- + gtk_widget_hide (widget); + } + - widget = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + widget = e_dialog_button_new_with_icon ("window-close", _("_Close")); g_signal_connect_swapped ( widget, "clicked", -diff -up evolution-3.11.4/e-util/e-send-options.c.help-contents evolution-3.11.4/e-util/e-send-options.c ---- evolution-3.11.4/e-util/e-send-options.c.help-contents 2014-01-07 22:05:51.000000000 +0100 -+++ evolution-3.11.4/e-util/e-send-options.c 2014-01-13 08:31:03.316822806 +0100 +diff -up evolution-3.11.90/e-util/e-send-options.c.help-contents evolution-3.11.90/e-util/e-send-options.c +--- evolution-3.11.90/e-util/e-send-options.c.help-contents 2014-01-07 22:05:51.000000000 +0100 ++++ evolution-3.11.90/e-util/e-send-options.c 2014-02-17 09:11:15.408454286 +0100 @@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; @@ -104,18 +104,10 @@ diff -up evolution-3.11.4/e-util/e-send-options.c.help-contents evolution-3.11.4 return (priv->priority && priv->security && priv->status -diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.4/plugins/email-custom-header/email-custom-header.c ---- evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help-contents 2014-01-07 22:05:51.000000000 +0100 -+++ evolution-3.11.4/plugins/email-custom-header/email-custom-header.c 2014-01-13 08:31:03.316822806 +0100 -@@ -26,6 +26,7 @@ - #include - #include - -+#include "e-util/e-util.h" - #include "mail/em-utils.h" - #include "mail/em-event.h" - #include "composer/e-msg-composer.h" -@@ -116,6 +117,8 @@ static gboolean +diff -up evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.90/plugins/email-custom-header/email-custom-header.c +--- evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.help-contents 2014-02-16 15:11:01.000000000 +0100 ++++ evolution-3.11.90/plugins/email-custom-header/email-custom-header.c 2014-02-17 09:11:15.409454286 +0100 +@@ -118,6 +118,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { CustomHeaderOptionsDialogPrivate *priv; @@ -124,7 +116,7 @@ diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help priv = mch->priv; #define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name) -@@ -126,6 +129,13 @@ epech_get_widgets (CustomHeaderOptionsDi +@@ -128,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); @@ -138,9 +130,9 @@ diff -up evolution-3.11.4/plugins/email-custom-header/email-custom-header.c.help #undef EMAIL_CUSTOM_HEADER return (priv->page -diff -up evolution-3.11.4/shell/e-shell-window-actions.c.help-contents evolution-3.11.4/shell/e-shell-window-actions.c ---- evolution-3.11.4/shell/e-shell-window-actions.c.help-contents 2014-01-07 23:08:55.000000000 +0100 -+++ evolution-3.11.4/shell/e-shell-window-actions.c 2014-01-13 08:31:03.317822806 +0100 +diff -up evolution-3.11.90/shell/e-shell-window-actions.c.help-contents evolution-3.11.90/shell/e-shell-window-actions.c +--- evolution-3.11.90/shell/e-shell-window-actions.c.help-contents 2014-02-16 15:11:01.000000000 +0100 ++++ evolution-3.11.90/shell/e-shell-window-actions.c 2014-02-17 09:11:15.409454286 +0100 @@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); diff --git a/evolution.spec b/evolution.spec index 00dbfdf..6d1b7f6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,12 +31,12 @@ ### Abstract ### Name: evolution -Version: 3.11.5 -Release: 2%{?dist} +Version: 3.11.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL -URL: http://projects.gnome.org/evolution/ +URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Source: http://download.gnome.org/sources/%{name}/3.11/%{name}-%{version}.tar.xz @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Feb 17 2014 Milan Crha - 3.11.90-1 +- Update to 3.11.90 + * Mon Feb 03 2014 Milan Crha - 3.11.5-2 - Drop krb5 dependency diff --git a/sources b/sources index 7a40630..c853713 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d42aef65bbc7418f7c73b4c1916d399d evolution-3.11.5.tar.xz +837ffcf62b070cd9e9104bb4266a5c29 evolution-3.11.90.tar.xz From 850b75f8004899c3b4151fd9a9195692a6dde616 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 19 Feb 2014 21:06:35 +0100 Subject: [PATCH 545/844] Rebuilt for libgnome-desktop soname bump --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 6d1b7f6..1b82b8d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -32,7 +32,7 @@ Name: evolution Version: 3.11.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Feb 19 2014 Kalev Lember - 3.11.90-2 +- Rebuilt for libgnome-desktop soname bump + * Mon Feb 17 2014 Milan Crha - 3.11.90-1 - Update to 3.11.90 From c0178dddd07263f77fe3821a35fdd2501fcf344b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Mar 2014 13:40:44 +0100 Subject: [PATCH 546/844] Update to 3.11.91 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 52 ++++++++++++++-------------- evolution.spec | 7 ++-- sources | 2 +- 4 files changed, 33 insertions(+), 29 deletions(-) diff --git a/.gitignore b/.gitignore index a4ca67b..45839b7 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.4.tar.xz /evolution-3.11.5.tar.xz /evolution-3.11.90.tar.xz +/evolution-3.11.91.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index b3750f5..a466d32 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,6 +1,6 @@ -diff -up evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-02-16 15:11:01.000000000 +0100 -+++ evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c 2014-02-17 09:11:15.407454286 +0100 +diff -up evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c 2014-03-03 13:37:40.924928474 +0100 @@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", @@ -13,10 +13,10 @@ diff -up evolution-3.11.90/addressbook/gui/contact-editor/e-contact-editor.c.hel widget = e_builder_get_widget ( e_contact_editor->priv->builder, "button-web-expand"); g_signal_connect_swapped ( -diff -up evolution-3.11.90/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.90/calendar/gui/dialogs/comp-editor.c ---- evolution-3.11.90/calendar/gui/dialogs/comp-editor.c.help-contents 2014-02-16 15:11:01.000000000 +0100 -+++ evolution-3.11.90/calendar/gui/dialogs/comp-editor.c 2014-02-17 09:11:15.408454286 +0100 -@@ -2169,6 +2169,12 @@ comp_editor_init (CompEditor *editor) +diff -up evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.91/calendar/gui/dialogs/comp-editor.c +--- evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/calendar/gui/dialogs/comp-editor.c 2014-03-03 13:37:40.924928474 +0100 +@@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,9 +29,9 @@ diff -up evolution-3.11.90/calendar/gui/dialogs/comp-editor.c.help-contents evol action_group = gtk_action_group_new ("individual"); gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); -diff -up evolution-3.11.90/e-util/e-misc-utils.c.help-contents evolution-3.11.90/e-util/e-misc-utils.c ---- evolution-3.11.90/e-util/e-misc-utils.c.help-contents 2014-02-11 14:39:16.000000000 +0100 -+++ evolution-3.11.90/e-util/e-misc-utils.c 2014-02-17 09:11:15.408454286 +0100 +diff -up evolution-3.11.91/e-util/e-misc-utils.c.help-contents evolution-3.11.91/e-util/e-misc-utils.c +--- evolution-3.11.91/e-util/e-misc-utils.c.help-contents 2014-02-11 14:39:16.000000000 +0100 ++++ evolution-3.11.91/e-util/e-misc-utils.c 2014-03-03 13:37:40.925928474 +0100 @@ -2102,3 +2102,20 @@ e_binding_transform_uid_to_source (GBind return success; @@ -53,9 +53,9 @@ diff -up evolution-3.11.90/e-util/e-misc-utils.c.help-contents evolution-3.11.90 + + return is_installed; +} -diff -up evolution-3.11.90/e-util/e-misc-utils.h.help-contents evolution-3.11.90/e-util/e-misc-utils.h ---- evolution-3.11.90/e-util/e-misc-utils.h.help-contents 2014-01-07 22:05:51.000000000 +0100 -+++ evolution-3.11.90/e-util/e-misc-utils.h 2014-02-17 09:11:15.408454286 +0100 +diff -up evolution-3.11.91/e-util/e-misc-utils.h.help-contents evolution-3.11.91/e-util/e-misc-utils.h +--- evolution-3.11.91/e-util/e-misc-utils.h.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/e-util/e-misc-utils.h 2014-03-03 13:37:40.925928474 +0100 @@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); @@ -65,9 +65,9 @@ diff -up evolution-3.11.90/e-util/e-misc-utils.h.help-contents evolution-3.11.90 G_END_DECLS #endif /* E_MISC_UTILS_H */ -diff -up evolution-3.11.90/e-util/e-preferences-window.c.help-contents evolution-3.11.90/e-util/e-preferences-window.c ---- evolution-3.11.90/e-util/e-preferences-window.c.help-contents 2014-02-17 09:11:15.408454286 +0100 -+++ evolution-3.11.90/e-util/e-preferences-window.c 2014-02-17 09:14:41.257445705 +0100 +diff -up evolution-3.11.91/e-util/e-preferences-window.c.help-contents evolution-3.11.91/e-util/e-preferences-window.c +--- evolution-3.11.91/e-util/e-preferences-window.c.help-contents 2014-02-16 15:11:01.000000000 +0100 ++++ evolution-3.11.91/e-util/e-preferences-window.c 2014-03-03 13:37:40.925928474 +0100 @@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -80,9 +80,9 @@ diff -up evolution-3.11.90/e-util/e-preferences-window.c.help-contents evolution widget = e_dialog_button_new_with_icon ("window-close", _("_Close")); g_signal_connect_swapped ( widget, "clicked", -diff -up evolution-3.11.90/e-util/e-send-options.c.help-contents evolution-3.11.90/e-util/e-send-options.c ---- evolution-3.11.90/e-util/e-send-options.c.help-contents 2014-01-07 22:05:51.000000000 +0100 -+++ evolution-3.11.90/e-util/e-send-options.c 2014-02-17 09:11:15.408454286 +0100 +diff -up evolution-3.11.91/e-util/e-send-options.c.help-contents evolution-3.11.91/e-util/e-send-options.c +--- evolution-3.11.91/e-util/e-send-options.c.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/e-util/e-send-options.c 2014-03-03 13:37:40.925928474 +0100 @@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; @@ -104,9 +104,9 @@ diff -up evolution-3.11.90/e-util/e-send-options.c.help-contents evolution-3.11. return (priv->priority && priv->security && priv->status -diff -up evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.90/plugins/email-custom-header/email-custom-header.c ---- evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.help-contents 2014-02-16 15:11:01.000000000 +0100 -+++ evolution-3.11.90/plugins/email-custom-header/email-custom-header.c 2014-02-17 09:11:15.409454286 +0100 +diff -up evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.91/plugins/email-custom-header/email-custom-header.c +--- evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-03 01:37:23.000000000 +0100 ++++ evolution-3.11.91/plugins/email-custom-header/email-custom-header.c 2014-03-03 13:39:03.723924965 +0100 @@ -118,6 +118,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { @@ -118,7 +118,7 @@ diff -up evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.hel #define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name) @@ -128,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi - priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); + priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); + + helpbutton = EMAIL_CUSTOM_HEADER ("helpbutton1"); @@ -130,9 +130,9 @@ diff -up evolution-3.11.90/plugins/email-custom-header/email-custom-header.c.hel #undef EMAIL_CUSTOM_HEADER return (priv->page -diff -up evolution-3.11.90/shell/e-shell-window-actions.c.help-contents evolution-3.11.90/shell/e-shell-window-actions.c ---- evolution-3.11.90/shell/e-shell-window-actions.c.help-contents 2014-02-16 15:11:01.000000000 +0100 -+++ evolution-3.11.90/shell/e-shell-window-actions.c 2014-02-17 09:11:15.409454286 +0100 +diff -up evolution-3.11.91/shell/e-shell-window-actions.c.help-contents evolution-3.11.91/shell/e-shell-window-actions.c +--- evolution-3.11.91/shell/e-shell-window-actions.c.help-contents 2014-02-17 15:53:16.000000000 +0100 ++++ evolution-3.11.91/shell/e-shell-window-actions.c 2014-03-03 13:37:40.926928474 +0100 @@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); diff --git a/evolution.spec b/evolution.spec index 1b82b8d..6062392 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,8 +31,8 @@ ### Abstract ### Name: evolution -Version: 3.11.90 -Release: 2%{?dist} +Version: 3.11.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 03 2014 Milan Crha - 3.11.91-1 +- Update to 3.11.91 + * Wed Feb 19 2014 Kalev Lember - 3.11.90-2 - Rebuilt for libgnome-desktop soname bump diff --git a/sources b/sources index c853713..e0f1d8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -837ffcf62b070cd9e9104bb4266a5c29 evolution-3.11.90.tar.xz +a26a512b2f48597f4679dba42b6498de evolution-3.11.91.tar.xz From 62342c1498ec651b3b1d775fc2d9b86a155586f1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Mar 2014 15:56:03 +0100 Subject: [PATCH 547/844] evolution-plugin-3.0.pc is gone --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 6062392..0073de0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -480,7 +480,6 @@ rm -rf $RPM_BUILD_ROOT %{_includedir}/evolution-%{evo_base_version} %{_libdir}/pkgconfig/evolution-calendar-3.0.pc %{_libdir}/pkgconfig/evolution-mail-3.0.pc -%{_libdir}/pkgconfig/evolution-plugin-3.0.pc %{_libdir}/pkgconfig/evolution-shell-3.0.pc %{_libdir}/pkgconfig/libemail-engine.pc From 39978d2e9e3d047e02f080ecc3bb061e737f7da6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 12 Mar 2014 12:17:51 +0100 Subject: [PATCH 548/844] Use pkgconfig() notations in [Build]Requires where applicable --- evolution.spec | 76 +++++++++++++++++++++++++++++--------------------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/evolution.spec b/evolution.spec index 0073de0..523aac8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,7 +10,6 @@ %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 %define libsoup_version 2.40.3 -%define clutter_gtk_version 0.10 %define webkit_version 1.8.0 %define evo_base_version 3.12 @@ -61,51 +60,59 @@ Requires: highlight ### Build Dependencies ### -BuildRequires: atk-devel BuildRequires: autoconf >= 2.59 BuildRequires: automake >= 1.9 -BuildRequires: cairo-gobject-devel -BuildRequires: clutter-gtk-devel >= %{clutter_gtk_version} BuildRequires: desktop-file-utils -BuildRequires: evolution-data-server-devel >= %{version} BuildRequires: gettext -BuildRequires: glib2-devel >= %{glib2_version} BuildRequires: gnome-common -BuildRequires: gnome-desktop3-devel >= %{gnome_desktop_version} BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} -BuildRequires: gnome-icon-theme-devel >= %{gnome_icon_theme_version} -BuildRequires: gnome-online-accounts -BuildRequires: gnutls-devel BuildRequires: gtk-doc -BuildRequires: gtk3-devel >= %{gtk3_version} -BuildRequires: gtkhtml3-devel >= %{gtkhtml_version} -BuildRequires: gtkspell3-devel BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} BuildRequires: itstool -BuildRequires: libcanberra-devel -BuildRequires: libgdata-devel >= %{libgdata_version} -BuildRequires: libgweather-devel >= %{libgweather_version} -BuildRequires: libpst-devel -BuildRequires: libsoup-devel >= %{libsoup_version} BuildRequires: libtool >= 1.5 -BuildRequires: libxml2-devel -BuildRequires: nspr-devel -BuildRequires: nss-devel BuildRequires: pkgconfig -BuildRequires: webkitgtk3-devel >= %{webkit_version} BuildRequires: yelp-tools +BuildRequires: pkgconfig(atk) +BuildRequires: pkgconfig(cairo-gobject) +BuildRequires: pkgconfig(camel-1.2) >= %{version} +BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gcr-3) +BuildRequires: pkgconfig(gdk-pixbuf-2.0) +BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} +BuildRequires: pkgconfig(gnome-icon-theme) >= %{gnome_icon_theme_version} +BuildRequires: pkgconfig(gsettings-desktop-schemas) +BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +BuildRequires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version} +BuildRequires: pkgconfig(gtkspell3-3.0) +BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version} +BuildRequires: pkgconfig(libcanberra-gtk3) +BuildRequires: pkgconfig(libebackend-1.2) >= %{version} +BuildRequires: pkgconfig(libebook-1.2) >= %{version} +BuildRequires: pkgconfig(libecal-1.2) >= %{version} +BuildRequires: pkgconfig(libedataserver-1.2) >= %{version} +BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} +BuildRequires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version} +BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} +BuildRequires: pkgconfig(libxml-2.0) +BuildRequires: pkgconfig(nspr) +BuildRequires: pkgconfig(nss) +BuildRequires: pkgconfig(shared-mime-info) +BuildRequires: pkgconfig(webkitgtk-3.0) >= %{webkit_version} + %if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 %endif %if %{libnotify_support} -BuildRequires: libnotify-devel +BuildRequires: pkgconfig(libnotify) %endif %if %{libpst_support} -BuildRequires: libpst-devel +BuildRequires: pkgconfig(libpst) %endif %description @@ -118,14 +125,19 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: evolution-data-server-devel >= %{version} -Requires: gtk3-devel >= %{gtk3_version} -Requires: gtkhtml3-devel >= %{gtkhtml_version} -Requires: gtkspell3-devel -Requires: libgdata-devel >= %{libgdata_version} -Requires: libgweather-devel >= %{libgweather_version} -Requires: libsoup-devel >= %{libsoup_version} -Requires: libxml2-devel +Requires: pkgconfig(camel-1.2) >= %{version} +Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} +Requires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version} +Requires: pkgconfig(gtkspell3-3.0) +Requires: pkgconfig(gweather-3.0) >= %{libgweather_version} +Requires: pkgconfig(libebackend-1.2) >= %{version} +Requires: pkgconfig(libebook-1.2) >= %{version} +Requires: pkgconfig(libecal-1.2) >= %{version} +Requires: pkgconfig(libedataserver-1.2) >= %{version} +Requires: pkgconfig(libgdata) >= %{libgdata_version} +Requires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version} +Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version} +Requires: pkgconfig(libxml-2.0) Obsoletes: libgal2-devel <= %{last_libgal2_version} %description devel From 75d69c823e367458c7fd9c809c3d8c6663fff414 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Mar 2014 08:09:52 +0100 Subject: [PATCH 549/844] Update to 3.11.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 45839b7..e6a651b 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.5.tar.xz /evolution-3.11.90.tar.xz /evolution-3.11.91.tar.xz +/evolution-3.11.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 523aac8..9dc35e8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ ### Abstract ### Name: evolution -Version: 3.11.91 +Version: 3.11.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 17 2014 Milan Crha - 3.11.92-1 +- Update to 3.11.92 + * Mon Mar 03 2014 Milan Crha - 3.11.91-1 - Update to 3.11.91 diff --git a/sources b/sources index e0f1d8c..7d57d78 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a26a512b2f48597f4679dba42b6498de evolution-3.11.91.tar.xz +ffaffe453ce1b7e041fec997583d4861 evolution-3.11.92.tar.xz From 9cd2679ec3781ccdb4b9cb2535a436f6510b84fb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Mar 2014 09:43:54 +0100 Subject: [PATCH 550/844] Update to 3.12.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e6a651b..b135ad9 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.90.tar.xz /evolution-3.11.91.tar.xz /evolution-3.11.92.tar.xz +/evolution-3.12.0.tar.xz diff --git a/evolution.spec b/evolution.spec index 9dc35e8..b190b45 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,14 +30,14 @@ ### Abstract ### Name: evolution -Version: 3.11.92 +Version: 3.12.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.11/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Mar 24 2014 Milan Crha - 3.12.0-1 +- Update to 3.12.0 + * Mon Mar 17 2014 Milan Crha - 3.11.92-1 - Update to 3.11.92 diff --git a/sources b/sources index 7d57d78..4f277f7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ffaffe453ce1b7e041fec997583d4861 evolution-3.11.92.tar.xz +5ec7a2828eef2dac3da2a1de18d1188c evolution-3.12.0.tar.xz From bd4d130074f605f44e3063127423a2931a62dc80 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Apr 2014 11:17:09 +0200 Subject: [PATCH 551/844] Update to 3.12.1 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 65 +++++++++++++++------------- evolution.spec | 5 ++- sources | 2 +- 4 files changed, 40 insertions(+), 33 deletions(-) diff --git a/.gitignore b/.gitignore index b135ad9..641882e 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.91.tar.xz /evolution-3.11.92.tar.xz /evolution-3.12.0.tar.xz +/evolution-3.12.1.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index a466d32..ba5c29b 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,6 +1,6 @@ -diff -up evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-03-03 01:37:23.000000000 +0100 -+++ evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c 2014-03-03 13:37:40.924928474 +0100 +diff -up evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200 ++++ evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c 2014-04-14 11:15:36.606320997 +0200 @@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", @@ -13,9 +13,9 @@ diff -up evolution-3.11.91/addressbook/gui/contact-editor/e-contact-editor.c.hel widget = e_builder_get_widget ( e_contact_editor->priv->builder, "button-web-expand"); g_signal_connect_swapped ( -diff -up evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.11.91/calendar/gui/dialogs/comp-editor.c ---- evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents 2014-03-03 01:37:23.000000000 +0100 -+++ evolution-3.11.91/calendar/gui/dialogs/comp-editor.c 2014-03-03 13:37:40.924928474 +0100 +diff -up evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.12.1/calendar/gui/dialogs/comp-editor.c +--- evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200 ++++ evolution-3.12.1/calendar/gui/dialogs/comp-editor.c 2014-04-14 11:15:36.606320997 +0200 @@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,14 +29,13 @@ diff -up evolution-3.11.91/calendar/gui/dialogs/comp-editor.c.help-contents evol action_group = gtk_action_group_new ("individual"); gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); -diff -up evolution-3.11.91/e-util/e-misc-utils.c.help-contents evolution-3.11.91/e-util/e-misc-utils.c ---- evolution-3.11.91/e-util/e-misc-utils.c.help-contents 2014-02-11 14:39:16.000000000 +0100 -+++ evolution-3.11.91/e-util/e-misc-utils.c 2014-03-03 13:37:40.925928474 +0100 -@@ -2102,3 +2102,20 @@ e_binding_transform_uid_to_source (GBind - +diff -up evolution-3.12.1/e-util/e-misc-utils.c.help-contents evolution-3.12.1/e-util/e-misc-utils.c +--- evolution-3.12.1/e-util/e-misc-utils.c.help-contents 2014-04-14 11:15:36.606320997 +0200 ++++ evolution-3.12.1/e-util/e-misc-utils.c 2014-04-14 11:15:47.698320550 +0200 +@@ -2103,6 +2103,23 @@ e_binding_transform_uid_to_source (GBind return success; } -+ + +gboolean +e_misc_utils_is_help_package_installed (void) +{ @@ -53,21 +52,25 @@ diff -up evolution-3.11.91/e-util/e-misc-utils.c.help-contents evolution-3.11.91 + + return is_installed; +} -diff -up evolution-3.11.91/e-util/e-misc-utils.h.help-contents evolution-3.11.91/e-util/e-misc-utils.h ---- evolution-3.11.91/e-util/e-misc-utils.h.help-contents 2014-03-03 01:37:23.000000000 +0100 -+++ evolution-3.11.91/e-util/e-misc-utils.h 2014-03-03 13:37:40.925928474 +0100 ++ + /** + * e_binding_transform_text_non_null: + * @binding: a #GBinding +diff -up evolution-3.12.1/e-util/e-misc-utils.h.help-contents evolution-3.12.1/e-util/e-misc-utils.h +--- evolution-3.12.1/e-util/e-misc-utils.h.help-contents 2014-04-14 11:15:36.607320997 +0200 ++++ evolution-3.12.1/e-util/e-misc-utils.h 2014-04-14 11:16:06.930319775 +0200 @@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); +gboolean e_misc_utils_is_help_package_installed (void); + - G_END_DECLS - - #endif /* E_MISC_UTILS_H */ -diff -up evolution-3.11.91/e-util/e-preferences-window.c.help-contents evolution-3.11.91/e-util/e-preferences-window.c ---- evolution-3.11.91/e-util/e-preferences-window.c.help-contents 2014-02-16 15:11:01.000000000 +0100 -+++ evolution-3.11.91/e-util/e-preferences-window.c 2014-03-03 13:37:40.925928474 +0100 + gboolean e_binding_transform_text_non_null + (GBinding *binding, + const GValue *source_value, +diff -up evolution-3.12.1/e-util/e-preferences-window.c.help-contents evolution-3.12.1/e-util/e-preferences-window.c +--- evolution-3.12.1/e-util/e-preferences-window.c.help-contents 2014-03-23 02:13:17.000000000 +0100 ++++ evolution-3.12.1/e-util/e-preferences-window.c 2014-04-14 11:15:36.607320997 +0200 @@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -80,9 +83,9 @@ diff -up evolution-3.11.91/e-util/e-preferences-window.c.help-contents evolution widget = e_dialog_button_new_with_icon ("window-close", _("_Close")); g_signal_connect_swapped ( widget, "clicked", -diff -up evolution-3.11.91/e-util/e-send-options.c.help-contents evolution-3.11.91/e-util/e-send-options.c ---- evolution-3.11.91/e-util/e-send-options.c.help-contents 2014-03-03 01:37:23.000000000 +0100 -+++ evolution-3.11.91/e-util/e-send-options.c 2014-03-03 13:37:40.925928474 +0100 +diff -up evolution-3.12.1/e-util/e-send-options.c.help-contents evolution-3.12.1/e-util/e-send-options.c +--- evolution-3.12.1/e-util/e-send-options.c.help-contents 2014-04-13 16:33:29.000000000 +0200 ++++ evolution-3.12.1/e-util/e-send-options.c 2014-04-14 11:15:36.607320997 +0200 @@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; @@ -104,9 +107,9 @@ diff -up evolution-3.11.91/e-util/e-send-options.c.help-contents evolution-3.11. return (priv->priority && priv->security && priv->status -diff -up evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.11.91/plugins/email-custom-header/email-custom-header.c ---- evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-03 01:37:23.000000000 +0100 -+++ evolution-3.11.91/plugins/email-custom-header/email-custom-header.c 2014-03-03 13:39:03.723924965 +0100 +diff -up evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.12.1/plugins/email-custom-header/email-custom-header.c +--- evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-23 02:13:18.000000000 +0100 ++++ evolution-3.12.1/plugins/email-custom-header/email-custom-header.c 2014-04-14 11:15:36.607320997 +0200 @@ -118,6 +118,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { @@ -130,10 +133,10 @@ diff -up evolution-3.11.91/plugins/email-custom-header/email-custom-header.c.hel #undef EMAIL_CUSTOM_HEADER return (priv->page -diff -up evolution-3.11.91/shell/e-shell-window-actions.c.help-contents evolution-3.11.91/shell/e-shell-window-actions.c ---- evolution-3.11.91/shell/e-shell-window-actions.c.help-contents 2014-02-17 15:53:16.000000000 +0100 -+++ evolution-3.11.91/shell/e-shell-window-actions.c 2014-03-03 13:37:40.926928474 +0100 -@@ -1413,6 +1413,11 @@ e_shell_window_actions_init (EShellWindo +diff -up evolution-3.12.1/shell/e-shell-window-actions.c.help-contents evolution-3.12.1/shell/e-shell-window-actions.c +--- evolution-3.12.1/shell/e-shell-window-actions.c.help-contents 2014-03-23 02:13:19.000000000 +0100 ++++ evolution-3.12.1/shell/e-shell-window-actions.c 2014-04-14 11:15:36.607320997 +0200 +@@ -1458,6 +1458,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); g_free (path); diff --git a/evolution.spec b/evolution.spec index b190b45..c6b53d9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ ### Abstract ### Name: evolution -Version: 3.12.0 +Version: 3.12.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Apr 14 2014 Milan Crha - 3.12.1-1 +- Update to 3.12.1 + * Mon Mar 24 2014 Milan Crha - 3.12.0-1 - Update to 3.12.0 diff --git a/sources b/sources index 4f277f7..5c2ceb2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5ec7a2828eef2dac3da2a1de18d1188c evolution-3.12.0.tar.xz +03fd35c2ec39a90221c16400f8797623 evolution-3.12.1.tar.xz From 151465a78a9df0046dd9ac703f5c331a2a528a46 Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Wed, 16 Apr 2014 10:56:10 -0700 Subject: [PATCH 552/844] rebuild for new libgdata --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index c6b53d9..9d625cb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.12.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Wed Apr 16 2014 Adam Williamson - 3.12.1-2 +- rebuild for new libgdata + * Mon Apr 14 2014 Milan Crha - 3.12.1-1 - Update to 3.12.1 From 59f145b3d62bc86cf1e230e305909472971c9e75 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 May 2014 09:31:59 +0200 Subject: [PATCH 553/844] Update to 3.12.2 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 641882e..4dff3d0 100644 --- a/.gitignore +++ b/.gitignore @@ -73,3 +73,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.11.92.tar.xz /evolution-3.12.0.tar.xz /evolution-3.12.1.tar.xz +/evolution-3.12.2.tar.xz diff --git a/evolution.spec b/evolution.spec index 9d625cb..8b0bb13 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.12.1 -Release: 2%{?dist} +Version: 3.12.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon May 12 2014 Milan Crha - 3.12.2-1 +- Update to 3.12.2 + * Wed Apr 16 2014 Adam Williamson - 3.12.1-2 - rebuild for new libgdata diff --git a/sources b/sources index 5c2ceb2..21232d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -03fd35c2ec39a90221c16400f8797623 evolution-3.12.1.tar.xz +cc5dd0abe5741bfa7ee5456df188a28f evolution-3.12.2.tar.xz From eebca5f2913eaef5426dd47e0c2e1b4b78520a5a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 7 Jun 2014 06:09:33 -0500 Subject: [PATCH 554/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 8b0bb13..718db0d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -31,7 +31,7 @@ Name: evolution Version: 3.12.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Sat Jun 07 2014 Fedora Release Engineering - 3.12.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + * Mon May 12 2014 Milan Crha - 3.12.2-1 - Update to 3.12.2 From 8bed81facc5beaae893d9428da6b66f70e50cd6e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 9 Jun 2014 09:24:34 +0200 Subject: [PATCH 555/844] Update to 3.12.3 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4dff3d0..82b0c5b 100644 --- a/.gitignore +++ b/.gitignore @@ -74,3 +74,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.12.0.tar.xz /evolution-3.12.1.tar.xz /evolution-3.12.2.tar.xz +/evolution-3.12.3.tar.xz diff --git a/evolution.spec b/evolution.spec index 718db0d..01fbbe0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,8 +30,8 @@ ### Abstract ### Name: evolution -Version: 3.12.2 -Release: 2%{?dist} +Version: 3.12.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -529,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 09 2014 Milan Crha - 3.12.3-1 +- Update to 3.12.3 + * Sat Jun 07 2014 Fedora Release Engineering - 3.12.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index 21232d9..6191441 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cc5dd0abe5741bfa7ee5456df188a28f evolution-3.12.2.tar.xz +7e359b94af6fe5380eb071ec24c486e5 evolution-3.12.3.tar.xz From e5098bb2c6d5e195c1c0dca21b2e36c3b8f47063 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 9 Jun 2014 11:36:44 +0200 Subject: [PATCH 556/844] Drop gnome-icon-theme dependency --- ...ion-3.12.3-drop-gnome-icon-theme-dep.patch | 23 +++++++++++++++++++ evolution.spec | 8 +++---- 2 files changed, 27 insertions(+), 4 deletions(-) create mode 100644 evolution-3.12.3-drop-gnome-icon-theme-dep.patch diff --git a/evolution-3.12.3-drop-gnome-icon-theme-dep.patch b/evolution-3.12.3-drop-gnome-icon-theme-dep.patch new file mode 100644 index 0000000..f3d5f23 --- /dev/null +++ b/evolution-3.12.3-drop-gnome-icon-theme-dep.patch @@ -0,0 +1,23 @@ +diff -up evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep evolution-3.12.3/configure.ac +--- evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep 2014-06-09 11:33:17.814864320 +0200 ++++ evolution-3.12.3/configure.ac 2014-06-09 11:33:44.925863171 +0200 +@@ -49,7 +49,6 @@ m4_define([gtkhtml_minimum_version], [4. + m4_define([gdk_pixbuf_minimum_version], [2.24.0]) + m4_define([gcr_minimum_version], [3.4]) + m4_define([gnome_desktop_minimum_version], [2.91.3]) +-m4_define([gnome_icon_theme_minimum_version], [2.30.2.1]) + m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) + m4_define([webkitgtk_minimum_version], [2.0.1]) + m4_define([libgdata_minimum_version], [0.10]) +@@ -486,11 +485,6 @@ fi + AC_CHECK_FUNCS(mkdtemp) + + dnl ************************************************** +-dnl Gnome Icon Theme +-dnl ************************************************** +-PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version]) +- +-dnl ************************************************** + dnl Accessibility support + dnl ************************************************** + PKG_CHECK_MODULES([A11Y], [atk]) diff --git a/evolution.spec b/evolution.spec index 01fbbe0..c507080 100644 --- a/evolution.spec +++ b/evolution.spec @@ -5,7 +5,6 @@ %define gtkhtml_version 4.5.2 %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 -%define gnome_icon_theme_version 2.30.2.1 %define intltool_version 0.35.5 %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 @@ -31,7 +30,7 @@ Name: evolution Version: 3.12.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -53,7 +52,6 @@ Patch02: evolution-2.30.1-help-contents.patch ## Dependencies ### -Requires: gnome-icon-theme >= %{gnome_icon_theme_version} Requires: gvfs Requires: gtkspell3 Requires: highlight @@ -83,7 +81,6 @@ BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} -BuildRequires: pkgconfig(gnome-icon-theme) >= %{gnome_icon_theme_version} BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version} @@ -529,6 +526,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jun 09 2014 Milan Crha - 3.12.3-2 +- Drop gnome-icon-theme dependency + * Mon Jun 09 2014 Milan Crha - 3.12.3-1 - Update to 3.12.3 From 567f66cdf835f79ddbec4ff368c673c881174fed Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 9 Jun 2014 13:29:49 +0200 Subject: [PATCH 557/844] Oops, also apply the new patch to drop gnome-icon-theme dependency --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index c507080..965ee0b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -50,6 +50,8 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch + ## Dependencies ### Requires: gvfs @@ -205,6 +207,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .drop-gnome-icon-theme-dep # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do From c605dad9cb9b9f0cd34912dedfed859c213cc443 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 26 Jun 2014 08:08:26 +0200 Subject: [PATCH 558/844] Add upstream patches to fix folder names in Mail view's folder tree and colors in preview --- ...on-3.12.3-folder-tree-columns-expand.patch | 25 +++ ...on-3.12.3-webview-named-theme-colors.patch | 153 ++++++++++++++++++ evolution.spec | 11 +- 3 files changed, 188 insertions(+), 1 deletion(-) create mode 100644 evolution-3.12.3-folder-tree-columns-expand.patch create mode 100644 evolution-3.12.3-webview-named-theme-colors.patch diff --git a/evolution-3.12.3-folder-tree-columns-expand.patch b/evolution-3.12.3-folder-tree-columns-expand.patch new file mode 100644 index 0000000..53aa3dc --- /dev/null +++ b/evolution-3.12.3-folder-tree-columns-expand.patch @@ -0,0 +1,25 @@ +From 33dd6d93ca6e4fa3f1d3b846650504d419d88f9b Mon Sep 17 00:00:00 2001 +From: Sebastian Keller +Date: Tue, 17 Jun 2014 10:07:48 +0200 +Subject: Bug 731549 - EMFolderTree: Text column doesn't expand with recent + gtk+ + +gtk commit 73ff6a8e0ff307b8d14986c64918022364ff10e7 removed the code +that made the column expand previously, resulting in only ellipses being +shown. + +diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c +index 5b5a3b9..a8967d6 100644 +--- a/mail/em-folder-tree.c ++++ b/mail/em-folder-tree.c +@@ -1259,6 +1259,7 @@ folder_tree_constructed (GObject *object) + priv->selection_changed_handler_id = handler_id; + + column = gtk_tree_view_column_new (); ++ gtk_tree_view_column_set_expand (column, TRUE); + gtk_tree_view_column_set_sizing ( + column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + gtk_tree_view_append_column (tree_view, column); +-- +cgit v0.10.1 + diff --git a/evolution-3.12.3-webview-named-theme-colors.patch b/evolution-3.12.3-webview-named-theme-colors.patch new file mode 100644 index 0000000..27dabdc --- /dev/null +++ b/evolution-3.12.3-webview-named-theme-colors.patch @@ -0,0 +1,153 @@ +From 5f197603700d0e0cbfc2dab7c4750fd04c41de25 Mon Sep 17 00:00:00 2001 +From: Sebastian Keller +Date: Mon, 23 Jun 2014 11:39:46 +0200 +Subject: Bug 731872 - EWebView: Use named colors from themes + + +diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c +index 8703ee1..7615db4 100644 +--- a/e-util/e-web-view.c ++++ b/e-util/e-web-view.c +@@ -574,20 +574,20 @@ style_updated_cb (EWebView *web_view) + gchar *style; + GtkStateFlags state_flags; + GtkStyleContext *style_context; +- GtkWidgetPath *widget_path; ++ gboolean backdrop; + + state_flags = gtk_widget_get_state_flags (GTK_WIDGET (web_view)); +- style_context = gtk_style_context_new (); +- widget_path = gtk_widget_path_new (); +- gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW); +- gtk_style_context_set_path (style_context, widget_path); +- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY); +- +- gtk_style_context_get_background_color ( +- style_context, +- state_flags | GTK_STATE_FLAG_FOCUSED, +- &color); +- color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color)); ++ style_context = gtk_widget_get_style_context (GTK_WIDGET (web_view)); ++ backdrop = (state_flags & GTK_STATE_FLAG_BACKDROP) != 0; ++ ++ if (gtk_style_context_lookup_color ( ++ style_context, ++ backdrop ? "theme_unfocused_base_color" : "theme_base_color", ++ &color)) ++ color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color)); ++ else ++ color_value = g_strdup("#ffffff"); ++ + style = g_strconcat ("background-color: ", color_value, ";", NULL); + + e_web_view_add_css_rule_into_style_sheet ( +@@ -599,11 +599,14 @@ style_updated_cb (EWebView *web_view) + g_free (color_value); + g_free (style); + +- gtk_style_context_get_color ( +- style_context, +- state_flags | GTK_STATE_FLAG_FOCUSED, +- &color); +- color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color)); ++ if (gtk_style_context_lookup_color ( ++ style_context, ++ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color", ++ &color)) ++ color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color)); ++ else ++ color_value = g_strdup("#000000"); ++ + style = g_strconcat ("color: ", color_value, ";", NULL); + + e_web_view_add_css_rule_into_style_sheet ( +@@ -612,9 +615,6 @@ style_updated_cb (EWebView *web_view) + ".-e-web-view-text-color", + style); + +- gtk_widget_path_free (widget_path); +- g_object_unref (style_context); +- + g_free (color_value); + g_free (style); + } +diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c +index 2efe8eb..a81802b 100644 +--- a/em-format/e-mail-formatter.c ++++ b/em-format/e-mail-formatter.c +@@ -489,20 +489,21 @@ mail_formatter_update_style (EMailFormatter *formatter, + GtkStyleContext *style_context; + GtkWidgetPath *widget_path; + GdkRGBA rgba; ++ gboolean backdrop; + + g_object_freeze_notify (G_OBJECT (formatter)); + +- /* derive colors from top-level window */ + style_context = gtk_style_context_new (); + widget_path = gtk_widget_path_new (); + gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW); + gtk_style_context_set_path (style_context, widget_path); +- gtk_style_context_invalidate (style_context); ++ backdrop = (state & GTK_STATE_FLAG_BACKDROP) != 0; + +- gtk_style_context_save (style_context); +- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_TOOLBAR); +- +- gtk_style_context_get_background_color (style_context, state, &rgba); ++ if (!gtk_style_context_lookup_color ( ++ style_context, ++ backdrop ? "theme_unfocused_bg_color" : "theme_bg_color", ++ &rgba)) ++ gdk_rgba_parse (&rgba, "#eeeeee"); + e_mail_formatter_set_color ( + formatter, E_MAIL_FORMATTER_COLOR_BODY, &rgba); + +@@ -512,20 +513,27 @@ mail_formatter_update_style (EMailFormatter *formatter, + e_mail_formatter_set_color ( + formatter, E_MAIL_FORMATTER_COLOR_FRAME, &rgba); + +- gtk_style_context_restore (style_context); +- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY); +- +- gtk_style_context_get_color (style_context, state, &rgba); ++ if (!gtk_style_context_lookup_color ( ++ style_context, ++ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color", ++ &rgba)) ++ gdk_rgba_parse (&rgba, "#000000"); + e_mail_formatter_set_color ( + formatter, E_MAIL_FORMATTER_COLOR_HEADER, &rgba); + +- gtk_style_context_get_background_color ( +- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba); ++ if (!gtk_style_context_lookup_color ( ++ style_context, ++ backdrop ? "theme_unfocused_base_color" : "theme_base_color", ++ &rgba)) ++ gdk_rgba_parse (&rgba, "#ffffff"); + e_mail_formatter_set_color ( + formatter, E_MAIL_FORMATTER_COLOR_CONTENT, &rgba); + +- gtk_style_context_get_color ( +- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba); ++ if (!gtk_style_context_lookup_color ( ++ style_context, ++ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color", ++ &rgba)) ++ gdk_rgba_parse (&rgba, "#000000"); + e_mail_formatter_set_color ( + formatter, E_MAIL_FORMATTER_COLOR_TEXT, &rgba); + +@@ -605,7 +613,7 @@ e_mail_formatter_class_init (EMailFormatterClass *class) + gdk_rgba_parse (rgba, "#3f3f3f"); + + rgba = &class->colors[E_MAIL_FORMATTER_COLOR_HEADER]; +- gdk_rgba_parse (rgba, "#eeeeee"); ++ gdk_rgba_parse (rgba, "#000000"); + + rgba = &class->colors[E_MAIL_FORMATTER_COLOR_TEXT]; + gdk_rgba_parse (rgba, "#000000"); +-- +cgit v0.10.1 + diff --git a/evolution.spec b/evolution.spec index 965ee0b..981bb4e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ Name: evolution Version: 3.12.3 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -52,6 +52,9 @@ Patch02: evolution-2.30.1-help-contents.patch Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch +Patch04: evolution-3.12.3-folder-tree-columns-expand.patch +Patch05: evolution-3.12.3-webview-named-theme-colors.patch + ## Dependencies ### Requires: gvfs @@ -208,6 +211,8 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents %patch03 -p1 -b .drop-gnome-icon-theme-dep +%patch04 -p1 -b .folder-tree-columns-expand +%patch05 -p1 -b .webview-named-theme-colors # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -529,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Thu Jun 26 2014 Milan Crha - 3.12.3-3 +- Add upstream patch to fix folder names in Mail view's folder tree +- Add upstream patch to fix colors in preview + * Mon Jun 09 2014 Milan Crha - 3.12.3-2 - Drop gnome-icon-theme dependency From 831aad1270122787b1ddabd3cd302614ed793ff3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Jul 2014 09:15:43 +0200 Subject: [PATCH 559/844] Update to 3.12.4 --- .gitignore | 1 + ...on-3.12.3-folder-tree-columns-expand.patch | 25 --- ...on-3.12.3-webview-named-theme-colors.patch | 153 ------------------ evolution.spec | 14 +- sources | 2 +- 5 files changed, 9 insertions(+), 186 deletions(-) delete mode 100644 evolution-3.12.3-folder-tree-columns-expand.patch delete mode 100644 evolution-3.12.3-webview-named-theme-colors.patch diff --git a/.gitignore b/.gitignore index 82b0c5b..82edaf5 100644 --- a/.gitignore +++ b/.gitignore @@ -75,3 +75,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.12.1.tar.xz /evolution-3.12.2.tar.xz /evolution-3.12.3.tar.xz +/evolution-3.12.4.tar.xz diff --git a/evolution-3.12.3-folder-tree-columns-expand.patch b/evolution-3.12.3-folder-tree-columns-expand.patch deleted file mode 100644 index 53aa3dc..0000000 --- a/evolution-3.12.3-folder-tree-columns-expand.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 33dd6d93ca6e4fa3f1d3b846650504d419d88f9b Mon Sep 17 00:00:00 2001 -From: Sebastian Keller -Date: Tue, 17 Jun 2014 10:07:48 +0200 -Subject: Bug 731549 - EMFolderTree: Text column doesn't expand with recent - gtk+ - -gtk commit 73ff6a8e0ff307b8d14986c64918022364ff10e7 removed the code -that made the column expand previously, resulting in only ellipses being -shown. - -diff --git a/mail/em-folder-tree.c b/mail/em-folder-tree.c -index 5b5a3b9..a8967d6 100644 ---- a/mail/em-folder-tree.c -+++ b/mail/em-folder-tree.c -@@ -1259,6 +1259,7 @@ folder_tree_constructed (GObject *object) - priv->selection_changed_handler_id = handler_id; - - column = gtk_tree_view_column_new (); -+ gtk_tree_view_column_set_expand (column, TRUE); - gtk_tree_view_column_set_sizing ( - column, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_append_column (tree_view, column); --- -cgit v0.10.1 - diff --git a/evolution-3.12.3-webview-named-theme-colors.patch b/evolution-3.12.3-webview-named-theme-colors.patch deleted file mode 100644 index 27dabdc..0000000 --- a/evolution-3.12.3-webview-named-theme-colors.patch +++ /dev/null @@ -1,153 +0,0 @@ -From 5f197603700d0e0cbfc2dab7c4750fd04c41de25 Mon Sep 17 00:00:00 2001 -From: Sebastian Keller -Date: Mon, 23 Jun 2014 11:39:46 +0200 -Subject: Bug 731872 - EWebView: Use named colors from themes - - -diff --git a/e-util/e-web-view.c b/e-util/e-web-view.c -index 8703ee1..7615db4 100644 ---- a/e-util/e-web-view.c -+++ b/e-util/e-web-view.c -@@ -574,20 +574,20 @@ style_updated_cb (EWebView *web_view) - gchar *style; - GtkStateFlags state_flags; - GtkStyleContext *style_context; -- GtkWidgetPath *widget_path; -+ gboolean backdrop; - - state_flags = gtk_widget_get_state_flags (GTK_WIDGET (web_view)); -- style_context = gtk_style_context_new (); -- widget_path = gtk_widget_path_new (); -- gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW); -- gtk_style_context_set_path (style_context, widget_path); -- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY); -- -- gtk_style_context_get_background_color ( -- style_context, -- state_flags | GTK_STATE_FLAG_FOCUSED, -- &color); -- color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color)); -+ style_context = gtk_widget_get_style_context (GTK_WIDGET (web_view)); -+ backdrop = (state_flags & GTK_STATE_FLAG_BACKDROP) != 0; -+ -+ if (gtk_style_context_lookup_color ( -+ style_context, -+ backdrop ? "theme_unfocused_base_color" : "theme_base_color", -+ &color)) -+ color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color)); -+ else -+ color_value = g_strdup("#ffffff"); -+ - style = g_strconcat ("background-color: ", color_value, ";", NULL); - - e_web_view_add_css_rule_into_style_sheet ( -@@ -599,11 +599,14 @@ style_updated_cb (EWebView *web_view) - g_free (color_value); - g_free (style); - -- gtk_style_context_get_color ( -- style_context, -- state_flags | GTK_STATE_FLAG_FOCUSED, -- &color); -- color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color)); -+ if (gtk_style_context_lookup_color ( -+ style_context, -+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color", -+ &color)) -+ color_value = g_strdup_printf ("#%06x", e_rgba_to_value (&color)); -+ else -+ color_value = g_strdup("#000000"); -+ - style = g_strconcat ("color: ", color_value, ";", NULL); - - e_web_view_add_css_rule_into_style_sheet ( -@@ -612,9 +615,6 @@ style_updated_cb (EWebView *web_view) - ".-e-web-view-text-color", - style); - -- gtk_widget_path_free (widget_path); -- g_object_unref (style_context); -- - g_free (color_value); - g_free (style); - } -diff --git a/em-format/e-mail-formatter.c b/em-format/e-mail-formatter.c -index 2efe8eb..a81802b 100644 ---- a/em-format/e-mail-formatter.c -+++ b/em-format/e-mail-formatter.c -@@ -489,20 +489,21 @@ mail_formatter_update_style (EMailFormatter *formatter, - GtkStyleContext *style_context; - GtkWidgetPath *widget_path; - GdkRGBA rgba; -+ gboolean backdrop; - - g_object_freeze_notify (G_OBJECT (formatter)); - -- /* derive colors from top-level window */ - style_context = gtk_style_context_new (); - widget_path = gtk_widget_path_new (); - gtk_widget_path_append_type (widget_path, GTK_TYPE_WINDOW); - gtk_style_context_set_path (style_context, widget_path); -- gtk_style_context_invalidate (style_context); -+ backdrop = (state & GTK_STATE_FLAG_BACKDROP) != 0; - -- gtk_style_context_save (style_context); -- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_TOOLBAR); -- -- gtk_style_context_get_background_color (style_context, state, &rgba); -+ if (!gtk_style_context_lookup_color ( -+ style_context, -+ backdrop ? "theme_unfocused_bg_color" : "theme_bg_color", -+ &rgba)) -+ gdk_rgba_parse (&rgba, "#eeeeee"); - e_mail_formatter_set_color ( - formatter, E_MAIL_FORMATTER_COLOR_BODY, &rgba); - -@@ -512,20 +513,27 @@ mail_formatter_update_style (EMailFormatter *formatter, - e_mail_formatter_set_color ( - formatter, E_MAIL_FORMATTER_COLOR_FRAME, &rgba); - -- gtk_style_context_restore (style_context); -- gtk_style_context_add_class (style_context, GTK_STYLE_CLASS_ENTRY); -- -- gtk_style_context_get_color (style_context, state, &rgba); -+ if (!gtk_style_context_lookup_color ( -+ style_context, -+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color", -+ &rgba)) -+ gdk_rgba_parse (&rgba, "#000000"); - e_mail_formatter_set_color ( - formatter, E_MAIL_FORMATTER_COLOR_HEADER, &rgba); - -- gtk_style_context_get_background_color ( -- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba); -+ if (!gtk_style_context_lookup_color ( -+ style_context, -+ backdrop ? "theme_unfocused_base_color" : "theme_base_color", -+ &rgba)) -+ gdk_rgba_parse (&rgba, "#ffffff"); - e_mail_formatter_set_color ( - formatter, E_MAIL_FORMATTER_COLOR_CONTENT, &rgba); - -- gtk_style_context_get_color ( -- style_context, state | GTK_STATE_FLAG_FOCUSED, &rgba); -+ if (!gtk_style_context_lookup_color ( -+ style_context, -+ backdrop ? "theme_unfocused_fg_color" : "theme_fg_color", -+ &rgba)) -+ gdk_rgba_parse (&rgba, "#000000"); - e_mail_formatter_set_color ( - formatter, E_MAIL_FORMATTER_COLOR_TEXT, &rgba); - -@@ -605,7 +613,7 @@ e_mail_formatter_class_init (EMailFormatterClass *class) - gdk_rgba_parse (rgba, "#3f3f3f"); - - rgba = &class->colors[E_MAIL_FORMATTER_COLOR_HEADER]; -- gdk_rgba_parse (rgba, "#eeeeee"); -+ gdk_rgba_parse (rgba, "#000000"); - - rgba = &class->colors[E_MAIL_FORMATTER_COLOR_TEXT]; - gdk_rgba_parse (rgba, "#000000"); --- -cgit v0.10.1 - diff --git a/evolution.spec b/evolution.spec index 981bb4e..29377a7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,8 +29,8 @@ ### Abstract ### Name: evolution -Version: 3.12.3 -Release: 3%{?dist} +Version: 3.12.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -52,9 +52,6 @@ Patch02: evolution-2.30.1-help-contents.patch Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch -Patch04: evolution-3.12.3-folder-tree-columns-expand.patch -Patch05: evolution-3.12.3-webview-named-theme-colors.patch - ## Dependencies ### Requires: gvfs @@ -211,8 +208,6 @@ This package contains the plugin to import Microsoft Personal Storage Table %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents %patch03 -p1 -b .drop-gnome-icon-theme-dep -%patch04 -p1 -b .folder-tree-columns-expand -%patch05 -p1 -b .webview-named-theme-colors # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -534,6 +529,11 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Jul 14 2014 Milan Crha - 3.12.4-1 +- Update to 3.12.4 +- Remove patch to fix folder names in Mail view's folder tree (fixed upstream) +- Remove patch to fix colors in preview (fixed upstream) + * Thu Jun 26 2014 Milan Crha - 3.12.3-3 - Add upstream patch to fix folder names in Mail view's folder tree - Add upstream patch to fix colors in preview diff --git a/sources b/sources index 6191441..b58f30d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7e359b94af6fe5380eb071ec24c486e5 evolution-3.12.3.tar.xz +b94b63bd8a32527aa45b152878c0a354 evolution-3.12.4.tar.xz From f54cc9e68be5d3e763c0af9ee8380abe782e711c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 30 Jul 2014 08:17:13 +0200 Subject: [PATCH 560/844] Update to 3.13.4; Introduce tests subpackage with installed tests --- .gitignore | 1 + evolution.spec | 42 +++++++++++++++++++++++++++++------------- sources | 2 +- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 82edaf5..1e5cd33 100644 --- a/.gitignore +++ b/.gitignore @@ -76,3 +76,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.12.2.tar.xz /evolution-3.12.3.tar.xz /evolution-3.12.4.tar.xz +/evolution-3.13.4.tar.xz diff --git a/evolution.spec b/evolution.spec index 29377a7..7117a9a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -11,7 +11,7 @@ %define libsoup_version 2.40.3 %define webkit_version 1.8.0 -%define evo_base_version 3.12 +%define evo_base_version 3.14 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -29,14 +29,14 @@ ### Abstract ### Name: evolution -Version: 3.12.4 +Version: 3.13.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.12/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -50,8 +50,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -Patch03: evolution-3.12.3-drop-gnome-icon-theme-dep.patch - ## Dependencies ### Requires: gvfs @@ -146,7 +144,7 @@ Development files needed for building things which link against %{name}. Summary: Developer documentation for Evolution Group: Development/Libraries Requires: devhelp -Requires: evolution-devel = %{version}-%{release} +Requires: %{name}-devel%{?_isa} = %{version}-%{release} BuildArch: noarch %description devel-docs @@ -156,7 +154,7 @@ This package contains developer documentation for Evolution. %package help Group: Applications/Productivity Summary: Help files for %{name} -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: yelp BuildArch: noarch @@ -167,7 +165,7 @@ This package contains user documentation for %{name}. %package bogofilter Group: Applications/Productivity Summary: Bogofilter plugin for Evolution -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: bogofilter BuildRequires: bogofilter @@ -177,7 +175,7 @@ This package contains the plugin to filter junk mail using Bogofilter. %package spamassassin Group: Applications/Productivity Summary: SpamAssassin plugin for Evolution -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: spamassassin BuildRequires: spamassassin @@ -187,7 +185,7 @@ This package contains the plugin to filter junk mail using SpamAssassin. %package perl Group: Applications/Productivity Summary: Supplemental utilities that require Perl -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description perl This package contains supplemental utilities for %{name} that require Perl. @@ -196,18 +194,26 @@ This package contains supplemental utilities for %{name} that require Perl. %package pst Group: Applications/Productivity Summary: PST importer plugin for Evolution -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} %description pst This package contains the plugin to import Microsoft Personal Storage Table (PST) files used by Microsoft Outlook and Microsoft Exchange. %endif +%package tests +Summary: Tests for the %{name} package +Group: Development/Libraries +Requires: %{name}%{?_isa} = %{version}-%{release} + +%description tests +The %{name}-tests package contains tests that can be used to verify +the functionality of the installed %{name} package. + %prep %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .drop-gnome-icon-theme-dep # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -250,7 +256,8 @@ autoconf --disable-maintainer-mode \ --with-sub-version=" (%{version}-%{release})" \ %ldap_flags %ssl_flags %gtkdoc_flags \ - --enable-plugins=all + --enable-plugins=all \ + --enable-installed-tests export tagname=CC make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" @@ -528,7 +535,16 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif +%files tests +%{_libexecdir}/%{name}/installed-tests +%{_datadir}/installed-tests + %changelog +* Wed Jul 30 2014 Milan Crha - 3.13.4-1 +- Update to 3.13.4 +- Introduce tests subpackage with installed tests +- Remove patch to drop gnome-icon-theme dependency (fixed upstream) + * Mon Jul 14 2014 Milan Crha - 3.12.4-1 - Update to 3.12.4 - Remove patch to fix folder names in Mail view's folder tree (fixed upstream) diff --git a/sources b/sources index b58f30d..a7db44e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b94b63bd8a32527aa45b152878c0a354 evolution-3.12.4.tar.xz +0e866a0572c99bef9a560758891ba5e7 evolution-3.13.4.tar.xz From 7b2ffd1352eda1a5549badc003aefccb4e3dfb54 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 30 Jul 2014 10:30:09 +0200 Subject: [PATCH 561/844] Add cryptui-0.0 into (Build)Requirements --- evolution.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/evolution.spec b/evolution.spec index 7117a9a..865bee1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -75,6 +75,7 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(camel-1.2) >= %{version} +BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -123,6 +124,7 @@ Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} Requires: pkgconfig(camel-1.2) >= %{version} +Requires: pkgconfig(cryptui-0.0) Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} Requires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version} Requires: pkgconfig(gtkspell3-3.0) From 91b1e2ee92dc5820405527005e49c2e05095427b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 30 Jul 2014 11:24:03 +0200 Subject: [PATCH 562/844] Add patch to add missing tests files in the distribution tarball --- evolution-3.13.4-missing-tests.patch | 1282 ++++++++++++++++++++++++++ evolution.spec | 4 + 2 files changed, 1286 insertions(+) create mode 100644 evolution-3.13.4-missing-tests.patch diff --git a/evolution-3.13.4-missing-tests.patch b/evolution-3.13.4-missing-tests.patch new file mode 100644 index 0000000..cab4f03 --- /dev/null +++ b/evolution-3.13.4-missing-tests.patch @@ -0,0 +1,1282 @@ +diff -up evolution-3.13.4/tests/addressbook.feature.missing-tests evolution-3.13.4/tests/addressbook.feature +--- evolution-3.13.4/tests/addressbook.feature.missing-tests 2014-07-30 11:21:47.031172903 +0200 ++++ evolution-3.13.4/tests/addressbook.feature 2014-07-30 11:21:47.031172903 +0200 +@@ -0,0 +1,101 @@ ++Feature: Addressbook: File: Create contacts ++ ++ Background: ++ * Open Evolution and setup fake account ++ * Open "Contacts" section ++ * Select "Personal" addressbook ++ * Change categories view to "Any Category" ++ * Delete all contacts containing "Doe" ++ ++ @addressbook_contacts ++ Scenario: Create a simple contact ++ * Create a new contact ++ * Set "Full Name..." in contact editor to "John Doe" ++ * Save the contact ++ * Refresh addressbook ++ * Select "Doe, John" contact ++ * Open contact editor for selected contact ++ Then "Full Name..." property is set to "John Doe" ++ ++ @addressbook_contacts ++ Scenario: Create a new contact with data ++ * Create a new contact ++ * Set "Full Name..." in contact editor to "Jimmy Doe" ++ * Set "Nickname:" in contact editor to "Unknown" ++ * Set emails in contact editor to ++ | Field | Value | ++ | Work Email | jimmy.doe@company.com | ++ | Home Email | jimmy_doe_72@gmail.com | ++ | Other Email | jimmydoe72@yahoo.com | ++ | Other Email | xxjimmyxx@free_email.com | ++ * Tick "Wants to receive HTML mail" checkbox ++ * Set phones in contact editor to ++ | Field | Value | ++ | Assistant Phone | 123 | ++ | Business Phone | 234 | ++ | Business Fax | 345 | ++ | Callback Phone | 456 | ++ | Car Phone | 567 | ++ | Company Phone | 678 | ++ | Home Phone | 789 | ++ | Home Fax | 890 | ++ | ISDN | 123 | ++ | Mobile Phone | 234 | ++ | Other Phone | 345 | ++ | Other Fax | 456 | ++ | Pager | 567 | ++ | Primary Phone | 678 | ++ | Radio | 789 | ++ | Telex | 890 | ++ * Set IMs in contact editor to ++ | Field | Value | ++ | AIM | 123 | ++ | Jabber | 234 | ++ | Yahoo | 345 | ++ | Gadu-Gadu | 456 | ++ | MSN | 123 | ++ | ICQ | 234 | ++ | GroupWise | 345 | ++ | Skype | jimmy.doe | ++ | Twitter | @jimmydoe | ++ * Save the contact ++ * Refresh addressbook ++ * Select "Doe, Jimmy" contact ++ * Open contact editor for selected contact ++ Then "Nickname:" property is set to "Unknown" ++ And Emails are set to ++ | Field | Value | ++ | Work Email | jimmy.doe@company.com | ++ | Home Email | jimmy_doe_72@gmail.com | ++ | Other Email | jimmydoe72@yahoo.com | ++ | Other Email | xxjimmyxx@free_email.com | ++ And "Wants to receive HTML mail" checkbox is ticked ++ And Phones are set to ++ | Field | Value | ++ | Assistant Phone | 123 | ++ | Business Phone | 234 | ++ | Business Fax | 345 | ++ | Callback Phone | 456 | ++ | Car Phone | 567 | ++ | Company Phone | 678 | ++ | Home Phone | 789 | ++ | Home Fax | 890 | ++ | ISDN | 123 | ++ | Mobile Phone | 234 | ++ | Other Phone | 345 | ++ | Other Fax | 456 | ++ | Pager | 567 | ++ | Primary Phone | 678 | ++ | Radio | 789 | ++ | Telex | 890 | ++ And IMs are set to ++ | Field | Value | ++ | AIM | 123 | ++ | Jabber | 234 | ++ | Yahoo | 345 | ++ | Gadu-Gadu | 456 | ++ | MSN | 123 | ++ | ICQ | 234 | ++ | GroupWise | 345 | ++ | Skype | jimmy.doe | ++ | Twitter | @jimmydoe | +diff -up evolution-3.13.4/tests/common_steps.py.missing-tests evolution-3.13.4/tests/common_steps.py +--- evolution-3.13.4/tests/common_steps.py.missing-tests 2014-07-30 11:21:47.031172903 +0200 ++++ evolution-3.13.4/tests/common_steps.py 2014-07-30 11:21:47.031172903 +0200 +@@ -0,0 +1,238 @@ ++# -*- coding: UTF-8 -*- ++from dogtail.utils import isA11yEnabled, enableA11y ++if isA11yEnabled() is False: ++ enableA11y(True) ++ ++from time import time, sleep ++from functools import wraps ++from os import strerror, errno, system ++from signal import signal, alarm, SIGALRM ++from subprocess import Popen, PIPE ++from behave import step ++from gi.repository import GLib, Gio ++import fcntl, os ++ ++from dogtail.rawinput import keyCombo, absoluteMotion, pressKey ++from dogtail.tree import root ++from unittest import TestCase ++ ++ ++# Create a dummy unittest class to have nice assertions ++class dummy(TestCase): ++ def runTest(self): # pylint: disable=R0201 ++ assert True ++ ++ ++def wait_until(my_lambda, element, timeout=30, period=0.25): ++ """ ++ This function keeps running lambda with specified params until the result is True ++ or timeout is reached ++ Sample usages: ++ * wait_until(lambda x: x.name != 'Loading...', context.app) ++ Pause until window title is not 'Loading...'. ++ Return False if window title is still 'Loading...' ++ Throw an exception if window doesn't exist after default timeout ++ ++ * wait_until(lambda element, expected: x.text == expected, element, ('Expected text')) ++ Wait until element text becomes the expected (passed to the lambda) ++ ++ """ ++ exception_thrown = None ++ mustend = int(time()) + timeout ++ while int(time()) < mustend: ++ try: ++ if my_lambda(element): ++ return True ++ except Exception as e: ++ # If lambda has thrown the exception we'll re-raise it later ++ # and forget about if lambda passes ++ exception_thrown = e ++ sleep(period) ++ if exception_thrown: ++ raise exception_thrown ++ else: ++ return False ++ ++ ++class TimeoutError(Exception): ++ """ ++ Timeout exception class for limit_execution_time_to function ++ """ ++ pass ++ ++ ++def limit_execution_time_to( ++ seconds=10, error_message=strerror(errno.ETIME)): ++ """ ++ Decorator to limit function execution to specified limit ++ """ ++ def decorator(func): ++ def _handle_timeout(signum, frame): ++ raise TimeoutError(error_message) ++ ++ def wrapper(*args, **kwargs): ++ signal(SIGALRM, _handle_timeout) ++ alarm(seconds) ++ try: ++ result = func(*args, **kwargs) ++ finally: ++ alarm(0) ++ return result ++ ++ return wraps(func)(wrapper) ++ ++ return decorator ++ ++ ++class App(object): ++ """ ++ This class does all basic events with the app ++ """ ++ def __init__( ++ self, appName, shortcut='', a11yAppName=None, ++ forceKill=True, parameters='', recordVideo=False): ++ """ ++ Initialize object App ++ appName command to run the app ++ shortcut default quit shortcut ++ a11yAppName app's a11y name is different than binary ++ forceKill is the app supposed to be kill before/after test? ++ parameters has the app any params needed to start? (only for startViaCommand) ++ recordVideo start gnome-shell recording while running the app ++ """ ++ self.appCommand = appName ++ self.shortcut = shortcut ++ self.forceKill = forceKill ++ self.parameters = parameters ++ self.internCommand = self.appCommand.lower() ++ self.a11yAppName = a11yAppName ++ self.recordVideo = recordVideo ++ self.pid = None ++ ++ # a way of overcoming overview autospawn when mouse in 1,1 from start ++ pressKey('Esc') ++ absoluteMotion(100, 100, 2) ++ ++ # attempt to make a recording of the test ++ if self.recordVideo: ++ keyCombo('R') ++ ++ def isRunning(self): ++ """ ++ Is the app running? ++ """ ++ if self.a11yAppName is None: ++ self.a11yAppName = self.internCommand ++ ++ # Trap weird bus errors ++ for attempt in xrange(0, 30): ++ sleep(1) ++ try: ++ return self.a11yAppName in [x.name for x in root.applications()] ++ except GLib.GError: ++ continue ++ raise Exception("10 at-spi errors, seems that bus is blocked") ++ ++ def kill(self): ++ """ ++ Kill the app via 'killall' ++ """ ++ if self.recordVideo: ++ keyCombo('R') ++ ++ try: ++ self.process.kill() ++ except: ++ # Fall back to killall ++ Popen("killall " + self.appCommand, shell=True).wait() ++ ++ def startViaCommand(self): ++ """ ++ Start the app via command ++ """ ++ if self.forceKill and self.isRunning(): ++ self.kill() ++ assert not self.isRunning(), "Application cannot be stopped" ++ ++ #command = "%s %s" % (self.appCommand, self.parameters) ++ #self.pid = run(command, timeout=5) ++ self.process = Popen(self.appCommand.split() + self.parameters.split(), ++ stdout=PIPE, stderr=PIPE, bufsize=0) ++ self.pid = self.process.pid ++ ++ assert self.isRunning(), "Application failed to start" ++ return root.application(self.a11yAppName) ++ ++ def closeViaShortcut(self): ++ """ ++ Close the app via shortcut ++ """ ++ if not self.isRunning(): ++ raise Exception("App is not running") ++ ++ keyCombo(self.shortcut) ++ assert not self.isRunning(), "Application cannot be stopped" ++ ++ ++@step(u'Start a new Evolution instance') ++def start_new_evolution_instance(context): ++ context.app = context.app_class.startViaCommand() ++ ++ ++def cleanup(): ++ # Remove cached data and settings ++ folders = ['~/.local/share/evolution', '~/.cache/evolution', '~/.config/evolution'] ++ for folder in folders: ++ system("rm -rf %s > /dev/null" % folder) ++ ++ # Clean up goa data ++ system("rm -rf ~/.config/goa-1.0/accounts.conf") ++ system("killall goa-daemon 2&> /dev/null") ++ ++ # Reset GSettings ++ schemas = [x for x in Gio.Settings.list_schemas() if 'evolution' in x.lower()] ++ for schema in schemas: ++ system("gsettings reset-recursively %s" % schema) ++ ++ # Skip warning dialog ++ system("gsettings set org.gnome.evolution.shell skip-warning-dialog true") ++ # Show switcher buttons as icons (to minimize tree scrolling) ++ system("gsettings set org.gnome.evolution.shell buttons-style icons") ++ # Skip default mailer handler dialog ++ system("gsettings set org.gnome.evolution.mail prompt-check-if-default-mailer false") ++ ++ ++def check_for_errors(context): ++ """Check that no error is displayed on Evolution UI""" ++ # Don't try to check for errors on dead app ++ if not context.app or context.app.dead: ++ return ++ alerts = context.app.findChildren(lambda x: x.roleName == 'alert') ++ if not alerts: ++ # alerts can also return None ++ return ++ alerts = filter(lambda x: x.showing, alerts) ++ if len(alerts) > 0: ++ labels = alerts[0].findChildren(lambda x: x.roleName == 'label') ++ messages = [x.name for x in labels] ++ ++ if alerts[0].name != 'Error' and alerts[0].showing: ++ # Erase the configuration and start all over again ++ system("evolution --force-shutdown &> /dev/null") ++ ++ # Remove previous data ++ folders = ['~/.local/share/evolution', '~/.cache/evolution', '~/.config/evolution'] ++ for folder in folders: ++ system("rm -rf %s > /dev/null" % folder) ++ ++ raise RuntimeError("Error occurred: %s" % messages) ++ ++ ++def non_block_read(output): ++ fd = output.fileno() ++ fl = fcntl.fcntl(fd, fcntl.F_GETFL) ++ fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK) ++ try: ++ return output.read() ++ except: ++ return "" +diff -up evolution-3.13.4/tests/environment.py.missing-tests evolution-3.13.4/tests/environment.py +--- evolution-3.13.4/tests/environment.py.missing-tests 2014-07-30 11:21:47.031172903 +0200 ++++ evolution-3.13.4/tests/environment.py 2014-07-30 11:21:47.031172903 +0200 +@@ -0,0 +1,82 @@ ++# -*- coding: UTF-8 -*- ++ ++from time import sleep, localtime, strftime ++from dogtail.utils import isA11yEnabled, enableA11y ++if not isA11yEnabled(): ++ enableA11y(True) ++ ++from common_steps import App, dummy, cleanup, non_block_read ++from dogtail.config import config ++import os ++ ++ ++def before_all(context): ++ """Setup evolution stuff ++ Being executed once before any test ++ """ ++ ++ try: ++ # Close running evo instances ++ os.system("evolution --force-shutdown > /dev/null") ++ ++ # Skip dogtail actions to print to stdout ++ config.logDebugToStdOut = False ++ config.typingDelay = 0.2 ++ ++ # Include assertion object ++ context.assertion = dummy() ++ ++ # Cleanup existing data before any test ++ cleanup() ++ ++ # Store scenario start time for session logs ++ context.log_start_time = strftime("%Y-%m-%d %H:%M:%S", localtime()) ++ ++ context.app_class = App('evolution') ++ ++ except Exception as e: ++ print("Error in before_all: %s" % e.message) ++ ++ ++def after_step(context, step): ++ try: ++ if step.status == 'failed' and hasattr(context, "embed"): ++ # Embed screenshot if HTML report is used ++ os.system("dbus-send --print-reply --session --type=method_call " + ++ "--dest='org.gnome.Shell.Screenshot' " + ++ "'/org/gnome/Shell/Screenshot' " + ++ "org.gnome.Shell.Screenshot.Screenshot " + ++ "boolean:true boolean:false string:/tmp/screenshot.png") ++ context.embed('image/png', open("/tmp/screenshot.png", 'r').read()) ++ except Exception as e: ++ print("Error in after_step: %s" % str(e)) ++ ++ ++def after_scenario(context, scenario): ++ """Teardown for each scenario ++ Kill evolution (in order to make this reliable we send sigkill) ++ """ ++ try: ++ # Attach journalctl logs ++ if hasattr(context, "embed"): ++ os.system("journalctl /usr/bin/gnome-session --no-pager -o cat --since='%s'> /tmp/journal-session.log" % context.log_start_time) ++ data = open("/tmp/journal-session.log", 'r').read() ++ if data: ++ context.embed('text/plain', data) ++ ++ context.app_class.kill() ++ ++ stdout = non_block_read(context.app_class.process.stdout) ++ stderr = non_block_read(context.app_class.process.stderr) ++ ++ if stdout: ++ context.embed('text/plain', stdout) ++ ++ if stderr: ++ context.embed('text/plain', stderr) ++ ++ # Make some pause after scenario ++ sleep(1) ++ except Exception as e: ++ # Stupid behave simply crashes in case exception has occurred ++ print("Error in after_scenario: %s" % e.message) +diff -up evolution-3.13.4/tests/shortcuts.feature.missing-tests evolution-3.13.4/tests/shortcuts.feature +--- evolution-3.13.4/tests/shortcuts.feature.missing-tests 2014-07-30 11:21:47.032172902 +0200 ++++ evolution-3.13.4/tests/shortcuts.feature 2014-07-30 11:21:47.031172903 +0200 +@@ -0,0 +1,135 @@ ++Feature: Shortcuts ++ ++ Background: ++ * Open Evolution and setup fake account ++ ++ @general_shortcuts ++ Scenario: Ctrl-Q to quit application - two instances ++ * Start a new Evolution instance ++ * Press "Q" ++ Then Evolution is closed ++ ++ @general_shortcuts ++ Scenario: F1 to launch help ++ * Press "" ++ Then Help section "Evolution Mail and Calendar" is displayed ++ ++ @general_shortcuts ++ Scenario: Shift-Ctrl-W to open a new window ++ * Press "W" ++ Then Evolution has 2 windows opened ++ ++ @general_shortcuts ++ Scenario: Ctrl-W to close a window ++ * Press "W" ++ * Press "W" ++ Then Evolution has 1 window opened ++ ++ @general_shortcuts ++ Scenario: Ctrl-Shift-S to open Preferences ++ * Press "S" ++ Then Preferences dialog is opened ++ ++ @mail_shortcuts ++ Scenario: Mail: Ctrl-Shift-M to compose new message ++ * Open "Mail" section ++ * Press "M" ++ Then Message composer with title "Compose Message" is opened ++ ++ @contacts_shortcuts ++ Scenario: Contacts: Ctrl-Shift-C to create new contact ++ * Open "Contacts" section ++ * Press "C" ++ Then Contact editor window is opened ++ ++ @contacts_shortcuts ++ Scenario: Contacts: Ctrl-Shift-L to create new contact list ++ * Open "Contacts" section ++ * Press "L" ++ Then Contact List editor window is opened ++ ++ @calendar_shortcuts ++ Scenario: Calendar: Ctrl-Shift-A to create new appointment ++ * Open "Calendar" section ++ * Press "A" ++ Then Event editor with title "Appointment - No Summary" is displayed ++ ++ @calendar_shortcuts ++ Scenario: Calendar: Ctrl-Shift-E to create new meeting ++ * Open "Calendar" section ++ * Press "E" ++ Then Event editor with title "Meeting - No Summary" is displayed ++ ++ @calendar_shortcuts ++ Scenario: Tasks: Ctrl-Shift-T to create new task ++ * Open "Tasks" section ++ * Press "T" ++ Then Task editor with title "Task - No Summary" is opened ++ ++ @memos_shortcuts ++ Scenario: Memos: Ctrl-Shift-O to create new memo ++ * Open "Memos" section ++ * Press "O" ++ Then Memo editor with title "Memo - No Summary" is opened ++ ++ @memos_shortcuts ++ Scenario: Memos: Ctrl-Shift-O to create new task ++ * Open "Memos" section ++ * Press "O" ++ Then Shared memo editor with title "Memo - No Summary" is opened ++ ++ @view_shortcuts ++ Scenario Outline: Ctrl+<1-5> to switch views ++ * Press "" ++ Then "
" view is opened ++ ++ Examples: ++ | shortcut | section | ++ | 1 | Mail | ++ | 2 | Contacts | ++ | 3 | Calendar | ++ | 4 | Tasks | ++ | 5 | Memos | ++ ++ @menu_shortcuts ++ Scenario Outline: Menu shortcuts on all views ++ * Open "
" section ++ * Press "" ++ Then "" menu is opened ++ ++ Examples: ++ | section | shortcut | menu | ++ | Mail | F | File | ++ | Mail | E | Edit | ++ | Mail | V | View | ++ | Mail | O | Folder | ++ | Mail | M | Message | ++ | Mail | S | Search | ++ | Mail | H | Help | ++ ++ | Contacts | F | File | ++ | Contacts | E | Edit | ++ | Contacts | V | View | ++ | Contacts | A | Actions | ++ | Contacts | S | Search | ++ | Contacts | H | Help | ++ ++ | Calendar | F | File | ++ | Calendar | E | Edit | ++ | Calendar | V | View | ++ | Calendar | A | Actions | ++ | Calendar | S | Search | ++ | Calendar | H | Help | ++ ++ | Tasks | F | File | ++ | Tasks | E | Edit | ++ | Tasks | V | View | ++ | Tasks | A | Actions | ++ | Tasks | S | Search | ++ | Tasks | H | Help | ++ ++ | Memos | F | File | ++ | Memos | E | Edit | ++ | Memos | V | View | ++ | Memos | S | Search | ++ | Memos | H | Help | +diff -up evolution-3.13.4/tests/steps/addressbook_steps.py.missing-tests evolution-3.13.4/tests/steps/addressbook_steps.py +--- evolution-3.13.4/tests/steps/addressbook_steps.py.missing-tests 2014-07-30 11:21:47.032172902 +0200 ++++ evolution-3.13.4/tests/steps/addressbook_steps.py 2014-07-30 11:21:47.032172902 +0200 +@@ -0,0 +1,391 @@ ++# -*- coding: UTF-8 -*- ++from behave import step, then ++from common_steps import wait_until ++from dogtail.predicate import GenericPredicate ++from dogtail.rawinput import keyCombo ++from time import time, sleep ++from gi.repository import GLib ++import pyatspi ++ ++ ++@step(u'Select "{name}" addressbook') ++def select_addressbook(context, name, password=None): ++ cells = context.app.findChildren( ++ GenericPredicate(name=name, roleName='table cell')) ++ visible_cells = filter(lambda x: x.showing, cells) ++ if visible_cells == []: ++ raise RuntimeError("Cannot find addressbook '%s'" % name) ++ visible_cells[0].click() ++ # Wait for addressbook to load ++ try: ++ spinner = context.app.findChild( ++ GenericPredicate(name='Spinner'), retry=False, requireResult=False) ++ if spinner: ++ start_time = time() ++ while spinner.showing: ++ sleep(1) ++ if (time() - start_time) > 180: ++ raise RuntimeError("Contacts take too long to synchronize") ++ except (GLib.GError, TypeError): ++ pass ++ ++ ++@step(u'Change categories view to "{category}"') ++def change_categories_view(context, category): ++ labels = context.app.findChildren( ++ lambda x: x.labeller.name == 'Show:' and x.showing) ++ if labels == []: ++ raise RuntimeError("Cannot find category switcher") ++ labels[0].combovalue = category ++ ++ ++@step(u'Delete selected contact') ++def delete_selected_contact(context): ++ context.app.menu('Edit').click() ++ mnu = context.app.menu('Edit').menuItem("Delete Contact") ++ if pyatspi.STATE_ENABLED in mnu.getState().getStates(): ++ context.app.menu('Edit').menuItem("Delete Contact").click() ++ ++ alert = context.app.child(roleName='alert', name='Question') ++ alert.button('Delete').click() ++ context.execute_steps(u"* Wait for email to synchronize") ++ ++ ++@step(u'Delete all contacts containing "{part}"') ++def delete_all_contacts_containing(context, part): ++ context.app.search_bar.grab_focus() ++ for attempts in range(0, 10): ++ try: ++ context.app.search_bar.text = part ++ break ++ except (GLib.GError, AttributeError): ++ sleep(0.1) ++ continue ++ keyCombo("") ++ context.execute_steps(u"* Wait for email to synchronize") ++ context.app.search_bar.grab_focus() ++ keyCombo("") ++ sleep(3) ++ heading = context.app.findChild( ++ GenericPredicate(roleName='heading'), ++ retry=False, requireResult=False) ++ if heading: ++ keyCombo("a") ++ context.execute_steps(u"* Delete selected contact") ++ sleep(3) ++ ++ ++@step(u'Create a new contact') ++def create_a_new_contact(context): ++ context.app.menu('File').click() ++ context.app.menu('File').menu('New').point() ++ context.app.menu('File').menu('New').menuItem("Contact").click() ++ context.execute_steps(u"Then Contact editor window is opened") ++ ++ ++def get_element_by_name(contact_editor, name, section=None): ++ """Get a field object by name in section (if specified)""" ++ element = None ++ if section: ++ panel = contact_editor.findChild( ++ GenericPredicate(roleName='panel', name=section), retry=False, requireResult=False) ++ if not panel: ++ # Other section is not a panel, but a toggle button ++ panel = contact_editor.child(roleName='toggle button', name=section) ++ element = panel.childLabelled(name) ++ else: ++ label = contact_editor.findChild( ++ GenericPredicate(label=name), retry=False, requireResult=False) ++ if not label: ++ # In case childLabelled is missing ++ # Find a filler with this name and get its text child ++ element = contact_editor.child( ++ roleName='filler', name=name).child(roleName='text') ++ else: ++ element = contact_editor.childLabelled(name) ++ if element: ++ return element ++ else: ++ raise RuntimeError("Cannot find element named '%s' in section '%s'" % ( ++ name, section)) ++ ++ ++@step(u'Set "{field_name}" in contact editor to "{field_value}"') ++def set_field_to_value(context, field_name, field_value): ++ element = get_element_by_name(context.app.contact_editor, field_name) ++ if element.roleName == "text": ++ element.text = field_value ++ elif element.roleName == "combo box": ++ if element.combovalue != field_value: ++ element.combovalue = field_value ++ ++ ++@step(u'Save the contact') ++def save_contact(context): ++ context.app.contact_editor.button('Save').click() ++ assert wait_until(lambda x: not x.showing, context.app.contact_editor),\ ++ "Contact Editor was not hidden" ++ assert wait_until(lambda x: x.dead, context.app.contact_editor),\ ++ "Contact Editor was not closed" ++ context.app.contact_editor = None ++ ++ ++@step(u'Refresh addressbook') ++def refresh_addressbook(context): ++ #Clear the search ++ icons = context.app.search_bar.findChildren(lambda x: x.roleName == 'icon') ++ if icons != []: ++ icons[-1].click() ++ else: ++ for attempts in range(0, 10): ++ try: ++ context.app.search_bar.text = '' ++ break ++ except (GLib.GError, AttributeError): ++ sleep(0.1) ++ continue ++ context.app.search_bar.grab_focus() ++ keyCombo('') ++ context.execute_steps(u"* Wait for email to synchronize") ++ ++ ++@step(u'Select "{contact_name}" contact list') ++@step(u'Select "{contact_name}" contact') ++def select_contact_with_name(context, contact_name): ++ # heading shows the name of currently selected contact ++ # We have to keep on pressing Tab to select the next contact ++ # Until we meet the first contact ++ # WARNING - what if we will have two identical contacts? ++ fail = False ++ selected_contact = None ++ ++ # HACK ++ # To make the contact table appear ++ # we need to focus on search window ++ # and send Tabs to have the first contact focused ++ context.app.search_bar.grab_focus() ++ sleep(0.1) ++ # Switch to 'Any field contains' (not reachable in 3.6) ++ icons = context.app.search_bar.findChildren(GenericPredicate(roleName='icon')) ++ ++ if icons != []: ++ icons[0].click() ++ wait_until(lambda x: x.findChildren( ++ GenericPredicate(roleName='check menu item', name='Any field contains')) != [], ++ context.app) ++ context.app.menuItem('Any field contains').click() ++ for attempts in range(0, 10): ++ try: ++ context.app.search_bar.text = contact_name ++ break ++ except (GLib.GError, AttributeError): ++ sleep(0.1) ++ continue ++ keyCombo("") ++ context.app.search_bar.grab_focus() ++ ++ keyCombo("") ++ first_contact_name = context.app.child(roleName='heading').text ++ ++ while True: ++ selected_contact = context.app.child(roleName='heading') ++ if selected_contact.text == contact_name: ++ fail = False ++ break ++ keyCombo("") ++ # Wait until contact data is being rendered ++ sleep(1) ++ if first_contact_name == selected_contact.text: ++ fail = True ++ break ++ ++ context.assertion.assertFalse( ++ fail, "Can't find contact named '%s'" % contact_name) ++ context.selected_contact_text = selected_contact.text ++ ++ ++@step(u'Open contact editor for selected contact') ++def open_contact_editor_for_selected_contact(context): ++ context.app.menu('File').click() ++ context.app.menu('File').menuItem('Open Contact').click() ++ context.execute_steps(u""" ++ Then Contact editor window with title "Contact Editor - %s" is opened ++ """ % context.selected_contact_text) ++ ++ ++@then(u'"{field}" property is set to "{expected}"') ++def property_in_contact_window_is_set_to(context, field, expected): ++ element = get_element_by_name(context.app.contact_editor, field) ++ actual = None ++ if element.roleName == "text": ++ actual = element.text ++ elif element.roleName == "combo box": ++ actual = element.combovalue ++ if actual == '': ++ actual = element.textentry('').text ++ assert unicode(actual) == expected, "Incorrect value" ++ ++ ++def get_combobox_textbox_object(contact_editor, section, scroll_to_bottom=True): ++ """Get a list of paired 'combobox-textbox' objects in contact editor""" ++ section_names = { ++ 'Ims': 'Instant Messaging', ++ 'Phones': 'Telephone', ++ 'Emails': 'Email'} ++ section = section_names[section.capitalize()] ++ lbl = contact_editor.child(roleName='label', name=section) ++ panel = lbl.findAncestor(GenericPredicate(roleName='panel')) ++ textboxes = panel.findChildren(GenericPredicate(roleName='text')) ++ ++ # Scroll to the bottom of the page if needed ++ pagetab = panel.findAncestor(GenericPredicate(roleName='page tab')) ++ for scroll in pagetab.findChildren(lambda x: x.roleName == 'scroll bar'): ++ if scroll_to_bottom: ++ scroll.value = scroll.maxValue ++ else: ++ scroll.value = 0 ++ ++ # Expand section if button exists ++ button = panel.findChild( ++ GenericPredicate(roleName='push button', name=section), ++ retry=False, requireResult=False) ++ # Expand button if any of textboxes is not visible ++ if button and (False in [x.showing for x in textboxes]): ++ button.click() ++ ++ comboboxes = panel.findChildren(GenericPredicate(roleName='combo box')) ++ ++ # Rearrange comboboxes and textboxes according to their position ++ result = [] ++ for combo in comboboxes: ++ combo_row = combo.position[1] ++ matching_textboxes = [ ++ x for x in textboxes ++ if ((x.position[1] - combo_row) == 0) and (x.position[0] > combo.position[0])] ++ if (matching_textboxes != []): ++ correct_textbox = min(matching_textboxes, key=lambda x: x.position[0]) ++ result.append((combo, correct_textbox)) ++ ++ comboboxes = [x[0] for x in result][::-1] ++ textboxes = [x[1] for x in result][::-1] ++ ++ return (textboxes, comboboxes, button) ++ ++ ++@step(u'Set {section} in contact editor to') ++def set_contact_emails_to_value(context, section): ++ (textboxes, comboboxes, collapse_button) = get_combobox_textbox_object( ++ context.app.contact_editor, section) ++ ++ # clear existing data ++ for textbox in textboxes: ++ textbox.text = "" ++ ++ for index, row in enumerate(context.table.rows): ++ # Check that we have sufficient amount of textboxes ++ # If not - click plus buttons until we have enough ++ if index == len(textboxes): ++ textboxes[0].parent.child(roleName="push button").click() ++ (textboxes, comboboxes, collapse_button) = get_combobox_textbox_object( ++ context.app.contact_editor, section) ++ textboxes[index].text = row['Value'] ++ if comboboxes[index].combovalue != row['Field']: ++ comboboxes[index].combovalue = row['Field'] ++ ++ ++@then(u'{section} are set to') ++def emails_are_set_to(context, section): ++ (textboxes, comboboxes, collapse_button) = get_combobox_textbox_object( ++ context.app.contact_editor, section, section == 'IMs') ++ ++ actual = [] ++ for index, textbox in enumerate(textboxes): ++ combo_value = textbox.text ++ if combo_value.strip() != '': ++ type_value = comboboxes[index].combovalue ++ actual.append({'Field': unicode(type_value), 'Value': unicode(combo_value)}) ++ actual = sorted(actual) ++ ++ expected = [] ++ for row in context.table: ++ expected.append({'Field': row['Field'], 'Value': row['Value']}) ++ expected = sorted(expected) ++ ++ assert actual == expected, "Incorrect %s value:\nexpected:%s\n but was:%s" % ( ++ row['Field'], expected, actual) ++ ++ # Collapse the section after check ++ collapse_button.click() ++ ++ ++@step(u'Tick "Wants to receive HTML mail" checkbox') ++def tick_checkbox(context): ++ context.app.contact_editor.childNamed("Wants to receive HTML mail").click() ++ ++ ++@step(u'"Wants to receive HTML mail" checkbox is ticked') ++def checkbox_is_ticked(context): ++ check_state = context.app.childNamed("Wants to receive HTML mail").checked ++ assert check_state, "Incorrect checkbox state" ++ ++ ++@step(u'Switch to "{name}" tab in contact editor') ++def switch_to_tab(context, name): ++ context.app.contact_editor.tab(name).click() ++ ++ ++@step(u'Set the following properties in contact editor') ++def set_properties(context): ++ for row in context.table.rows: ++ context.execute_steps(u""" ++ * Set "%s" in contact editor to "%s" ++ """ % (row['Field'], row['Value'])) ++ ++ ++@step(u'The following properties in contact editor are set') ++def verify_properties(context): ++ for row in context.table.rows: ++ context.execute_steps(u""" ++ Then "%s" property is set to "%s" ++ """ % (row['Field'], row['Value'])) ++ ++ ++@step(u'Set the following properties in "{section}" section of contact editor') ++def set_properties_in_section(context, section): ++ for row in context.table.rows: ++ context.execute_steps(u""" ++ * Set "%s" in "%s" section of contact editor to "%s" ++ """ % (row['Field'], section, row['Value'])) ++ ++ ++@step(u'The following properties in "{section}" section of contact editor are set') ++def verify_properties_in_section(context, section): ++ for row in context.table.rows: ++ context.execute_steps(u""" ++ Then "%s" property in "%s" section is set to "%s" ++ """ % (row['Field'], section, row['Value'])) ++ ++ ++@step(u'Set the following note for the contact') ++def set_note_for_contact(context): ++ context.app.contact_editor.child( ++ roleName='page tab', name='Notes').textentry('').text = context.text ++ ++ ++@then(u'The following note is set for the contact') ++def verify_note_set_for_contact(context): ++ actual = context.app.contact_editor.child( ++ roleName='page tab', name='Notes').textentry('').text ++ expected = context.text ++ assert actual == expected,\ ++ "Incorrect note value:\nexpected:%s\n but was:%s" % (expected, actual) ++ ++ ++@step(u'Set "{field_name}" in "{section}" section of contact editor to "{field_value}"') ++def set_field_in_section_to_value(context, field_name, section, field_value): ++ element = get_element_by_name( ++ context.app.contact_editor, field_name, section=section) ++ if element.roleName == "text": ++ element.text = field_value ++ elif element.roleName == "combo box": ++ element.combovalue = field_value +diff -up evolution-3.13.4/tests/steps/initial_setup_steps.py.missing-tests evolution-3.13.4/tests/steps/initial_setup_steps.py +--- evolution-3.13.4/tests/steps/initial_setup_steps.py.missing-tests 2014-07-30 11:21:47.032172902 +0200 ++++ evolution-3.13.4/tests/steps/initial_setup_steps.py 2014-07-30 11:21:47.032172902 +0200 +@@ -0,0 +1,130 @@ ++# -*- coding: UTF-8 -*- ++from behave import step ++ ++from common_steps import check_for_errors ++from dogtail.tree import root ++from os import system ++from pyatspi import STATE_SENSITIVE ++from time import sleep ++ ++ ++@step(u'Open Evolution and setup fake account') ++def open_evolution_and_setup_fake_account(context): ++ system("evolution --force-shutdown 2&> /dev/null") ++ context.execute_steps(u'* Start a new Evolution instance') ++ window = context.app.child(roleName='frame') ++ if window.name == 'Welcome': ++ context.execute_steps(u""" ++ * Complete Welcome dialog in Evolution Account Assistant ++ * Complete Restore from Backup dialog in Evolution Account Assistant ++ * Complete Identity dialog setting name to "GNOME QE User" and email address to "test@test" ++ * Wait for account is being looked up dialog in Evolution Account Assistant ++ * Complete Receiving Email dialog of Evolution Account Assistant setting ++ | Field | Value | ++ | Server Type: | None | ++ * Complete Sending Email dialog of Evolution Account Assistant setting ++ | Field | Value | ++ | Server Type: | Sendmail | ++ * Complete Account Summary in Evolution Account Assistant ++ * Complete Done dialog in Evolution Account Assistant ++ """) ++ ++ ++@step(u'Complete Receiving Options in Evolution Account Assistant') ++@step(u'Complete Account Summary in Evolution Account Assistant') ++@step(u'Complete Restore from Backup dialog in Evolution Account Assistant') ++@step(u'Complete Welcome dialog in Evolution Account Assistant') ++def evo_account_assistant_dummy_dialogs(context): ++ # nothing to do here, skip it ++ window = context.app.child(roleName='frame') ++ click_next(window) ++ ++ ++@step(u'Complete Identity dialog setting name to "{name}" and email address to "{email}"') ++def evo_account_assistant_identity_dialog(context, name, email): ++ # nothing to do here, skip it ++ window = context.app.child(roleName='frame') ++ window.childLabelled("Full Name:").text = name ++ window.childLabelled("Email Address:").text = email ++ click_next(window) ++ ++ ++@step(u"Wait for account is being looked up dialog in Evolution Account Assistant") ++def wait_for_account_to_be_looked_up(context): ++ window = context.app.child(roleName='frame') ++ skip_lookup = window.findChildren(lambda x: x.name == 'Skip Lookup') ++ visible_skip_lookup = [x for x in skip_lookup if x.showing] ++ if len(visible_skip_lookup) > 0: ++ visible_skip_lookup = visible_skip_lookup[0] ++ # bug https://bugzilla.gnome.org/show_bug.cgi?id=726539: Skip Lookup is not being removed ++ #assert wait_until(lambda x: not x.showing, visible_skip_lookup),\ ++ # "Skip Lookup button didn't dissappear" ++ ++ ++def click_next(window): ++ # As initial wizard dialog creates a bunch of 'Next' buttons ++ # We have to click to the visible and enabled one ++ buttons = window.findChildren(lambda x: x.name == 'Next' and x.showing and ++ STATE_SENSITIVE in x.getState().getStates()) ++ if buttons == []: ++ raise Exception("Enabled Next button was not found") ++ else: ++ buttons[0].click() ++ ++ ++@step(u'Complete {sending_or_receiving} Email dialog of Evolution Account Assistant setting') ++def evo_account_assistant_receiving_email_dialog_from_table(context, sending_or_receiving): ++ window = context.app.child(roleName='frame') ++ for row in context.table: ++ label = str(row['Field']) ++ value = str(row['Value']) ++ filler = window.child(roleName='filler', name='%s Email' % sending_or_receiving) ++ widgets = filler.findChildren(lambda x: x.showing) ++ visible_widgets = [x for x in widgets if x.labeller and x.labeller.name == label] ++ if len(visible_widgets) == 0: ++ raise RuntimeError("Cannot find visible widget labelled '%s'" % label) ++ widget = visible_widgets[0] ++ if widget.roleName == 'combo box': ++ if label != 'Port:': ++ widget.click() ++ widget.menuItem(value).click() ++ else: ++ # Port is a combobox, but you can type your port there ++ widget.textentry('').text = value ++ widget.textentry('').grab_focus() ++ widget.textentry('').keyCombo("") ++ if widget.roleName == 'text': ++ widget.text = value ++ ++ # Check for password here and accept self-generated certificate (if appears) ++ btns = window.findChildren(lambda x: x.name == 'Check for Supported Types') ++ visible_btns = [w for w in btns if w.showing] ++ if visible_btns == []: ++ click_next(window) ++ return ++ visible_btns[0].click() ++ ++ # Confirm all certificates by clicking 'Accept Permanently' until dialog is visible ++ apps = [x.name for x in root.applications()] ++ if 'evolution-user-prompter' in apps: ++ prompter = root.application('evolution-user-prompter') ++ dialog = prompter.child(roleName='dialog') ++ while dialog.showing: ++ if prompter.findChild(lambda x: x.name == 'Accept Permanently', retry=False, requireResult=False): ++ prompter.button('Accept Permanently').click() ++ else: ++ sleep(0.1) ++ ++ # Wait until Cancel button disappears ++ cancel = filler.findChildren(lambda x: x.name == 'Cancel')[0] ++ while cancel.showing: ++ sleep(0.1) ++ check_for_errors(context) ++ click_next(window) ++ ++ ++@step(u'Complete Done dialog in Evolution Account Assistant') ++def evo_account_assistant_done_dialog(context): ++ # nothing to do here, skip it ++ window = context.app.child(roleName='frame') ++ window.button('Apply').click() +diff -up evolution-3.13.4/tests/steps/steps.py.missing-tests evolution-3.13.4/tests/steps/steps.py +--- evolution-3.13.4/tests/steps/steps.py.missing-tests 2014-07-30 11:21:47.032172902 +0200 ++++ evolution-3.13.4/tests/steps/steps.py 2014-07-30 11:21:47.032172902 +0200 +@@ -0,0 +1,177 @@ ++# -*- coding: UTF-8 -*- ++from behave import step, then ++from common_steps import wait_until ++from dogtail.tree import root ++from dogtail.rawinput import keyCombo ++from time import sleep, time ++from os import system ++from gi.repository import Gio, GLib ++ ++ ++@step(u'Help section "{name}" is displayed') ++def help_is_displayed(context, name): ++ try: ++ context.yelp = root.application('yelp') ++ frame = context.yelp.child(roleName='frame') ++ wait_until(lambda x: x.showing, frame) ++ sleep(1) ++ context.assertion.assertEquals(name, frame.name) ++ finally: ++ system("killall yelp") ++ ++ ++@step(u'Evolution has {num:d} window opened') ++@step(u'Evolution has {num:d} windows opened') ++def evolution_has_num_windows_opened(context, num): ++ windows = context.app.findChildren(lambda x: x.roleName == 'frame') ++ context.assertion.assertEqual(len(windows), num) ++ ++ ++@step(u'Preferences dialog is opened') ++def preferences_dialog_opened(context): ++ context.app.window('Evolution Preferences') ++ ++ ++@step(u'"{name}" view is opened') ++def view_is_opened(context, name): ++ if name != 'Mail': ++ window_name = context.app.children[0].name ++ context.assertion.assertEquals(window_name, "%s - Evolution" % name) ++ else: ++ # A special case for Mail ++ context.assertion.assertTrue(context.app.menu('Message').showing) ++ ++ ++def get_visible_searchbar(context): ++ """Wait for searchbar to become visible""" ++ def get_searchbars(): ++ return context.app.findChildren(lambda x: x.labeller.name == 'Search:' and x.showing) ++ assert wait_until(lambda x: len(x()) > 0, get_searchbars), "No visible searchbars found" ++ return get_searchbars()[0] ++ ++ ++@step(u'Open "{section_name}" section') ++def open_section_by_name(context, section_name): ++ wait_until(lambda x: x.showing, context.app.menu('View')) ++ sleep(0.2) ++ context.app.menu('View').click() ++ context.app.menu('View').menu('Window').point() ++ context.app.menu('View').menu('Window').menuItem(section_name).click() ++ ++ # Find a search bar ++ context.app.search_bar = get_visible_searchbar(context) ++ ++ # Check that service required for this sections is running ++ required_services = { ++ 'Mail': 'org.gnome.evolution.dataserver.Sources', ++ 'Calendar': 'org.gnome.evolution.dataserver.Calendar', ++ 'Tasks': 'org.gnome.evolution.dataserver.Calendar', ++ 'Memos': 'org.gnome.evolution.dataserver.Calendar', ++ 'Contacts': 'org.gnome.evolution.dataserver.AddressBook', ++ } ++ required_service = required_services[section_name] ++ bus = Gio.bus_get_sync(Gio.BusType.SESSION, None) ++ dbus_proxy = Gio.DBusProxy.new_sync(bus, Gio.DBusProxyFlags.NONE, None, ++ 'org.freedesktop.DBus', ++ '/org/freedesktop/DBus', ++ 'org.freedesktop.DBus', None) ++ for attempt in xrange(0, 10): ++ result = dbus_proxy.call_sync( ++ 'ListNames', None, Gio.DBusCallFlags.NO_AUTO_START, 500, None) ++ sleep(1) ++ if True in [required_service in x for x in result[0]]: ++ return ++ raise RuntimeError("%s service was not found" % required_service) ++ ++ ++@step(u'"{name}" menu is opened') ++def menu_is_opened(context, name): ++ sleep(0.5) ++ menu = context.app.menu(name) ++ children_displayed = [x.showing for x in menu.children] ++ context.assertion.assertTrue(True in children_displayed, "Menu '%s' is not opened" % name) ++ ++ ++@step(u'Press "{sequence}"') ++def press_button_sequence(context, sequence): ++ keyCombo(sequence) ++ sleep(0.5) ++ ++ ++@then(u'Evolution is closed') ++def evolution_is_closed(context): ++ assert wait_until(lambda x: x.dead, context.app),\ ++ "Evolution window is opened" ++ context.assertion.assertFalse(context.app_class.isRunning(), "Evolution is in the process list") ++ ++ ++@step(u'Message composer with title "{name}" is opened') ++def message_composer_is_opened(context, name): ++ context.app.composer = context.app.window(name) ++ ++ ++@then(u'Contact editor window with title "{title}" is opened') ++def contact_editor_with_label_is_opened(context, title): ++ context.app.contact_editor = context.app.dialog(title) ++ context.assertion.assertIsNotNone( ++ context.app.contact_editor, "Contact Editor was not found") ++ context.assertion.assertTrue( ++ context.app.contact_editor.showing, "Contact Editor didn't appear") ++ ++ ++@then(u'Contact editor window is opened') ++def contact_editor_is_opened(context): ++ context.execute_steps(u'Then Contact editor window with title "Contact Editor" is opened') ++ ++ ++@then(u'Contact List editor window is opened') ++def contact_list_editor_is_opened(context): ++ context.execute_steps( ++ u'Then Contact List editor window with title "Contact List Editor" is opened') ++ ++ ++@then(u'Contact List editor window with title "{name}" is opened') ++def contact_list_editor__with_name_is_opened(context, name): ++ context.app.contact_list_editor = context.app.dialog(name) ++ ++ ++@step(u'Memo editor with title "{name}" is opened') ++def memo_editor_is_opened(context, name): ++ context.execute_steps(u'* Task editor with title "%s" is opened' % name) ++ ++ ++@step(u'Shared Memo editor with title "{name}" is opened') ++def shared_memo_editor_is_opened(context, name): ++ context.execute_steps(u'* Task editor with title "%s" is opened' % name) ++ ++ ++@step(u'Task editor with title "{title}" is opened') ++def task_editor_with_title_is_opened(context, title): ++ context.app.task_editor = context.app.window(title) ++ # Spoof event_editor for assigned tasks ++ if 'Assigned' in title: ++ context.app.event_editor = context.app.task_editor ++ ++ ++@step(u'Event editor with title "{name}" is displayed') ++def event_editor_with_name_displayed(context, name): ++ context.app.event_editor = context.app.window(name) ++ ++ ++@step(u'Wait for email to synchronize') ++def wait_for_mail_folder_to_synchronize(context): ++ # Wait until Google calendar is loaded ++ for attempt in range(0, 10): ++ start_time = time() ++ try: ++ spinners = context.app.findChildren(lambda x: x.name == 'Spinner') ++ for spinner in spinners: ++ try: ++ while spinner.showing: ++ sleep(0.1) ++ if (time() - start_time) > 180: ++ raise RuntimeError("Mail takes too long to synchronize") ++ except GLib.GError: ++ continue ++ except (GLib.GError, TypeError): ++ continue diff --git a/evolution.spec b/evolution.spec index 865bee1..45faed1 100644 --- a/evolution.spec +++ b/evolution.spec @@ -50,6 +50,8 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +Patch03: evolution-3.13.4-missing-tests.patch + ## Dependencies ### Requires: gvfs @@ -216,6 +218,7 @@ the functionality of the installed %{name} package. %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .missing-tests # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -545,6 +548,7 @@ rm -rf $RPM_BUILD_ROOT * Wed Jul 30 2014 Milan Crha - 3.13.4-1 - Update to 3.13.4 - Introduce tests subpackage with installed tests +- Add patch to add missing tests files in the distribution tarball - Remove patch to drop gnome-icon-theme dependency (fixed upstream) * Mon Jul 14 2014 Milan Crha - 3.12.4-1 From a90efe993bce09b738400967b18a49ac57182e24 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 30 Jul 2014 12:38:26 +0200 Subject: [PATCH 563/844] noarch sub-packages may not require packages with %{?_isa} --- evolution.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 45faed1..13eea48 100644 --- a/evolution.spec +++ b/evolution.spec @@ -148,7 +148,7 @@ Development files needed for building things which link against %{name}. Summary: Developer documentation for Evolution Group: Development/Libraries Requires: devhelp -Requires: %{name}-devel%{?_isa} = %{version}-%{release} +Requires: %{name}-devel = %{version}-%{release} BuildArch: noarch %description devel-docs @@ -158,7 +158,7 @@ This package contains developer documentation for Evolution. %package help Group: Applications/Productivity Summary: Help files for %{name} -Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: %{name} = %{version}-%{release} Requires: yelp BuildArch: noarch From 6a927c010971d95317cf7467c2f7311227278e18 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 16 Aug 2014 11:40:48 +0000 Subject: [PATCH 564/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 13eea48..3dd7189 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ Name: evolution Version: 3.13.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -545,6 +545,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Sat Aug 16 2014 Fedora Release Engineering - 3.13.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + * Wed Jul 30 2014 Milan Crha - 3.13.4-1 - Update to 3.13.4 - Introduce tests subpackage with installed tests From 2f8441542ba16b29607fd50b362c09f48ece31f6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 25 Aug 2014 09:10:30 +0200 Subject: [PATCH 565/844] Update to 3.13.5 --- .gitignore | 1 + evolution-3.13.4-missing-tests.patch | 1282 -------------------------- evolution.spec | 11 +- sources | 2 +- 4 files changed, 8 insertions(+), 1288 deletions(-) delete mode 100644 evolution-3.13.4-missing-tests.patch diff --git a/.gitignore b/.gitignore index 1e5cd33..08b92b7 100644 --- a/.gitignore +++ b/.gitignore @@ -77,3 +77,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.12.3.tar.xz /evolution-3.12.4.tar.xz /evolution-3.13.4.tar.xz +/evolution-3.13.5.tar.xz diff --git a/evolution-3.13.4-missing-tests.patch b/evolution-3.13.4-missing-tests.patch deleted file mode 100644 index cab4f03..0000000 --- a/evolution-3.13.4-missing-tests.patch +++ /dev/null @@ -1,1282 +0,0 @@ -diff -up evolution-3.13.4/tests/addressbook.feature.missing-tests evolution-3.13.4/tests/addressbook.feature ---- evolution-3.13.4/tests/addressbook.feature.missing-tests 2014-07-30 11:21:47.031172903 +0200 -+++ evolution-3.13.4/tests/addressbook.feature 2014-07-30 11:21:47.031172903 +0200 -@@ -0,0 +1,101 @@ -+Feature: Addressbook: File: Create contacts -+ -+ Background: -+ * Open Evolution and setup fake account -+ * Open "Contacts" section -+ * Select "Personal" addressbook -+ * Change categories view to "Any Category" -+ * Delete all contacts containing "Doe" -+ -+ @addressbook_contacts -+ Scenario: Create a simple contact -+ * Create a new contact -+ * Set "Full Name..." in contact editor to "John Doe" -+ * Save the contact -+ * Refresh addressbook -+ * Select "Doe, John" contact -+ * Open contact editor for selected contact -+ Then "Full Name..." property is set to "John Doe" -+ -+ @addressbook_contacts -+ Scenario: Create a new contact with data -+ * Create a new contact -+ * Set "Full Name..." in contact editor to "Jimmy Doe" -+ * Set "Nickname:" in contact editor to "Unknown" -+ * Set emails in contact editor to -+ | Field | Value | -+ | Work Email | jimmy.doe@company.com | -+ | Home Email | jimmy_doe_72@gmail.com | -+ | Other Email | jimmydoe72@yahoo.com | -+ | Other Email | xxjimmyxx@free_email.com | -+ * Tick "Wants to receive HTML mail" checkbox -+ * Set phones in contact editor to -+ | Field | Value | -+ | Assistant Phone | 123 | -+ | Business Phone | 234 | -+ | Business Fax | 345 | -+ | Callback Phone | 456 | -+ | Car Phone | 567 | -+ | Company Phone | 678 | -+ | Home Phone | 789 | -+ | Home Fax | 890 | -+ | ISDN | 123 | -+ | Mobile Phone | 234 | -+ | Other Phone | 345 | -+ | Other Fax | 456 | -+ | Pager | 567 | -+ | Primary Phone | 678 | -+ | Radio | 789 | -+ | Telex | 890 | -+ * Set IMs in contact editor to -+ | Field | Value | -+ | AIM | 123 | -+ | Jabber | 234 | -+ | Yahoo | 345 | -+ | Gadu-Gadu | 456 | -+ | MSN | 123 | -+ | ICQ | 234 | -+ | GroupWise | 345 | -+ | Skype | jimmy.doe | -+ | Twitter | @jimmydoe | -+ * Save the contact -+ * Refresh addressbook -+ * Select "Doe, Jimmy" contact -+ * Open contact editor for selected contact -+ Then "Nickname:" property is set to "Unknown" -+ And Emails are set to -+ | Field | Value | -+ | Work Email | jimmy.doe@company.com | -+ | Home Email | jimmy_doe_72@gmail.com | -+ | Other Email | jimmydoe72@yahoo.com | -+ | Other Email | xxjimmyxx@free_email.com | -+ And "Wants to receive HTML mail" checkbox is ticked -+ And Phones are set to -+ | Field | Value | -+ | Assistant Phone | 123 | -+ | Business Phone | 234 | -+ | Business Fax | 345 | -+ | Callback Phone | 456 | -+ | Car Phone | 567 | -+ | Company Phone | 678 | -+ | Home Phone | 789 | -+ | Home Fax | 890 | -+ | ISDN | 123 | -+ | Mobile Phone | 234 | -+ | Other Phone | 345 | -+ | Other Fax | 456 | -+ | Pager | 567 | -+ | Primary Phone | 678 | -+ | Radio | 789 | -+ | Telex | 890 | -+ And IMs are set to -+ | Field | Value | -+ | AIM | 123 | -+ | Jabber | 234 | -+ | Yahoo | 345 | -+ | Gadu-Gadu | 456 | -+ | MSN | 123 | -+ | ICQ | 234 | -+ | GroupWise | 345 | -+ | Skype | jimmy.doe | -+ | Twitter | @jimmydoe | -diff -up evolution-3.13.4/tests/common_steps.py.missing-tests evolution-3.13.4/tests/common_steps.py ---- evolution-3.13.4/tests/common_steps.py.missing-tests 2014-07-30 11:21:47.031172903 +0200 -+++ evolution-3.13.4/tests/common_steps.py 2014-07-30 11:21:47.031172903 +0200 -@@ -0,0 +1,238 @@ -+# -*- coding: UTF-8 -*- -+from dogtail.utils import isA11yEnabled, enableA11y -+if isA11yEnabled() is False: -+ enableA11y(True) -+ -+from time import time, sleep -+from functools import wraps -+from os import strerror, errno, system -+from signal import signal, alarm, SIGALRM -+from subprocess import Popen, PIPE -+from behave import step -+from gi.repository import GLib, Gio -+import fcntl, os -+ -+from dogtail.rawinput import keyCombo, absoluteMotion, pressKey -+from dogtail.tree import root -+from unittest import TestCase -+ -+ -+# Create a dummy unittest class to have nice assertions -+class dummy(TestCase): -+ def runTest(self): # pylint: disable=R0201 -+ assert True -+ -+ -+def wait_until(my_lambda, element, timeout=30, period=0.25): -+ """ -+ This function keeps running lambda with specified params until the result is True -+ or timeout is reached -+ Sample usages: -+ * wait_until(lambda x: x.name != 'Loading...', context.app) -+ Pause until window title is not 'Loading...'. -+ Return False if window title is still 'Loading...' -+ Throw an exception if window doesn't exist after default timeout -+ -+ * wait_until(lambda element, expected: x.text == expected, element, ('Expected text')) -+ Wait until element text becomes the expected (passed to the lambda) -+ -+ """ -+ exception_thrown = None -+ mustend = int(time()) + timeout -+ while int(time()) < mustend: -+ try: -+ if my_lambda(element): -+ return True -+ except Exception as e: -+ # If lambda has thrown the exception we'll re-raise it later -+ # and forget about if lambda passes -+ exception_thrown = e -+ sleep(period) -+ if exception_thrown: -+ raise exception_thrown -+ else: -+ return False -+ -+ -+class TimeoutError(Exception): -+ """ -+ Timeout exception class for limit_execution_time_to function -+ """ -+ pass -+ -+ -+def limit_execution_time_to( -+ seconds=10, error_message=strerror(errno.ETIME)): -+ """ -+ Decorator to limit function execution to specified limit -+ """ -+ def decorator(func): -+ def _handle_timeout(signum, frame): -+ raise TimeoutError(error_message) -+ -+ def wrapper(*args, **kwargs): -+ signal(SIGALRM, _handle_timeout) -+ alarm(seconds) -+ try: -+ result = func(*args, **kwargs) -+ finally: -+ alarm(0) -+ return result -+ -+ return wraps(func)(wrapper) -+ -+ return decorator -+ -+ -+class App(object): -+ """ -+ This class does all basic events with the app -+ """ -+ def __init__( -+ self, appName, shortcut='', a11yAppName=None, -+ forceKill=True, parameters='', recordVideo=False): -+ """ -+ Initialize object App -+ appName command to run the app -+ shortcut default quit shortcut -+ a11yAppName app's a11y name is different than binary -+ forceKill is the app supposed to be kill before/after test? -+ parameters has the app any params needed to start? (only for startViaCommand) -+ recordVideo start gnome-shell recording while running the app -+ """ -+ self.appCommand = appName -+ self.shortcut = shortcut -+ self.forceKill = forceKill -+ self.parameters = parameters -+ self.internCommand = self.appCommand.lower() -+ self.a11yAppName = a11yAppName -+ self.recordVideo = recordVideo -+ self.pid = None -+ -+ # a way of overcoming overview autospawn when mouse in 1,1 from start -+ pressKey('Esc') -+ absoluteMotion(100, 100, 2) -+ -+ # attempt to make a recording of the test -+ if self.recordVideo: -+ keyCombo('R') -+ -+ def isRunning(self): -+ """ -+ Is the app running? -+ """ -+ if self.a11yAppName is None: -+ self.a11yAppName = self.internCommand -+ -+ # Trap weird bus errors -+ for attempt in xrange(0, 30): -+ sleep(1) -+ try: -+ return self.a11yAppName in [x.name for x in root.applications()] -+ except GLib.GError: -+ continue -+ raise Exception("10 at-spi errors, seems that bus is blocked") -+ -+ def kill(self): -+ """ -+ Kill the app via 'killall' -+ """ -+ if self.recordVideo: -+ keyCombo('R') -+ -+ try: -+ self.process.kill() -+ except: -+ # Fall back to killall -+ Popen("killall " + self.appCommand, shell=True).wait() -+ -+ def startViaCommand(self): -+ """ -+ Start the app via command -+ """ -+ if self.forceKill and self.isRunning(): -+ self.kill() -+ assert not self.isRunning(), "Application cannot be stopped" -+ -+ #command = "%s %s" % (self.appCommand, self.parameters) -+ #self.pid = run(command, timeout=5) -+ self.process = Popen(self.appCommand.split() + self.parameters.split(), -+ stdout=PIPE, stderr=PIPE, bufsize=0) -+ self.pid = self.process.pid -+ -+ assert self.isRunning(), "Application failed to start" -+ return root.application(self.a11yAppName) -+ -+ def closeViaShortcut(self): -+ """ -+ Close the app via shortcut -+ """ -+ if not self.isRunning(): -+ raise Exception("App is not running") -+ -+ keyCombo(self.shortcut) -+ assert not self.isRunning(), "Application cannot be stopped" -+ -+ -+@step(u'Start a new Evolution instance') -+def start_new_evolution_instance(context): -+ context.app = context.app_class.startViaCommand() -+ -+ -+def cleanup(): -+ # Remove cached data and settings -+ folders = ['~/.local/share/evolution', '~/.cache/evolution', '~/.config/evolution'] -+ for folder in folders: -+ system("rm -rf %s > /dev/null" % folder) -+ -+ # Clean up goa data -+ system("rm -rf ~/.config/goa-1.0/accounts.conf") -+ system("killall goa-daemon 2&> /dev/null") -+ -+ # Reset GSettings -+ schemas = [x for x in Gio.Settings.list_schemas() if 'evolution' in x.lower()] -+ for schema in schemas: -+ system("gsettings reset-recursively %s" % schema) -+ -+ # Skip warning dialog -+ system("gsettings set org.gnome.evolution.shell skip-warning-dialog true") -+ # Show switcher buttons as icons (to minimize tree scrolling) -+ system("gsettings set org.gnome.evolution.shell buttons-style icons") -+ # Skip default mailer handler dialog -+ system("gsettings set org.gnome.evolution.mail prompt-check-if-default-mailer false") -+ -+ -+def check_for_errors(context): -+ """Check that no error is displayed on Evolution UI""" -+ # Don't try to check for errors on dead app -+ if not context.app or context.app.dead: -+ return -+ alerts = context.app.findChildren(lambda x: x.roleName == 'alert') -+ if not alerts: -+ # alerts can also return None -+ return -+ alerts = filter(lambda x: x.showing, alerts) -+ if len(alerts) > 0: -+ labels = alerts[0].findChildren(lambda x: x.roleName == 'label') -+ messages = [x.name for x in labels] -+ -+ if alerts[0].name != 'Error' and alerts[0].showing: -+ # Erase the configuration and start all over again -+ system("evolution --force-shutdown &> /dev/null") -+ -+ # Remove previous data -+ folders = ['~/.local/share/evolution', '~/.cache/evolution', '~/.config/evolution'] -+ for folder in folders: -+ system("rm -rf %s > /dev/null" % folder) -+ -+ raise RuntimeError("Error occurred: %s" % messages) -+ -+ -+def non_block_read(output): -+ fd = output.fileno() -+ fl = fcntl.fcntl(fd, fcntl.F_GETFL) -+ fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK) -+ try: -+ return output.read() -+ except: -+ return "" -diff -up evolution-3.13.4/tests/environment.py.missing-tests evolution-3.13.4/tests/environment.py ---- evolution-3.13.4/tests/environment.py.missing-tests 2014-07-30 11:21:47.031172903 +0200 -+++ evolution-3.13.4/tests/environment.py 2014-07-30 11:21:47.031172903 +0200 -@@ -0,0 +1,82 @@ -+# -*- coding: UTF-8 -*- -+ -+from time import sleep, localtime, strftime -+from dogtail.utils import isA11yEnabled, enableA11y -+if not isA11yEnabled(): -+ enableA11y(True) -+ -+from common_steps import App, dummy, cleanup, non_block_read -+from dogtail.config import config -+import os -+ -+ -+def before_all(context): -+ """Setup evolution stuff -+ Being executed once before any test -+ """ -+ -+ try: -+ # Close running evo instances -+ os.system("evolution --force-shutdown > /dev/null") -+ -+ # Skip dogtail actions to print to stdout -+ config.logDebugToStdOut = False -+ config.typingDelay = 0.2 -+ -+ # Include assertion object -+ context.assertion = dummy() -+ -+ # Cleanup existing data before any test -+ cleanup() -+ -+ # Store scenario start time for session logs -+ context.log_start_time = strftime("%Y-%m-%d %H:%M:%S", localtime()) -+ -+ context.app_class = App('evolution') -+ -+ except Exception as e: -+ print("Error in before_all: %s" % e.message) -+ -+ -+def after_step(context, step): -+ try: -+ if step.status == 'failed' and hasattr(context, "embed"): -+ # Embed screenshot if HTML report is used -+ os.system("dbus-send --print-reply --session --type=method_call " + -+ "--dest='org.gnome.Shell.Screenshot' " + -+ "'/org/gnome/Shell/Screenshot' " + -+ "org.gnome.Shell.Screenshot.Screenshot " + -+ "boolean:true boolean:false string:/tmp/screenshot.png") -+ context.embed('image/png', open("/tmp/screenshot.png", 'r').read()) -+ except Exception as e: -+ print("Error in after_step: %s" % str(e)) -+ -+ -+def after_scenario(context, scenario): -+ """Teardown for each scenario -+ Kill evolution (in order to make this reliable we send sigkill) -+ """ -+ try: -+ # Attach journalctl logs -+ if hasattr(context, "embed"): -+ os.system("journalctl /usr/bin/gnome-session --no-pager -o cat --since='%s'> /tmp/journal-session.log" % context.log_start_time) -+ data = open("/tmp/journal-session.log", 'r').read() -+ if data: -+ context.embed('text/plain', data) -+ -+ context.app_class.kill() -+ -+ stdout = non_block_read(context.app_class.process.stdout) -+ stderr = non_block_read(context.app_class.process.stderr) -+ -+ if stdout: -+ context.embed('text/plain', stdout) -+ -+ if stderr: -+ context.embed('text/plain', stderr) -+ -+ # Make some pause after scenario -+ sleep(1) -+ except Exception as e: -+ # Stupid behave simply crashes in case exception has occurred -+ print("Error in after_scenario: %s" % e.message) -diff -up evolution-3.13.4/tests/shortcuts.feature.missing-tests evolution-3.13.4/tests/shortcuts.feature ---- evolution-3.13.4/tests/shortcuts.feature.missing-tests 2014-07-30 11:21:47.032172902 +0200 -+++ evolution-3.13.4/tests/shortcuts.feature 2014-07-30 11:21:47.031172903 +0200 -@@ -0,0 +1,135 @@ -+Feature: Shortcuts -+ -+ Background: -+ * Open Evolution and setup fake account -+ -+ @general_shortcuts -+ Scenario: Ctrl-Q to quit application - two instances -+ * Start a new Evolution instance -+ * Press "Q" -+ Then Evolution is closed -+ -+ @general_shortcuts -+ Scenario: F1 to launch help -+ * Press "" -+ Then Help section "Evolution Mail and Calendar" is displayed -+ -+ @general_shortcuts -+ Scenario: Shift-Ctrl-W to open a new window -+ * Press "W" -+ Then Evolution has 2 windows opened -+ -+ @general_shortcuts -+ Scenario: Ctrl-W to close a window -+ * Press "W" -+ * Press "W" -+ Then Evolution has 1 window opened -+ -+ @general_shortcuts -+ Scenario: Ctrl-Shift-S to open Preferences -+ * Press "S" -+ Then Preferences dialog is opened -+ -+ @mail_shortcuts -+ Scenario: Mail: Ctrl-Shift-M to compose new message -+ * Open "Mail" section -+ * Press "M" -+ Then Message composer with title "Compose Message" is opened -+ -+ @contacts_shortcuts -+ Scenario: Contacts: Ctrl-Shift-C to create new contact -+ * Open "Contacts" section -+ * Press "C" -+ Then Contact editor window is opened -+ -+ @contacts_shortcuts -+ Scenario: Contacts: Ctrl-Shift-L to create new contact list -+ * Open "Contacts" section -+ * Press "L" -+ Then Contact List editor window is opened -+ -+ @calendar_shortcuts -+ Scenario: Calendar: Ctrl-Shift-A to create new appointment -+ * Open "Calendar" section -+ * Press "A" -+ Then Event editor with title "Appointment - No Summary" is displayed -+ -+ @calendar_shortcuts -+ Scenario: Calendar: Ctrl-Shift-E to create new meeting -+ * Open "Calendar" section -+ * Press "E" -+ Then Event editor with title "Meeting - No Summary" is displayed -+ -+ @calendar_shortcuts -+ Scenario: Tasks: Ctrl-Shift-T to create new task -+ * Open "Tasks" section -+ * Press "T" -+ Then Task editor with title "Task - No Summary" is opened -+ -+ @memos_shortcuts -+ Scenario: Memos: Ctrl-Shift-O to create new memo -+ * Open "Memos" section -+ * Press "O" -+ Then Memo editor with title "Memo - No Summary" is opened -+ -+ @memos_shortcuts -+ Scenario: Memos: Ctrl-Shift-O to create new task -+ * Open "Memos" section -+ * Press "O" -+ Then Shared memo editor with title "Memo - No Summary" is opened -+ -+ @view_shortcuts -+ Scenario Outline: Ctrl+<1-5> to switch views -+ * Press "" -+ Then "
" view is opened -+ -+ Examples: -+ | shortcut | section | -+ | 1 | Mail | -+ | 2 | Contacts | -+ | 3 | Calendar | -+ | 4 | Tasks | -+ | 5 | Memos | -+ -+ @menu_shortcuts -+ Scenario Outline: Menu shortcuts on all views -+ * Open "
" section -+ * Press "" -+ Then "" menu is opened -+ -+ Examples: -+ | section | shortcut | menu | -+ | Mail | F | File | -+ | Mail | E | Edit | -+ | Mail | V | View | -+ | Mail | O | Folder | -+ | Mail | M | Message | -+ | Mail | S | Search | -+ | Mail | H | Help | -+ -+ | Contacts | F | File | -+ | Contacts | E | Edit | -+ | Contacts | V | View | -+ | Contacts | A | Actions | -+ | Contacts | S | Search | -+ | Contacts | H | Help | -+ -+ | Calendar | F | File | -+ | Calendar | E | Edit | -+ | Calendar | V | View | -+ | Calendar | A | Actions | -+ | Calendar | S | Search | -+ | Calendar | H | Help | -+ -+ | Tasks | F | File | -+ | Tasks | E | Edit | -+ | Tasks | V | View | -+ | Tasks | A | Actions | -+ | Tasks | S | Search | -+ | Tasks | H | Help | -+ -+ | Memos | F | File | -+ | Memos | E | Edit | -+ | Memos | V | View | -+ | Memos | S | Search | -+ | Memos | H | Help | -diff -up evolution-3.13.4/tests/steps/addressbook_steps.py.missing-tests evolution-3.13.4/tests/steps/addressbook_steps.py ---- evolution-3.13.4/tests/steps/addressbook_steps.py.missing-tests 2014-07-30 11:21:47.032172902 +0200 -+++ evolution-3.13.4/tests/steps/addressbook_steps.py 2014-07-30 11:21:47.032172902 +0200 -@@ -0,0 +1,391 @@ -+# -*- coding: UTF-8 -*- -+from behave import step, then -+from common_steps import wait_until -+from dogtail.predicate import GenericPredicate -+from dogtail.rawinput import keyCombo -+from time import time, sleep -+from gi.repository import GLib -+import pyatspi -+ -+ -+@step(u'Select "{name}" addressbook') -+def select_addressbook(context, name, password=None): -+ cells = context.app.findChildren( -+ GenericPredicate(name=name, roleName='table cell')) -+ visible_cells = filter(lambda x: x.showing, cells) -+ if visible_cells == []: -+ raise RuntimeError("Cannot find addressbook '%s'" % name) -+ visible_cells[0].click() -+ # Wait for addressbook to load -+ try: -+ spinner = context.app.findChild( -+ GenericPredicate(name='Spinner'), retry=False, requireResult=False) -+ if spinner: -+ start_time = time() -+ while spinner.showing: -+ sleep(1) -+ if (time() - start_time) > 180: -+ raise RuntimeError("Contacts take too long to synchronize") -+ except (GLib.GError, TypeError): -+ pass -+ -+ -+@step(u'Change categories view to "{category}"') -+def change_categories_view(context, category): -+ labels = context.app.findChildren( -+ lambda x: x.labeller.name == 'Show:' and x.showing) -+ if labels == []: -+ raise RuntimeError("Cannot find category switcher") -+ labels[0].combovalue = category -+ -+ -+@step(u'Delete selected contact') -+def delete_selected_contact(context): -+ context.app.menu('Edit').click() -+ mnu = context.app.menu('Edit').menuItem("Delete Contact") -+ if pyatspi.STATE_ENABLED in mnu.getState().getStates(): -+ context.app.menu('Edit').menuItem("Delete Contact").click() -+ -+ alert = context.app.child(roleName='alert', name='Question') -+ alert.button('Delete').click() -+ context.execute_steps(u"* Wait for email to synchronize") -+ -+ -+@step(u'Delete all contacts containing "{part}"') -+def delete_all_contacts_containing(context, part): -+ context.app.search_bar.grab_focus() -+ for attempts in range(0, 10): -+ try: -+ context.app.search_bar.text = part -+ break -+ except (GLib.GError, AttributeError): -+ sleep(0.1) -+ continue -+ keyCombo("") -+ context.execute_steps(u"* Wait for email to synchronize") -+ context.app.search_bar.grab_focus() -+ keyCombo("") -+ sleep(3) -+ heading = context.app.findChild( -+ GenericPredicate(roleName='heading'), -+ retry=False, requireResult=False) -+ if heading: -+ keyCombo("a") -+ context.execute_steps(u"* Delete selected contact") -+ sleep(3) -+ -+ -+@step(u'Create a new contact') -+def create_a_new_contact(context): -+ context.app.menu('File').click() -+ context.app.menu('File').menu('New').point() -+ context.app.menu('File').menu('New').menuItem("Contact").click() -+ context.execute_steps(u"Then Contact editor window is opened") -+ -+ -+def get_element_by_name(contact_editor, name, section=None): -+ """Get a field object by name in section (if specified)""" -+ element = None -+ if section: -+ panel = contact_editor.findChild( -+ GenericPredicate(roleName='panel', name=section), retry=False, requireResult=False) -+ if not panel: -+ # Other section is not a panel, but a toggle button -+ panel = contact_editor.child(roleName='toggle button', name=section) -+ element = panel.childLabelled(name) -+ else: -+ label = contact_editor.findChild( -+ GenericPredicate(label=name), retry=False, requireResult=False) -+ if not label: -+ # In case childLabelled is missing -+ # Find a filler with this name and get its text child -+ element = contact_editor.child( -+ roleName='filler', name=name).child(roleName='text') -+ else: -+ element = contact_editor.childLabelled(name) -+ if element: -+ return element -+ else: -+ raise RuntimeError("Cannot find element named '%s' in section '%s'" % ( -+ name, section)) -+ -+ -+@step(u'Set "{field_name}" in contact editor to "{field_value}"') -+def set_field_to_value(context, field_name, field_value): -+ element = get_element_by_name(context.app.contact_editor, field_name) -+ if element.roleName == "text": -+ element.text = field_value -+ elif element.roleName == "combo box": -+ if element.combovalue != field_value: -+ element.combovalue = field_value -+ -+ -+@step(u'Save the contact') -+def save_contact(context): -+ context.app.contact_editor.button('Save').click() -+ assert wait_until(lambda x: not x.showing, context.app.contact_editor),\ -+ "Contact Editor was not hidden" -+ assert wait_until(lambda x: x.dead, context.app.contact_editor),\ -+ "Contact Editor was not closed" -+ context.app.contact_editor = None -+ -+ -+@step(u'Refresh addressbook') -+def refresh_addressbook(context): -+ #Clear the search -+ icons = context.app.search_bar.findChildren(lambda x: x.roleName == 'icon') -+ if icons != []: -+ icons[-1].click() -+ else: -+ for attempts in range(0, 10): -+ try: -+ context.app.search_bar.text = '' -+ break -+ except (GLib.GError, AttributeError): -+ sleep(0.1) -+ continue -+ context.app.search_bar.grab_focus() -+ keyCombo('') -+ context.execute_steps(u"* Wait for email to synchronize") -+ -+ -+@step(u'Select "{contact_name}" contact list') -+@step(u'Select "{contact_name}" contact') -+def select_contact_with_name(context, contact_name): -+ # heading shows the name of currently selected contact -+ # We have to keep on pressing Tab to select the next contact -+ # Until we meet the first contact -+ # WARNING - what if we will have two identical contacts? -+ fail = False -+ selected_contact = None -+ -+ # HACK -+ # To make the contact table appear -+ # we need to focus on search window -+ # and send Tabs to have the first contact focused -+ context.app.search_bar.grab_focus() -+ sleep(0.1) -+ # Switch to 'Any field contains' (not reachable in 3.6) -+ icons = context.app.search_bar.findChildren(GenericPredicate(roleName='icon')) -+ -+ if icons != []: -+ icons[0].click() -+ wait_until(lambda x: x.findChildren( -+ GenericPredicate(roleName='check menu item', name='Any field contains')) != [], -+ context.app) -+ context.app.menuItem('Any field contains').click() -+ for attempts in range(0, 10): -+ try: -+ context.app.search_bar.text = contact_name -+ break -+ except (GLib.GError, AttributeError): -+ sleep(0.1) -+ continue -+ keyCombo("") -+ context.app.search_bar.grab_focus() -+ -+ keyCombo("") -+ first_contact_name = context.app.child(roleName='heading').text -+ -+ while True: -+ selected_contact = context.app.child(roleName='heading') -+ if selected_contact.text == contact_name: -+ fail = False -+ break -+ keyCombo("") -+ # Wait until contact data is being rendered -+ sleep(1) -+ if first_contact_name == selected_contact.text: -+ fail = True -+ break -+ -+ context.assertion.assertFalse( -+ fail, "Can't find contact named '%s'" % contact_name) -+ context.selected_contact_text = selected_contact.text -+ -+ -+@step(u'Open contact editor for selected contact') -+def open_contact_editor_for_selected_contact(context): -+ context.app.menu('File').click() -+ context.app.menu('File').menuItem('Open Contact').click() -+ context.execute_steps(u""" -+ Then Contact editor window with title "Contact Editor - %s" is opened -+ """ % context.selected_contact_text) -+ -+ -+@then(u'"{field}" property is set to "{expected}"') -+def property_in_contact_window_is_set_to(context, field, expected): -+ element = get_element_by_name(context.app.contact_editor, field) -+ actual = None -+ if element.roleName == "text": -+ actual = element.text -+ elif element.roleName == "combo box": -+ actual = element.combovalue -+ if actual == '': -+ actual = element.textentry('').text -+ assert unicode(actual) == expected, "Incorrect value" -+ -+ -+def get_combobox_textbox_object(contact_editor, section, scroll_to_bottom=True): -+ """Get a list of paired 'combobox-textbox' objects in contact editor""" -+ section_names = { -+ 'Ims': 'Instant Messaging', -+ 'Phones': 'Telephone', -+ 'Emails': 'Email'} -+ section = section_names[section.capitalize()] -+ lbl = contact_editor.child(roleName='label', name=section) -+ panel = lbl.findAncestor(GenericPredicate(roleName='panel')) -+ textboxes = panel.findChildren(GenericPredicate(roleName='text')) -+ -+ # Scroll to the bottom of the page if needed -+ pagetab = panel.findAncestor(GenericPredicate(roleName='page tab')) -+ for scroll in pagetab.findChildren(lambda x: x.roleName == 'scroll bar'): -+ if scroll_to_bottom: -+ scroll.value = scroll.maxValue -+ else: -+ scroll.value = 0 -+ -+ # Expand section if button exists -+ button = panel.findChild( -+ GenericPredicate(roleName='push button', name=section), -+ retry=False, requireResult=False) -+ # Expand button if any of textboxes is not visible -+ if button and (False in [x.showing for x in textboxes]): -+ button.click() -+ -+ comboboxes = panel.findChildren(GenericPredicate(roleName='combo box')) -+ -+ # Rearrange comboboxes and textboxes according to their position -+ result = [] -+ for combo in comboboxes: -+ combo_row = combo.position[1] -+ matching_textboxes = [ -+ x for x in textboxes -+ if ((x.position[1] - combo_row) == 0) and (x.position[0] > combo.position[0])] -+ if (matching_textboxes != []): -+ correct_textbox = min(matching_textboxes, key=lambda x: x.position[0]) -+ result.append((combo, correct_textbox)) -+ -+ comboboxes = [x[0] for x in result][::-1] -+ textboxes = [x[1] for x in result][::-1] -+ -+ return (textboxes, comboboxes, button) -+ -+ -+@step(u'Set {section} in contact editor to') -+def set_contact_emails_to_value(context, section): -+ (textboxes, comboboxes, collapse_button) = get_combobox_textbox_object( -+ context.app.contact_editor, section) -+ -+ # clear existing data -+ for textbox in textboxes: -+ textbox.text = "" -+ -+ for index, row in enumerate(context.table.rows): -+ # Check that we have sufficient amount of textboxes -+ # If not - click plus buttons until we have enough -+ if index == len(textboxes): -+ textboxes[0].parent.child(roleName="push button").click() -+ (textboxes, comboboxes, collapse_button) = get_combobox_textbox_object( -+ context.app.contact_editor, section) -+ textboxes[index].text = row['Value'] -+ if comboboxes[index].combovalue != row['Field']: -+ comboboxes[index].combovalue = row['Field'] -+ -+ -+@then(u'{section} are set to') -+def emails_are_set_to(context, section): -+ (textboxes, comboboxes, collapse_button) = get_combobox_textbox_object( -+ context.app.contact_editor, section, section == 'IMs') -+ -+ actual = [] -+ for index, textbox in enumerate(textboxes): -+ combo_value = textbox.text -+ if combo_value.strip() != '': -+ type_value = comboboxes[index].combovalue -+ actual.append({'Field': unicode(type_value), 'Value': unicode(combo_value)}) -+ actual = sorted(actual) -+ -+ expected = [] -+ for row in context.table: -+ expected.append({'Field': row['Field'], 'Value': row['Value']}) -+ expected = sorted(expected) -+ -+ assert actual == expected, "Incorrect %s value:\nexpected:%s\n but was:%s" % ( -+ row['Field'], expected, actual) -+ -+ # Collapse the section after check -+ collapse_button.click() -+ -+ -+@step(u'Tick "Wants to receive HTML mail" checkbox') -+def tick_checkbox(context): -+ context.app.contact_editor.childNamed("Wants to receive HTML mail").click() -+ -+ -+@step(u'"Wants to receive HTML mail" checkbox is ticked') -+def checkbox_is_ticked(context): -+ check_state = context.app.childNamed("Wants to receive HTML mail").checked -+ assert check_state, "Incorrect checkbox state" -+ -+ -+@step(u'Switch to "{name}" tab in contact editor') -+def switch_to_tab(context, name): -+ context.app.contact_editor.tab(name).click() -+ -+ -+@step(u'Set the following properties in contact editor') -+def set_properties(context): -+ for row in context.table.rows: -+ context.execute_steps(u""" -+ * Set "%s" in contact editor to "%s" -+ """ % (row['Field'], row['Value'])) -+ -+ -+@step(u'The following properties in contact editor are set') -+def verify_properties(context): -+ for row in context.table.rows: -+ context.execute_steps(u""" -+ Then "%s" property is set to "%s" -+ """ % (row['Field'], row['Value'])) -+ -+ -+@step(u'Set the following properties in "{section}" section of contact editor') -+def set_properties_in_section(context, section): -+ for row in context.table.rows: -+ context.execute_steps(u""" -+ * Set "%s" in "%s" section of contact editor to "%s" -+ """ % (row['Field'], section, row['Value'])) -+ -+ -+@step(u'The following properties in "{section}" section of contact editor are set') -+def verify_properties_in_section(context, section): -+ for row in context.table.rows: -+ context.execute_steps(u""" -+ Then "%s" property in "%s" section is set to "%s" -+ """ % (row['Field'], section, row['Value'])) -+ -+ -+@step(u'Set the following note for the contact') -+def set_note_for_contact(context): -+ context.app.contact_editor.child( -+ roleName='page tab', name='Notes').textentry('').text = context.text -+ -+ -+@then(u'The following note is set for the contact') -+def verify_note_set_for_contact(context): -+ actual = context.app.contact_editor.child( -+ roleName='page tab', name='Notes').textentry('').text -+ expected = context.text -+ assert actual == expected,\ -+ "Incorrect note value:\nexpected:%s\n but was:%s" % (expected, actual) -+ -+ -+@step(u'Set "{field_name}" in "{section}" section of contact editor to "{field_value}"') -+def set_field_in_section_to_value(context, field_name, section, field_value): -+ element = get_element_by_name( -+ context.app.contact_editor, field_name, section=section) -+ if element.roleName == "text": -+ element.text = field_value -+ elif element.roleName == "combo box": -+ element.combovalue = field_value -diff -up evolution-3.13.4/tests/steps/initial_setup_steps.py.missing-tests evolution-3.13.4/tests/steps/initial_setup_steps.py ---- evolution-3.13.4/tests/steps/initial_setup_steps.py.missing-tests 2014-07-30 11:21:47.032172902 +0200 -+++ evolution-3.13.4/tests/steps/initial_setup_steps.py 2014-07-30 11:21:47.032172902 +0200 -@@ -0,0 +1,130 @@ -+# -*- coding: UTF-8 -*- -+from behave import step -+ -+from common_steps import check_for_errors -+from dogtail.tree import root -+from os import system -+from pyatspi import STATE_SENSITIVE -+from time import sleep -+ -+ -+@step(u'Open Evolution and setup fake account') -+def open_evolution_and_setup_fake_account(context): -+ system("evolution --force-shutdown 2&> /dev/null") -+ context.execute_steps(u'* Start a new Evolution instance') -+ window = context.app.child(roleName='frame') -+ if window.name == 'Welcome': -+ context.execute_steps(u""" -+ * Complete Welcome dialog in Evolution Account Assistant -+ * Complete Restore from Backup dialog in Evolution Account Assistant -+ * Complete Identity dialog setting name to "GNOME QE User" and email address to "test@test" -+ * Wait for account is being looked up dialog in Evolution Account Assistant -+ * Complete Receiving Email dialog of Evolution Account Assistant setting -+ | Field | Value | -+ | Server Type: | None | -+ * Complete Sending Email dialog of Evolution Account Assistant setting -+ | Field | Value | -+ | Server Type: | Sendmail | -+ * Complete Account Summary in Evolution Account Assistant -+ * Complete Done dialog in Evolution Account Assistant -+ """) -+ -+ -+@step(u'Complete Receiving Options in Evolution Account Assistant') -+@step(u'Complete Account Summary in Evolution Account Assistant') -+@step(u'Complete Restore from Backup dialog in Evolution Account Assistant') -+@step(u'Complete Welcome dialog in Evolution Account Assistant') -+def evo_account_assistant_dummy_dialogs(context): -+ # nothing to do here, skip it -+ window = context.app.child(roleName='frame') -+ click_next(window) -+ -+ -+@step(u'Complete Identity dialog setting name to "{name}" and email address to "{email}"') -+def evo_account_assistant_identity_dialog(context, name, email): -+ # nothing to do here, skip it -+ window = context.app.child(roleName='frame') -+ window.childLabelled("Full Name:").text = name -+ window.childLabelled("Email Address:").text = email -+ click_next(window) -+ -+ -+@step(u"Wait for account is being looked up dialog in Evolution Account Assistant") -+def wait_for_account_to_be_looked_up(context): -+ window = context.app.child(roleName='frame') -+ skip_lookup = window.findChildren(lambda x: x.name == 'Skip Lookup') -+ visible_skip_lookup = [x for x in skip_lookup if x.showing] -+ if len(visible_skip_lookup) > 0: -+ visible_skip_lookup = visible_skip_lookup[0] -+ # bug https://bugzilla.gnome.org/show_bug.cgi?id=726539: Skip Lookup is not being removed -+ #assert wait_until(lambda x: not x.showing, visible_skip_lookup),\ -+ # "Skip Lookup button didn't dissappear" -+ -+ -+def click_next(window): -+ # As initial wizard dialog creates a bunch of 'Next' buttons -+ # We have to click to the visible and enabled one -+ buttons = window.findChildren(lambda x: x.name == 'Next' and x.showing and -+ STATE_SENSITIVE in x.getState().getStates()) -+ if buttons == []: -+ raise Exception("Enabled Next button was not found") -+ else: -+ buttons[0].click() -+ -+ -+@step(u'Complete {sending_or_receiving} Email dialog of Evolution Account Assistant setting') -+def evo_account_assistant_receiving_email_dialog_from_table(context, sending_or_receiving): -+ window = context.app.child(roleName='frame') -+ for row in context.table: -+ label = str(row['Field']) -+ value = str(row['Value']) -+ filler = window.child(roleName='filler', name='%s Email' % sending_or_receiving) -+ widgets = filler.findChildren(lambda x: x.showing) -+ visible_widgets = [x for x in widgets if x.labeller and x.labeller.name == label] -+ if len(visible_widgets) == 0: -+ raise RuntimeError("Cannot find visible widget labelled '%s'" % label) -+ widget = visible_widgets[0] -+ if widget.roleName == 'combo box': -+ if label != 'Port:': -+ widget.click() -+ widget.menuItem(value).click() -+ else: -+ # Port is a combobox, but you can type your port there -+ widget.textentry('').text = value -+ widget.textentry('').grab_focus() -+ widget.textentry('').keyCombo("") -+ if widget.roleName == 'text': -+ widget.text = value -+ -+ # Check for password here and accept self-generated certificate (if appears) -+ btns = window.findChildren(lambda x: x.name == 'Check for Supported Types') -+ visible_btns = [w for w in btns if w.showing] -+ if visible_btns == []: -+ click_next(window) -+ return -+ visible_btns[0].click() -+ -+ # Confirm all certificates by clicking 'Accept Permanently' until dialog is visible -+ apps = [x.name for x in root.applications()] -+ if 'evolution-user-prompter' in apps: -+ prompter = root.application('evolution-user-prompter') -+ dialog = prompter.child(roleName='dialog') -+ while dialog.showing: -+ if prompter.findChild(lambda x: x.name == 'Accept Permanently', retry=False, requireResult=False): -+ prompter.button('Accept Permanently').click() -+ else: -+ sleep(0.1) -+ -+ # Wait until Cancel button disappears -+ cancel = filler.findChildren(lambda x: x.name == 'Cancel')[0] -+ while cancel.showing: -+ sleep(0.1) -+ check_for_errors(context) -+ click_next(window) -+ -+ -+@step(u'Complete Done dialog in Evolution Account Assistant') -+def evo_account_assistant_done_dialog(context): -+ # nothing to do here, skip it -+ window = context.app.child(roleName='frame') -+ window.button('Apply').click() -diff -up evolution-3.13.4/tests/steps/steps.py.missing-tests evolution-3.13.4/tests/steps/steps.py ---- evolution-3.13.4/tests/steps/steps.py.missing-tests 2014-07-30 11:21:47.032172902 +0200 -+++ evolution-3.13.4/tests/steps/steps.py 2014-07-30 11:21:47.032172902 +0200 -@@ -0,0 +1,177 @@ -+# -*- coding: UTF-8 -*- -+from behave import step, then -+from common_steps import wait_until -+from dogtail.tree import root -+from dogtail.rawinput import keyCombo -+from time import sleep, time -+from os import system -+from gi.repository import Gio, GLib -+ -+ -+@step(u'Help section "{name}" is displayed') -+def help_is_displayed(context, name): -+ try: -+ context.yelp = root.application('yelp') -+ frame = context.yelp.child(roleName='frame') -+ wait_until(lambda x: x.showing, frame) -+ sleep(1) -+ context.assertion.assertEquals(name, frame.name) -+ finally: -+ system("killall yelp") -+ -+ -+@step(u'Evolution has {num:d} window opened') -+@step(u'Evolution has {num:d} windows opened') -+def evolution_has_num_windows_opened(context, num): -+ windows = context.app.findChildren(lambda x: x.roleName == 'frame') -+ context.assertion.assertEqual(len(windows), num) -+ -+ -+@step(u'Preferences dialog is opened') -+def preferences_dialog_opened(context): -+ context.app.window('Evolution Preferences') -+ -+ -+@step(u'"{name}" view is opened') -+def view_is_opened(context, name): -+ if name != 'Mail': -+ window_name = context.app.children[0].name -+ context.assertion.assertEquals(window_name, "%s - Evolution" % name) -+ else: -+ # A special case for Mail -+ context.assertion.assertTrue(context.app.menu('Message').showing) -+ -+ -+def get_visible_searchbar(context): -+ """Wait for searchbar to become visible""" -+ def get_searchbars(): -+ return context.app.findChildren(lambda x: x.labeller.name == 'Search:' and x.showing) -+ assert wait_until(lambda x: len(x()) > 0, get_searchbars), "No visible searchbars found" -+ return get_searchbars()[0] -+ -+ -+@step(u'Open "{section_name}" section') -+def open_section_by_name(context, section_name): -+ wait_until(lambda x: x.showing, context.app.menu('View')) -+ sleep(0.2) -+ context.app.menu('View').click() -+ context.app.menu('View').menu('Window').point() -+ context.app.menu('View').menu('Window').menuItem(section_name).click() -+ -+ # Find a search bar -+ context.app.search_bar = get_visible_searchbar(context) -+ -+ # Check that service required for this sections is running -+ required_services = { -+ 'Mail': 'org.gnome.evolution.dataserver.Sources', -+ 'Calendar': 'org.gnome.evolution.dataserver.Calendar', -+ 'Tasks': 'org.gnome.evolution.dataserver.Calendar', -+ 'Memos': 'org.gnome.evolution.dataserver.Calendar', -+ 'Contacts': 'org.gnome.evolution.dataserver.AddressBook', -+ } -+ required_service = required_services[section_name] -+ bus = Gio.bus_get_sync(Gio.BusType.SESSION, None) -+ dbus_proxy = Gio.DBusProxy.new_sync(bus, Gio.DBusProxyFlags.NONE, None, -+ 'org.freedesktop.DBus', -+ '/org/freedesktop/DBus', -+ 'org.freedesktop.DBus', None) -+ for attempt in xrange(0, 10): -+ result = dbus_proxy.call_sync( -+ 'ListNames', None, Gio.DBusCallFlags.NO_AUTO_START, 500, None) -+ sleep(1) -+ if True in [required_service in x for x in result[0]]: -+ return -+ raise RuntimeError("%s service was not found" % required_service) -+ -+ -+@step(u'"{name}" menu is opened') -+def menu_is_opened(context, name): -+ sleep(0.5) -+ menu = context.app.menu(name) -+ children_displayed = [x.showing for x in menu.children] -+ context.assertion.assertTrue(True in children_displayed, "Menu '%s' is not opened" % name) -+ -+ -+@step(u'Press "{sequence}"') -+def press_button_sequence(context, sequence): -+ keyCombo(sequence) -+ sleep(0.5) -+ -+ -+@then(u'Evolution is closed') -+def evolution_is_closed(context): -+ assert wait_until(lambda x: x.dead, context.app),\ -+ "Evolution window is opened" -+ context.assertion.assertFalse(context.app_class.isRunning(), "Evolution is in the process list") -+ -+ -+@step(u'Message composer with title "{name}" is opened') -+def message_composer_is_opened(context, name): -+ context.app.composer = context.app.window(name) -+ -+ -+@then(u'Contact editor window with title "{title}" is opened') -+def contact_editor_with_label_is_opened(context, title): -+ context.app.contact_editor = context.app.dialog(title) -+ context.assertion.assertIsNotNone( -+ context.app.contact_editor, "Contact Editor was not found") -+ context.assertion.assertTrue( -+ context.app.contact_editor.showing, "Contact Editor didn't appear") -+ -+ -+@then(u'Contact editor window is opened') -+def contact_editor_is_opened(context): -+ context.execute_steps(u'Then Contact editor window with title "Contact Editor" is opened') -+ -+ -+@then(u'Contact List editor window is opened') -+def contact_list_editor_is_opened(context): -+ context.execute_steps( -+ u'Then Contact List editor window with title "Contact List Editor" is opened') -+ -+ -+@then(u'Contact List editor window with title "{name}" is opened') -+def contact_list_editor__with_name_is_opened(context, name): -+ context.app.contact_list_editor = context.app.dialog(name) -+ -+ -+@step(u'Memo editor with title "{name}" is opened') -+def memo_editor_is_opened(context, name): -+ context.execute_steps(u'* Task editor with title "%s" is opened' % name) -+ -+ -+@step(u'Shared Memo editor with title "{name}" is opened') -+def shared_memo_editor_is_opened(context, name): -+ context.execute_steps(u'* Task editor with title "%s" is opened' % name) -+ -+ -+@step(u'Task editor with title "{title}" is opened') -+def task_editor_with_title_is_opened(context, title): -+ context.app.task_editor = context.app.window(title) -+ # Spoof event_editor for assigned tasks -+ if 'Assigned' in title: -+ context.app.event_editor = context.app.task_editor -+ -+ -+@step(u'Event editor with title "{name}" is displayed') -+def event_editor_with_name_displayed(context, name): -+ context.app.event_editor = context.app.window(name) -+ -+ -+@step(u'Wait for email to synchronize') -+def wait_for_mail_folder_to_synchronize(context): -+ # Wait until Google calendar is loaded -+ for attempt in range(0, 10): -+ start_time = time() -+ try: -+ spinners = context.app.findChildren(lambda x: x.name == 'Spinner') -+ for spinner in spinners: -+ try: -+ while spinner.showing: -+ sleep(0.1) -+ if (time() - start_time) > 180: -+ raise RuntimeError("Mail takes too long to synchronize") -+ except GLib.GError: -+ continue -+ except (GLib.GError, TypeError): -+ continue diff --git a/evolution.spec b/evolution.spec index 3dd7189..4648ce5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,8 +29,8 @@ ### Abstract ### Name: evolution -Version: 3.13.4 -Release: 2%{?dist} +Version: 3.13.5 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -50,8 +50,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -Patch03: evolution-3.13.4-missing-tests.patch - ## Dependencies ### Requires: gvfs @@ -218,7 +216,6 @@ the functionality of the installed %{name} package. %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .missing-tests # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -545,6 +542,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 25 2014 Milan Crha - 3.13.5-1 +- Update to 3.13.5 +- Remove patch to add missing tests files in the distribution tarball (fixed upstream) + * Sat Aug 16 2014 Fedora Release Engineering - 3.13.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild diff --git a/sources b/sources index a7db44e..32e445a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e866a0572c99bef9a560758891ba5e7 evolution-3.13.4.tar.xz +3d984360b837a176e56db08a137ba799 evolution-3.13.5.tar.xz From 9ec66593941726f00d5011a21a1cb69f3edaa031 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Sep 2014 09:19:12 +0200 Subject: [PATCH 566/844] Update to 3.13.6 --- .gitignore | 1 + evolution-2.30.1-help-contents.patch | 59 +++++++------ evolution.spec | 121 ++++++++++++++------------- sources | 2 +- 4 files changed, 92 insertions(+), 91 deletions(-) diff --git a/.gitignore b/.gitignore index 08b92b7..680e1e3 100644 --- a/.gitignore +++ b/.gitignore @@ -78,3 +78,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.12.4.tar.xz /evolution-3.13.4.tar.xz /evolution-3.13.5.tar.xz +/evolution-3.13.6.tar.xz diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch index ba5c29b..0b9e3be 100644 --- a/evolution-2.30.1-help-contents.patch +++ b/evolution-2.30.1-help-contents.patch @@ -1,7 +1,7 @@ -diff -up evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200 -+++ evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c 2014-04-14 11:15:36.606320997 +0200 -@@ -4281,6 +4281,11 @@ e_contact_editor_init (EContactEditor *e +diff -up evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c +--- evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-09-22 09:15:05.051468361 +0200 ++++ evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c 2014-09-22 09:17:01.509463747 +0200 +@@ -4143,6 +4143,10 @@ e_contact_editor_init (EContactEditor *e g_signal_connect ( widget, "clicked", G_CALLBACK (show_help_cb), e_contact_editor); @@ -9,13 +9,12 @@ diff -up evolution-3.12.1/addressbook/gui/contact-editor/e-contact-editor.c.help + gtk_widget_set_sensitive (widget, FALSE); + gtk_widget_hide (widget); + } -+ + widget = e_builder_get_widget ( - e_contact_editor->priv->builder, "button-web-expand"); - g_signal_connect_swapped ( -diff -up evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.12.1/calendar/gui/dialogs/comp-editor.c ---- evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-13 16:33:29.000000000 +0200 -+++ evolution-3.12.1/calendar/gui/dialogs/comp-editor.c 2014-04-14 11:15:36.606320997 +0200 + e_contact_editor->priv->builder, "expander-contact-phone"); +diff -up evolution-3.13.6/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.13.6/calendar/gui/dialogs/comp-editor.c +--- evolution-3.13.6/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-11 09:21:59.000000000 +0200 ++++ evolution-3.13.6/calendar/gui/dialogs/comp-editor.c 2014-09-22 09:15:05.052468361 +0200 @@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor) G_BINDING_SYNC_CREATE); } @@ -29,10 +28,10 @@ diff -up evolution-3.12.1/calendar/gui/dialogs/comp-editor.c.help-contents evolu action_group = gtk_action_group_new ("individual"); gtk_action_group_set_translation_domain ( action_group, GETTEXT_PACKAGE); -diff -up evolution-3.12.1/e-util/e-misc-utils.c.help-contents evolution-3.12.1/e-util/e-misc-utils.c ---- evolution-3.12.1/e-util/e-misc-utils.c.help-contents 2014-04-14 11:15:36.606320997 +0200 -+++ evolution-3.12.1/e-util/e-misc-utils.c 2014-04-14 11:15:47.698320550 +0200 -@@ -2103,6 +2103,23 @@ e_binding_transform_uid_to_source (GBind +diff -up evolution-3.13.6/e-util/e-misc-utils.c.help-contents evolution-3.13.6/e-util/e-misc-utils.c +--- evolution-3.13.6/e-util/e-misc-utils.c.help-contents 2014-07-11 08:47:35.000000000 +0200 ++++ evolution-3.13.6/e-util/e-misc-utils.c 2014-09-22 09:15:05.052468361 +0200 +@@ -2493,6 +2493,23 @@ e_binding_transform_uid_to_source (GBind return success; } @@ -56,10 +55,10 @@ diff -up evolution-3.12.1/e-util/e-misc-utils.c.help-contents evolution-3.12.1/e /** * e_binding_transform_text_non_null: * @binding: a #GBinding -diff -up evolution-3.12.1/e-util/e-misc-utils.h.help-contents evolution-3.12.1/e-util/e-misc-utils.h ---- evolution-3.12.1/e-util/e-misc-utils.h.help-contents 2014-04-14 11:15:36.607320997 +0200 -+++ evolution-3.12.1/e-util/e-misc-utils.h 2014-04-14 11:16:06.930319775 +0200 -@@ -184,6 +184,8 @@ gboolean e_binding_transform_uid_to_sour +diff -up evolution-3.13.6/e-util/e-misc-utils.h.help-contents evolution-3.13.6/e-util/e-misc-utils.h +--- evolution-3.13.6/e-util/e-misc-utils.h.help-contents 2014-07-07 12:45:01.000000000 +0200 ++++ evolution-3.13.6/e-util/e-misc-utils.h 2014-09-22 09:15:05.052468361 +0200 +@@ -229,6 +229,8 @@ gboolean e_binding_transform_uid_to_sour GValue *target_value, ESourceRegistry *registry); @@ -68,9 +67,9 @@ diff -up evolution-3.12.1/e-util/e-misc-utils.h.help-contents evolution-3.12.1/e gboolean e_binding_transform_text_non_null (GBinding *binding, const GValue *source_value, -diff -up evolution-3.12.1/e-util/e-preferences-window.c.help-contents evolution-3.12.1/e-util/e-preferences-window.c ---- evolution-3.12.1/e-util/e-preferences-window.c.help-contents 2014-03-23 02:13:17.000000000 +0100 -+++ evolution-3.12.1/e-util/e-preferences-window.c 2014-04-14 11:15:36.607320997 +0200 +diff -up evolution-3.13.6/e-util/e-preferences-window.c.help-contents evolution-3.13.6/e-util/e-preferences-window.c +--- evolution-3.13.6/e-util/e-preferences-window.c.help-contents 2014-02-12 20:47:07.000000000 +0100 ++++ evolution-3.13.6/e-util/e-preferences-window.c 2014-09-22 09:15:05.053468361 +0200 @@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW GTK_BUTTON_BOX (container), widget, TRUE); gtk_widget_show (widget); @@ -83,9 +82,9 @@ diff -up evolution-3.12.1/e-util/e-preferences-window.c.help-contents evolution- widget = e_dialog_button_new_with_icon ("window-close", _("_Close")); g_signal_connect_swapped ( widget, "clicked", -diff -up evolution-3.12.1/e-util/e-send-options.c.help-contents evolution-3.12.1/e-util/e-send-options.c ---- evolution-3.12.1/e-util/e-send-options.c.help-contents 2014-04-13 16:33:29.000000000 +0200 -+++ evolution-3.12.1/e-util/e-send-options.c 2014-04-14 11:15:36.607320997 +0200 +diff -up evolution-3.13.6/e-util/e-send-options.c.help-contents evolution-3.13.6/e-util/e-send-options.c +--- evolution-3.13.6/e-util/e-send-options.c.help-contents 2014-03-27 15:05:39.000000000 +0100 ++++ evolution-3.13.6/e-util/e-send-options.c 2014-09-22 09:15:05.053468361 +0200 @@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) { ESendOptionsDialogPrivate *priv; @@ -107,9 +106,9 @@ diff -up evolution-3.12.1/e-util/e-send-options.c.help-contents evolution-3.12.1 return (priv->priority && priv->security && priv->status -diff -up evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.12.1/plugins/email-custom-header/email-custom-header.c ---- evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help-contents 2014-03-23 02:13:18.000000000 +0100 -+++ evolution-3.12.1/plugins/email-custom-header/email-custom-header.c 2014-04-14 11:15:36.607320997 +0200 +diff -up evolution-3.13.6/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.13.6/plugins/email-custom-header/email-custom-header.c +--- evolution-3.13.6/plugins/email-custom-header/email-custom-header.c.help-contents 2014-06-09 16:39:38.000000000 +0200 ++++ evolution-3.13.6/plugins/email-custom-header/email-custom-header.c 2014-09-22 09:15:05.053468361 +0200 @@ -118,6 +118,8 @@ static gboolean epech_get_widgets (CustomHeaderOptionsDialog *mch) { @@ -133,9 +132,9 @@ diff -up evolution-3.12.1/plugins/email-custom-header/email-custom-header.c.help #undef EMAIL_CUSTOM_HEADER return (priv->page -diff -up evolution-3.12.1/shell/e-shell-window-actions.c.help-contents evolution-3.12.1/shell/e-shell-window-actions.c ---- evolution-3.12.1/shell/e-shell-window-actions.c.help-contents 2014-03-23 02:13:19.000000000 +0100 -+++ evolution-3.12.1/shell/e-shell-window-actions.c 2014-04-14 11:15:36.607320997 +0200 +diff -up evolution-3.13.6/shell/e-shell-window-actions.c.help-contents evolution-3.13.6/shell/e-shell-window-actions.c +--- evolution-3.13.6/shell/e-shell-window-actions.c.help-contents 2014-03-07 14:49:13.000000000 +0100 ++++ evolution-3.13.6/shell/e-shell-window-actions.c 2014-09-22 09:15:05.053468361 +0200 @@ -1458,6 +1458,11 @@ e_shell_window_actions_init (EShellWindo if (path == NULL) gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); diff --git a/evolution.spec b/evolution.spec index 4648ce5..951c6f7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -24,12 +24,12 @@ # Coverity scan can override this to 0, to skip checking in gtk-doc generated code %{!?with_docs: %define with_docs 1} -%define evo_plugin_dir %{_libdir}/evolution/%{evo_base_version}/plugins +%define evo_plugin_dir %{_libdir}/evolution/plugins ### Abstract ### Name: evolution -Version: 3.13.5 +Version: 3.13.6 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -382,68 +382,66 @@ rm -rf $RPM_BUILD_ROOT # The main data directory # (have not attempted to split this up into an explicit list) %dir %{_datadir}/evolution -%{_datadir}/evolution/%{evo_base_version} +%{_datadir}/evolution # Modules: %dir %{_libdir}/evolution -%dir %{_libdir}/evolution/%{evo_base_version} -%dir %{_libdir}/evolution/%{evo_base_version}/modules -%{_libdir}/evolution/%{evo_base_version}/modules/module-addressbook.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-backup-restore.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-google.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-ldap.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-local.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-book-config-webdav.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-caldav.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-contacts.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-google.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-local.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-weather.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-cal-config-webcal.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-calendar.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-composer-autosave.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-contact-photos.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-gravatar.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-itip-formatter.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mail-config.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mail.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mailto-handler.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-mdn.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-offline-alert.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-prefer-plain.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-lib.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-plugin-manager.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-settings.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-startup-wizard.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-text-highlight.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-vcard-inline.so -%{_libdir}/evolution/%{evo_base_version}/modules/module-web-inspector.so +%dir %{_libdir}/evolution/modules +%{_libdir}/evolution/modules/module-addressbook.so +%{_libdir}/evolution/modules/module-backup-restore.so +%{_libdir}/evolution/modules/module-book-config-google.so +%{_libdir}/evolution/modules/module-book-config-ldap.so +%{_libdir}/evolution/modules/module-book-config-local.so +%{_libdir}/evolution/modules/module-book-config-webdav.so +%{_libdir}/evolution/modules/module-cal-config-caldav.so +%{_libdir}/evolution/modules/module-cal-config-contacts.so +%{_libdir}/evolution/modules/module-cal-config-google.so +%{_libdir}/evolution/modules/module-cal-config-local.so +%{_libdir}/evolution/modules/module-cal-config-weather.so +%{_libdir}/evolution/modules/module-cal-config-webcal.so +%{_libdir}/evolution/modules/module-calendar.so +%{_libdir}/evolution/modules/module-composer-autosave.so +%{_libdir}/evolution/modules/module-contact-photos.so +%{_libdir}/evolution/modules/module-gravatar.so +%{_libdir}/evolution/modules/module-itip-formatter.so +%{_libdir}/evolution/modules/module-mail-config.so +%{_libdir}/evolution/modules/module-mail.so +%{_libdir}/evolution/modules/module-mailto-handler.so +%{_libdir}/evolution/modules/module-mdn.so +%{_libdir}/evolution/modules/module-offline-alert.so +%{_libdir}/evolution/modules/module-prefer-plain.so +%{_libdir}/evolution/modules/module-plugin-lib.so +%{_libdir}/evolution/modules/module-plugin-manager.so +%{_libdir}/evolution/modules/module-settings.so +%{_libdir}/evolution/modules/module-startup-wizard.so +%{_libdir}/evolution/modules/module-text-highlight.so +%{_libdir}/evolution/modules/module-vcard-inline.so +%{_libdir}/evolution/modules/module-web-inspector.so # Shared libraries: -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-composer.so -%{_libdir}/evolution/%{evo_base_version}/libeabutil.so -%{_libdir}/evolution/%{evo_base_version}/libecontacteditor.so -%{_libdir}/evolution/%{evo_base_version}/libecontactlisteditor.so -%{_libdir}/evolution/%{evo_base_version}/libemail-engine.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-formatter.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-shell.so -%{_libdir}/evolution/%{evo_base_version}/libessmime.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-util.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-addressbook-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-calendar-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail-importers.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-mail.so -%{_libdir}/evolution/%{evo_base_version}/libevolution-smime.so -%{_libdir}/evolution/%{evo_base_version}/libgnomecanvas.so +%{_libdir}/evolution/libevolution-mail-composer.so +%{_libdir}/evolution/libeabutil.so +%{_libdir}/evolution/libecontacteditor.so +%{_libdir}/evolution/libecontactlisteditor.so +%{_libdir}/evolution/libemail-engine.so +%{_libdir}/evolution/libevolution-mail-formatter.so +%{_libdir}/evolution/libevolution-shell.so +%{_libdir}/evolution/libessmime.so +%{_libdir}/evolution/libevolution-util.so +%{_libdir}/evolution/libevolution-addressbook-importers.so +%{_libdir}/evolution/libevolution-calendar.so +%{_libdir}/evolution/libevolution-calendar-importers.so +%{_libdir}/evolution/libevolution-mail-importers.so +%{_libdir}/evolution/libevolution-mail.so +%{_libdir}/evolution/libevolution-smime.so +%{_libdir}/evolution/libgnomecanvas.so # Various libexec programs: %dir %{_libexecdir}/evolution -%dir %{_libexecdir}/evolution/%{evo_base_version} -%{_libexecdir}/evolution/%{evo_base_version}/evolution-addressbook-export -%{_libexecdir}/evolution/%{evo_base_version}/evolution-alarm-notify -%{_libexecdir}/evolution/%{evo_base_version}/evolution-backup -%{_libexecdir}/evolution/%{evo_base_version}/killev +%{_libexecdir}/evolution/evolution-addressbook-export +%{_libexecdir}/evolution/evolution-alarm-notify +%{_libexecdir}/evolution/evolution-backup +%{_libexecdir}/evolution/killev # The plugin directory: %dir %{evo_plugin_dir} @@ -498,7 +496,7 @@ rm -rf $RPM_BUILD_ROOT %files devel %defattr(-, root, root) -%{_includedir}/evolution-%{evo_base_version} +%{_includedir}/evolution %{_libdir}/pkgconfig/evolution-calendar-3.0.pc %{_libdir}/pkgconfig/evolution-mail-3.0.pc %{_libdir}/pkgconfig/evolution-shell-3.0.pc @@ -520,15 +518,15 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %defattr(-, root, root) -%{_libdir}/evolution/%{evo_base_version}/modules/module-bogofilter.so +%{_libdir}/evolution/modules/module-bogofilter.so %files spamassassin %defattr(-, root, root) -%{_libdir}/evolution/%{evo_base_version}/modules/module-spamassassin.so +%{_libdir}/evolution/modules/module-spamassassin.so %files perl %defattr(-, root, root) -%{_libexecdir}/evolution/%{evo_base_version}/csv2vcard +%{_libexecdir}/evolution/csv2vcard %if %{libpst_support} %files pst @@ -542,6 +540,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 22 2014 Milan Crha - 3.13.6-1 +- Update to 3.13.6 + * Mon Aug 25 2014 Milan Crha - 3.13.5-1 - Update to 3.13.5 - Remove patch to add missing tests files in the distribution tarball (fixed upstream) diff --git a/sources b/sources index 32e445a..add920c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -3d984360b837a176e56db08a137ba799 evolution-3.13.5.tar.xz +af87482520c78a81ef4ec2feab588b49 evolution-3.13.6.tar.xz From 7d6f6c18192e50f388c66dcb9d17a52a0f1bef26 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Sep 2014 12:30:49 +0200 Subject: [PATCH 567/844] --disable-autoar - gnome-autoar not in repos yet --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 951c6f7..3a260ff 100644 --- a/evolution.spec +++ b/evolution.spec @@ -256,6 +256,7 @@ autoconf %configure \ --disable-maintainer-mode \ + --disable-autoar \ --with-sub-version=" (%{version}-%{release})" \ %ldap_flags %ssl_flags %gtkdoc_flags \ --enable-plugins=all \ From 5fab70e2719b1610f49e986ba1da6f328b613951 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Oct 2014 07:37:57 +0100 Subject: [PATCH 568/844] Update to 3.13.7 --- .gitignore | 1 + evolution.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 680e1e3..bcbb9ab 100644 --- a/.gitignore +++ b/.gitignore @@ -79,3 +79,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.13.4.tar.xz /evolution-3.13.5.tar.xz /evolution-3.13.6.tar.xz +/evolution-3.13.7.tar.xz diff --git a/evolution.spec b/evolution.spec index 3a260ff..1a02acb 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ ### Abstract ### Name: evolution -Version: 3.13.6 +Version: 3.13.7 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -520,10 +520,12 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %defattr(-, root, root) %{_libdir}/evolution/modules/module-bogofilter.so +%{_datadir}/appdata/evolution-bogofilter.metainfo.xml %files spamassassin %defattr(-, root, root) %{_libdir}/evolution/modules/module-spamassassin.so +%{_datadir}/appdata/evolution-spamassassin.metainfo.xml %files perl %defattr(-, root, root) @@ -541,6 +543,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Oct 27 2014 Milan Crha - 3.13.7-1 +- Update to 3.13.7 + * Mon Sep 22 2014 Milan Crha - 3.13.6-1 - Update to 3.13.6 diff --git a/sources b/sources index add920c..f27887c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -af87482520c78a81ef4ec2feab588b49 evolution-3.13.6.tar.xz +71724fae8ca9c22b7fbf0eb0bfdda940 evolution-3.13.7.tar.xz From 6f355c3b6244fb27e6035c40442c8011ff0d3568 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Nov 2014 09:00:23 +0100 Subject: [PATCH 569/844] Update to 3.13.8 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index bcbb9ab..820f859 100644 --- a/.gitignore +++ b/.gitignore @@ -80,3 +80,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.13.5.tar.xz /evolution-3.13.6.tar.xz /evolution-3.13.7.tar.xz +/evolution-3.13.8.tar.xz diff --git a/evolution.spec b/evolution.spec index 1a02acb..7184b52 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ ### Abstract ### Name: evolution -Version: 3.13.7 +Version: 3.13.8 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -543,6 +543,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Nov 24 2014 Milan Crha - 3.13.8-1 +- Update to 3.13.8 + * Mon Oct 27 2014 Milan Crha - 3.13.7-1 - Update to 3.13.7 diff --git a/sources b/sources index f27887c..e09f638 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -71724fae8ca9c22b7fbf0eb0bfdda940 evolution-3.13.7.tar.xz +7a9e555b4b3f1784d2a3faa2b3af92ce evolution-3.13.8.tar.xz From 6475803cbdd5738f318124442efbdc1da3fe75f7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Dec 2014 09:10:05 +0100 Subject: [PATCH 570/844] Update to 3.13.9 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 820f859..b248f0d 100644 --- a/.gitignore +++ b/.gitignore @@ -81,3 +81,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.13.6.tar.xz /evolution-3.13.7.tar.xz /evolution-3.13.8.tar.xz +/evolution-3.13.9.tar.xz diff --git a/evolution.spec b/evolution.spec index 7184b52..10c6cba 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ ### Abstract ### Name: evolution -Version: 3.13.8 +Version: 3.13.9 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -543,6 +543,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Dec 22 2014 Milan Crha - 3.13.9-1 +- Update to 3.13.9 + * Mon Nov 24 2014 Milan Crha - 3.13.8-1 - Update to 3.13.8 diff --git a/sources b/sources index e09f638..3767faf 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7a9e555b4b3f1784d2a3faa2b3af92ce evolution-3.13.8.tar.xz +50dac16d73b0ca00df583381f50a16a2 evolution-3.13.9.tar.xz From f9369eb29e05dda8c402c37d8b74b42039a2e36d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 26 Jan 2015 10:40:03 +0100 Subject: [PATCH 571/844] Update to 3.13.10 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b248f0d..347c9af 100644 --- a/.gitignore +++ b/.gitignore @@ -82,3 +82,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.13.7.tar.xz /evolution-3.13.8.tar.xz /evolution-3.13.9.tar.xz +/evolution-3.13.10.tar.xz diff --git a/evolution.spec b/evolution.spec index 10c6cba..099aab6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ ### Abstract ### Name: evolution -Version: 3.13.9 +Version: 3.13.10 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -543,6 +543,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jan 26 2015 Milan Crha - 3.13.10-1 +- Update to 3.13.10 + * Mon Dec 22 2014 Milan Crha - 3.13.9-1 - Update to 3.13.9 diff --git a/sources b/sources index 3767faf..4dc6c49 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -50dac16d73b0ca00df583381f50a16a2 evolution-3.13.9.tar.xz +b19376206d98624a5f232a7826872e3f evolution-3.13.10.tar.xz From d73ddbba36468ffdf4d443b95e7d5dd9ff406f8d Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Mon, 2 Feb 2015 12:50:47 +0100 Subject: [PATCH 572/844] Backport the WebKit composer patches --- evolution-3.13.10-composer-backports.patch | 742 +++++++++++++++++++++ evolution.spec | 9 +- 2 files changed, 750 insertions(+), 1 deletion(-) create mode 100644 evolution-3.13.10-composer-backports.patch diff --git a/evolution-3.13.10-composer-backports.patch b/evolution-3.13.10-composer-backports.patch new file mode 100644 index 0000000..59e0c62 --- /dev/null +++ b/evolution-3.13.10-composer-backports.patch @@ -0,0 +1,742 @@ +diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c +index 254f820..baa5b38 100644 +--- a/e-util/e-html-editor-selection.c ++++ b/e-util/e-html-editor-selection.c +@@ -1347,22 +1347,22 @@ set_block_alignment (WebKitDOMElement *element, + static WebKitDOMNode * + get_parent_block_node_from_child (WebKitDOMNode *node) + { +- WebKitDOMElement *parent = WEBKIT_DOM_ELEMENT ( +- webkit_dom_node_get_parent_node (node)); ++ WebKitDOMNode *parent = webkit_dom_node_get_parent_node (node); + +- if (WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) || +- element_has_tag (parent, "b") || +- element_has_tag (parent, "i") || +- element_has_tag (parent, "u")) +- parent = WEBKIT_DOM_ELEMENT ( +- webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (parent))); ++ if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-temp-text-wrapper") || ++ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted") || ++ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character") || ++ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-signature") || ++ WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) || ++ element_has_tag (WEBKIT_DOM_ELEMENT (parent), "b") || ++ element_has_tag (WEBKIT_DOM_ELEMENT (parent), "i") || ++ element_has_tag (WEBKIT_DOM_ELEMENT (parent), "u")) ++ parent = webkit_dom_node_get_parent_node (parent); + +- if (element_has_class (parent, "-x-evo-temp-text-wrapper") || +- element_has_class (parent, "-x-evo-signature")) +- parent = WEBKIT_DOM_ELEMENT ( +- webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (parent))); ++ if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted")) ++ parent = webkit_dom_node_get_parent_node (parent); + +- return WEBKIT_DOM_NODE (parent); ++ return parent; + } + + /** +@@ -3771,7 +3771,7 @@ e_html_editor_selection_set_monospaced (EHTMLEditorSelection *selection, + range, WEBKIT_DOM_NODE (monospace), NULL); + + e_html_editor_selection_move_caret_into_element ( +- document, monospace); ++ document, monospace, FALSE); + } + } else { + gboolean is_bold, is_italic, is_underline, is_strikethrough; +@@ -4857,7 +4857,8 @@ e_html_editor_selection_replace_image_src (EHTMLEditorSelection *selection, + + void + e_html_editor_selection_move_caret_into_element (WebKitDOMDocument *document, +- WebKitDOMElement *element) ++ WebKitDOMElement *element, ++ gboolean to_start) + { + WebKitDOMDOMWindow *window; + WebKitDOMDOMSelection *window_selection; +@@ -4871,8 +4872,8 @@ e_html_editor_selection_move_caret_into_element (WebKitDOMDocument *document, + new_range = webkit_dom_document_create_range (document); + + webkit_dom_range_select_node_contents ( +- new_range, WEBKIT_DOM_NODE (element), NULL); +- webkit_dom_range_collapse (new_range, FALSE, NULL); ++ new_range, WEBKIT_DOM_NODE (element), NULL); ++ webkit_dom_range_collapse (new_range, to_start, NULL); + webkit_dom_dom_selection_remove_all_ranges (window_selection); + webkit_dom_dom_selection_add_range (window_selection, new_range); + } +@@ -5071,13 +5072,13 @@ e_html_editor_selection_restore_caret_position (EHTMLEditorSelection *selection) + remove_node (WEBKIT_DOM_NODE (element)); + + e_html_editor_selection_move_caret_into_element ( +- document, WEBKIT_DOM_ELEMENT (next_sibling)); ++ document, WEBKIT_DOM_ELEMENT (next_sibling), FALSE); + + goto out; + } + } + +- e_html_editor_selection_move_caret_into_element (document, element); ++ e_html_editor_selection_move_caret_into_element (document, element, FALSE); + + if (fix_after_quoting) { + prev_sibling = webkit_dom_node_get_previous_sibling ( +@@ -6054,6 +6055,8 @@ e_html_editor_selection_save (EHTMLEditorSelection *selection) + parent_node, marker_node, split_node, NULL); + } + ++ webkit_dom_node_normalize (parent_node); ++ + end_marker: + marker = webkit_dom_document_create_element (document, "SPAN", NULL); + webkit_dom_element_set_id (marker, "-x-evo-selection-end-marker"); +@@ -6084,8 +6087,15 @@ e_html_editor_selection_save (EHTMLEditorSelection *selection) + WEBKIT_DOM_NODE (marker), + next_sibling, + NULL); +- return; ++ } else { ++ webkit_dom_node_insert_before ( ++ node, ++ WEBKIT_DOM_NODE (marker), ++ webkit_dom_node_get_next_sibling ( ++ webkit_dom_node_get_parent_node (parent_node)), ++ NULL); + } ++ return; + } + + if (WEBKIT_DOM_IS_TEXT (container)) { +@@ -6138,11 +6148,27 @@ e_html_editor_selection_save (EHTMLEditorSelection *selection) + if (split_node) { + parent_node = webkit_dom_node_get_parent_node (split_node); + +- webkit_dom_node_insert_before ( +- parent_node, marker_node, split_node, NULL); +- } else +- webkit_dom_node_append_child ( +- WEBKIT_DOM_NODE (container), marker_node, NULL); ++ if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (parent_node)) { ++ webkit_dom_node_append_child ( ++ webkit_dom_node_get_previous_sibling (split_node), ++ marker_node, ++ NULL); ++ } else ++ webkit_dom_node_insert_before ( ++ parent_node, marker_node, split_node, NULL); ++ } else { ++ WebKitDOMNode *first_child; ++ ++ first_child = webkit_dom_node_get_first_child (container); ++ if (offset == 0 && WEBKIT_DOM_IS_TEXT (first_child)) ++ webkit_dom_node_insert_before ( ++ WEBKIT_DOM_NODE (container), marker_node, webkit_dom_node_get_first_child (container), NULL); ++ else ++ webkit_dom_node_append_child ( ++ WEBKIT_DOM_NODE (container), marker_node, NULL); ++ } ++ ++ webkit_dom_node_normalize (parent_node); + + check: + if ((next_sibling = webkit_dom_node_get_next_sibling (marker_node))) { +diff --git a/e-util/e-html-editor-selection.h b/e-util/e-html-editor-selection.h +index 3290dfe..5ae9492 100644 +--- a/e-util/e-html-editor-selection.h ++++ b/e-util/e-html-editor-selection.h +@@ -185,7 +185,8 @@ void e_html_editor_selection_insert_image + const gchar *image_uri); + void e_html_editor_selection_move_caret_into_element + (WebKitDOMDocument *document, +- WebKitDOMElement *element); ++ WebKitDOMElement *element, ++ gboolean to_start); + void e_html_editor_selection_clear_caret_position_marker + (EHTMLEditorSelection *selection); + WebKitDOMNode * +diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c +index cb97da3..aeea625 100644 +--- a/e-util/e-html-editor-view.c ++++ b/e-util/e-html-editor-view.c +@@ -699,12 +699,18 @@ get_parent_block_node_from_child (WebKitDOMNode *node) + WebKitDOMNode *parent = webkit_dom_node_get_parent_node (node); + + if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-temp-text-wrapper") || ++ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted") || ++ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character") || ++ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-signature") || + WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) || + element_has_tag (WEBKIT_DOM_ELEMENT (parent), "b") || + element_has_tag (WEBKIT_DOM_ELEMENT (parent), "i") || + element_has_tag (WEBKIT_DOM_ELEMENT (parent), "u")) + parent = webkit_dom_node_get_parent_node (parent); + ++ if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted")) ++ parent = webkit_dom_node_get_parent_node (parent); ++ + return parent; + } + +@@ -1044,17 +1050,21 @@ move_elements_to_body (WebKitDOMDocument *document) + list = webkit_dom_document_query_selector_all ( + document, "span.-x-evo-to-body[data-credits]", NULL); + for (ii = webkit_dom_node_list_get_length (list) - 1; ii >= 0; ii--) { +- WebKitDOMNode *child; ++ char *credits; ++ WebKitDOMElement *pre_element; + WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); + +- while ((child = webkit_dom_node_get_first_child (node))) { +- webkit_dom_node_insert_before ( +- WEBKIT_DOM_NODE (body), +- child, +- webkit_dom_node_get_first_child ( +- WEBKIT_DOM_NODE (body)), +- NULL); +- } ++ pre_element = webkit_dom_document_create_element (document, "pre", NULL); ++ credits = webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (node), "data-credits"); ++ webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre_element), credits, NULL); ++ g_free (credits); ++ ++ webkit_dom_node_insert_before ( ++ WEBKIT_DOM_NODE (body), ++ WEBKIT_DOM_NODE (pre_element), ++ webkit_dom_node_get_first_child ( ++ WEBKIT_DOM_NODE (body)), ++ NULL); + + remove_node (node); + } +@@ -2131,6 +2141,57 @@ register_input_event_listener_on_body (EHTMLEditorView *view) + } + + static void ++remove_empty_blocks (WebKitDOMDocument *document) ++{ ++ gint ii, length; ++ WebKitDOMNodeList *list; ++ ++ list = webkit_dom_document_query_selector_all ( ++ document, "blockquote[type=cite] > :empty", NULL); ++ ++ length = webkit_dom_node_list_get_length (list); ++ for (ii = 0; ii < length; ii++) ++ remove_node (webkit_dom_node_list_item (list, ii)); ++ ++ g_object_unref (list); ++} ++ ++/* Following two functions are used when deleting the selection inside ++ * the quoted content. The thing is that normally the quote marks are not ++ * selectable by user. But this caused a lof of problems for WebKit when removing ++ * the selection. This will avoid it as when the delete or backspace key is pressed ++ * we will make the quote marks user selectable so they will act as any other text. ++ * On HTML keyup event callback we will make them again non-selectable. */ ++static void ++disable_quote_marks_select (WebKitDOMDocument *document) ++{ ++ WebKitDOMHTMLHeadElement *head; ++ WebKitDOMElement *style_element; ++ ++ head = webkit_dom_document_get_head (document); ++ ++ if (!webkit_dom_document_get_element_by_id (document, "-x-evo-quote-style")) { ++ style_element = webkit_dom_document_create_element (document, "style", NULL); ++ webkit_dom_element_set_id (style_element, "-x-evo-quote-style"); ++ webkit_dom_html_element_set_inner_html ( ++ WEBKIT_DOM_HTML_ELEMENT (style_element), ++ ".-x-evo-quoted { -webkit-user-select: none; }", ++ NULL); ++ webkit_dom_node_append_child ( ++ WEBKIT_DOM_NODE (head), WEBKIT_DOM_NODE (style_element), NULL); ++ } ++} ++ ++static void ++enable_quote_marks_select (WebKitDOMDocument *document) ++{ ++ WebKitDOMElement *style_element; ++ ++ if ((style_element = webkit_dom_document_get_element_by_id (document, "-x-evo-quote-style"))) ++ remove_node (WEBKIT_DOM_NODE (style_element)); ++} ++ ++static void + body_keyup_event_cb (WebKitDOMElement *element, + WebKitDOMUIEvent *event, + EHTMLEditorView *view) +@@ -2150,99 +2211,100 @@ body_keyup_event_cb (WebKitDOMElement *element, + * BackSpace or Delete. */ + gint level; + WebKitDOMElement *selection_start_marker, *selection_end_marker; +- WebKitDOMElement *br_element; ++ WebKitDOMElement *tmp_element; + WebKitDOMDocument *document; +- WebKitDOMNode *node, *parent; ++ WebKitDOMNode *parent; ++ ++ if (e_html_editor_view_get_html_mode (view)) ++ return; + + document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (element)); + ++ disable_quote_marks_select (document); ++ /* Remove empty blocks if presented. */ ++ remove_empty_blocks (document); ++ + e_html_editor_selection_save (selection); + selection_start_marker = webkit_dom_document_get_element_by_id ( + document, "-x-evo-selection-start-marker"); + selection_end_marker = webkit_dom_document_get_element_by_id ( + document, "-x-evo-selection-end-marker"); + +- level = get_citation_level ( +- WEBKIT_DOM_NODE (selection_start_marker), FALSE); +- if (level == 0) +- goto restore; +- +- node = webkit_dom_node_get_previous_sibling ( +- WEBKIT_DOM_NODE (selection_start_marker)); +- +- if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (node)) +- node = webkit_dom_node_get_previous_sibling (node); +- +- if (node) +- goto restore; +- +- parent = get_parent_block_node_from_child ( +- WEBKIT_DOM_NODE (selection_start_marker)); +- +- node = webkit_dom_node_get_previous_sibling (parent); +- if (!node) { +- /* Situation where the start of the selection was in the +- * multiple quoted content and that start on the beginning +- * of the citation. +- * +- * > +- * >> | +- * >> xx|x +- * */ +- node = webkit_dom_node_get_parent_node (parent); +- if (!WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (node)) +- goto restore; +- node = webkit_dom_node_get_previous_sibling (node); +- if (!node) +- goto restore; +- if (!WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (webkit_dom_node_get_parent_node (node))) +- goto restore; ++ /* If we deleted a selection the caret will be inside the quote marks, fix it. */ ++ parent = webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (selection_start_marker)); ++ if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character")) { ++ webkit_dom_node_insert_before ( ++ webkit_dom_node_get_parent_node ( ++ webkit_dom_node_get_parent_node (parent)), ++ WEBKIT_DOM_NODE (selection_end_marker), ++ webkit_dom_node_get_next_sibling ( ++ webkit_dom_node_get_parent_node (parent)), ++ NULL); ++ webkit_dom_node_insert_before ( ++ webkit_dom_node_get_parent_node ( ++ webkit_dom_node_get_parent_node (parent)), ++ WEBKIT_DOM_NODE (selection_start_marker), ++ webkit_dom_node_get_next_sibling ( ++ webkit_dom_node_get_parent_node (parent)), ++ NULL); + } + +- br_element = webkit_dom_element_query_selector ( +- WEBKIT_DOM_ELEMENT (node), "span.-x-evo-quote-character > br", NULL); +- if (br_element) { +- WebKitDOMNode *tmp; +- +- if (WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (node)) { +- /* We have to select the right block when the selection +- * started on the end of the citation that is +- * inside another citation. +- * +- * >>| +- * > xx|x +- */ +- /* */ +- node = webkit_dom_node_get_parent_node ( +- WEBKIT_DOM_NODE (br_element)); +- /* */ +- node = webkit_dom_node_get_parent_node (node); +- /* right block */ +- node = webkit_dom_node_get_parent_node (node); +- } ++ /* Under some circumstances we will end with block inside the citation ++ * that has the quote marks removed and we have to reinsert them back. */ ++ level = get_citation_level (WEBKIT_DOM_NODE (selection_start_marker), FALSE); ++ if (level > 0) { ++ WebKitDOMNode *prev_sibling; + +- webkit_dom_node_append_child ( +- node, WEBKIT_DOM_NODE (selection_start_marker), NULL); ++ prev_sibling = webkit_dom_node_get_previous_sibling ( ++ WEBKIT_DOM_NODE (selection_start_marker)); ++ if (!prev_sibling || ++ (WEBKIT_DOM_IS_HTMLBR_ELEMENT (prev_sibling) && ++ !webkit_dom_node_get_previous_sibling (prev_sibling))) { ++ WebKitDOMElement *block; ++ ++ block = WEBKIT_DOM_ELEMENT (get_parent_block_node_from_child ( ++ WEBKIT_DOM_NODE (selection_start_marker))); ++ if (element_has_class (block, "-x-evo-paragraph")) { ++ gint length, word_wrap_length; ++ ++ word_wrap_length = e_html_editor_selection_get_word_wrap_length (selection); ++ length = word_wrap_length - 2 * (level - 1); ++ block = e_html_editor_selection_wrap_paragraph_length ( ++ selection, block, length); ++ webkit_dom_node_normalize (WEBKIT_DOM_NODE (block)); ++ } ++ quote_plain_text_element_after_wrapping ( ++ document, block, level); ++ } ++ } + +- while ((tmp = webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker)))) +- webkit_dom_node_append_child (node, tmp, NULL); ++ /* Situation where the start of the selection was in the beginning ++ * of the block in quoted content and the end in the beginning of ++ * content that is after the citation or the selection end was in ++ * the end of the quoted content (showed by ^). The correct structure ++ * in these cases is to have empty block after the citation. ++ * ++ * > |xxx ++ * > xxx^ ++ * |xxx ++ * */ ++ tmp_element = webkit_dom_document_get_element_by_id (document, "-x-evo-tmp-block"); ++ if (tmp_element) { ++ remove_wrapping_from_element (tmp_element); ++ remove_quoting_from_element (tmp_element); ++ webkit_dom_element_remove_attribute (tmp_element, "id"); ++ ++ parent = webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (tmp_element)); ++ while (parent && !WEBKIT_DOM_IS_HTML_BODY_ELEMENT (webkit_dom_node_get_parent_node (parent))) ++ parent = webkit_dom_node_get_parent_node (parent); + + webkit_dom_node_insert_before ( +- node, +- WEBKIT_DOM_NODE (selection_end_marker), +- webkit_dom_node_get_next_sibling ( +- WEBKIT_DOM_NODE (selection_start_marker)), ++ webkit_dom_node_get_parent_node (parent), ++ WEBKIT_DOM_NODE (tmp_element), ++ webkit_dom_node_get_next_sibling (parent), + NULL); +- +- if (!WEBKIT_DOM_IS_HTMLBR_ELEMENT (webkit_dom_node_get_last_child (node))) +- webkit_dom_node_append_child ( +- node, WEBKIT_DOM_NODE (br_element), NULL); +- else +- remove_node (WEBKIT_DOM_NODE (br_element)); +- +- remove_node (parent); + } +- restore: ++ + e_html_editor_selection_restore (selection); + } else if (key_code == HTML_KEY_CODE_CONTROL) + html_editor_view_set_links_active (view, FALSE); +@@ -2825,6 +2887,127 @@ change_quoted_block_to_normal (EHTMLEditorView *view) + } + + static gboolean ++fix_structure_after_delete_before_quoted_content (EHTMLEditorView *view) ++{ ++ EHTMLEditorSelection *selection; ++ gboolean collapsed = FALSE; ++ WebKitDOMDocument *document; ++ WebKitDOMElement *selection_start_marker, *selection_end_marker; ++ WebKitDOMNode *block, *node; ++ ++ selection = e_html_editor_view_get_selection (view); ++ ++ collapsed = e_html_editor_selection_is_collapsed (selection); ++ ++ e_html_editor_selection_save (selection); ++ ++ document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view)); ++ selection_start_marker = webkit_dom_document_query_selector ( ++ document, "span#-x-evo-selection-start-marker", NULL); ++ selection_end_marker = webkit_dom_document_query_selector ( ++ document, "span#-x-evo-selection-end-marker", NULL); ++ ++ if (!selection_start_marker || !selection_end_marker) ++ return FALSE; ++ ++ if (collapsed) { ++ WebKitDOMNode *next_sibling; ++ ++ block = get_parent_block_node_from_child ( ++ WEBKIT_DOM_NODE (selection_start_marker)); ++ ++ next_sibling = webkit_dom_node_get_next_sibling (block); ++ ++ /* Next block is quoted content */ ++ if (!WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (next_sibling)) ++ goto restore; ++ ++ /* Delete was pressed in block without any content */ ++ if (webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (selection_start_marker))) ++ goto restore; ++ ++ /* If there is just BR element go ahead */ ++ node = webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker)); ++ if (node && !WEBKIT_DOM_IS_HTMLBR_ELEMENT (node)) ++ goto restore; ++ else { ++ /* Remove the empty block and move caret into the beginning of the citation */ ++ remove_node (block); ++ ++ e_html_editor_selection_move_caret_into_element ( ++ document, WEBKIT_DOM_ELEMENT (next_sibling), TRUE); ++ ++ return TRUE; ++ } ++ } else { ++ WebKitDOMNode *end_block; ++ ++ /* Let the quote marks be selectable to nearly correctly remove the ++ * selection. Corrections after are done in body_keyup_event_cb. */ ++ enable_quote_marks_select (document); ++ ++ node = webkit_dom_node_get_previous_sibling ( ++ WEBKIT_DOM_NODE (selection_start_marker)); ++ ++ if (!node || !WEBKIT_DOM_IS_ELEMENT (node)) ++ goto restore; ++ ++ if (!element_has_class (WEBKIT_DOM_ELEMENT (node), "-x-evo-quoted")) ++ goto restore; ++ ++ webkit_dom_node_insert_before ( ++ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (node)), ++ WEBKIT_DOM_NODE (selection_start_marker), ++ WEBKIT_DOM_NODE (node), ++ NULL); ++ ++ block = get_parent_block_node_from_child ( ++ WEBKIT_DOM_NODE (selection_start_marker)); ++ end_block = get_parent_block_node_from_child ( ++ WEBKIT_DOM_NODE (selection_end_marker)); ++ ++ /* Situation where the start of the selection is in the beginning ++ * of the block in quoted content and the end in the beginning of ++ * content that is after the citation or the selection end is in ++ * the end of the quoted content (showed by ^). We have to ++ * mark the start block to correctly restore the structure ++ * afterwards. ++ * ++ * > |xxx ++ * > xxx^ ++ * |xxx ++ * */ ++ if (get_citation_level (end_block, FALSE) > 0) { ++ WebKitDOMNode *parent; ++ ++ if (webkit_dom_node_get_next_sibling (end_block)) ++ goto restore; ++ ++ parent = webkit_dom_node_get_parent_node (end_block); ++ while (parent && WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (parent)) { ++ WebKitDOMNode *next_parent = webkit_dom_node_get_parent_node (parent); ++ ++ if (webkit_dom_node_get_next_sibling (parent) && ++ !WEBKIT_DOM_IS_HTML_BODY_ELEMENT (next_parent)) ++ goto restore; ++ ++ parent = next_parent; ++ } ++ } ++ node = webkit_dom_node_get_next_sibling ( ++ WEBKIT_DOM_NODE (selection_end_marker)); ++ if (!node || WEBKIT_DOM_IS_HTMLBR_ELEMENT (node)) { ++ webkit_dom_element_set_id ( ++ WEBKIT_DOM_ELEMENT (block), "-x-evo-tmp-block"); ++ } ++ } ++ restore: ++ e_html_editor_selection_restore (selection); ++ ++ return FALSE; ++} ++ ++static gboolean + html_editor_view_key_press_event (GtkWidget *widget, + GdkEventKey *event) + { +@@ -2916,6 +3099,10 @@ html_editor_view_key_press_event (GtkWidget *widget, + return TRUE; + } + ++ if (event->keyval == GDK_KEY_Delete || event->keyval == GDK_KEY_BackSpace) ++ if (fix_structure_after_delete_before_quoted_content (view)) ++ return TRUE; ++ + /* Chain up to parent's key_press_event() method. */ + return GTK_WIDGET_CLASS (e_html_editor_view_parent_class)-> + key_press_event (widget, event); +@@ -4570,6 +4757,9 @@ clear_attributes (WebKitDOMDocument *document) + while (webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (head))) + remove_node (webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (head))); + ++ /* Make the quote marks non-selectable. */ ++ disable_quote_marks_select (document); ++ + /* Remove non Evolution attributes from BODY element */ + attributes = webkit_dom_element_get_attributes (WEBKIT_DOM_ELEMENT (body)); + length = webkit_dom_named_node_map_get_length (attributes); +@@ -4718,16 +4908,20 @@ html_editor_convert_view_content (EHTMLEditorView *view, + document, "span.-x-evo-to-body[data-credits]", NULL); + length = webkit_dom_node_list_get_length (list); + for (ii = 0; ii < length; ii++) { +- WebKitDOMNode *node, *child; ++ char *credits; ++ WebKitDOMElement *pre_element; ++ WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); + +- node = webkit_dom_node_list_item (list, ii); +- while ((child = webkit_dom_node_get_first_child (node))) { +- webkit_dom_node_insert_before ( +- WEBKIT_DOM_NODE (wrapper), +- child, +- WEBKIT_DOM_NODE (content_wrapper), +- NULL); +- } ++ pre_element = webkit_dom_document_create_element (document, "pre", NULL); ++ credits = webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (node), "data-credits"); ++ webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre_element), credits, NULL); ++ g_free (credits); ++ ++ webkit_dom_node_insert_before ( ++ WEBKIT_DOM_NODE (wrapper), ++ WEBKIT_DOM_NODE (pre_element), ++ WEBKIT_DOM_NODE (content_wrapper), ++ NULL); + + remove_node (node); + } +@@ -4927,6 +5121,8 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view, + document, "-x-evo-selection-end-marker"); + current_block = get_parent_block_node_from_child ( + WEBKIT_DOM_NODE (selection_start_marker)); ++ if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (current_block)) ++ current_block = NULL; + + element = webkit_dom_document_create_element (document, "div", NULL); + if (is_html) { +@@ -6230,9 +6426,6 @@ process_elements (EHTMLEditorView *view, + remove_base_attributes (WEBKIT_DOM_ELEMENT (child)); + remove_evolution_attributes (WEBKIT_DOM_ELEMENT (child)); + } +- if (!changing_mode && to_plain_text) +- if (!webkit_dom_node_has_child_nodes (child)) +- g_string_append (buffer, "\n"); + } + + /* Signature */ +@@ -6261,7 +6454,6 @@ process_elements (EHTMLEditorView *view, + WEBKIT_DOM_HTML_ELEMENT (child)); + g_string_append (buffer, content); + g_free (content); +- skip_node = TRUE; + } + skip_node = TRUE; + goto next; +@@ -7043,6 +7235,9 @@ html_editor_view_load_status_changed (EHTMLEditorView *view) + webkit_dom_element_set_attribute ( + WEBKIT_DOM_ELEMENT (body), "data-message", "", NULL); + ++ /* Make the quote marks non-selectable. */ ++ disable_quote_marks_select (document); ++ + if (view->priv->convert_in_situ) { + html_editor_convert_view_content (view, NULL); + view->priv->convert_in_situ = FALSE; +@@ -7057,7 +7252,7 @@ html_editor_view_load_status_changed (EHTMLEditorView *view) + if (webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (body), "data-evo-draft")) { + /* Restore the selection how it was when the draft was saved */ + e_html_editor_selection_move_caret_into_element ( +- document, WEBKIT_DOM_ELEMENT (body)); ++ document, WEBKIT_DOM_ELEMENT (body), FALSE); + e_html_editor_selection_restore ( + e_html_editor_view_get_selection (view)); + } +@@ -7812,7 +8007,8 @@ e_html_editor_view_update_fonts (EHTMLEditorView *view) + " font-family: '%s';\n" + " font-size: %dpt;\n" + " font-weight: %d;\n" +- " font-style: %s;\n", ++ " font-style: %s;\n" ++ " -webkit-line-break: after-white-space;\n", + pango_font_description_get_family (vw), + pango_font_description_get_size (vw) / PANGO_SCALE, + pango_font_description_get_weight (vw), +@@ -8007,13 +8203,6 @@ e_html_editor_view_update_fonts (EHTMLEditorView *view) + + g_string_append (stylesheet, "}\n"); + +- g_string_append ( +- stylesheet, +- ".-x-evo-quoted " +- "{\n" +- " -webkit-user-select: none;\n" +- "}\n"); +- + g_string_append_printf ( + stylesheet, + ".-x-evo-quote-character " +diff --git a/em-format/e-mail-formatter-quote.c b/em-format/e-mail-formatter-quote.c +index 4df8be6..1916bba 100644 +--- a/em-format/e-mail-formatter-quote.c ++++ b/em-format/e-mail-formatter-quote.c +@@ -122,7 +122,7 @@ mail_formatter_quote_run (EMailFormatter *formatter, + * the special span element and it will be moved to body in EHTMLEditorView */ + if (qf->priv->credits && *qf->priv->credits) { + gchar *credits = g_strdup_printf ( +- "
%s
", ++ "", + qf->priv->credits); + g_output_stream_write_all ( + stream, credits, strlen (credits), NULL, cancellable, NULL); +@@ -133,7 +133,7 @@ mail_formatter_quote_run (EMailFormatter *formatter, + * after the message and cite it in EHTMLEditorView because of reasons + * mentioned above */ + if (qf->priv->flags & E_MAIL_FORMATTER_QUOTE_FLAG_CITE) { +- string = ""; ++ string = ""; + g_output_stream_write_all ( + stream, string, strlen (string), NULL, cancellable, NULL); + } +diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c +index 795ac9e..fcba621 100644 +--- a/mail/em-composer-utils.c ++++ b/mail/em-composer-utils.c +@@ -2871,8 +2871,7 @@ composer_set_body (EMsgComposer *composer, + original = quoting_text (QUOTING_ORIGINAL); + text = em_utils_message_to_html ( + session, message, original, E_MAIL_FORMATTER_QUOTE_FLAG_HEADERS, +- parts_list, "", +- "", &validity_found); ++ parts_list, NULL, NULL, &validity_found); + e_msg_composer_set_body_text (composer, text, TRUE); + g_free (text); + g_free (original); +@@ -2885,8 +2884,7 @@ composer_set_body (EMsgComposer *composer, + credits = attribution_format (message); + text = em_utils_message_to_html ( + session, message, credits, E_MAIL_FORMATTER_QUOTE_FLAG_CITE, +- parts_list, "", +- "", &validity_found); ++ parts_list, NULL, NULL, &validity_found); + g_free (credits); + e_msg_composer_set_body_text (composer, text, TRUE); + g_free (text); diff --git a/evolution.spec b/evolution.spec index 099aab6..b4fdefc 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ Name: evolution Version: 3.13.10 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -50,6 +50,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# Backport WebKit composer fixes to test them in the wild +Patch03: evolution-3.13.10-composer-backports.patch + ## Dependencies ### Requires: gvfs @@ -216,6 +219,7 @@ the functionality of the installed %{name} package. %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .composer_backports # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -543,6 +547,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Feb 02 2015 Tomas Popela - 3.13.10-2 +- Backport the WebKit composer patches + * Mon Jan 26 2015 Milan Crha - 3.13.10-1 - Update to 3.13.10 From 2f435143e84c8279a6cc57e9cb07ac73686ffb85 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Feb 2015 11:36:23 +0100 Subject: [PATCH 573/844] Update to 3.13.90 --- .gitignore | 1 + ...ion-3.12.3-drop-gnome-icon-theme-dep.patch | 23 - evolution-3.13.10-composer-backports.patch | 742 ------------------ evolution.spec | 23 +- sources | 2 +- 5 files changed, 11 insertions(+), 780 deletions(-) delete mode 100644 evolution-3.12.3-drop-gnome-icon-theme-dep.patch delete mode 100644 evolution-3.13.10-composer-backports.patch diff --git a/.gitignore b/.gitignore index 347c9af..c1b205d 100644 --- a/.gitignore +++ b/.gitignore @@ -83,3 +83,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.13.8.tar.xz /evolution-3.13.9.tar.xz /evolution-3.13.10.tar.xz +/evolution-3.13.90.tar.xz diff --git a/evolution-3.12.3-drop-gnome-icon-theme-dep.patch b/evolution-3.12.3-drop-gnome-icon-theme-dep.patch deleted file mode 100644 index f3d5f23..0000000 --- a/evolution-3.12.3-drop-gnome-icon-theme-dep.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep evolution-3.12.3/configure.ac ---- evolution-3.12.3/configure.ac.drop-gnome-icon-theme-dep 2014-06-09 11:33:17.814864320 +0200 -+++ evolution-3.12.3/configure.ac 2014-06-09 11:33:44.925863171 +0200 -@@ -49,7 +49,6 @@ m4_define([gtkhtml_minimum_version], [4. - m4_define([gdk_pixbuf_minimum_version], [2.24.0]) - m4_define([gcr_minimum_version], [3.4]) - m4_define([gnome_desktop_minimum_version], [2.91.3]) --m4_define([gnome_icon_theme_minimum_version], [2.30.2.1]) - m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) - m4_define([webkitgtk_minimum_version], [2.0.1]) - m4_define([libgdata_minimum_version], [0.10]) -@@ -486,11 +485,6 @@ fi - AC_CHECK_FUNCS(mkdtemp) - - dnl ************************************************** --dnl Gnome Icon Theme --dnl ************************************************** --PKG_CHECK_MODULES([GIT], [gnome-icon-theme >= gnome_icon_theme_minimum_version]) -- --dnl ************************************************** - dnl Accessibility support - dnl ************************************************** - PKG_CHECK_MODULES([A11Y], [atk]) diff --git a/evolution-3.13.10-composer-backports.patch b/evolution-3.13.10-composer-backports.patch deleted file mode 100644 index 59e0c62..0000000 --- a/evolution-3.13.10-composer-backports.patch +++ /dev/null @@ -1,742 +0,0 @@ -diff --git a/e-util/e-html-editor-selection.c b/e-util/e-html-editor-selection.c -index 254f820..baa5b38 100644 ---- a/e-util/e-html-editor-selection.c -+++ b/e-util/e-html-editor-selection.c -@@ -1347,22 +1347,22 @@ set_block_alignment (WebKitDOMElement *element, - static WebKitDOMNode * - get_parent_block_node_from_child (WebKitDOMNode *node) - { -- WebKitDOMElement *parent = WEBKIT_DOM_ELEMENT ( -- webkit_dom_node_get_parent_node (node)); -+ WebKitDOMNode *parent = webkit_dom_node_get_parent_node (node); - -- if (WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) || -- element_has_tag (parent, "b") || -- element_has_tag (parent, "i") || -- element_has_tag (parent, "u")) -- parent = WEBKIT_DOM_ELEMENT ( -- webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (parent))); -+ if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-temp-text-wrapper") || -+ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted") || -+ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character") || -+ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-signature") || -+ WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) || -+ element_has_tag (WEBKIT_DOM_ELEMENT (parent), "b") || -+ element_has_tag (WEBKIT_DOM_ELEMENT (parent), "i") || -+ element_has_tag (WEBKIT_DOM_ELEMENT (parent), "u")) -+ parent = webkit_dom_node_get_parent_node (parent); - -- if (element_has_class (parent, "-x-evo-temp-text-wrapper") || -- element_has_class (parent, "-x-evo-signature")) -- parent = WEBKIT_DOM_ELEMENT ( -- webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (parent))); -+ if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted")) -+ parent = webkit_dom_node_get_parent_node (parent); - -- return WEBKIT_DOM_NODE (parent); -+ return parent; - } - - /** -@@ -3771,7 +3771,7 @@ e_html_editor_selection_set_monospaced (EHTMLEditorSelection *selection, - range, WEBKIT_DOM_NODE (monospace), NULL); - - e_html_editor_selection_move_caret_into_element ( -- document, monospace); -+ document, monospace, FALSE); - } - } else { - gboolean is_bold, is_italic, is_underline, is_strikethrough; -@@ -4857,7 +4857,8 @@ e_html_editor_selection_replace_image_src (EHTMLEditorSelection *selection, - - void - e_html_editor_selection_move_caret_into_element (WebKitDOMDocument *document, -- WebKitDOMElement *element) -+ WebKitDOMElement *element, -+ gboolean to_start) - { - WebKitDOMDOMWindow *window; - WebKitDOMDOMSelection *window_selection; -@@ -4871,8 +4872,8 @@ e_html_editor_selection_move_caret_into_element (WebKitDOMDocument *document, - new_range = webkit_dom_document_create_range (document); - - webkit_dom_range_select_node_contents ( -- new_range, WEBKIT_DOM_NODE (element), NULL); -- webkit_dom_range_collapse (new_range, FALSE, NULL); -+ new_range, WEBKIT_DOM_NODE (element), NULL); -+ webkit_dom_range_collapse (new_range, to_start, NULL); - webkit_dom_dom_selection_remove_all_ranges (window_selection); - webkit_dom_dom_selection_add_range (window_selection, new_range); - } -@@ -5071,13 +5072,13 @@ e_html_editor_selection_restore_caret_position (EHTMLEditorSelection *selection) - remove_node (WEBKIT_DOM_NODE (element)); - - e_html_editor_selection_move_caret_into_element ( -- document, WEBKIT_DOM_ELEMENT (next_sibling)); -+ document, WEBKIT_DOM_ELEMENT (next_sibling), FALSE); - - goto out; - } - } - -- e_html_editor_selection_move_caret_into_element (document, element); -+ e_html_editor_selection_move_caret_into_element (document, element, FALSE); - - if (fix_after_quoting) { - prev_sibling = webkit_dom_node_get_previous_sibling ( -@@ -6054,6 +6055,8 @@ e_html_editor_selection_save (EHTMLEditorSelection *selection) - parent_node, marker_node, split_node, NULL); - } - -+ webkit_dom_node_normalize (parent_node); -+ - end_marker: - marker = webkit_dom_document_create_element (document, "SPAN", NULL); - webkit_dom_element_set_id (marker, "-x-evo-selection-end-marker"); -@@ -6084,8 +6087,15 @@ e_html_editor_selection_save (EHTMLEditorSelection *selection) - WEBKIT_DOM_NODE (marker), - next_sibling, - NULL); -- return; -+ } else { -+ webkit_dom_node_insert_before ( -+ node, -+ WEBKIT_DOM_NODE (marker), -+ webkit_dom_node_get_next_sibling ( -+ webkit_dom_node_get_parent_node (parent_node)), -+ NULL); - } -+ return; - } - - if (WEBKIT_DOM_IS_TEXT (container)) { -@@ -6138,11 +6148,27 @@ e_html_editor_selection_save (EHTMLEditorSelection *selection) - if (split_node) { - parent_node = webkit_dom_node_get_parent_node (split_node); - -- webkit_dom_node_insert_before ( -- parent_node, marker_node, split_node, NULL); -- } else -- webkit_dom_node_append_child ( -- WEBKIT_DOM_NODE (container), marker_node, NULL); -+ if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (parent_node)) { -+ webkit_dom_node_append_child ( -+ webkit_dom_node_get_previous_sibling (split_node), -+ marker_node, -+ NULL); -+ } else -+ webkit_dom_node_insert_before ( -+ parent_node, marker_node, split_node, NULL); -+ } else { -+ WebKitDOMNode *first_child; -+ -+ first_child = webkit_dom_node_get_first_child (container); -+ if (offset == 0 && WEBKIT_DOM_IS_TEXT (first_child)) -+ webkit_dom_node_insert_before ( -+ WEBKIT_DOM_NODE (container), marker_node, webkit_dom_node_get_first_child (container), NULL); -+ else -+ webkit_dom_node_append_child ( -+ WEBKIT_DOM_NODE (container), marker_node, NULL); -+ } -+ -+ webkit_dom_node_normalize (parent_node); - - check: - if ((next_sibling = webkit_dom_node_get_next_sibling (marker_node))) { -diff --git a/e-util/e-html-editor-selection.h b/e-util/e-html-editor-selection.h -index 3290dfe..5ae9492 100644 ---- a/e-util/e-html-editor-selection.h -+++ b/e-util/e-html-editor-selection.h -@@ -185,7 +185,8 @@ void e_html_editor_selection_insert_image - const gchar *image_uri); - void e_html_editor_selection_move_caret_into_element - (WebKitDOMDocument *document, -- WebKitDOMElement *element); -+ WebKitDOMElement *element, -+ gboolean to_start); - void e_html_editor_selection_clear_caret_position_marker - (EHTMLEditorSelection *selection); - WebKitDOMNode * -diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c -index cb97da3..aeea625 100644 ---- a/e-util/e-html-editor-view.c -+++ b/e-util/e-html-editor-view.c -@@ -699,12 +699,18 @@ get_parent_block_node_from_child (WebKitDOMNode *node) - WebKitDOMNode *parent = webkit_dom_node_get_parent_node (node); - - if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-temp-text-wrapper") || -+ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted") || -+ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character") || -+ element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-signature") || - WEBKIT_DOM_IS_HTML_ANCHOR_ELEMENT (parent) || - element_has_tag (WEBKIT_DOM_ELEMENT (parent), "b") || - element_has_tag (WEBKIT_DOM_ELEMENT (parent), "i") || - element_has_tag (WEBKIT_DOM_ELEMENT (parent), "u")) - parent = webkit_dom_node_get_parent_node (parent); - -+ if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quoted")) -+ parent = webkit_dom_node_get_parent_node (parent); -+ - return parent; - } - -@@ -1044,17 +1050,21 @@ move_elements_to_body (WebKitDOMDocument *document) - list = webkit_dom_document_query_selector_all ( - document, "span.-x-evo-to-body[data-credits]", NULL); - for (ii = webkit_dom_node_list_get_length (list) - 1; ii >= 0; ii--) { -- WebKitDOMNode *child; -+ char *credits; -+ WebKitDOMElement *pre_element; - WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); - -- while ((child = webkit_dom_node_get_first_child (node))) { -- webkit_dom_node_insert_before ( -- WEBKIT_DOM_NODE (body), -- child, -- webkit_dom_node_get_first_child ( -- WEBKIT_DOM_NODE (body)), -- NULL); -- } -+ pre_element = webkit_dom_document_create_element (document, "pre", NULL); -+ credits = webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (node), "data-credits"); -+ webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre_element), credits, NULL); -+ g_free (credits); -+ -+ webkit_dom_node_insert_before ( -+ WEBKIT_DOM_NODE (body), -+ WEBKIT_DOM_NODE (pre_element), -+ webkit_dom_node_get_first_child ( -+ WEBKIT_DOM_NODE (body)), -+ NULL); - - remove_node (node); - } -@@ -2131,6 +2141,57 @@ register_input_event_listener_on_body (EHTMLEditorView *view) - } - - static void -+remove_empty_blocks (WebKitDOMDocument *document) -+{ -+ gint ii, length; -+ WebKitDOMNodeList *list; -+ -+ list = webkit_dom_document_query_selector_all ( -+ document, "blockquote[type=cite] > :empty", NULL); -+ -+ length = webkit_dom_node_list_get_length (list); -+ for (ii = 0; ii < length; ii++) -+ remove_node (webkit_dom_node_list_item (list, ii)); -+ -+ g_object_unref (list); -+} -+ -+/* Following two functions are used when deleting the selection inside -+ * the quoted content. The thing is that normally the quote marks are not -+ * selectable by user. But this caused a lof of problems for WebKit when removing -+ * the selection. This will avoid it as when the delete or backspace key is pressed -+ * we will make the quote marks user selectable so they will act as any other text. -+ * On HTML keyup event callback we will make them again non-selectable. */ -+static void -+disable_quote_marks_select (WebKitDOMDocument *document) -+{ -+ WebKitDOMHTMLHeadElement *head; -+ WebKitDOMElement *style_element; -+ -+ head = webkit_dom_document_get_head (document); -+ -+ if (!webkit_dom_document_get_element_by_id (document, "-x-evo-quote-style")) { -+ style_element = webkit_dom_document_create_element (document, "style", NULL); -+ webkit_dom_element_set_id (style_element, "-x-evo-quote-style"); -+ webkit_dom_html_element_set_inner_html ( -+ WEBKIT_DOM_HTML_ELEMENT (style_element), -+ ".-x-evo-quoted { -webkit-user-select: none; }", -+ NULL); -+ webkit_dom_node_append_child ( -+ WEBKIT_DOM_NODE (head), WEBKIT_DOM_NODE (style_element), NULL); -+ } -+} -+ -+static void -+enable_quote_marks_select (WebKitDOMDocument *document) -+{ -+ WebKitDOMElement *style_element; -+ -+ if ((style_element = webkit_dom_document_get_element_by_id (document, "-x-evo-quote-style"))) -+ remove_node (WEBKIT_DOM_NODE (style_element)); -+} -+ -+static void - body_keyup_event_cb (WebKitDOMElement *element, - WebKitDOMUIEvent *event, - EHTMLEditorView *view) -@@ -2150,99 +2211,100 @@ body_keyup_event_cb (WebKitDOMElement *element, - * BackSpace or Delete. */ - gint level; - WebKitDOMElement *selection_start_marker, *selection_end_marker; -- WebKitDOMElement *br_element; -+ WebKitDOMElement *tmp_element; - WebKitDOMDocument *document; -- WebKitDOMNode *node, *parent; -+ WebKitDOMNode *parent; -+ -+ if (e_html_editor_view_get_html_mode (view)) -+ return; - - document = webkit_dom_node_get_owner_document (WEBKIT_DOM_NODE (element)); - -+ disable_quote_marks_select (document); -+ /* Remove empty blocks if presented. */ -+ remove_empty_blocks (document); -+ - e_html_editor_selection_save (selection); - selection_start_marker = webkit_dom_document_get_element_by_id ( - document, "-x-evo-selection-start-marker"); - selection_end_marker = webkit_dom_document_get_element_by_id ( - document, "-x-evo-selection-end-marker"); - -- level = get_citation_level ( -- WEBKIT_DOM_NODE (selection_start_marker), FALSE); -- if (level == 0) -- goto restore; -- -- node = webkit_dom_node_get_previous_sibling ( -- WEBKIT_DOM_NODE (selection_start_marker)); -- -- if (WEBKIT_DOM_IS_HTMLBR_ELEMENT (node)) -- node = webkit_dom_node_get_previous_sibling (node); -- -- if (node) -- goto restore; -- -- parent = get_parent_block_node_from_child ( -- WEBKIT_DOM_NODE (selection_start_marker)); -- -- node = webkit_dom_node_get_previous_sibling (parent); -- if (!node) { -- /* Situation where the start of the selection was in the -- * multiple quoted content and that start on the beginning -- * of the citation. -- * -- * > -- * >> | -- * >> xx|x -- * */ -- node = webkit_dom_node_get_parent_node (parent); -- if (!WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (node)) -- goto restore; -- node = webkit_dom_node_get_previous_sibling (node); -- if (!node) -- goto restore; -- if (!WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (webkit_dom_node_get_parent_node (node))) -- goto restore; -+ /* If we deleted a selection the caret will be inside the quote marks, fix it. */ -+ parent = webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (selection_start_marker)); -+ if (element_has_class (WEBKIT_DOM_ELEMENT (parent), "-x-evo-quote-character")) { -+ webkit_dom_node_insert_before ( -+ webkit_dom_node_get_parent_node ( -+ webkit_dom_node_get_parent_node (parent)), -+ WEBKIT_DOM_NODE (selection_end_marker), -+ webkit_dom_node_get_next_sibling ( -+ webkit_dom_node_get_parent_node (parent)), -+ NULL); -+ webkit_dom_node_insert_before ( -+ webkit_dom_node_get_parent_node ( -+ webkit_dom_node_get_parent_node (parent)), -+ WEBKIT_DOM_NODE (selection_start_marker), -+ webkit_dom_node_get_next_sibling ( -+ webkit_dom_node_get_parent_node (parent)), -+ NULL); - } - -- br_element = webkit_dom_element_query_selector ( -- WEBKIT_DOM_ELEMENT (node), "span.-x-evo-quote-character > br", NULL); -- if (br_element) { -- WebKitDOMNode *tmp; -- -- if (WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (node)) { -- /* We have to select the right block when the selection -- * started on the end of the citation that is -- * inside another citation. -- * -- * >>| -- * > xx|x -- */ -- /* */ -- node = webkit_dom_node_get_parent_node ( -- WEBKIT_DOM_NODE (br_element)); -- /* */ -- node = webkit_dom_node_get_parent_node (node); -- /* right block */ -- node = webkit_dom_node_get_parent_node (node); -- } -+ /* Under some circumstances we will end with block inside the citation -+ * that has the quote marks removed and we have to reinsert them back. */ -+ level = get_citation_level (WEBKIT_DOM_NODE (selection_start_marker), FALSE); -+ if (level > 0) { -+ WebKitDOMNode *prev_sibling; - -- webkit_dom_node_append_child ( -- node, WEBKIT_DOM_NODE (selection_start_marker), NULL); -+ prev_sibling = webkit_dom_node_get_previous_sibling ( -+ WEBKIT_DOM_NODE (selection_start_marker)); -+ if (!prev_sibling || -+ (WEBKIT_DOM_IS_HTMLBR_ELEMENT (prev_sibling) && -+ !webkit_dom_node_get_previous_sibling (prev_sibling))) { -+ WebKitDOMElement *block; -+ -+ block = WEBKIT_DOM_ELEMENT (get_parent_block_node_from_child ( -+ WEBKIT_DOM_NODE (selection_start_marker))); -+ if (element_has_class (block, "-x-evo-paragraph")) { -+ gint length, word_wrap_length; -+ -+ word_wrap_length = e_html_editor_selection_get_word_wrap_length (selection); -+ length = word_wrap_length - 2 * (level - 1); -+ block = e_html_editor_selection_wrap_paragraph_length ( -+ selection, block, length); -+ webkit_dom_node_normalize (WEBKIT_DOM_NODE (block)); -+ } -+ quote_plain_text_element_after_wrapping ( -+ document, block, level); -+ } -+ } - -- while ((tmp = webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker)))) -- webkit_dom_node_append_child (node, tmp, NULL); -+ /* Situation where the start of the selection was in the beginning -+ * of the block in quoted content and the end in the beginning of -+ * content that is after the citation or the selection end was in -+ * the end of the quoted content (showed by ^). The correct structure -+ * in these cases is to have empty block after the citation. -+ * -+ * > |xxx -+ * > xxx^ -+ * |xxx -+ * */ -+ tmp_element = webkit_dom_document_get_element_by_id (document, "-x-evo-tmp-block"); -+ if (tmp_element) { -+ remove_wrapping_from_element (tmp_element); -+ remove_quoting_from_element (tmp_element); -+ webkit_dom_element_remove_attribute (tmp_element, "id"); -+ -+ parent = webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (tmp_element)); -+ while (parent && !WEBKIT_DOM_IS_HTML_BODY_ELEMENT (webkit_dom_node_get_parent_node (parent))) -+ parent = webkit_dom_node_get_parent_node (parent); - - webkit_dom_node_insert_before ( -- node, -- WEBKIT_DOM_NODE (selection_end_marker), -- webkit_dom_node_get_next_sibling ( -- WEBKIT_DOM_NODE (selection_start_marker)), -+ webkit_dom_node_get_parent_node (parent), -+ WEBKIT_DOM_NODE (tmp_element), -+ webkit_dom_node_get_next_sibling (parent), - NULL); -- -- if (!WEBKIT_DOM_IS_HTMLBR_ELEMENT (webkit_dom_node_get_last_child (node))) -- webkit_dom_node_append_child ( -- node, WEBKIT_DOM_NODE (br_element), NULL); -- else -- remove_node (WEBKIT_DOM_NODE (br_element)); -- -- remove_node (parent); - } -- restore: -+ - e_html_editor_selection_restore (selection); - } else if (key_code == HTML_KEY_CODE_CONTROL) - html_editor_view_set_links_active (view, FALSE); -@@ -2825,6 +2887,127 @@ change_quoted_block_to_normal (EHTMLEditorView *view) - } - - static gboolean -+fix_structure_after_delete_before_quoted_content (EHTMLEditorView *view) -+{ -+ EHTMLEditorSelection *selection; -+ gboolean collapsed = FALSE; -+ WebKitDOMDocument *document; -+ WebKitDOMElement *selection_start_marker, *selection_end_marker; -+ WebKitDOMNode *block, *node; -+ -+ selection = e_html_editor_view_get_selection (view); -+ -+ collapsed = e_html_editor_selection_is_collapsed (selection); -+ -+ e_html_editor_selection_save (selection); -+ -+ document = webkit_web_view_get_dom_document (WEBKIT_WEB_VIEW (view)); -+ selection_start_marker = webkit_dom_document_query_selector ( -+ document, "span#-x-evo-selection-start-marker", NULL); -+ selection_end_marker = webkit_dom_document_query_selector ( -+ document, "span#-x-evo-selection-end-marker", NULL); -+ -+ if (!selection_start_marker || !selection_end_marker) -+ return FALSE; -+ -+ if (collapsed) { -+ WebKitDOMNode *next_sibling; -+ -+ block = get_parent_block_node_from_child ( -+ WEBKIT_DOM_NODE (selection_start_marker)); -+ -+ next_sibling = webkit_dom_node_get_next_sibling (block); -+ -+ /* Next block is quoted content */ -+ if (!WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (next_sibling)) -+ goto restore; -+ -+ /* Delete was pressed in block without any content */ -+ if (webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (selection_start_marker))) -+ goto restore; -+ -+ /* If there is just BR element go ahead */ -+ node = webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker)); -+ if (node && !WEBKIT_DOM_IS_HTMLBR_ELEMENT (node)) -+ goto restore; -+ else { -+ /* Remove the empty block and move caret into the beginning of the citation */ -+ remove_node (block); -+ -+ e_html_editor_selection_move_caret_into_element ( -+ document, WEBKIT_DOM_ELEMENT (next_sibling), TRUE); -+ -+ return TRUE; -+ } -+ } else { -+ WebKitDOMNode *end_block; -+ -+ /* Let the quote marks be selectable to nearly correctly remove the -+ * selection. Corrections after are done in body_keyup_event_cb. */ -+ enable_quote_marks_select (document); -+ -+ node = webkit_dom_node_get_previous_sibling ( -+ WEBKIT_DOM_NODE (selection_start_marker)); -+ -+ if (!node || !WEBKIT_DOM_IS_ELEMENT (node)) -+ goto restore; -+ -+ if (!element_has_class (WEBKIT_DOM_ELEMENT (node), "-x-evo-quoted")) -+ goto restore; -+ -+ webkit_dom_node_insert_before ( -+ webkit_dom_node_get_parent_node (WEBKIT_DOM_NODE (node)), -+ WEBKIT_DOM_NODE (selection_start_marker), -+ WEBKIT_DOM_NODE (node), -+ NULL); -+ -+ block = get_parent_block_node_from_child ( -+ WEBKIT_DOM_NODE (selection_start_marker)); -+ end_block = get_parent_block_node_from_child ( -+ WEBKIT_DOM_NODE (selection_end_marker)); -+ -+ /* Situation where the start of the selection is in the beginning -+ * of the block in quoted content and the end in the beginning of -+ * content that is after the citation or the selection end is in -+ * the end of the quoted content (showed by ^). We have to -+ * mark the start block to correctly restore the structure -+ * afterwards. -+ * -+ * > |xxx -+ * > xxx^ -+ * |xxx -+ * */ -+ if (get_citation_level (end_block, FALSE) > 0) { -+ WebKitDOMNode *parent; -+ -+ if (webkit_dom_node_get_next_sibling (end_block)) -+ goto restore; -+ -+ parent = webkit_dom_node_get_parent_node (end_block); -+ while (parent && WEBKIT_DOM_IS_HTML_QUOTE_ELEMENT (parent)) { -+ WebKitDOMNode *next_parent = webkit_dom_node_get_parent_node (parent); -+ -+ if (webkit_dom_node_get_next_sibling (parent) && -+ !WEBKIT_DOM_IS_HTML_BODY_ELEMENT (next_parent)) -+ goto restore; -+ -+ parent = next_parent; -+ } -+ } -+ node = webkit_dom_node_get_next_sibling ( -+ WEBKIT_DOM_NODE (selection_end_marker)); -+ if (!node || WEBKIT_DOM_IS_HTMLBR_ELEMENT (node)) { -+ webkit_dom_element_set_id ( -+ WEBKIT_DOM_ELEMENT (block), "-x-evo-tmp-block"); -+ } -+ } -+ restore: -+ e_html_editor_selection_restore (selection); -+ -+ return FALSE; -+} -+ -+static gboolean - html_editor_view_key_press_event (GtkWidget *widget, - GdkEventKey *event) - { -@@ -2916,6 +3099,10 @@ html_editor_view_key_press_event (GtkWidget *widget, - return TRUE; - } - -+ if (event->keyval == GDK_KEY_Delete || event->keyval == GDK_KEY_BackSpace) -+ if (fix_structure_after_delete_before_quoted_content (view)) -+ return TRUE; -+ - /* Chain up to parent's key_press_event() method. */ - return GTK_WIDGET_CLASS (e_html_editor_view_parent_class)-> - key_press_event (widget, event); -@@ -4570,6 +4757,9 @@ clear_attributes (WebKitDOMDocument *document) - while (webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (head))) - remove_node (webkit_dom_node_get_first_child (WEBKIT_DOM_NODE (head))); - -+ /* Make the quote marks non-selectable. */ -+ disable_quote_marks_select (document); -+ - /* Remove non Evolution attributes from BODY element */ - attributes = webkit_dom_element_get_attributes (WEBKIT_DOM_ELEMENT (body)); - length = webkit_dom_named_node_map_get_length (attributes); -@@ -4718,16 +4908,20 @@ html_editor_convert_view_content (EHTMLEditorView *view, - document, "span.-x-evo-to-body[data-credits]", NULL); - length = webkit_dom_node_list_get_length (list); - for (ii = 0; ii < length; ii++) { -- WebKitDOMNode *node, *child; -+ char *credits; -+ WebKitDOMElement *pre_element; -+ WebKitDOMNode *node = webkit_dom_node_list_item (list, ii); - -- node = webkit_dom_node_list_item (list, ii); -- while ((child = webkit_dom_node_get_first_child (node))) { -- webkit_dom_node_insert_before ( -- WEBKIT_DOM_NODE (wrapper), -- child, -- WEBKIT_DOM_NODE (content_wrapper), -- NULL); -- } -+ pre_element = webkit_dom_document_create_element (document, "pre", NULL); -+ credits = webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (node), "data-credits"); -+ webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre_element), credits, NULL); -+ g_free (credits); -+ -+ webkit_dom_node_insert_before ( -+ WEBKIT_DOM_NODE (wrapper), -+ WEBKIT_DOM_NODE (pre_element), -+ WEBKIT_DOM_NODE (content_wrapper), -+ NULL); - - remove_node (node); - } -@@ -4927,6 +5121,8 @@ html_editor_view_insert_converted_html_into_selection (EHTMLEditorView *view, - document, "-x-evo-selection-end-marker"); - current_block = get_parent_block_node_from_child ( - WEBKIT_DOM_NODE (selection_start_marker)); -+ if (WEBKIT_DOM_IS_HTML_BODY_ELEMENT (current_block)) -+ current_block = NULL; - - element = webkit_dom_document_create_element (document, "div", NULL); - if (is_html) { -@@ -6230,9 +6426,6 @@ process_elements (EHTMLEditorView *view, - remove_base_attributes (WEBKIT_DOM_ELEMENT (child)); - remove_evolution_attributes (WEBKIT_DOM_ELEMENT (child)); - } -- if (!changing_mode && to_plain_text) -- if (!webkit_dom_node_has_child_nodes (child)) -- g_string_append (buffer, "\n"); - } - - /* Signature */ -@@ -6261,7 +6454,6 @@ process_elements (EHTMLEditorView *view, - WEBKIT_DOM_HTML_ELEMENT (child)); - g_string_append (buffer, content); - g_free (content); -- skip_node = TRUE; - } - skip_node = TRUE; - goto next; -@@ -7043,6 +7235,9 @@ html_editor_view_load_status_changed (EHTMLEditorView *view) - webkit_dom_element_set_attribute ( - WEBKIT_DOM_ELEMENT (body), "data-message", "", NULL); - -+ /* Make the quote marks non-selectable. */ -+ disable_quote_marks_select (document); -+ - if (view->priv->convert_in_situ) { - html_editor_convert_view_content (view, NULL); - view->priv->convert_in_situ = FALSE; -@@ -7057,7 +7252,7 @@ html_editor_view_load_status_changed (EHTMLEditorView *view) - if (webkit_dom_element_get_attribute (WEBKIT_DOM_ELEMENT (body), "data-evo-draft")) { - /* Restore the selection how it was when the draft was saved */ - e_html_editor_selection_move_caret_into_element ( -- document, WEBKIT_DOM_ELEMENT (body)); -+ document, WEBKIT_DOM_ELEMENT (body), FALSE); - e_html_editor_selection_restore ( - e_html_editor_view_get_selection (view)); - } -@@ -7812,7 +8007,8 @@ e_html_editor_view_update_fonts (EHTMLEditorView *view) - " font-family: '%s';\n" - " font-size: %dpt;\n" - " font-weight: %d;\n" -- " font-style: %s;\n", -+ " font-style: %s;\n" -+ " -webkit-line-break: after-white-space;\n", - pango_font_description_get_family (vw), - pango_font_description_get_size (vw) / PANGO_SCALE, - pango_font_description_get_weight (vw), -@@ -8007,13 +8203,6 @@ e_html_editor_view_update_fonts (EHTMLEditorView *view) - - g_string_append (stylesheet, "}\n"); - -- g_string_append ( -- stylesheet, -- ".-x-evo-quoted " -- "{\n" -- " -webkit-user-select: none;\n" -- "}\n"); -- - g_string_append_printf ( - stylesheet, - ".-x-evo-quote-character " -diff --git a/em-format/e-mail-formatter-quote.c b/em-format/e-mail-formatter-quote.c -index 4df8be6..1916bba 100644 ---- a/em-format/e-mail-formatter-quote.c -+++ b/em-format/e-mail-formatter-quote.c -@@ -122,7 +122,7 @@ mail_formatter_quote_run (EMailFormatter *formatter, - * the special span element and it will be moved to body in EHTMLEditorView */ - if (qf->priv->credits && *qf->priv->credits) { - gchar *credits = g_strdup_printf ( -- "
%s
", -+ "", - qf->priv->credits); - g_output_stream_write_all ( - stream, credits, strlen (credits), NULL, cancellable, NULL); -@@ -133,7 +133,7 @@ mail_formatter_quote_run (EMailFormatter *formatter, - * after the message and cite it in EHTMLEditorView because of reasons - * mentioned above */ - if (qf->priv->flags & E_MAIL_FORMATTER_QUOTE_FLAG_CITE) { -- string = ""; -+ string = ""; - g_output_stream_write_all ( - stream, string, strlen (string), NULL, cancellable, NULL); - } -diff --git a/mail/em-composer-utils.c b/mail/em-composer-utils.c -index 795ac9e..fcba621 100644 ---- a/mail/em-composer-utils.c -+++ b/mail/em-composer-utils.c -@@ -2871,8 +2871,7 @@ composer_set_body (EMsgComposer *composer, - original = quoting_text (QUOTING_ORIGINAL); - text = em_utils_message_to_html ( - session, message, original, E_MAIL_FORMATTER_QUOTE_FLAG_HEADERS, -- parts_list, "", -- "", &validity_found); -+ parts_list, NULL, NULL, &validity_found); - e_msg_composer_set_body_text (composer, text, TRUE); - g_free (text); - g_free (original); -@@ -2885,8 +2884,7 @@ composer_set_body (EMsgComposer *composer, - credits = attribution_format (message); - text = em_utils_message_to_html ( - session, message, credits, E_MAIL_FORMATTER_QUOTE_FLAG_CITE, -- parts_list, "", -- "", &validity_found); -+ parts_list, NULL, NULL, &validity_found); - g_free (credits); - e_msg_composer_set_body_text (composer, text, TRUE); - g_free (text); diff --git a/evolution.spec b/evolution.spec index b4fdefc..83164fd 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,15 +1,14 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") -%define glib2_version 2.36.0 -%define gtk3_version 3.4.0 -%define gtkhtml_version 4.5.2 +%define glib2_version 2.40.0 +%define gtk3_version 3.10.0 %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define intltool_version 0.35.5 %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 %define libsoup_version 2.40.3 -%define webkit_version 1.8.0 +%define webkit_version 2.2.0 %define evo_base_version 3.14 @@ -29,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.13.10 -Release: 2%{?dist} +Version: 3.13.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -50,9 +49,6 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch -# Backport WebKit composer fixes to test them in the wild -Patch03: evolution-3.13.10-composer-backports.patch - ## Dependencies ### Requires: gvfs @@ -87,7 +83,6 @@ BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} -BuildRequires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version} BuildRequires: pkgconfig(gtkspell3-3.0) BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version} BuildRequires: pkgconfig(libcanberra-gtk3) @@ -96,7 +91,6 @@ BuildRequires: pkgconfig(libebook-1.2) >= %{version} BuildRequires: pkgconfig(libecal-1.2) >= %{version} BuildRequires: pkgconfig(libedataserver-1.2) >= %{version} BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} -BuildRequires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version} BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(nspr) @@ -129,7 +123,6 @@ Requires: %{name} = %{version}-%{release} Requires: pkgconfig(camel-1.2) >= %{version} Requires: pkgconfig(cryptui-0.0) Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} -Requires: pkgconfig(gtkhtml-editor-4.0) >= %{gtkhtml_version} Requires: pkgconfig(gtkspell3-3.0) Requires: pkgconfig(gweather-3.0) >= %{libgweather_version} Requires: pkgconfig(libebackend-1.2) >= %{version} @@ -137,7 +130,6 @@ Requires: pkgconfig(libebook-1.2) >= %{version} Requires: pkgconfig(libecal-1.2) >= %{version} Requires: pkgconfig(libedataserver-1.2) >= %{version} Requires: pkgconfig(libgdata) >= %{libgdata_version} -Requires: pkgconfig(libgtkhtml-4.0) >= %{gtkhtml_version} Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version} Requires: pkgconfig(libxml-2.0) Obsoletes: libgal2-devel <= %{last_libgal2_version} @@ -219,7 +211,6 @@ the functionality of the installed %{name} package. %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents -%patch03 -p1 -b .composer_backports # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -547,6 +538,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Feb 16 2015 Milan Crha - 3.13.90-1 +- Update to 3.13.90 +- Remove WebKit composer patches (fixed upstream) + * Mon Feb 02 2015 Tomas Popela - 3.13.10-2 - Backport the WebKit composer patches diff --git a/sources b/sources index 4dc6c49..1336c2c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b19376206d98624a5f232a7826872e3f evolution-3.13.10.tar.xz +36da0aab8ee71b73ccdc9fe4fbaa502a evolution-3.13.90.tar.xz From dd0644fb870b6cf9a8c8ab69a716bf18600c32ae Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 2 Mar 2015 09:49:19 +0100 Subject: [PATCH 574/844] Update to 3.15.91 --- .gitignore | 1 + evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c1b205d..989667f 100644 --- a/.gitignore +++ b/.gitignore @@ -84,3 +84,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.13.9.tar.xz /evolution-3.13.10.tar.xz /evolution-3.13.90.tar.xz +/evolution-3.15.91.tar.xz diff --git a/evolution.spec b/evolution.spec index 83164fd..0a92c35 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,7 +10,7 @@ %define libsoup_version 2.40.3 %define webkit_version 2.2.0 -%define evo_base_version 3.14 +%define evo_base_version 3.16 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.13.90 +Version: 3.15.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.13/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.15/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -538,6 +538,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Mar 02 2015 Milan Crha - 3.15.91-1 +- Update to 3.15.91 + * Mon Feb 16 2015 Milan Crha - 3.13.90-1 - Update to 3.13.90 - Remove WebKit composer patches (fixed upstream) diff --git a/sources b/sources index 1336c2c..4f26674 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36da0aab8ee71b73ccdc9fe4fbaa502a evolution-3.13.90.tar.xz +141b78120d0e9c7882c532b3a3d401f0 evolution-3.15.91.tar.xz From ae9de4ed5bccf4d82a626c9f4fe85876868478bb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Mar 2015 12:24:31 +0100 Subject: [PATCH 575/844] Update to 3.15.92; Remove obsolete patches (one unused and one fixed upstream) --- .gitignore | 1 + evolution-1.4.4-ldap-x86_64-hack.patch | 21 ---- evolution-2.30.1-help-contents.patch | 149 ------------------------- evolution.spec | 16 +-- sources | 2 +- 5 files changed, 10 insertions(+), 179 deletions(-) delete mode 100644 evolution-1.4.4-ldap-x86_64-hack.patch delete mode 100644 evolution-2.30.1-help-contents.patch diff --git a/.gitignore b/.gitignore index 989667f..bff7adf 100644 --- a/.gitignore +++ b/.gitignore @@ -85,3 +85,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.13.10.tar.xz /evolution-3.13.90.tar.xz /evolution-3.15.91.tar.xz +/evolution-3.15.92.tar.xz diff --git a/evolution-1.4.4-ldap-x86_64-hack.patch b/evolution-1.4.4-ldap-x86_64-hack.patch deleted file mode 100644 index 2a1946b..0000000 --- a/evolution-1.4.4-ldap-x86_64-hack.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up evolution-2.31.1/configure.ldaphack evolution-2.31.1/configure ---- evolution-2.31.1/configure.ldaphack 2010-05-03 12:43:34.000000000 +0200 -+++ evolution-2.31.1/configure 2010-05-03 19:22:55.000000000 +0200 -@@ -15797,7 +15797,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" -+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - -@@ -16129,7 +16129,7 @@ if test "${ac_cv_lib_ldap_ldap_open+set} - $as_echo_n "(cached) " >&6 - else - ac_check_lib_save_LIBS=$LIBS --LIBS="-lldap $LDAP_LDFLAGS $LDAP_LIBS $LIBS" -+LIBS="-lldap -lresolv $LDAP_LDFLAGS $LDAP_LIBS $LIBS" - cat confdefs.h - <<_ACEOF >conftest.$ac_ext - /* end confdefs.h. */ - diff --git a/evolution-2.30.1-help-contents.patch b/evolution-2.30.1-help-contents.patch deleted file mode 100644 index 0b9e3be..0000000 --- a/evolution-2.30.1-help-contents.patch +++ /dev/null @@ -1,149 +0,0 @@ -diff -up evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c.help-contents evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c ---- evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c.help-contents 2014-09-22 09:15:05.051468361 +0200 -+++ evolution-3.13.6/addressbook/gui/contact-editor/e-contact-editor.c 2014-09-22 09:17:01.509463747 +0200 -@@ -4143,6 +4143,10 @@ e_contact_editor_init (EContactEditor *e - g_signal_connect ( - widget, "clicked", - G_CALLBACK (show_help_cb), e_contact_editor); -+ if (!e_misc_utils_is_help_package_installed ()) { -+ gtk_widget_set_sensitive (widget, FALSE); -+ gtk_widget_hide (widget); -+ } - - widget = e_builder_get_widget ( - e_contact_editor->priv->builder, "expander-contact-phone"); -diff -up evolution-3.13.6/calendar/gui/dialogs/comp-editor.c.help-contents evolution-3.13.6/calendar/gui/dialogs/comp-editor.c ---- evolution-3.13.6/calendar/gui/dialogs/comp-editor.c.help-contents 2014-04-11 09:21:59.000000000 +0200 -+++ evolution-3.13.6/calendar/gui/dialogs/comp-editor.c 2014-09-22 09:15:05.052468361 +0200 -@@ -2168,6 +2168,12 @@ comp_editor_init (CompEditor *editor) - G_BINDING_SYNC_CREATE); - } - -+ action = gtk_action_group_get_action (action_group, "help"); -+ if (action && !e_misc_utils_is_help_package_installed ()) { -+ gtk_action_set_visible (action, FALSE); -+ gtk_action_set_sensitive (action, FALSE); -+ } -+ - action_group = gtk_action_group_new ("individual"); - gtk_action_group_set_translation_domain ( - action_group, GETTEXT_PACKAGE); -diff -up evolution-3.13.6/e-util/e-misc-utils.c.help-contents evolution-3.13.6/e-util/e-misc-utils.c ---- evolution-3.13.6/e-util/e-misc-utils.c.help-contents 2014-07-11 08:47:35.000000000 +0200 -+++ evolution-3.13.6/e-util/e-misc-utils.c 2014-09-22 09:15:05.052468361 +0200 -@@ -2493,6 +2493,23 @@ e_binding_transform_uid_to_source (GBind - return success; - } - -+gboolean -+e_misc_utils_is_help_package_installed (void) -+{ -+ gboolean is_installed; -+ gchar *path; -+ -+ /* Viewing user documentation requires the evolution-help -+ * package. Look for one of the files it installs. */ -+ path = g_build_filename (EVOLUTION_DATADIR, "help", "C", PACKAGE, "index.page", NULL); -+ -+ is_installed = g_file_test (path, G_FILE_TEST_IS_REGULAR); -+ -+ g_free (path); -+ -+ return is_installed; -+} -+ - /** - * e_binding_transform_text_non_null: - * @binding: a #GBinding -diff -up evolution-3.13.6/e-util/e-misc-utils.h.help-contents evolution-3.13.6/e-util/e-misc-utils.h ---- evolution-3.13.6/e-util/e-misc-utils.h.help-contents 2014-07-07 12:45:01.000000000 +0200 -+++ evolution-3.13.6/e-util/e-misc-utils.h 2014-09-22 09:15:05.052468361 +0200 -@@ -229,6 +229,8 @@ gboolean e_binding_transform_uid_to_sour - GValue *target_value, - ESourceRegistry *registry); - -+gboolean e_misc_utils_is_help_package_installed (void); -+ - gboolean e_binding_transform_text_non_null - (GBinding *binding, - const GValue *source_value, -diff -up evolution-3.13.6/e-util/e-preferences-window.c.help-contents evolution-3.13.6/e-util/e-preferences-window.c ---- evolution-3.13.6/e-util/e-preferences-window.c.help-contents 2014-02-12 20:47:07.000000000 +0100 -+++ evolution-3.13.6/e-util/e-preferences-window.c 2014-09-22 09:15:05.053468361 +0200 -@@ -385,6 +385,11 @@ e_preferences_window_init (EPreferencesW - GTK_BUTTON_BOX (container), widget, TRUE); - gtk_widget_show (widget); - -+ if (!e_misc_utils_is_help_package_installed ()) { -+ gtk_widget_set_sensitive (widget, FALSE); -+ gtk_widget_hide (widget); -+ } -+ - widget = e_dialog_button_new_with_icon ("window-close", _("_Close")); - g_signal_connect_swapped ( - widget, "clicked", -diff -up evolution-3.13.6/e-util/e-send-options.c.help-contents evolution-3.13.6/e-util/e-send-options.c ---- evolution-3.13.6/e-util/e-send-options.c.help-contents 2014-03-27 15:05:39.000000000 +0100 -+++ evolution-3.13.6/e-util/e-send-options.c 2014-09-22 09:15:05.053468361 +0200 -@@ -439,6 +439,7 @@ get_widgets (ESendOptionsDialog *sod) - { - ESendOptionsDialogPrivate *priv; - GtkBuilder *builder; -+ GtkWidget *helpbutton; - - priv = sod->priv; - builder = sod->priv->builder; -@@ -478,6 +479,12 @@ get_widgets (ESendOptionsDialog *sod) - priv->accepted_label = e_builder_get_widget (builder, "accepted-label"); - priv->completed_label = e_builder_get_widget (builder, "completed-label"); - -+ helpbutton = e_builder_get_widget (builder, "helpbutton1"); -+ if (helpbutton && !e_misc_utils_is_help_package_installed ()) { -+ gtk_widget_set_sensitive (helpbutton, FALSE); -+ gtk_widget_hide (helpbutton); -+ } -+ - return (priv->priority - && priv->security - && priv->status -diff -up evolution-3.13.6/plugins/email-custom-header/email-custom-header.c.help-contents evolution-3.13.6/plugins/email-custom-header/email-custom-header.c ---- evolution-3.13.6/plugins/email-custom-header/email-custom-header.c.help-contents 2014-06-09 16:39:38.000000000 +0200 -+++ evolution-3.13.6/plugins/email-custom-header/email-custom-header.c 2014-09-22 09:15:05.053468361 +0200 -@@ -118,6 +118,8 @@ static gboolean - epech_get_widgets (CustomHeaderOptionsDialog *mch) - { - CustomHeaderOptionsDialogPrivate *priv; -+ GtkWidget *helpbutton; -+ - priv = mch->priv; - - #define EMAIL_CUSTOM_HEADER(name) e_builder_get_widget (priv->builder, name) -@@ -128,6 +130,13 @@ epech_get_widgets (CustomHeaderOptionsDi - - priv->page = EMAIL_CUSTOM_HEADER ("email-custom-header-vbox"); - priv->header_table = EMAIL_CUSTOM_HEADER ("email-custom-header-options"); -+ -+ helpbutton = EMAIL_CUSTOM_HEADER ("helpbutton1"); -+ if (helpbutton && !e_misc_utils_is_help_package_installed ()) { -+ gtk_widget_set_sensitive (helpbutton, FALSE); -+ gtk_widget_hide (helpbutton); -+ } -+ - #undef EMAIL_CUSTOM_HEADER - - return (priv->page -diff -up evolution-3.13.6/shell/e-shell-window-actions.c.help-contents evolution-3.13.6/shell/e-shell-window-actions.c ---- evolution-3.13.6/shell/e-shell-window-actions.c.help-contents 2014-03-07 14:49:13.000000000 +0100 -+++ evolution-3.13.6/shell/e-shell-window-actions.c 2014-09-22 09:15:05.053468361 +0200 -@@ -1458,6 +1458,11 @@ e_shell_window_actions_init (EShellWindo - if (path == NULL) - gtk_action_set_visible (ACTION (SUBMIT_BUG), FALSE); - g_free (path); -+ -+ if (!e_misc_utils_is_help_package_installed ()) { -+ gtk_action_set_visible (ACTION (CONTENTS), FALSE); -+ gtk_action_set_sensitive (ACTION (CONTENTS), FALSE); -+ } - } - - GtkWidget * diff --git a/evolution.spec b/evolution.spec index 0a92c35..ccb460b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.15.91 +Version: 3.15.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -43,11 +43,8 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### -# bad hack -Patch01: evolution-1.4.4-ldap-x86_64-hack.patch - -# RH bug #589555 -Patch02: evolution-2.30.1-help-contents.patch +# RH bug # +#Patch01: .patch ## Dependencies ### @@ -209,8 +206,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} -%patch01 -p1 -b .ldaphack -%patch02 -p1 -b .help-contents +#%patch01 -p1 -b .backup # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -538,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Mar 16 2015 Milan Crha - 3.15.92-1 +- Update to 3.15.92 +- Remove obsolete patches (one unused and one fixed upstream) + * Mon Mar 02 2015 Milan Crha - 3.15.91-1 - Update to 3.15.91 diff --git a/sources b/sources index 4f26674..18cc69e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -141b78120d0e9c7882c532b3a3d401f0 evolution-3.15.91.tar.xz +f17f93d152c17d57b1b8075308698ffd evolution-3.15.92.tar.xz From 8bcd0c22b3e787b798e3368c48c70ec378b12a35 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 23 Mar 2015 11:44:30 +0100 Subject: [PATCH 576/844] Update to 3.16.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bff7adf..31a1a0c 100644 --- a/.gitignore +++ b/.gitignore @@ -86,3 +86,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.13.90.tar.xz /evolution-3.15.91.tar.xz /evolution-3.15.92.tar.xz +/evolution-3.16.0.tar.xz diff --git a/evolution.spec b/evolution.spec index ccb460b..e904843 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.15.92 +Version: 3.16.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.15/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.16/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Mar 23 2015 Milan Crha - 3.16.0-1 +- Update to 3.16.0 + * Mon Mar 16 2015 Milan Crha - 3.15.92-1 - Update to 3.15.92 - Remove obsolete patches (one unused and one fixed upstream) diff --git a/sources b/sources index 18cc69e..4372bbd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f17f93d152c17d57b1b8075308698ffd evolution-3.15.92.tar.xz +21f7a5c78af4b10dcfb469efcb18b901 evolution-3.16.0.tar.xz From 27ed552d1c0952ba72ed8db20da1b8d4c7e00c27 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Apr 2015 10:21:38 +0200 Subject: [PATCH 577/844] Update to 3.16.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 31a1a0c..065ebb1 100644 --- a/.gitignore +++ b/.gitignore @@ -87,3 +87,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.15.91.tar.xz /evolution-3.15.92.tar.xz /evolution-3.16.0.tar.xz +/evolution-3.16.1.tar.xz diff --git a/evolution.spec b/evolution.spec index e904843..bc48578 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.16.0 +Version: 3.16.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Apr 13 2015 Milan Crha - 3.16.1-1 +- Update to 3.16.1 + * Mon Mar 23 2015 Milan Crha - 3.16.0-1 - Update to 3.16.0 diff --git a/sources b/sources index 4372bbd..79c203f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -21f7a5c78af4b10dcfb469efcb18b901 evolution-3.16.0.tar.xz +aaafbc54e91b581d6fcc32edc68b371d evolution-3.16.1.tar.xz From 770f32eb1b03c3d567454b956c5567139cac58e9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Apr 2015 13:29:01 +0200 Subject: [PATCH 578/844] Add forgotten new symbolic icon --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index bc48578..c565c12 100644 --- a/evolution.spec +++ b/evolution.spec @@ -370,6 +370,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/icons/hicolor/32x32/apps/* %{_datadir}/icons/hicolor/48x48/apps/* %{_datadir}/icons/hicolor/256x256/apps/* +%{_datadir}/icons/hicolor/symbolic/apps/* # The main data directory # (have not attempted to split this up into an explicit list) From 5c781df2ff08439a82fd59c63bb4e2872ce8277e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Apr 2015 09:05:44 +0200 Subject: [PATCH 579/844] Update to 3.17.1 --- .gitignore | 1 + evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 065ebb1..1e300d9 100644 --- a/.gitignore +++ b/.gitignore @@ -88,3 +88,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.15.92.tar.xz /evolution-3.16.0.tar.xz /evolution-3.16.1.tar.xz +/evolution-3.17.1.tar.xz diff --git a/evolution.spec b/evolution.spec index c565c12..2c1c198 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,7 +10,7 @@ %define libsoup_version 2.40.3 %define webkit_version 2.2.0 -%define evo_base_version 3.16 +%define evo_base_version 3.18 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.16.1 +Version: 3.17.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.16/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.17/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -535,6 +535,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Apr 27 2015 Milan Crha - 3.17.1-1 +- Update to 3.17.1 + * Mon Apr 13 2015 Milan Crha - 3.16.1-1 - Update to 3.16.1 diff --git a/sources b/sources index 79c203f..e3f45bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -aaafbc54e91b581d6fcc32edc68b371d evolution-3.16.1.tar.xz +123f29e55b0a09fb381359300c2a52da evolution-3.17.1.tar.xz From 6c3e449024cf3ced1fe6df31d6eaac6cd1325a2a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Apr 2015 11:19:10 +0200 Subject: [PATCH 580/844] Add patch for a removal of an e-cell-renderer-color gtk-doc leftover --- evolution-3.17.1-doc-e-cell-renderer-color.patch | 12 ++++++++++++ evolution.spec | 5 +++-- 2 files changed, 15 insertions(+), 2 deletions(-) create mode 100644 evolution-3.17.1-doc-e-cell-renderer-color.patch diff --git a/evolution-3.17.1-doc-e-cell-renderer-color.patch b/evolution-3.17.1-doc-e-cell-renderer-color.patch new file mode 100644 index 0000000..7d88ab0 --- /dev/null +++ b/evolution-3.17.1-doc-e-cell-renderer-color.patch @@ -0,0 +1,12 @@ +diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml b/doc/reference/evolution-util/evolution-util-docs.sgml +index f671a52..cdf3410 100644 +--- a/doc/reference/evolution-util/evolution-util-docs.sgml ++++ b/doc/reference/evolution-util/evolution-util-docs.sgml +@@ -252,7 +252,6 @@ + + + +- + + + diff --git a/evolution.spec b/evolution.spec index 2c1c198..7eb5ca5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -44,7 +44,7 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### # RH bug # -#Patch01: .patch +Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch ## Dependencies ### @@ -206,7 +206,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} -#%patch01 -p1 -b .backup +%patch01 -p1 -b .doc-e-cell-renderer-color # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -537,6 +537,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Apr 27 2015 Milan Crha - 3.17.1-1 - Update to 3.17.1 +- Add patch for a removal of an e-cell-renderer-color gtk-doc leftover * Mon Apr 13 2015 Milan Crha - 3.16.1-1 - Update to 3.16.1 From c6898fce468cba951f124789aff61346ef902785 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 25 May 2015 09:20:01 +0200 Subject: [PATCH 581/844] Update to 3.17.2 --- .gitignore | 1 + evolution-3.17.1-doc-e-cell-renderer-color.patch | 12 ------------ evolution.spec | 10 +++++++--- sources | 2 +- 4 files changed, 9 insertions(+), 16 deletions(-) delete mode 100644 evolution-3.17.1-doc-e-cell-renderer-color.patch diff --git a/.gitignore b/.gitignore index 1e300d9..6c39769 100644 --- a/.gitignore +++ b/.gitignore @@ -89,3 +89,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.16.0.tar.xz /evolution-3.16.1.tar.xz /evolution-3.17.1.tar.xz +/evolution-3.17.2.tar.xz diff --git a/evolution-3.17.1-doc-e-cell-renderer-color.patch b/evolution-3.17.1-doc-e-cell-renderer-color.patch deleted file mode 100644 index 7d88ab0..0000000 --- a/evolution-3.17.1-doc-e-cell-renderer-color.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/doc/reference/evolution-util/evolution-util-docs.sgml b/doc/reference/evolution-util/evolution-util-docs.sgml -index f671a52..cdf3410 100644 ---- a/doc/reference/evolution-util/evolution-util-docs.sgml -+++ b/doc/reference/evolution-util/evolution-util-docs.sgml -@@ -252,7 +252,6 @@ - - - -- - - - diff --git a/evolution.spec b/evolution.spec index 7eb5ca5..669bba5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.17.1 +Version: 3.17.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -44,7 +44,7 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### # RH bug # -Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +#Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch ## Dependencies ### @@ -206,7 +206,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} -%patch01 -p1 -b .doc-e-cell-renderer-color +#%patch01 -p1 -b .doc-e-cell-renderer-color # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -535,6 +535,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon May 25 2015 Milan Crha - 3.17.2-1 +- Update to 3.17.2 +- Remove patch for a removal of an e-cell-renderer-color gtk-doc leftover (fixed upstream) + * Mon Apr 27 2015 Milan Crha - 3.17.1-1 - Update to 3.17.1 - Add patch for a removal of an e-cell-renderer-color gtk-doc leftover diff --git a/sources b/sources index e3f45bb..02653fd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -123f29e55b0a09fb381359300c2a52da evolution-3.17.1.tar.xz +377e2b4a7791056d0349b072fccc8734 evolution-3.17.2.tar.xz From a94f71f8e75728ec4eb6df001419c4830c6e741d Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 17 Jun 2015 05:50:09 +0000 Subject: [PATCH 582/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 669bba5..d85ed4e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.17.2 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -535,6 +535,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Wed Jun 17 2015 Fedora Release Engineering - 3.17.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + * Mon May 25 2015 Milan Crha - 3.17.2-1 - Update to 3.17.2 - Remove patch for a removal of an e-cell-renderer-color gtk-doc leftover (fixed upstream) From 7406d60b3b4da029b663f854d4798fb8d6f9c8a5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 Jun 2015 09:09:13 +0200 Subject: [PATCH 583/844] Update to 3.17.3 --- .gitignore | 1 + evolution.spec | 14 ++++++++++---- sources | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 6c39769..2c1bf6d 100644 --- a/.gitignore +++ b/.gitignore @@ -90,3 +90,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.16.1.tar.xz /evolution-3.17.1.tar.xz /evolution-3.17.2.tar.xz +/evolution-3.17.3.tar.xz diff --git a/evolution.spec b/evolution.spec index d85ed4e..e151c6b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.17.2 -Release: 2%{?dist} +Version: 3.17.3 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -229,9 +229,9 @@ if ! pkg-config --exists nss; then fi %if %{with_docs} -%define gtkdoc_flags --enable-gtk-doc +%define gtkdoc_flags --enable-gtk-doc --with-help %else -%define gtkdoc_flags --disable-gtk-doc +%define gtkdoc_flags --disable-gtk-doc --without-help %endif CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS @@ -305,7 +305,9 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; %find_lang evolution-%{evo_base_version} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang +%if %{with_docs} grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang +%endif %post /sbin/ldconfig @@ -535,6 +537,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jun 22 2015 Milan Crha - 3.17.3-1 +- Update to 3.17.3 +- Disable help build when gtk-doc is disabled + * Wed Jun 17 2015 Fedora Release Engineering - 3.17.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild diff --git a/sources b/sources index 02653fd..c5c9694 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -377e2b4a7791056d0349b072fccc8734 evolution-3.17.2.tar.xz +cf327c4effe701fff5a22ebd5b222dd8 evolution-3.17.3.tar.xz From 9960903b24c09eb30e007cb7b113d703006e918d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Jul 2015 10:00:51 +0200 Subject: [PATCH 584/844] Update to 3.17.4 --- .gitignore | 1 + evolution.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 2c1bf6d..01d5621 100644 --- a/.gitignore +++ b/.gitignore @@ -91,3 +91,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.17.1.tar.xz /evolution-3.17.2.tar.xz /evolution-3.17.3.tar.xz +/evolution-3.17.4.tar.xz diff --git a/evolution.spec b/evolution.spec index e151c6b..497ad88 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.17.3 +Version: 3.17.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -234,8 +234,7 @@ fi %define gtkdoc_flags --disable-gtk-doc --without-help %endif -CPPFLAGS="-I%{_includedir}/et"; export CPPFLAGS -CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -I%{_includedir}/et -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS +CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS # Regenerate configure to pick up configure.ac changes aclocal -I m4 @@ -537,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jul 20 2015 Milan Crha - 3.17.4-1 +- Update to 3.17.4 + * Mon Jun 22 2015 Milan Crha - 3.17.3-1 - Update to 3.17.3 - Disable help build when gtk-doc is disabled diff --git a/sources b/sources index c5c9694..379e3a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -cf327c4effe701fff5a22ebd5b222dd8 evolution-3.17.3.tar.xz +f0faf07d0c6c58e8663600d6ebf5a133 evolution-3.17.4.tar.xz From a23db7ba17ea5e7538c875641e265b57f6abc5ee Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 22 Jul 2015 12:30:35 +0200 Subject: [PATCH 585/844] Rebuild for newer gnome-desktop3 --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 497ad88..9b637d4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.17.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -536,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Wed Jul 22 2015 Milan Crha - 3.17.4-2 +- Rebuild for newer gnome-desktop3 + * Mon Jul 20 2015 Milan Crha - 3.17.4-1 - Update to 3.17.4 From 63e0678ac42063264f156526ee83b0b15afda0b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Aug 2015 10:11:57 +0200 Subject: [PATCH 586/844] Update to 3.17.90 --- evolution.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9b637d4..9a4aaae 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.17.4 -Release: 2%{?dist} +Version: 3.17.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -536,6 +536,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 17 2015 Milan Crha - 3.17.90-1 +- Update to 3.17.90 + * Wed Jul 22 2015 Milan Crha - 3.17.4-2 - Rebuild for newer gnome-desktop3 From b6796b2079b1aa874950dd1fc455a746fe77d893 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Aug 2015 10:24:51 +0200 Subject: [PATCH 587/844] Also upload tarball From fe3e334b6959a47e83fd27bbc7cec8f2db7f865b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Aug 2015 10:26:36 +0200 Subject: [PATCH 588/844] Also upload tarball From 12532061700f8ba22f2fe4bda0fa39560d9d09e5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Aug 2015 10:29:03 +0200 Subject: [PATCH 589/844] Also upload tarball --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 01d5621..b0fe60c 100644 --- a/.gitignore +++ b/.gitignore @@ -92,3 +92,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.17.2.tar.xz /evolution-3.17.3.tar.xz /evolution-3.17.4.tar.xz +/evolution-3.17.90.tar.xz diff --git a/sources b/sources index 379e3a8..4d7b46a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f0faf07d0c6c58e8663600d6ebf5a133 evolution-3.17.4.tar.xz +8e4b871854f42013660e9633401c5691 evolution-3.17.90.tar.xz From 3c4af4773c4333361d84e01f7663abb9144ca818 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Aug 2015 12:16:13 +0200 Subject: [PATCH 590/844] itip-formatter plugin was integrated into the core sources --- evolution.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/evolution.spec b/evolution.spec index 9a4aaae..2dc9aa8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -460,9 +460,6 @@ rm -rf $RPM_BUILD_ROOT %{evo_plugin_dir}/org-gnome-face.eplug %{evo_plugin_dir}/liborg-gnome-face.so -%{evo_plugin_dir}/org-gnome-itip-formatter.eplug -%{evo_plugin_dir}/liborg-gnome-itip-formatter.so - %{evo_plugin_dir}/org-gnome-mailing-list-actions.eplug %{evo_plugin_dir}/liborg-gnome-mailing-list-actions.so From e97342f0b1c0a44d551347e2d85786db3815780f Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 31 Aug 2015 08:32:35 +0200 Subject: [PATCH 591/844] Update to 3.17.91 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b0fe60c..4d27b80 100644 --- a/.gitignore +++ b/.gitignore @@ -93,3 +93,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.17.3.tar.xz /evolution-3.17.4.tar.xz /evolution-3.17.90.tar.xz +/evolution-3.17.91.tar.xz diff --git a/evolution.spec b/evolution.spec index 2dc9aa8..1f4e150 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.17.90 +Version: 3.17.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -533,6 +533,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 31 2015 Milan Crha - 3.17.91-1 +- Update to 3.17.91 + * Mon Aug 17 2015 Milan Crha - 3.17.90-1 - Update to 3.17.90 diff --git a/sources b/sources index 4d7b46a..5edeada 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -8e4b871854f42013660e9633401c5691 evolution-3.17.90.tar.xz +0e05503ae9b4948229d11f2b953bc2dd evolution-3.17.91.tar.xz From 1802d2033dc305fdd6a1018b85e5e601150226e8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Sep 2015 12:37:00 +0200 Subject: [PATCH 592/844] Update to 3.17.92; Add pkgconfig(iso-codes) into BuildRequires --- .gitignore | 1 + evolution.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4d27b80..b494aa9 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.17.4.tar.xz /evolution-3.17.90.tar.xz /evolution-3.17.91.tar.xz +/evolution-3.17.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 1f4e150..c8aad51 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.17.91 +Version: 3.17.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -82,6 +82,7 @@ BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gtkspell3-3.0) BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version} +BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) BuildRequires: pkgconfig(libebackend-1.2) >= %{version} BuildRequires: pkgconfig(libebook-1.2) >= %{version} @@ -533,6 +534,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 14 2015 Milan Crha - 3.17.92-1 +- Update to 3.17.92 +- Add pkgconfig(iso-codes) into BuildRequires + * Mon Aug 31 2015 Milan Crha - 3.17.91-1 - Update to 3.17.91 diff --git a/sources b/sources index 5edeada..416e86c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0e05503ae9b4948229d11f2b953bc2dd evolution-3.17.91.tar.xz +886cf723f18df4f75afd0983d124e2a2 evolution-3.17.92.tar.xz From edf024988d90afd18951bbdd43e2aca16b0cc91b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Sep 2015 14:08:13 +0200 Subject: [PATCH 593/844] Update to 3.18.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b494aa9..97b63a4 100644 --- a/.gitignore +++ b/.gitignore @@ -95,3 +95,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.17.90.tar.xz /evolution-3.17.91.tar.xz /evolution-3.17.92.tar.xz +/evolution-3.18.0.tar.xz diff --git a/evolution.spec b/evolution.spec index c8aad51..0841854 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.17.92 +Version: 3.18.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.17/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 21 2015 Milan Crha - 3.18.0-1 +- Update to 3.18.0 + * Mon Sep 14 2015 Milan Crha - 3.17.92-1 - Update to 3.17.92 - Add pkgconfig(iso-codes) into BuildRequires diff --git a/sources b/sources index 416e86c..ea2aa2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -886cf723f18df4f75afd0983d124e2a2 evolution-3.17.92.tar.xz +2bc21e57d9a86fc01bc542e350bebcc2 evolution-3.18.0.tar.xz From 2d5098ed6ed524df898d2bedaae653707ee128ec Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Oct 2015 10:37:52 +0200 Subject: [PATCH 594/844] Update to 3.18.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 97b63a4..55beb42 100644 --- a/.gitignore +++ b/.gitignore @@ -96,3 +96,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.17.91.tar.xz /evolution-3.17.92.tar.xz /evolution-3.18.0.tar.xz +/evolution-3.18.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 0841854..bdfe32b 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.18.0 +Version: 3.18.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Oct 12 2015 Milan Crha - 3.18.1-1 +- Update to 3.18.1 + * Mon Sep 21 2015 Milan Crha - 3.18.0-1 - Update to 3.18.0 diff --git a/sources b/sources index ea2aa2d..f6f8d2e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2bc21e57d9a86fc01bc542e350bebcc2 evolution-3.18.0.tar.xz +0c682c30820e922efe17c924bc47677d evolution-3.18.1.tar.xz From c58e96504523e848cc2a0aa4932a1ff7dcd24b56 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 26 Oct 2015 09:06:44 +0100 Subject: [PATCH 595/844] Update to 3.19.1 --- .gitignore | 1 + evolution.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 55beb42..b9e7f1f 100644 --- a/.gitignore +++ b/.gitignore @@ -97,3 +97,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.17.92.tar.xz /evolution-3.18.0.tar.xz /evolution-3.18.1.tar.xz +/evolution-3.19.1.tar.xz diff --git a/evolution.spec b/evolution.spec index bdfe32b..dc6b50d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,7 +10,7 @@ %define libsoup_version 2.40.3 %define webkit_version 2.2.0 -%define evo_base_version 3.18 +%define evo_base_version 3.20 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.18.1 +Version: 3.19.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.18/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.19/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -97,7 +97,7 @@ BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(webkitgtk-3.0) >= %{webkit_version} %if %{ldap_support} -BuildRequires: openldap-devel >= 2.0.11 +BuildRequires: openldap-devel >= 2.0.11 %endif %if %{libnotify_support} @@ -154,7 +154,7 @@ Requires: yelp BuildArch: noarch %description help -This package contains user documentation for %{name}. +This package contains user documentation for %{name}. %endif %package bogofilter @@ -224,7 +224,7 @@ done %define ssl_flags --enable-nss=yes --enable-smime=yes -if ! pkg-config --exists nss; then +if ! pkg-config --exists nss; then echo "Unable to find suitable version of mozilla nss to use!" exit 1 fi @@ -442,8 +442,8 @@ rm -rf $RPM_BUILD_ROOT %dir %{evo_plugin_dir} # The various plugins follow; they are all part of the main package: -# (note that there are various resources such as ui and pixmap files that -# are built as part of specific plugins but which are currently packaged using +# (note that there are various resources such as ui and pixmap files that +# are built as part of specific plugins but which are currently packaged using # globs above; the purpose of the separation below is to be more explicit about # which plugins we ship) %{evo_plugin_dir}/org-gnome-evolution-attachment-reminder.eplug @@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Oct 26 2015 Milan Crha - 3.19.1-1 +- Update to 3.19.1 + * Mon Oct 12 2015 Milan Crha - 3.18.1-1 - Update to 3.18.1 diff --git a/sources b/sources index f6f8d2e..2ef4b67 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c682c30820e922efe17c924bc47677d evolution-3.18.1.tar.xz +9078a68e639c769b1d65aef1d2c023bc evolution-3.19.1.tar.xz From 4c2158e83a3bce1ee99c89dcf27b15eea20d44cc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 23 Nov 2015 10:36:46 +0100 Subject: [PATCH 596/844] Update to 3.19.2 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b9e7f1f..7d05d86 100644 --- a/.gitignore +++ b/.gitignore @@ -98,3 +98,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.18.0.tar.xz /evolution-3.18.1.tar.xz /evolution-3.19.1.tar.xz +/evolution-3.19.2.tar.xz diff --git a/evolution.spec b/evolution.spec index dc6b50d..382bd9d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.19.1 +Version: 3.19.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Nov 23 2015 Milan Crha - 3.19.2-1 +- Update to 3.19.2 + * Mon Oct 26 2015 Milan Crha - 3.19.1-1 - Update to 3.19.1 diff --git a/sources b/sources index 2ef4b67..7e8e319 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9078a68e639c769b1d65aef1d2c023bc evolution-3.19.1.tar.xz +c16815ceddaa11e92e65c583e69480c7 evolution-3.19.2.tar.xz From b41f7c28488aab5e404782db440864b40f3ae9f5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Dec 2015 11:05:40 +0100 Subject: [PATCH 597/844] Update to 3.19.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 7d05d86..4a2a099 100644 --- a/.gitignore +++ b/.gitignore @@ -99,3 +99,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.18.1.tar.xz /evolution-3.19.1.tar.xz /evolution-3.19.2.tar.xz +/evolution-3.19.3.tar.xz diff --git a/evolution.spec b/evolution.spec index 382bd9d..918a6e2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.19.2 +Version: 3.19.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Dec 14 2015 Milan Crha - 3.19.3-1 +- Update to 3.19.3 + * Mon Nov 23 2015 Milan Crha - 3.19.2-1 - Update to 3.19.2 diff --git a/sources b/sources index 7e8e319..5ae9ba3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c16815ceddaa11e92e65c583e69480c7 evolution-3.19.2.tar.xz +7b461c13841cbbf054cbcbd941c2d1ec evolution-3.19.3.tar.xz From 46eb226a6880cb871e9ef871487003267b4b0b09 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Jan 2016 16:19:56 +0100 Subject: [PATCH 598/844] Update to 3.19.4 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4a2a099..f301291 100644 --- a/.gitignore +++ b/.gitignore @@ -100,3 +100,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.19.1.tar.xz /evolution-3.19.2.tar.xz /evolution-3.19.3.tar.xz +/evolution-3.19.4.tar.xz diff --git a/evolution.spec b/evolution.spec index 918a6e2..e26d67e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.19.3 +Version: 3.19.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -534,6 +534,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jan 18 2016 Milan Crha - 3.19.4-1 +- Update to 3.19.4 + * Mon Dec 14 2015 Milan Crha - 3.19.3-1 - Update to 3.19.3 diff --git a/sources b/sources index 5ae9ba3..9272d1b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7b461c13841cbbf054cbcbd941c2d1ec evolution-3.19.3.tar.xz +b97f4be7a34a2d81bfcc5696d56120b1 evolution-3.19.4.tar.xz From 1f9279186b39695f72d6c4a9e2d24783cf3e4ac6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Jan 2016 18:08:25 +0100 Subject: [PATCH 599/844] Add forgotten evolution-pst.metainfo.xml file --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index e26d67e..77362b7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -525,6 +525,7 @@ rm -rf $RPM_BUILD_ROOT %if %{libpst_support} %files pst %defattr(-, root, root) +%{_datadir}/appdata/evolution-pst.metainfo.xml %{evo_plugin_dir}/org-gnome-pst-import.eplug %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif From 3b05bca8ecbef1eeb1f0084067aea96cc48c62f8 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Mon, 18 Jan 2016 20:25:59 +0100 Subject: [PATCH 600/844] rebuild for libical 2.0.0 --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 77362b7..c9d1959 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.19.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -535,6 +535,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jan 18 2016 David Tardon - 3.19.4-2 +- rebuild for libical 2.0.0 + * Mon Jan 18 2016 Milan Crha - 3.19.4-1 - Update to 3.19.4 From 210618e56ccfe6bfd486f1e106b102b4d7fd3de9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 27 Jan 2016 12:03:25 +0100 Subject: [PATCH 601/844] Remove unneeded %defattr --- evolution.spec | 8 -------- 1 file changed, 8 deletions(-) diff --git a/evolution.spec b/evolution.spec index c9d1959..136a1f4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -331,7 +331,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : rm -rf $RPM_BUILD_ROOT %files -f translations.lang -%defattr(-, root, root) %doc AUTHORS COPYING NEWS README # GSettings schemas: @@ -487,7 +486,6 @@ rm -rf $RPM_BUILD_ROOT %files devel -%defattr(-, root, root) %{_includedir}/evolution %{_libdir}/pkgconfig/evolution-calendar-3.0.pc %{_libdir}/pkgconfig/evolution-mail-3.0.pc @@ -495,7 +493,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libemail-engine.pc %files devel-docs -%defattr(-,root,root,-) %doc %{_datadir}/gtk-doc/html/evolution-mail-composer %doc %{_datadir}/gtk-doc/html/evolution-mail-engine %doc %{_datadir}/gtk-doc/html/evolution-mail-formatter @@ -504,27 +501,22 @@ rm -rf $RPM_BUILD_ROOT %if %{with_docs} %files help -f help.lang -%defattr(-, root, root) %dir %{_datadir}/help/*/evolution %endif %files bogofilter -%defattr(-, root, root) %{_libdir}/evolution/modules/module-bogofilter.so %{_datadir}/appdata/evolution-bogofilter.metainfo.xml %files spamassassin -%defattr(-, root, root) %{_libdir}/evolution/modules/module-spamassassin.so %{_datadir}/appdata/evolution-spamassassin.metainfo.xml %files perl -%defattr(-, root, root) %{_libexecdir}/evolution/csv2vcard %if %{libpst_support} %files pst -%defattr(-, root, root) %{_datadir}/appdata/evolution-pst.metainfo.xml %{evo_plugin_dir}/org-gnome-pst-import.eplug %{evo_plugin_dir}/liborg-gnome-pst-import.so From 1e1f1702316571694260876b715737d343ad315a Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Wed, 3 Feb 2016 20:06:55 +0000 Subject: [PATCH 602/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 136a1f4..26a5e20 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.19.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Wed Feb 03 2016 Fedora Release Engineering - 3.19.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + * Mon Jan 18 2016 David Tardon - 3.19.4-2 - rebuild for libical 2.0.0 From 881f6ea4e67a3af3364dcc168d2f3570cd9b9f13 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Feb 2016 13:00:58 +0100 Subject: [PATCH 603/844] Update to 3.19.90 --- .gitignore | 1 + evolution.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index f301291..e8ade2a 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.19.2.tar.xz /evolution-3.19.3.tar.xz /evolution-3.19.4.tar.xz +/evolution-3.19.90.tar.xz diff --git a/evolution.spec b/evolution.spec index 26a5e20..fa153fe 100644 --- a/evolution.spec +++ b/evolution.spec @@ -21,15 +21,15 @@ %define libpst_support 1 # Coverity scan can override this to 0, to skip checking in gtk-doc generated code -%{!?with_docs: %define with_docs 1} +%{!?with_docs: %global with_docs 1} %define evo_plugin_dir %{_libdir}/evolution/plugins ### Abstract ### Name: evolution -Version: 3.19.4 -Release: 3%{?dist} +Version: 3.19.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -286,7 +286,7 @@ for f in $helpdir/C/figures/*.png; do done done -# %{with_docs} +# %%{with_docs} %endif %install @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Feb 15 2016 Milan Crha - 3.19.90-1 +- Update to 3.19.90 + * Wed Feb 03 2016 Fedora Release Engineering - 3.19.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 9272d1b..cc749c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b97f4be7a34a2d81bfcc5696d56120b1 evolution-3.19.4.tar.xz +33bf93410cc1a4f2a3ad557fbc90b1f1 evolution-3.19.90.tar.xz From 8e693f88f8197658459e31eb4431311377a7c0fc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 18 Feb 2016 10:29:13 +0100 Subject: [PATCH 604/844] Add patch for GNOME bug 761883 (Typo in the previous fix) --- evolution-3.19.90-gnbug761883.patch | 15 +++++++++++++++ evolution.spec | 8 +++++++- 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 evolution-3.19.90-gnbug761883.patch diff --git a/evolution-3.19.90-gnbug761883.patch b/evolution-3.19.90-gnbug761883.patch new file mode 100644 index 0000000..ab39dca --- /dev/null +++ b/evolution-3.19.90-gnbug761883.patch @@ -0,0 +1,15 @@ +diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c +index b7ffba8..2abf9c2 100644 +--- a/e-util/e-html-editor-view.c ++++ b/e-util/e-html-editor-view.c +@@ -3263,8 +3263,8 @@ merge_siblings_if_necessary (WebKitDOMDocument *document, + goto signature; + repeat: + child = webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (element)); +- if (WEBKIT_DOM_IS_ELEMENT (prev_element)) +- prev_element = WEBKIT_DOM_ELEMENT (prev_element); ++ if (WEBKIT_DOM_IS_ELEMENT (child)) ++ prev_element = WEBKIT_DOM_ELEMENT (child); + else + goto signature; + diff --git a/evolution.spec b/evolution.spec index fa153fe..ec68285 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.19.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,6 +46,8 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +Patch01: evolution-3.19.90-gnbug761883.patch + ## Dependencies ### Requires: gvfs @@ -208,6 +210,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color +%patch01 -p1 -b .gnbug761883 # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -527,6 +530,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Thu Feb 18 2016 Milan Crha - 3.19.90-2 +- Add patch for GNOME bug 761883 (Typo in the previous fix) + * Mon Feb 15 2016 Milan Crha - 3.19.90-1 - Update to 3.19.90 From 84ba7a4d46bff9e7826f86189938cb5f75c7e9ee Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Feb 2016 11:36:20 +0100 Subject: [PATCH 605/844] Update to 3.19.91 Remove patch for GNOME bug 761883 (Fixed upstream) --- .gitignore | 1 + evolution-3.19.90-gnbug761883.patch | 15 --------------- evolution.spec | 11 ++++++----- sources | 2 +- 4 files changed, 8 insertions(+), 21 deletions(-) delete mode 100644 evolution-3.19.90-gnbug761883.patch diff --git a/.gitignore b/.gitignore index e8ade2a..529c95b 100644 --- a/.gitignore +++ b/.gitignore @@ -102,3 +102,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.19.3.tar.xz /evolution-3.19.4.tar.xz /evolution-3.19.90.tar.xz +/evolution-3.19.91.tar.xz diff --git a/evolution-3.19.90-gnbug761883.patch b/evolution-3.19.90-gnbug761883.patch deleted file mode 100644 index ab39dca..0000000 --- a/evolution-3.19.90-gnbug761883.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/e-util/e-html-editor-view.c b/e-util/e-html-editor-view.c -index b7ffba8..2abf9c2 100644 ---- a/e-util/e-html-editor-view.c -+++ b/e-util/e-html-editor-view.c -@@ -3263,8 +3263,8 @@ merge_siblings_if_necessary (WebKitDOMDocument *document, - goto signature; - repeat: - child = webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (element)); -- if (WEBKIT_DOM_IS_ELEMENT (prev_element)) -- prev_element = WEBKIT_DOM_ELEMENT (prev_element); -+ if (WEBKIT_DOM_IS_ELEMENT (child)) -+ prev_element = WEBKIT_DOM_ELEMENT (child); - else - goto signature; - diff --git a/evolution.spec b/evolution.spec index ec68285..858bfa7 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.19.90 -Release: 2%{?dist} +Version: 3.19.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,8 +46,6 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch -Patch01: evolution-3.19.90-gnbug761883.patch - ## Dependencies ### Requires: gvfs @@ -210,7 +208,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color -%patch01 -p1 -b .gnbug761883 # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -530,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Feb 29 2016 Milan Crha - 3.19.91-1 +- Update to 3.19.91 +- Remove patch for GNOME bug 761883 (Fixed upstream) + * Thu Feb 18 2016 Milan Crha - 3.19.90-2 - Add patch for GNOME bug 761883 (Typo in the previous fix) diff --git a/sources b/sources index cc749c5..01e82b2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -33bf93410cc1a4f2a3ad557fbc90b1f1 evolution-3.19.90.tar.xz +05b0fa2238d44871c14a3d09aa66334d evolution-3.19.91.tar.xz From 2739683f6c94c55c661b0cbe95ffd9270c25beea Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 14 Mar 2016 12:29:11 +0100 Subject: [PATCH 606/844] Update to 3.19.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 529c95b..33cc58b 100644 --- a/.gitignore +++ b/.gitignore @@ -103,3 +103,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.19.4.tar.xz /evolution-3.19.90.tar.xz /evolution-3.19.91.tar.xz +/evolution-3.19.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 858bfa7..a567e25 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.19.91 +Version: 3.19.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Mar 14 2016 Milan Crha - 3.19.92-1 +- Update to 3.19.92 + * Mon Feb 29 2016 Milan Crha - 3.19.91-1 - Update to 3.19.91 - Remove patch for GNOME bug 761883 (Fixed upstream) diff --git a/sources b/sources index 01e82b2..f39210b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -05b0fa2238d44871c14a3d09aa66334d evolution-3.19.91.tar.xz +d2a026ad907149ec11c7e6616840cf7f evolution-3.19.92.tar.xz From 5b771a4b32825ec73b1533deeaf2df58bc64d9a3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Mar 2016 11:24:36 +0100 Subject: [PATCH 607/844] Update to 3.20.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 33cc58b..1a76ec2 100644 --- a/.gitignore +++ b/.gitignore @@ -104,3 +104,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.19.90.tar.xz /evolution-3.19.91.tar.xz /evolution-3.19.92.tar.xz +/evolution-3.20.0.tar.xz diff --git a/evolution.spec b/evolution.spec index a567e25..397edb5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.19.92 +Version: 3.20.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.19/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Mar 21 2016 Milan Crha - 3.20.0-1 +- Update to 3.20.0 + * Mon Mar 14 2016 Milan Crha - 3.19.92-1 - Update to 3.19.92 diff --git a/sources b/sources index f39210b..9983f65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d2a026ad907149ec11c7e6616840cf7f evolution-3.19.92.tar.xz +d821da82d09b7dd2bcb693751c080f86 evolution-3.20.0.tar.xz From eeabfae1c9db3e11695ea627a6600ed11bf970f8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Apr 2016 12:30:37 +0200 Subject: [PATCH 608/844] Update to 3.20.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 1a76ec2..b2a67b2 100644 --- a/.gitignore +++ b/.gitignore @@ -105,3 +105,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.19.91.tar.xz /evolution-3.19.92.tar.xz /evolution-3.20.0.tar.xz +/evolution-3.20.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 397edb5..168ab75 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.20.0 +Version: 3.20.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Apr 11 2016 Milan Crha - 3.20.1-1 +- Update to 3.20.1 + * Mon Mar 21 2016 Milan Crha - 3.20.0-1 - Update to 3.20.0 diff --git a/sources b/sources index 9983f65..72b2c66 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -d821da82d09b7dd2bcb693751c080f86 evolution-3.20.0.tar.xz +2c97048bbacec04306f52015660e1aa5 evolution-3.20.1.tar.xz From 3f0ea01c18f946a05f0a799358f1c5119e1a4097 Mon Sep 17 00:00:00 2001 From: David Tardon Date: Fri, 15 Apr 2016 20:12:04 +0200 Subject: [PATCH 609/844] rebuild for ICU 57.1 --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 168ab75..b0aabaa 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.20.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Fri Apr 15 2016 David Tardon - 3.20.1-2 +- rebuild for ICU 57.1 + * Mon Apr 11 2016 Milan Crha - 3.20.1-1 - Update to 3.20.1 From 1dc083f748e1fec64640c5b706b8f1053c818a96 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 25 Apr 2016 10:59:44 +0200 Subject: [PATCH 610/844] Update to 3.21.1 --- .gitignore | 1 + evolution.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index b2a67b2..83f2f7b 100644 --- a/.gitignore +++ b/.gitignore @@ -106,3 +106,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.19.92.tar.xz /evolution-3.20.0.tar.xz /evolution-3.20.1.tar.xz +/evolution-3.21.1.tar.xz diff --git a/evolution.spec b/evolution.spec index b0aabaa..b23f585 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,7 +10,7 @@ %define libsoup_version 2.40.3 %define webkit_version 2.2.0 -%define evo_base_version 3.20 +%define evo_base_version 3.22 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.20.1 -Release: 2%{?dist} +Version: 3.21.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.20/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.21/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Apr 25 2016 Milan Crha - 3.21.1-1 +- Update to 3.21.1 + * Fri Apr 15 2016 David Tardon - 3.20.1-2 - rebuild for ICU 57.1 diff --git a/sources b/sources index 72b2c66..3aa771d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2c97048bbacec04306f52015660e1aa5 evolution-3.20.1.tar.xz +27b50b80f3b2be45cc257be21c3f5bea evolution-3.21.1.tar.xz From a027215d70b6fbcf4f4c62b71e929e675b01355c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 23 May 2016 11:24:11 +0200 Subject: [PATCH 611/844] Update to 3.21.2 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 83f2f7b..c7965ea 100644 --- a/.gitignore +++ b/.gitignore @@ -107,3 +107,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.20.0.tar.xz /evolution-3.20.1.tar.xz /evolution-3.21.1.tar.xz +/evolution-3.21.2.tar.xz diff --git a/evolution.spec b/evolution.spec index b23f585..2ee6573 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.21.1 +Version: 3.21.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon May 23 2016 Milan Crha - 3.21.2-1 +- Update to 3.21.2 + * Mon Apr 25 2016 Milan Crha - 3.21.1-1 - Update to 3.21.1 diff --git a/sources b/sources index 3aa771d..1c6fbd9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -27b50b80f3b2be45cc257be21c3f5bea evolution-3.21.1.tar.xz +c47fae5aa37bcdcfdd9c1e46d4bd9403 evolution-3.21.2.tar.xz From db82a9b77a8fb9bb3a7b3bd31480b5358e6c02ad Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Jun 2016 14:18:11 +0200 Subject: [PATCH 612/844] Update to 3.21.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c7965ea..98de4f7 100644 --- a/.gitignore +++ b/.gitignore @@ -108,3 +108,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.20.1.tar.xz /evolution-3.21.1.tar.xz /evolution-3.21.2.tar.xz +/evolution-3.21.3.tar.xz diff --git a/evolution.spec b/evolution.spec index 2ee6573..f27fe7f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.21.2 +Version: 3.21.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jun 20 2016 Milan Crha - 3.21.3-1 +- Update to 3.21.3 + * Mon May 23 2016 Milan Crha - 3.21.2-1 - Update to 3.21.2 diff --git a/sources b/sources index 1c6fbd9..3bedcda 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c47fae5aa37bcdcfdd9c1e46d4bd9403 evolution-3.21.2.tar.xz +01f2a680b3b772c4e15694f9736f5636 evolution-3.21.3.tar.xz From 90e3bb0fca6f5eeb6bcc02fedfd46e01a919e71b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 24 Jun 2016 10:21:08 +0200 Subject: [PATCH 613/844] Mandatory Perl build-requires added --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index f27fe7f..1b2f6a2 100644 --- a/evolution.spec +++ b/evolution.spec @@ -65,6 +65,7 @@ BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} BuildRequires: itstool BuildRequires: libtool >= 1.5 +BuildRequires: perl-generators BuildRequires: pkgconfig BuildRequires: yelp-tools From 8bfeae5c3df3723758b11235e57fb03f9d0375f3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Jul 2016 11:06:46 +0200 Subject: [PATCH 614/844] Update to 3.21.4 --- .gitignore | 1 + evolution.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 98de4f7..8cf6409 100644 --- a/.gitignore +++ b/.gitignore @@ -109,3 +109,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.1.tar.xz /evolution-3.21.2.tar.xz /evolution-3.21.3.tar.xz +/evolution-3.21.4.tar.xz diff --git a/evolution.spec b/evolution.spec index 1b2f6a2..b80e5a5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,13 +1,13 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") -%define glib2_version 2.40.0 +%define glib2_version 2.46.0 %define gtk3_version 3.10.0 %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define intltool_version 0.35.5 %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 -%define libsoup_version 2.40.3 +%define libsoup_version 2.42 %define webkit_version 2.2.0 %define evo_base_version 3.22 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.21.3 +Version: 3.21.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -528,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jul 18 2016 Milan Crha - 3.21.4-1 +- Update to 3.21.4 + * Mon Jun 20 2016 Milan Crha - 3.21.3-1 - Update to 3.21.3 diff --git a/sources b/sources index 3bedcda..d9a2e1f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -01f2a680b3b772c4e15694f9736f5636 evolution-3.21.3.tar.xz +7d04dd8ab5a88c1b90e33dc1a3250b42 evolution-3.21.4.tar.xz From 3a18b59c5935ac9fb7a40c517dc0f98025ee2941 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Jul 2016 11:54:39 +0200 Subject: [PATCH 615/844] Remove the "perl" subpackage (code moved to the evolution-data-server) --- evolution.spec | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/evolution.spec b/evolution.spec index b80e5a5..f2b00e4 100644 --- a/evolution.spec +++ b/evolution.spec @@ -65,7 +65,6 @@ BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} BuildRequires: itstool BuildRequires: libtool >= 1.5 -BuildRequires: perl-generators BuildRequires: pkgconfig BuildRequires: yelp-tools @@ -178,14 +177,6 @@ BuildRequires: spamassassin %description spamassassin This package contains the plugin to filter junk mail using SpamAssassin. -%package perl -Group: Applications/Productivity -Summary: Supplemental utilities that require Perl -Requires: %{name}%{?_isa} = %{version}-%{release} - -%description perl -This package contains supplemental utilities for %{name} that require Perl. - %if %{libpst_support} %package pst Group: Applications/Productivity @@ -513,9 +504,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/modules/module-spamassassin.so %{_datadir}/appdata/evolution-spamassassin.metainfo.xml -%files perl -%{_libexecdir}/evolution/csv2vcard - %if %{libpst_support} %files pst %{_datadir}/appdata/evolution-pst.metainfo.xml @@ -530,6 +518,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * Mon Jul 18 2016 Milan Crha - 3.21.4-1 - Update to 3.21.4 +- Remove the "perl" subpackage (code moved to the evolution-data-server) * Mon Jun 20 2016 Milan Crha - 3.21.3-1 - Update to 3.21.3 From 88dcc2bbb46360ae6ac669161ee50d713cbc11dd Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Jul 2016 14:29:49 +0200 Subject: [PATCH 616/844] evolution-addressbook-export had been moved to the evolution-data-server --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index f2b00e4..0eed1b3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -424,7 +424,6 @@ rm -rf $RPM_BUILD_ROOT # Various libexec programs: %dir %{_libexecdir}/evolution -%{_libexecdir}/evolution/evolution-addressbook-export %{_libexecdir}/evolution/evolution-alarm-notify %{_libexecdir}/evolution/evolution-backup %{_libexecdir}/evolution/killev From 89372a60e2da7d2f264ceeceb557c8cceb6b9bc1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 15 Aug 2016 17:53:26 +0200 Subject: [PATCH 617/844] Update to 3.21.90 --- .gitignore | 1 + evolution-3.21.90-ldflags.patch | 46 +++++++++++++++++++++++++++++++++ evolution.spec | 24 ++++++++++++++--- sources | 2 +- 4 files changed, 68 insertions(+), 5 deletions(-) create mode 100644 evolution-3.21.90-ldflags.patch diff --git a/.gitignore b/.gitignore index 8cf6409..5e36a3a 100644 --- a/.gitignore +++ b/.gitignore @@ -110,3 +110,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.2.tar.xz /evolution-3.21.3.tar.xz /evolution-3.21.4.tar.xz +/evolution-3.21.90.tar.xz diff --git a/evolution-3.21.90-ldflags.patch b/evolution-3.21.90-ldflags.patch new file mode 100644 index 0000000..6dee6ce --- /dev/null +++ b/evolution-3.21.90-ldflags.patch @@ -0,0 +1,46 @@ +diff --git a/modules/itip-formatter/web-extension/Makefile.am b/modules/itip-formatter/web-extension/Makefile.am +index a519744..87df8e6 100644 +--- a/modules/itip-formatter/web-extension/Makefile.am ++++ b/modules/itip-formatter/web-extension/Makefile.am +@@ -21,6 +21,6 @@ libmoduleitipformatterwebextension_la_LIBADD = \ + $(WEB_EXTENSIONS_LIBS) + + libmoduleitipformatterwebextension_la_LDFLAGS = \ +- -module -avoid-version -no-undefined ++ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) + + -include $(top_srcdir)/git.mk +diff --git a/modules/webkit-editor/web-extension/Makefile.am b/modules/webkit-editor/web-extension/Makefile.am +index f2a7b02..2d31253 100644 +--- a/modules/webkit-editor/web-extension/Makefile.am ++++ b/modules/webkit-editor/web-extension/Makefile.am +@@ -33,6 +33,6 @@ libewebkiteditorwebextension_la_LIBADD = \ + $(WEB_EXTENSIONS_LIBS) + + libewebkiteditorwebextension_la_LDFLAGS = \ +- -module -avoid-version -no-undefined ++ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) + + -include $(top_srcdir)/git.mk +diff --git a/web-extensions/Makefile.am b/web-extensions/Makefile.am +index 07854c2..d98f361 100644 +--- a/web-extensions/Makefile.am ++++ b/web-extensions/Makefile.am +@@ -16,6 +16,8 @@ libedomutils_la_LIBADD = \ + $(EVOLUTION_DATA_SERVER_LIBS) \ + $(GNOME_PLATFORM_LIBS) + ++libedomutils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) ++ + libewebextension_la_SOURCES = \ + e-web-extension.h \ + e-web-extension-names.h \ +@@ -38,7 +40,6 @@ libewebextension_la_LIBADD = \ + $(GNOME_PLATFORM_LIBS) \ + $(WEB_EXTENSIONS_LIBS) + +-libewebextension_la_LDFLAGS = \ +- -module -avoid-version -no-undefined ++libewebextension_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) + + -include $(top_srcdir)/git.mk diff --git a/evolution.spec b/evolution.spec index 0eed1b3..1d31b0d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -8,7 +8,7 @@ %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 %define libsoup_version 2.42 -%define webkit_version 2.2.0 +%define webkit2gtk_version 2.13.0 %define evo_base_version 3.22 @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.21.4 +Version: 3.21.90 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -46,6 +46,8 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +Patch01: evolution-3.21.90-ldflags.patch + ## Dependencies ### Requires: gvfs @@ -94,7 +96,7 @@ BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(shared-mime-info) -BuildRequires: pkgconfig(webkitgtk-3.0) >= %{webkit_version} +BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} %if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 @@ -200,6 +202,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color +%patch01 -p1 -b .ldflags # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -294,6 +297,9 @@ find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; # remove statically built libraries: find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; +# remove test GIO modules directory +rm -r $RPM_BUILD_ROOT/%{_libdir}/evolution/test-gio-modules + %find_lang evolution-%{evo_base_version} --all-name --with-gnome grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang @@ -402,7 +408,8 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/modules/module-startup-wizard.so %{_libdir}/evolution/modules/module-text-highlight.so %{_libdir}/evolution/modules/module-vcard-inline.so -%{_libdir}/evolution/modules/module-web-inspector.so +%{_libdir}/evolution/modules/module-webkit-editor.so +%{_libdir}/evolution/modules/module-webkit-inspector.so # Shared libraries: %{_libdir}/evolution/libevolution-mail-composer.so @@ -422,6 +429,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/libevolution-smime.so %{_libdir}/evolution/libgnomecanvas.so +# WebKit2 Extensions +%{_libdir}/evolution/web-extensions/libedomutils.so +%{_libdir}/evolution/web-extensions/libewebextension.so +%{_libdir}/evolution/web-extensions/libmoduleitipformatterwebextension.so +%{_libdir}/evolution/web-extensions/webkit-editor/libewebkiteditorwebextension.so + # Various libexec programs: %dir %{_libexecdir}/evolution %{_libexecdir}/evolution/evolution-alarm-notify @@ -515,6 +528,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 15 2016 Milan Crha - 3.21.90-1 +- Update to 3.21.90 + * Mon Jul 18 2016 Milan Crha - 3.21.4-1 - Update to 3.21.4 - Remove the "perl" subpackage (code moved to the evolution-data-server) diff --git a/sources b/sources index d9a2e1f..feb2be8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -7d04dd8ab5a88c1b90e33dc1a3250b42 evolution-3.21.4.tar.xz +58cdef8655a79b05dcb132cc7a547849 evolution-3.21.90.tar.xz From 1c2228543d876fc418569105481f8957e1f67319 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 29 Aug 2016 15:53:53 +0200 Subject: [PATCH 618/844] Update to 3.21.91 --- .gitignore | 1 + evolution-3.21.90-ldflags.patch | 46 --------------------------------- evolution.spec | 8 +++--- sources | 2 +- 4 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 evolution-3.21.90-ldflags.patch diff --git a/.gitignore b/.gitignore index 5e36a3a..5cfd0da 100644 --- a/.gitignore +++ b/.gitignore @@ -111,3 +111,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.3.tar.xz /evolution-3.21.4.tar.xz /evolution-3.21.90.tar.xz +/evolution-3.21.91.tar.xz diff --git a/evolution-3.21.90-ldflags.patch b/evolution-3.21.90-ldflags.patch deleted file mode 100644 index 6dee6ce..0000000 --- a/evolution-3.21.90-ldflags.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff --git a/modules/itip-formatter/web-extension/Makefile.am b/modules/itip-formatter/web-extension/Makefile.am -index a519744..87df8e6 100644 ---- a/modules/itip-formatter/web-extension/Makefile.am -+++ b/modules/itip-formatter/web-extension/Makefile.am -@@ -21,6 +21,6 @@ libmoduleitipformatterwebextension_la_LIBADD = \ - $(WEB_EXTENSIONS_LIBS) - - libmoduleitipformatterwebextension_la_LDFLAGS = \ -- -module -avoid-version -no-undefined -+ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) - - -include $(top_srcdir)/git.mk -diff --git a/modules/webkit-editor/web-extension/Makefile.am b/modules/webkit-editor/web-extension/Makefile.am -index f2a7b02..2d31253 100644 ---- a/modules/webkit-editor/web-extension/Makefile.am -+++ b/modules/webkit-editor/web-extension/Makefile.am -@@ -33,6 +33,6 @@ libewebkiteditorwebextension_la_LIBADD = \ - $(WEB_EXTENSIONS_LIBS) - - libewebkiteditorwebextension_la_LDFLAGS = \ -- -module -avoid-version -no-undefined -+ -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) - - -include $(top_srcdir)/git.mk -diff --git a/web-extensions/Makefile.am b/web-extensions/Makefile.am -index 07854c2..d98f361 100644 ---- a/web-extensions/Makefile.am -+++ b/web-extensions/Makefile.am -@@ -16,6 +16,8 @@ libedomutils_la_LIBADD = \ - $(EVOLUTION_DATA_SERVER_LIBS) \ - $(GNOME_PLATFORM_LIBS) - -+libedomutils_la_LDFLAGS = -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) -+ - libewebextension_la_SOURCES = \ - e-web-extension.h \ - e-web-extension-names.h \ -@@ -38,7 +40,6 @@ libewebextension_la_LIBADD = \ - $(GNOME_PLATFORM_LIBS) \ - $(WEB_EXTENSIONS_LIBS) - --libewebextension_la_LDFLAGS = \ -- -module -avoid-version -no-undefined -+libewebextension_la_LDFLAGS = -module -avoid-version $(NO_UNDEFINED) $(CODE_COVERAGE_LDFLAGS) - - -include $(top_srcdir)/git.mk diff --git a/evolution.spec b/evolution.spec index 1d31b0d..671824e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.21.90 +Version: 3.21.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -46,8 +46,6 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch -Patch01: evolution-3.21.90-ldflags.patch - ## Dependencies ### Requires: gvfs @@ -202,7 +200,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color -%patch01 -p1 -b .ldflags # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -528,6 +525,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 29 2016 Milan Crha - 3.21.91-1 +- Update to 3.21.91 + * Mon Aug 15 2016 Milan Crha - 3.21.90-1 - Update to 3.21.90 diff --git a/sources b/sources index feb2be8..31deac6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -58cdef8655a79b05dcb132cc7a547849 evolution-3.21.90.tar.xz +6a3472597314433111f672544537243c evolution-3.21.91.tar.xz From 358a64f5a6b5b551ca49c1f61ea658ce9996d8f0 Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 1 Sep 2016 17:48:19 +0200 Subject: [PATCH 619/844] Adapt to WebKit Unstable DOM API changes --- evolution.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 671824e..4fbde1f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -8,7 +8,7 @@ %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 %define libsoup_version 2.42 -%define webkit2gtk_version 2.13.0 +%define webkit2gtk_version 2.13.90 %define evo_base_version 3.22 @@ -29,7 +29,7 @@ Name: evolution Version: 3.21.91 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -42,6 +42,7 @@ Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### +Patch01: webkit_dom_insert_adjacent_text.patch # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch @@ -199,6 +200,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} +%patch01 -p1 -b .webkit_dom_insert_adjacent_text #%patch01 -p1 -b .doc-e-cell-renderer-color # Remove the welcome email from Novell @@ -525,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Thu Sep 01 2016 Tomas Popela - 3.21.91-2 +- Adapt to WebKit Unstable DOM API changes + * Mon Aug 29 2016 Milan Crha - 3.21.91-1 - Update to 3.21.91 From 3df91f31e578d8f962e7b7dba9c95d821a10d60f Mon Sep 17 00:00:00 2001 From: Tomas Popela Date: Thu, 1 Sep 2016 17:52:44 +0200 Subject: [PATCH 620/844] Commit the missing patch --- webkit_dom_insert_adjacent_text.patch | 180 ++++++++++++++++++++++++++ 1 file changed, 180 insertions(+) create mode 100644 webkit_dom_insert_adjacent_text.patch diff --git a/webkit_dom_insert_adjacent_text.patch b/webkit_dom_insert_adjacent_text.patch new file mode 100644 index 0000000..6900389 --- /dev/null +++ b/webkit_dom_insert_adjacent_text.patch @@ -0,0 +1,180 @@ +diff --git a/configure.ac b/configure.ac +index 7eccb7d..a1ba2c0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -50,7 +50,7 @@ m4_define([gcr_minimum_version], [3.4]) + m4_define([enchant_minimum_version], [1.1.7]) + m4_define([gnome_desktop_minimum_version], [2.91.3]) + m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) +-m4_define([webkit2gtk_minimum_version], [2.13.0]) ++m4_define([webkit2gtk_minimum_version], [2.13.90]) + m4_define([libxml_minimum_version], [2.7.3]) + m4_define([shared_mime_info_minimum_version], [0.22]) + m4_define([libpst_minimum_version], [0.6.54]) +diff --git a/modules/webkit-editor/web-extension/e-composer-dom-functions.c b/modules/webkit-editor/web-extension/e-composer-dom-functions.c +index a54b180..221c0af 100644 +--- a/modules/webkit-editor/web-extension/e-composer-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-composer-dom-functions.c +@@ -25,7 +25,7 @@ + #define WEBKIT_DOM_USE_UNSTABLE_API + #include + #include +-#include ++#include + #undef WEBKIT_DOM_USE_UNSTABLE_API + + #include +@@ -370,8 +370,8 @@ e_composer_dom_insert_signature (EEditorPage *editor_page, + WEBKIT_DOM_NODE (insert_signature_in), node, NULL); + remove_node (WEBKIT_DOM_NODE (converted_signature)); + } else +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (insert_signature_in), ++ webkit_dom_element_insert_adjacent_html ( ++ insert_signature_in, + "beforeend", + signature_text, + NULL); +diff --git a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c +index b3ac1bf..d3699a2 100644 +--- a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c +@@ -1087,7 +1087,7 @@ e_dialogs_dom_spell_check_run (EEditorPage *editor_page, + * reached only when we reach the beginning/end of the document */ + if (start && end) + webkit_dom_dom_selection_set_base_and_extent ( +- dom_selection, start, start_offset, end, end_offset, NULL); ++ dom_selection, start, start_offset, end, end_offset); + + g_clear_object (&dom_selection); + +diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +index e778849..7d89495 100644 +--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +@@ -26,6 +26,7 @@ + #include + #include + #include ++#include + #include + #undef WEBKIT_DOM_USE_UNSTABLE_API + +@@ -1677,8 +1678,8 @@ e_editor_dom_check_magic_links (EEditorPage *editor_page, + new_href); + + if (appending_to_link) { +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (parent), ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (parent), + "beforeend", + text_to_append, + NULL); +@@ -1710,8 +1711,8 @@ e_editor_dom_check_magic_links (EEditorPage *editor_page, + new_href); + + if (appending_to_link) { +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (parent), ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (parent), + "beforeend", + text_to_append, + NULL); +@@ -2087,8 +2088,8 @@ emoticon_insert_span (EEmoticon *emoticon, + + if (!e_editor_page_get_unicode_smileys_enabled (editor_page)) { + /* ​ == UNICODE_ZERO_WIDTH_SPACE */ +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (span), "afterend", "​", NULL); ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (span), "afterend", "​", NULL); + } + + if (ev) { +@@ -2112,8 +2113,8 @@ emoticon_insert_span (EEmoticon *emoticon, + dom_create_selection_marker (document, FALSE)), + NULL); + } else +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (node), "afterend", "​", NULL); ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (node), "afterend", "​", NULL); + ev->data.fragment = g_object_ref (fragment); + } + +@@ -3910,8 +3911,8 @@ e_editor_dom_body_key_up_event_process_return_key (EEditorPage *editor_page) + if (!webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (selection_start_marker)) && + (!webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker)) || + WEBKIT_DOM_IS_HTML_BR_ELEMENT (webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker))))) +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (parent), ++ webkit_dom_element_insert_adjacent_text ( ++ WEBKIT_DOM_ELEMENT (parent), + "afterbegin", + UNICODE_ZERO_WIDTH_SPACE, + NULL); +@@ -5494,14 +5495,14 @@ e_editor_dom_quote_and_insert_text_into_selection (EEditorPage *editor_page, + static void + mark_citation (WebKitDOMElement *citation) + { +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (citation), ++ webkit_dom_element_insert_adjacent_text ( ++ citation, + "beforebegin", + "##CITATION_START##", + NULL); + +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (citation), ++ webkit_dom_element_insert_adjacent_text ( ++ citation, + "afterend", + "##CITATION_END##", + NULL); +@@ -5537,8 +5538,8 @@ create_text_markers_for_selection_in_element (WebKitDOMElement *element) + selection_marker = webkit_dom_element_query_selector ( + element, "#-x-evo-selection-start-marker", NULL); + if (selection_marker) +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (selection_marker), ++ webkit_dom_element_insert_adjacent_text ( ++ selection_marker, + "afterend", + "##SELECTION_START##", + NULL); +@@ -5546,8 +5547,8 @@ create_text_markers_for_selection_in_element (WebKitDOMElement *element) + selection_marker = webkit_dom_element_query_selector ( + element, "#-x-evo-selection-end-marker", NULL); + if (selection_marker) +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (selection_marker), ++ webkit_dom_element_insert_adjacent_text ( ++ selection_marker, + "afterend", + "##SELECTION_END##", + NULL); +@@ -11090,8 +11091,8 @@ e_editor_dom_insert_base64_image (EEditorPage *editor_page, + webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (resizable_wrapper), TRUE, NULL), + NULL); + +- webkit_dom_html_element_insert_adjacent_html ( +- WEBKIT_DOM_HTML_ELEMENT (node), "afterend", "​", NULL); ++ webkit_dom_element_insert_adjacent_html ( ++ WEBKIT_DOM_ELEMENT (node), "afterend", "​", NULL); + ev->data.fragment = g_object_ref (fragment); + + e_editor_dom_selection_get_coordinates (editor_page, +@@ -14617,8 +14618,8 @@ set_font_style (WebKitDOMDocument *document, + text_content = webkit_dom_node_get_text_content (first_child); + + if (g_strcmp0 (text_content, UNICODE_ZERO_WIDTH_SPACE) != 0) +- webkit_dom_html_element_insert_adjacent_text ( +- WEBKIT_DOM_HTML_ELEMENT (parent), ++ webkit_dom_element_insert_adjacent_text ( ++ WEBKIT_DOM_ELEMENT (parent), + "afterend", + UNICODE_ZERO_WIDTH_SPACE, + NULL); From cdc90255e838467f7a10b2dab30a365781b939f9 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Sep 2016 14:44:40 +0200 Subject: [PATCH 621/844] Update to 3.21.92 --- .gitignore | 1 + evolution.spec | 10 +- sources | 2 +- webkit_dom_insert_adjacent_text.patch | 180 -------------------------- 4 files changed, 8 insertions(+), 185 deletions(-) delete mode 100644 webkit_dom_insert_adjacent_text.patch diff --git a/.gitignore b/.gitignore index 5cfd0da..cf94a27 100644 --- a/.gitignore +++ b/.gitignore @@ -112,3 +112,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.4.tar.xz /evolution-3.21.90.tar.xz /evolution-3.21.91.tar.xz +/evolution-3.21.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 4fbde1f..1fcd27d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.21.91 -Release: 2%{?dist} +Version: 3.21.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -42,7 +42,6 @@ Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ### Patches ### -Patch01: webkit_dom_insert_adjacent_text.patch # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch @@ -200,7 +199,6 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} -%patch01 -p1 -b .webkit_dom_insert_adjacent_text #%patch01 -p1 -b .doc-e-cell-renderer-color # Remove the welcome email from Novell @@ -527,6 +525,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 12 2016 Milan Crha - 3.21.92-1 +- Update to 3.21.92 +- Remove patch for "Adapt to WebKit Unstable DOM API changes: (fixed upstream) + * Thu Sep 01 2016 Tomas Popela - 3.21.91-2 - Adapt to WebKit Unstable DOM API changes diff --git a/sources b/sources index 31deac6..9e15bad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -6a3472597314433111f672544537243c evolution-3.21.91.tar.xz +0f301ca945f9be3d2827f76c02c5dcb6 evolution-3.21.92.tar.xz diff --git a/webkit_dom_insert_adjacent_text.patch b/webkit_dom_insert_adjacent_text.patch deleted file mode 100644 index 6900389..0000000 --- a/webkit_dom_insert_adjacent_text.patch +++ /dev/null @@ -1,180 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 7eccb7d..a1ba2c0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -50,7 +50,7 @@ m4_define([gcr_minimum_version], [3.4]) - m4_define([enchant_minimum_version], [1.1.7]) - m4_define([gnome_desktop_minimum_version], [2.91.3]) - m4_define([gsettings_desktop_schemas_minimum_version], [2.91.92]) --m4_define([webkit2gtk_minimum_version], [2.13.0]) -+m4_define([webkit2gtk_minimum_version], [2.13.90]) - m4_define([libxml_minimum_version], [2.7.3]) - m4_define([shared_mime_info_minimum_version], [0.22]) - m4_define([libpst_minimum_version], [0.6.54]) -diff --git a/modules/webkit-editor/web-extension/e-composer-dom-functions.c b/modules/webkit-editor/web-extension/e-composer-dom-functions.c -index a54b180..221c0af 100644 ---- a/modules/webkit-editor/web-extension/e-composer-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-composer-dom-functions.c -@@ -25,7 +25,7 @@ - #define WEBKIT_DOM_USE_UNSTABLE_API - #include - #include --#include -+#include - #undef WEBKIT_DOM_USE_UNSTABLE_API - - #include -@@ -370,8 +370,8 @@ e_composer_dom_insert_signature (EEditorPage *editor_page, - WEBKIT_DOM_NODE (insert_signature_in), node, NULL); - remove_node (WEBKIT_DOM_NODE (converted_signature)); - } else -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (insert_signature_in), -+ webkit_dom_element_insert_adjacent_html ( -+ insert_signature_in, - "beforeend", - signature_text, - NULL); -diff --git a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c -index b3ac1bf..d3699a2 100644 ---- a/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-dialogs-dom-functions.c -@@ -1087,7 +1087,7 @@ e_dialogs_dom_spell_check_run (EEditorPage *editor_page, - * reached only when we reach the beginning/end of the document */ - if (start && end) - webkit_dom_dom_selection_set_base_and_extent ( -- dom_selection, start, start_offset, end, end_offset, NULL); -+ dom_selection, start, start_offset, end, end_offset); - - g_clear_object (&dom_selection); - -diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -index e778849..7d89495 100644 ---- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -@@ -26,6 +26,7 @@ - #include - #include - #include -+#include - #include - #undef WEBKIT_DOM_USE_UNSTABLE_API - -@@ -1677,8 +1678,8 @@ e_editor_dom_check_magic_links (EEditorPage *editor_page, - new_href); - - if (appending_to_link) { -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (parent), -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (parent), - "beforeend", - text_to_append, - NULL); -@@ -1710,8 +1711,8 @@ e_editor_dom_check_magic_links (EEditorPage *editor_page, - new_href); - - if (appending_to_link) { -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (parent), -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (parent), - "beforeend", - text_to_append, - NULL); -@@ -2087,8 +2088,8 @@ emoticon_insert_span (EEmoticon *emoticon, - - if (!e_editor_page_get_unicode_smileys_enabled (editor_page)) { - /* ​ == UNICODE_ZERO_WIDTH_SPACE */ -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (span), "afterend", "​", NULL); -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (span), "afterend", "​", NULL); - } - - if (ev) { -@@ -2112,8 +2113,8 @@ emoticon_insert_span (EEmoticon *emoticon, - dom_create_selection_marker (document, FALSE)), - NULL); - } else -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (node), "afterend", "​", NULL); -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (node), "afterend", "​", NULL); - ev->data.fragment = g_object_ref (fragment); - } - -@@ -3910,8 +3911,8 @@ e_editor_dom_body_key_up_event_process_return_key (EEditorPage *editor_page) - if (!webkit_dom_node_get_previous_sibling (WEBKIT_DOM_NODE (selection_start_marker)) && - (!webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker)) || - WEBKIT_DOM_IS_HTML_BR_ELEMENT (webkit_dom_node_get_next_sibling (WEBKIT_DOM_NODE (selection_end_marker))))) -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (parent), -+ webkit_dom_element_insert_adjacent_text ( -+ WEBKIT_DOM_ELEMENT (parent), - "afterbegin", - UNICODE_ZERO_WIDTH_SPACE, - NULL); -@@ -5494,14 +5495,14 @@ e_editor_dom_quote_and_insert_text_into_selection (EEditorPage *editor_page, - static void - mark_citation (WebKitDOMElement *citation) - { -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (citation), -+ webkit_dom_element_insert_adjacent_text ( -+ citation, - "beforebegin", - "##CITATION_START##", - NULL); - -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (citation), -+ webkit_dom_element_insert_adjacent_text ( -+ citation, - "afterend", - "##CITATION_END##", - NULL); -@@ -5537,8 +5538,8 @@ create_text_markers_for_selection_in_element (WebKitDOMElement *element) - selection_marker = webkit_dom_element_query_selector ( - element, "#-x-evo-selection-start-marker", NULL); - if (selection_marker) -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (selection_marker), -+ webkit_dom_element_insert_adjacent_text ( -+ selection_marker, - "afterend", - "##SELECTION_START##", - NULL); -@@ -5546,8 +5547,8 @@ create_text_markers_for_selection_in_element (WebKitDOMElement *element) - selection_marker = webkit_dom_element_query_selector ( - element, "#-x-evo-selection-end-marker", NULL); - if (selection_marker) -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (selection_marker), -+ webkit_dom_element_insert_adjacent_text ( -+ selection_marker, - "afterend", - "##SELECTION_END##", - NULL); -@@ -11090,8 +11091,8 @@ e_editor_dom_insert_base64_image (EEditorPage *editor_page, - webkit_dom_node_clone_node_with_error (WEBKIT_DOM_NODE (resizable_wrapper), TRUE, NULL), - NULL); - -- webkit_dom_html_element_insert_adjacent_html ( -- WEBKIT_DOM_HTML_ELEMENT (node), "afterend", "​", NULL); -+ webkit_dom_element_insert_adjacent_html ( -+ WEBKIT_DOM_ELEMENT (node), "afterend", "​", NULL); - ev->data.fragment = g_object_ref (fragment); - - e_editor_dom_selection_get_coordinates (editor_page, -@@ -14617,8 +14618,8 @@ set_font_style (WebKitDOMDocument *document, - text_content = webkit_dom_node_get_text_content (first_child); - - if (g_strcmp0 (text_content, UNICODE_ZERO_WIDTH_SPACE) != 0) -- webkit_dom_html_element_insert_adjacent_text ( -- WEBKIT_DOM_HTML_ELEMENT (parent), -+ webkit_dom_element_insert_adjacent_text ( -+ WEBKIT_DOM_ELEMENT (parent), - "afterend", - UNICODE_ZERO_WIDTH_SPACE, - NULL); From 0b19259e8b0de477582dc2372f04598cad6be5aa Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Sep 2016 11:19:44 +0200 Subject: [PATCH 622/844] Update to 3.22.0; Add gnome-autoar dependency --- .gitignore | 1 + evolution.spec | 12 +++++++++--- sources | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index cf94a27..fa88735 100644 --- a/.gitignore +++ b/.gitignore @@ -113,3 +113,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.90.tar.xz /evolution-3.21.91.tar.xz /evolution-3.21.92.tar.xz +/evolution-3.22.0.tar.xz diff --git a/evolution.spec b/evolution.spec index 1fcd27d..92cd149 100644 --- a/evolution.spec +++ b/evolution.spec @@ -2,6 +2,7 @@ %define glib2_version 2.46.0 %define gtk3_version 3.10.0 +%define gnome_autoar_version 0.1.1 %define gnome_desktop_version 2.91.3 %define gnome_doc_utils_version 0.8.0 %define intltool_version 0.35.5 @@ -28,14 +29,14 @@ ### Abstract ### Name: evolution -Version: 3.21.92 +Version: 3.22.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.21/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -77,6 +78,8 @@ BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version} BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version} +BuildRequires: pkgconfig(gnome-autoar-0) >= %{gnome_autoar_version} +BuildRequires: pkgconfig(gnome-autoar-gtk-0) >= %{gnome_autoar_version} BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version} BuildRequires: pkgconfig(gsettings-desktop-schemas) BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version} @@ -239,7 +242,6 @@ autoconf %configure \ --disable-maintainer-mode \ - --disable-autoar \ --with-sub-version=" (%{version}-%{release})" \ %ldap_flags %ssl_flags %gtkdoc_flags \ --enable-plugins=all \ @@ -525,6 +527,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 19 2016 Milan Crha - 3.22.0-1 +- Update to 3.22.0 +- Add gnome-autoar dependency + * Mon Sep 12 2016 Milan Crha - 3.21.92-1 - Update to 3.21.92 - Remove patch for "Adapt to WebKit Unstable DOM API changes: (fixed upstream) diff --git a/sources b/sources index 9e15bad..f8ec951 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0f301ca945f9be3d2827f76c02c5dcb6 evolution-3.21.92.tar.xz +16e508bb90ab7ca9861e26195a866b73 evolution-3.22.0.tar.xz From 5e6effdfd8329347fb64973afd6332ddf4e006db Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 10 Oct 2016 11:44:33 +0200 Subject: [PATCH 623/844] Update to 3.22.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index fa88735..816d8f4 100644 --- a/.gitignore +++ b/.gitignore @@ -114,3 +114,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.91.tar.xz /evolution-3.21.92.tar.xz /evolution-3.22.0.tar.xz +/evolution-3.22.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 92cd149..43e731c 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ ### Abstract ### Name: evolution -Version: 3.22.0 +Version: 3.22.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -527,6 +527,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Oct 10 2016 Milan Crha - 3.22.1-1 +- Update to 3.22.1 + * Mon Sep 19 2016 Milan Crha - 3.22.0-1 - Update to 3.22.0 - Add gnome-autoar dependency diff --git a/sources b/sources index f8ec951..63ce26b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -16e508bb90ab7ca9861e26195a866b73 evolution-3.22.0.tar.xz +828493ae3eefeb0594ef816fbab9c617 evolution-3.22.1.tar.xz From 949618baa0031058f0311e62afe8cda9c06183b3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 13 Oct 2016 13:08:40 +0200 Subject: [PATCH 624/844] Add patch for GNOME bug #772803 (Inline images cause busy loop on Reply in WebKitWebProcess) --- evolution-3.22.1-inline-images-reply.patch | 26 ++++++++++++++++++++++ evolution.spec | 7 +++++- 2 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 evolution-3.22.1-inline-images-reply.patch diff --git a/evolution-3.22.1-inline-images-reply.patch b/evolution-3.22.1-inline-images-reply.patch new file mode 100644 index 0000000..c241487 --- /dev/null +++ b/evolution-3.22.1-inline-images-reply.patch @@ -0,0 +1,26 @@ +From d74c18bcc12f056d98cc1fcdb90f4372015ebf0e Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Thu, 13 Oct 2016 13:00:36 +0200 +Subject: [PATCH] Bug 772803 - Inline images cause busy loop on Reply in + WebKitWebProcess + +--- + src/modules/webkit-editor/web-extension/e-editor-dom-functions.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +index c61d365..0e8da0d 100644 +--- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c ++++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c +@@ -8419,7 +8419,7 @@ change_cid_images_src_to_base64 (EEditorPage *editor_page) + + list = webkit_dom_document_query_selector_all ( + document, selector, NULL); +- for (jj = webkit_dom_node_list_get_length (list) - 1; jj--;) { ++ for (jj = webkit_dom_node_list_get_length (list); jj--;) { + WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); + + set_base64_to_element_attribute ( +-- +2.7.4 + diff --git a/evolution.spec b/evolution.spec index 43e731c..7c87868 100644 --- a/evolution.spec +++ b/evolution.spec @@ -30,7 +30,7 @@ Name: evolution Version: 3.22.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,6 +46,7 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch +Patch01: evolution-3.22.1-inline-images-reply.patch ## Dependencies ### @@ -203,6 +204,7 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color +%patch01 -p1 -b .inline-images-reply # Remove the welcome email from Novell for inbox in mail/default/*/Inbox; do @@ -527,6 +529,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Thu Oct 13 2016 Milan Crha - 3.22.1-2 +- Add patch for GNOME bug #772803 (Inline images cause busy loop on Reply in WebKitWebProcess) + * Mon Oct 10 2016 Milan Crha - 3.22.1-1 - Update to 3.22.1 From c0dbee3bf380ef46a16dd96dde1cff1dc1cc75a8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Oct 2016 16:29:44 +0200 Subject: [PATCH 625/844] Update to 3.23.1 --- .gitignore | 1 + evolution-3.22.1-inline-images-reply.patch | 26 ------ evolution.spec | 94 ++++++++++------------ sources | 2 +- 4 files changed, 43 insertions(+), 80 deletions(-) delete mode 100644 evolution-3.22.1-inline-images-reply.patch diff --git a/.gitignore b/.gitignore index 816d8f4..599bde9 100644 --- a/.gitignore +++ b/.gitignore @@ -115,3 +115,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.21.92.tar.xz /evolution-3.22.0.tar.xz /evolution-3.22.1.tar.xz +/evolution-3.23.1.tar.xz diff --git a/evolution-3.22.1-inline-images-reply.patch b/evolution-3.22.1-inline-images-reply.patch deleted file mode 100644 index c241487..0000000 --- a/evolution-3.22.1-inline-images-reply.patch +++ /dev/null @@ -1,26 +0,0 @@ -From d74c18bcc12f056d98cc1fcdb90f4372015ebf0e Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Thu, 13 Oct 2016 13:00:36 +0200 -Subject: [PATCH] Bug 772803 - Inline images cause busy loop on Reply in - WebKitWebProcess - ---- - src/modules/webkit-editor/web-extension/e-editor-dom-functions.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -index c61d365..0e8da0d 100644 ---- a/modules/webkit-editor/web-extension/e-editor-dom-functions.c -+++ b/modules/webkit-editor/web-extension/e-editor-dom-functions.c -@@ -8419,7 +8419,7 @@ change_cid_images_src_to_base64 (EEditorPage *editor_page) - - list = webkit_dom_document_query_selector_all ( - document, selector, NULL); -- for (jj = webkit_dom_node_list_get_length (list) - 1; jj--;) { -+ for (jj = webkit_dom_node_list_get_length (list); jj--;) { - WebKitDOMNode *node = webkit_dom_node_list_item (list, jj); - - set_base64_to_element_attribute ( --- -2.7.4 - diff --git a/evolution.spec b/evolution.spec index 7c87868..fcd2ca5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -4,14 +4,13 @@ %define gtk3_version 3.10.0 %define gnome_autoar_version 0.1.1 %define gnome_desktop_version 2.91.3 -%define gnome_doc_utils_version 0.8.0 %define intltool_version 0.35.5 %define libgdata_version 0.10.0 %define libgweather_version 3.5.0 %define libsoup_version 2.42 %define webkit2gtk_version 2.13.90 -%define evo_base_version 3.22 +%define evo_base_version 3.24 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -29,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.22.1 -Release: 2%{?dist} +Version: 3.23.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.22/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.23/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -46,7 +45,6 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} # RH bug # #Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch -Patch01: evolution-3.22.1-inline-images-reply.patch ## Dependencies ### @@ -56,17 +54,13 @@ Requires: highlight ### Build Dependencies ### -BuildRequires: autoconf >= 2.59 -BuildRequires: automake >= 1.9 -BuildRequires: desktop-file-utils +BuildRequires: cmake +BuildRequires: gcc BuildRequires: gettext -BuildRequires: gnome-common -BuildRequires: gnome-doc-utils >= %{gnome_doc_utils_version} BuildRequires: gtk-doc BuildRequires: highlight BuildRequires: intltool >= %{intltool_version} BuildRequires: itstool -BuildRequires: libtool >= 1.5 BuildRequires: pkgconfig BuildRequires: yelp-tools @@ -92,6 +86,7 @@ BuildRequires: pkgconfig(libebackend-1.2) >= %{version} BuildRequires: pkgconfig(libebook-1.2) >= %{version} BuildRequires: pkgconfig(libecal-1.2) >= %{version} BuildRequires: pkgconfig(libedataserver-1.2) >= %{version} +BuildRequires: pkgconfig(libedataserverui-1.2) >= %{version} BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} BuildRequires: pkgconfig(libxml-2.0) @@ -99,6 +94,7 @@ BuildRequires: pkgconfig(nspr) BuildRequires: pkgconfig(nss) BuildRequires: pkgconfig(shared-mime-info) BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version} +BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk_version} %if %{ldap_support} BuildRequires: openldap-devel >= 2.0.11 @@ -204,22 +200,25 @@ the functionality of the installed %{name} package. %prep %setup -q -n evolution-%{version} #%patch01 -p1 -b .doc-e-cell-renderer-color -%patch01 -p1 -b .inline-images-reply # Remove the welcome email from Novell -for inbox in mail/default/*/Inbox; do +for inbox in src/mail/default/*/Inbox; do echo -n "" > $inbox done %build + +mkdir -p _build +cd _build + # define all of our flags, this is kind of ugly :( %if %{ldap_support} -%define ldap_flags --with-openldap=yes +%define ldap_flags -DWITH_OPENLDAP=ON %else -%define ldap_flags --without-openldap +%define ldap_flags -DWITH_OPENLDAP=OFF %endif -%define ssl_flags --enable-nss=yes --enable-smime=yes +%define ssl_flags -DENABLE_SMIME=ON if ! pkg-config --exists nss; then echo "Unable to find suitable version of mozilla nss to use!" @@ -227,32 +226,28 @@ if ! pkg-config --exists nss; then fi %if %{with_docs} -%define gtkdoc_flags --enable-gtk-doc --with-help +%define gtkdoc_flags -DENABLE_GTK_DOC=ON -DWITH_HELP=ON %else -%define gtkdoc_flags --disable-gtk-doc --without-help +%define gtkdoc_flags -DENABLE_GTK_DOC=OFF -DWITH_HELP=OFF %endif CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS -# Regenerate configure to pick up configure.ac changes -aclocal -I m4 -autoheader -automake --add-missing -libtoolize -intltoolize --force -autoconf - -%configure \ - --disable-maintainer-mode \ - --with-sub-version=" (%{version}-%{release})" \ +%cmake -G "Unix Makefiles" \ + -DENABLE_MAINTAINER_MODE=OFF \ + -DVERSION_SUBSTRING=" (%{version}-%{release})" \ %ldap_flags %ssl_flags %gtkdoc_flags \ - --enable-plugins=all \ - --enable-installed-tests -export tagname=CC -make %{?_smp_mflags} LIBTOOL=/usr/bin/libtool CFLAGS="$CFLAGS -fno-strict-aliasing" + -DENABLE_PLUGINS=all \ + -DENABLE_YTNEF=OFF \ + -DENABLE_INSTALLED_TESTS=ON \ + .. + +make %{?_smp_mflags} %if %{with_docs} +cd .. + # Strip unneeded translations from .mo files. # This reduces the RPM size by several megabytes. cd po @@ -287,19 +282,8 @@ done %install rm -rf $RPM_BUILD_ROOT -export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 -export tagname=CC -make LIBTOOL=/usr/bin/libtool DESTDIR=$RPM_BUILD_ROOT install -unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL - -# remove libtool archives for importers and the like -find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.la' -exec rm {} \; - -# remove statically built libraries: -find $RPM_BUILD_ROOT/%{_libdir}/evolution -name '*.a' -exec rm {} \; - -# remove test GIO modules directory -rm -r $RPM_BUILD_ROOT/%{_libdir}/evolution/test-gio-modules +cd _build +make DESTDIR=$RPM_BUILD_ROOT install %find_lang evolution-%{evo_base_version} --all-name --with-gnome @@ -329,7 +313,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT -%files -f translations.lang +%files -f _build/translations.lang %doc AUTHORS COPYING NEWS README # GSettings schemas: @@ -415,8 +399,11 @@ rm -rf $RPM_BUILD_ROOT # Shared libraries: %{_libdir}/evolution/libevolution-mail-composer.so %{_libdir}/evolution/libeabutil.so +%{_libdir}/evolution/libeabwidgets.so %{_libdir}/evolution/libecontacteditor.so %{_libdir}/evolution/libecontactlisteditor.so +%{_libdir}/evolution/libecontactprint.so +%{_libdir}/evolution/libedomutils.so %{_libdir}/evolution/libemail-engine.so %{_libdir}/evolution/libevolution-mail-formatter.so %{_libdir}/evolution/libevolution-shell.so @@ -431,10 +418,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/libgnomecanvas.so # WebKit2 Extensions -%{_libdir}/evolution/web-extensions/libedomutils.so %{_libdir}/evolution/web-extensions/libewebextension.so -%{_libdir}/evolution/web-extensions/libmoduleitipformatterwebextension.so -%{_libdir}/evolution/web-extensions/webkit-editor/libewebkiteditorwebextension.so +%{_libdir}/evolution/web-extensions/module-itip-formatter-webextension.so +%{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so # Various libexec programs: %dir %{_libexecdir}/evolution @@ -505,8 +491,7 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/evolution-util %if %{with_docs} -%files help -f help.lang -%dir %{_datadir}/help/*/evolution +%files help -f _build/help.lang %endif %files bogofilter @@ -529,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Oct 24 2016 Milan Crha - 3.23.1-1 +- Update to 3.23.1 + * Thu Oct 13 2016 Milan Crha - 3.22.1-2 - Add patch for GNOME bug #772803 (Inline images cause busy loop on Reply in WebKitWebProcess) diff --git a/sources b/sources index 63ce26b..d628bf2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -828493ae3eefeb0594ef816fbab9c617 evolution-3.22.1.tar.xz +800439a75b1c10650709d3c008944fef evolution-3.23.1.tar.xz From 3dd8772098ed9b11d9864c47a0364dc2ad6b299a Mon Sep 17 00:00:00 2001 From: Filipe Rosset Date: Sun, 6 Nov 2016 02:38:58 -0200 Subject: [PATCH 626/844] Rebuild for newer highlight --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index fcd2ca5..7f0b38d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.23.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -514,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Sun Nov 06 2016 Filipe Rosset - 3.23.1-2 +- Rebuild for newer highlight + * Mon Oct 24 2016 Milan Crha - 3.23.1-1 - Update to 3.23.1 From e3627764f6b2e286d7af6cc9c4edcc087d326f07 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Nov 2016 13:48:26 +0100 Subject: [PATCH 627/844] Update to 3.23.2 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 599bde9..62e5c37 100644 --- a/.gitignore +++ b/.gitignore @@ -116,3 +116,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.22.0.tar.xz /evolution-3.22.1.tar.xz /evolution-3.23.1.tar.xz +/evolution-3.23.2.tar.xz diff --git a/evolution.spec b/evolution.spec index 7f0b38d..cc18541 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.23.1 -Release: 2%{?dist} +Version: 3.23.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -514,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Nov 21 2016 Milan Crha - 3.23.2-1 +- Update to 3.23.2 + * Sun Nov 06 2016 Filipe Rosset - 3.23.1-2 - Rebuild for newer highlight diff --git a/sources b/sources index d628bf2..5eac674 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -800439a75b1c10650709d3c008944fef evolution-3.23.1.tar.xz +2b6f3fe9e57fab6cb1a90f7815ea979a evolution-3.23.2.tar.xz From 832d895b174bae77d91d0a5b5763caf3ae110c3d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Dec 2016 15:00:34 +0100 Subject: [PATCH 628/844] Update to 3.23.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 62e5c37..5307a78 100644 --- a/.gitignore +++ b/.gitignore @@ -117,3 +117,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.22.1.tar.xz /evolution-3.23.1.tar.xz /evolution-3.23.2.tar.xz +/evolution-3.23.3.tar.xz diff --git a/evolution.spec b/evolution.spec index cc18541..436f032 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.23.2 +Version: 3.23.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -514,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Dec 12 2016 Milan Crha - 3.23.3-1 +- Update to 3.23.3 + * Mon Nov 21 2016 Milan Crha - 3.23.2-1 - Update to 3.23.2 diff --git a/sources b/sources index 5eac674..c587cd7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -2b6f3fe9e57fab6cb1a90f7815ea979a evolution-3.23.2.tar.xz +SHA512 (evolution-3.23.3.tar.xz) = e4fe79fec60d75c025d46e788e2330db6ab761cc81980dd0f4ca8f7bb2a10ff0111b2e3c421bbb96722599dd23a9671623243dde31636ac3859ce055f8189a00 From 142ebb9bf7bee8ceed61e5d6d7dbb55ae7f2cae7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jan 2017 11:54:33 +0100 Subject: [PATCH 629/844] Update to 3.23.4 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5307a78..fe9919c 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.23.1.tar.xz /evolution-3.23.2.tar.xz /evolution-3.23.3.tar.xz +/evolution-3.23.4.tar.xz diff --git a/evolution.spec b/evolution.spec index 436f032..8f0f024 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.23.3 +Version: 3.23.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -514,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jan 16 2017 Milan Crha - 3.23.4-1 +- Update to 3.23.4 + * Mon Dec 12 2016 Milan Crha - 3.23.3-1 - Update to 3.23.3 diff --git a/sources b/sources index c587cd7..00b45c1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.23.3.tar.xz) = e4fe79fec60d75c025d46e788e2330db6ab761cc81980dd0f4ca8f7bb2a10ff0111b2e3c421bbb96722599dd23a9671623243dde31636ac3859ce055f8189a00 +SHA512 (evolution-3.23.4.tar.xz) = e18e3a21a9b83d6784988e625635fdd4900cc8f76a3152ffdfff0697221bee665f4ae9e66a96613d55404eac8c636c0433568933e9f0ed713d0389438e41bdf9 From 0a0935f3834700f8bd65b2fcfa865b4c6c415fab Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jan 2017 14:05:06 +0100 Subject: [PATCH 630/844] Add new installed, but unpackaged, file into the .spec file --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 8f0f024..23627ce 100644 --- a/evolution.spec +++ b/evolution.spec @@ -378,6 +378,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/modules/module-cal-config-webcal.so %{_libdir}/evolution/modules/module-calendar.so %{_libdir}/evolution/modules/module-composer-autosave.so +%{_libdir}/evolution/modules/module-composer-to-meeting.so %{_libdir}/evolution/modules/module-contact-photos.so %{_libdir}/evolution/modules/module-gravatar.so %{_libdir}/evolution/modules/module-itip-formatter.so From e90e472f8a8142692bd8a86dbd9e9e86fc62a0db Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 10 Feb 2017 09:28:26 +0000 Subject: [PATCH 631/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 23627ce..69a95ce 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.23.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Fri Feb 10 2017 Fedora Release Engineering - 3.23.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + * Mon Jan 16 2017 Milan Crha - 3.23.4-1 - Update to 3.23.4 From b85365031d80018bc237e07665ac8933f27ebfd3 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Feb 2017 12:32:01 +0100 Subject: [PATCH 632/844] Update to 3.23.90 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe9919c..613084b 100644 --- a/.gitignore +++ b/.gitignore @@ -119,3 +119,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.23.2.tar.xz /evolution-3.23.3.tar.xz /evolution-3.23.4.tar.xz +/evolution-3.23.90.tar.xz diff --git a/evolution.spec b/evolution.spec index 69a95ce..2ed0c56 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.23.4 -Release: 2%{?dist} +Version: 3.23.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Feb 13 2017 Milan Crha - 3.23.90-1 +- Update to 3.23.90 + * Fri Feb 10 2017 Fedora Release Engineering - 3.23.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild diff --git a/sources b/sources index 00b45c1..0c81fc6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.23.4.tar.xz) = e18e3a21a9b83d6784988e625635fdd4900cc8f76a3152ffdfff0697221bee665f4ae9e66a96613d55404eac8c636c0433568933e9f0ed713d0389438e41bdf9 +SHA512 (evolution-3.23.90.tar.xz) = 46051b1034bc0858e0892edef7033465ff83d082368529255602b6b5bf679397c52e93e424aa14f9f69e4dd7839071fc8489cf76347ff74b08777e94dc92556e From 15a4d36b18f1e8f2cc59dbb558a02fd802d23529 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Feb 2017 13:38:26 +0100 Subject: [PATCH 633/844] Update to 3.23.91 --- .gitignore | 1 + evolution.spec | 7 ++++++- sources | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 613084b..21a92e6 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.23.3.tar.xz /evolution-3.23.4.tar.xz /evolution-3.23.90.tar.xz +/evolution-3.23.91.tar.xz diff --git a/evolution.spec b/evolution.spec index 2ed0c56..6850b11 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.23.90 +Version: 3.23.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -68,6 +68,7 @@ BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(camel-1.2) >= %{version} BuildRequires: pkgconfig(cryptui-0.0) +BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gcr-3) BuildRequires: pkgconfig(gdk-pixbuf-2.0) @@ -120,6 +121,7 @@ Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} Requires: pkgconfig(camel-1.2) >= %{version} Requires: pkgconfig(cryptui-0.0) +Requires: pkgconfig(enchant) Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} Requires: pkgconfig(gtkspell3-3.0) Requires: pkgconfig(gweather-3.0) >= %{libgweather_version} @@ -515,6 +517,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Feb 27 2017 Milan Crha - 3.23.91-1 +- Update to 3.23.91 + * Mon Feb 13 2017 Milan Crha - 3.23.90-1 - Update to 3.23.90 diff --git a/sources b/sources index 0c81fc6..5715f09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.23.90.tar.xz) = 46051b1034bc0858e0892edef7033465ff83d082368529255602b6b5bf679397c52e93e424aa14f9f69e4dd7839071fc8489cf76347ff74b08777e94dc92556e +SHA512 (evolution-3.23.91.tar.xz) = f45adaebd55598c8b11e61ccebe14d25c4f199e3f69aba73a4c24b1611d06e254246aac62916f85a27f32acd14cbd98d89adf1ef3b322f3f1d5d8d830ab6fbef From 31a70d8a26fed0d7cd8f68a04270fb5a1eff877c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Mar 2017 11:19:51 +0100 Subject: [PATCH 634/844] Update to 3.23.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 21a92e6..9df016c 100644 --- a/.gitignore +++ b/.gitignore @@ -121,3 +121,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.23.4.tar.xz /evolution-3.23.90.tar.xz /evolution-3.23.91.tar.xz +/evolution-3.23.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 6850b11..f297ca9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.23.91 +Version: 3.23.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -517,6 +517,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Mar 13 2017 Milan Crha - 3.23.92-1 +- Update to 3.23.92 + * Mon Feb 27 2017 Milan Crha - 3.23.91-1 - Update to 3.23.91 diff --git a/sources b/sources index 5715f09..e1353d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.23.91.tar.xz) = f45adaebd55598c8b11e61ccebe14d25c4f199e3f69aba73a4c24b1611d06e254246aac62916f85a27f32acd14cbd98d89adf1ef3b322f3f1d5d8d830ab6fbef +SHA512 (evolution-3.23.92.tar.xz) = 004b51d46b4441c3f71c776e57d9b5db52119fad524edcd8eef406afed60b75b82bb5988a518ca875b70edd6d8c74ee9abcc39a9f2832370c211edd7255a82bf From 5b3dd3995f0b34cd639551b189ef097602a07704 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 20 Mar 2017 11:49:45 +0100 Subject: [PATCH 635/844] Update to 3.24.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9df016c..65f41c6 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.23.90.tar.xz /evolution-3.23.91.tar.xz /evolution-3.23.92.tar.xz +/evolution-3.24.0.tar.xz diff --git a/evolution.spec b/evolution.spec index f297ca9..a15dea5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.23.92 +Version: 3.24.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.23/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.24/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -517,6 +517,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Mar 20 2017 Milan Crha - 3.24.0-1 +- Update to 3.24.0 + * Mon Mar 13 2017 Milan Crha - 3.23.92-1 - Update to 3.23.92 diff --git a/sources b/sources index e1353d9..a0ebfc9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.23.92.tar.xz) = 004b51d46b4441c3f71c776e57d9b5db52119fad524edcd8eef406afed60b75b82bb5988a518ca875b70edd6d8c74ee9abcc39a9f2832370c211edd7255a82bf +SHA512 (evolution-3.24.0.tar.xz) = 82038bef0b66fdafd8e04bcd0a499b377da255f9c8d095da38bb184bb099bccc395f8a538baaa19e7ea58ce7d097df86b4083b2b5b8ba182373258e72826b80d From ab9be396d8ee910a4b1125b3f8a3441083ec5004 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 10 Apr 2017 10:42:27 +0200 Subject: [PATCH 636/844] Update to 3.24.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 65f41c6..1d05c36 100644 --- a/.gitignore +++ b/.gitignore @@ -123,3 +123,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.23.91.tar.xz /evolution-3.23.92.tar.xz /evolution-3.24.0.tar.xz +/evolution-3.24.1.tar.xz diff --git a/evolution.spec b/evolution.spec index a15dea5..0e6a168 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.24.0 +Version: 3.24.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -517,6 +517,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Apr 10 2017 Milan Crha - 3.24.1-1 +- Update to 3.24.1 + * Mon Mar 20 2017 Milan Crha - 3.24.0-1 - Update to 3.24.0 diff --git a/sources b/sources index a0ebfc9..02bd391 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.24.0.tar.xz) = 82038bef0b66fdafd8e04bcd0a499b377da255f9c8d095da38bb184bb099bccc395f8a538baaa19e7ea58ce7d097df86b4083b2b5b8ba182373258e72826b80d +SHA512 (evolution-3.24.1.tar.xz) = ad88f2dedf529eec38461887d27544968e22d0a56d3f7fe4b547b1436c462c2175a556c6664c287dd3765e9b9499427acd846bee242a8a85b3049a9ba3b90bba From 6d266770f09c44afac7c3aacae97779b38ec01ab Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Apr 2017 11:19:13 +0200 Subject: [PATCH 637/844] Update to 3.25.1 --- .gitignore | 1 + evolution.spec | 33 +++++++++++++++++++-------------- sources | 2 +- 3 files changed, 21 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 1d05c36..aa814f6 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.23.92.tar.xz /evolution-3.24.0.tar.xz /evolution-3.24.1.tar.xz +/evolution-3.25.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 0e6a168..a88541e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,7 +10,7 @@ %define libsoup_version 2.42 %define webkit2gtk_version 2.13.90 -%define evo_base_version 3.24 +%define evo_base_version 3.26 %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 @@ -28,14 +28,14 @@ ### Abstract ### Name: evolution -Version: 3.24.1 +Version: 3.25.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.24/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -250,17 +250,19 @@ make %{?_smp_mflags} cd .. -# Strip unneeded translations from .mo files. -# This reduces the RPM size by several megabytes. -cd po -grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep -mv POTFILES.keep POTFILES.in -intltool-update --gettext-package=%{name}-%{evo_base_version} --pot -for p in *.po; do - msgmerge $p %{name}-%{evo_base_version}.pot > $p.out - msgfmt -o `basename $p .po`.gmo $p.out -done -cd - +# Disable this part, because it breaks multilib +# +## Strip unneeded translations from .mo files. +## This reduces the RPM size by several megabytes. +#cd po +#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep +#mv POTFILES.keep POTFILES.in +#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot +#for p in *.po; do +# msgmerge $p %{name}-%{evo_base_version}.pot > $p.out +# msgfmt -o `basename $p .po`.gmo $p.out +#done +#cd - # Replace identical images in the help by links. # This reduces the RPM size by several megabytes. @@ -517,6 +519,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Apr 24 2017 Milan Crha - 3.25.1-1 +- Update to 3.25.1 + * Mon Apr 10 2017 Milan Crha - 3.24.1-1 - Update to 3.24.1 diff --git a/sources b/sources index 02bd391..44b33f2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.24.1.tar.xz) = ad88f2dedf529eec38461887d27544968e22d0a56d3f7fe4b547b1436c462c2175a556c6664c287dd3765e9b9499427acd846bee242a8a85b3049a9ba3b90bba +SHA512 (evolution-3.25.1.tar.xz) = 0f7a1956a2ade49870a097dca9acefd45dd9b11378883c8b0aedd49102828ddb1af5c299a36eaf971f1f11958325a5f8ea74881329cbdc734529233d4a4d94d2 From b3a2af25ad1abd7cc749eb104722e19ce0d193f2 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 27 Apr 2017 10:50:32 +0200 Subject: [PATCH 638/844] Split translations into separate package --- evolution.spec | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/evolution.spec b/evolution.spec index a88541e..a3dcd4d 100644 --- a/evolution.spec +++ b/evolution.spec @@ -29,7 +29,7 @@ Name: evolution Version: 3.25.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -51,6 +51,7 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} Requires: gvfs Requires: gtkspell3 Requires: highlight +Requires: %{name}-langpacks = %{version}-%{release} ### Build Dependencies ### @@ -147,6 +148,14 @@ BuildArch: noarch %description devel-docs This package contains developer documentation for Evolution. +%package langpacks +Summary: Translations for %{name} +BuildArch: noarch +Requires: %{name} = %{version}-%{release} + +%description langpacks +This package contains translations for %{name}. + %if %{with_docs} %package help Group: Applications/Productivity @@ -250,20 +259,6 @@ make %{?_smp_mflags} cd .. -# Disable this part, because it breaks multilib -# -## Strip unneeded translations from .mo files. -## This reduces the RPM size by several megabytes. -#cd po -#grep -v ".*[.]desktop[.]in[.]in$" POTFILES.in > POTFILES.keep -#mv POTFILES.keep POTFILES.in -#intltool-update --gettext-package=%{name}-%{evo_base_version} --pot -#for p in *.po; do -# msgmerge $p %{name}-%{evo_base_version}.pot > $p.out -# msgfmt -o `basename $p .po`.gmo $p.out -#done -#cd - - # Replace identical images in the help by links. # This reduces the RPM size by several megabytes. helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name} @@ -317,7 +312,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : %clean rm -rf $RPM_BUILD_ROOT -%files -f _build/translations.lang +%files %doc AUTHORS COPYING NEWS README # GSettings schemas: @@ -495,6 +490,8 @@ rm -rf $RPM_BUILD_ROOT %doc %{_datadir}/gtk-doc/html/evolution-shell %doc %{_datadir}/gtk-doc/html/evolution-util +%files langpacks -f _build/translations.lang + %if %{with_docs} %files help -f _build/help.lang %endif @@ -519,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Thu Apr 27 2017 Milan Crha - 3.25.1-2 +- Split translations into separate package + * Mon Apr 24 2017 Milan Crha - 3.25.1-1 - Update to 3.25.1 From 3bc553e38e66313869e6168edffcf91dc3684445 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 22 May 2017 11:04:32 +0200 Subject: [PATCH 639/844] Update to 3.25.2 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index aa814f6..2379ae7 100644 --- a/.gitignore +++ b/.gitignore @@ -125,3 +125,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.24.0.tar.xz /evolution-3.24.1.tar.xz /evolution-3.25.1.tar.xz +/evolution-3.25.2.tar.xz diff --git a/evolution.spec b/evolution.spec index a3dcd4d..bd8f923 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.25.1 -Release: 2%{?dist} +Version: 3.25.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -516,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon May 22 2017 Milan Crha - 3.25.2-1 +- Update to 3.25.2 + * Thu Apr 27 2017 Milan Crha - 3.25.1-2 - Split translations into separate package diff --git a/sources b/sources index 44b33f2..20c07d8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.1.tar.xz) = 0f7a1956a2ade49870a097dca9acefd45dd9b11378883c8b0aedd49102828ddb1af5c299a36eaf971f1f11958325a5f8ea74881329cbdc734529233d4a4d94d2 +SHA512 (evolution-3.25.2.tar.xz) = a43abdfe2d7dcddc7340e1f210390a6891b75613da6a266c4800d9d7c4c60c824fa9217a29c71a14d63e91ced2e5ba7fbb93f35c8d6737fcd3c7a7a5946e169a From 62ef73354b52fc8d6a2b2c6466b33ec586060abc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Jun 2017 11:26:20 +0200 Subject: [PATCH 640/844] Update to 3.25.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2379ae7..278e128 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.24.1.tar.xz /evolution-3.25.1.tar.xz /evolution-3.25.2.tar.xz +/evolution-3.25.3.tar.xz diff --git a/evolution.spec b/evolution.spec index bd8f923..fc33083 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.25.2 +Version: 3.25.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -516,6 +516,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jun 19 2017 Milan Crha - 3.25.3-1 +- Update to 3.25.3 + * Mon May 22 2017 Milan Crha - 3.25.2-1 - Update to 3.25.2 diff --git a/sources b/sources index 20c07d8..1a443d4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.2.tar.xz) = a43abdfe2d7dcddc7340e1f210390a6891b75613da6a266c4800d9d7c4c60c824fa9217a29c71a14d63e91ced2e5ba7fbb93f35c8d6737fcd3c7a7a5946e169a +SHA512 (evolution-3.25.3.tar.xz) = 282a7946da0b426c3aabc8e452338d8d27ec7beb6037b2b6f8fdd071246079170eb14c55dfb391fbab6caf3c893b8b1b751a84eb17b13d17b1d3931128ac5449 From f38bf581839162ee1bbd3ff399511b39d3a9c474 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Jul 2017 08:12:02 +0200 Subject: [PATCH 641/844] Update to 3.25.4 --- .gitignore | 1 + evolution.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 278e128..4a663ea 100644 --- a/.gitignore +++ b/.gitignore @@ -127,3 +127,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.1.tar.xz /evolution-3.25.2.tar.xz /evolution-3.25.3.tar.xz +/evolution-3.25.4.tar.xz diff --git a/evolution.spec b/evolution.spec index fc33083..896ce26 100644 --- a/evolution.spec +++ b/evolution.spec @@ -10,8 +10,6 @@ %define libsoup_version 2.42 %define webkit2gtk_version 2.13.90 -%define evo_base_version 3.26 - %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 %define last_evo_nm_version 3.5.0 @@ -28,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.25.3 +Version: 3.25.4 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -284,11 +282,11 @@ rm -rf $RPM_BUILD_ROOT cd _build make DESTDIR=$RPM_BUILD_ROOT install -%find_lang evolution-%{evo_base_version} --all-name --with-gnome +%find_lang evolution --all-name --with-gnome -grep "/usr/share/locale" evolution-%{evo_base_version}.lang > translations.lang +grep "/usr/share/locale" evolution.lang > translations.lang %if %{with_docs} -grep -v "/usr/share/locale" evolution-%{evo_base_version}.lang > help.lang +grep -v "/usr/share/locale" evolution.lang > help.lang %endif %post @@ -516,6 +514,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jul 17 2017 Milan Crha - 3.25.4-1 +- Update to 3.25.4 + * Mon Jun 19 2017 Milan Crha - 3.25.3-1 - Update to 3.25.3 diff --git a/sources b/sources index 1a443d4..945436a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.3.tar.xz) = 282a7946da0b426c3aabc8e452338d8d27ec7beb6037b2b6f8fdd071246079170eb14c55dfb391fbab6caf3c893b8b1b751a84eb17b13d17b1d3931128ac5449 +SHA512 (evolution-3.25.4.tar.xz) = 3d59bdb8d69c6be4c22eb689981550b110b6b37885ba6f370d059c860e3bd408efc1b3450b6702debe8685c4ab9b66c30a4c6867fa61cd5bf906e49fb74c4594 From 54b54ba63c716de2efb4d4e84e08a7eba98e2684 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 24 Jul 2017 20:34:02 +0200 Subject: [PATCH 642/844] Add missed org.gnome.evolution.text-highlight.gschema.xml to the .rpm --- evolution.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/evolution.spec b/evolution.spec index 896ce26..ebb2ef8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -324,6 +324,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/glib-2.0/schemas/org.gnome.evolution.importer.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.bogofilter.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.spamassassin.gschema.xml +%{_datadir}/glib-2.0/schemas/org.gnome.evolution.text-highlight.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.attachment-reminder.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.autocontacts.gschema.xml %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.email-custom-header.gschema.xml From 6f4d594b8e85aae82d2a00b4765fe8d29319a85d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 26 Jul 2017 07:52:11 +0000 Subject: [PATCH 643/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index ebb2ef8..c847447 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.25.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Wed Jul 26 2017 Fedora Release Engineering - 3.25.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + * Mon Jul 17 2017 Milan Crha - 3.25.4-1 - Update to 3.25.4 From 82d3f7de2fcfe5d93f3193feb834c0344002b943 Mon Sep 17 00:00:00 2001 From: Florian Weimer Date: Mon, 31 Jul 2017 11:33:06 +0200 Subject: [PATCH 644/844] Rebuild with binutils fix for ppc64le (#1475636) --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index c847447..3a05e62 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.25.4 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Jul 31 2017 Florian Weimer - 3.25.4-3 +- Rebuild with binutils fix for ppc64le (#1475636) + * Wed Jul 26 2017 Fedora Release Engineering - 3.25.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild From a84732fea9f7bb391ca444d5f2cf6b6ea90d7af8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 2 Aug 2017 20:21:20 +0000 Subject: [PATCH 645/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 3a05e62..49fff21 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.25.4 -Release: 3%{?dist} +Release: 4%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -515,6 +515,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Wed Aug 02 2017 Fedora Release Engineering - 3.25.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + * Mon Jul 31 2017 Florian Weimer - 3.25.4-3 - Rebuild with binutils fix for ppc64le (#1475636) From 033eceb1c0eaad1da8389937ae4fbe117998415c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 7 Aug 2017 11:21:59 +0200 Subject: [PATCH 646/844] Update to 3.25.90 --- .gitignore | 1 + evolution.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 4a663ea..958ca0a 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.2.tar.xz /evolution-3.25.3.tar.xz /evolution-3.25.4.tar.xz +/evolution-3.25.90.tar.xz diff --git a/evolution.spec b/evolution.spec index 49fff21..d725b0f 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,8 +26,8 @@ ### Abstract ### Name: evolution -Version: 3.25.4 -Release: 4%{?dist} +Version: 3.25.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -362,6 +362,7 @@ rm -rf $RPM_BUILD_ROOT # Modules: %dir %{_libdir}/evolution %dir %{_libdir}/evolution/modules +%{_libdir}/evolution/modules/module-accounts-window.so %{_libdir}/evolution/modules/module-addressbook.so %{_libdir}/evolution/modules/module-backup-restore.so %{_libdir}/evolution/modules/module-book-config-google.so @@ -377,6 +378,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/evolution/modules/module-calendar.so %{_libdir}/evolution/modules/module-composer-autosave.so %{_libdir}/evolution/modules/module-composer-to-meeting.so +%{_libdir}/evolution/modules/module-config-lookup.so %{_libdir}/evolution/modules/module-contact-photos.so %{_libdir}/evolution/modules/module-gravatar.so %{_libdir}/evolution/modules/module-itip-formatter.so @@ -515,6 +517,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 07 2017 Milan Crha - 3.25.90-1 +- Update to 3.25.90 + * Wed Aug 02 2017 Fedora Release Engineering - 3.25.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 945436a..073e6e5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.4.tar.xz) = 3d59bdb8d69c6be4c22eb689981550b110b6b37885ba6f370d059c860e3bd408efc1b3450b6702debe8685c4ab9b66c30a4c6867fa61cd5bf906e49fb74c4594 +SHA512 (evolution-3.25.90.tar.xz) = 0b1059b36d3d4ab51d681ca268f6d4cdd294bec6fc86f961a57228e57932c27300425f85861714cfc72d3c30f211038eb8b93cc50875e728a1ea4cbceb2e81b0 From d21c532c22ecaa86d4f64cca5ad961505c859a66 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 Aug 2017 15:05:26 +0200 Subject: [PATCH 647/844] Update to 3.25.91 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 958ca0a..ca768d8 100644 --- a/.gitignore +++ b/.gitignore @@ -129,3 +129,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.3.tar.xz /evolution-3.25.4.tar.xz /evolution-3.25.90.tar.xz +/evolution-3.25.91.tar.xz diff --git a/evolution.spec b/evolution.spec index d725b0f..53fd4da 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.25.90 +Version: 3.25.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -517,6 +517,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Aug 21 2017 Milan Crha - 3.25.91-1 +- Update to 3.25.91 + * Mon Aug 07 2017 Milan Crha - 3.25.90-1 - Update to 3.25.90 diff --git a/sources b/sources index 073e6e5..c4c4d18 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.90.tar.xz) = 0b1059b36d3d4ab51d681ca268f6d4cdd294bec6fc86f961a57228e57932c27300425f85861714cfc72d3c30f211038eb8b93cc50875e728a1ea4cbceb2e81b0 +SHA512 (evolution-3.25.91.tar.xz) = 1d94fd6ce55dedf580d2cc8d0966275c33f9acdaafdb9eff9c8214f360132bdcfe1311e5d4e2cc3d20d44b915f91add86c598893f2ce4fd34c28d741d8ebf7b1 From c387b14adb558d731dbd3fe20c267f1ca86e11dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Tue, 22 Aug 2017 17:11:11 +0300 Subject: [PATCH 648/844] Install COPYING as %license https://bugzilla.redhat.com/show_bug.cgi?id=1484037 --- evolution.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/evolution.spec b/evolution.spec index 53fd4da..7813bd3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.25.91 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -311,7 +311,8 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : rm -rf $RPM_BUILD_ROOT %files -%doc AUTHORS COPYING NEWS README +%license COPYING +%doc AUTHORS NEWS README # GSettings schemas: %{_datadir}/GConf/gsettings/evolution.convert @@ -517,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Tue Aug 22 2017 Ville Skyttä - 3.25.91-2 +- Install COPYING as %%license + * Mon Aug 21 2017 Milan Crha - 3.25.91-1 - Update to 3.25.91 From 944ed78ad4cb1fdba700422e85e4daf58c5e7373 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Sep 2017 09:31:19 +0200 Subject: [PATCH 649/844] Update to 3.25.92 --- .gitignore | 1 + evolution.spec | 19 +++++++++++-------- sources | 2 +- 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index ca768d8..14c4ebe 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.4.tar.xz /evolution-3.25.90.tar.xz /evolution-3.25.91.tar.xz +/evolution-3.25.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 7813bd3..9ad6616 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,8 +26,8 @@ ### Abstract ### Name: evolution -Version: 3.25.91 -Release: 2%{?dist} +Version: 3.25.92 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -340,11 +340,11 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution -%{_datadir}/appdata/evolution.appdata.xml +%{_datadir}/appdata/org.gnome.Evolution.appdata.xml # Desktop files: -%{_datadir}/applications/evolution.desktop -%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop +%{_datadir}/applications/org.gnome.Evolution.desktop +%{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop # Icons: %{_datadir}/icons/hicolor/16x16/apps/* @@ -500,15 +500,15 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %{_libdir}/evolution/modules/module-bogofilter.so -%{_datadir}/appdata/evolution-bogofilter.metainfo.xml +%{_datadir}/appdata/org.gnome.Evolution-bogofilter.metainfo.xml %files spamassassin %{_libdir}/evolution/modules/module-spamassassin.so -%{_datadir}/appdata/evolution-spamassassin.metainfo.xml +%{_datadir}/appdata/org.gnome.Evolution-spamassassin.metainfo.xml %if %{libpst_support} %files pst -%{_datadir}/appdata/evolution-pst.metainfo.xml +%{_datadir}/appdata/org.gnome.Evolution-pst.metainfo.xml %{evo_plugin_dir}/org-gnome-pst-import.eplug %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 04 2017 Milan Crha - 3.25.92-1 +- Update to 3.25.92 + * Tue Aug 22 2017 Ville Skyttä - 3.25.91-2 - Install COPYING as %%license diff --git a/sources b/sources index c4c4d18..a0c8c52 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.91.tar.xz) = 1d94fd6ce55dedf580d2cc8d0966275c33f9acdaafdb9eff9c8214f360132bdcfe1311e5d4e2cc3d20d44b915f91add86c598893f2ce4fd34c28d741d8ebf7b1 +SHA512 (evolution-3.25.92.tar.xz) = e8be902d17a6d0629fc3626238bcd3eb6558f80055dacd79c5598dad534f0ea0a70d4744f17e4eb910094002915436cb9498810609384ef722c82a83ba8503af From 3a4128e0f91969a1f65032abd303557d57b460b4 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Sep 2017 18:20:38 +0200 Subject: [PATCH 650/844] Update to 3.25.92.1 --- .gitignore | 1 + evolution.spec | 39 +++++++++++++++++++++------------------ sources | 2 +- 3 files changed, 23 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 14c4ebe..e15001e 100644 --- a/.gitignore +++ b/.gitignore @@ -131,3 +131,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.90.tar.xz /evolution-3.25.91.tar.xz /evolution-3.25.92.tar.xz +/evolution-3.25.92.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 9ad6616..4bd3f0a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.25.92 +Version: 3.25.92.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -65,7 +65,7 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo-gobject) -BuildRequires: pkgconfig(camel-1.2) >= %{version} +BuildRequires: pkgconfig(camel-1.2) >= 3.25.92 BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} @@ -82,11 +82,11 @@ BuildRequires: pkgconfig(gtkspell3-3.0) BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version} BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) -BuildRequires: pkgconfig(libebackend-1.2) >= %{version} -BuildRequires: pkgconfig(libebook-1.2) >= %{version} -BuildRequires: pkgconfig(libecal-1.2) >= %{version} -BuildRequires: pkgconfig(libedataserver-1.2) >= %{version} -BuildRequires: pkgconfig(libedataserverui-1.2) >= %{version} +BuildRequires: pkgconfig(libebackend-1.2) >= 3.25.92 +BuildRequires: pkgconfig(libebook-1.2) >= 3.25.92 +BuildRequires: pkgconfig(libecal-1.2) >= 3.25.92 +BuildRequires: pkgconfig(libedataserver-1.2) >= 3.25.92 +BuildRequires: pkgconfig(libedataserverui-1.2) >= 3.25.92 BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} BuildRequires: pkgconfig(libxml-2.0) @@ -118,16 +118,16 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: pkgconfig(camel-1.2) >= %{version} +Requires: pkgconfig(camel-1.2) >= 3.25.92 Requires: pkgconfig(cryptui-0.0) Requires: pkgconfig(enchant) Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} Requires: pkgconfig(gtkspell3-3.0) Requires: pkgconfig(gweather-3.0) >= %{libgweather_version} -Requires: pkgconfig(libebackend-1.2) >= %{version} -Requires: pkgconfig(libebook-1.2) >= %{version} -Requires: pkgconfig(libecal-1.2) >= %{version} -Requires: pkgconfig(libedataserver-1.2) >= %{version} +Requires: pkgconfig(libebackend-1.2) >= 3.25.92 +Requires: pkgconfig(libebook-1.2) >= 3.25.92 +Requires: pkgconfig(libecal-1.2) >= 3.25.92 +Requires: pkgconfig(libedataserver-1.2) >= 3.25.92 Requires: pkgconfig(libgdata) >= %{libgdata_version} Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version} Requires: pkgconfig(libxml-2.0) @@ -340,11 +340,11 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution -%{_datadir}/appdata/org.gnome.Evolution.appdata.xml +%{_datadir}/appdata/evolution.appdata.xml # Desktop files: -%{_datadir}/applications/org.gnome.Evolution.desktop -%{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop +%{_datadir}/applications/evolution.desktop +%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop # Icons: %{_datadir}/icons/hicolor/16x16/apps/* @@ -500,15 +500,15 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %{_libdir}/evolution/modules/module-bogofilter.so -%{_datadir}/appdata/org.gnome.Evolution-bogofilter.metainfo.xml +%{_datadir}/appdata/evolution-bogofilter.metainfo.xml %files spamassassin %{_libdir}/evolution/modules/module-spamassassin.so -%{_datadir}/appdata/org.gnome.Evolution-spamassassin.metainfo.xml +%{_datadir}/appdata/evolution-spamassassin.metainfo.xml %if %{libpst_support} %files pst -%{_datadir}/appdata/org.gnome.Evolution-pst.metainfo.xml +%{_datadir}/appdata/evolution-pst.metainfo.xml %{evo_plugin_dir}/org-gnome-pst-import.eplug %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif @@ -518,6 +518,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 04 2017 Milan Crha - 3.25.92.1-1 +- Update to 3.25.92.1 + * Mon Sep 04 2017 Milan Crha - 3.25.92-1 - Update to 3.25.92 diff --git a/sources b/sources index a0c8c52..cbbd1d9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.92.tar.xz) = e8be902d17a6d0629fc3626238bcd3eb6558f80055dacd79c5598dad534f0ea0a70d4744f17e4eb910094002915436cb9498810609384ef722c82a83ba8503af +SHA512 (evolution-3.25.92.1.tar.xz) = 095f33d7567ed023d5847905766f27ca0d1e79755d8e67b440d4dccad2e1d10241678d81ecc4f521bbb3fa9e453ca74ce0dffc9dac84a2aa43b910de80ee62ec From 4af3e1fb2f6e8eb74a9397a2895eb4c1693166c8 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 4 Sep 2017 19:11:32 +0200 Subject: [PATCH 651/844] Update to 3.25.92.2 --- .gitignore | 1 + evolution.spec | 6 +++--- sources | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index e15001e..88c5e58 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.91.tar.xz /evolution-3.25.92.tar.xz /evolution-3.25.92.1.tar.xz +/evolution-3.25.92.2.tar.xz diff --git a/evolution.spec b/evolution.spec index 4bd3f0a..994c102 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.25.92.1 +Version: 3.25.92.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -518,8 +518,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog -* Mon Sep 04 2017 Milan Crha - 3.25.92.1-1 -- Update to 3.25.92.1 +* Mon Sep 04 2017 Milan Crha - 3.25.92.2-1 +- Update to 3.25.92.2 * Mon Sep 04 2017 Milan Crha - 3.25.92-1 - Update to 3.25.92 diff --git a/sources b/sources index cbbd1d9..171dd60 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.92.1.tar.xz) = 095f33d7567ed023d5847905766f27ca0d1e79755d8e67b440d4dccad2e1d10241678d81ecc4f521bbb3fa9e453ca74ce0dffc9dac84a2aa43b910de80ee62ec +SHA512 (evolution-3.25.92.2.tar.xz) = b030a93c5a8670c77570e8a84ceab732593ed5e4d57c49a2a5512149c2ec27f42add0eb49aeb711f68e47a92320c9705f3d0acacee049322b05139ebe6f35ccf From 9a33dde60d2a19ef3c3952dcd534ca2ccbbb377a Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Sep 2017 11:33:46 +0200 Subject: [PATCH 652/844] Update to 3.26.0 --- .gitignore | 1 + evolution.spec | 31 ++++++++++++++++++------------- sources | 2 +- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 88c5e58..4ad7a37 100644 --- a/.gitignore +++ b/.gitignore @@ -133,3 +133,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.92.tar.xz /evolution-3.25.92.1.tar.xz /evolution-3.25.92.2.tar.xz +/evolution-3.26.0.tar.xz diff --git a/evolution.spec b/evolution.spec index 994c102..0da9630 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,19 +26,21 @@ ### Abstract ### Name: evolution -Version: 3.25.92.2 +Version: 3.26.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.25/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.26/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} +%global eds_version %{version} + ### Patches ### # RH bug # @@ -65,7 +67,7 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo-gobject) -BuildRequires: pkgconfig(camel-1.2) >= 3.25.92 +BuildRequires: pkgconfig(camel-1.2) >= %{eds_version} BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} @@ -82,11 +84,11 @@ BuildRequires: pkgconfig(gtkspell3-3.0) BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version} BuildRequires: pkgconfig(iso-codes) BuildRequires: pkgconfig(libcanberra-gtk3) -BuildRequires: pkgconfig(libebackend-1.2) >= 3.25.92 -BuildRequires: pkgconfig(libebook-1.2) >= 3.25.92 -BuildRequires: pkgconfig(libecal-1.2) >= 3.25.92 -BuildRequires: pkgconfig(libedataserver-1.2) >= 3.25.92 -BuildRequires: pkgconfig(libedataserverui-1.2) >= 3.25.92 +BuildRequires: pkgconfig(libebackend-1.2) >= %{eds_version} +BuildRequires: pkgconfig(libebook-1.2) >= %{eds_version} +BuildRequires: pkgconfig(libecal-1.2) >= %{eds_version} +BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version} +BuildRequires: pkgconfig(libedataserverui-1.2) >= %{eds_version} BuildRequires: pkgconfig(libgdata) >= %{libgdata_version} BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version} BuildRequires: pkgconfig(libxml-2.0) @@ -118,16 +120,16 @@ personal information-management tool. Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} -Requires: pkgconfig(camel-1.2) >= 3.25.92 +Requires: pkgconfig(camel-1.2) >= %{eds_version} Requires: pkgconfig(cryptui-0.0) Requires: pkgconfig(enchant) Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} Requires: pkgconfig(gtkspell3-3.0) Requires: pkgconfig(gweather-3.0) >= %{libgweather_version} -Requires: pkgconfig(libebackend-1.2) >= 3.25.92 -Requires: pkgconfig(libebook-1.2) >= 3.25.92 -Requires: pkgconfig(libecal-1.2) >= 3.25.92 -Requires: pkgconfig(libedataserver-1.2) >= 3.25.92 +Requires: pkgconfig(libebackend-1.2) >= %{eds_version} +Requires: pkgconfig(libebook-1.2) >= %{eds_version} +Requires: pkgconfig(libecal-1.2) >= %{eds_version} +Requires: pkgconfig(libedataserver-1.2) >= %{eds_version} Requires: pkgconfig(libgdata) >= %{libgdata_version} Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version} Requires: pkgconfig(libxml-2.0) @@ -518,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Sep 11 2017 Milan Crha - 3.26.0-1 +- Update to 3.26.0 + * Mon Sep 04 2017 Milan Crha - 3.25.92.2-1 - Update to 3.25.92.2 diff --git a/sources b/sources index 171dd60..ea05e1d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.25.92.2.tar.xz) = b030a93c5a8670c77570e8a84ceab732593ed5e4d57c49a2a5512149c2ec27f42add0eb49aeb711f68e47a92320c9705f3d0acacee049322b05139ebe6f35ccf +SHA512 (evolution-3.26.0.tar.xz) = 297554495afcbfa681bf3108ec0f3c208c68d1fab181d283e9131ca0a3ed8301f631e69f1bcec0592296a023dadec991babf7b0194f6e47a9455a1e1642a5740 From 98e2e3564b2517a169eaf616249839c8257c5eb7 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 2 Oct 2017 15:02:40 +0200 Subject: [PATCH 653/844] Update to 3.26.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 4ad7a37..65cdd63 100644 --- a/.gitignore +++ b/.gitignore @@ -134,3 +134,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.92.1.tar.xz /evolution-3.25.92.2.tar.xz /evolution-3.26.0.tar.xz +/evolution-3.26.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 0da9630..b77f648 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.26.0 +Version: 3.26.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -520,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Oct 02 2017 Milan Crha - 3.26.1-1 +- Update to 3.26.1 + * Mon Sep 11 2017 Milan Crha - 3.26.0-1 - Update to 3.26.0 diff --git a/sources b/sources index ea05e1d..9fafb09 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.26.0.tar.xz) = 297554495afcbfa681bf3108ec0f3c208c68d1fab181d283e9131ca0a3ed8301f631e69f1bcec0592296a023dadec991babf7b0194f6e47a9455a1e1642a5740 +SHA512 (evolution-3.26.1.tar.xz) = d947bd6c9c6999cd2e816a93c1016748fbe6a268498d555ced312117205cb8f5f215c25dee1359e77bce6bdc98bb04ec69bba82802970dacde396543ffd09baf From 1655c348395c025925d0860d1fc86c969d90373b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Oct 2017 10:40:30 +0200 Subject: [PATCH 654/844] Update to 3.27.1 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 65cdd63..fe9f54d 100644 --- a/.gitignore +++ b/.gitignore @@ -135,3 +135,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.25.92.2.tar.xz /evolution-3.26.0.tar.xz /evolution-3.26.1.tar.xz +/evolution-3.27.1.tar.xz diff --git a/evolution.spec b/evolution.spec index b77f648..c744f19 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,14 +26,14 @@ ### Abstract ### Name: evolution -Version: 3.26.1 +Version: 3.27.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) -Source: http://download.gnome.org/sources/%{name}/3.26/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.27/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -520,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Oct 16 2017 Milan Crha - 3.27.1-1 +- Update to 3.27.1 + * Mon Oct 02 2017 Milan Crha - 3.26.1-1 - Update to 3.26.1 diff --git a/sources b/sources index 9fafb09..4351348 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.26.1.tar.xz) = d947bd6c9c6999cd2e816a93c1016748fbe6a268498d555ced312117205cb8f5f215c25dee1359e77bce6bdc98bb04ec69bba82802970dacde396543ffd09baf +SHA512 (evolution-3.27.1.tar.xz) = 0950b782773e2a83d54a5cdfc00e25096208c80ac1d56cb7240f0d796038612b8d1cec74a5c5fe515ffebc91cd2fd1d249be89be0abd352345f1cadd4ed24e9e From a5fa200c8faf43fed97ffe86513f1f2beecd80f1 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Oct 2017 12:01:58 +0200 Subject: [PATCH 655/844] Correct data file names after rename of evolution.desktop file --- evolution.spec | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index c744f19..54fcc64 100644 --- a/evolution.spec +++ b/evolution.spec @@ -342,11 +342,11 @@ rm -rf $RPM_BUILD_ROOT # The main executable %{_bindir}/evolution -%{_datadir}/appdata/evolution.appdata.xml +%{_datadir}/appdata/org.gnome.Evolution.appdata.xml # Desktop files: -%{_datadir}/applications/evolution.desktop -%{_sysconfdir}/xdg/autostart/evolution-alarm-notify.desktop +%{_datadir}/applications/org.gnome.Evolution.desktop +%{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop # Icons: %{_datadir}/icons/hicolor/16x16/apps/* @@ -502,15 +502,15 @@ rm -rf $RPM_BUILD_ROOT %files bogofilter %{_libdir}/evolution/modules/module-bogofilter.so -%{_datadir}/appdata/evolution-bogofilter.metainfo.xml +%{_datadir}/appdata/org.gnome.Evolution-bogofilter.metainfo.xml %files spamassassin %{_libdir}/evolution/modules/module-spamassassin.so -%{_datadir}/appdata/evolution-spamassassin.metainfo.xml +%{_datadir}/appdata/org.gnome.Evolution-spamassassin.metainfo.xml %if %{libpst_support} %files pst -%{_datadir}/appdata/evolution-pst.metainfo.xml +%{_datadir}/appdata/org.gnome.Evolution-pst.metainfo.xml %{evo_plugin_dir}/org-gnome-pst-import.eplug %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif From f92c864c73dc25c27c55621ac9c095a7adc4914e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Wed, 8 Nov 2017 14:21:22 +0100 Subject: [PATCH 656/844] Rebuild for newer libical --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 54fcc64..48e914a 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.27.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -520,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Wed Nov 08 2017 Milan Crha - 3.27.1-2 +- Rebuild for newer libical + * Mon Oct 16 2017 Milan Crha - 3.27.1-1 - Update to 3.27.1 From c02662d6cdb984e09d0288556e301d5e85e9d99e Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Nov 2017 09:37:46 +0100 Subject: [PATCH 657/844] Update to 3.27.2 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index fe9f54d..c168b76 100644 --- a/.gitignore +++ b/.gitignore @@ -136,3 +136,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.26.0.tar.xz /evolution-3.26.1.tar.xz /evolution-3.27.1.tar.xz +/evolution-3.27.2.tar.xz diff --git a/evolution.spec b/evolution.spec index 48e914a..7b03340 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,8 +26,8 @@ ### Abstract ### Name: evolution -Version: 3.27.1 -Release: 2%{?dist} +Version: 3.27.2 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -520,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Nov 13 2017 Milan Crha - 3.27.2-1 +- Update to 3.27.2 + * Wed Nov 08 2017 Milan Crha - 3.27.1-2 - Rebuild for newer libical diff --git a/sources b/sources index 4351348..958a4c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.1.tar.xz) = 0950b782773e2a83d54a5cdfc00e25096208c80ac1d56cb7240f0d796038612b8d1cec74a5c5fe515ffebc91cd2fd1d249be89be0abd352345f1cadd4ed24e9e +SHA512 (evolution-3.27.2.tar.xz) = 9f34da0b7c2e5c7fc0bee8530536c9d40a6a4b60d5ccaf195526c3812bf463ac2603c8abdf539f9fb996c448d728095c9fb9bed64f52a308ae148686d3f63754 From 6fd4e3e138c0a7fc0b8b85c5b852b75ac91a4e1c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 11 Dec 2017 11:41:59 +0100 Subject: [PATCH 658/844] Update to 3.27.3 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index c168b76..ead78e0 100644 --- a/.gitignore +++ b/.gitignore @@ -137,3 +137,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.26.1.tar.xz /evolution-3.27.1.tar.xz /evolution-3.27.2.tar.xz +/evolution-3.27.3.tar.xz diff --git a/evolution.spec b/evolution.spec index 7b03340..b89dca3 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,7 +26,7 @@ ### Abstract ### Name: evolution -Version: 3.27.2 +Version: 3.27.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -520,6 +520,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Mon Dec 11 2017 Milan Crha - 3.27.3-1 +- Update to 3.27.3 + * Mon Nov 13 2017 Milan Crha - 3.27.2-1 - Update to 3.27.2 diff --git a/sources b/sources index 958a4c5..f24fdad 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.2.tar.xz) = 9f34da0b7c2e5c7fc0bee8530536c9d40a6a4b60d5ccaf195526c3812bf463ac2603c8abdf539f9fb996c448d728095c9fb9bed64f52a308ae148686d3f63754 +SHA512 (evolution-3.27.3.tar.xz) = 441eb7d03d478737ebdc23e189bf8b51b889e11ab8b469821a8ff060f03562a6898306a5a8662dd2735597067065c7c87739dac41f7445905b48291bce3bbd1f From 0e04492ff473e2dce0932a62fd0234fb8fb45fd6 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 2 Jan 2018 16:56:38 +0100 Subject: [PATCH 659/844] Add explicit dependency on evolution-data-server (RH bug #1524416) --- evolution.spec | 3 +++ 1 file changed, 3 insertions(+) diff --git a/evolution.spec b/evolution.spec index b89dca3..307b6ea 100644 --- a/evolution.spec +++ b/evolution.spec @@ -48,6 +48,7 @@ Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} ## Dependencies ### +Requires: evolution-data-server >= %{eds_version} Requires: gvfs Requires: gtkspell3 Requires: highlight @@ -520,6 +521,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +- Add explicit dependency on evolution-data-server (RH bug #1524416) + * Mon Dec 11 2017 Milan Crha - 3.27.3-1 - Update to 3.27.3 From 16463de30015a8929357a8e4b647e0a413450849 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Sat, 6 Jan 2018 10:26:49 +0100 Subject: [PATCH 660/844] Remove obsolete scriptlets Signed-off-by: Igor Gnatenko --- evolution.spec | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/evolution.spec b/evolution.spec index 307b6ea..0cd9aa5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.27.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -292,26 +292,9 @@ grep "/usr/share/locale" evolution.lang > translations.lang grep -v "/usr/share/locale" evolution.lang > help.lang %endif -%post -/sbin/ldconfig -/usr/bin/update-desktop-database &> /dev/null || : -touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : +%post -p /sbin/ldconfig -%postun -/sbin/ldconfig -/usr/bin/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : - gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : - glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : -fi - -%posttrans -gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : -glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || : - -%clean -rm -rf $RPM_BUILD_ROOT +%postun -p /sbin/ldconfig %files %license COPYING @@ -521,6 +504,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/installed-tests %changelog +* Sat Jan 06 2018 Igor Gnatenko - 3.27.3-2 +- Remove obsolete scriptlets - Add explicit dependency on evolution-data-server (RH bug #1524416) * Mon Dec 11 2017 Milan Crha - 3.27.3-1 From 1c5ae90ff16c540b345a4cf53dad64109b881468 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 8 Jan 2018 10:50:31 +0100 Subject: [PATCH 661/844] Update to 3.27.4 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ead78e0..02d4373 100644 --- a/.gitignore +++ b/.gitignore @@ -138,3 +138,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.1.tar.xz /evolution-3.27.2.tar.xz /evolution-3.27.3.tar.xz +/evolution-3.27.4.tar.xz diff --git a/evolution.spec b/evolution.spec index 0cd9aa5..89f8469 100644 --- a/evolution.spec +++ b/evolution.spec @@ -26,8 +26,8 @@ ### Abstract ### Name: evolution -Version: 3.27.3 -Release: 2%{?dist} +Version: 3.27.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -504,6 +504,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Jan 08 2018 Milan Crha - 3.27.4-1 +- Update to 3.27.4 + * Sat Jan 06 2018 Igor Gnatenko - 3.27.3-2 - Remove obsolete scriptlets - Add explicit dependency on evolution-data-server (RH bug #1524416) diff --git a/sources b/sources index f24fdad..b707ba7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.3.tar.xz) = 441eb7d03d478737ebdc23e189bf8b51b889e11ab8b469821a8ff060f03562a6898306a5a8662dd2735597067065c7c87739dac41f7445905b48291bce3bbd1f +SHA512 (evolution-3.27.4.tar.xz) = f0c1d74cddb2aedc30492e224389289f25e33072db8411af51349b82833a59a9bc5e2343ea6868a6bdb7d941578354aa5a46de942957a25e47c4f6972d6f4a18 From 6b13d190a60bf37bf6ab7e9725ba79fb40f26583 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Mon, 5 Feb 2018 14:38:14 +0100 Subject: [PATCH 662/844] Rebuilt for libgweather soname bump --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 89f8469..0f89249 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.27.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -504,6 +504,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Feb 05 2018 Kalev Lember - 3.27.4-2 +- Rebuilt for libgweather soname bump + * Mon Jan 08 2018 Milan Crha - 3.27.4-1 - Update to 3.27.4 From fe1f15fc48a24cda6eafa481b52447eb2fd1adb0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 6 Feb 2018 09:33:04 +0100 Subject: [PATCH 663/844] Update to 3.27.90; Properly obsolete evolution-perl subpackage --- .gitignore | 1 + evolution.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 02d4373..b6bd819 100644 --- a/.gitignore +++ b/.gitignore @@ -139,3 +139,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.2.tar.xz /evolution-3.27.3.tar.xz /evolution-3.27.4.tar.xz +/evolution-3.27.90.tar.xz diff --git a/evolution.spec b/evolution.spec index 0f89249..abed4b8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -13,6 +13,7 @@ %define last_anjal_version 0.3.2-3 %define last_libgal2_version 2:2.5.3-2 %define last_evo_nm_version 3.5.0 +%define last_evo_perl_version 3.21.90 %define ldap_support 1 %define libnotify_support 1 @@ -26,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.27.4 -Release: 2%{?dist} +Version: 3.27.90 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -38,6 +39,7 @@ Source: http://download.gnome.org/sources/%{name}/3.27/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} +Obsoletes: evolution-perl < %{last_evo_perl_version} %global eds_version %{version} @@ -504,6 +506,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Tue Feb 06 2018 Milan Crha - 3.27.90-1 +- Update to 3.27.90 +- Properly obsolete evolution-perl subpackage + * Mon Feb 05 2018 Kalev Lember - 3.27.4-2 - Rebuilt for libgweather soname bump diff --git a/sources b/sources index b707ba7..fcba1c2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.4.tar.xz) = f0c1d74cddb2aedc30492e224389289f25e33072db8411af51349b82833a59a9bc5e2343ea6868a6bdb7d941578354aa5a46de942957a25e47c4f6972d6f4a18 +SHA512 (evolution-3.27.90.tar.xz) = b4141efd72803726826ceb55141831d85845f430fd3b23a0ce3ddf72906770f4852d50ad997be279c488ee9a4f6c2a00c4351eb44b1a676a1f72f0fdd822aeab From 35158c04996b59dde034ec4bf733a0e3f12c3bcb Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Fri, 9 Feb 2018 09:04:27 +0100 Subject: [PATCH 664/844] Escape macros in %changelog Reference: https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/Y2ZUKK2B7T2IKXPMODNF6HB2O5T5TS6H/ Signed-off-by: Igor Gnatenko --- evolution.spec | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/evolution.spec b/evolution.spec index abed4b8..ab9e811 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.27.90 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -506,6 +506,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Fri Feb 09 2018 Igor Gnatenko - 3.27.90-2 +- Escape macros in %%changelog + * Tue Feb 06 2018 Milan Crha - 3.27.90-1 - Update to 3.27.90 - Properly obsolete evolution-perl subpackage @@ -1844,7 +1847,7 @@ grep -v "/usr/share/locale" evolution.lang > help.lang - Add -Wdeclaration-after-statement to strict build settings. * Mon Mar 26 2007 Matthew Barnes - 2.10.0-4.fc7 -- Run gtk-update-icon-cache in %post and %postun (RH bug #234018). +- Run gtk-update-icon-cache in %%post and %%postun (RH bug #234018). * Sat Mar 17 2007 Matthew Barnes - 2.10.0-3.fc7 - Add flag to disable deprecated Camel symbols. @@ -2160,9 +2163,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang * Fri May 12 2006 Matthew Barnes - 2.7.1-1 - Update to 2.7.1 - Bump evo_major from 2.6 to 2.8 -- Upstream evolution.desktop renamed evolution-%{evo_major}.desktop. -- Upstream evolution.keys renamed evolution-%{evo_major}.keys. -- Upstream evolution.mime renamed evolution-%{evo_major}.mime. +- Upstream evolution.desktop renamed evolution-%%{evo_major}.desktop. +- Upstream evolution.keys renamed evolution-%%{evo_major}.keys. +- Upstream evolution.mime renamed evolution-%%{evo_major}.mime. - Update line numbers in evolution-2.5.2-no-gnome-common.patch and evolution-2.5.5.1-notification-cleanups.patch and rename them to version 2.7.1. @@ -2516,7 +2519,7 @@ and run autoconf at the start of the build) (#156328) - Removed explicit run-time spec-file requirement on mozilla. The Mozilla NSS API/ABI stabilised by version 1.7.3 The libraries are always located in the libdir - However, the headers are in /usr/include/mozilla-%{mozilla_build_version} + However, the headers are in /usr/include/mozilla-%%{mozilla_build_version} and so they move each time the mozilla version changes. So we no longer have an explicit mozilla run-time requirement in the specfile; a requirement on the appropriate NSS and NSPR .so files is automagically generated on build. From e59357c6c87871d7d4d79efbf883e9b8441b19c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Tue, 13 Feb 2018 14:31:53 +0100 Subject: [PATCH 665/844] Rebuild against newer gnome-desktop3 package --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index ab9e811..744c39e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.27.90 -Release: 2%{?dist} +Release: 3%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -506,6 +506,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Tue Feb 13 2018 Björn Esser - 3.27.90-3 +- Rebuild against newer gnome-desktop3 package + * Fri Feb 09 2018 Igor Gnatenko - 3.27.90-2 - Escape macros in %%changelog From 4680cdd201d78ed322afae33196a75633564a5f9 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Tue, 13 Feb 2018 23:20:51 +0100 Subject: [PATCH 666/844] Remove BuildRoot definition None of currently supported distributions need that. It was needed last for EL5 which is EOL now Signed-off-by: Igor Gnatenko --- evolution.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 744c39e..23df3fe 100644 --- a/evolution.spec +++ b/evolution.spec @@ -33,7 +33,6 @@ Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) Source: http://download.gnome.org/sources/%{name}/3.27/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} From 1371091dd158dee896f7118648af3c72f990f552 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Feb 2018 11:46:38 +0100 Subject: [PATCH 667/844] Update to 3.27.91 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b6bd819..5606cac 100644 --- a/.gitignore +++ b/.gitignore @@ -140,3 +140,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.3.tar.xz /evolution-3.27.4.tar.xz /evolution-3.27.90.tar.xz +/evolution-3.27.91.tar.xz diff --git a/evolution.spec b/evolution.spec index 23df3fe..e54b6b0 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,8 +27,8 @@ ### Abstract ### Name: evolution -Version: 3.27.90 -Release: 3%{?dist} +Version: 3.27.91 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -505,6 +505,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Feb 19 2018 Milan Crha - 3.27.91-1 +- Update to 3.27.91 + * Tue Feb 13 2018 Björn Esser - 3.27.90-3 - Rebuild against newer gnome-desktop3 package diff --git a/sources b/sources index fcba1c2..62ae2b0 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.90.tar.xz) = b4141efd72803726826ceb55141831d85845f430fd3b23a0ce3ddf72906770f4852d50ad997be279c488ee9a4f6c2a00c4351eb44b1a676a1f72f0fdd822aeab +SHA512 (evolution-3.27.91.tar.xz) = d78ffb6fdcf67e177f6ffefda3543d41abfbd73dcbd8940b0680f386393ff2a9836a39d69339bdac3995f5dfcdf561d73d71d20ac27f6dea1322827b1e2168f5 From ece73378e2af7ae832e736fc3fab8541c6b877da Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 19 Feb 2018 11:58:43 +0100 Subject: [PATCH 668/844] metainfo files installed into 'metainfo', not 'appdata' --- evolution.spec | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/evolution.spec b/evolution.spec index e54b6b0..8fbb068 100644 --- a/evolution.spec +++ b/evolution.spec @@ -327,7 +327,7 @@ grep -v "/usr/share/locale" evolution.lang > help.lang # The main executable %{_bindir}/evolution -%{_datadir}/appdata/org.gnome.Evolution.appdata.xml +%{_datadir}/metainfo/org.gnome.Evolution.appdata.xml # Desktop files: %{_datadir}/applications/org.gnome.Evolution.desktop @@ -487,15 +487,15 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %files bogofilter %{_libdir}/evolution/modules/module-bogofilter.so -%{_datadir}/appdata/org.gnome.Evolution-bogofilter.metainfo.xml +%{_datadir}/metainfo/org.gnome.Evolution-bogofilter.metainfo.xml %files spamassassin %{_libdir}/evolution/modules/module-spamassassin.so -%{_datadir}/appdata/org.gnome.Evolution-spamassassin.metainfo.xml +%{_datadir}/metainfo/org.gnome.Evolution-spamassassin.metainfo.xml %if %{libpst_support} %files pst -%{_datadir}/appdata/org.gnome.Evolution-pst.metainfo.xml +%{_datadir}/metainfo/org.gnome.Evolution-pst.metainfo.xml %{evo_plugin_dir}/org-gnome-pst-import.eplug %{evo_plugin_dir}/liborg-gnome-pst-import.so %endif From 08634aa4a7571c6f512168d293ed21f63fefac72 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 5 Mar 2018 11:57:54 +0100 Subject: [PATCH 669/844] Update to 3.27.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 5606cac..21d368e 100644 --- a/.gitignore +++ b/.gitignore @@ -141,3 +141,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.4.tar.xz /evolution-3.27.90.tar.xz /evolution-3.27.91.tar.xz +/evolution-3.27.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 8fbb068..038c130 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.27.91 +Version: 3.27.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -505,6 +505,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Mar 05 2018 Milan Crha - 3.27.92-1 +- Update to 3.27.92 + * Mon Feb 19 2018 Milan Crha - 3.27.91-1 - Update to 3.27.91 diff --git a/sources b/sources index 62ae2b0..7f6ebe5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.91.tar.xz) = d78ffb6fdcf67e177f6ffefda3543d41abfbd73dcbd8940b0680f386393ff2a9836a39d69339bdac3995f5dfcdf561d73d71d20ac27f6dea1322827b1e2168f5 +SHA512 (evolution-3.27.92.tar.xz) = 42f6ce9cca88a5358480108c296b11b27448a1d3e3fe5e25ed2c996cfcddecd0197c3d396a6f5a1777d402a51d5d39b60f333c4ea89a4257a86ec33f93eddb10 From b35ae4759d45df1b66809b86ff948654baea8a93 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 12 Mar 2018 10:28:57 +0100 Subject: [PATCH 670/844] Update to 3.28.0 --- .gitignore | 1 + evolution.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 21d368e..f3a7d27 100644 --- a/.gitignore +++ b/.gitignore @@ -142,3 +142,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.90.tar.xz /evolution-3.27.91.tar.xz /evolution-3.27.92.tar.xz +/evolution-3.28.0.tar.xz diff --git a/evolution.spec b/evolution.spec index 038c130..5c94517 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,13 +27,13 @@ ### Abstract ### Name: evolution -Version: 3.27.92 +Version: 3.28.0 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.27/%{name}-%{version}.tar.xz +Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -505,6 +505,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Mar 12 2018 Milan Crha - 3.28.0-1 +- Update to 3.28.0 + * Mon Mar 05 2018 Milan Crha - 3.27.92-1 - Update to 3.27.92 diff --git a/sources b/sources index 7f6ebe5..05a8544 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.27.92.tar.xz) = 42f6ce9cca88a5358480108c296b11b27448a1d3e3fe5e25ed2c996cfcddecd0197c3d396a6f5a1777d402a51d5d39b60f333c4ea89a4257a86ec33f93eddb10 +SHA512 (evolution-3.28.0.tar.xz) = 1282726e7a576cab6d78d0f9ac1d23162e4958cd9d448a3285767f7a0d8591f13cdb93435fa3b492d168f47e5d4313e36b8864fd07502da8654368e0141dd09c From 0826fc41c29882c5e965e434aaec5516303e31c5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 9 Apr 2018 12:16:22 +0200 Subject: [PATCH 671/844] Update to 3.28.1 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index f3a7d27..523e09a 100644 --- a/.gitignore +++ b/.gitignore @@ -143,3 +143,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.91.tar.xz /evolution-3.27.92.tar.xz /evolution-3.28.0.tar.xz +/evolution-3.28.1.tar.xz diff --git a/evolution.spec b/evolution.spec index 5c94517..f4c4e03 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.28.0 +Version: 3.28.1 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -505,6 +505,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Apr 09 2018 Milan Crha - 3.28.1-1 +- Update to 3.28.1 + * Mon Mar 12 2018 Milan Crha - 3.28.0-1 - Update to 3.28.0 diff --git a/sources b/sources index 05a8544..052d166 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.28.0.tar.xz) = 1282726e7a576cab6d78d0f9ac1d23162e4958cd9d448a3285767f7a0d8591f13cdb93435fa3b492d168f47e5d4313e36b8864fd07502da8654368e0141dd09c +SHA512 (evolution-3.28.1.tar.xz) = 8567d5c8563a30b006f9f7dae1c1b3ce76b517526730b1cef1f367f9dccf66e0dd6adc50281331839c04be344be1d60343418ad584c21219659fa547cb9656ea From 4db821e61fc01e2a150d2a72485182c2865b98be Mon Sep 17 00:00:00 2001 From: Adam Williamson Date: Tue, 10 Apr 2018 12:01:24 -0700 Subject: [PATCH 672/844] Backport fix to strip closing > from URLs when linkifying --- evolution-3.28.1-angle-bracket-url.patch | 26 ++++++++++++++++++++++++ evolution.spec | 12 ++++++++--- 2 files changed, 35 insertions(+), 3 deletions(-) create mode 100644 evolution-3.28.1-angle-bracket-url.patch diff --git a/evolution-3.28.1-angle-bracket-url.patch b/evolution-3.28.1-angle-bracket-url.patch new file mode 100644 index 0000000..2a402ff --- /dev/null +++ b/evolution-3.28.1-angle-bracket-url.patch @@ -0,0 +1,26 @@ +From 8df33a2da490f1201da01f2d959b515e3d98ae9f Mon Sep 17 00:00:00 2001 +From: Milan Crha +Date: Tue, 10 Apr 2018 16:08:28 +0200 +Subject: Bug 795108 - Trailing bracket not stripped when linkifying URL inside + angle brackets + +--- + src/modules/webkit-editor/web-extension/e-editor-dom-functions.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h +index 071c48e..4191d2c 100644 +--- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h ++++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h +@@ -31,7 +31,7 @@ + #define URL_PATTERN "((?:(?:(?:" URL_PROTOCOLS ")\\:\\/\\/)|(?:www\\.|ftp\\.))[^\\s\\/\\$\\.\\?#].[^\\s]*+)" + #define URL_PATTERN_SPACE URL_PATTERN "\\s$" + /* Taken from camel-url-scanner.c */ +-#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\"" ++#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\">" + + /* http://www.w3.org/TR/html5/forms.html#valid-e-mail-address */ + #define E_MAIL_PATTERN \ +-- +cgit v0.12 + diff --git a/evolution.spec b/evolution.spec index f4c4e03..d9389c6 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,13 +28,17 @@ Name: evolution Version: 3.28.1 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz +# Backport upstream fix for stripping closing > from URLs when linkifying +# https://git.gnome.org/browse/evolution/commit/?id=8df33a2da490f1201da01f2d959b515e3d98ae9f +Patch0: evolution-3.28.1-angle-bracket-url.patch + Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} @@ -211,8 +215,7 @@ The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. %prep -%setup -q -n evolution-%{version} -#%patch01 -p1 -b .doc-e-cell-renderer-color +%autosetup -p1 -n evolution-%{version} # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do @@ -505,6 +508,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Tue Apr 10 2018 Adam Williamson - 3.28.1-2 +- Backport fix to strip closing > from URLs when linkifying (BGO#795108) + * Mon Apr 09 2018 Milan Crha - 3.28.1-1 - Update to 3.28.1 From 5fe8ed1ba0834d5cb14f933248ec6f455566eb20 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Apr 2018 12:42:33 +0200 Subject: [PATCH 673/844] Update to 3.29.1 --- .gitignore | 1 + evolution-3.28.1-angle-bracket-url.patch | 26 ------------------------ evolution.spec | 19 ++++++++--------- sources | 2 +- 4 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 evolution-3.28.1-angle-bracket-url.patch diff --git a/.gitignore b/.gitignore index 523e09a..4db1dce 100644 --- a/.gitignore +++ b/.gitignore @@ -144,3 +144,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.27.92.tar.xz /evolution-3.28.0.tar.xz /evolution-3.28.1.tar.xz +/evolution-3.29.1.tar.xz diff --git a/evolution-3.28.1-angle-bracket-url.patch b/evolution-3.28.1-angle-bracket-url.patch deleted file mode 100644 index 2a402ff..0000000 --- a/evolution-3.28.1-angle-bracket-url.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 8df33a2da490f1201da01f2d959b515e3d98ae9f Mon Sep 17 00:00:00 2001 -From: Milan Crha -Date: Tue, 10 Apr 2018 16:08:28 +0200 -Subject: Bug 795108 - Trailing bracket not stripped when linkifying URL inside - angle brackets - ---- - src/modules/webkit-editor/web-extension/e-editor-dom-functions.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -index 071c48e..4191d2c 100644 ---- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -+++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.h -@@ -31,7 +31,7 @@ - #define URL_PATTERN "((?:(?:(?:" URL_PROTOCOLS ")\\:\\/\\/)|(?:www\\.|ftp\\.))[^\\s\\/\\$\\.\\?#].[^\\s]*+)" - #define URL_PATTERN_SPACE URL_PATTERN "\\s$" - /* Taken from camel-url-scanner.c */ --#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\"" -+#define URL_INVALID_TRAILING_CHARS ",.:;?!-|}])\">" - - /* http://www.w3.org/TR/html5/forms.html#valid-e-mail-address */ - #define E_MAIL_PATTERN \ --- -cgit v0.12 - diff --git a/evolution.spec b/evolution.spec index d9389c6..1746b42 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,17 +27,13 @@ ### Abstract ### Name: evolution -Version: 3.28.1 -Release: 2%{?dist} +Version: 3.29.1 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution -Source: http://download.gnome.org/sources/%{name}/3.28/%{name}-%{version}.tar.xz - -# Backport upstream fix for stripping closing > from URLs when linkifying -# https://git.gnome.org/browse/evolution/commit/?id=8df33a2da490f1201da01f2d959b515e3d98ae9f -Patch0: evolution-3.28.1-angle-bracket-url.patch +Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} @@ -48,9 +44,6 @@ Obsoletes: evolution-perl < %{last_evo_perl_version} ### Patches ### -# RH bug # -#Patch01: evolution-3.17.1-doc-e-cell-renderer-color.patch - ## Dependencies ### Requires: evolution-data-server >= %{eds_version} @@ -215,7 +208,7 @@ The %{name}-tests package contains tests that can be used to verify the functionality of the installed %{name} package. %prep -%autosetup -p1 -n evolution-%{version} +%setup -q -n evolution-%{version} # Remove the welcome email from Novell for inbox in src/mail/default/*/Inbox; do @@ -508,6 +501,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Apr 16 2018 Milan Crha - 3.29.1-1 +- Update to 3.29.1 +- Remove fix to strip closing > from URLs when linkifying (BGO#795108) (Fixed upstream) + * Tue Apr 10 2018 Adam Williamson - 3.28.1-2 - Backport fix to strip closing > from URLs when linkifying (BGO#795108) diff --git a/sources b/sources index 052d166..7f4737b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.28.1.tar.xz) = 8567d5c8563a30b006f9f7dae1c1b3ce76b517526730b1cef1f367f9dccf66e0dd6adc50281331839c04be344be1d60343418ad584c21219659fa547cb9656ea +SHA512 (evolution-3.29.1.tar.xz) = 917b6aa6854e7ae2d157316821e436fedfcf7ab266e19fd9264ee7d315801214e94a98edeff8f2298c0fbd257e99b91fc05e74dcab453c5d017719a8dee43dc9 From 07b198b7d7b2ecc21cbd2c494ecf3d08e5fe4e0b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 21 May 2018 12:34:44 +0200 Subject: [PATCH 674/844] Update to 3.29.2 --- .gitignore | 1 + evolution.spec | 13 ++++++++----- sources | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4db1dce..4fae180 100644 --- a/.gitignore +++ b/.gitignore @@ -145,3 +145,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.28.0.tar.xz /evolution-3.28.1.tar.xz /evolution-3.29.1.tar.xz +/evolution-3.29.2.tar.xz diff --git a/evolution.spec b/evolution.spec index 1746b42..01d9281 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.29.1 +Version: 3.29.2 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -35,6 +35,8 @@ License: GPLv2+ and GFDL URL: https://wiki.gnome.org/Apps/Evolution Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz +### Patches ### + Obsoletes: anjal <= %{last_anjal_version} Obsoletes: libgal2 <= %{last_libgal2_version} Obsoletes: evolution-NetworkManager < %{last_evo_nm_version} @@ -42,8 +44,6 @@ Obsoletes: evolution-perl < %{last_evo_perl_version} %global eds_version %{version} -### Patches ### - ## Dependencies ### Requires: evolution-data-server >= %{eds_version} @@ -327,7 +327,6 @@ grep -v "/usr/share/locale" evolution.lang > help.lang # Desktop files: %{_datadir}/applications/org.gnome.Evolution.desktop -%{_sysconfdir}/xdg/autostart/org.gnome.Evolution-alarm-notify.desktop # Icons: %{_datadir}/icons/hicolor/16x16/apps/* @@ -381,6 +380,8 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_libdir}/evolution/modules/module-webkit-editor.so %{_libdir}/evolution/modules/module-webkit-inspector.so +%{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so + # Shared libraries: %{_libdir}/evolution/libevolution-mail-composer.so %{_libdir}/evolution/libeabutil.so @@ -409,7 +410,6 @@ grep -v "/usr/share/locale" evolution.lang > help.lang # Various libexec programs: %dir %{_libexecdir}/evolution -%{_libexecdir}/evolution/evolution-alarm-notify %{_libexecdir}/evolution/evolution-backup %{_libexecdir}/evolution/killev @@ -501,6 +501,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon May 21 2018 Milan Crha - 3.29.2-1 +- Update to 3.29.2 + * Mon Apr 16 2018 Milan Crha - 3.29.1-1 - Update to 3.29.1 - Remove fix to strip closing > from URLs when linkifying (BGO#795108) (Fixed upstream) diff --git a/sources b/sources index 7f4737b..27dc2d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.29.1.tar.xz) = 917b6aa6854e7ae2d157316821e436fedfcf7ab266e19fd9264ee7d315801214e94a98edeff8f2298c0fbd257e99b91fc05e74dcab453c5d017719a8dee43dc9 +SHA512 (evolution-3.29.2.tar.xz) = 350e5b0aa71626b9c27e74d68d6f771e89b558b5a48dfaa71c86689de5d4d211230be4558b069575deb29f5521bf9403f79d733cacaf6c6ccaf3ef9f17246b6c From 274681f2066852c664881ff3b03274128c516023 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 18 Jun 2018 10:40:59 +0200 Subject: [PATCH 675/844] Update to 3.29.3 --- .gitignore | 1 + evolution.spec | 7 ++++--- sources | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 4fae180..1cd2d43 100644 --- a/.gitignore +++ b/.gitignore @@ -146,3 +146,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.28.1.tar.xz /evolution-3.29.1.tar.xz /evolution-3.29.2.tar.xz +/evolution-3.29.3.tar.xz diff --git a/evolution.spec b/evolution.spec index 01d9281..8cbf7aa 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ ### Abstract ### Name: evolution -Version: 3.29.2 +Version: 3.29.3 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -67,7 +67,6 @@ BuildRequires: yelp-tools BuildRequires: pkgconfig(atk) BuildRequires: pkgconfig(cairo-gobject) BuildRequires: pkgconfig(camel-1.2) >= %{eds_version} -BuildRequires: pkgconfig(cryptui-0.0) BuildRequires: pkgconfig(enchant) BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version} BuildRequires: pkgconfig(gcr-3) @@ -120,7 +119,6 @@ Group: Development/Libraries Summary: Development files for building against %{name} Requires: %{name} = %{version}-%{release} Requires: pkgconfig(camel-1.2) >= %{eds_version} -Requires: pkgconfig(cryptui-0.0) Requires: pkgconfig(enchant) Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version} Requires: pkgconfig(gtkspell3-3.0) @@ -501,6 +499,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Jun 18 2018 Milan Crha - 3.29.3-1 +- Update to 3.29.3 + * Mon May 21 2018 Milan Crha - 3.29.2-1 - Update to 3.29.2 diff --git a/sources b/sources index 27dc2d5..7010a65 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.29.2.tar.xz) = 350e5b0aa71626b9c27e74d68d6f771e89b558b5a48dfaa71c86689de5d4d211230be4558b069575deb29f5521bf9403f79d733cacaf6c6ccaf3ef9f17246b6c +SHA512 (evolution-3.29.3.tar.xz) = 308c4add0ecafcddf426295896e6ecba32ac2b73cae0546600fddbe0d0dbd878ed8b2cf80e78cbb89b89297303089940831db95d99e94557f46c59673cc15ffb From c58ae334a2a9125c678e84379ca212768e638d7f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 00:12:35 +0000 Subject: [PATCH 676/844] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- evolution.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index 8cbf7aa..25a4dee 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ Name: evolution Version: 3.29.3 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -499,6 +499,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 3.29.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Mon Jun 18 2018 Milan Crha - 3.29.3-1 - Update to 3.29.3 From f57fa988d1b9df84155ee67d1be820695cc3223c Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 16 Jul 2018 12:17:20 +0200 Subject: [PATCH 677/844] Update to 3.29.4; Change dependencies of the tests subpackage and do not precompile the scripts there --- .gitignore | 1 + evolution.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 1cd2d43..38abbe7 100644 --- a/.gitignore +++ b/.gitignore @@ -147,3 +147,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.29.1.tar.xz /evolution-3.29.2.tar.xz /evolution-3.29.3.tar.xz +/evolution-3.29.4.tar.xz diff --git a/evolution.spec b/evolution.spec index 25a4dee..b425c65 100644 --- a/evolution.spec +++ b/evolution.spec @@ -1,4 +1,5 @@ %global _changelog_trimtime %(date +%s -d "1 year ago") +%global _python_bytecompile_extra 0 %define glib2_version 2.46.0 %define gtk3_version 3.10.0 @@ -27,8 +28,8 @@ ### Abstract ### Name: evolution -Version: 3.29.3 -Release: 2%{?dist} +Version: 3.29.4 +Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -200,6 +201,8 @@ This package contains the plugin to import Microsoft Personal Storage Table Summary: Tests for the %{name} package Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} +Requires: python2-behave +Requires: python2-dogtail %description tests The %{name}-tests package contains tests that can be used to verify @@ -499,6 +502,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Jul 16 2018 Milan Crha - 3.29.4-1 +- Update to 3.29.4 +- Change dependencies of the tests subpackage and do not precompile the scripts there + * Fri Jul 13 2018 Fedora Release Engineering - 3.29.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index 7010a65..118b728 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.29.3.tar.xz) = 308c4add0ecafcddf426295896e6ecba32ac2b73cae0546600fddbe0d0dbd878ed8b2cf80e78cbb89b89297303089940831db95d99e94557f46c59673cc15ffb +SHA512 (evolution-3.29.4.tar.xz) = 37315cafd0016d69b5a19a34a00dfd6d4c2743dda1b891179f4cfc430b7730c214cf032f2f9a25363ff459067fb6255801bf9c606f8407af038ad25d0b680c39 From 3278e47c9507ec9bc856cf15101cafe20d06592b Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Jul 2018 15:08:27 +0200 Subject: [PATCH 678/844] Update to 3.29.90 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 38abbe7..3b5c870 100644 --- a/.gitignore +++ b/.gitignore @@ -148,3 +148,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.29.2.tar.xz /evolution-3.29.3.tar.xz /evolution-3.29.4.tar.xz +/evolution-3.29.90.tar.xz diff --git a/evolution.spec b/evolution.spec index b425c65..bdfc041 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.29.4 +Version: 3.29.90 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -502,6 +502,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Jul 30 2018 Milan Crha - 3.29.90-1 +- Update to 3.29.90 + * Mon Jul 16 2018 Milan Crha - 3.29.4-1 - Update to 3.29.4 - Change dependencies of the tests subpackage and do not precompile the scripts there diff --git a/sources b/sources index 118b728..9de4bcd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.29.4.tar.xz) = 37315cafd0016d69b5a19a34a00dfd6d4c2743dda1b891179f4cfc430b7730c214cf032f2f9a25363ff459067fb6255801bf9c606f8407af038ad25d0b680c39 +SHA512 (evolution-3.29.90.tar.xz) = 0ff260dd2ca58d3e5729ead748deae340b8a229208ceb7c614185b05f43655c86b8718f951538a21e34e7585cdd91a90a8987714e17f47c6c31d4018e73064e3 From 5a2e3fe03c60b5c5f934a96b2d6eeca3a954d213 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 30 Jul 2018 15:48:15 +0200 Subject: [PATCH 679/844] module-book-config-webdav.so renamed to module-book-config-carddav.so --- evolution.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/evolution.spec b/evolution.spec index bdfc041..78fadc8 100644 --- a/evolution.spec +++ b/evolution.spec @@ -349,10 +349,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_libdir}/evolution/modules/module-accounts-window.so %{_libdir}/evolution/modules/module-addressbook.so %{_libdir}/evolution/modules/module-backup-restore.so +%{_libdir}/evolution/modules/module-book-config-carddav.so %{_libdir}/evolution/modules/module-book-config-google.so %{_libdir}/evolution/modules/module-book-config-ldap.so %{_libdir}/evolution/modules/module-book-config-local.so -%{_libdir}/evolution/modules/module-book-config-webdav.so %{_libdir}/evolution/modules/module-cal-config-caldav.so %{_libdir}/evolution/modules/module-cal-config-contacts.so %{_libdir}/evolution/modules/module-cal-config-google.so From 4c0576c0e9b92f5beeb09ebab094cbe50326cf76 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 13 Aug 2018 12:36:50 +0200 Subject: [PATCH 680/844] Update to 3.29.91 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 3b5c870..b742433 100644 --- a/.gitignore +++ b/.gitignore @@ -149,3 +149,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.29.3.tar.xz /evolution-3.29.4.tar.xz /evolution-3.29.90.tar.xz +/evolution-3.29.91.tar.xz diff --git a/evolution.spec b/evolution.spec index 78fadc8..0cfecf9 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.29.90 +Version: 3.29.91 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -502,6 +502,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Aug 13 2018 Milan Crha - 3.29.91-1 +- Update to 3.29.91 + * Mon Jul 30 2018 Milan Crha - 3.29.90-1 - Update to 3.29.90 diff --git a/sources b/sources index 9de4bcd..8d4f808 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.29.90.tar.xz) = 0ff260dd2ca58d3e5729ead748deae340b8a229208ceb7c614185b05f43655c86b8718f951538a21e34e7585cdd91a90a8987714e17f47c6c31d4018e73064e3 +SHA512 (evolution-3.29.91.tar.xz) = 3b311d14f49ae4c90abf996693f2fdb9104913dd655f9e96391921bbaff0cbb2230e3a1da6ac7c7a5c8a3c592a3fd91001b8b271d2d8c3f09e0d283b81877f68 From 2cbfa27cad2d9f22092e839ff44113548e7507e0 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 27 Aug 2018 11:26:42 +0200 Subject: [PATCH 681/844] Update to 3.29.92 --- .gitignore | 1 + evolution.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index b742433..d7de872 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.29.4.tar.xz /evolution-3.29.90.tar.xz /evolution-3.29.91.tar.xz +/evolution-3.29.92.tar.xz diff --git a/evolution.spec b/evolution.spec index 0cfecf9..bba697e 100644 --- a/evolution.spec +++ b/evolution.spec @@ -28,7 +28,7 @@ ### Abstract ### Name: evolution -Version: 3.29.91 +Version: 3.29.92 Release: 1%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME @@ -502,6 +502,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang %{_datadir}/installed-tests %changelog +* Mon Aug 27 2018 Milan Crha - 3.29.92-1 +- Update to 3.29.92 + * Mon Aug 13 2018 Milan Crha - 3.29.91-1 - Update to 3.29.91 diff --git a/sources b/sources index 8d4f808..8357f53 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (evolution-3.29.91.tar.xz) = 3b311d14f49ae4c90abf996693f2fdb9104913dd655f9e96391921bbaff0cbb2230e3a1da6ac7c7a5c8a3c592a3fd91001b8b271d2d8c3f09e0d283b81877f68 +SHA512 (evolution-3.29.92.tar.xz) = b667124b25261f875ad066445a103ad9d62602b1c25bee611b342dcd12175f19fecf7021739e5161afd579a5960321ebece3cfb06b409db2e304c88ab26a5032 From 35f1854fc3e5c991332f9735686b29205d54180d Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 3 Sep 2018 10:04:16 +0200 Subject: [PATCH 682/844] Update to 3.30.0; Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels) --- .gitignore | 1 + evolution-3.30.0-evo-issue-86.patch | 340 ++++++++++++++++++++++++++++ evolution.spec | 12 +- sources | 2 +- 4 files changed, 352 insertions(+), 3 deletions(-) create mode 100644 evolution-3.30.0-evo-issue-86.patch diff --git a/.gitignore b/.gitignore index d7de872..b53a4ba 100644 --- a/.gitignore +++ b/.gitignore @@ -151,3 +151,4 @@ evolution-2.31.5.tar.bz2 /evolution-3.29.90.tar.xz /evolution-3.29.91.tar.xz /evolution-3.29.92.tar.xz +/evolution-3.30.0.tar.xz diff --git a/evolution-3.30.0-evo-issue-86.patch b/evolution-3.30.0-evo-issue-86.patch new file mode 100644 index 0000000..261cb02 --- /dev/null +++ b/evolution-3.30.0-evo-issue-86.patch @@ -0,0 +1,340 @@ +diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c +index ea3bf6f987..f89565f7e2 100644 +--- a/src/e-util/test-html-editor-units-bugs.c ++++ b/src/e-util/test-html-editor-units-bugs.c +@@ -1208,6 +1208,120 @@ test_bug_750636 (TestFixture *fixture) + g_test_fail (); + } + ++static void ++test_issue_86 (TestFixture *fixture) ++{ ++ const gchar *source_text = ++ "normal text\n" ++ "\n" ++ "> level 1\n" ++ "> level 1\n" ++ "> > level 2\n" ++ "> > level 2\n" ++ "> >\n" ++ "> > level 2\n" ++ ">\n" ++ "> level 1\n" ++ "> level 1\n" ++ ">\n" ++ "> > > level 3\n" ++ "> > > level 3\n" ++ ">\n" ++ "> > level 2\n" ++ "> > level 2\n" ++ ">\n" ++ "> level 1\n" ++ "\n" ++ "back normal text\n"; ++ gchar *converted, *to_insert; ++ ++ if (!test_utils_process_commands (fixture, ++ "mode:html\n")) { ++ g_test_fail (); ++ return; ++ } ++ ++ converted = camel_text_to_html (source_text, ++ CAMEL_MIME_FILTER_TOHTML_PRE | ++ CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS | ++ CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES | ++ CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION, ++ 0xDDDDDD); ++ ++ g_return_if_fail (converted != NULL); ++ ++ to_insert = g_strconcat (converted, ++ "" ++ "", ++ NULL); ++ ++ test_utils_insert_content (fixture, to_insert, ++ E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML); ++ ++ if (!test_utils_run_simple_test (fixture, ++ "", ++ HTML_PREFIX "
On Today, User wrote:
" ++ "
" ++ "
normal text
" ++ "

" ++ "
" ++ "
level 1
" ++ "
level 1
" ++ "
" ++ "
level 2
" ++ "
level 2
" ++ "

" ++ "
level 2
" ++ "
" ++ "

" ++ "
level 1
" ++ "
level 1
" ++ "

" ++ "
" ++ "
" ++ "
level 3
" ++ "
level 3
" ++ "
" ++ "
" ++ "

" ++ "
" ++ "
level 2
" ++ "
level 2
" ++ "
" ++ "

" ++ "
level 1
" ++ "
" ++ "

" ++ "
back normal text
" ++ "
" HTML_SUFFIX, ++ "On Today, User wrote:\n" ++ "> normal text\n" ++ "> \n" ++ "> > level 1\n" ++ "> > level 1\n" ++ "> > > level 2\n" ++ "> > > level 2\n" ++ "> > > \n" ++ "> > > level 2\n" ++ "> > \n" ++ "> > level 1\n" ++ "> > level 1\n" ++ "> > \n" ++ "> > > > level 3\n" ++ "> > > > level 3\n" ++ "> > \n" ++ "> > > level 2\n" ++ "> > > level 2\n" ++ "> > \n" ++ "> > level 1\n" ++ "> \n" ++ "> back normal text")) ++ g_test_fail (); ++ ++ g_free (to_insert); ++ g_free (converted); ++} ++ + void + test_add_html_editor_bug_tests (void) + { +@@ -1237,4 +1351,5 @@ test_add_html_editor_bug_tests (void) + test_utils_add_test ("/bug/780088", test_bug_780088); + test_utils_add_test ("/bug/788829", test_bug_788829); + test_utils_add_test ("/bug/750636", test_bug_750636); ++ test_utils_add_test ("/issue/86", test_issue_86); + } +diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c +index bdef1ccf57..71d80ae5a7 100644 +--- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c ++++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c +@@ -6230,7 +6230,6 @@ e_editor_dom_convert_content (EEditorPage *editor_page, + WEBKIT_DOM_NODE (content_wrapper), + WEBKIT_DOM_NODE (e_editor_dom_prepare_paragraph (editor_page, FALSE)), + NULL); +- + if (!cite_body) { + if (!empty) { + WebKitDOMNode *child; +@@ -8804,6 +8803,133 @@ e_editor_dom_adapt_to_editor_dom_changes (EEditorPage *editor_page) + g_clear_object (&collection); + } + ++static void ++traverse_nodes_to_split_pre (WebKitDOMDocument *document, ++ WebKitDOMNode *node, ++ WebKitDOMNode *new_parent, /* can be NULL, then prepend to out_new_nodes */ ++ gboolean is_in_pre, ++ GSList **out_new_nodes) /* WebKitDOMNode * */ ++{ ++ if (is_in_pre && WEBKIT_DOM_IS_TEXT (node)) { ++ gchar *text; ++ ++ text = webkit_dom_text_get_whole_text (WEBKIT_DOM_TEXT (node)); ++ if (text) { ++ WebKitDOMElement *pre; ++ gint ii; ++ gchar **strv; ++ ++ strv = g_strsplit (text, "\n", -1); ++ ++ for (ii = 0; strv && strv[ii]; ii++) { ++ if (*(strv[ii])) { ++ gint len = strlen (strv[ii]); ++ ++ if (strv[ii][len - 1] == '\r') { ++ strv[ii][len - 1] = '\0'; ++ } ++ } ++ ++ /* 
 is shown as a block, thus adding a new line at the end behaves like two 
-s */
++				if (!*(strv[ii]) && !strv[ii + 1])
++					break;
++
++				pre = webkit_dom_document_create_element (document, "pre", NULL);
++
++				if (*(strv[ii])) {
++					webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre), strv[ii], NULL);
++				} else {
++					WebKitDOMElement *br;
++
++					br = webkit_dom_document_create_element (document, "br", NULL);
++					webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);
++				}
++
++				if (new_parent)
++					webkit_dom_node_append_child (new_parent, WEBKIT_DOM_NODE (pre), NULL);
++				else
++					*out_new_nodes = g_slist_prepend (*out_new_nodes, pre);
++			}
++
++			g_strfreev (strv);
++		}
++
++		g_free (text);
++	} else if (WEBKIT_DOM_IS_HTML_PRE_ELEMENT (node)) {
++		is_in_pre = TRUE;
++	} else {
++		WebKitDOMNode *nd;
++		GError *error = NULL;
++
++		nd = webkit_dom_node_clone_node_with_error (node, FALSE, &error);
++		if (nd) {
++			if (new_parent)
++				webkit_dom_node_append_child (new_parent, nd, NULL);
++			else
++				*out_new_nodes = g_slist_prepend (*out_new_nodes, nd);
++
++			new_parent = nd;
++		} else {
++			g_warning ("%s: Failed to clone node %s: %s\n", G_STRFUNC, G_OBJECT_TYPE_NAME (node), error ? error->message : "Unknown error");
++		}
++	}
++
++	for (node = webkit_dom_node_get_first_child (node);
++	     node;
++	     node = webkit_dom_node_get_next_sibling (node)) {
++		traverse_nodes_to_split_pre (document, node, new_parent, is_in_pre, out_new_nodes);
++	}
++}
++
++static void
++maybe_split_pre_paragraphs (WebKitDOMDocument *document)
++{
++	WebKitDOMHTMLElement *body;
++	WebKitDOMNodeList *list;
++
++	body = webkit_dom_document_get_body (document);
++	if (!body)
++		return;
++
++	list = webkit_dom_document_query_selector_all (document, "pre", NULL);
++	if (webkit_dom_node_list_get_length (list)) {
++		WebKitDOMNode *body_node, *node, *current;
++		GSList *new_nodes = NULL, *to_remove = NULL, *link;
++
++		g_clear_object (&list);
++
++		body_node = WEBKIT_DOM_NODE (body);
++		webkit_dom_node_normalize (body_node);
++
++		for (current = webkit_dom_node_get_first_child (body_node);
++		     current;
++		     current = webkit_dom_node_get_next_sibling (current)) {
++			traverse_nodes_to_split_pre (document, current, NULL, FALSE, &new_nodes);
++			to_remove = g_slist_prepend (to_remove, current);
++		}
++
++		for (link = to_remove; link; link = g_slist_next (link)) {
++			node = link->data;
++
++			webkit_dom_node_remove_child (body_node, node, NULL);
++		}
++
++		/* They are in reverse order, thus reverse it */
++		new_nodes = g_slist_reverse (new_nodes);
++
++		for (link = new_nodes; link; link = g_slist_next (link)) {
++			node = link->data;
++
++			webkit_dom_node_append_child (body_node, node, NULL);
++		}
++
++		g_slist_free (to_remove);
++		g_slist_free (new_nodes);
++	}
++
++	g_clear_object (&list);
++}
++
+ void
+ e_editor_dom_process_content_after_load (EEditorPage *editor_page)
+ {
+@@ -8853,60 +8979,8 @@ e_editor_dom_process_content_after_load (EEditorPage *editor_page)
+ 		}
+ 
+ 		goto out;
+-	} else {
+-		WebKitDOMNodeList *list;
+-		gulong ii;
+-
+-		list = webkit_dom_document_query_selector_all (document, "pre", NULL);
+-		for (ii = webkit_dom_node_list_get_length (list); ii--;) {
+-			WebKitDOMNode *node = webkit_dom_node_list_item (list, ii), *parent;
+-			WebKitDOMElement *element;
+-			gchar *inner_html;
+-
+-			element = WEBKIT_DOM_ELEMENT (node);
+-			parent = webkit_dom_node_get_parent_node (node);
+-			inner_html = webkit_dom_element_get_inner_html (element);
+-
+-			if (inner_html && *inner_html) {
+-				gchar **strv;
+-
+-				strv = g_strsplit (inner_html, "\n", -1);
+-				if (strv && strv[0] && strv[1]) {
+-					WebKitDOMElement *pre;
+-					gint jj;
+-
+-					for (jj = 0; strv[jj]; jj++) {
+-						pre = webkit_dom_document_create_element (document, "pre", NULL);
+-						if (*(strv[jj])) {
+-							gint len = strlen (strv[jj]);
+-
+-							if (strv[jj][len - 1] == '\r') {
+-								strv[jj][len - 1] = '\0';
+-							}
+-						}
+-
+-						if (*(strv[jj])) {
+-							webkit_dom_html_element_set_inner_html (WEBKIT_DOM_HTML_ELEMENT (pre), strv[jj], NULL);
+-						} else {
+-							WebKitDOMElement *br;
+-
+-							br = webkit_dom_document_create_element (document, "br", NULL);
+-							webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);
+-						}
+-
+-						webkit_dom_node_insert_before (parent, WEBKIT_DOM_NODE (pre), node, NULL);
+-					}
+-
+-					remove_node (node);
+-				}
+-
+-				g_strfreev (strv);
+-			}
+-
+-			g_free (inner_html);
+-		}
+-
+-		g_clear_object (&list);
++	} else if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (body), "data-evo-draft")) {
++		maybe_split_pre_paragraphs (document);
+ 	}
+ 
+ 	e_editor_dom_adapt_to_editor_dom_changes (editor_page);
diff --git a/evolution.spec b/evolution.spec
index bba697e..8f03e99 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -28,16 +28,18 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.29.92
+Version: 3.30.0
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.29/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
 
 ### Patches ###
 
+Patch01: evolution-3.30.0-evo-issue-86.patch
+
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -211,6 +213,8 @@ the functionality of the installed %{name} package.
 %prep
 %setup -q -n evolution-%{version}
 
+%patch01 -p1 -b .evo-issue-86
+
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
   echo -n "" > $inbox
@@ -502,6 +506,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{_datadir}/installed-tests
 
 %changelog
+* Mon Sep 03 2018 Milan Crha  - 3.30.0-1
+- Update to 3.30.0
+- Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels)
+
 * Mon Aug 27 2018 Milan Crha  - 3.29.92-1
 - Update to 3.29.92
 
diff --git a/sources b/sources
index 8357f53..6ef8d59 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.29.92.tar.xz) = b667124b25261f875ad066445a103ad9d62602b1c25bee611b342dcd12175f19fecf7021739e5161afd579a5960321ebece3cfb06b409db2e304c88ab26a5032
+SHA512 (evolution-3.30.0.tar.xz) = 15a28dc4cd3b4a194deadd7bb205e9942f193f8f5894e2cdd83e71404535cd9c43223e38d59eaa5dc9cdc977c057ee4f155df397e56079daa8432a6414010a01

From e3f54b98d3a732af5fa5651144f570f83ec89a42 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 24 Sep 2018 09:53:03 +0200
Subject: [PATCH 683/844] Update to 3.30.1

- Remove patch for GNOME Evolution issue #86 (fixed upstream)
- Disable tests subpackage - it uses python2 and it is unmaintained upstream
- Remove BuildRequires on bogofilter and spamassassin
---
 .gitignore                          |   1 +
 evolution-3.30.0-evo-issue-86.patch | 340 ----------------------------
 evolution.spec                      |  30 ++-
 sources                             |   2 +-
 4 files changed, 22 insertions(+), 351 deletions(-)
 delete mode 100644 evolution-3.30.0-evo-issue-86.patch

diff --git a/.gitignore b/.gitignore
index b53a4ba..36929b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -152,3 +152,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.29.91.tar.xz
 /evolution-3.29.92.tar.xz
 /evolution-3.30.0.tar.xz
+/evolution-3.30.1.tar.xz
diff --git a/evolution-3.30.0-evo-issue-86.patch b/evolution-3.30.0-evo-issue-86.patch
deleted file mode 100644
index 261cb02..0000000
--- a/evolution-3.30.0-evo-issue-86.patch
+++ /dev/null
@@ -1,340 +0,0 @@
-diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c
-index ea3bf6f987..f89565f7e2 100644
---- a/src/e-util/test-html-editor-units-bugs.c
-+++ b/src/e-util/test-html-editor-units-bugs.c
-@@ -1208,6 +1208,120 @@ test_bug_750636 (TestFixture *fixture)
- 		g_test_fail ();
- }
- 
-+static void
-+test_issue_86 (TestFixture *fixture)
-+{
-+	const gchar *source_text =
-+		"normal text\n"
-+		"\n"
-+		"> level 1\n"
-+		"> level 1\n"
-+		"> > level 2\n"
-+		"> > level 2\n"
-+		"> >\n"
-+		"> > level 2\n"
-+		">\n"
-+		"> level 1\n"
-+		"> level 1\n"
-+		">\n"
-+		"> > > level 3\n"
-+		"> > > level 3\n"
-+		">\n"
-+		"> > level 2\n"
-+		"> > level 2\n"
-+		">\n"
-+		"> level 1\n"
-+		"\n"
-+		"back normal text\n";
-+	gchar *converted, *to_insert;
-+
-+	if (!test_utils_process_commands (fixture,
-+		"mode:html\n")) {
-+		g_test_fail ();
-+		return;
-+	}
-+
-+	converted = camel_text_to_html (source_text,
-+		CAMEL_MIME_FILTER_TOHTML_PRE |
-+		CAMEL_MIME_FILTER_TOHTML_CONVERT_URLS |
-+		CAMEL_MIME_FILTER_TOHTML_CONVERT_ADDRESSES |
-+		CAMEL_MIME_FILTER_TOHTML_QUOTE_CITATION,
-+		0xDDDDDD);
-+
-+	g_return_if_fail (converted != NULL);
-+
-+	to_insert = g_strconcat (converted,
-+		""
-+		"",
-+		NULL);
-+
-+	test_utils_insert_content (fixture, to_insert,
-+		E_CONTENT_EDITOR_INSERT_REPLACE_ALL | E_CONTENT_EDITOR_INSERT_TEXT_HTML);
-+
-+	if (!test_utils_run_simple_test (fixture,
-+		"",
-+		HTML_PREFIX "
On Today, User wrote:
"
-+		"
"
-+			"
normal text
"
-+			"

"
-+			"
"
-+				"
level 1
"
-+				"
level 1
"
-+				"
"
-+					"
level 2
"
-+					"
level 2
"
-+					"

"
-+					"
level 2
"
-+				"
"
-+				"

"
-+				"
level 1
"
-+				"
level 1
"
-+				"

"
-+				"
"
-+					"
"
-+						"
level 3
"
-+						"
level 3
"
-+					"
"
-+				"
"
-+				"

"
-+				"
"
-+					"
level 2
"
-+					"
level 2
"
-+				"
"
-+				"

"
-+				"
level 1
"
-+			"
"
-+			"

"
-+			"
back normal text
"
-+		"
" HTML_SUFFIX,
-+		"On Today, User wrote:\n"
-+		"> normal text\n"
-+		"> \n"
-+		"> > level 1\n"
-+		"> > level 1\n"
-+		"> > > level 2\n"
-+		"> > > level 2\n"
-+		"> > > \n"
-+		"> > > level 2\n"
-+		"> > \n"
-+		"> > level 1\n"
-+		"> > level 1\n"
-+		"> > \n"
-+		"> > > > level 3\n"
-+		"> > > > level 3\n"
-+		"> > \n"
-+		"> > > level 2\n"
-+		"> > > level 2\n"
-+		"> > \n"
-+		"> > level 1\n"
-+		"> \n"
-+		"> back normal text"))
-+		g_test_fail ();
-+
-+	g_free (to_insert);
-+	g_free (converted);
-+}
-+
- void
- test_add_html_editor_bug_tests (void)
- {
-@@ -1237,4 +1351,5 @@ test_add_html_editor_bug_tests (void)
- 	test_utils_add_test ("/bug/780088", test_bug_780088);
- 	test_utils_add_test ("/bug/788829", test_bug_788829);
- 	test_utils_add_test ("/bug/750636", test_bug_750636);
-+	test_utils_add_test ("/issue/86", test_issue_86);
- }
-diff --git a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
-index bdef1ccf57..71d80ae5a7 100644
---- a/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
-+++ b/src/modules/webkit-editor/web-extension/e-editor-dom-functions.c
-@@ -6230,7 +6230,6 @@ e_editor_dom_convert_content (EEditorPage *editor_page,
- 			WEBKIT_DOM_NODE (content_wrapper),
- 			WEBKIT_DOM_NODE (e_editor_dom_prepare_paragraph (editor_page, FALSE)),
- 			NULL);
--
- 	if (!cite_body) {
- 		if (!empty) {
- 			WebKitDOMNode *child;
-@@ -8804,6 +8803,133 @@ e_editor_dom_adapt_to_editor_dom_changes (EEditorPage *editor_page)
- 	g_clear_object (&collection);
- }
- 
-+static void
-+traverse_nodes_to_split_pre (WebKitDOMDocument *document,
-+			     WebKitDOMNode *node,
-+			     WebKitDOMNode *new_parent, /* can be NULL, then prepend to out_new_nodes */
-+			     gboolean is_in_pre,
-+			     GSList **out_new_nodes) /* WebKitDOMNode * */
-+{
-+	if (is_in_pre && WEBKIT_DOM_IS_TEXT (node)) {
-+		gchar *text;
-+
-+		text = webkit_dom_text_get_whole_text (WEBKIT_DOM_TEXT (node));
-+		if (text) {
-+			WebKitDOMElement *pre;
-+			gint ii;
-+			gchar **strv;
-+
-+			strv = g_strsplit (text, "\n", -1);
-+
-+			for (ii = 0; strv && strv[ii]; ii++) {
-+				if (*(strv[ii])) {
-+					gint len = strlen (strv[ii]);
-+
-+					if (strv[ii][len - 1] == '\r') {
-+						strv[ii][len - 1] = '\0';
-+					}
-+				}
-+
-+				/* 
 is shown as a block, thus adding a new line at the end behaves like two 
-s */
-+				if (!*(strv[ii]) && !strv[ii + 1])
-+					break;
-+
-+				pre = webkit_dom_document_create_element (document, "pre", NULL);
-+
-+				if (*(strv[ii])) {
-+					webkit_dom_html_element_set_inner_text (WEBKIT_DOM_HTML_ELEMENT (pre), strv[ii], NULL);
-+				} else {
-+					WebKitDOMElement *br;
-+
-+					br = webkit_dom_document_create_element (document, "br", NULL);
-+					webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);
-+				}
-+
-+				if (new_parent)
-+					webkit_dom_node_append_child (new_parent, WEBKIT_DOM_NODE (pre), NULL);
-+				else
-+					*out_new_nodes = g_slist_prepend (*out_new_nodes, pre);
-+			}
-+
-+			g_strfreev (strv);
-+		}
-+
-+		g_free (text);
-+	} else if (WEBKIT_DOM_IS_HTML_PRE_ELEMENT (node)) {
-+		is_in_pre = TRUE;
-+	} else {
-+		WebKitDOMNode *nd;
-+		GError *error = NULL;
-+
-+		nd = webkit_dom_node_clone_node_with_error (node, FALSE, &error);
-+		if (nd) {
-+			if (new_parent)
-+				webkit_dom_node_append_child (new_parent, nd, NULL);
-+			else
-+				*out_new_nodes = g_slist_prepend (*out_new_nodes, nd);
-+
-+			new_parent = nd;
-+		} else {
-+			g_warning ("%s: Failed to clone node %s: %s\n", G_STRFUNC, G_OBJECT_TYPE_NAME (node), error ? error->message : "Unknown error");
-+		}
-+	}
-+
-+	for (node = webkit_dom_node_get_first_child (node);
-+	     node;
-+	     node = webkit_dom_node_get_next_sibling (node)) {
-+		traverse_nodes_to_split_pre (document, node, new_parent, is_in_pre, out_new_nodes);
-+	}
-+}
-+
-+static void
-+maybe_split_pre_paragraphs (WebKitDOMDocument *document)
-+{
-+	WebKitDOMHTMLElement *body;
-+	WebKitDOMNodeList *list;
-+
-+	body = webkit_dom_document_get_body (document);
-+	if (!body)
-+		return;
-+
-+	list = webkit_dom_document_query_selector_all (document, "pre", NULL);
-+	if (webkit_dom_node_list_get_length (list)) {
-+		WebKitDOMNode *body_node, *node, *current;
-+		GSList *new_nodes = NULL, *to_remove = NULL, *link;
-+
-+		g_clear_object (&list);
-+
-+		body_node = WEBKIT_DOM_NODE (body);
-+		webkit_dom_node_normalize (body_node);
-+
-+		for (current = webkit_dom_node_get_first_child (body_node);
-+		     current;
-+		     current = webkit_dom_node_get_next_sibling (current)) {
-+			traverse_nodes_to_split_pre (document, current, NULL, FALSE, &new_nodes);
-+			to_remove = g_slist_prepend (to_remove, current);
-+		}
-+
-+		for (link = to_remove; link; link = g_slist_next (link)) {
-+			node = link->data;
-+
-+			webkit_dom_node_remove_child (body_node, node, NULL);
-+		}
-+
-+		/* They are in reverse order, thus reverse it */
-+		new_nodes = g_slist_reverse (new_nodes);
-+
-+		for (link = new_nodes; link; link = g_slist_next (link)) {
-+			node = link->data;
-+
-+			webkit_dom_node_append_child (body_node, node, NULL);
-+		}
-+
-+		g_slist_free (to_remove);
-+		g_slist_free (new_nodes);
-+	}
-+
-+	g_clear_object (&list);
-+}
-+
- void
- e_editor_dom_process_content_after_load (EEditorPage *editor_page)
- {
-@@ -8853,60 +8979,8 @@ e_editor_dom_process_content_after_load (EEditorPage *editor_page)
- 		}
- 
- 		goto out;
--	} else {
--		WebKitDOMNodeList *list;
--		gulong ii;
--
--		list = webkit_dom_document_query_selector_all (document, "pre", NULL);
--		for (ii = webkit_dom_node_list_get_length (list); ii--;) {
--			WebKitDOMNode *node = webkit_dom_node_list_item (list, ii), *parent;
--			WebKitDOMElement *element;
--			gchar *inner_html;
--
--			element = WEBKIT_DOM_ELEMENT (node);
--			parent = webkit_dom_node_get_parent_node (node);
--			inner_html = webkit_dom_element_get_inner_html (element);
--
--			if (inner_html && *inner_html) {
--				gchar **strv;
--
--				strv = g_strsplit (inner_html, "\n", -1);
--				if (strv && strv[0] && strv[1]) {
--					WebKitDOMElement *pre;
--					gint jj;
--
--					for (jj = 0; strv[jj]; jj++) {
--						pre = webkit_dom_document_create_element (document, "pre", NULL);
--						if (*(strv[jj])) {
--							gint len = strlen (strv[jj]);
--
--							if (strv[jj][len - 1] == '\r') {
--								strv[jj][len - 1] = '\0';
--							}
--						}
--
--						if (*(strv[jj])) {
--							webkit_dom_html_element_set_inner_html (WEBKIT_DOM_HTML_ELEMENT (pre), strv[jj], NULL);
--						} else {
--							WebKitDOMElement *br;
--
--							br = webkit_dom_document_create_element (document, "br", NULL);
--							webkit_dom_node_append_child (WEBKIT_DOM_NODE (pre), WEBKIT_DOM_NODE (br), NULL);
--						}
--
--						webkit_dom_node_insert_before (parent, WEBKIT_DOM_NODE (pre), node, NULL);
--					}
--
--					remove_node (node);
--				}
--
--				g_strfreev (strv);
--			}
--
--			g_free (inner_html);
--		}
--
--		g_clear_object (&list);
-+	} else if (!webkit_dom_element_has_attribute (WEBKIT_DOM_ELEMENT (body), "data-evo-draft")) {
-+		maybe_split_pre_paragraphs (document);
- 	}
- 
- 	e_editor_dom_adapt_to_editor_dom_changes (editor_page);
diff --git a/evolution.spec b/evolution.spec
index 8f03e99..b07f333 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,5 +1,6 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 %global _python_bytecompile_extra 0
+%global enable_installed_tests 0
 
 %define glib2_version 2.46.0
 %define gtk3_version 3.10.0
@@ -28,7 +29,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.30.0
+Version: 3.30.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -38,8 +39,6 @@ Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
 
 ### Patches ###
 
-Patch01: evolution-3.30.0-evo-issue-86.patch
-
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -173,7 +172,6 @@ Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: bogofilter
-BuildRequires: bogofilter
 
 %description bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
@@ -183,7 +181,6 @@ Group: Applications/Productivity
 Summary: SpamAssassin plugin for Evolution
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: spamassassin
-BuildRequires: spamassassin
 
 %description spamassassin
 This package contains the plugin to filter junk mail using SpamAssassin.
@@ -199,6 +196,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 (PST) files used by Microsoft Outlook and Microsoft Exchange.
 %endif
 
+%if %{enable_installed_tests}
 %package tests
 Summary: Tests for the %{name} package
 Group: Development/Libraries
@@ -209,11 +207,10 @@ Requires: python2-dogtail
 %description tests
 The %{name}-tests package contains tests that can be used to verify
 the functionality of the installed %{name} package.
+%endif
 
 %prep
-%setup -q -n evolution-%{version}
-
-%patch01 -p1 -b .evo-issue-86
+%setup -q -n %{name}-%{version}
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -245,15 +242,20 @@ fi
 %define gtkdoc_flags -DENABLE_GTK_DOC=OFF -DWITH_HELP=OFF
 %endif
 
+%if %{enable_installed_tests}
+%define tests_flags -DENABLE_INSTALLED_TESTS=ON
+%else
+%define tests_flags -DENABLE_INSTALLED_TESTS=OFF
+%endif
+
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
 
 %cmake -G "Unix Makefiles" \
 	-DENABLE_MAINTAINER_MODE=OFF \
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
-	%ldap_flags %ssl_flags %gtkdoc_flags \
+	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags \
 	-DENABLE_PLUGINS=all \
 	-DENABLE_YTNEF=OFF \
-	-DENABLE_INSTALLED_TESTS=ON \
 	..
 
 make %{?_smp_mflags}
@@ -501,11 +503,19 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{evo_plugin_dir}/liborg-gnome-pst-import.so
 %endif
 
+%if %{enable_installed_tests}
 %files tests
 %{_libexecdir}/%{name}/installed-tests
 %{_datadir}/installed-tests
+%endif
 
 %changelog
+* Mon Sep 24 2018 Milan Crha  - 3.30.1-1
+- Update to 3.30.1
+- Remove patch for GNOME Evolution issue #86 (fixed upstream)
+- Disable tests subpackage - it uses python2 and it is unmaintained upstream
+- Remove BuildRequires on bogofilter and spamassassin
+
 * Mon Sep 03 2018 Milan Crha  - 3.30.0-1
 - Update to 3.30.0
 - Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels)
diff --git a/sources b/sources
index 6ef8d59..70950d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.30.0.tar.xz) = 15a28dc4cd3b4a194deadd7bb205e9942f193f8f5894e2cdd83e71404535cd9c43223e38d59eaa5dc9cdc977c057ee4f155df397e56079daa8432a6414010a01
+SHA512 (evolution-3.30.1.tar.xz) = 4df32a3419592c53954794dbffbbf1e8d84e02dfd2ad23c2e6c7c8477447e5f826839ebce9325cf9ce9b484725b57f6985123ec57f3c7af438a37194b297c4de

From bca21c79fbfe67cc6c138072bb6b11a75dff6d24 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 8 Oct 2018 09:39:00 +0200
Subject: [PATCH 684/844] Update to 3.31.1

---
 .gitignore     | 1 +
 evolution.spec | 7 +++++--
 sources        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index 36929b1..e30b56b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -153,3 +153,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.29.92.tar.xz
 /evolution-3.30.0.tar.xz
 /evolution-3.30.1.tar.xz
+/evolution-3.31.1.tar.xz
diff --git a/evolution.spec b/evolution.spec
index b07f333..f4534d9 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -29,13 +29,13 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.30.1
+Version: 3.31.1
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.30/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.31/%{name}-%{version}.tar.xz
 
 ### Patches ###
 
@@ -510,6 +510,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Oct 08 2018 Milan Crha  - 3.31.1-1
+- Update to 3.31.1
+
 * Mon Sep 24 2018 Milan Crha  - 3.30.1-1
 - Update to 3.30.1
 - Remove patch for GNOME Evolution issue #86 (fixed upstream)
diff --git a/sources b/sources
index 70950d1..61b4207 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.30.1.tar.xz) = 4df32a3419592c53954794dbffbbf1e8d84e02dfd2ad23c2e6c7c8477447e5f826839ebce9325cf9ce9b484725b57f6985123ec57f3c7af438a37194b297c4de
+SHA512 (evolution-3.31.1.tar.xz) = 6ed79bbd809c5820c61b75221e3bc5c3085f1c3f8ce56459abc6c0d4683bd0540d6639c6ca5a86afb571875cc21a8a7cf3aff7099bf4fa4883863b11973386f1

From 546e48c9aa667fd96fe374bdf8bf246ddd4dec2a Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 8 Oct 2018 11:02:18 +0200
Subject: [PATCH 685/844] Package also the added man page

---
 evolution.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evolution.spec b/evolution.spec
index f4534d9..0ffcc55 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -303,6 +303,7 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %files
 %license COPYING
 %doc AUTHORS NEWS README
+%{_mandir}/man1/*
 
 # GSettings schemas:
 %{_datadir}/GConf/gsettings/evolution.convert

From 7180276e165498216b7a4efdc3d9e6e6ad139579 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 26 Oct 2018 14:12:57 +0200
Subject: [PATCH 686/844] Obsolete evolution-tests subpackage; Add
 BuildRequires/Requires for 'killall' binary

With this `evolution --force-shutdown`, alias killev, will find it
and will be able to stop evolution(-data-server) processes. It could
look also for 'pkill', but none of these seems to be part of build
root anymore. Having explicit dependency is better anyway.
---
 evolution.spec | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 0ffcc55..d5c58db 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,5 +1,7 @@
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 %global _python_bytecompile_extra 0
+
+# correct Obsoletes for evolution-tests when this is changed
 %global enable_installed_tests 0
 
 %define glib2_version 2.46.0
@@ -30,7 +32,7 @@
 
 Name: evolution
 Version: 3.31.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -44,10 +46,15 @@ Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
 Obsoletes: evolution-perl < %{last_evo_perl_version}
 
+%if !%{enable_installed_tests}
+Obsoletes: evolution-tests <= 3.31.1
+%endif
+
 %global eds_version %{version}
 
 ## Dependencies ###
 
+Requires: %{_bindir}/killall
 Requires: evolution-data-server >= %{eds_version}
 Requires: gvfs
 Requires: gtkspell3
@@ -56,6 +63,7 @@ Requires: %{name}-langpacks = %{version}-%{release}
 
 ### Build Dependencies ###
 
+BuildRequires: %{_bindir}/killall
 BuildRequires: cmake
 BuildRequires: gcc
 BuildRequires: gettext
@@ -511,6 +519,10 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Oct 26 2018 Milan Crha  - 3.31.1-2
+- Obsolete evolution-tests subpackage
+- Add BuildRequires/Requires for 'killall' binary
+
 * Mon Oct 08 2018 Milan Crha  - 3.31.1-1
 - Update to 3.31.1
 

From 4d04bc5858bee7c5bd71497eefb85f0ca9ec173e Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 12 Nov 2018 11:10:33 +0100
Subject: [PATCH 687/844] Update to 3.31.2

---
 .gitignore     | 1 +
 evolution.spec | 7 +++++--
 sources        | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index e30b56b..fd038bb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -154,3 +154,4 @@ evolution-2.31.5.tar.bz2
 /evolution-3.30.0.tar.xz
 /evolution-3.30.1.tar.xz
 /evolution-3.31.1.tar.xz
+/evolution-3.31.2.tar.xz
diff --git a/evolution.spec b/evolution.spec
index d5c58db..8278d2d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,8 +31,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.31.1
-Release: 2%{?dist}
+Version: 3.31.2
+Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -519,6 +519,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Nov 12 2018 Milan Crha  - 3.31.2-1
+- Update to 3.31.2
+
 * Fri Oct 26 2018 Milan Crha  - 3.31.1-2
 - Obsolete evolution-tests subpackage
 - Add BuildRequires/Requires for 'killall' binary
diff --git a/sources b/sources
index 61b4207..6b8c4fd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.31.1.tar.xz) = 6ed79bbd809c5820c61b75221e3bc5c3085f1c3f8ce56459abc6c0d4683bd0540d6639c6ca5a86afb571875cc21a8a7cf3aff7099bf4fa4883863b11973386f1
+SHA512 (evolution-3.31.2.tar.xz) = e77cb4be63176cbfff3d034a94b1acaacf03d2de570d201da79fd96bddfce70961770e0fc492f8032f12ca033a5316cdd58b7fe4732e0c85b1bf31a00a9d8242

From c1874eab10792f648041545a117f1424c46a5383 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 10 Dec 2018 09:18:38 +0100
Subject: [PATCH 688/844] Update to 3.31.3

---
 .gitignore     | 158 +------------------------------------------------
 evolution.spec |   5 +-
 sources        |   2 +-
 3 files changed, 6 insertions(+), 159 deletions(-)

diff --git a/.gitignore b/.gitignore
index fd038bb..56bb02d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,157 +1 @@
-evolution-2.31.5.tar.bz2
-/evolution-2.31.91.tar.bz2
-/evolution-2.31.92.tar.bz2
-/evolution-2.91.0.tar.bz2
-/evolution-2.91.1.tar.bz2
-/evolution-2.91.2.tar.bz2
-/evolution-2.91.3.tar.bz2
-/evolution-2.91.4.tar.bz2
-/evolution-2.91.5.tar.bz2
-/evolution-2.91.6.tar.bz2
-/evolution-2.91.6.1.tar.bz2
-/evolution-2.91.6.2.tar.bz2
-/evolution-2.91.90.tar.bz2
-/evolution-2.91.91.tar.bz2
-/evolution-2.91.92.tar.bz2
-/evolution-3.0.0.tar.bz2
-/evolution-3.1.1.tar.bz2
-/evolution-3.1.2.tar.bz2
-/evolution-3.1.3.tar.bz2
-/evolution-3.1.4.tar.bz2
-/evolution-3.1.5.tar.bz2
-/evolution-3.1.90.tar.xz
-/evolution-3.1.91.tar.xz
-/evolution-3.1.92.tar.xz
-/evolution-3.2.0.tar.xz
-/evolution-3.3.1.tar.xz
-/evolution-3.3.2.tar.xz
-/evolution-3.3.3.tar.xz
-/evolution-3.3.4.tar.xz
-/evolution-3.3.5.tar.xz
-/evolution-3.3.90.tar.xz
-/evolution-3.3.91.tar.xz
-/evolution-3.3.92.tar.xz
-/evolution-3.4.0.tar.xz
-/evolution-3.4.0.1.tar.xz
-/evolution-3.4.1.tar.xz
-/evolution-3.5.1.tar.xz
-/evolution-3.5.2.tar.xz
-/evolution-3.5.3.tar.xz
-/evolution-3.5.3.1.tar.xz
-/evolution-3.5.4.tar.xz
-/evolution-3.5.5.tar.xz
-/evolution-3.5.90.tar.xz
-/evolution-3.5.91.tar.xz
-/evolution-3.5.92.tar.xz
-/evolution-3.6.0.tar.xz
-/evolution-3.7.1.tar.xz
-/evolution-3.7.2.tar.xz
-/evolution-3.7.3.1.tar.xz
-/evolution-3.7.3.2.tar.xz
-/evolution-3.7.4.tar.xz
-/evolution-3.7.5.tar.xz
-/evolution-3.7.90.tar.xz
-/evolution-3.7.91.tar.xz
-/evolution-3.7.92.tar.xz
-/evolution-3.8.0.tar.xz
-/evolution-3.9.1.tar.xz
-/evolution-3.9.2.tar.xz
-/evolution-3.9.3.tar.xz
-/evolution-3.9.4.tar.xz
-/evolution-3.9.5.tar.xz
-/evolution-3.9.90.tar.xz
-/evolution-3.9.91.tar.xz
-/evolution-3.9.92.tar.xz
-/evolution-3.10.0.tar.xz
-/evolution-3.10.1.tar.xz
-/evolution-3.11.1.tar.xz
-/evolution-3.11.2.tar.xz
-/evolution-3.11.4.tar.xz
-/evolution-3.11.5.tar.xz
-/evolution-3.11.90.tar.xz
-/evolution-3.11.91.tar.xz
-/evolution-3.11.92.tar.xz
-/evolution-3.12.0.tar.xz
-/evolution-3.12.1.tar.xz
-/evolution-3.12.2.tar.xz
-/evolution-3.12.3.tar.xz
-/evolution-3.12.4.tar.xz
-/evolution-3.13.4.tar.xz
-/evolution-3.13.5.tar.xz
-/evolution-3.13.6.tar.xz
-/evolution-3.13.7.tar.xz
-/evolution-3.13.8.tar.xz
-/evolution-3.13.9.tar.xz
-/evolution-3.13.10.tar.xz
-/evolution-3.13.90.tar.xz
-/evolution-3.15.91.tar.xz
-/evolution-3.15.92.tar.xz
-/evolution-3.16.0.tar.xz
-/evolution-3.16.1.tar.xz
-/evolution-3.17.1.tar.xz
-/evolution-3.17.2.tar.xz
-/evolution-3.17.3.tar.xz
-/evolution-3.17.4.tar.xz
-/evolution-3.17.90.tar.xz
-/evolution-3.17.91.tar.xz
-/evolution-3.17.92.tar.xz
-/evolution-3.18.0.tar.xz
-/evolution-3.18.1.tar.xz
-/evolution-3.19.1.tar.xz
-/evolution-3.19.2.tar.xz
-/evolution-3.19.3.tar.xz
-/evolution-3.19.4.tar.xz
-/evolution-3.19.90.tar.xz
-/evolution-3.19.91.tar.xz
-/evolution-3.19.92.tar.xz
-/evolution-3.20.0.tar.xz
-/evolution-3.20.1.tar.xz
-/evolution-3.21.1.tar.xz
-/evolution-3.21.2.tar.xz
-/evolution-3.21.3.tar.xz
-/evolution-3.21.4.tar.xz
-/evolution-3.21.90.tar.xz
-/evolution-3.21.91.tar.xz
-/evolution-3.21.92.tar.xz
-/evolution-3.22.0.tar.xz
-/evolution-3.22.1.tar.xz
-/evolution-3.23.1.tar.xz
-/evolution-3.23.2.tar.xz
-/evolution-3.23.3.tar.xz
-/evolution-3.23.4.tar.xz
-/evolution-3.23.90.tar.xz
-/evolution-3.23.91.tar.xz
-/evolution-3.23.92.tar.xz
-/evolution-3.24.0.tar.xz
-/evolution-3.24.1.tar.xz
-/evolution-3.25.1.tar.xz
-/evolution-3.25.2.tar.xz
-/evolution-3.25.3.tar.xz
-/evolution-3.25.4.tar.xz
-/evolution-3.25.90.tar.xz
-/evolution-3.25.91.tar.xz
-/evolution-3.25.92.tar.xz
-/evolution-3.25.92.1.tar.xz
-/evolution-3.25.92.2.tar.xz
-/evolution-3.26.0.tar.xz
-/evolution-3.26.1.tar.xz
-/evolution-3.27.1.tar.xz
-/evolution-3.27.2.tar.xz
-/evolution-3.27.3.tar.xz
-/evolution-3.27.4.tar.xz
-/evolution-3.27.90.tar.xz
-/evolution-3.27.91.tar.xz
-/evolution-3.27.92.tar.xz
-/evolution-3.28.0.tar.xz
-/evolution-3.28.1.tar.xz
-/evolution-3.29.1.tar.xz
-/evolution-3.29.2.tar.xz
-/evolution-3.29.3.tar.xz
-/evolution-3.29.4.tar.xz
-/evolution-3.29.90.tar.xz
-/evolution-3.29.91.tar.xz
-/evolution-3.29.92.tar.xz
-/evolution-3.30.0.tar.xz
-/evolution-3.30.1.tar.xz
-/evolution-3.31.1.tar.xz
-/evolution-3.31.2.tar.xz
+/evolution-*.tar.xz
diff --git a/evolution.spec b/evolution.spec
index 8278d2d..87d3af4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.31.2
+Version: 3.31.3
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -519,6 +519,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Dec 10 2018 Milan Crha  - 3.31.3-1
+- Update to 3.31.3
+
 * Mon Nov 12 2018 Milan Crha  - 3.31.2-1
 - Update to 3.31.2
 
diff --git a/sources b/sources
index 6b8c4fd..f7a9427 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.31.2.tar.xz) = e77cb4be63176cbfff3d034a94b1acaacf03d2de570d201da79fd96bddfce70961770e0fc492f8032f12ca033a5316cdd58b7fe4732e0c85b1bf31a00a9d8242
+SHA512 (evolution-3.31.3.tar.xz) = 38dc3c6d2c5c1a60e2633581446f5080e95b4c55127d56b0c0fa7e39070b7bf3f9a645d5221a1f438906bc087a2242dc7f6a339b121a8dfe5cfc46516ad79df4

From d0d4ca7b18c181838af46f7c22aee00d62697b63 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 7 Jan 2019 11:45:04 +0100
Subject: [PATCH 689/844] Update to 3.31.4

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 87d3af4..9077cca 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.31.3
+Version: 3.31.4
 Release: 1%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
@@ -519,6 +519,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Jan 07 2019 Milan Crha  - 3.31.4-1
+- Update to 3.31.4
+
 * Mon Dec 10 2018 Milan Crha  - 3.31.3-1
 - Update to 3.31.3
 
diff --git a/sources b/sources
index f7a9427..3474fa1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.31.3.tar.xz) = 38dc3c6d2c5c1a60e2633581446f5080e95b4c55127d56b0c0fa7e39070b7bf3f9a645d5221a1f438906bc087a2242dc7f6a339b121a8dfe5cfc46516ad79df4
+SHA512 (evolution-3.31.4.tar.xz) = ca70662b7a423c8010befaf0bee92d139ec2f27a3d47e97ab6b4d6fdfb2da71a681701e3b244643dd3dd594534ce8af14d10f4c10eddea8b902921a7f490ae48

From bc4e04ddc2fcc4d6c97e73d26a91eefceb137a18 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko 
Date: Tue, 22 Jan 2019 18:38:54 +0100
Subject: [PATCH 690/844] Remove obsolete ldconfig scriptlets

References: https://fedoraproject.org/wiki/Changes/RemoveObsoleteScriptlets
Signed-off-by: Igor Gnatenko 
---
 evolution.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 9077cca..340f761 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -304,9 +304,7 @@ grep "/usr/share/locale" evolution.lang > translations.lang
 grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
-%post -p /sbin/ldconfig
-
-%postun -p /sbin/ldconfig
+%ldconfig_scriptlets
 
 %files
 %license COPYING

From 5487933e14dfd33e97ed00814c1219dddba43314 Mon Sep 17 00:00:00 2001
From: Igor Gnatenko 
Date: Mon, 28 Jan 2019 20:17:43 +0100
Subject: [PATCH 691/844] Remove obsolete Group tag

References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag
---
 evolution.spec | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 340f761..3f07d98 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -33,7 +33,6 @@
 Name: evolution
 Version: 3.31.4
 Release: 1%{?dist}
-Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -125,7 +124,6 @@ are tightly integrated with one another and act as a seamless
 personal information-management tool.
 
 %package devel
-Group: Development/Libraries
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig(camel-1.2) >= %{eds_version}
@@ -147,7 +145,6 @@ Development files needed for building things which link against %{name}.
 
 %package devel-docs
 Summary: Developer documentation for Evolution
-Group: Development/Libraries
 Requires: devhelp
 Requires: %{name}-devel = %{version}-%{release}
 BuildArch: noarch
@@ -165,7 +162,6 @@ This package contains translations for %{name}.
 
 %if %{with_docs}
 %package help
-Group: Applications/Productivity
 Summary: Help files for %{name}
 Requires: %{name} = %{version}-%{release}
 Requires: yelp
@@ -176,7 +172,6 @@ This package contains user documentation for %{name}.
 %endif
 
 %package bogofilter
-Group: Applications/Productivity
 Summary: Bogofilter plugin for Evolution
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: bogofilter
@@ -185,7 +180,6 @@ Requires: bogofilter
 This package contains the plugin to filter junk mail using Bogofilter.
 
 %package spamassassin
-Group: Applications/Productivity
 Summary: SpamAssassin plugin for Evolution
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: spamassassin
@@ -195,7 +189,6 @@ This package contains the plugin to filter junk mail using SpamAssassin.
 
 %if %{libpst_support}
 %package pst
-Group: Applications/Productivity
 Summary: PST importer plugin for Evolution
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
@@ -207,7 +200,6 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %if %{enable_installed_tests}
 %package tests
 Summary: Tests for the %{name} package
-Group: Development/Libraries
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: python2-behave
 Requires: python2-dogtail

From 0b3ebe1869950db186678a464fb585064f1cdb26 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Thu, 31 Jan 2019 19:10:41 +0000
Subject: [PATCH 692/844] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 3f07d98..5e07edb 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -32,7 +32,7 @@
 
 Name: evolution
 Version: 3.31.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Thu Jan 31 2019 Fedora Release Engineering  - 3.31.4-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
 * Mon Jan 07 2019 Milan Crha  - 3.31.4-1
 - Update to 3.31.4
 

From f5528af470c83d96d188e7fc7350111c11e0e6ef Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 4 Feb 2019 11:57:09 +0100
Subject: [PATCH 693/844] Update to 3.31.90

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 5e07edb..5d809f0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,8 +31,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.31.4
-Release: 2%{?dist}
+Version: 3.31.90
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Feb 04 2019 Milan Crha  - 3.31.90-1
+- Update to 3.31.90
+
 * Thu Jan 31 2019 Fedora Release Engineering  - 3.31.4-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
diff --git a/sources b/sources
index 3474fa1..d0d7ebc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.31.4.tar.xz) = ca70662b7a423c8010befaf0bee92d139ec2f27a3d47e97ab6b4d6fdfb2da71a681701e3b244643dd3dd594534ce8af14d10f4c10eddea8b902921a7f490ae48
+SHA512 (evolution-3.31.90.tar.xz) = 614baa7a85a8b24c92301b14c8ef3a1a84fadc09e2020dc3cbc17e4c5557a0ec3051c9c8d2c23bdda5955af1a9ece4fb2cc00090753fa4682eb7d74f329bf128

From 00125089c84140e5e3e25c0ac874ccdbf7de551d Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 18 Feb 2019 10:51:47 +0100
Subject: [PATCH 694/844] Update to 3.31.91

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 5d809f0..6dd317b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.31.90
+Version: 3.31.91
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Feb 18 2019 Milan Crha  - 3.31.91-1
+- Update to 3.31.91
+
 * Mon Feb 04 2019 Milan Crha  - 3.31.90-1
 - Update to 3.31.90
 
diff --git a/sources b/sources
index d0d7ebc..c18aaf5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.31.90.tar.xz) = 614baa7a85a8b24c92301b14c8ef3a1a84fadc09e2020dc3cbc17e4c5557a0ec3051c9c8d2c23bdda5955af1a9ece4fb2cc00090753fa4682eb7d74f329bf128
+SHA512 (evolution-3.31.91.tar.xz) = 35de5ce3b314aa22c33a72faad20612a6bd300a8ab4f17c37e79d67bcc3e69a0cb2021fbe005024471411e12f6e9bd7fb24b19daf1bc490526cf2aa79dd7d568

From 5a0aeeb769c59b98f329fe17e4b00a1a9fb791c3 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 4 Mar 2019 12:52:26 +0100
Subject: [PATCH 695/844] Update to 3.31.92

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 6dd317b..da8febb 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.31.91
+Version: 3.31.92
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Mar 04 2019 Milan Crha  - 3.31.92-1
+- Update to 3.31.92
+
 * Mon Feb 18 2019 Milan Crha  - 3.31.91-1
 - Update to 3.31.91
 
diff --git a/sources b/sources
index c18aaf5..976747d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.31.91.tar.xz) = 35de5ce3b314aa22c33a72faad20612a6bd300a8ab4f17c37e79d67bcc3e69a0cb2021fbe005024471411e12f6e9bd7fb24b19daf1bc490526cf2aa79dd7d568
+SHA512 (evolution-3.31.92.tar.xz) = 6a67fc97beea6d423769c46fa5ea8af6c7026c082adb6ddf178b3dada2c61204998c66a1558962050b22b3d299d7a435c3af8995f76edcd127803b76af2d2009

From 43b3efa37d9b03bd081e8c1ae776433ebcc13a45 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 11 Mar 2019 10:44:21 +0100
Subject: [PATCH 696/844] Update to 3.32.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index da8febb..5a830f6 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,12 +31,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.31.92
+Version: 3.32.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.31/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz
 
 ### Patches ###
 
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Mar 11 2019 Milan Crha  - 3.32.0-1
+- Update to 3.32.0
+
 * Mon Mar 04 2019 Milan Crha  - 3.31.92-1
 - Update to 3.31.92
 
diff --git a/sources b/sources
index 976747d..5d90717 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.31.92.tar.xz) = 6a67fc97beea6d423769c46fa5ea8af6c7026c082adb6ddf178b3dada2c61204998c66a1558962050b22b3d299d7a435c3af8995f76edcd127803b76af2d2009
+SHA512 (evolution-3.32.0.tar.xz) = a93931fea87a4f1cbfc5303424017491c6c6237d77c5fc31e9295424c063c84bffca4bb353b113ff982f979bb8c261e095fd282205f4afdcc7135248ec4d7cdc

From 94696ff516e168c2b46c57ae6a457e1d37cefb09 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 8 Apr 2019 15:41:31 +0200
Subject: [PATCH 697/844] Update to 3.32.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 5a830f6..4b00570 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.32.0
+Version: 3.32.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Apr 08 2019 Milan Crha  - 3.32.1-1
+- Update to 3.32.1
+
 * Mon Mar 11 2019 Milan Crha  - 3.32.0-1
 - Update to 3.32.0
 
diff --git a/sources b/sources
index 5d90717..d04ab03 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.32.0.tar.xz) = a93931fea87a4f1cbfc5303424017491c6c6237d77c5fc31e9295424c063c84bffca4bb353b113ff982f979bb8c261e095fd282205f4afdcc7135248ec4d7cdc
+SHA512 (evolution-3.32.1.tar.xz) = b50f0156970fb331ca39e8bb82a00565bb716ccaf13f3feecc4bdf8858b43b998464b0c4d06d0d430a385759bfb6f14a5d0fb6a030c68f80f00c91212eee0342

From 4593d93bd2845b66bd0d6b6df42f22b3a6b87e1c Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 22 Apr 2019 11:26:43 +0200
Subject: [PATCH 698/844] Update to 3.33.1

---
 evolution.spec | 13 ++++++++-----
 sources        |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 4b00570..dea1107 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,12 +31,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.32.1
+Version: 3.33.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.32/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.33/%{name}-%{version}.tar.xz
 
 ### Patches ###
 
@@ -56,7 +56,7 @@ Obsoletes: evolution-tests <= 3.31.1
 Requires: %{_bindir}/killall
 Requires: evolution-data-server >= %{eds_version}
 Requires: gvfs
-Requires: gtkspell3
+Requires: gspell
 Requires: highlight
 Requires: %{name}-langpacks = %{version}-%{release}
 
@@ -87,7 +87,7 @@ BuildRequires: pkgconfig(gnome-autoar-gtk-0) >= %{gnome_autoar_version}
 BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
 BuildRequires: pkgconfig(gsettings-desktop-schemas)
 BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
-BuildRequires: pkgconfig(gtkspell3-3.0)
+BuildRequires: pkgconfig(gspell-1)
 BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
 BuildRequires: pkgconfig(iso-codes)
 BuildRequires: pkgconfig(libcanberra-gtk3)
@@ -129,7 +129,7 @@ Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig(camel-1.2) >= %{eds_version}
 Requires: pkgconfig(enchant)
 Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
-Requires: pkgconfig(gtkspell3-3.0)
+Requires: pkgconfig(gspell-1)
 Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
 Requires: pkgconfig(libebackend-1.2) >= %{eds_version}
 Requires: pkgconfig(libebook-1.2) >= %{eds_version}
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Apr 22 2019 Milan Crha  - 3.33.1-1
+- Update to 3.33.1
+
 * Mon Apr 08 2019 Milan Crha  - 3.32.1-1
 - Update to 3.32.1
 
diff --git a/sources b/sources
index d04ab03..988bd4f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.32.1.tar.xz) = b50f0156970fb331ca39e8bb82a00565bb716ccaf13f3feecc4bdf8858b43b998464b0c4d06d0d430a385759bfb6f14a5d0fb6a030c68f80f00c91212eee0342
+SHA512 (evolution-3.33.1.tar.xz) = 977e02ac534dd8e92bbaac66e1c17028f014524fdcfb8fef1286670632c5346bb1cc5d9cbb55b63ba92919e39b695de6199585031c4e51085bd37f1033550328

From 910669d20df4cbada9299f2670d769eab6286805 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 20 May 2019 18:35:55 +0200
Subject: [PATCH 699/844] Update to 3.33.2

---
 evolution.spec | 9 ++++++---
 sources        | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index dea1107..9c7575e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.33.1
+Version: 3.33.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -93,7 +93,7 @@ BuildRequires: pkgconfig(iso-codes)
 BuildRequires: pkgconfig(libcanberra-gtk3)
 BuildRequires: pkgconfig(libebackend-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libebook-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(libecal-1.2) >= %{eds_version}
+BuildRequires: pkgconfig(libecal-2.0) >= %{eds_version}
 BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libedataserverui-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libgdata) >= %{libgdata_version}
@@ -133,7 +133,7 @@ Requires: pkgconfig(gspell-1)
 Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
 Requires: pkgconfig(libebackend-1.2) >= %{eds_version}
 Requires: pkgconfig(libebook-1.2) >= %{eds_version}
-Requires: pkgconfig(libecal-1.2) >= %{eds_version}
+Requires: pkgconfig(libecal-2.0) >= %{eds_version}
 Requires: pkgconfig(libedataserver-1.2) >= %{eds_version}
 Requires: pkgconfig(libgdata) >= %{libgdata_version}
 Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon May 20 2019 Milan Crha  - 3.33.2-1
+- Update to 3.33.2
+
 * Mon Apr 22 2019 Milan Crha  - 3.33.1-1
 - Update to 3.33.1
 
diff --git a/sources b/sources
index 988bd4f..0c0b039 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.33.1.tar.xz) = 977e02ac534dd8e92bbaac66e1c17028f014524fdcfb8fef1286670632c5346bb1cc5d9cbb55b63ba92919e39b695de6199585031c4e51085bd37f1033550328
+SHA512 (evolution-3.33.2.tar.xz) = b6822c55a51029728690a49732bd2a0c33b0c20e9bc9b2fe44c89464233801139251982c6bded400750803167a1238abe86a5b62b1141a15239824924a4b1fe3

From f949fcdd6deaa4cf910df96414a84f1e8c4217b7 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 17 Jun 2019 17:16:33 +0200
Subject: [PATCH 700/844] Update to 3.33.3

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 9c7575e..d46aed2 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.33.2
+Version: 3.33.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Jun 17 2019 Milan Crha  - 3.33.3-1
+- Update to 3.33.3
+
 * Mon May 20 2019 Milan Crha  - 3.33.2-1
 - Update to 3.33.2
 
diff --git a/sources b/sources
index 0c0b039..283e47d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.33.2.tar.xz) = b6822c55a51029728690a49732bd2a0c33b0c20e9bc9b2fe44c89464233801139251982c6bded400750803167a1238abe86a5b62b1141a15239824924a4b1fe3
+SHA512 (evolution-3.33.3.tar.xz) = f5b841e629d953818df03ff12028631c363af75dbe8c57cb74cc1a288ee6c946173dc779b2e02597e1ad9a2cc87635963bbcb8e148da4cdd000761db4b5b68b6

From 2c62413444cce5bdcd2abe5972b321873a293657 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 17 Jun 2019 18:56:34 +0200
Subject: [PATCH 701/844] Correct packaged file names in 3.33.3

---
 evolution.spec | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d46aed2..91cd359 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -300,7 +300,7 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 
 %files
 %license COPYING
-%doc AUTHORS NEWS README
+%doc AUTHORS NEWS README.md
 %{_mandir}/man1/*
 
 # GSettings schemas:
@@ -340,7 +340,6 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{_datadir}/icons/hicolor/24x24/apps/*
 %{_datadir}/icons/hicolor/32x32/apps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/256x256/apps/*
 %{_datadir}/icons/hicolor/symbolic/apps/*
 
 # The main data directory

From 2bbb579b042bc661622840a81ad8419e175aee95 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 17 Jun 2019 19:13:08 +0200
Subject: [PATCH 702/844] ...and add a new scalable icon too

---
 evolution.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evolution.spec b/evolution.spec
index 91cd359..bde879d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -341,6 +341,7 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{_datadir}/icons/hicolor/32x32/apps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
 %{_datadir}/icons/hicolor/symbolic/apps/*
+%{_datadir}/icons/hicolor/scalable/apps/*
 
 # The main data directory
 # (have not attempted to split this up into an explicit list)

From 4db00e385a9a17c5aedfaa3f11ef7aaa5cf57efe Mon Sep 17 00:00:00 2001
From: Kalev Lember 
Date: Mon, 8 Jul 2019 13:56:34 +0300
Subject: [PATCH 703/844] Rebuilt for libgweather soname bump

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index bde879d..48518be 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -32,7 +32,7 @@
 
 Name: evolution
 Version: 3.33.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -509,6 +509,9 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Jul 08 2019 Kalev Lember  - 3.33.3-2
+- Rebuilt for libgweather soname bump
+
 * Mon Jun 17 2019 Milan Crha  - 3.33.3-1
 - Update to 3.33.3
 

From 685ae11132b719cf2b38aeafaa23ccaca96ac0ca Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 15 Jul 2019 10:34:42 +0200
Subject: [PATCH 704/844] Add changes related to Flatpak build

---
 evolution.spec | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 48518be..d0a721b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -26,6 +26,10 @@
 # Coverity scan can override this to 0, to skip checking in gtk-doc generated code
 %{!?with_docs: %global with_docs 1}
 
+%if 0%{?flatpak}
+%global with_docs 0
+%endif
+
 %define evo_plugin_dir %{_libdir}/evolution/plugins
 
 ### Abstract ###
@@ -53,20 +57,26 @@ Obsoletes: evolution-tests <= 3.31.1
 
 ## Dependencies ###
 
+%if ! 0%{?flatpak}
 Requires: %{_bindir}/killall
-Requires: evolution-data-server >= %{eds_version}
 Requires: gvfs
+%endif
+Requires: evolution-data-server >= %{eds_version}
 Requires: gspell
 Requires: highlight
 Requires: %{name}-langpacks = %{version}-%{release}
 
 ### Build Dependencies ###
 
+%if ! 0%{?flatpak}
 BuildRequires: %{_bindir}/killall
+%endif
 BuildRequires: cmake
 BuildRequires: gcc
 BuildRequires: gettext
+%if %{with_docs}
 BuildRequires: gtk-doc
+%endif
 BuildRequires: highlight
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: itstool
@@ -76,7 +86,7 @@ BuildRequires: yelp-tools
 BuildRequires: pkgconfig(atk)
 BuildRequires: pkgconfig(cairo-gobject)
 BuildRequires: pkgconfig(camel-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(enchant)
+BuildRequires: pkgconfig(enchant-2)
 BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
 BuildRequires: pkgconfig(gcr-3)
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
@@ -143,6 +153,8 @@ Obsoletes: libgal2-devel <= %{last_libgal2_version}
 %description devel
 Development files needed for building things which link against %{name}.
 
+%if %{with_docs}
+
 %package devel-docs
 Summary: Developer documentation for Evolution
 Requires: devhelp
@@ -152,6 +164,8 @@ BuildArch: noarch
 %description devel-docs
 This package contains developer documentation for Evolution.
 
+%endif
+
 %package langpacks
 Summary: Translations for %{name}
 BuildArch: noarch
@@ -217,6 +231,11 @@ for inbox in src/mail/default/*/Inbox; do
   echo -n "" > $inbox
 done
 
+%if 0%{?flatpak}
+mv data/org.gnome.Evolution.desktop.in.in data/org.gnome.Evolution.desktop.in.i
+cat data/org.gnome.Evolution.desktop.in.i | sed -e "s/Icon=evolution/Icon=org.gnome.Evolution/" >data/org.gnome.Evolution.desktop.in.in
+%endif
+
 %build
 
 mkdir -p _build
@@ -291,9 +310,9 @@ make DESTDIR=$RPM_BUILD_ROOT install
 
 %find_lang evolution --all-name --with-gnome
 
-grep "/usr/share/locale" evolution.lang > translations.lang
+grep "%{_datadir}/locale" evolution.lang > translations.lang
 %if %{with_docs}
-grep -v "/usr/share/locale" evolution.lang > help.lang
+grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %ldconfig_scriptlets
@@ -474,6 +493,8 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %{_libdir}/pkgconfig/evolution-shell-3.0.pc
 %{_libdir}/pkgconfig/libemail-engine.pc
 
+%if %{with_docs}
+
 %files devel-docs
 %doc %{_datadir}/gtk-doc/html/evolution-mail-composer
 %doc %{_datadir}/gtk-doc/html/evolution-mail-engine
@@ -481,6 +502,8 @@ grep -v "/usr/share/locale" evolution.lang > help.lang
 %doc %{_datadir}/gtk-doc/html/evolution-shell
 %doc %{_datadir}/gtk-doc/html/evolution-util
 
+%endif
+
 %files langpacks -f _build/translations.lang
 
 %if %{with_docs}

From 6c7b6099368240da756018ff484080d4879e8d45 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 15 Jul 2019 10:46:58 +0200
Subject: [PATCH 705/844] Update to 3.33.4

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d0a721b..b9d8624 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,8 +35,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.33.3
-Release: 2%{?dist}
+Version: 3.33.4
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -532,6 +532,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Jul 15 2019 Milan Crha  - 3.33.4-1
+- Update to 3.33.4
+
 * Mon Jul 08 2019 Kalev Lember  - 3.33.3-2
 - Rebuilt for libgweather soname bump
 
diff --git a/sources b/sources
index 283e47d..159c69e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.33.3.tar.xz) = f5b841e629d953818df03ff12028631c363af75dbe8c57cb74cc1a288ee6c946173dc779b2e02597e1ad9a2cc87635963bbcb8e148da4cdd000761db4b5b68b6
+SHA512 (evolution-3.33.4.tar.xz) = 44dfa79a880be65b7150e1a35fb93e95e9165f228b61ba3c878becb376b5f829e0d4a3dfeea51a1213a4bdf3e71d231991b1eb58b4bd292ba0ca061a914f4cad

From 8df5cd0f6da16b1ba03988d87bcc629d6c76791d Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 15 Jul 2019 11:00:51 +0200
Subject: [PATCH 706/844] Note in the VERSION_SUBSTRING it's a Flatpak build
 when it's a Flatpak build

---
 evolution.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/evolution.spec b/evolution.spec
index b9d8624..db2e483 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -271,7 +271,11 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated
 
 %cmake -G "Unix Makefiles" \
 	-DENABLE_MAINTAINER_MODE=OFF \
+%if 0%{?flatpak}
+	-DVERSION_SUBSTRING=" (%{version}-%{release} Flatpak)" \
+%else
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
+%endif
 	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags \
 	-DENABLE_PLUGINS=all \
 	-DENABLE_YTNEF=OFF \

From c9c5188faada228ce360d998f8138c97ed20bad4 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 15 Jul 2019 18:29:18 +0200
Subject: [PATCH 707/844] Revert "Note in the VERSION_SUBSTRING it's a Flatpak
 build when it's a Flatpak build"

This reverts commit 8df5cd0f6da16b1ba03988d87bcc629d6c76791d.
---
 evolution.spec | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index db2e483..b9d8624 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -271,11 +271,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated
 
 %cmake -G "Unix Makefiles" \
 	-DENABLE_MAINTAINER_MODE=OFF \
-%if 0%{?flatpak}
-	-DVERSION_SUBSTRING=" (%{version}-%{release} Flatpak)" \
-%else
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
-%endif
 	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags \
 	-DENABLE_PLUGINS=all \
 	-DENABLE_YTNEF=OFF \

From e1ade460495e5ed9e9048787cd2ba0e7038cf12b Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 15 Jul 2019 18:35:28 +0200
Subject: [PATCH 708/844] Add Flatpak wrapper and helper scripts

---
 evolution.spec                         | 13 +++++++++++
 flatpak-evolution-fix-service-names.sh | 10 +++++++++
 flatpak-evolution-wrapper.sh.in        | 31 ++++++++++++++++++++++++++
 3 files changed, 54 insertions(+)
 create mode 100755 flatpak-evolution-fix-service-names.sh
 create mode 100644 flatpak-evolution-wrapper.sh.in

diff --git a/evolution.spec b/evolution.spec
index b9d8624..5eb5a62 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -41,6 +41,8 @@ Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
 Source: http://download.gnome.org/sources/%{name}/3.33/%{name}-%{version}.tar.xz
+Source1: flatpak-evolution-fix-service-names.sh
+Source2: flatpak-evolution-wrapper.sh.in
 
 ### Patches ###
 
@@ -308,6 +310,13 @@ rm -rf $RPM_BUILD_ROOT
 cd _build
 make DESTDIR=$RPM_BUILD_ROOT install
 
+%if 0%{?flatpak}
+%{S:1} <%{S:2} >flatpak-evolution-wrapper.sh
+chmod a+x flatpak-evolution-wrapper.sh
+mv $RPM_BUILD_ROOT%{_bindir}/evolution $RPM_BUILD_ROOT%{_bindir}/evolution.bin
+cp flatpak-evolution-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/evolution
+%endif
+
 %find_lang evolution --all-name --with-gnome
 
 grep "%{_datadir}/locale" evolution.lang > translations.lang
@@ -348,6 +357,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 # The main executable
 %{_bindir}/evolution
 
+%if 0%{?flatpak}
+%{_bindir}/evolution.bin
+%endif
+
 %{_datadir}/metainfo/org.gnome.Evolution.appdata.xml
 
 # Desktop files:
diff --git a/flatpak-evolution-fix-service-names.sh b/flatpak-evolution-fix-service-names.sh
new file mode 100755
index 0000000..9454543
--- /dev/null
+++ b/flatpak-evolution-fix-service-names.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+# see https://gitlab.gnome.org/GNOME/glib/issues/1737
+# previous versions used milliseconds instead of seconds as the timeout argument",
+(`pkg-config --atleast-version 2.60.1 gio-2.0` || `pkg-config --atleast-version 2.61.0 gio-2.0`) && TIMEOUTMULT= || TIMEOUTMULT=000
+
+sed -e "s|\@SOURCES_SERVICE\@|$(pkg-config --variable=sourcesdbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@ADDRESSBOOK_SERVICE\@|$(pkg-config --variable=addressbookdbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@CALENDAR_SERVICE\@|$(pkg-config --variable=calendardbusservicename evolution-data-server-1.2)|" \
+    -e "s|\@TIMEOUTMULT\@|${TIMEOUTMULT}|"
diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
new file mode 100644
index 0000000..678b771
--- /dev/null
+++ b/flatpak-evolution-wrapper.sh.in
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
+   /app/bin/evolution.bin "$@"
+else
+   export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
+   export GIO_USE_NETWORK_MONITOR=base
+   gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
+
+   gpg-agent --homedir ~/.gnupg --daemon --pinentry-program=/app/bin/pinentry
+
+   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-source-registry &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @SOURCES_SERVICE@
+   fi
+
+   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @ADDRESSBOOK_SERVICE@ | wc -l)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-addressbook-factory -r &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @ADDRESSBOOK_SERVICE@
+   fi
+
+   LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @CALENDAR_SERVICE@ | wc -l)
+   if [ "${LINES}" = "0" ]; then
+      /app/libexec/evolution-calendar-factory -r &
+      gdbus wait --session --timeout=1@TIMEOUTMULT@ @CALENDAR_SERVICE@
+   fi
+
+   /app/bin/evolution.bin "$@"
+fi

From ce77a0418a0b08405eafea329ce09277927e0788 Mon Sep 17 00:00:00 2001
From: Kalev Lember 
Date: Sun, 21 Jul 2019 21:25:01 +0300
Subject: [PATCH 709/844] Rebuilt for libgnome-desktop soname bump

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 5eb5a62..48a8331 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -36,7 +36,7 @@
 
 Name: evolution
 Version: 3.33.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -545,6 +545,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Sun Jul 21 2019 Kalev Lember  - 3.33.4-2
+- Rebuilt for libgnome-desktop soname bump
+
 * Mon Jul 15 2019 Milan Crha  - 3.33.4-1
 - Update to 3.33.4
 

From ec2a2b027189706a3fab7beb7c494fef853be513 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Thu, 25 Jul 2019 00:00:56 +0000
Subject: [PATCH 710/844] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 48a8331..629a95f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -36,7 +36,7 @@
 
 Name: evolution
 Version: 3.33.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -545,6 +545,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Thu Jul 25 2019 Fedora Release Engineering  - 3.33.4-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
 * Sun Jul 21 2019 Kalev Lember  - 3.33.4-2
 - Rebuilt for libgnome-desktop soname bump
 

From 45e514ef04a3dfef26d9affdf0f5161efaf7c396 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 5 Aug 2019 11:29:16 +0200
Subject: [PATCH 711/844] Update to 3.33.90

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 629a95f..74ec4c4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,8 +35,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.33.4
-Release: 3%{?dist}
+Version: 3.33.90
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -545,6 +545,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Aug 05 2019 Milan Crha  - 3.33.90-1
+- Update to 3.33.90
+
 * Thu Jul 25 2019 Fedora Release Engineering  - 3.33.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
diff --git a/sources b/sources
index 159c69e..8caffc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.33.4.tar.xz) = 44dfa79a880be65b7150e1a35fb93e95e9165f228b61ba3c878becb376b5f829e0d4a3dfeea51a1213a4bdf3e71d231991b1eb58b4bd292ba0ca061a914f4cad
+SHA512 (evolution-3.33.90.tar.xz) = 666e84b49f7766f2d47bf2e13e0c06c0103c7547af72c677b14b66c3154e5ce23dbc90d52c356b523ca7c3b4193047bea45ad1fe7cdcb44635627e18d5b2b04e

From 260259b146670295e5ad93223328f37fd52300fd Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 5 Aug 2019 13:05:07 +0200
Subject: [PATCH 712/844] Add a patch to add also CFLAGS into gtkdoc-scangobj
 call

---
 evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch | 12 ++++++++++++
 evolution.spec                                    |  4 +++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch

diff --git a/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch b/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch
new file mode 100644
index 0000000..7faea0d
--- /dev/null
+++ b/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch
@@ -0,0 +1,12 @@
+diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
+index 0ba1a7a78..2dfc4d691 100644
+--- a/cmake/modules/GtkDoc.cmake
++++ b/cmake/modules/GtkDoc.cmake
+@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
+ 
+ 	# Add it as the last, thus in-tree headers have precedence
+ 	list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
++	list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS})
+ 
+ 	if(_scangobj_deps)
+ 		list(REMOVE_DUPLICATES _scangobj_deps)
diff --git a/evolution.spec b/evolution.spec
index 74ec4c4..07691e1 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@ Source: http://download.gnome.org/sources/%{name}/3.33/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
-### Patches ###
+Patch01: evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch
 
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
@@ -228,6 +228,8 @@ the functionality of the installed %{name} package.
 %prep
 %setup -q -n %{name}-%{version}
 
+%patch01 -p1 -b .cflags-to-gtkdoc-scangobj
+
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
   echo -n "" > $inbox

From 139076b8f0b86124e653d21b10b874a733a9a788 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 5 Aug 2019 13:06:04 +0200
Subject: [PATCH 713/844] Update flatpak-evolution-wrapper.sh.in - kill
 gpg-agent it started

Thus the `bwrap evolution` can stop.

Related to https://gitlab.gnome.org/GNOME/evolution/issues/564
---
 flatpak-evolution-wrapper.sh.in | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
index 678b771..c57bfbe 100644
--- a/flatpak-evolution-wrapper.sh.in
+++ b/flatpak-evolution-wrapper.sh.in
@@ -28,4 +28,6 @@ else
    fi
 
    /app/bin/evolution.bin "$@"
+
+   pkill -TERM gpg-agent
 fi

From 4af50979876af681653479cfb9f8b05d617b8536 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 19 Aug 2019 10:59:56 +0200
Subject: [PATCH 714/844] Update to 3.33.91

---
 evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch | 12 ------------
 evolution.spec                                    |  9 ++++-----
 sources                                           |  2 +-
 3 files changed, 5 insertions(+), 18 deletions(-)
 delete mode 100644 evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch

diff --git a/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch b/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch
deleted file mode 100644
index 7faea0d..0000000
--- a/evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/cmake/modules/GtkDoc.cmake b/cmake/modules/GtkDoc.cmake
-index 0ba1a7a78..2dfc4d691 100644
---- a/cmake/modules/GtkDoc.cmake
-+++ b/cmake/modules/GtkDoc.cmake
-@@ -98,6 +98,7 @@ macro(add_gtkdoc _module _namespace _deprecated_guards _srcdirsvar _depsvar _ign
- 
- 	# Add it as the last, thus in-tree headers have precedence
- 	list(APPEND _scangobj_cflags_list -I${INCLUDE_INSTALL_DIR})
-+	list(APPEND _scangobj_cflags_list ${CMAKE_C_FLAGS})
- 
- 	if(_scangobj_deps)
- 		list(REMOVE_DUPLICATES _scangobj_deps)
diff --git a/evolution.spec b/evolution.spec
index 07691e1..b3d35ff 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,7 +35,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.33.90
+Version: 3.33.91
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -44,8 +44,6 @@ Source: http://download.gnome.org/sources/%{name}/3.33/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
-Patch01: evolution-3.33.90-cflags-to-gtkdoc-scangobj.patch
-
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -228,8 +226,6 @@ the functionality of the installed %{name} package.
 %prep
 %setup -q -n %{name}-%{version}
 
-%patch01 -p1 -b .cflags-to-gtkdoc-scangobj
-
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
   echo -n "" > $inbox
@@ -547,6 +543,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Aug 19 2019 Milan Crha  - 3.33.91-1
+- Update to 3.33.91
+
 * Mon Aug 05 2019 Milan Crha  - 3.33.90-1
 - Update to 3.33.90
 
diff --git a/sources b/sources
index 8caffc8..42e53b4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.33.90.tar.xz) = 666e84b49f7766f2d47bf2e13e0c06c0103c7547af72c677b14b66c3154e5ce23dbc90d52c356b523ca7c3b4193047bea45ad1fe7cdcb44635627e18d5b2b04e
+SHA512 (evolution-3.33.91.tar.xz) = 226c9f975004eee442160199e4470be232d9a80f64d996d2597799001b283a8befbda0f00520f1a027cda7361c9645d171817d89975a131b6170dc3f01e0e718

From c1397a8862b33ea6461ed8a9f72d3561c1e73807 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 2 Sep 2019 11:57:58 +0200
Subject: [PATCH 715/844] Update to 3.33.92

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index b3d35ff..af0552e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,7 +35,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.33.91
+Version: 3.33.92
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -543,6 +543,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Sep 02 2019 Milan Crha  - 3.33.92-1
+- Update to 3.33.92
+
 * Mon Aug 19 2019 Milan Crha  - 3.33.91-1
 - Update to 3.33.91
 
diff --git a/sources b/sources
index 42e53b4..5d76a60 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.33.91.tar.xz) = 226c9f975004eee442160199e4470be232d9a80f64d996d2597799001b283a8befbda0f00520f1a027cda7361c9645d171817d89975a131b6170dc3f01e0e718
+SHA512 (evolution-3.33.92.tar.xz) = 543b848f7c6fe5df05b82537f1aa2f28aca91a3b0ad575a87058f470061c8cd5b78d9eca9306ebded14c3ea9a78d70ba04393b3afd060c3c880158f6dcd17161

From e64c8a4fa473117ece700f48c6a1e62692884054 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 9 Sep 2019 11:00:05 +0200
Subject: [PATCH 716/844] Update to 3.34.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index af0552e..62ff380 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,12 +35,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.33.92
+Version: 3.34.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.33/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -543,6 +543,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Sep 09 2019 Milan Crha  - 3.34.0-1
+- Update to 3.34.0
+
 * Mon Sep 02 2019 Milan Crha  - 3.33.92-1
 - Update to 3.33.92
 
diff --git a/sources b/sources
index 5d76a60..5bc9798 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.33.92.tar.xz) = 543b848f7c6fe5df05b82537f1aa2f28aca91a3b0ad575a87058f470061c8cd5b78d9eca9306ebded14c3ea9a78d70ba04393b3afd060c3c880158f6dcd17161
+SHA512 (evolution-3.34.0.tar.xz) = d31ee2a5723166225288339bac1ea4b1b0b46c207167d4c851b7e344171667399783c055e7d5c84cbda93a8e893d2d8052d26c03b74af4986bfb886c5c595905

From 86d04b20fd287cf8e0374c99c816cbd96111b88c Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 7 Oct 2019 10:04:13 +0200
Subject: [PATCH 717/844] Update to 3.34.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 62ff380..496cddf 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,7 +35,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.34.0
+Version: 3.34.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -543,6 +543,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Oct 07 2019 Milan Crha  - 3.34.1-1
+- Update to 3.34.1
+
 * Mon Sep 09 2019 Milan Crha  - 3.34.0-1
 - Update to 3.34.0
 
diff --git a/sources b/sources
index 5bc9798..6450871 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.34.0.tar.xz) = d31ee2a5723166225288339bac1ea4b1b0b46c207167d4c851b7e344171667399783c055e7d5c84cbda93a8e893d2d8052d26c03b74af4986bfb886c5c595905
+SHA512 (evolution-3.34.1.tar.xz) = d72329b2dde41724cc8818f843b5530c5465e4fd7fceca3208a26180f9d6e286165d03d33ba4066e959a6e69bd1e5d33759d4287a57bb765bf7143410be6102c

From fb4509bdb2e43e610c1a466b0787293208bc6fc9 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 7 Oct 2019 11:34:13 +0200
Subject: [PATCH 718/844] module-itip-formatter-webextension.so does not exist
 anymore

---
 evolution.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 496cddf..3d12428 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -441,7 +441,6 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 # WebKit2 Extensions
 %{_libdir}/evolution/web-extensions/libewebextension.so
-%{_libdir}/evolution/web-extensions/module-itip-formatter-webextension.so
 %{_libdir}/evolution/web-extensions/webkit-editor/module-webkit-editor-webextension.so
 
 # Various libexec programs:

From 3843f64feaf1bc88f96aa96c9b353c07a91a5b80 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 11 Oct 2019 08:43:07 +0200
Subject: [PATCH 719/844] Update to 3.35.1

---
 evolution.spec | 9 ++++++---
 sources        | 2 +-
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 3d12428..03a3808 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -12,7 +12,7 @@
 %define libgdata_version 0.10.0
 %define libgweather_version 3.5.0
 %define libsoup_version 2.42
-%define webkit2gtk_version 2.13.90
+%define webkit2gtk_version 2.24.0
 
 %define last_anjal_version 0.3.2-3
 %define last_libgal2_version 2:2.5.3-2
@@ -35,12 +35,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.34.1
+Version: 3.35.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.34/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.35/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -542,6 +542,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Oct 11 2019 Milan Crha  - 3.35.1-1
+- Update to 3.35.1
+
 * Mon Oct 07 2019 Milan Crha  - 3.34.1-1
 - Update to 3.34.1
 
diff --git a/sources b/sources
index 6450871..5aa8f50 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.34.1.tar.xz) = d72329b2dde41724cc8818f843b5530c5465e4fd7fceca3208a26180f9d6e286165d03d33ba4066e959a6e69bd1e5d33759d4287a57bb765bf7143410be6102c
+SHA512 (evolution-3.35.1.tar.xz) = 0457baae9f3bc42d7fe214fa908bd70ed32a2a0887c32e0cc17df33636339be8bb9c60ebbe8ea7ee388a992c27d96c5bcf477b170c72218a8213b4e05814768c

From c423ca6b674d80e5b12dfaed9361b28cc07b9d73 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 11 Oct 2019 12:02:24 +0200
Subject: [PATCH 720/844] libedomutils.so had been removed

---
 evolution.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 03a3808..f71fc10 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -425,7 +425,6 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/libecontacteditor.so
 %{_libdir}/evolution/libecontactlisteditor.so
 %{_libdir}/evolution/libecontactprint.so
-%{_libdir}/evolution/libedomutils.so
 %{_libdir}/evolution/libemail-engine.so
 %{_libdir}/evolution/libevolution-mail-formatter.so
 %{_libdir}/evolution/libevolution-shell.so

From 51da7b6a76e34d3dfffae2c4896d3f954fcdf32a Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 22 Nov 2019 10:26:01 +0100
Subject: [PATCH 721/844] Update to 3.35.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index f71fc10..39c93e4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,7 +35,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.35.1
+Version: 3.35.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -541,6 +541,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Nov 22 2019 Milan Crha  - 3.35.2-1
+- Update to 3.35.2
+
 * Fri Oct 11 2019 Milan Crha  - 3.35.1-1
 - Update to 3.35.1
 
diff --git a/sources b/sources
index 5aa8f50..f6c9f7c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.35.1.tar.xz) = 0457baae9f3bc42d7fe214fa908bd70ed32a2a0887c32e0cc17df33636339be8bb9c60ebbe8ea7ee388a992c27d96c5bcf477b170c72218a8213b4e05814768c
+SHA512 (evolution-3.35.2.tar.xz) = dd2072fbf0476932e66010095e2e8c9d9469b0a2fed56edb229a30fbdbb89982f5f95f7331389c40bcd990275936f9f0ccdcb44cccb4309825309adb98afb4a4

From 75f7ac63ed09f1704aa06423e510b22bf3712277 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 3 Jan 2020 17:27:32 +0100
Subject: [PATCH 722/844] Update to 3.35.3

---
 evolution.spec | 6 +++++-
 sources        | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 39c93e4..1bd1981 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -35,7 +35,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.35.2
+Version: 3.35.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -80,6 +80,7 @@ BuildRequires: gtk-doc
 BuildRequires: highlight
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: itstool
+BuildRequires: make
 BuildRequires: pkgconfig
 BuildRequires: yelp-tools
 
@@ -541,6 +542,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 03 2020 Milan Crha  - 3.35.3-1
+- Update to 3.35.3
+
 * Fri Nov 22 2019 Milan Crha  - 3.35.2-1
 - Update to 3.35.2
 
diff --git a/sources b/sources
index f6c9f7c..8896889 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.35.2.tar.xz) = dd2072fbf0476932e66010095e2e8c9d9469b0a2fed56edb229a30fbdbb89982f5f95f7331389c40bcd990275936f9f0ccdcb44cccb4309825309adb98afb4a4
+SHA512 (evolution-3.35.3.tar.xz) = 350046d5b59572380c20eb6ded1074ebe93fb03c5db0c38995d5ea27880753b817499f066671ec103aaa7662e4a486cc503e3ddfeb131445b4b2f33261cc16d4

From 926fb3c7a97dc9d4bed43caf7a8805e118686f4f Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 6 Jan 2020 17:45:05 +0100
Subject: [PATCH 723/844] Enable TNEF support for Fedora (RH Bug #1782987)

---
 evolution.spec | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 1bd1981..b7041a7 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -4,6 +4,11 @@
 # correct Obsoletes for evolution-tests when this is changed
 %global enable_installed_tests 0
 
+%global tnef_support 0
+%if 0%{?fedora}
+%global tnef_support 1
+%endif
+
 %define glib2_version 2.46.0
 %define gtk3_version 3.10.0
 %define gnome_autoar_version 0.1.1
@@ -36,7 +41,7 @@
 
 Name: evolution
 Version: 3.35.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -116,6 +121,10 @@ BuildRequires: pkgconfig(shared-mime-info)
 BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
 BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk_version}
 
+%if %{tnef_support}
+BuildRequires: pkgconfig(libytnef)
+%endif
+
 %if %{ldap_support}
 BuildRequires: openldap-devel >= 2.0.11
 %endif
@@ -268,14 +277,19 @@ fi
 %define tests_flags -DENABLE_INSTALLED_TESTS=OFF
 %endif
 
+%if %{tnef_support}
+%global tnef_flags -DENABLE_YTNEF=ON
+%else
+%global tnef_flags -DENABLE_YTNEF=OFF
+%endif
+
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
 
 %cmake -G "Unix Makefiles" \
 	-DENABLE_MAINTAINER_MODE=OFF \
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
-	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags \
+	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \
 	-DENABLE_PLUGINS=all \
-	-DENABLE_YTNEF=OFF \
 	..
 
 make %{?_smp_mflags}
@@ -417,6 +431,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/modules/module-webkit-editor.so
 %{_libdir}/evolution/modules/module-webkit-inspector.so
 
+%if %{tnef_support}
+%{_libdir}/evolution/modules/module-tnef-attachment.so
+%endif
+
 %{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
 
 # Shared libraries:
@@ -542,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Jan 06 2020 Milan Crha  - 3.35.3-2
+- Enable TNEF support for Fedora
+
 * Fri Jan 03 2020 Milan Crha  - 3.35.3-1
 - Update to 3.35.3
 

From dc7980ff4e5ced658d38d365c8e69bf1b1791f89 Mon Sep 17 00:00:00 2001
From: Kalev Lember 
Date: Mon, 6 Jan 2020 13:44:31 +0100
Subject: [PATCH 724/844] Rebuilt for libgnome-desktop soname bump

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index b7041a7..819956d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -41,7 +41,7 @@
 
 Name: evolution
 Version: 3.35.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Thu Jan 16 2020 Kalev Lember  - 3.35.3-3
+- Rebuilt for libgnome-desktop soname bump
+
 * Mon Jan 06 2020 Milan Crha  - 3.35.3-2
 - Enable TNEF support for Fedora
 

From cded12c82fc4307fc41adb1f93e005d9eb806794 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Tue, 28 Jan 2020 17:54:56 +0000
Subject: [PATCH 725/844] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 819956d..3f66177 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -41,7 +41,7 @@
 
 Name: evolution
 Version: 3.35.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue Jan 28 2020 Fedora Release Engineering  - 3.35.3-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
 * Thu Jan 16 2020 Kalev Lember  - 3.35.3-3
 - Rebuilt for libgnome-desktop soname bump
 

From e7b0b8995824d675706208b6f53d07154225dc4f Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 31 Jan 2020 11:41:11 +0100
Subject: [PATCH 726/844] Update to 3.35.90

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 3f66177..0130cf8 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -40,8 +40,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.35.3
-Release: 4%{?dist}
+Version: 3.35.90
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 31 2020 Milan Crha  - 3.35.90-1
+- Update to 3.35.90
+
 * Tue Jan 28 2020 Fedora Release Engineering  - 3.35.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
diff --git a/sources b/sources
index 8896889..32e14d3 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.35.3.tar.xz) = 350046d5b59572380c20eb6ded1074ebe93fb03c5db0c38995d5ea27880753b817499f066671ec103aaa7662e4a486cc503e3ddfeb131445b4b2f33261cc16d4
+SHA512 (evolution-3.35.90.tar.xz) = f6f44ba79e1358679e25304e1c26be4c4fa1af22153ac3295bae614ff20a7643051332bba8d559576b98a6dadb621b446a991acc5aa9e48a3783112db843e1f4

From 5f5764aa967e222c520ce801760fb5e588ec893d Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 14 Feb 2020 11:09:54 +0100
Subject: [PATCH 727/844] Update to 3.35.91

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 0130cf8..7c674dd 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -40,7 +40,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.35.90
+Version: 3.35.91
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Feb 14 2020 Milan Crha  - 3.35.91-1
+- Update to 3.35.91
+
 * Fri Jan 31 2020 Milan Crha  - 3.35.90-1
 - Update to 3.35.90
 
diff --git a/sources b/sources
index 32e14d3..30496e6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.35.90.tar.xz) = f6f44ba79e1358679e25304e1c26be4c4fa1af22153ac3295bae614ff20a7643051332bba8d559576b98a6dadb621b446a991acc5aa9e48a3783112db843e1f4
+SHA512 (evolution-3.35.91.tar.xz) = 8595e0cd2e7873522cb0349a130020d5ad24c8bab03195e2377afde95edda1b01983302566f0e12fb4d131313f03ddb3ddb60791138e94ddbc6d7f4281e46b0d

From 223d147c3f020542324708ff01efbae9a63477f9 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 28 Feb 2020 10:28:43 +0100
Subject: [PATCH 728/844] Update to 3.35.92

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 7c674dd..0bc1369 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -40,7 +40,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.35.91
+Version: 3.35.92
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Feb 28 2020 Milan Crha  - 3.35.92-1
+- Update to 3.35.92
+
 * Fri Feb 14 2020 Milan Crha  - 3.35.91-1
 - Update to 3.35.91
 
diff --git a/sources b/sources
index 30496e6..df81f2b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.35.91.tar.xz) = 8595e0cd2e7873522cb0349a130020d5ad24c8bab03195e2377afde95edda1b01983302566f0e12fb4d131313f03ddb3ddb60791138e94ddbc6d7f4281e46b0d
+SHA512 (evolution-3.35.92.tar.xz) = ffd0feeae09bb56da9ce983de818da64cec137b9d1e0bbdf2fdf5e6cf992a4e9bc58e7fd9824db71a7459746211cf1dc4c6f3f4b9a2577a0362a6e4f105d01c1

From 7bc39e254a21752e9bd511ceb7e6253fd1ef1d6c Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 6 Mar 2020 08:50:29 +0100
Subject: [PATCH 729/844] Update to 3.36.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 0bc1369..676691a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -40,12 +40,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.35.92
+Version: 3.36.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.35/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 06 2020 Milan Crha  - 3.36.0-1
+- Update to 3.36.0
+
 * Fri Feb 28 2020 Milan Crha  - 3.35.92-1
 - Update to 3.35.92
 
diff --git a/sources b/sources
index df81f2b..393899b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.35.92.tar.xz) = ffd0feeae09bb56da9ce983de818da64cec137b9d1e0bbdf2fdf5e6cf992a4e9bc58e7fd9824db71a7459746211cf1dc4c6f3f4b9a2577a0362a6e4f105d01c1
+SHA512 (evolution-3.36.0.tar.xz) = 606584de713c637b95b190898c28b8d0670b7f5d700a36f8b613a135d79912141bfa14aad600c4d9b2227f9e2de982c1ca5894e69a78381a4e19abbc669906d5

From 8fcf95967040c04b4a750d6c94401ac0758016eb Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 27 Mar 2020 09:41:35 +0100
Subject: [PATCH 730/844] Update to 3.36.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 676691a..1106855 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -40,7 +40,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.36.0
+Version: 3.36.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 27 2020 Milan Crha  - 3.36.1-1
+- Update to 3.36.1
+
 * Fri Mar 06 2020 Milan Crha  - 3.36.0-1
 - Update to 3.36.0
 
diff --git a/sources b/sources
index 393899b..eb35eb9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.36.0.tar.xz) = 606584de713c637b95b190898c28b8d0670b7f5d700a36f8b613a135d79912141bfa14aad600c4d9b2227f9e2de982c1ca5894e69a78381a4e19abbc669906d5
+SHA512 (evolution-3.36.1.tar.xz) = 626e80494553dd2e9670d09453694a3d406924a961a4842720f5fdffbad7250922a3c0ccc5e1f477e6249767b2387e41c6b59db88948e4c74a1c6bb241354c3e

From 3a2a9ca9bdb38268a4219a5c6367e446edfb5ee6 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 24 Apr 2020 10:26:33 +0200
Subject: [PATCH 731/844] Update to 3.37.1

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 1106855..f6611a4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -40,12 +40,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.36.1
+Version: 3.37.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.36/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.37/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Apr 24 2020 Milan Crha  - 3.37.1-1
+- Update to 3.37.1
+
 * Fri Mar 27 2020 Milan Crha  - 3.36.1-1
 - Update to 3.36.1
 
diff --git a/sources b/sources
index eb35eb9..1c50d34 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.36.1.tar.xz) = 626e80494553dd2e9670d09453694a3d406924a961a4842720f5fdffbad7250922a3c0ccc5e1f477e6249767b2387e41c6b59db88948e4c74a1c6bb241354c3e
+SHA512 (evolution-3.37.1.tar.xz) = 21ab1aea30123a7f923d8dbfb27ea185a9c90c7dabbdd1eb434390e5b9167810ad1b2696df9de690f5b2f1c97750b71cf29327ac254e8ba5a8718180b2d7820d

From 461c016e27a08c0c0b69561c92a7935ad3bcdbae Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 24 Apr 2020 11:16:40 +0200
Subject: [PATCH 732/844] Add a new module-cal-config-webdav-notes.so into the
 .spec file

---
 evolution.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evolution.spec b/evolution.spec
index f6611a4..d8c7b37 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -409,6 +409,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/modules/module-cal-config-local.so
 %{_libdir}/evolution/modules/module-cal-config-weather.so
 %{_libdir}/evolution/modules/module-cal-config-webcal.so
+%{_libdir}/evolution/modules/module-cal-config-webdav-notes.so
 %{_libdir}/evolution/modules/module-calendar.so
 %{_libdir}/evolution/modules/module-composer-autosave.so
 %{_libdir}/evolution/modules/module-composer-to-meeting.so

From 5c6c34c87f0aee87005b2c8be9bc8ab009a11fcd Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 29 May 2020 14:10:05 +0200
Subject: [PATCH 733/844] Update to 3.37.2

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d8c7b37..2e99ee6 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -17,7 +17,7 @@
 %define libgdata_version 0.10.0
 %define libgweather_version 3.5.0
 %define libsoup_version 2.42
-%define webkit2gtk_version 2.24.0
+%define webkit2gtk_version 2.28.0
 
 %define last_anjal_version 0.3.2-3
 %define last_libgal2_version 2:2.5.3-2
@@ -40,7 +40,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.37.1
+Version: 3.37.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -561,6 +561,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri May 29 2020 Milan Crha  - 3.37.2-1
+- Update to 3.37.2
+
 * Fri Apr 24 2020 Milan Crha  - 3.37.1-1
 - Update to 3.37.1
 
diff --git a/sources b/sources
index 1c50d34..23ec06c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.37.1.tar.xz) = 21ab1aea30123a7f923d8dbfb27ea185a9c90c7dabbdd1eb434390e5b9167810ad1b2696df9de690f5b2f1c97750b71cf29327ac254e8ba5a8718180b2d7820d
+SHA512 (evolution-3.37.2.tar.xz) = f5e9fede217fe74917e2a1cee2e4c7f79f6595d6bf8270fc65ba85e01b183793dc978c2312feff06d84747c7774ec6855965d640f39e37d5b43cb4bc53423525

From 3fef373d47054190e071d2ce41bc763760c5548a Mon Sep 17 00:00:00 2001
From: Adam Williamson 
Date: Tue, 23 Jun 2020 13:22:24 -0700
Subject: [PATCH 734/844] Backport several fixes for annoying bugs from
 mainline

---
 ...orrect-caret-placement-around-signat.patch | 471 ++++++++++++++++++
 ...-freeze-on-drag-of-message-over-comp.patch |  58 +++
 ...ome-user-options-not-propagated-to-t.patch |  39 ++
 ...age-contains-search-broken-in-3.36.3.patch | 235 +++++++++
 ...ndeletable-empty-item-in-folder-list.patch | 137 +++++
 evolution.spec                                |  15 +-
 6 files changed, 953 insertions(+), 2 deletions(-)
 create mode 100644 0001-I-966-Composer-Correct-caret-placement-around-signat.patch
 create mode 100644 0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch
 create mode 100644 0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch
 create mode 100644 0004-I-982-Message-contains-search-broken-in-3.36.3.patch
 create mode 100644 0005-I-979-Undeletable-empty-item-in-folder-list.patch

diff --git a/0001-I-966-Composer-Correct-caret-placement-around-signat.patch b/0001-I-966-Composer-Correct-caret-placement-around-signat.patch
new file mode 100644
index 0000000..fef2437
--- /dev/null
+++ b/0001-I-966-Composer-Correct-caret-placement-around-signat.patch
@@ -0,0 +1,471 @@
+From 63102bd4672b4182e824963608ce73e0bcc417d2 Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Thu, 4 Jun 2020 17:49:22 +0200
+Subject: [PATCH 1/5] I#966 - Composer: Correct caret placement around
+ signature wrapper
+
+Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/966
+---
+ data/webkit/e-editor.js                     | 96 +++++++++++++--------
+ src/composer/e-composer-private.c           | 54 ++++++++++--
+ src/composer/e-composer-private.h           |  2 +
+ src/e-util/e-content-editor.c               |  2 +
+ src/e-util/e-content-editor.h               |  2 +
+ src/e-util/e-mail-signature-combo-box.c     |  6 ++
+ src/e-util/test-html-editor-units-bugs.c    |  1 +
+ src/modules/webkit-editor/e-webkit-editor.c | 14 ++-
+ 8 files changed, 121 insertions(+), 56 deletions(-)
+
+diff --git a/data/webkit/e-editor.js b/data/webkit/e-editor.js
+index 0451093a54..61dba68c94 100644
+--- a/data/webkit/e-editor.js
++++ b/data/webkit/e-editor.js
+@@ -79,7 +79,6 @@ var EvoEditor = {
+ 	UNICODE_SMILEYS : false,
+ 	WRAP_QUOTED_TEXT_IN_REPLIES : true,
+ 	START_BOTTOM : false,
+-	TOP_SIGNATURE : false,
+ 
+ 	FORCE_NO : 0,
+ 	FORCE_YES : 1,
+@@ -4719,6 +4718,31 @@ EvoEditor.GetCurrentSignatureUid = function()
+ 	return "";
+ }
+ 
++EvoEditor.insertEmptyParagraphBefore = function(beforeNode)
++{
++	var node = document.createElement("DIV");
++
++	node.appendChild(document.createElement("BR"));
++	document.body.insertBefore(node, beforeNode);
++	EvoEditor.maybeUpdateParagraphWidth(node);
++
++	return node;
++}
++
++EvoEditor.scrollIntoSelection = function()
++{
++	var node = document.getSelection().focusNode;
++
++	if (node) {
++		if (node.nodeType != node.ELEMENT_NODE)
++			node = node.parentElement;
++
++		if (node && node.scrollIntoView != undefined) {
++			node.scrollIntoView();
++		}
++	}
++}
++
+ EvoEditor.removeUnwantedTags = function(parent)
+ {
+ 	if (!parent)
+@@ -4735,12 +4759,9 @@ EvoEditor.removeUnwantedTags = function(parent)
+ 	}
+ }
+ 
+-EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkChanged, ignoreNextChange, startBottom, topSignature, addDelimiter)
++EvoEditor.InsertSignature = function(content, isHTML, canRepositionCaret, uid, fromMessage, checkChanged, ignoreNextChange, startBottom, topSignature, addDelimiter)
+ {
+-	var sigSpan, node, scrollX, scrollY;
+-
+-	scrollX = window.scrollX;
+-	scrollY = window.scrollY;
++	var sigSpan, node;
+ 
+ 	sigSpan = document.createElement("SPAN");
+ 	sigSpan.className = "-x-evo-signature";
+@@ -4819,8 +4840,9 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
+ 				if (checkChanged) {
+ 					/* Normalize the signature that we want to insert as the one in the
+ 					 * message already is normalized. */
+-					webkit_dom_node_normalize (WEBKIT_DOM_NODE (signature_to_insert));
+-					if (!webkit_dom_node_is_equal_node (WEBKIT_DOM_NODE (signature_to_insert), signature)) {
++					signature.normalize();
++
++					if (signature.firstElementChild && !signature.firstElementChild.isEqualNode(sigSpan)) {
+ 						/* Signature in the body is different than the one with the
+ 						 * same id, so set the active signature to None and leave
+ 						 * the signature that is in the body. */
+@@ -4835,7 +4857,7 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
+ 					if (signature.hasAttribute("name")) {
+ 						id = signature.getAttribute("name");
+ 						signature.id = id;
+-						signature.removeAttribute(name);
++						signature.removeAttribute("name");
+ 					} else {
+ 						id = signature.id;
+ 					}
+@@ -4902,7 +4924,9 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
+ 
+ 				EvoUndoRedo.StartRecord(EvoUndoRedo.RECORD_KIND_CUSTOM, "InsertSignature::new-changes", document.body, document.body, EvoEditor.CLAIM_CONTENT_FLAG_SAVE_HTML);
+ 				try {
+-					if (topSignature) {
++					var emptyDocument = !document.body.firstElementChild || !document.body.firstElementChild.nextElementSibling;
++
++					if (topSignature && !emptyDocument) {
+ 						document.body.insertBefore(useWrapper, document.body.firstChild);
+ 
+ 						node = document.createElement("DIV");
+@@ -4910,7 +4934,15 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
+ 						node.className = "-x-evo-top-signature-spacer";
+ 
+ 						document.body.insertBefore(node, useWrapper.nextSibling);
++
++						// Insert empty paragraph before the signature
++						EvoEditor.insertEmptyParagraphBefore(document.body.firstChild);
+ 					} else {
++						if (!startBottom && !emptyDocument) {
++							// Insert empty paragraph before the signature
++							EvoEditor.insertEmptyParagraphBefore(null);
++						}
++
+ 						document.body.appendChild(useWrapper);
+ 					}
+ 				} finally {
+@@ -4920,36 +4952,27 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
+ 
+ 			fromMessage = false;
+ 
+-			// Position the caret and scroll to it
+-			if (startBottom) {
+-				if (topSignature) {
+-					document.getSelection().setPosition(document.body.lastChild, 0);
+-				} else if (useWrapper.previousSibling) {
+-					document.getSelection().setPosition(useWrapper.previousSibling, 0);
++			if (canRepositionCaret) {
++				// Position the caret and scroll to it
++				if (startBottom) {
++					if (topSignature) {
++						document.getSelection().setPosition(document.body.lastChild, 0);
++					} else if (useWrapper.previousSibling) {
++						document.getSelection().setPosition(useWrapper.previousSibling, 0);
++					} else {
++						document.getSelection().setPosition(useWrapper, 0);
++					}
+ 				} else {
+-					document.getSelection().setPosition(useWrapper, 0);
++					document.getSelection().setPosition(document.body.firstChild, 0);
+ 				}
+-			} else {
+-				document.getSelection().setPosition(document.body.firstChild, 0);
+-			}
+-
+-			node = document.getSelection().anchorNode;
+ 
+-			if (node) {
+-				if (node.nodeType != node.ELEMENT_NODE)
+-					node = node.parentElement;
+-
+-				if (node && node.scrollIntoViewIfNeeded != undefined)
+-					node.scrollIntoViewIfNeeded();
++				EvoEditor.scrollIntoSelection();
+ 			}
+ 		}
+ 	} finally {
+ 		EvoUndoRedo.StopRecord(EvoUndoRedo.RECORD_KIND_GROUP, "InsertSignature");
+ 	}
+ 
+-	// the above changes can cause change of the scroll offset, thus restore it
+-	window.scrollTo(scrollX, scrollY);
+-
+ 	var res = [];
+ 
+ 	res["fromMessage"] = fromMessage;
+@@ -5716,15 +5739,12 @@ EvoEditor.processLoadedContent = function()
+ 		node.scrollIntoView();
+ 	}
+ 
+-	if (EvoEditor.START_BOTTOM) {
+-		var node = document.createElement("DIV");
+-
+-		node.appendChild(document.createElement("BR"));
+-		document.body.appendChild(node);
+-		EvoEditor.maybeUpdateParagraphWidth(node);
+-
++	if (EvoEditor.START_BOTTOM && document.body.firstElementChild && document.body.firstElementChild.nextElementSibling) {
++		node = EvoEditor.insertEmptyParagraphBefore(null);
+ 		document.getSelection().setPosition(node, 0);
+ 		node.scrollIntoView();
++	} else {
++		EvoEditor.scrollIntoSelection();
+ 	}
+ }
+ 
+diff --git a/src/composer/e-composer-private.c b/src/composer/e-composer-private.c
+index e4a1c17924..77d1ca7918 100644
+--- a/src/composer/e-composer-private.c
++++ b/src/composer/e-composer-private.c
+@@ -548,6 +548,8 @@ e_composer_private_finalize (EMsgComposer *composer)
+ 	g_ptr_array_foreach (array, (GFunc) g_free, NULL);
+ 	g_ptr_array_free (array, TRUE);
+ 
++	g_clear_object (&composer->priv->load_signature_cancellable);
++
+ 	g_free (composer->priv->charset);
+ 	g_free (composer->priv->mime_type);
+ 	g_free (composer->priv->mime_body);
+@@ -769,11 +771,29 @@ e_composer_selection_is_image_uris (EMsgComposer *composer,
+ 	return all_image_uris;
+ }
+ 
++typedef struct _UpdateSignatureData {
++	EMsgComposer *composer;
++	gboolean can_reposition_caret;
++} UpdateSignatureData;
++
++static void
++update_signature_data_free (gpointer ptr)
++{
++	UpdateSignatureData *usd = ptr;
++
++	if (usd) {
++		g_clear_object (&usd->composer);
++		g_slice_free (UpdateSignatureData, usd);
++	}
++}
++
+ static void
+ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
+-                            GAsyncResult *result,
+-                            EMsgComposer *composer)
++			    GAsyncResult *result,
++			    gpointer user_data)
+ {
++	UpdateSignatureData *usd = user_data;
++	EMsgComposer *composer = usd->composer;
+ 	gchar *contents = NULL, *new_signature_id;
+ 	gsize length = 0;
+ 	gboolean is_html;
+@@ -786,15 +806,18 @@ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
+ 
+ 	/* FIXME Use an EAlert here. */
+ 	if (error != NULL) {
+-		g_warning ("%s: %s", G_STRFUNC, error->message);
++		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
++			g_warning ("%s: %s", G_STRFUNC, error->message);
+ 		g_error_free (error);
+-		g_object_unref (composer);
++		update_signature_data_free (usd);
+ 		return;
+ 	}
+ 
++	g_clear_object (&composer->priv->load_signature_cancellable);
++
+ 	if (composer->priv->ignore_next_signature_change) {
+ 		composer->priv->ignore_next_signature_change = FALSE;
+-		g_object_unref (composer);
++		update_signature_data_free (usd);
+ 		return;
+ 	}
+ 
+@@ -805,6 +828,7 @@ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
+ 		cnt_editor,
+ 		contents,
+ 		is_html,
++		usd->can_reposition_caret,
+ 		gtk_combo_box_get_active_id (GTK_COMBO_BOX (combo_box)),
+ 		&composer->priv->set_signature_from_message,
+ 		&composer->priv->check_if_signature_is_changed,
+@@ -833,7 +857,7 @@ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
+ 
+ 	g_free (new_signature_id);
+ 	g_free (contents);
+-	g_object_unref (composer);
++	update_signature_data_free (usd);
+ }
+ 
+ static void
+@@ -853,9 +877,15 @@ e_composer_update_signature (EMsgComposer *composer)
+ 	EMailSignatureComboBox *combo_box;
+ 	EHTMLEditor *editor;
+ 	EContentEditor *cnt_editor;
++	UpdateSignatureData *usd;
+ 
+ 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
+ 
++	if (composer->priv->load_signature_cancellable) {
++		g_cancellable_cancel (composer->priv->load_signature_cancellable);
++		g_clear_object (&composer->priv->load_signature_cancellable);
++	}
++
+ 	/* Do nothing if we're redirecting a message or we disabled
+ 	 * the signature on purpose */
+ 	if (composer->priv->redirect || composer->priv->disable_signature)
+@@ -874,13 +904,19 @@ e_composer_update_signature (EMsgComposer *composer)
+ 		return;
+ 	}
+ 
++	composer->priv->load_signature_cancellable = g_cancellable_new ();
++
++	usd = g_slice_new (UpdateSignatureData);
++	usd->composer = g_object_ref (composer);
++	usd->can_reposition_caret = e_msg_composer_get_is_reply_or_forward (composer) &&
++		!gtk_widget_get_realized (GTK_WIDGET (composer));
++
+ 	/* XXX Signature files should be local and therefore load quickly,
+ 	 *     so while we do load them asynchronously we don't allow for
+ 	 *     user cancellation and we keep the composer alive until the
+ 	 *     asynchronous loading is complete. */
+ 	e_mail_signature_combo_box_load_selected (
+-		combo_box, G_PRIORITY_DEFAULT, NULL,
++		combo_box, G_PRIORITY_DEFAULT, composer->priv->load_signature_cancellable,
+ 		(GAsyncReadyCallback) composer_load_signature_cb,
+-		g_object_ref (composer));
++		usd);
+ }
+-
+diff --git a/src/composer/e-composer-private.h b/src/composer/e-composer-private.h
+index c415974cbc..19c1aefb64 100644
+--- a/src/composer/e-composer-private.h
++++ b/src/composer/e-composer-private.h
+@@ -124,6 +124,8 @@ struct _EMsgComposerPrivate {
+ 
+ 	guint content_hash_ref_count; /* when reaches 0, the content_hash is freed; to be able to reuse it */
+ 	EContentEditorContentHash *content_hash;
++
++	GCancellable *load_signature_cancellable;
+ };
+ 
+ void		e_composer_private_constructed	(EMsgComposer *composer);
+diff --git a/src/e-util/e-content-editor.c b/src/e-util/e-content-editor.c
+index 9f69638c39..ed07be45b2 100644
+--- a/src/e-util/e-content-editor.c
++++ b/src/e-util/e-content-editor.c
+@@ -2400,6 +2400,7 @@ gchar *
+ e_content_editor_insert_signature (EContentEditor *editor,
+                                    const gchar *content,
+                                    gboolean is_html,
++				   gboolean can_reposition_caret,
+                                    const gchar *signature_id,
+                                    gboolean *set_signature_from_message,
+                                    gboolean *check_if_signature_is_changed,
+@@ -2417,6 +2418,7 @@ e_content_editor_insert_signature (EContentEditor *editor,
+ 		editor,
+ 		content,
+ 		is_html,
++		can_reposition_caret,
+ 		signature_id,
+ 		set_signature_from_message,
+ 		check_if_signature_is_changed,
+diff --git a/src/e-util/e-content-editor.h b/src/e-util/e-content-editor.h
+index ae00b147f4..eaa7aab44d 100644
+--- a/src/e-util/e-content-editor.h
++++ b/src/e-util/e-content-editor.h
+@@ -145,6 +145,7 @@ struct _EContentEditorInterface {
+ 	gchar *		(*insert_signature)		(EContentEditor *editor,
+ 							 const gchar *content,
+ 							 gboolean is_html,
++							 gboolean can_reposition_caret,
+ 							 const gchar *signature_id,
+ 							 gboolean *set_signature_from_message,
+ 							 gboolean *check_if_signature_is_changed,
+@@ -644,6 +645,7 @@ gchar *		e_content_editor_insert_signature
+ 						(EContentEditor *editor,
+ 						 const gchar *content,
+ 						 gboolean is_html,
++						 gboolean can_reposition_caret,
+ 						 const gchar *signature_id,
+ 						 gboolean *set_signature_from_message,
+ 						 gboolean *check_if_signature_is_changed,
+diff --git a/src/e-util/e-mail-signature-combo-box.c b/src/e-util/e-mail-signature-combo-box.c
+index 8ba4428135..7dac48bc1e 100644
+--- a/src/e-util/e-mail-signature-combo-box.c
++++ b/src/e-util/e-mail-signature-combo-box.c
+@@ -615,6 +615,7 @@ e_mail_signature_combo_box_set_identity (EMailSignatureComboBox *combo_box,
+ typedef struct _LoadContext LoadContext;
+ 
+ struct _LoadContext {
++	GCancellable *cancellable;
+ 	gchar *contents;
+ 	gsize length;
+ 	gboolean is_html;
+@@ -623,6 +624,7 @@ struct _LoadContext {
+ static void
+ load_context_free (LoadContext *context)
+ {
++	g_clear_object (&context->cancellable);
+ 	g_free (context->contents);
+ 	g_slice_free (LoadContext, context);
+ }
+@@ -761,6 +763,7 @@ e_mail_signature_combo_box_load_selected (EMailSignatureComboBox *combo_box,
+ 	g_return_if_fail (E_IS_MAIL_SIGNATURE_COMBO_BOX (combo_box));
+ 
+ 	context = g_slice_new0 (LoadContext);
++	context->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
+ 
+ 	simple = g_simple_async_result_new (
+ 		G_OBJECT (combo_box), callback, user_data,
+@@ -824,6 +827,9 @@ e_mail_signature_combo_box_load_selected_finish (EMailSignatureComboBox *combo_b
+ 	if (g_simple_async_result_propagate_error (simple, error))
+ 		return FALSE;
+ 
++	if (g_cancellable_set_error_if_cancelled (context->cancellable, error))
++		return FALSE;
++
+ 	if (contents != NULL) {
+ 		*contents = context->contents;
+ 		context->contents = NULL;
+diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c
+index a67b8a478d..8ca3e532d5 100644
+--- a/src/e-util/test-html-editor-units-bugs.c
++++ b/src/e-util/test-html-editor-units-bugs.c
+@@ -712,6 +712,7 @@ test_bug_772513 (TestFixture *fixture)
+ 		cnt_editor,
+ 		"",
+ 		FALSE,
++		FALSE,
+ 		"none",
+ 		&set_signature_from_message,
+ 		&check_if_signature_is_changed,
+diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
+index a300f3b980..304781d626 100644
+--- a/src/modules/webkit-editor/e-webkit-editor.c
++++ b/src/modules/webkit-editor/e-webkit-editor.c
+@@ -2470,10 +2470,6 @@ webkit_editor_set_top_signature (EWebKitEditor *wk_editor,
+ 
+ 	wk_editor->priv->top_signature = value;
+ 
+-	e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
+-		"EvoEditor.TOP_SIGNATURE = %x;",
+-		e_webkit_editor_three_state_to_bool (value, "composer-top-signature"));
+-
+ 	g_object_notify (G_OBJECT (wk_editor), "top-signature");
+ }
+ 
+@@ -2579,6 +2575,7 @@ static gchar *
+ webkit_editor_insert_signature (EContentEditor *editor,
+                                 const gchar *content,
+                                 gboolean is_html,
++				gboolean can_reposition_caret,
+                                 const gchar *signature_id,
+                                 gboolean *set_signature_from_message,
+                                 gboolean *check_if_signature_is_changed,
+@@ -2597,9 +2594,10 @@ webkit_editor_insert_signature (EContentEditor *editor,
+ 	}
+ 
+ 	jsc_value = webkit_editor_call_jsc_sync (E_WEBKIT_EDITOR (editor),
+-		"EvoEditor.InsertSignature(%s, %x, %s, %x, %x, %x, %x, %x, %x);",
++		"EvoEditor.InsertSignature(%s, %x, %x, %s, %x, %x, %x, %x, %x, %x);",
+ 		content ? content : "",
+ 		is_html,
++		can_reposition_caret,
+ 		signature_id,
+ 		*set_signature_from_message,
+ 		*check_if_signature_is_changed,
+@@ -4798,10 +4796,8 @@ webkit_editor_load_changed_cb (EWebKitEditor *wk_editor,
+ 		return;
+ 
+ 	e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
+-		"EvoEditor.START_BOTTOM = %x;\n"
+-		"EvoEditor.TOP_SIGNATURE = %x;",
+-		e_webkit_editor_three_state_to_bool (wk_editor->priv->start_bottom, "composer-reply-start-bottom"),
+-		e_webkit_editor_three_state_to_bool (wk_editor->priv->top_signature, "composer-top-signature"));
++		"EvoEditor.START_BOTTOM = %x;",
++		e_webkit_editor_three_state_to_bool (wk_editor->priv->start_bottom, "composer-reply-start-bottom"));
+ 
+ 	/* Dispatch queued operations - as we are using this just for load
+ 	 * operations load just the latest request and throw away the rest. */
+-- 
+2.27.0
+
diff --git a/0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch b/0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch
new file mode 100644
index 0000000..e938e4b
--- /dev/null
+++ b/0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch
@@ -0,0 +1,58 @@
+From edfd6aa9b513c7347e930d44012c53123cf88a74 Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Fri, 5 Jun 2020 13:40:41 +0200
+Subject: [PATCH 2/5] I#969 - Workaround freeze on drag of message over
+ composer body
+
+Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/969
+---
+ src/modules/webkit-editor/e-webkit-editor.c | 26 +++++++++++++++++++++
+ 1 file changed, 26 insertions(+)
+
+diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
+index 304781d626..2a91782e41 100644
+--- a/src/modules/webkit-editor/e-webkit-editor.c
++++ b/src/modules/webkit-editor/e-webkit-editor.c
+@@ -5101,6 +5101,28 @@ webkit_editor_drag_leave_cb (EWebKitEditor *wk_editor,
+ 	g_signal_stop_emission_by_name (GTK_WIDGET (wk_editor), "drag-leave");
+ }
+ 
++static gboolean
++webkit_editor_drag_motion_cb (GtkWidget *widget,
++			      GdkDragContext *context,
++			      gint x,
++			      gint y,
++			      guint time,
++			      gpointer user_data)
++{
++	GdkAtom chosen;
++
++	chosen = gtk_drag_dest_find_target (widget, context, NULL);
++
++	/* This is when dragging message from the message list, which can eventually freeze
++	   Evolution, if PDF file format is set, when processes by WebKitGTK itself. */
++	if (chosen != GDK_NONE && chosen == gdk_atom_intern ("x-uid-list", TRUE)) {
++		gdk_drag_status (context, GDK_ACTION_COPY, time);
++		return TRUE;
++	}
++
++	return FALSE;
++}
++
+ static gboolean
+ webkit_editor_drag_drop_cb (EWebKitEditor *wk_editor,
+                             GdkDragContext *context,
+@@ -5533,6 +5555,10 @@ e_webkit_editor_init (EWebKitEditor *wk_editor)
+ 		wk_editor, "drag-drop",
+ 		G_CALLBACK (webkit_editor_drag_drop_cb), NULL);
+ 
++	g_signal_connect (
++		wk_editor, "drag-motion",
++		G_CALLBACK (webkit_editor_drag_motion_cb), NULL);
++
+ 	g_signal_connect (
+ 		wk_editor, "web-process-crashed",
+ 		G_CALLBACK (webkit_editor_web_process_crashed_cb), NULL);
+-- 
+2.27.0
+
diff --git a/0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch b/0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch
new file mode 100644
index 0000000..9f587e3
--- /dev/null
+++ b/0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch
@@ -0,0 +1,39 @@
+From b8acc612b838e7354c05efa8348954841566b26b Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Mon, 8 Jun 2020 09:17:32 +0200
+Subject: [PATCH 3/5] I#975 - Composer: Some user options not propagated to the
+ WebProcess
+
+Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/975
+---
+ src/modules/webkit-editor/e-webkit-editor.c | 14 ++++++++++++--
+ 1 file changed, 12 insertions(+), 2 deletions(-)
+
+diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
+index 2a91782e41..ca8bf6e65d 100644
+--- a/src/modules/webkit-editor/e-webkit-editor.c
++++ b/src/modules/webkit-editor/e-webkit-editor.c
+@@ -4796,8 +4796,18 @@ webkit_editor_load_changed_cb (EWebKitEditor *wk_editor,
+ 		return;
+ 
+ 	e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
+-		"EvoEditor.START_BOTTOM = %x;",
+-		e_webkit_editor_three_state_to_bool (wk_editor->priv->start_bottom, "composer-reply-start-bottom"));
++		"EvoEditor.NORMAL_PARAGRAPH_WIDTH = %d;"
++		"EvoEditor.START_BOTTOM = %x;"
++		"EvoEditor.MAGIC_LINKS = %x;"
++		"EvoEditor.MAGIC_SMILEYS = %x;"
++		"EvoEditor.UNICODE_SMILEYS = %x;"
++		"EvoEditor.WRAP_QUOTED_TEXT_IN_REPLIES = %x;",
++		wk_editor->priv->normal_paragraph_width,
++		e_webkit_editor_three_state_to_bool (wk_editor->priv->start_bottom, "composer-reply-start-bottom"),
++		wk_editor->priv->magic_links,
++		wk_editor->priv->magic_smileys,
++		wk_editor->priv->unicode_smileys,
++		wk_editor->priv->wrap_quoted_text_in_replies);
+ 
+ 	/* Dispatch queued operations - as we are using this just for load
+ 	 * operations load just the latest request and throw away the rest. */
+-- 
+2.27.0
+
diff --git a/0004-I-982-Message-contains-search-broken-in-3.36.3.patch b/0004-I-982-Message-contains-search-broken-in-3.36.3.patch
new file mode 100644
index 0000000..722551a
--- /dev/null
+++ b/0004-I-982-Message-contains-search-broken-in-3.36.3.patch
@@ -0,0 +1,235 @@
+From fb5dfe31f4985cf3b42eba899fd71f3cf2d256bf Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Thu, 11 Jun 2020 19:06:29 +0200
+Subject: [PATCH 4/5] I#982 - 'Message contains'-search broken in 3.36.3
+
+Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/982
+---
+ src/e-util/e-filter-rule.c           | 111 +++++++++++++++++++++++----
+ src/mail/message-list.c              |  18 ++---
+ src/mail/searchtypes.xml.in          |   8 +-
+ src/modules/mail/e-mail-shell-view.c |   2 +-
+ 4 files changed, 107 insertions(+), 32 deletions(-)
+
+diff --git a/src/e-util/e-filter-rule.c b/src/e-util/e-filter-rule.c
+index 2ec1d8dfc1..72bfc6af5e 100644
+--- a/src/e-util/e-filter-rule.c
++++ b/src/e-util/e-filter-rule.c
+@@ -811,9 +811,16 @@ filter_rule_xml_decode (EFilterRule *rule,
+ }
+ 
+ static void
+-filter_rule_build_code (EFilterRule *rule,
+-                        GString *out)
++filter_rule_build_code_for_parts (EFilterRule *rule,
++				  GList *parts,
++				  gboolean without_match_all,
++				  gboolean force_match_all,
++				  GString *out)
+ {
++	g_return_if_fail (rule != NULL);
++	g_return_if_fail (parts != NULL);
++	g_return_if_fail (out != NULL);
++
+ 	switch (rule->threading) {
+ 	case E_FILTER_THREAD_NONE:
+ 		break;
+@@ -831,25 +838,97 @@ filter_rule_build_code (EFilterRule *rule,
+ 		break;
+ 	}
+ 
+-	if (rule->threading != E_FILTER_THREAD_NONE)
++	if ((rule->threading != E_FILTER_THREAD_NONE && !without_match_all) || force_match_all)
+ 		g_string_append (out, "(match-all ");
+ 
+-	switch (rule->grouping) {
+-	case E_FILTER_GROUP_ALL:
+-		g_string_append (out, " (and\n  ");
+-		break;
+-	case E_FILTER_GROUP_ANY:
+-		g_string_append (out, " (or\n  ");
+-		break;
+-	default:
+-		g_warning ("Invalid grouping");
++	if (parts->next) {
++		switch (rule->grouping) {
++		case E_FILTER_GROUP_ALL:
++			g_string_append (out, " (and\n  ");
++			break;
++		case E_FILTER_GROUP_ANY:
++			g_string_append (out, " (or\n  ");
++			break;
++		default:
++			g_warning ("Invalid grouping");
++		}
++	}
++
++	e_filter_part_build_code_list (parts, out);
++
++	if (parts->next)
++		g_string_append (out, ")\n");
++
++	if (rule->threading != E_FILTER_THREAD_NONE) {
++		if (without_match_all && !force_match_all)
++			g_string_append (out, ")\n");
++		else
++			g_string_append (out, "))\n");
++	} else if (force_match_all) {
++		g_string_append (out, ")\n");
++	}
++}
++
++static void
++filter_rule_build_code (EFilterRule *rule,
++                        GString *out)
++{
++	GList *link;
++	gboolean has_body_search = FALSE;
++
++	if (!rule->parts)
++		return;
++
++	for (link = rule->parts; link && !has_body_search; link = g_list_next (link)) {
++		EFilterPart *part = link->data;
++
++		has_body_search = g_strcmp0 (part->name, "body") == 0;
+ 	}
+ 
+-	e_filter_part_build_code_list (rule->parts, out);
+-	g_string_append (out, ")\n");
++	if (has_body_search) {
++		GList *body_searches = NULL, *other_searches = NULL;
+ 
+-	if (rule->threading != E_FILTER_THREAD_NONE)
+-		g_string_append (out, "))\n");
++		for (link = rule->parts; link; link = g_list_next (link)) {
++			EFilterPart *part = link->data;
++
++			if (g_strcmp0 (part->name, "body") == 0) {
++				body_searches = g_list_prepend (body_searches, part);
++			} else {
++				other_searches = g_list_prepend (other_searches, part);
++			}
++		}
++
++		if (other_searches && body_searches) {
++			switch (rule->grouping) {
++			case E_FILTER_GROUP_ALL:
++				g_string_append (out, "(and ");
++				break;
++			case E_FILTER_GROUP_ANY:
++				g_string_append (out, "(or ");
++				break;
++			default:
++				g_warning ("Invalid grouping");
++			}
++
++			body_searches = g_list_reverse (body_searches);
++			other_searches = g_list_reverse (other_searches);
++
++			filter_rule_build_code_for_parts (rule, other_searches, FALSE, TRUE, out);
++
++			g_string_append_c (out, ' ');
++
++			filter_rule_build_code_for_parts (rule, body_searches, TRUE, FALSE, out);
++
++			g_string_append_c (out, ')');
++		} else {
++			filter_rule_build_code_for_parts (rule, rule->parts, FALSE, FALSE, out);
++		}
++
++		g_list_free (body_searches);
++		g_list_free (other_searches);
++	} else {
++		filter_rule_build_code_for_parts (rule, rule->parts, FALSE, FALSE, out);
++	}
+ }
+ 
+ static void
+diff --git a/src/mail/message-list.c b/src/mail/message-list.c
+index 01b7528850..2c5741a139 100644
+--- a/src/mail/message-list.c
++++ b/src/mail/message-list.c
+@@ -6176,7 +6176,7 @@ message_list_regen_thread (GSimpleAsyncResult *simple,
+ 	/* The 'expr' should be enclosed in "(match-all ...)", thus the search traverses
+ 	   folder content, but also try to not repeat it, to avoid unnecessary performance hits. */
+ 	if (regen_data->search != NULL) {
+-		gboolean is_match_all = g_str_has_prefix (regen_data->search, "(match-all ");
++		gboolean is_match_all = g_str_has_prefix (regen_data->search, "(match-all ") && !strstr (regen_data->search, "(body-contains ");
+ 		gboolean is_match_threads = strstr (regen_data->search, "(match-threads ") != NULL;
+ 
+ 		if (expr->len == 0) {
+@@ -6186,25 +6186,21 @@ message_list_regen_thread (GSimpleAsyncResult *simple,
+ 				g_string_prepend (expr, "(match-all ");
+ 				g_string_append_c (expr, ')');
+ 			}
+-		} else if (is_match_threads) {
++		} else if (is_match_threads || !is_match_all) {
+ 			/* The "match-threads" cannot be below "match-all". */
+ 			g_string_prepend (expr, "(and (match-all ");
+ 			g_string_append (expr, ") ");
+ 			g_string_append (expr, regen_data->search);
+ 			g_string_append_c (expr, ')');
+ 		} else {
++			const gchar *stripped_search = regen_data->search + 11; /* strlen ("(match-all ") */
++			gint len = strlen (stripped_search);
++
+ 			g_string_prepend (expr, "(match-all (and ");
+ 			g_string_append_c (expr, ' ');
+ 
+-			if (is_match_all) {
+-				const gchar *stripped_search = regen_data->search + 11; /* strlen ("(match-all ") */
+-				gint len = strlen (stripped_search);
+-
+-				if (len > 0 && stripped_search[len - 1] == ')') {
+-					g_string_append_len (expr, stripped_search, len - 1);
+-				} else {
+-					g_string_append (expr, regen_data->search);
+-				}
++			if (len > 0 && stripped_search[len - 1] == ')') {
++				g_string_append_len (expr, stripped_search, len - 1);
+ 			} else {
+ 				g_string_append (expr, regen_data->search);
+ 			}
+diff --git a/src/mail/searchtypes.xml.in b/src/mail/searchtypes.xml.in
+index e03e28e60f..d0362d59dd 100644
+--- a/src/mail/searchtypes.xml.in
++++ b/src/mail/searchtypes.xml.in
+@@ -728,10 +728,6 @@
+           
+           
+         
+-        
+-          
+-          
+-        
+         
+           
+           
+@@ -740,6 +736,10 @@
+           
+           
+         
++        
++          
++          
++        
+       
+       
+     
+diff --git a/src/modules/mail/e-mail-shell-view.c b/src/modules/mail/e-mail-shell-view.c
+index 8dcca65eca..be72de3441 100644
+--- a/src/modules/mail/e-mail-shell-view.c
++++ b/src/modules/mail/e-mail-shell-view.c
+@@ -752,7 +752,7 @@ filter:
+ 
+ 	/* Apply selected filter. */
+ 
+-	if (query && *query && !g_str_has_prefix (query, "(match-all ") && !strstr (query, "(match-threads ")) {
++	if (query && *query && !strstr (query, "(match-all ") && !strstr (query, "(match-threads ")) {
+ 		/* Make sure the query is enclosed in "(match-all ...)", to traverse the folders' content */
+ 		temp = g_strconcat ("(match-all ", query, ")", NULL);
+ 		g_free (query);
+-- 
+2.27.0
+
diff --git a/0005-I-979-Undeletable-empty-item-in-folder-list.patch b/0005-I-979-Undeletable-empty-item-in-folder-list.patch
new file mode 100644
index 0000000..4932196
--- /dev/null
+++ b/0005-I-979-Undeletable-empty-item-in-folder-list.patch
@@ -0,0 +1,137 @@
+From c72c70e1b3eb9142e98b73ac06a38fedda7fb7d2 Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Thu, 18 Jun 2020 09:54:55 +0200
+Subject: [PATCH 5/5] I#979 - Undeletable empty item in folder list
+
+Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/979
+---
+ src/mail/em-folder-tree-model.c | 34 ++++++++++++++++++---------------
+ src/mail/em-folder-tree-model.h |  2 +-
+ src/mail/em-folder-tree.c       |  5 ++---
+ 3 files changed, 22 insertions(+), 19 deletions(-)
+
+diff --git a/src/mail/em-folder-tree-model.c b/src/mail/em-folder-tree-model.c
+index d43fb1e1c4..0d3e50fedc 100644
+--- a/src/mail/em-folder-tree-model.c
++++ b/src/mail/em-folder-tree-model.c
+@@ -1385,7 +1385,7 @@ em_folder_tree_model_set_session (EMFolderTreeModel *model,
+ 	g_object_notify (G_OBJECT (model), "session");
+ }
+ 
+-void
++gboolean
+ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
+                                       GtkTreeIter *iter,
+                                       CamelStore *store,
+@@ -1414,18 +1414,18 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
+ 	gboolean folder_is_outbox = FALSE;
+ 	gchar *uri;
+ 
+-	g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model));
+-	g_return_if_fail (iter != NULL);
+-	g_return_if_fail (CAMEL_IS_STORE (store));
+-	g_return_if_fail (fi != NULL);
++	g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), FALSE);
++	g_return_val_if_fail (iter != NULL, FALSE);
++	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
++	g_return_val_if_fail (fi != NULL, FALSE);
+ 
+ 	si = folder_tree_model_store_index_lookup (model, store);
+-	g_return_if_fail (si != NULL);
++	g_return_val_if_fail (si != NULL, FALSE);
+ 
+ 	/* Make sure we don't already know about it. */
+ 	if (g_hash_table_lookup (si->full_hash, fi->full_name)) {
+ 		store_info_unref (si);
+-		return;
++		return FALSE;
+ 	}
+ 
+ 	if (!si->loaded)
+@@ -1568,7 +1568,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
+ 		g_signal_emit (model, signals[LOADED_ROW], 0, path, iter);
+ 		g_signal_emit (model, signals[LOADING_ROW], 0, path, iter);
+ 		gtk_tree_path_free (path);
+-		return;
++		return TRUE;
+ 	}
+ 
+ 	if (fi->child) {
+@@ -1587,8 +1587,9 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
+ 				emitted = TRUE;
+ 			}
+ 
+-			em_folder_tree_model_set_folder_info (
+-				model, &sub, store, fi, fully_loaded);
++			if (!em_folder_tree_model_set_folder_info (model, &sub, store, fi, fully_loaded))
++				gtk_tree_store_remove (tree_store, &sub);
++
+ 			fi = fi->next;
+ 		} while (fi);
+ 	}
+@@ -1598,6 +1599,8 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
+ 		g_signal_emit (model, signals[LOADED_ROW], 0, path, iter);
+ 		gtk_tree_path_free (path);
+ 	}
++
++	return TRUE;
+ }
+ 
+ static void
+@@ -1676,8 +1679,9 @@ folder_tree_model_folder_renamed_cb (CamelStore *store,
+ 	gtk_tree_path_free (path);
+ 
+ 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &root);
+-	em_folder_tree_model_set_folder_info (
+-		EM_FOLDER_TREE_MODEL (model), &iter, store, info, TRUE);
++
++	if (!em_folder_tree_model_set_folder_info (EM_FOLDER_TREE_MODEL (model), &iter, store, info, TRUE))
++		gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
+ }
+ 
+ static void
+@@ -1741,9 +1745,9 @@ folder_tree_model_folder_subscribed_cb (CamelStore *store,
+ 
+ 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent);
+ 
+-	em_folder_tree_model_set_folder_info (
+-		EM_FOLDER_TREE_MODEL (model), &iter, store, fi,
+-		(fi->flags & (CAMEL_FOLDER_NOINFERIORS | CAMEL_FOLDER_NOCHILDREN)) != 0);
++	if (!em_folder_tree_model_set_folder_info (EM_FOLDER_TREE_MODEL (model), &iter, store, fi,
++		(fi->flags & (CAMEL_FOLDER_NOINFERIORS | CAMEL_FOLDER_NOCHILDREN)) != 0))
++		gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
+ }
+ 
+ static void
+diff --git a/src/mail/em-folder-tree-model.h b/src/mail/em-folder-tree-model.h
+index 1402144e4c..45784278be 100644
+--- a/src/mail/em-folder-tree-model.h
++++ b/src/mail/em-folder-tree-model.h
+@@ -123,7 +123,7 @@ EMailSession *	em_folder_tree_model_get_session
+ void		em_folder_tree_model_set_session
+ 					(EMFolderTreeModel *model,
+ 					 EMailSession *session);
+-void		em_folder_tree_model_set_folder_info
++gboolean	em_folder_tree_model_set_folder_info
+ 					(EMFolderTreeModel *model,
+ 					 GtkTreeIter *iter,
+ 					 CamelStore *store,
+diff --git a/src/mail/em-folder-tree.c b/src/mail/em-folder-tree.c
+index 39871c6f1f..b4eab4f9f8 100644
+--- a/src/mail/em-folder-tree.c
++++ b/src/mail/em-folder-tree.c
+@@ -363,9 +363,8 @@ folder_tree_get_folder_info_cb (CamelStore *store,
+ 						GTK_TREE_STORE (model),
+ 						&iter, &root);
+ 
+-				em_folder_tree_model_set_folder_info (
+-					EM_FOLDER_TREE_MODEL (model),
+-					&iter, store, child_info, TRUE);
++				if (!em_folder_tree_model_set_folder_info (EM_FOLDER_TREE_MODEL (model), &iter, store, child_info, TRUE))
++					gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
+ 			}
+ 
+ 			child_info = child_info->next;
+-- 
+2.27.0
+
diff --git a/evolution.spec b/evolution.spec
index 2e99ee6..40a3ab2 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -41,7 +41,7 @@
 
 Name: evolution
 Version: 3.37.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -49,6 +49,14 @@ Source: http://download.gnome.org/sources/%{name}/3.37/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+# Various bugfix backports from upstream mainline
+Patch0001: 0001-I-966-Composer-Correct-caret-placement-around-signat.patch
+Patch0002: 0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch
+Patch0003: 0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch
+Patch0004: 0004-I-982-Message-contains-search-broken-in-3.36.3.patch
+Patch0005: 0005-I-979-Undeletable-empty-item-in-folder-list.patch
+
+
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -234,7 +242,7 @@ the functionality of the installed %{name} package.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%autosetup -p1 -n %{name}-%{version}
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -561,6 +569,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue Jun 23 2020 Adam Williamson  - 3.37.2-2
+- Backport several fixes for annoying bugs from mainline
+
 * Fri May 29 2020 Milan Crha  - 3.37.2-1
 - Update to 3.37.2
 

From 97079f55ec1717bed6adb771fc1c1d683e85018a Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 3 Jul 2020 09:29:15 +0200
Subject: [PATCH 735/844] Update to 3.37.3

---
 ...orrect-caret-placement-around-signat.patch | 471 ------------------
 ...-freeze-on-drag-of-message-over-comp.patch |  58 ---
 ...ome-user-options-not-propagated-to-t.patch |  39 --
 ...age-contains-search-broken-in-3.36.3.patch | 235 ---------
 ...ndeletable-empty-item-in-folder-list.patch | 137 -----
 evolution.spec                                |  17 +-
 sources                                       |   2 +-
 7 files changed, 7 insertions(+), 952 deletions(-)
 delete mode 100644 0001-I-966-Composer-Correct-caret-placement-around-signat.patch
 delete mode 100644 0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch
 delete mode 100644 0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch
 delete mode 100644 0004-I-982-Message-contains-search-broken-in-3.36.3.patch
 delete mode 100644 0005-I-979-Undeletable-empty-item-in-folder-list.patch

diff --git a/0001-I-966-Composer-Correct-caret-placement-around-signat.patch b/0001-I-966-Composer-Correct-caret-placement-around-signat.patch
deleted file mode 100644
index fef2437..0000000
--- a/0001-I-966-Composer-Correct-caret-placement-around-signat.patch
+++ /dev/null
@@ -1,471 +0,0 @@
-From 63102bd4672b4182e824963608ce73e0bcc417d2 Mon Sep 17 00:00:00 2001
-From: Milan Crha 
-Date: Thu, 4 Jun 2020 17:49:22 +0200
-Subject: [PATCH 1/5] I#966 - Composer: Correct caret placement around
- signature wrapper
-
-Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/966
----
- data/webkit/e-editor.js                     | 96 +++++++++++++--------
- src/composer/e-composer-private.c           | 54 ++++++++++--
- src/composer/e-composer-private.h           |  2 +
- src/e-util/e-content-editor.c               |  2 +
- src/e-util/e-content-editor.h               |  2 +
- src/e-util/e-mail-signature-combo-box.c     |  6 ++
- src/e-util/test-html-editor-units-bugs.c    |  1 +
- src/modules/webkit-editor/e-webkit-editor.c | 14 ++-
- 8 files changed, 121 insertions(+), 56 deletions(-)
-
-diff --git a/data/webkit/e-editor.js b/data/webkit/e-editor.js
-index 0451093a54..61dba68c94 100644
---- a/data/webkit/e-editor.js
-+++ b/data/webkit/e-editor.js
-@@ -79,7 +79,6 @@ var EvoEditor = {
- 	UNICODE_SMILEYS : false,
- 	WRAP_QUOTED_TEXT_IN_REPLIES : true,
- 	START_BOTTOM : false,
--	TOP_SIGNATURE : false,
- 
- 	FORCE_NO : 0,
- 	FORCE_YES : 1,
-@@ -4719,6 +4718,31 @@ EvoEditor.GetCurrentSignatureUid = function()
- 	return "";
- }
- 
-+EvoEditor.insertEmptyParagraphBefore = function(beforeNode)
-+{
-+	var node = document.createElement("DIV");
-+
-+	node.appendChild(document.createElement("BR"));
-+	document.body.insertBefore(node, beforeNode);
-+	EvoEditor.maybeUpdateParagraphWidth(node);
-+
-+	return node;
-+}
-+
-+EvoEditor.scrollIntoSelection = function()
-+{
-+	var node = document.getSelection().focusNode;
-+
-+	if (node) {
-+		if (node.nodeType != node.ELEMENT_NODE)
-+			node = node.parentElement;
-+
-+		if (node && node.scrollIntoView != undefined) {
-+			node.scrollIntoView();
-+		}
-+	}
-+}
-+
- EvoEditor.removeUnwantedTags = function(parent)
- {
- 	if (!parent)
-@@ -4735,12 +4759,9 @@ EvoEditor.removeUnwantedTags = function(parent)
- 	}
- }
- 
--EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkChanged, ignoreNextChange, startBottom, topSignature, addDelimiter)
-+EvoEditor.InsertSignature = function(content, isHTML, canRepositionCaret, uid, fromMessage, checkChanged, ignoreNextChange, startBottom, topSignature, addDelimiter)
- {
--	var sigSpan, node, scrollX, scrollY;
--
--	scrollX = window.scrollX;
--	scrollY = window.scrollY;
-+	var sigSpan, node;
- 
- 	sigSpan = document.createElement("SPAN");
- 	sigSpan.className = "-x-evo-signature";
-@@ -4819,8 +4840,9 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
- 				if (checkChanged) {
- 					/* Normalize the signature that we want to insert as the one in the
- 					 * message already is normalized. */
--					webkit_dom_node_normalize (WEBKIT_DOM_NODE (signature_to_insert));
--					if (!webkit_dom_node_is_equal_node (WEBKIT_DOM_NODE (signature_to_insert), signature)) {
-+					signature.normalize();
-+
-+					if (signature.firstElementChild && !signature.firstElementChild.isEqualNode(sigSpan)) {
- 						/* Signature in the body is different than the one with the
- 						 * same id, so set the active signature to None and leave
- 						 * the signature that is in the body. */
-@@ -4835,7 +4857,7 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
- 					if (signature.hasAttribute("name")) {
- 						id = signature.getAttribute("name");
- 						signature.id = id;
--						signature.removeAttribute(name);
-+						signature.removeAttribute("name");
- 					} else {
- 						id = signature.id;
- 					}
-@@ -4902,7 +4924,9 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
- 
- 				EvoUndoRedo.StartRecord(EvoUndoRedo.RECORD_KIND_CUSTOM, "InsertSignature::new-changes", document.body, document.body, EvoEditor.CLAIM_CONTENT_FLAG_SAVE_HTML);
- 				try {
--					if (topSignature) {
-+					var emptyDocument = !document.body.firstElementChild || !document.body.firstElementChild.nextElementSibling;
-+
-+					if (topSignature && !emptyDocument) {
- 						document.body.insertBefore(useWrapper, document.body.firstChild);
- 
- 						node = document.createElement("DIV");
-@@ -4910,7 +4934,15 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
- 						node.className = "-x-evo-top-signature-spacer";
- 
- 						document.body.insertBefore(node, useWrapper.nextSibling);
-+
-+						// Insert empty paragraph before the signature
-+						EvoEditor.insertEmptyParagraphBefore(document.body.firstChild);
- 					} else {
-+						if (!startBottom && !emptyDocument) {
-+							// Insert empty paragraph before the signature
-+							EvoEditor.insertEmptyParagraphBefore(null);
-+						}
-+
- 						document.body.appendChild(useWrapper);
- 					}
- 				} finally {
-@@ -4920,36 +4952,27 @@ EvoEditor.InsertSignature = function(content, isHTML, uid, fromMessage, checkCha
- 
- 			fromMessage = false;
- 
--			// Position the caret and scroll to it
--			if (startBottom) {
--				if (topSignature) {
--					document.getSelection().setPosition(document.body.lastChild, 0);
--				} else if (useWrapper.previousSibling) {
--					document.getSelection().setPosition(useWrapper.previousSibling, 0);
-+			if (canRepositionCaret) {
-+				// Position the caret and scroll to it
-+				if (startBottom) {
-+					if (topSignature) {
-+						document.getSelection().setPosition(document.body.lastChild, 0);
-+					} else if (useWrapper.previousSibling) {
-+						document.getSelection().setPosition(useWrapper.previousSibling, 0);
-+					} else {
-+						document.getSelection().setPosition(useWrapper, 0);
-+					}
- 				} else {
--					document.getSelection().setPosition(useWrapper, 0);
-+					document.getSelection().setPosition(document.body.firstChild, 0);
- 				}
--			} else {
--				document.getSelection().setPosition(document.body.firstChild, 0);
--			}
--
--			node = document.getSelection().anchorNode;
- 
--			if (node) {
--				if (node.nodeType != node.ELEMENT_NODE)
--					node = node.parentElement;
--
--				if (node && node.scrollIntoViewIfNeeded != undefined)
--					node.scrollIntoViewIfNeeded();
-+				EvoEditor.scrollIntoSelection();
- 			}
- 		}
- 	} finally {
- 		EvoUndoRedo.StopRecord(EvoUndoRedo.RECORD_KIND_GROUP, "InsertSignature");
- 	}
- 
--	// the above changes can cause change of the scroll offset, thus restore it
--	window.scrollTo(scrollX, scrollY);
--
- 	var res = [];
- 
- 	res["fromMessage"] = fromMessage;
-@@ -5716,15 +5739,12 @@ EvoEditor.processLoadedContent = function()
- 		node.scrollIntoView();
- 	}
- 
--	if (EvoEditor.START_BOTTOM) {
--		var node = document.createElement("DIV");
--
--		node.appendChild(document.createElement("BR"));
--		document.body.appendChild(node);
--		EvoEditor.maybeUpdateParagraphWidth(node);
--
-+	if (EvoEditor.START_BOTTOM && document.body.firstElementChild && document.body.firstElementChild.nextElementSibling) {
-+		node = EvoEditor.insertEmptyParagraphBefore(null);
- 		document.getSelection().setPosition(node, 0);
- 		node.scrollIntoView();
-+	} else {
-+		EvoEditor.scrollIntoSelection();
- 	}
- }
- 
-diff --git a/src/composer/e-composer-private.c b/src/composer/e-composer-private.c
-index e4a1c17924..77d1ca7918 100644
---- a/src/composer/e-composer-private.c
-+++ b/src/composer/e-composer-private.c
-@@ -548,6 +548,8 @@ e_composer_private_finalize (EMsgComposer *composer)
- 	g_ptr_array_foreach (array, (GFunc) g_free, NULL);
- 	g_ptr_array_free (array, TRUE);
- 
-+	g_clear_object (&composer->priv->load_signature_cancellable);
-+
- 	g_free (composer->priv->charset);
- 	g_free (composer->priv->mime_type);
- 	g_free (composer->priv->mime_body);
-@@ -769,11 +771,29 @@ e_composer_selection_is_image_uris (EMsgComposer *composer,
- 	return all_image_uris;
- }
- 
-+typedef struct _UpdateSignatureData {
-+	EMsgComposer *composer;
-+	gboolean can_reposition_caret;
-+} UpdateSignatureData;
-+
-+static void
-+update_signature_data_free (gpointer ptr)
-+{
-+	UpdateSignatureData *usd = ptr;
-+
-+	if (usd) {
-+		g_clear_object (&usd->composer);
-+		g_slice_free (UpdateSignatureData, usd);
-+	}
-+}
-+
- static void
- composer_load_signature_cb (EMailSignatureComboBox *combo_box,
--                            GAsyncResult *result,
--                            EMsgComposer *composer)
-+			    GAsyncResult *result,
-+			    gpointer user_data)
- {
-+	UpdateSignatureData *usd = user_data;
-+	EMsgComposer *composer = usd->composer;
- 	gchar *contents = NULL, *new_signature_id;
- 	gsize length = 0;
- 	gboolean is_html;
-@@ -786,15 +806,18 @@ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
- 
- 	/* FIXME Use an EAlert here. */
- 	if (error != NULL) {
--		g_warning ("%s: %s", G_STRFUNC, error->message);
-+		if (!g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
-+			g_warning ("%s: %s", G_STRFUNC, error->message);
- 		g_error_free (error);
--		g_object_unref (composer);
-+		update_signature_data_free (usd);
- 		return;
- 	}
- 
-+	g_clear_object (&composer->priv->load_signature_cancellable);
-+
- 	if (composer->priv->ignore_next_signature_change) {
- 		composer->priv->ignore_next_signature_change = FALSE;
--		g_object_unref (composer);
-+		update_signature_data_free (usd);
- 		return;
- 	}
- 
-@@ -805,6 +828,7 @@ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
- 		cnt_editor,
- 		contents,
- 		is_html,
-+		usd->can_reposition_caret,
- 		gtk_combo_box_get_active_id (GTK_COMBO_BOX (combo_box)),
- 		&composer->priv->set_signature_from_message,
- 		&composer->priv->check_if_signature_is_changed,
-@@ -833,7 +857,7 @@ composer_load_signature_cb (EMailSignatureComboBox *combo_box,
- 
- 	g_free (new_signature_id);
- 	g_free (contents);
--	g_object_unref (composer);
-+	update_signature_data_free (usd);
- }
- 
- static void
-@@ -853,9 +877,15 @@ e_composer_update_signature (EMsgComposer *composer)
- 	EMailSignatureComboBox *combo_box;
- 	EHTMLEditor *editor;
- 	EContentEditor *cnt_editor;
-+	UpdateSignatureData *usd;
- 
- 	g_return_if_fail (E_IS_MSG_COMPOSER (composer));
- 
-+	if (composer->priv->load_signature_cancellable) {
-+		g_cancellable_cancel (composer->priv->load_signature_cancellable);
-+		g_clear_object (&composer->priv->load_signature_cancellable);
-+	}
-+
- 	/* Do nothing if we're redirecting a message or we disabled
- 	 * the signature on purpose */
- 	if (composer->priv->redirect || composer->priv->disable_signature)
-@@ -874,13 +904,19 @@ e_composer_update_signature (EMsgComposer *composer)
- 		return;
- 	}
- 
-+	composer->priv->load_signature_cancellable = g_cancellable_new ();
-+
-+	usd = g_slice_new (UpdateSignatureData);
-+	usd->composer = g_object_ref (composer);
-+	usd->can_reposition_caret = e_msg_composer_get_is_reply_or_forward (composer) &&
-+		!gtk_widget_get_realized (GTK_WIDGET (composer));
-+
- 	/* XXX Signature files should be local and therefore load quickly,
- 	 *     so while we do load them asynchronously we don't allow for
- 	 *     user cancellation and we keep the composer alive until the
- 	 *     asynchronous loading is complete. */
- 	e_mail_signature_combo_box_load_selected (
--		combo_box, G_PRIORITY_DEFAULT, NULL,
-+		combo_box, G_PRIORITY_DEFAULT, composer->priv->load_signature_cancellable,
- 		(GAsyncReadyCallback) composer_load_signature_cb,
--		g_object_ref (composer));
-+		usd);
- }
--
-diff --git a/src/composer/e-composer-private.h b/src/composer/e-composer-private.h
-index c415974cbc..19c1aefb64 100644
---- a/src/composer/e-composer-private.h
-+++ b/src/composer/e-composer-private.h
-@@ -124,6 +124,8 @@ struct _EMsgComposerPrivate {
- 
- 	guint content_hash_ref_count; /* when reaches 0, the content_hash is freed; to be able to reuse it */
- 	EContentEditorContentHash *content_hash;
-+
-+	GCancellable *load_signature_cancellable;
- };
- 
- void		e_composer_private_constructed	(EMsgComposer *composer);
-diff --git a/src/e-util/e-content-editor.c b/src/e-util/e-content-editor.c
-index 9f69638c39..ed07be45b2 100644
---- a/src/e-util/e-content-editor.c
-+++ b/src/e-util/e-content-editor.c
-@@ -2400,6 +2400,7 @@ gchar *
- e_content_editor_insert_signature (EContentEditor *editor,
-                                    const gchar *content,
-                                    gboolean is_html,
-+				   gboolean can_reposition_caret,
-                                    const gchar *signature_id,
-                                    gboolean *set_signature_from_message,
-                                    gboolean *check_if_signature_is_changed,
-@@ -2417,6 +2418,7 @@ e_content_editor_insert_signature (EContentEditor *editor,
- 		editor,
- 		content,
- 		is_html,
-+		can_reposition_caret,
- 		signature_id,
- 		set_signature_from_message,
- 		check_if_signature_is_changed,
-diff --git a/src/e-util/e-content-editor.h b/src/e-util/e-content-editor.h
-index ae00b147f4..eaa7aab44d 100644
---- a/src/e-util/e-content-editor.h
-+++ b/src/e-util/e-content-editor.h
-@@ -145,6 +145,7 @@ struct _EContentEditorInterface {
- 	gchar *		(*insert_signature)		(EContentEditor *editor,
- 							 const gchar *content,
- 							 gboolean is_html,
-+							 gboolean can_reposition_caret,
- 							 const gchar *signature_id,
- 							 gboolean *set_signature_from_message,
- 							 gboolean *check_if_signature_is_changed,
-@@ -644,6 +645,7 @@ gchar *		e_content_editor_insert_signature
- 						(EContentEditor *editor,
- 						 const gchar *content,
- 						 gboolean is_html,
-+						 gboolean can_reposition_caret,
- 						 const gchar *signature_id,
- 						 gboolean *set_signature_from_message,
- 						 gboolean *check_if_signature_is_changed,
-diff --git a/src/e-util/e-mail-signature-combo-box.c b/src/e-util/e-mail-signature-combo-box.c
-index 8ba4428135..7dac48bc1e 100644
---- a/src/e-util/e-mail-signature-combo-box.c
-+++ b/src/e-util/e-mail-signature-combo-box.c
-@@ -615,6 +615,7 @@ e_mail_signature_combo_box_set_identity (EMailSignatureComboBox *combo_box,
- typedef struct _LoadContext LoadContext;
- 
- struct _LoadContext {
-+	GCancellable *cancellable;
- 	gchar *contents;
- 	gsize length;
- 	gboolean is_html;
-@@ -623,6 +624,7 @@ struct _LoadContext {
- static void
- load_context_free (LoadContext *context)
- {
-+	g_clear_object (&context->cancellable);
- 	g_free (context->contents);
- 	g_slice_free (LoadContext, context);
- }
-@@ -761,6 +763,7 @@ e_mail_signature_combo_box_load_selected (EMailSignatureComboBox *combo_box,
- 	g_return_if_fail (E_IS_MAIL_SIGNATURE_COMBO_BOX (combo_box));
- 
- 	context = g_slice_new0 (LoadContext);
-+	context->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
- 
- 	simple = g_simple_async_result_new (
- 		G_OBJECT (combo_box), callback, user_data,
-@@ -824,6 +827,9 @@ e_mail_signature_combo_box_load_selected_finish (EMailSignatureComboBox *combo_b
- 	if (g_simple_async_result_propagate_error (simple, error))
- 		return FALSE;
- 
-+	if (g_cancellable_set_error_if_cancelled (context->cancellable, error))
-+		return FALSE;
-+
- 	if (contents != NULL) {
- 		*contents = context->contents;
- 		context->contents = NULL;
-diff --git a/src/e-util/test-html-editor-units-bugs.c b/src/e-util/test-html-editor-units-bugs.c
-index a67b8a478d..8ca3e532d5 100644
---- a/src/e-util/test-html-editor-units-bugs.c
-+++ b/src/e-util/test-html-editor-units-bugs.c
-@@ -712,6 +712,7 @@ test_bug_772513 (TestFixture *fixture)
- 		cnt_editor,
- 		"",
- 		FALSE,
-+		FALSE,
- 		"none",
- 		&set_signature_from_message,
- 		&check_if_signature_is_changed,
-diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
-index a300f3b980..304781d626 100644
---- a/src/modules/webkit-editor/e-webkit-editor.c
-+++ b/src/modules/webkit-editor/e-webkit-editor.c
-@@ -2470,10 +2470,6 @@ webkit_editor_set_top_signature (EWebKitEditor *wk_editor,
- 
- 	wk_editor->priv->top_signature = value;
- 
--	e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
--		"EvoEditor.TOP_SIGNATURE = %x;",
--		e_webkit_editor_three_state_to_bool (value, "composer-top-signature"));
--
- 	g_object_notify (G_OBJECT (wk_editor), "top-signature");
- }
- 
-@@ -2579,6 +2575,7 @@ static gchar *
- webkit_editor_insert_signature (EContentEditor *editor,
-                                 const gchar *content,
-                                 gboolean is_html,
-+				gboolean can_reposition_caret,
-                                 const gchar *signature_id,
-                                 gboolean *set_signature_from_message,
-                                 gboolean *check_if_signature_is_changed,
-@@ -2597,9 +2594,10 @@ webkit_editor_insert_signature (EContentEditor *editor,
- 	}
- 
- 	jsc_value = webkit_editor_call_jsc_sync (E_WEBKIT_EDITOR (editor),
--		"EvoEditor.InsertSignature(%s, %x, %s, %x, %x, %x, %x, %x, %x);",
-+		"EvoEditor.InsertSignature(%s, %x, %x, %s, %x, %x, %x, %x, %x, %x);",
- 		content ? content : "",
- 		is_html,
-+		can_reposition_caret,
- 		signature_id,
- 		*set_signature_from_message,
- 		*check_if_signature_is_changed,
-@@ -4798,10 +4796,8 @@ webkit_editor_load_changed_cb (EWebKitEditor *wk_editor,
- 		return;
- 
- 	e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
--		"EvoEditor.START_BOTTOM = %x;\n"
--		"EvoEditor.TOP_SIGNATURE = %x;",
--		e_webkit_editor_three_state_to_bool (wk_editor->priv->start_bottom, "composer-reply-start-bottom"),
--		e_webkit_editor_three_state_to_bool (wk_editor->priv->top_signature, "composer-top-signature"));
-+		"EvoEditor.START_BOTTOM = %x;",
-+		e_webkit_editor_three_state_to_bool (wk_editor->priv->start_bottom, "composer-reply-start-bottom"));
- 
- 	/* Dispatch queued operations - as we are using this just for load
- 	 * operations load just the latest request and throw away the rest. */
--- 
-2.27.0
-
diff --git a/0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch b/0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch
deleted file mode 100644
index e938e4b..0000000
--- a/0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From edfd6aa9b513c7347e930d44012c53123cf88a74 Mon Sep 17 00:00:00 2001
-From: Milan Crha 
-Date: Fri, 5 Jun 2020 13:40:41 +0200
-Subject: [PATCH 2/5] I#969 - Workaround freeze on drag of message over
- composer body
-
-Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/969
----
- src/modules/webkit-editor/e-webkit-editor.c | 26 +++++++++++++++++++++
- 1 file changed, 26 insertions(+)
-
-diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
-index 304781d626..2a91782e41 100644
---- a/src/modules/webkit-editor/e-webkit-editor.c
-+++ b/src/modules/webkit-editor/e-webkit-editor.c
-@@ -5101,6 +5101,28 @@ webkit_editor_drag_leave_cb (EWebKitEditor *wk_editor,
- 	g_signal_stop_emission_by_name (GTK_WIDGET (wk_editor), "drag-leave");
- }
- 
-+static gboolean
-+webkit_editor_drag_motion_cb (GtkWidget *widget,
-+			      GdkDragContext *context,
-+			      gint x,
-+			      gint y,
-+			      guint time,
-+			      gpointer user_data)
-+{
-+	GdkAtom chosen;
-+
-+	chosen = gtk_drag_dest_find_target (widget, context, NULL);
-+
-+	/* This is when dragging message from the message list, which can eventually freeze
-+	   Evolution, if PDF file format is set, when processes by WebKitGTK itself. */
-+	if (chosen != GDK_NONE && chosen == gdk_atom_intern ("x-uid-list", TRUE)) {
-+		gdk_drag_status (context, GDK_ACTION_COPY, time);
-+		return TRUE;
-+	}
-+
-+	return FALSE;
-+}
-+
- static gboolean
- webkit_editor_drag_drop_cb (EWebKitEditor *wk_editor,
-                             GdkDragContext *context,
-@@ -5533,6 +5555,10 @@ e_webkit_editor_init (EWebKitEditor *wk_editor)
- 		wk_editor, "drag-drop",
- 		G_CALLBACK (webkit_editor_drag_drop_cb), NULL);
- 
-+	g_signal_connect (
-+		wk_editor, "drag-motion",
-+		G_CALLBACK (webkit_editor_drag_motion_cb), NULL);
-+
- 	g_signal_connect (
- 		wk_editor, "web-process-crashed",
- 		G_CALLBACK (webkit_editor_web_process_crashed_cb), NULL);
--- 
-2.27.0
-
diff --git a/0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch b/0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch
deleted file mode 100644
index 9f587e3..0000000
--- a/0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From b8acc612b838e7354c05efa8348954841566b26b Mon Sep 17 00:00:00 2001
-From: Milan Crha 
-Date: Mon, 8 Jun 2020 09:17:32 +0200
-Subject: [PATCH 3/5] I#975 - Composer: Some user options not propagated to the
- WebProcess
-
-Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/975
----
- src/modules/webkit-editor/e-webkit-editor.c | 14 ++++++++++++--
- 1 file changed, 12 insertions(+), 2 deletions(-)
-
-diff --git a/src/modules/webkit-editor/e-webkit-editor.c b/src/modules/webkit-editor/e-webkit-editor.c
-index 2a91782e41..ca8bf6e65d 100644
---- a/src/modules/webkit-editor/e-webkit-editor.c
-+++ b/src/modules/webkit-editor/e-webkit-editor.c
-@@ -4796,8 +4796,18 @@ webkit_editor_load_changed_cb (EWebKitEditor *wk_editor,
- 		return;
- 
- 	e_web_view_jsc_run_script (WEBKIT_WEB_VIEW (wk_editor), wk_editor->priv->cancellable,
--		"EvoEditor.START_BOTTOM = %x;",
--		e_webkit_editor_three_state_to_bool (wk_editor->priv->start_bottom, "composer-reply-start-bottom"));
-+		"EvoEditor.NORMAL_PARAGRAPH_WIDTH = %d;"
-+		"EvoEditor.START_BOTTOM = %x;"
-+		"EvoEditor.MAGIC_LINKS = %x;"
-+		"EvoEditor.MAGIC_SMILEYS = %x;"
-+		"EvoEditor.UNICODE_SMILEYS = %x;"
-+		"EvoEditor.WRAP_QUOTED_TEXT_IN_REPLIES = %x;",
-+		wk_editor->priv->normal_paragraph_width,
-+		e_webkit_editor_three_state_to_bool (wk_editor->priv->start_bottom, "composer-reply-start-bottom"),
-+		wk_editor->priv->magic_links,
-+		wk_editor->priv->magic_smileys,
-+		wk_editor->priv->unicode_smileys,
-+		wk_editor->priv->wrap_quoted_text_in_replies);
- 
- 	/* Dispatch queued operations - as we are using this just for load
- 	 * operations load just the latest request and throw away the rest. */
--- 
-2.27.0
-
diff --git a/0004-I-982-Message-contains-search-broken-in-3.36.3.patch b/0004-I-982-Message-contains-search-broken-in-3.36.3.patch
deleted file mode 100644
index 722551a..0000000
--- a/0004-I-982-Message-contains-search-broken-in-3.36.3.patch
+++ /dev/null
@@ -1,235 +0,0 @@
-From fb5dfe31f4985cf3b42eba899fd71f3cf2d256bf Mon Sep 17 00:00:00 2001
-From: Milan Crha 
-Date: Thu, 11 Jun 2020 19:06:29 +0200
-Subject: [PATCH 4/5] I#982 - 'Message contains'-search broken in 3.36.3
-
-Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/982
----
- src/e-util/e-filter-rule.c           | 111 +++++++++++++++++++++++----
- src/mail/message-list.c              |  18 ++---
- src/mail/searchtypes.xml.in          |   8 +-
- src/modules/mail/e-mail-shell-view.c |   2 +-
- 4 files changed, 107 insertions(+), 32 deletions(-)
-
-diff --git a/src/e-util/e-filter-rule.c b/src/e-util/e-filter-rule.c
-index 2ec1d8dfc1..72bfc6af5e 100644
---- a/src/e-util/e-filter-rule.c
-+++ b/src/e-util/e-filter-rule.c
-@@ -811,9 +811,16 @@ filter_rule_xml_decode (EFilterRule *rule,
- }
- 
- static void
--filter_rule_build_code (EFilterRule *rule,
--                        GString *out)
-+filter_rule_build_code_for_parts (EFilterRule *rule,
-+				  GList *parts,
-+				  gboolean without_match_all,
-+				  gboolean force_match_all,
-+				  GString *out)
- {
-+	g_return_if_fail (rule != NULL);
-+	g_return_if_fail (parts != NULL);
-+	g_return_if_fail (out != NULL);
-+
- 	switch (rule->threading) {
- 	case E_FILTER_THREAD_NONE:
- 		break;
-@@ -831,25 +838,97 @@ filter_rule_build_code (EFilterRule *rule,
- 		break;
- 	}
- 
--	if (rule->threading != E_FILTER_THREAD_NONE)
-+	if ((rule->threading != E_FILTER_THREAD_NONE && !without_match_all) || force_match_all)
- 		g_string_append (out, "(match-all ");
- 
--	switch (rule->grouping) {
--	case E_FILTER_GROUP_ALL:
--		g_string_append (out, " (and\n  ");
--		break;
--	case E_FILTER_GROUP_ANY:
--		g_string_append (out, " (or\n  ");
--		break;
--	default:
--		g_warning ("Invalid grouping");
-+	if (parts->next) {
-+		switch (rule->grouping) {
-+		case E_FILTER_GROUP_ALL:
-+			g_string_append (out, " (and\n  ");
-+			break;
-+		case E_FILTER_GROUP_ANY:
-+			g_string_append (out, " (or\n  ");
-+			break;
-+		default:
-+			g_warning ("Invalid grouping");
-+		}
-+	}
-+
-+	e_filter_part_build_code_list (parts, out);
-+
-+	if (parts->next)
-+		g_string_append (out, ")\n");
-+
-+	if (rule->threading != E_FILTER_THREAD_NONE) {
-+		if (without_match_all && !force_match_all)
-+			g_string_append (out, ")\n");
-+		else
-+			g_string_append (out, "))\n");
-+	} else if (force_match_all) {
-+		g_string_append (out, ")\n");
-+	}
-+}
-+
-+static void
-+filter_rule_build_code (EFilterRule *rule,
-+                        GString *out)
-+{
-+	GList *link;
-+	gboolean has_body_search = FALSE;
-+
-+	if (!rule->parts)
-+		return;
-+
-+	for (link = rule->parts; link && !has_body_search; link = g_list_next (link)) {
-+		EFilterPart *part = link->data;
-+
-+		has_body_search = g_strcmp0 (part->name, "body") == 0;
- 	}
- 
--	e_filter_part_build_code_list (rule->parts, out);
--	g_string_append (out, ")\n");
-+	if (has_body_search) {
-+		GList *body_searches = NULL, *other_searches = NULL;
- 
--	if (rule->threading != E_FILTER_THREAD_NONE)
--		g_string_append (out, "))\n");
-+		for (link = rule->parts; link; link = g_list_next (link)) {
-+			EFilterPart *part = link->data;
-+
-+			if (g_strcmp0 (part->name, "body") == 0) {
-+				body_searches = g_list_prepend (body_searches, part);
-+			} else {
-+				other_searches = g_list_prepend (other_searches, part);
-+			}
-+		}
-+
-+		if (other_searches && body_searches) {
-+			switch (rule->grouping) {
-+			case E_FILTER_GROUP_ALL:
-+				g_string_append (out, "(and ");
-+				break;
-+			case E_FILTER_GROUP_ANY:
-+				g_string_append (out, "(or ");
-+				break;
-+			default:
-+				g_warning ("Invalid grouping");
-+			}
-+
-+			body_searches = g_list_reverse (body_searches);
-+			other_searches = g_list_reverse (other_searches);
-+
-+			filter_rule_build_code_for_parts (rule, other_searches, FALSE, TRUE, out);
-+
-+			g_string_append_c (out, ' ');
-+
-+			filter_rule_build_code_for_parts (rule, body_searches, TRUE, FALSE, out);
-+
-+			g_string_append_c (out, ')');
-+		} else {
-+			filter_rule_build_code_for_parts (rule, rule->parts, FALSE, FALSE, out);
-+		}
-+
-+		g_list_free (body_searches);
-+		g_list_free (other_searches);
-+	} else {
-+		filter_rule_build_code_for_parts (rule, rule->parts, FALSE, FALSE, out);
-+	}
- }
- 
- static void
-diff --git a/src/mail/message-list.c b/src/mail/message-list.c
-index 01b7528850..2c5741a139 100644
---- a/src/mail/message-list.c
-+++ b/src/mail/message-list.c
-@@ -6176,7 +6176,7 @@ message_list_regen_thread (GSimpleAsyncResult *simple,
- 	/* The 'expr' should be enclosed in "(match-all ...)", thus the search traverses
- 	   folder content, but also try to not repeat it, to avoid unnecessary performance hits. */
- 	if (regen_data->search != NULL) {
--		gboolean is_match_all = g_str_has_prefix (regen_data->search, "(match-all ");
-+		gboolean is_match_all = g_str_has_prefix (regen_data->search, "(match-all ") && !strstr (regen_data->search, "(body-contains ");
- 		gboolean is_match_threads = strstr (regen_data->search, "(match-threads ") != NULL;
- 
- 		if (expr->len == 0) {
-@@ -6186,25 +6186,21 @@ message_list_regen_thread (GSimpleAsyncResult *simple,
- 				g_string_prepend (expr, "(match-all ");
- 				g_string_append_c (expr, ')');
- 			}
--		} else if (is_match_threads) {
-+		} else if (is_match_threads || !is_match_all) {
- 			/* The "match-threads" cannot be below "match-all". */
- 			g_string_prepend (expr, "(and (match-all ");
- 			g_string_append (expr, ") ");
- 			g_string_append (expr, regen_data->search);
- 			g_string_append_c (expr, ')');
- 		} else {
-+			const gchar *stripped_search = regen_data->search + 11; /* strlen ("(match-all ") */
-+			gint len = strlen (stripped_search);
-+
- 			g_string_prepend (expr, "(match-all (and ");
- 			g_string_append_c (expr, ' ');
- 
--			if (is_match_all) {
--				const gchar *stripped_search = regen_data->search + 11; /* strlen ("(match-all ") */
--				gint len = strlen (stripped_search);
--
--				if (len > 0 && stripped_search[len - 1] == ')') {
--					g_string_append_len (expr, stripped_search, len - 1);
--				} else {
--					g_string_append (expr, regen_data->search);
--				}
-+			if (len > 0 && stripped_search[len - 1] == ')') {
-+				g_string_append_len (expr, stripped_search, len - 1);
- 			} else {
- 				g_string_append (expr, regen_data->search);
- 			}
-diff --git a/src/mail/searchtypes.xml.in b/src/mail/searchtypes.xml.in
-index e03e28e60f..d0362d59dd 100644
---- a/src/mail/searchtypes.xml.in
-+++ b/src/mail/searchtypes.xml.in
-@@ -728,10 +728,6 @@
-           
-           
-         
--        
--          
--          
--        
-         
-           
-           
-@@ -740,6 +736,10 @@
-           
-           
-         
-+        
-+          
-+          
-+        
-       
-       
-     
-diff --git a/src/modules/mail/e-mail-shell-view.c b/src/modules/mail/e-mail-shell-view.c
-index 8dcca65eca..be72de3441 100644
---- a/src/modules/mail/e-mail-shell-view.c
-+++ b/src/modules/mail/e-mail-shell-view.c
-@@ -752,7 +752,7 @@ filter:
- 
- 	/* Apply selected filter. */
- 
--	if (query && *query && !g_str_has_prefix (query, "(match-all ") && !strstr (query, "(match-threads ")) {
-+	if (query && *query && !strstr (query, "(match-all ") && !strstr (query, "(match-threads ")) {
- 		/* Make sure the query is enclosed in "(match-all ...)", to traverse the folders' content */
- 		temp = g_strconcat ("(match-all ", query, ")", NULL);
- 		g_free (query);
--- 
-2.27.0
-
diff --git a/0005-I-979-Undeletable-empty-item-in-folder-list.patch b/0005-I-979-Undeletable-empty-item-in-folder-list.patch
deleted file mode 100644
index 4932196..0000000
--- a/0005-I-979-Undeletable-empty-item-in-folder-list.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-From c72c70e1b3eb9142e98b73ac06a38fedda7fb7d2 Mon Sep 17 00:00:00 2001
-From: Milan Crha 
-Date: Thu, 18 Jun 2020 09:54:55 +0200
-Subject: [PATCH 5/5] I#979 - Undeletable empty item in folder list
-
-Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/979
----
- src/mail/em-folder-tree-model.c | 34 ++++++++++++++++++---------------
- src/mail/em-folder-tree-model.h |  2 +-
- src/mail/em-folder-tree.c       |  5 ++---
- 3 files changed, 22 insertions(+), 19 deletions(-)
-
-diff --git a/src/mail/em-folder-tree-model.c b/src/mail/em-folder-tree-model.c
-index d43fb1e1c4..0d3e50fedc 100644
---- a/src/mail/em-folder-tree-model.c
-+++ b/src/mail/em-folder-tree-model.c
-@@ -1385,7 +1385,7 @@ em_folder_tree_model_set_session (EMFolderTreeModel *model,
- 	g_object_notify (G_OBJECT (model), "session");
- }
- 
--void
-+gboolean
- em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
-                                       GtkTreeIter *iter,
-                                       CamelStore *store,
-@@ -1414,18 +1414,18 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
- 	gboolean folder_is_outbox = FALSE;
- 	gchar *uri;
- 
--	g_return_if_fail (EM_IS_FOLDER_TREE_MODEL (model));
--	g_return_if_fail (iter != NULL);
--	g_return_if_fail (CAMEL_IS_STORE (store));
--	g_return_if_fail (fi != NULL);
-+	g_return_val_if_fail (EM_IS_FOLDER_TREE_MODEL (model), FALSE);
-+	g_return_val_if_fail (iter != NULL, FALSE);
-+	g_return_val_if_fail (CAMEL_IS_STORE (store), FALSE);
-+	g_return_val_if_fail (fi != NULL, FALSE);
- 
- 	si = folder_tree_model_store_index_lookup (model, store);
--	g_return_if_fail (si != NULL);
-+	g_return_val_if_fail (si != NULL, FALSE);
- 
- 	/* Make sure we don't already know about it. */
- 	if (g_hash_table_lookup (si->full_hash, fi->full_name)) {
- 		store_info_unref (si);
--		return;
-+		return FALSE;
- 	}
- 
- 	if (!si->loaded)
-@@ -1568,7 +1568,7 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
- 		g_signal_emit (model, signals[LOADED_ROW], 0, path, iter);
- 		g_signal_emit (model, signals[LOADING_ROW], 0, path, iter);
- 		gtk_tree_path_free (path);
--		return;
-+		return TRUE;
- 	}
- 
- 	if (fi->child) {
-@@ -1587,8 +1587,9 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
- 				emitted = TRUE;
- 			}
- 
--			em_folder_tree_model_set_folder_info (
--				model, &sub, store, fi, fully_loaded);
-+			if (!em_folder_tree_model_set_folder_info (model, &sub, store, fi, fully_loaded))
-+				gtk_tree_store_remove (tree_store, &sub);
-+
- 			fi = fi->next;
- 		} while (fi);
- 	}
-@@ -1598,6 +1599,8 @@ em_folder_tree_model_set_folder_info (EMFolderTreeModel *model,
- 		g_signal_emit (model, signals[LOADED_ROW], 0, path, iter);
- 		gtk_tree_path_free (path);
- 	}
-+
-+	return TRUE;
- }
- 
- static void
-@@ -1676,8 +1679,9 @@ folder_tree_model_folder_renamed_cb (CamelStore *store,
- 	gtk_tree_path_free (path);
- 
- 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &root);
--	em_folder_tree_model_set_folder_info (
--		EM_FOLDER_TREE_MODEL (model), &iter, store, info, TRUE);
-+
-+	if (!em_folder_tree_model_set_folder_info (EM_FOLDER_TREE_MODEL (model), &iter, store, info, TRUE))
-+		gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
- }
- 
- static void
-@@ -1741,9 +1745,9 @@ folder_tree_model_folder_subscribed_cb (CamelStore *store,
- 
- 	gtk_tree_store_append (GTK_TREE_STORE (model), &iter, &parent);
- 
--	em_folder_tree_model_set_folder_info (
--		EM_FOLDER_TREE_MODEL (model), &iter, store, fi,
--		(fi->flags & (CAMEL_FOLDER_NOINFERIORS | CAMEL_FOLDER_NOCHILDREN)) != 0);
-+	if (!em_folder_tree_model_set_folder_info (EM_FOLDER_TREE_MODEL (model), &iter, store, fi,
-+		(fi->flags & (CAMEL_FOLDER_NOINFERIORS | CAMEL_FOLDER_NOCHILDREN)) != 0))
-+		gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
- }
- 
- static void
-diff --git a/src/mail/em-folder-tree-model.h b/src/mail/em-folder-tree-model.h
-index 1402144e4c..45784278be 100644
---- a/src/mail/em-folder-tree-model.h
-+++ b/src/mail/em-folder-tree-model.h
-@@ -123,7 +123,7 @@ EMailSession *	em_folder_tree_model_get_session
- void		em_folder_tree_model_set_session
- 					(EMFolderTreeModel *model,
- 					 EMailSession *session);
--void		em_folder_tree_model_set_folder_info
-+gboolean	em_folder_tree_model_set_folder_info
- 					(EMFolderTreeModel *model,
- 					 GtkTreeIter *iter,
- 					 CamelStore *store,
-diff --git a/src/mail/em-folder-tree.c b/src/mail/em-folder-tree.c
-index 39871c6f1f..b4eab4f9f8 100644
---- a/src/mail/em-folder-tree.c
-+++ b/src/mail/em-folder-tree.c
-@@ -363,9 +363,8 @@ folder_tree_get_folder_info_cb (CamelStore *store,
- 						GTK_TREE_STORE (model),
- 						&iter, &root);
- 
--				em_folder_tree_model_set_folder_info (
--					EM_FOLDER_TREE_MODEL (model),
--					&iter, store, child_info, TRUE);
-+				if (!em_folder_tree_model_set_folder_info (EM_FOLDER_TREE_MODEL (model), &iter, store, child_info, TRUE))
-+					gtk_tree_store_remove (GTK_TREE_STORE (model), &iter);
- 			}
- 
- 			child_info = child_info->next;
--- 
-2.27.0
-
diff --git a/evolution.spec b/evolution.spec
index 40a3ab2..8e02e69 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -40,8 +40,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.37.2
-Release: 2%{?dist}
+Version: 3.37.3
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -49,14 +49,6 @@ Source: http://download.gnome.org/sources/%{name}/3.37/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
-# Various bugfix backports from upstream mainline
-Patch0001: 0001-I-966-Composer-Correct-caret-placement-around-signat.patch
-Patch0002: 0002-I-969-Workaround-freeze-on-drag-of-message-over-comp.patch
-Patch0003: 0003-I-975-Composer-Some-user-options-not-propagated-to-t.patch
-Patch0004: 0004-I-982-Message-contains-search-broken-in-3.36.3.patch
-Patch0005: 0005-I-979-Undeletable-empty-item-in-folder-list.patch
-
-
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
@@ -242,7 +234,7 @@ the functionality of the installed %{name} package.
 %endif
 
 %prep
-%autosetup -p1 -n %{name}-%{version}
+%autosetup -p1 -S gendiff
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -569,6 +561,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jul 03 2020 Milan Crha  - 3.37.3-1
+- Update to 3.37.3
+
 * Tue Jun 23 2020 Adam Williamson  - 3.37.2-2
 - Backport several fixes for annoying bugs from mainline
 
diff --git a/sources b/sources
index 23ec06c..1e2bccf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.37.2.tar.xz) = f5e9fede217fe74917e2a1cee2e4c7f79f6595d6bf8270fc65ba85e01b183793dc978c2312feff06d84747c7774ec6855965d640f39e37d5b43cb4bc53423525
+SHA512 (evolution-3.37.3.tar.xz) = cce99573b79ce2e90af5266524baae039d8d781327d35e66f60412132f4ab68f51a7282e31fa560fb449a4c0f83de4cd252273dad956d1d68c3d9c75a513ed16

From a8e8708a2a3f2309d121417ee20e120cb36b93da Mon Sep 17 00:00:00 2001
From: Igor Raits 
Date: Mon, 20 Jul 2020 12:22:38 +0200
Subject: [PATCH 736/844] Improve compatibility with new CMake macro

Signed-off-by: Igor Raits 
---
 evolution.spec | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 8e02e69..9b88cfb 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -248,9 +248,6 @@ cat data/org.gnome.Evolution.desktop.in.i | sed -e "s/Icon=evolution/Icon=org.gn
 
 %build
 
-mkdir -p _build
-cd _build
-
 # define all of our flags, this is kind of ugly :(
 %if %{ldap_support}
 %define ldap_flags -DWITH_OPENLDAP=ON
@@ -290,14 +287,12 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
 	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \
 	-DENABLE_PLUGINS=all \
-	..
+	%{nil}
 
-make %{?_smp_mflags}
+%cmake_build
 
 %if %{with_docs}
 
-cd ..
-
 # Replace identical images in the help by links.
 # This reduces the RPM size by several megabytes.
 helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
@@ -319,9 +314,7 @@ done
 %endif
 
 %install
-rm -rf $RPM_BUILD_ROOT
-cd _build
-make DESTDIR=$RPM_BUILD_ROOT install
+%cmake_install
 
 %if 0%{?flatpak}
 %{S:1} <%{S:2} >flatpak-evolution-wrapper.sh
@@ -533,10 +526,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 %endif
 
-%files langpacks -f _build/translations.lang
+%files langpacks -f translations.lang
 
 %if %{with_docs}
-%files help -f _build/help.lang
+%files help -f help.lang
 %endif
 
 %files bogofilter

From 08bdc4c973e6443dc5cfb1bb92563e67ed5e0269 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Mon, 27 Jul 2020 17:00:38 +0000
Subject: [PATCH 737/844] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 9b88cfb..cd93651 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -41,7 +41,7 @@
 
 Name: evolution
 Version: 3.37.3
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -554,6 +554,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Jul 27 2020 Fedora Release Engineering  - 3.37.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
 * Fri Jul 03 2020 Milan Crha  - 3.37.3-1
 - Update to 3.37.3
 

From fa37715a0b81adea337e77de7117e5f685743c06 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Tue, 4 Aug 2020 12:23:40 +0200
Subject: [PATCH 738/844] Improve compatibility with new CMake macro ][

Add missing `%undefine __cmake_in_source_build`.
---
 evolution.spec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/evolution.spec b/evolution.spec
index cd93651..8cbe7d5 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -1,3 +1,5 @@
+%undefine __cmake_in_source_build
+
 %global _changelog_trimtime %(date +%s -d "1 year ago")
 %global _python_bytecompile_extra 0
 

From 3b069f56c928064925f5dd2cff517284717c95e6 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 7 Aug 2020 09:10:13 +0200
Subject: [PATCH 739/844] Update to 3.37.90

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 8cbe7d5..959e738 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.37.3
-Release: 2%{?dist}
+Version: 3.37.90
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -556,6 +556,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Aug 07 2020 Milan Crha  - 3.37.90-1
+- Update to 3.37.90
+
 * Mon Jul 27 2020 Fedora Release Engineering  - 3.37.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
diff --git a/sources b/sources
index 1e2bccf..e62abac 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.37.3.tar.xz) = cce99573b79ce2e90af5266524baae039d8d781327d35e66f60412132f4ab68f51a7282e31fa560fb449a4c0f83de4cd252273dad956d1d68c3d9c75a513ed16
+SHA512 (evolution-3.37.90.tar.xz) = b6378f0df07b34b99c2cf4974d9c0c8dc5215dd2f121540aac8fdc16ed1e159d8a82f6315b5ee1f2b1f1cdc43391f9818bb20116bb184b2c7f42cb36501d5ff2

From 58837002c6f38a3e666acc96bf277777425b3ba9 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 4 Sep 2020 09:20:42 +0200
Subject: [PATCH 740/844] Update to 3.37.92

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 959e738..e545172 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.37.90
+Version: 3.37.92
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -556,6 +556,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 04 2020 Milan Crha  - 3.37.92-1
+- Update to 3.37.92
+
 * Fri Aug 07 2020 Milan Crha  - 3.37.90-1
 - Update to 3.37.90
 
diff --git a/sources b/sources
index e62abac..64127f9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.37.90.tar.xz) = b6378f0df07b34b99c2cf4974d9c0c8dc5215dd2f121540aac8fdc16ed1e159d8a82f6315b5ee1f2b1f1cdc43391f9818bb20116bb184b2c7f42cb36501d5ff2
+SHA512 (evolution-3.37.92.tar.xz) = 021ff6da4002df4a0448c0d6697792e11a4b1595f6f81e9bd90e3ca77f7696326426722289e2b1a4fa35114408f2d9973df899834fe8d5aa53af83bec156865a

From d1a8e25c1b1c3854820962560dbf4b1b7a5da9cc Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 11 Sep 2020 08:17:53 +0200
Subject: [PATCH 741/844] Update to 3.38.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index e545172..9e22b0c 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,12 +42,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.37.92
+Version: 3.38.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.37/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -556,6 +556,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 11 2020 Milan Crha  - 3.38.0-1
+- Update to 3.38.0
+
 * Fri Sep 04 2020 Milan Crha  - 3.37.92-1
 - Update to 3.37.92
 
diff --git a/sources b/sources
index 64127f9..c153641 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.37.92.tar.xz) = 021ff6da4002df4a0448c0d6697792e11a4b1595f6f81e9bd90e3ca77f7696326426722289e2b1a4fa35114408f2d9973df899834fe8d5aa53af83bec156865a
+SHA512 (evolution-3.38.0.tar.xz) = d326495ca0abf21eb061d853c509127e66a5e1f28b6d37466a8bcf2e9b9953c8a64528adacaa02fa89c2e1370ca66bd30eecb96c05a7eb134f1a3cb7ac33d1e8

From 82fc4dba16b64579604579ed31620de76b7225a4 Mon Sep 17 00:00:00 2001
From: Adrian Reber 
Date: Sat, 26 Sep 2020 11:42:55 +0200
Subject: [PATCH 742/844] Rebuilt for protobuf 3.13

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 9e22b0c..888d401 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 3.38.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -556,6 +556,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Sat Sep 26 2020 Adrian Reber  - 3.38.0-2
+- Rebuilt for protobuf 3.13
+
 * Fri Sep 11 2020 Milan Crha  - 3.38.0-1
 - Update to 3.38.0
 

From 40034cda8ceae573f1d30caf7a342b35e8f7d39c Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 2 Oct 2020 09:03:10 +0200
Subject: [PATCH 743/844] Update to 3.38.1

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 888d401..2ad51a9 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.38.0
-Release: 2%{?dist}
+Version: 3.38.1
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -556,6 +556,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Oct 02 2020 Milan Crha  - 3.38.1-1
+- Update to 3.38.1
+
 * Sat Sep 26 2020 Adrian Reber  - 3.38.0-2
 - Rebuilt for protobuf 3.13
 
diff --git a/sources b/sources
index c153641..2b4cbc8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.38.0.tar.xz) = d326495ca0abf21eb061d853c509127e66a5e1f28b6d37466a8bcf2e9b9953c8a64528adacaa02fa89c2e1370ca66bd30eecb96c05a7eb134f1a3cb7ac33d1e8
+SHA512 (evolution-3.38.1.tar.xz) = bbef00d23833415ac14fda49d06b259551726ba552bf1174edf12687e0fe23faf992fcd952721d609592318d3e6104c2cdfcb156fdb50db8f9a2b5d8f2c75bc4

From 085d0a5ca3c9658b20b9faf708aef501f5ee1150 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 20 Nov 2020 10:48:45 +0100
Subject: [PATCH 744/844] Update to 3.38.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 2ad51a9..a65ab8b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.38.1
+Version: 3.38.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -556,6 +556,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Nov 20 2020 Milan Crha  - 3.38.2-1
+- Update to 3.38.2
+
 * Fri Oct 02 2020 Milan Crha  - 3.38.1-1
 - Update to 3.38.1
 
diff --git a/sources b/sources
index 2b4cbc8..99e7fdc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.38.1.tar.xz) = bbef00d23833415ac14fda49d06b259551726ba552bf1174edf12687e0fe23faf992fcd952721d609592318d3e6104c2cdfcb156fdb50db8f9a2b5d8f2c75bc4
+SHA512 (evolution-3.38.2.tar.xz) = 30d40e9e8934afa2a8b602bccf740a055423892cc435b54e2cb116d0a8f24a369975f90a253da0c3554fd315a378c014a26c5b85af5b588c2afd9e8ad4698f3e

From e6383f64f6430b835a7ae193e1271f84c1b7d20c Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 23 Nov 2020 11:28:57 +0100
Subject: [PATCH 745/844] Flatpak: Do not start gpg-agent in the Fedora build

This is looking for a system-installed pinentry, in contrast to
the Flathub build, which builds its own pinentry, thus no need
to override where the pinentry is installed in the Fedora Flatpak.
---
 flatpak-evolution-wrapper.sh.in | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
index c57bfbe..6a311fc 100644
--- a/flatpak-evolution-wrapper.sh.in
+++ b/flatpak-evolution-wrapper.sh.in
@@ -7,8 +7,6 @@ else
    export GIO_USE_NETWORK_MONITOR=base
    gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
 
-   gpg-agent --homedir ~/.gnupg --daemon --pinentry-program=/app/bin/pinentry
-
    LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)
    if [ "${LINES}" = "0" ]; then
       /app/libexec/evolution-source-registry &
@@ -28,6 +26,4 @@ else
    fi
 
    /app/bin/evolution.bin "$@"
-
-   pkill -TERM gpg-agent
 fi

From 94dccfdf9670a3ef3db6b09eb4b5b11c241f4c56 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Thu, 26 Nov 2020 11:38:45 +0100
Subject: [PATCH 746/844] Flaptak: Export WEBKIT_FORCE_SANDBOX=0 in the wrapper
 script

To be able to print.

Related to https://bugs.webkit.org/show_bug.cgi?id=202363
---
 flatpak-evolution-wrapper.sh.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
index 6a311fc..1b42f20 100644
--- a/flatpak-evolution-wrapper.sh.in
+++ b/flatpak-evolution-wrapper.sh.in
@@ -5,6 +5,7 @@ if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
 else
    export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
    export GIO_USE_NETWORK_MONITOR=base
+   export WEBKIT_FORCE_SANDBOX=0
    gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
 
    LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)

From e191be31886a65e0c0cc7ae9519b61679ba39660 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 8 Jan 2021 11:19:18 +0100
Subject: [PATCH 747/844] Update to 3.39.1

---
 evolution.spec | 13 ++++++++-----
 sources        |  2 +-
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index a65ab8b..9842107 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -11,13 +11,13 @@
 %global tnef_support 1
 %endif
 
-%define glib2_version 2.46.0
-%define gtk3_version 3.10.0
+%define glib2_version 2.56
+%define gtk3_version 3.22
 %define gnome_autoar_version 0.1.1
 %define gnome_desktop_version 2.91.3
 %define intltool_version 0.35.5
 %define libgdata_version 0.10.0
-%define libgweather_version 3.5.0
+%define libgweather_version 3.10
 %define libsoup_version 2.42
 %define webkit2gtk_version 2.28.0
 
@@ -42,12 +42,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.38.2
+Version: 3.39.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.38/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.39/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -556,6 +556,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 08 2021 Milan Crha  - 3.39.1-1
+- Update to 3.39.1
+
 * Fri Nov 20 2020 Milan Crha  - 3.38.2-1
 - Update to 3.38.2
 
diff --git a/sources b/sources
index 99e7fdc..3eac6d9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.38.2.tar.xz) = 30d40e9e8934afa2a8b602bccf740a055423892cc435b54e2cb116d0a8f24a369975f90a253da0c3554fd315a378c014a26c5b85af5b588c2afd9e8ad4698f3e
+SHA512 (evolution-3.39.1.tar.xz) = 74310c62816e0f140a4b9161c78eaacbd37858c9b666d949ec6a554cf8463c2a45a4b42e8e4d59cd15d032571d1e3a6cd01e93212f77f7667d35f8c8869bd776

From 2dbea5a9cc2ac8390e94c5e65b69c0aa5669e8dd Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 8 Jan 2021 12:53:10 +0100
Subject: [PATCH 748/844] Add "Sender validator" plugin files to the .spec file

---
 evolution.spec | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/evolution.spec b/evolution.spec
index 9842107..099af85 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -360,6 +360,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.mail-notification.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.prefer-plain.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.publish-calendar.gschema.xml
+%{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.sender-validator.gschema.xml
 %{_datadir}/glib-2.0/schemas/org.gnome.evolution.plugin.templates.gschema.xml
 
 # The main executable
@@ -503,6 +504,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{evo_plugin_dir}/org-gnome-save-calendar.eplug
 %{evo_plugin_dir}/liborg-gnome-save-calendar.so
 
+%{evo_plugin_dir}/org-gnome-evolution-sender-validation.eplug
+%{evo_plugin_dir}/liborg-gnome-evolution-sender-validation.so
+
 %{evo_plugin_dir}/org-gnome-templates.eplug
 %{evo_plugin_dir}/liborg-gnome-templates.so
 

From f03f5e6d5d9699ef022b816fffc5e64409fff0cb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Tue, 26 Jan 2021 05:03:50 +0000
Subject: [PATCH 749/844] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 099af85..294bec4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 3.39.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue Jan 26 2021 Fedora Release Engineering  - 3.39.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
 * Fri Jan 08 2021 Milan Crha  - 3.39.1-1
 - Update to 3.39.1
 

From dd6e5b22bbb1a90773678a4ca966a13cccce3ba5 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 12 Feb 2021 11:05:28 +0100
Subject: [PATCH 750/844] Update to 3.39.2

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 294bec4..a1f0499 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.39.1
-Release: 2%{?dist}
+Version: 3.39.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Feb 12 2021 Milan Crha  - 3.39.2-1
+- Update to 3.39.2
+
 * Tue Jan 26 2021 Fedora Release Engineering  - 3.39.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
diff --git a/sources b/sources
index 3eac6d9..ba76c38 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.39.1.tar.xz) = 74310c62816e0f140a4b9161c78eaacbd37858c9b666d949ec6a554cf8463c2a45a4b42e8e4d59cd15d032571d1e3a6cd01e93212f77f7667d35f8c8869bd776
+SHA512 (evolution-3.39.2.tar.xz) = 102cfb835b4317e0df7cf52cb8cccdf983d5b6e1f4833515f7ee0c8cc649d8a0aec4b3ed3e2fcc46c76482b5ee18d3a8231af8b23272b21765a2b47d9d4e7b08

From 0ebf9eec51ff76d02235f22b0ae2afb76a15b2f0 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 12 Mar 2021 10:04:40 +0100
Subject: [PATCH 751/844] Update to 3.39.3

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index a1f0499..d90bb5e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.39.2
+Version: 3.39.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 12 2021 Milan Crha  - 3.39.3-1
+- Update to 3.39.3
+
 * Fri Feb 12 2021 Milan Crha  - 3.39.2-1
 - Update to 3.39.2
 
diff --git a/sources b/sources
index ba76c38..de26966 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.39.2.tar.xz) = 102cfb835b4317e0df7cf52cb8cccdf983d5b6e1f4833515f7ee0c8cc649d8a0aec4b3ed3e2fcc46c76482b5ee18d3a8231af8b23272b21765a2b47d9d4e7b08
+SHA512 (evolution-3.39.3.tar.xz) = 7d19152e4cf4393ceb6a30dd3872c1f00dd45ab1e6efafda3110852b9ff9e9e08ab4c00ece11582910801b505d4cb8a4989989b0837f58d3850f9f1195da5477

From d2805d52d60be390dce1d364e71c3f14bfa3f107 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 19 Mar 2021 08:47:36 +0100
Subject: [PATCH 752/844] Update to 3.40.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d90bb5e..815a676 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,12 +42,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.39.3
+Version: 3.40.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.39/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 19 2021 Milan Crha  - 3.40.0-1
+- Update to 3.40.0
+
 * Fri Mar 12 2021 Milan Crha  - 3.39.3-1
 - Update to 3.39.3
 
diff --git a/sources b/sources
index de26966..985ed21 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.39.3.tar.xz) = 7d19152e4cf4393ceb6a30dd3872c1f00dd45ab1e6efafda3110852b9ff9e9e08ab4c00ece11582910801b505d4cb8a4989989b0837f58d3850f9f1195da5477
+SHA512 (evolution-3.40.0.tar.xz) = 9d672143213e5b37a15b8667b0c6cc6d6217cff981569fa937309839926607e3ef1f39743a5a1cf9ab2a181413fed85c4b36bb4dbf21dee492753d17d7f88548

From 309fa2b63e8e57c4866e8fd78b93aec1ee99f12d Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 30 Apr 2021 08:33:21 +0200
Subject: [PATCH 753/844] Update to 3.40.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 815a676..2956938 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.40.0
+Version: 3.40.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -560,6 +560,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Apr 30 2021 Milan Crha  - 3.40.1-1
+- Update to 3.40.1
+
 * Fri Mar 19 2021 Milan Crha  - 3.40.0-1
 - Update to 3.40.0
 
diff --git a/sources b/sources
index 985ed21..4e2a1ea 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.40.0.tar.xz) = 9d672143213e5b37a15b8667b0c6cc6d6217cff981569fa937309839926607e3ef1f39743a5a1cf9ab2a181413fed85c4b36bb4dbf21dee492753d17d7f88548
+SHA512 (evolution-3.40.1.tar.xz) = acebe937e7bce5e998b86ceb8e53b07ffc9f558543b72cc5d68a54ca2714684bdf3f22726f243754c6ecea7205ccb1b9411095e9c62ca7f9890d2edb0a0b0d00

From 694cc1719845826b32ca389f367c5ad8dca4898a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Genz?= 
Date: Thu, 13 May 2021 22:56:05 +0200
Subject: [PATCH 754/844] fix typo in changelog

---
 evolution.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 2956938..c8ff061 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -887,7 +887,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Mon Sep 12 2016 Milan Crha  - 3.21.92-1
 - Update to 3.21.92
-- Remove patch for "Adapt to WebKit Unstable DOM API changes: (fixed upstream)
+- Remove patch for "Adapt to WebKit Unstable DOM API changes" (fixed upstream)
 
 * Thu Sep 01 2016 Tomas Popela  - 3.21.91-2
 - Adapt to WebKit Unstable DOM API changes

From 041e2e033f333165f773a647c9f2aab234683702 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 17 May 2021 14:03:02 +0200
Subject: [PATCH 755/844] Add missing bundled() Provides for libgnomecanvas

---
 evolution.spec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/evolution.spec b/evolution.spec
index c8ff061..f626c00 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -51,6 +51,9 @@ Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+# Approximate version number
+Provides: bundled(libgnomecanvas) = 2.30.0
+
 Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}

From e2768c8955399437acc1d00ff50cbd03dafe738f Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 4 Jun 2021 09:31:55 +0200
Subject: [PATCH 756/844] Update to 3.40.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index f626c00..d8318ab 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.40.1
+Version: 3.40.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -563,6 +563,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jun 04 2021 Milan Crha  - 3.40.2-1
+- Update to 3.40.2
+
 * Fri Apr 30 2021 Milan Crha  - 3.40.1-1
 - Update to 3.40.1
 
diff --git a/sources b/sources
index 4e2a1ea..3e7a831 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.40.1.tar.xz) = acebe937e7bce5e998b86ceb8e53b07ffc9f558543b72cc5d68a54ca2714684bdf3f22726f243754c6ecea7205ccb1b9411095e9c62ca7f9890d2edb0a0b0d00
+SHA512 (evolution-3.40.2.tar.xz) = 081692e157bcc300ef26179f5e12a22bdc993043ca7c56b63622c4608b3c36c3c2e642d5353124c8661cc1ce2841d147345de86b4171ee7341493ffe0e24fc08

From 483aa3bdd0e78735f405278c5e9fd01440b18ebf Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 9 Jul 2021 08:34:42 +0200
Subject: [PATCH 757/844] Update to 3.41.1

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d8318ab..061bfd6 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,12 +42,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.40.2
+Version: 3.41.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.40/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.41/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -563,6 +563,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jul 09 2021 Milan Crha  - 3.41.1-1
+- Update to 3.41.1
+
 * Fri Jun 04 2021 Milan Crha  - 3.40.2-1
 - Update to 3.40.2
 
diff --git a/sources b/sources
index 3e7a831..b540905 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.40.2.tar.xz) = 081692e157bcc300ef26179f5e12a22bdc993043ca7c56b63622c4608b3c36c3c2e642d5353124c8661cc1ce2841d147345de86b4171ee7341493ffe0e24fc08
+SHA512 (evolution-3.41.1.tar.xz) = e19d64c616b8e4604b9e7bd35b74158750c60260807e93fddddbe08ac9a01944454c865f20f16545ffc95af00136dedd4ed446335df5e9cd9edbd2a6e7fccb23

From b5a535891eb2b49e6d2ae691bc71ddc333d019f2 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Wed, 21 Jul 2021 22:28:14 +0000
Subject: [PATCH 758/844] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 061bfd6..b552639 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 
 Name: evolution
 Version: 3.41.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -563,6 +563,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Wed Jul 21 2021 Fedora Release Engineering  - 3.41.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
 * Fri Jul 09 2021 Milan Crha  - 3.41.1-1
 - Update to 3.41.1
 

From a907cced911245c0898ffcff1982b3e706ba45ab Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 13 Aug 2021 11:15:01 +0200
Subject: [PATCH 759/844] Update to 3.41.2

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index b552639..6ea4be0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,8 +42,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.41.1
-Release: 2%{?dist}
+Version: 3.41.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -563,6 +563,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Aug 13 2021 Milan Crha  - 3.41.2-1
+- Update to 3.41.2
+
 * Wed Jul 21 2021 Fedora Release Engineering  - 3.41.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index b540905..4360aa2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.41.1.tar.xz) = e19d64c616b8e4604b9e7bd35b74158750c60260807e93fddddbe08ac9a01944454c865f20f16545ffc95af00136dedd4ed446335df5e9cd9edbd2a6e7fccb23
+SHA512 (evolution-3.41.2.tar.xz) = e61618bac075f364e5ef2523f6f849eeffc833f2a2993d616aceb5cd9a8471cda35b0a7012e3ecb9b5551df18692aedb4935ec0dc074a45f857f7ae0196f8946

From 5872f97d17536c142fb1db9fd604c97aee225c59 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 3 Sep 2021 10:35:08 +0200
Subject: [PATCH 760/844] Update to 3.41.3

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 6ea4be0..23c9c35 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.41.2
+Version: 3.41.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -563,6 +563,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 03 2021 Milan Crha  - 3.41.3-1
+- Update to 3.41.3
+
 * Fri Aug 13 2021 Milan Crha  - 3.41.2-1
 - Update to 3.41.2
 
diff --git a/sources b/sources
index 4360aa2..35d43a1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.41.2.tar.xz) = e61618bac075f364e5ef2523f6f849eeffc833f2a2993d616aceb5cd9a8471cda35b0a7012e3ecb9b5551df18692aedb4935ec0dc074a45f857f7ae0196f8946
+SHA512 (evolution-3.41.3.tar.xz) = 0d3eb998768fbdad628e39ecaa61cd8cd4bb1aca8fd43f8129922b8420bb41d777db3c31a62b077b2b0cfa919ab6db298857fb07653160852f3c290d81fa9f6a

From 9d9cb4565592b200b1abb233a2db2e351fca4c9e Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 17 Sep 2021 09:08:55 +0200
Subject: [PATCH 761/844] Update to 3.42.0

---
 evolution.spec | 10 ++++++++--
 sources        |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 23c9c35..b195533 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,12 +42,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.41.3
+Version: 3.42.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.41/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.42/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -292,6 +292,9 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
 	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \
 	-DENABLE_PLUGINS=all \
+	%if 0%{?flatpak}
+	"-DWITH_WMCLASS_OVERRIDE=evolution.bin" \
+	%endif
 	%{nil}
 
 %cmake_build
@@ -563,6 +566,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 17 2021 Milan Crha  - 3.42.0-1
+- Update to 3.42.0
+
 * Fri Sep 03 2021 Milan Crha  - 3.41.3-1
 - Update to 3.41.3
 
diff --git a/sources b/sources
index 35d43a1..2b146d1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.41.3.tar.xz) = 0d3eb998768fbdad628e39ecaa61cd8cd4bb1aca8fd43f8129922b8420bb41d777db3c31a62b077b2b0cfa919ab6db298857fb07653160852f3c290d81fa9f6a
+SHA512 (evolution-3.42.0.tar.xz) = 435155a69ef324ff3b0f85c9f0ed3206a7dfe12bd8ad5e9a87dff5de839e837417147e81faa93c57f207dff4d92cdc36ac3856402493ff693055f267aed5cbeb

From 90276bd075ffd364ae66ff591628eb6877f596ff Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 29 Oct 2021 10:18:40 +0200
Subject: [PATCH 762/844] Update to 3.42.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index b195533..978498a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.42.0
+Version: 3.42.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -566,6 +566,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Oct 29 2021 Milan Crha  - 3.42.1-1
+- Update to 3.42.1
+
 * Fri Sep 17 2021 Milan Crha  - 3.42.0-1
 - Update to 3.42.0
 
diff --git a/sources b/sources
index 2b146d1..07e6443 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.42.0.tar.xz) = 435155a69ef324ff3b0f85c9f0ed3206a7dfe12bd8ad5e9a87dff5de839e837417147e81faa93c57f207dff4d92cdc36ac3856402493ff693055f267aed5cbeb
+SHA512 (evolution-3.42.1.tar.xz) = 9db26d27c78997c3924b6627389b1a5c95a2f161219346fe45016b346a68c10679039fbde540220fc31769b0d3402c228ef7283b55ea3388cf66398a11cb0508

From 8db144cf83a832ce14542c8c7813dc97b961c3c9 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 3 Dec 2021 09:24:32 +0100
Subject: [PATCH 763/844] Update to 3.42.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 978498a..0859440 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,7 +42,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.42.1
+Version: 3.42.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -566,6 +566,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Dec 03 2021 Milan Crha  - 3.42.2-1
+- Update to 3.42.2
+
 * Fri Oct 29 2021 Milan Crha  - 3.42.1-1
 - Update to 3.42.1
 
diff --git a/sources b/sources
index 07e6443..2645a57 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.42.1.tar.xz) = 9db26d27c78997c3924b6627389b1a5c95a2f161219346fe45016b346a68c10679039fbde540220fc31769b0d3402c228ef7283b55ea3388cf66398a11cb0508
+SHA512 (evolution-3.42.2.tar.xz) = 3ecdda77a34ec477e073319f4e0de00c1c4a0c2539529ed5ff6c98fdeed4cdf160ecce2791dc9d8902768a659ee22f3455b17028c1d0477ffbbbe1a40e7f5d97

From e4d74fc368bebd6e9572831240e4e13b9a2dd2ea Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 7 Jan 2022 14:22:16 +0100
Subject: [PATCH 764/844] Update to 3.43.1

---
 evolution.spec | 12 ++++++++++--
 sources        |  2 +-
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 0859440..24f3442 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -18,6 +18,8 @@
 %define intltool_version 0.35.5
 %define libgdata_version 0.10.0
 %define libgweather_version 3.10
+%define geocode_glib_version 3.10
+%define sqlite_version 3.7.17
 %define libsoup_version 2.42
 %define webkit2gtk_version 2.28.0
 
@@ -42,12 +44,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.42.2
+Version: 3.43.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.42/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.43/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -110,8 +112,10 @@ BuildRequires: pkgconfig(gsettings-desktop-schemas)
 BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 BuildRequires: pkgconfig(gspell-1)
 BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
+BuildRequires: pkgconfig(geocode-glib-1.0) >= %{geocode_glib_version}
 BuildRequires: pkgconfig(iso-codes)
 BuildRequires: pkgconfig(libcanberra-gtk3)
+BuildRequires: pkgconfig(libcmark)
 BuildRequires: pkgconfig(libebackend-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libebook-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libecal-2.0) >= %{eds_version}
@@ -123,6 +127,7 @@ BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(nspr)
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(shared-mime-info)
+BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
 BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
 BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk_version}
 
@@ -566,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 07 2022 Milan Crha  - 3.43.1-1
+- Update to 3.43.1
+
 * Fri Dec 03 2021 Milan Crha  - 3.42.2-1
 - Update to 3.42.2
 
diff --git a/sources b/sources
index 2645a57..c64ee5d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.42.2.tar.xz) = 3ecdda77a34ec477e073319f4e0de00c1c4a0c2539529ed5ff6c98fdeed4cdf160ecce2791dc9d8902768a659ee22f3455b17028c1d0477ffbbbe1a40e7f5d97
+SHA512 (evolution-3.43.1.tar.xz) = cfb37989f2df9b5a85189490fac21fec1a0a6602014f31efae13302120073693aaced03d0b48947be337cead637d4fd19db39a23df2886f07fa4f3a5e2fc3c6f

From 2a08fd0fd6b39a2f52c5eb656df16bd9b7c5802b Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Thu, 20 Jan 2022 02:29:01 +0000
Subject: [PATCH 765/844] - Rebuilt for
 https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 24f3442..65ea57a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -45,7 +45,7 @@
 
 Name: evolution
 Version: 3.43.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Thu Jan 20 2022 Fedora Release Engineering  - 3.43.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
 * Fri Jan 07 2022 Milan Crha  - 3.43.1-1
 - Update to 3.43.1
 

From e4a015cb0d94518f8861855a2a9b47b3ba5c3f0b Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 11 Feb 2022 11:25:01 +0100
Subject: [PATCH 766/844] Update to 3.43.2

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 65ea57a..dfe055b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,8 +44,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.43.1
-Release: 2%{?dist}
+Version: 3.43.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Feb 11 2022 Milan Crha  - 3.43.2-1
+- Update to 3.43.2
+
 * Thu Jan 20 2022 Fedora Release Engineering  - 3.43.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
diff --git a/sources b/sources
index c64ee5d..a156427 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.43.1.tar.xz) = cfb37989f2df9b5a85189490fac21fec1a0a6602014f31efae13302120073693aaced03d0b48947be337cead637d4fd19db39a23df2886f07fa4f3a5e2fc3c6f
+SHA512 (evolution-3.43.2.tar.xz) = d122ec422c363557a7ce114cdbc948af060b403428d408a610ef647f899f2004ad8ec99d698665f9791bd13cfdfa01c5c679d603a369a6221fec733bbdbf6209

From 3934420b3c72d14b0774c8f6cb47eee7266d7272 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 4 Mar 2022 07:54:26 +0100
Subject: [PATCH 767/844] Update to 3.43.3

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index dfe055b..919ec52 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.43.2
+Version: 3.43.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 04 2022 Milan Crha  - 3.43.3-1
+- Update to 3.43.3
+
 * Fri Feb 11 2022 Milan Crha  - 3.43.2-1
 - Update to 3.43.2
 
diff --git a/sources b/sources
index a156427..d996234 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.43.2.tar.xz) = d122ec422c363557a7ce114cdbc948af060b403428d408a610ef647f899f2004ad8ec99d698665f9791bd13cfdfa01c5c679d603a369a6221fec733bbdbf6209
+SHA512 (evolution-3.43.3.tar.xz) = 5b6533abc2cf83e527183d100db78d18db9346964c507687faa1cb581b2a235f9781cf47ddd927a2c330d332c12b0aa9cadf0cb47289329116983f449df0527b

From 8eb691149b99d808b6fabd7f6ed4372f709c8c37 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 18 Mar 2022 10:01:10 +0100
Subject: [PATCH 768/844] Update to 3.44.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 919ec52..28abe73 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,12 +44,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.43.3
+Version: 3.44.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.43/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.44/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 18 2022 Milan Crha  - 3.44.0-1
+- Update to 3.44.0
+
 * Fri Mar 04 2022 Milan Crha  - 3.43.3-1
 - Update to 3.43.3
 
diff --git a/sources b/sources
index d996234..1df5462 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.43.3.tar.xz) = 5b6533abc2cf83e527183d100db78d18db9346964c507687faa1cb581b2a235f9781cf47ddd927a2c330d332c12b0aa9cadf0cb47289329116983f449df0527b
+SHA512 (evolution-3.44.0.tar.xz) = 607c6b40717ffe6b0bb9c04897b6e4ea64f47ddb67337f7481bb358a10f489fcad3c5102e6235f7f4098687867762ff12ee86a930f62467604fe4d5fc1de5ef6

From 377014ebd491276b7583d5640d546c8bbf29acc4 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 1 Apr 2022 12:14:20 +0200
Subject: [PATCH 769/844] Define TEMP_HOME=1 when building for Flatpak

It allows to open attachments from Evolution.
See https://github.com/flathub/org.gnome.Evolution/issues/89
for the details.
---
 evolution.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evolution.spec b/evolution.spec
index 28abe73..5ef4722 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -299,6 +299,7 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated
 	-DENABLE_PLUGINS=all \
 	%if 0%{?flatpak}
 	"-DWITH_WMCLASS_OVERRIDE=evolution.bin" \
+	"-DTEMP_HOME=1" \
 	%endif
 	%{nil}
 

From 0747cea4097fb77a708a5cc4b4d7f92ad2831426 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 22 Apr 2022 08:16:04 +0200
Subject: [PATCH 770/844] Update to 3.44.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 5ef4722..7abd941 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.44.0
+Version: 3.44.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -572,6 +572,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Apr 22 2022 Milan Crha  - 3.44.1-1
+- Update to 3.44.1
+
 * Fri Mar 18 2022 Milan Crha  - 3.44.0-1
 - Update to 3.44.0
 
diff --git a/sources b/sources
index 1df5462..84dfa09 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.44.0.tar.xz) = 607c6b40717ffe6b0bb9c04897b6e4ea64f47ddb67337f7481bb358a10f489fcad3c5102e6235f7f4098687867762ff12ee86a930f62467604fe4d5fc1de5ef6
+SHA512 (evolution-3.44.1.tar.xz) = c8deb23f4fb7848843cb9845d10d9509e7df0f4b21c439f85c530801b9ed04f05727f1ab2dd4af5b1419263fd87240dc5950fa1e15ef417f2e64134f13a3b6e0

From a262612227d497893c8dd9f2f9a8b0b11ec52ee7 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 27 May 2022 08:14:08 +0200
Subject: [PATCH 771/844] Update to 3.44.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 7abd941..8fdcf66 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.44.1
+Version: 3.44.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -572,6 +572,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri May 27 2022 Milan Crha  - 3.44.2-1
+- Update to 3.44.2
+
 * Fri Apr 22 2022 Milan Crha  - 3.44.1-1
 - Update to 3.44.1
 
diff --git a/sources b/sources
index 84dfa09..6bcbeeb 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.44.1.tar.xz) = c8deb23f4fb7848843cb9845d10d9509e7df0f4b21c439f85c530801b9ed04f05727f1ab2dd4af5b1419263fd87240dc5950fa1e15ef417f2e64134f13a3b6e0
+SHA512 (evolution-3.44.2.tar.xz) = e7dffc5cb4a9a84cccf881c75ba347f9bae3c87fd76613c9cc363bab9aeda864288ca93b48347c08c82734f20f237d489d3670789e2b38b7ed5efbaa9b8ca4a3

From 028c80efcb0cc07dd27c7c318da149b36f76816e Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 1 Jul 2022 12:13:10 +0200
Subject: [PATCH 772/844] Update to 3.44.3

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 8fdcf66..aded66f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.44.2
+Version: 3.44.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -572,6 +572,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jul 01 2022 Milan Crha  - 3.44.3-1
+- Update to 3.44.3
+
 * Fri May 27 2022 Milan Crha  - 3.44.2-1
 - Update to 3.44.2
 
diff --git a/sources b/sources
index 6bcbeeb..a256aaf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.44.2.tar.xz) = e7dffc5cb4a9a84cccf881c75ba347f9bae3c87fd76613c9cc363bab9aeda864288ca93b48347c08c82734f20f237d489d3670789e2b38b7ed5efbaa9b8ca4a3
+SHA512 (evolution-3.44.3.tar.xz) = b314082f4bc8b0515d90afb7292cd0713f4412c89e6b71e2a46c9d516bef7aa822128a82cddcd155b5bece2c903b464108068abfce5729a617eaf83a184019ab

From ccacb1c349ebcdf4e367aaa5d9d15181bb3fc490 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 1 Jul 2022 13:39:54 +0200
Subject: [PATCH 773/844] No %{_datadir}/icons/hicolor/symbolic/apps/* files
 anymore

---
 evolution.spec | 1 -
 1 file changed, 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index aded66f..899a178 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -393,7 +393,6 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_datadir}/icons/hicolor/24x24/apps/*
 %{_datadir}/icons/hicolor/32x32/apps/*
 %{_datadir}/icons/hicolor/48x48/apps/*
-%{_datadir}/icons/hicolor/symbolic/apps/*
 %{_datadir}/icons/hicolor/scalable/apps/*
 
 # The main data directory

From 3ee812cbedc77ce03978bbcb48b71572e04de55b Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Tue, 19 Jul 2022 21:03:08 +0200
Subject: [PATCH 774/844] Update to 3.45.1

---
 0001-Build-with-gcr4-by-default.patch | 203 ++++++++++++++++++++++++++
 evolution.spec                        |  38 ++---
 sources                               |   2 +-
 3 files changed, 224 insertions(+), 19 deletions(-)
 create mode 100644 0001-Build-with-gcr4-by-default.patch

diff --git a/0001-Build-with-gcr4-by-default.patch b/0001-Build-with-gcr4-by-default.patch
new file mode 100644
index 0000000..2b5a225
--- /dev/null
+++ b/0001-Build-with-gcr4-by-default.patch
@@ -0,0 +1,203 @@
+From f0df67904c3a71479808d56f33d22274e317b085 Mon Sep 17 00:00:00 2001
+From: Milan Crha 
+Date: Tue, 19 Jul 2022 18:54:42 +0200
+Subject: [PATCH] Build with gcr4 by default
+
+Use -DWITH_GCR3=ON to build with gcr3 instead. The gcr4 will replace gcr3
+in the future, thus let the gcr4 be the default build option.
+---
+ CMakeLists.txt                                | 15 +++++++++--
+ config.h.in                                   |  3 +++
+ .../gui/contact-editor/e-contact-editor.c     | 12 ++++++---
+ src/smime/gui/certificate-manager.c           | 27 ++++++++++++++-----
+ src/smime/gui/e-cert-selector.c               |  8 ++++--
+ src/smime/lib/e-cert.c                        |  4 +++
+ 6 files changed, 54 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 736428e888..21224b0606 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -75,7 +75,8 @@ add_definitions(-DSOUP_VERSION_MIN_REQUIRED=${soup_encoded_version})
+ set(eds_minimum_version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
+ set(enchant1_minimum_version 1.6.0)
+ set(enchant2_minimum_version 2.2.0)
+-set(gcr_minimum_version 3.4)
++set(gcr3_minimum_version 3.4)
++set(gcr4_minimum_version 3.90.0)
+ set(gdk_pixbuf_minimum_version 2.24.0)
+ set(gnome_desktop_minimum_version 2.91.3)
+ set(gsettings_desktop_schemas_minimum_version 2.91.92)
+@@ -252,10 +253,20 @@ else(ENABLE_GNOME_DESKTOP)
+ 	set(HAVE_GNOME_DESKTOP OFF)
+ endif(ENABLE_GNOME_DESKTOP)
+ 
++add_printable_option(WITH_GCR3 "Use gcr3, instead of gcr4" OFF)
++
++if(WITH_GCR3)
++	set(GCR_DEPENDENCY gcr-3)
++	set(gcr_minimum_version ${gcr3_minimum_version})
++else(WITH_GCR3)
++	set(GCR_DEPENDENCY gcr-4-gtk3)
++	set(gcr_minimum_version ${gcr4_minimum_version})
++endif(WITH_GCR3)
++
+ pkg_check_modules(GNOME_PLATFORM REQUIRED
+ 	cairo-gobject
+ 	gail-3.0>=${gdk_minimum_version}
+-	gcr-3>=${gcr_minimum_version}
++	${GCR_DEPENDENCY}>=${gcr_minimum_version}
+ 	gdk-pixbuf-2.0>=${gdk_pixbuf_minimum_version}
+ 	gio-2.0>=${glib_minimum_version}
+ 	${GIO_UNIX_REQUIREMENT}
+diff --git a/config.h.in b/config.h.in
+index 0b6ea1fb1c..90f15a8394 100644
+--- a/config.h.in
++++ b/config.h.in
+@@ -122,3 +122,6 @@
+ 
+ /* Define if libical-glib has I_CAL_EMAIL_PARAMETER */
+ #cmakedefine HAVE_I_CAL_EMAIL_PARAMETER 1
++
++/* Defined, when using gcr3, not gcr4 */
++#cmakedefine WITH_GCR3 1
+diff --git a/src/addressbook/gui/contact-editor/e-contact-editor.c b/src/addressbook/gui/contact-editor/e-contact-editor.c
+index 7bda5826da..d517f5f598 100644
+--- a/src/addressbook/gui/contact-editor/e-contact-editor.c
++++ b/src/addressbook/gui/contact-editor/e-contact-editor.c
+@@ -34,7 +34,11 @@
+ #include 
+ 
+ #define GCR_API_SUBJECT_TO_CHANGE
++#ifdef WITH_GCR3
+ #include 
++#else
++#include 
++#endif
+ #undef GCR_API_SUBJECT_TO_CHANGE
+ 
+ #include "shell/e-shell.h"
+@@ -3536,7 +3540,7 @@ init_certs (EContactEditor *editor)
+ 	GtkTreeViewColumn *column;
+ 	GtkTreeSelection *selection;
+ 	GtkCellRenderer *renderer;
+-	GcrCertificateWidget *certificate_widget;
++	GtkWidget *certificate_widget;
+ 	GtkWidget *widget;
+ 
+ 	tree_view = GTK_TREE_VIEW (e_builder_get_widget (editor->priv->builder, "certs-treeview"));
+@@ -3568,10 +3572,10 @@ init_certs (EContactEditor *editor)
+ 
+ 	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (list_store));
+ 
+-	certificate_widget = gcr_certificate_widget_new (NULL);
+-	gtk_widget_show (GTK_WIDGET (certificate_widget));
++	certificate_widget = GTK_WIDGET (gcr_certificate_widget_new (NULL));
++	gtk_widget_show (certificate_widget);
+ 	widget = e_builder_get_widget (editor->priv->builder, "cert-preview-scw");
+-	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (certificate_widget));
++	gtk_container_add (GTK_CONTAINER (widget), certificate_widget);
+ 
+ 	selection = gtk_tree_view_get_selection (tree_view);
+ 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
+diff --git a/src/smime/gui/certificate-manager.c b/src/smime/gui/certificate-manager.c
+index 9e630f4921..58568e5533 100644
+--- a/src/smime/gui/certificate-manager.c
++++ b/src/smime/gui/certificate-manager.c
+@@ -49,8 +49,11 @@
+ 
+ /* XXX Yeah, yeah... */
+ #define GCR_API_SUBJECT_TO_CHANGE
+-
++#ifdef WITH_GCR3
+ #include 
++#else
++#include 
++#endif
+ 
+ #include "shell/e-shell.h"
+ 
+@@ -1235,8 +1238,7 @@ cm_prepare_certificate_widget (GcrCertificate *certificate)
+ {
+ 	GcrParser *parser;
+ 	GcrParsed *parsed = NULL;
+-	GckAttributes *attributes;
+-	GcrCertificateWidget *certificate_widget;
++	GtkWidget *widget;
+ 	const guchar *der_data = NULL;
+ 	gsize der_length;
+ 	GError *local_error = NULL;
+@@ -1264,13 +1266,24 @@ cm_prepare_certificate_widget (GcrCertificate *certificate)
+ 		return NULL;
+ 	}
+ 
+-	attributes = gcr_parsed_get_attributes (parsed);
+-	certificate_widget = gcr_certificate_widget_new (certificate);
+-	gcr_certificate_widget_set_attributes (certificate_widget, attributes);
++	#ifdef WITH_GCR3
++	{
++		GcrCertificateWidget *certificate_widget;
++		GckAttributes *attributes;
++
++		attributes = gcr_parsed_get_attributes (parsed);
++		certificate_widget = gcr_certificate_widget_new (certificate);
++		gcr_certificate_widget_set_attributes (certificate_widget, attributes);
++
++		widget = GTK_WIDGET (certificate_widget);
++	}
++	#else
++	widget = gcr_certificate_widget_new (certificate);
++	#endif
+ 
+ 	gcr_parsed_unref (parsed);
+ 
+-	return GTK_WIDGET (certificate_widget);
++	return widget;
+ }
+ 
+ static void
+diff --git a/src/smime/gui/e-cert-selector.c b/src/smime/gui/e-cert-selector.c
+index 77e492b1f9..4986047c01 100644
+--- a/src/smime/gui/e-cert-selector.c
++++ b/src/smime/gui/e-cert-selector.c
+@@ -39,7 +39,11 @@
+ #define PKCS11_H 1
+ 
+ #define GCR_API_SUBJECT_TO_CHANGE
+-#include "gcr/gcr.h"
++#ifdef WITH_GCR3
++#include 
++#else
++#include 
++#endif
+ 
+ #include "smime/lib/e-cert.h"
+ 
+@@ -168,7 +172,7 @@ e_cert_selector_new (gint type,
+ 	e_load_ui_builder_definition (builder, "smime-ui.ui");
+ 
+ 	p->combobox = e_builder_get_widget (builder, "cert_combobox");
+-	p->cert_widget = gcr_certificate_widget_new (NULL);
++	p->cert_widget = GCR_CERTIFICATE_WIDGET (gcr_certificate_widget_new (NULL));
+ 
+ 	w = e_builder_get_widget (builder, "cert_selector_vbox");
+ 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (ecs));
+diff --git a/src/smime/lib/e-cert.c b/src/smime/lib/e-cert.c
+index f6792cb352..88ffbffa83 100644
+--- a/src/smime/lib/e-cert.c
++++ b/src/smime/lib/e-cert.c
+@@ -62,7 +62,11 @@
+ /* XXX Yeah, yeah */
+ #define GCR_API_SUBJECT_TO_CHANGE
+ 
++#ifdef WITH_GCR3
+ #include 
++#else
++#include 
++#endif
+ 
+ #define E_CERT_GET_PRIVATE(obj) \
+ 	(G_TYPE_INSTANCE_GET_PRIVATE \
+-- 
+2.35.1
+
diff --git a/evolution.spec b/evolution.spec
index 899a178..1a98301 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -11,17 +11,16 @@
 %global tnef_support 1
 %endif
 
-%define glib2_version 2.56
+%define glib2_version 2.66
 %define gtk3_version 3.22
 %define gnome_autoar_version 0.1.1
 %define gnome_desktop_version 2.91.3
 %define intltool_version 0.35.5
-%define libgdata_version 0.10.0
-%define libgweather_version 3.10
-%define geocode_glib_version 3.10
+%define libgweather_version 3.91
+%define geocode_glib_version 3.26.3
 %define sqlite_version 3.7.17
-%define libsoup_version 2.42
-%define webkit2gtk_version 2.28.0
+%define libsoup_version 3.1.1
+%define webkit2gtk_version 2.34.0
 
 %define last_anjal_version 0.3.2-3
 %define last_libgal2_version 2:2.5.3-2
@@ -44,15 +43,17 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.44.3
+Version: 3.45.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.44/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.45/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+Patch01: 0001-Build-with-gcr4-by-default.patch
+
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -101,7 +102,7 @@ BuildRequires: pkgconfig(cairo-gobject)
 BuildRequires: pkgconfig(camel-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(enchant-2)
 BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
-BuildRequires: pkgconfig(gcr-3)
+BuildRequires: pkgconfig(gcr-4-gtk3)
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
 BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
@@ -111,8 +112,8 @@ BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
 BuildRequires: pkgconfig(gsettings-desktop-schemas)
 BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 BuildRequires: pkgconfig(gspell-1)
-BuildRequires: pkgconfig(gweather-3.0) >= %{libgweather_version}
-BuildRequires: pkgconfig(geocode-glib-1.0) >= %{geocode_glib_version}
+BuildRequires: pkgconfig(gweather4) >= %{libgweather_version}
+BuildRequires: pkgconfig(geocode-glib-2.0) >= %{geocode_glib_version}
 BuildRequires: pkgconfig(iso-codes)
 BuildRequires: pkgconfig(libcanberra-gtk3)
 BuildRequires: pkgconfig(libcmark)
@@ -121,15 +122,14 @@ BuildRequires: pkgconfig(libebook-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libecal-2.0) >= %{eds_version}
 BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(libedataserverui-1.2) >= %{eds_version}
-BuildRequires: pkgconfig(libgdata) >= %{libgdata_version}
-BuildRequires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+BuildRequires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
 BuildRequires: pkgconfig(libxml-2.0)
 BuildRequires: pkgconfig(nspr)
 BuildRequires: pkgconfig(nss)
 BuildRequires: pkgconfig(shared-mime-info)
 BuildRequires: pkgconfig(sqlite3) >= %{sqlite_version}
-BuildRequires: pkgconfig(webkit2gtk-4.0) >= %{webkit2gtk_version}
-BuildRequires: pkgconfig(webkit2gtk-web-extension-4.0) >= %{webkit2gtk_version}
+BuildRequires: pkgconfig(webkit2gtk-4.1) >= %{webkit2gtk_version}
+BuildRequires: pkgconfig(webkit2gtk-web-extension-4.1) >= %{webkit2gtk_version}
 
 %if %{tnef_support}
 BuildRequires: pkgconfig(libytnef)
@@ -160,13 +160,12 @@ Requires: pkgconfig(camel-1.2) >= %{eds_version}
 Requires: pkgconfig(enchant)
 Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 Requires: pkgconfig(gspell-1)
-Requires: pkgconfig(gweather-3.0) >= %{libgweather_version}
+Requires: pkgconfig(gweather4) >= %{libgweather_version}
 Requires: pkgconfig(libebackend-1.2) >= %{eds_version}
 Requires: pkgconfig(libebook-1.2) >= %{eds_version}
 Requires: pkgconfig(libecal-2.0) >= %{eds_version}
 Requires: pkgconfig(libedataserver-1.2) >= %{eds_version}
-Requires: pkgconfig(libgdata) >= %{libgdata_version}
-Requires: pkgconfig(libsoup-2.4) >= %{libsoup_version}
+Requires: pkgconfig(libsoup-3.0) >= %{libsoup_version}
 Requires: pkgconfig(libxml-2.0)
 Obsoletes: libgal2-devel <= %{last_libgal2_version}
 
@@ -571,6 +570,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue Jul 19 2022 Milan Crha  - 3.45.1-1
+- Update to 3.45.1
+
 * Fri Jul 01 2022 Milan Crha  - 3.44.3-1
 - Update to 3.44.3
 
diff --git a/sources b/sources
index a256aaf..29964d7 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.44.3.tar.xz) = b314082f4bc8b0515d90afb7292cd0713f4412c89e6b71e2a46c9d516bef7aa822128a82cddcd155b5bece2c903b464108068abfce5729a617eaf83a184019ab
+SHA512 (evolution-3.45.1.tar.xz) = 26250ef4447b76cb64e3e88123115034e222a589701fc80fb53a23c967c75b620338aa936263acaa7f22ad28c197253456a0f5dd869883651f82f1ecc5042f7c

From 757aeece0e512b10c712eac00f319b0b10649b87 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Wed, 20 Jul 2022 15:50:39 +0200
Subject: [PATCH 775/844] Correct Requires for the 'devel' subpackage to
 enchant-2

---
 evolution.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 1a98301..846deae 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -157,7 +157,7 @@ personal information-management tool.
 Summary: Development files for building against %{name}
 Requires: %{name} = %{version}-%{release}
 Requires: pkgconfig(camel-1.2) >= %{eds_version}
-Requires: pkgconfig(enchant)
+Requires: pkgconfig(enchant-2)
 Requires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
 Requires: pkgconfig(gspell-1)
 Requires: pkgconfig(gweather4) >= %{libgweather_version}

From 8c5ea8c543a566c615379fb66094934ec4a9ffbc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Thu, 21 Jul 2022 02:34:51 +0000
Subject: [PATCH 776/844] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 846deae..98af3f0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.45.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -570,6 +570,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Thu Jul 21 2022 Fedora Release Engineering  - 3.45.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
+
 * Tue Jul 19 2022 Milan Crha  - 3.45.1-1
 - Update to 3.45.1
 

From 7b81ae4e1969d6a2efcba1f415aeb624bcfaa52a Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 5 Aug 2022 12:10:24 +0200
Subject: [PATCH 777/844] Update to 3.45.2

---
 0001-Build-with-gcr4-by-default.patch | 203 --------------------------
 evolution.spec                        |  12 +-
 sources                               |   2 +-
 3 files changed, 9 insertions(+), 208 deletions(-)
 delete mode 100644 0001-Build-with-gcr4-by-default.patch

diff --git a/0001-Build-with-gcr4-by-default.patch b/0001-Build-with-gcr4-by-default.patch
deleted file mode 100644
index 2b5a225..0000000
--- a/0001-Build-with-gcr4-by-default.patch
+++ /dev/null
@@ -1,203 +0,0 @@
-From f0df67904c3a71479808d56f33d22274e317b085 Mon Sep 17 00:00:00 2001
-From: Milan Crha 
-Date: Tue, 19 Jul 2022 18:54:42 +0200
-Subject: [PATCH] Build with gcr4 by default
-
-Use -DWITH_GCR3=ON to build with gcr3 instead. The gcr4 will replace gcr3
-in the future, thus let the gcr4 be the default build option.
----
- CMakeLists.txt                                | 15 +++++++++--
- config.h.in                                   |  3 +++
- .../gui/contact-editor/e-contact-editor.c     | 12 ++++++---
- src/smime/gui/certificate-manager.c           | 27 ++++++++++++++-----
- src/smime/gui/e-cert-selector.c               |  8 ++++--
- src/smime/lib/e-cert.c                        |  4 +++
- 6 files changed, 54 insertions(+), 15 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 736428e888..21224b0606 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -75,7 +75,8 @@ add_definitions(-DSOUP_VERSION_MIN_REQUIRED=${soup_encoded_version})
- set(eds_minimum_version ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
- set(enchant1_minimum_version 1.6.0)
- set(enchant2_minimum_version 2.2.0)
--set(gcr_minimum_version 3.4)
-+set(gcr3_minimum_version 3.4)
-+set(gcr4_minimum_version 3.90.0)
- set(gdk_pixbuf_minimum_version 2.24.0)
- set(gnome_desktop_minimum_version 2.91.3)
- set(gsettings_desktop_schemas_minimum_version 2.91.92)
-@@ -252,10 +253,20 @@ else(ENABLE_GNOME_DESKTOP)
- 	set(HAVE_GNOME_DESKTOP OFF)
- endif(ENABLE_GNOME_DESKTOP)
- 
-+add_printable_option(WITH_GCR3 "Use gcr3, instead of gcr4" OFF)
-+
-+if(WITH_GCR3)
-+	set(GCR_DEPENDENCY gcr-3)
-+	set(gcr_minimum_version ${gcr3_minimum_version})
-+else(WITH_GCR3)
-+	set(GCR_DEPENDENCY gcr-4-gtk3)
-+	set(gcr_minimum_version ${gcr4_minimum_version})
-+endif(WITH_GCR3)
-+
- pkg_check_modules(GNOME_PLATFORM REQUIRED
- 	cairo-gobject
- 	gail-3.0>=${gdk_minimum_version}
--	gcr-3>=${gcr_minimum_version}
-+	${GCR_DEPENDENCY}>=${gcr_minimum_version}
- 	gdk-pixbuf-2.0>=${gdk_pixbuf_minimum_version}
- 	gio-2.0>=${glib_minimum_version}
- 	${GIO_UNIX_REQUIREMENT}
-diff --git a/config.h.in b/config.h.in
-index 0b6ea1fb1c..90f15a8394 100644
---- a/config.h.in
-+++ b/config.h.in
-@@ -122,3 +122,6 @@
- 
- /* Define if libical-glib has I_CAL_EMAIL_PARAMETER */
- #cmakedefine HAVE_I_CAL_EMAIL_PARAMETER 1
-+
-+/* Defined, when using gcr3, not gcr4 */
-+#cmakedefine WITH_GCR3 1
-diff --git a/src/addressbook/gui/contact-editor/e-contact-editor.c b/src/addressbook/gui/contact-editor/e-contact-editor.c
-index 7bda5826da..d517f5f598 100644
---- a/src/addressbook/gui/contact-editor/e-contact-editor.c
-+++ b/src/addressbook/gui/contact-editor/e-contact-editor.c
-@@ -34,7 +34,11 @@
- #include 
- 
- #define GCR_API_SUBJECT_TO_CHANGE
-+#ifdef WITH_GCR3
- #include 
-+#else
-+#include 
-+#endif
- #undef GCR_API_SUBJECT_TO_CHANGE
- 
- #include "shell/e-shell.h"
-@@ -3536,7 +3540,7 @@ init_certs (EContactEditor *editor)
- 	GtkTreeViewColumn *column;
- 	GtkTreeSelection *selection;
- 	GtkCellRenderer *renderer;
--	GcrCertificateWidget *certificate_widget;
-+	GtkWidget *certificate_widget;
- 	GtkWidget *widget;
- 
- 	tree_view = GTK_TREE_VIEW (e_builder_get_widget (editor->priv->builder, "certs-treeview"));
-@@ -3568,10 +3572,10 @@ init_certs (EContactEditor *editor)
- 
- 	gtk_tree_view_set_model (tree_view, GTK_TREE_MODEL (list_store));
- 
--	certificate_widget = gcr_certificate_widget_new (NULL);
--	gtk_widget_show (GTK_WIDGET (certificate_widget));
-+	certificate_widget = GTK_WIDGET (gcr_certificate_widget_new (NULL));
-+	gtk_widget_show (certificate_widget);
- 	widget = e_builder_get_widget (editor->priv->builder, "cert-preview-scw");
--	gtk_container_add (GTK_CONTAINER (widget), GTK_WIDGET (certificate_widget));
-+	gtk_container_add (GTK_CONTAINER (widget), certificate_widget);
- 
- 	selection = gtk_tree_view_get_selection (tree_view);
- 	gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);
-diff --git a/src/smime/gui/certificate-manager.c b/src/smime/gui/certificate-manager.c
-index 9e630f4921..58568e5533 100644
---- a/src/smime/gui/certificate-manager.c
-+++ b/src/smime/gui/certificate-manager.c
-@@ -49,8 +49,11 @@
- 
- /* XXX Yeah, yeah... */
- #define GCR_API_SUBJECT_TO_CHANGE
--
-+#ifdef WITH_GCR3
- #include 
-+#else
-+#include 
-+#endif
- 
- #include "shell/e-shell.h"
- 
-@@ -1235,8 +1238,7 @@ cm_prepare_certificate_widget (GcrCertificate *certificate)
- {
- 	GcrParser *parser;
- 	GcrParsed *parsed = NULL;
--	GckAttributes *attributes;
--	GcrCertificateWidget *certificate_widget;
-+	GtkWidget *widget;
- 	const guchar *der_data = NULL;
- 	gsize der_length;
- 	GError *local_error = NULL;
-@@ -1264,13 +1266,24 @@ cm_prepare_certificate_widget (GcrCertificate *certificate)
- 		return NULL;
- 	}
- 
--	attributes = gcr_parsed_get_attributes (parsed);
--	certificate_widget = gcr_certificate_widget_new (certificate);
--	gcr_certificate_widget_set_attributes (certificate_widget, attributes);
-+	#ifdef WITH_GCR3
-+	{
-+		GcrCertificateWidget *certificate_widget;
-+		GckAttributes *attributes;
-+
-+		attributes = gcr_parsed_get_attributes (parsed);
-+		certificate_widget = gcr_certificate_widget_new (certificate);
-+		gcr_certificate_widget_set_attributes (certificate_widget, attributes);
-+
-+		widget = GTK_WIDGET (certificate_widget);
-+	}
-+	#else
-+	widget = gcr_certificate_widget_new (certificate);
-+	#endif
- 
- 	gcr_parsed_unref (parsed);
- 
--	return GTK_WIDGET (certificate_widget);
-+	return widget;
- }
- 
- static void
-diff --git a/src/smime/gui/e-cert-selector.c b/src/smime/gui/e-cert-selector.c
-index 77e492b1f9..4986047c01 100644
---- a/src/smime/gui/e-cert-selector.c
-+++ b/src/smime/gui/e-cert-selector.c
-@@ -39,7 +39,11 @@
- #define PKCS11_H 1
- 
- #define GCR_API_SUBJECT_TO_CHANGE
--#include "gcr/gcr.h"
-+#ifdef WITH_GCR3
-+#include 
-+#else
-+#include 
-+#endif
- 
- #include "smime/lib/e-cert.h"
- 
-@@ -168,7 +172,7 @@ e_cert_selector_new (gint type,
- 	e_load_ui_builder_definition (builder, "smime-ui.ui");
- 
- 	p->combobox = e_builder_get_widget (builder, "cert_combobox");
--	p->cert_widget = gcr_certificate_widget_new (NULL);
-+	p->cert_widget = GCR_CERTIFICATE_WIDGET (gcr_certificate_widget_new (NULL));
- 
- 	w = e_builder_get_widget (builder, "cert_selector_vbox");
- 	content_area = gtk_dialog_get_content_area (GTK_DIALOG (ecs));
-diff --git a/src/smime/lib/e-cert.c b/src/smime/lib/e-cert.c
-index f6792cb352..88ffbffa83 100644
---- a/src/smime/lib/e-cert.c
-+++ b/src/smime/lib/e-cert.c
-@@ -62,7 +62,11 @@
- /* XXX Yeah, yeah */
- #define GCR_API_SUBJECT_TO_CHANGE
- 
-+#ifdef WITH_GCR3
- #include 
-+#else
-+#include 
-+#endif
- 
- #define E_CERT_GET_PRIVATE(obj) \
- 	(G_TYPE_INSTANCE_GET_PRIVATE \
--- 
-2.35.1
-
diff --git a/evolution.spec b/evolution.spec
index 98af3f0..eb75eb0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.45.1
-Release: 2%{?dist}
+Version: 3.45.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -52,8 +52,6 @@ Source: http://download.gnome.org/sources/%{name}/3.45/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
-Patch01: 0001-Build-with-gcr4-by-default.patch
-
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -431,6 +429,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/modules/module-prefer-plain.so
 %{_libdir}/evolution/modules/module-plugin-lib.so
 %{_libdir}/evolution/modules/module-plugin-manager.so
+%{_libdir}/evolution/modules/module-rss.so
 %{_libdir}/evolution/modules/module-settings.so
 %{_libdir}/evolution/modules/module-startup-wizard.so
 %{_libdir}/evolution/modules/module-text-highlight.so
@@ -442,6 +441,8 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/modules/module-tnef-attachment.so
 %endif
 
+%{_libdir}/evolution-data-server/camel-providers/libcamelrss.so
+%{_libdir}/evolution-data-server/camel-providers/libcamelrss.urls
 %{_libdir}/evolution-data-server/ui-modules/module-evolution-alarm-notify.so
 
 # Shared libraries:
@@ -570,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Aug 05 2022 Milan Crha  - 3.45.2-1
+- Update to 3.45.2
+
 * Thu Jul 21 2022 Fedora Release Engineering  - 3.45.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
diff --git a/sources b/sources
index 29964d7..9b24fc5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.45.1.tar.xz) = 26250ef4447b76cb64e3e88123115034e222a589701fc80fb53a23c967c75b620338aa936263acaa7f22ad28c197253456a0f5dd869883651f82f1ecc5042f7c
+SHA512 (evolution-3.45.2.tar.xz) = ceed12be87dbe2f94a09da13ed71d9036e2d20ebc60df8854e27ba395184a4b9eeca97c9884e5dbd46da9b4f8ad21d9203b5ca2ad3292316ac8f999b11815392

From b0a176ba9caef3c0347596b5c4a655f9469d5f54 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Thu, 18 Aug 2022 07:41:50 +0200
Subject: [PATCH 778/844] Add rpminspect.yaml (settings for the RUNPATH test)

---
 rpminspect.yaml | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 rpminspect.yaml

diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..1ba6977
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,5 @@
+---
+runpath:
+    allowed_paths:
+        - /usr/lib/evolution
+        - /usr/lib64/evolution

From f0cc6e1d83a525d7481cbe2da01d6e94d472fb66 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 2 Sep 2022 09:08:18 +0200
Subject: [PATCH 779/844] Update to 3.45.3; Obsolete evolution-rss

---
 evolution.spec | 8 ++++++--
 sources        | 2 +-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index eb75eb0..0daeeda 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.45.2
+Version: 3.45.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -59,6 +59,7 @@ Obsoletes: anjal <= %{last_anjal_version}
 Obsoletes: libgal2 <= %{last_libgal2_version}
 Obsoletes: evolution-NetworkManager < %{last_evo_nm_version}
 Obsoletes: evolution-perl < %{last_evo_perl_version}
+Obsoletes: evolution-rss < 3.45.2
 
 %if !%{enable_installed_tests}
 Obsoletes: evolution-tests <= 3.31.1
@@ -100,7 +101,6 @@ BuildRequires: pkgconfig(cairo-gobject)
 BuildRequires: pkgconfig(camel-1.2) >= %{eds_version}
 BuildRequires: pkgconfig(enchant-2)
 BuildRequires: pkgconfig(gail-3.0) >= %{gtk3_version}
-BuildRequires: pkgconfig(gcr-4-gtk3)
 BuildRequires: pkgconfig(gdk-pixbuf-2.0)
 BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
 BuildRequires: pkgconfig(gmodule-2.0) >= %{glib2_version}
@@ -571,6 +571,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 02 2022 Milan Crha  - 3.45.3-1
+- Update to 3.45.3
+- Obsolete evolution-rss
+
 * Fri Aug 05 2022 Milan Crha  - 3.45.2-1
 - Update to 3.45.2
 
diff --git a/sources b/sources
index 9b24fc5..ac11e1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.45.2.tar.xz) = ceed12be87dbe2f94a09da13ed71d9036e2d20ebc60df8854e27ba395184a4b9eeca97c9884e5dbd46da9b4f8ad21d9203b5ca2ad3292316ac8f999b11815392
+SHA512 (evolution-3.45.3.tar.xz) = 40d3119e5c07e420c497c9e86107bf11759188916d1dc04c9507e5486da6bc150d5bd584c8e2f16ba341ce83c1e25c21356f8b1ca0a1c00eb2e3a8219c6cf251

From c7bbe3fb6201605652124e3c73a9a1e6c55063d2 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 16 Sep 2022 07:57:03 +0200
Subject: [PATCH 780/844] Update to 3.46.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 0daeeda..ffc4a0a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.45.3
+Version: 3.46.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.45/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 16 2022 Milan Crha  - 3.46.0-1
+- Update to 3.46.0
+
 * Fri Sep 02 2022 Milan Crha  - 3.45.3-1
 - Update to 3.45.3
 - Obsolete evolution-rss
diff --git a/sources b/sources
index ac11e1a..7919952 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.45.3.tar.xz) = 40d3119e5c07e420c497c9e86107bf11759188916d1dc04c9507e5486da6bc150d5bd584c8e2f16ba341ce83c1e25c21356f8b1ca0a1c00eb2e3a8219c6cf251
+SHA512 (evolution-3.46.0.tar.xz) = 58b532711196e7c79cffa2357245743562a94fd9629718066ba16a26889fb45f94992e4cc3cf0d3911356b700abecb05099c5c854749db282a241321c0d0c605

From e71d9f2208c98527251bb6791e8ce38406ea4578 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 23 Sep 2022 09:30:06 +0200
Subject: [PATCH 781/844] Resolves: #2129068 (Busy loop when opening composer
 window)

---
 ...rButton-Avoid-busy-loop-on-toggle-ac.patch | 174 ++++++++++++++++++
 evolution.spec                                |   7 +-
 2 files changed, 180 insertions(+), 1 deletion(-)
 create mode 100644 0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch

diff --git a/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch b/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch
new file mode 100644
index 0000000..c9f600c
--- /dev/null
+++ b/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch
@@ -0,0 +1,174 @@
+diff --git a/src/e-util/e-headerbar-button.c b/src/e-util/e-headerbar-button.c
+index 70dad04173..248a278ea4 100644
+--- a/src/e-util/e-headerbar-button.c
++++ b/src/e-util/e-headerbar-button.c
+@@ -136,8 +136,10 @@ header_bar_button_update_button (EHeaderBarButton *header_bar_button)
+ }
+ 
+ static void
+-header_bar_button_clicked (EHeaderBarButton *header_bar_button)
++header_bar_button_clicked (GtkWidget *button,
++			   gpointer user_data)
+ {
++	EHeaderBarButton *header_bar_button = user_data;
+ 	GtkAction *action;
+ 
+ 	if (header_bar_button->priv->action == NULL)
+@@ -149,6 +151,15 @@ header_bar_button_clicked (EHeaderBarButton *header_bar_button)
+ 		gtk_action_activate (action);
+ }
+ 
++static void
++header_bar_button_action_activate_cb (GObject *button,
++				      gpointer user_data)
++{
++	GtkAction *action = user_data;
++
++	gtk_action_activate (action);
++}
++
+ static void
+ header_bar_button_set_prefer_item (EHeaderBarButton *self,
+ 				   const gchar *prefer_item)
+@@ -178,12 +189,63 @@ header_bar_button_transform_sensitive_cb (GBinding *binding,
+ 	return TRUE;
+ }
+ 
++typedef struct _ToggleActionData {
++	GWeakRef *button_weakref;
++	gulong handler_id;
++} ToggleActionData;
++
++static void
++toggle_action_data_free (gpointer ptr,
++			 GClosure *closure)
++{
++	ToggleActionData *tad = ptr;
++
++	if (tad) {
++		e_weak_ref_free (tad->button_weakref);
++		g_free (tad);
++	}
++}
++
++static void
++header_button_action_notify_active_cb (GObject *action,
++				       GParamSpec *param,
++				       gpointer user_data)
++{
++	ToggleActionData *tad = user_data;
++	GtkToggleButton *button;
++	gboolean active = FALSE;
++
++	button = g_weak_ref_get (tad->button_weakref);
++	if (!button)
++		return;
++
++	g_object_get (action, "active", &active, NULL);
++
++	/* The "clicked" callback calls gtk_action_activate(), which, in case
++	   of the toggle action, means to flip the option, thus it calls a notification
++	   about action's 'active' property change, which leads back here, causing
++	   a busy loop though the signal handlers. Blocking the handler breaks the loop. */
++	if (tad->handler_id)
++		g_signal_handler_block (button, tad->handler_id);
++
++	if ((gtk_toggle_button_get_active (button) ? 1 : 0) != (active ? 1 : 0))
++		gtk_toggle_button_set_active (button, active);
++
++	if (tad->handler_id)
++		g_signal_handler_unblock (button, tad->handler_id);
++
++	g_clear_object (&button);
++}
++
+ static GtkWidget *
+ header_bar_button_add_action (EHeaderBarButton *header_bar_button,
+ 			      const gchar *label,
+-			      GtkAction *action)
++			      GtkAction *action,
++			      GCallback clicked_cb,
++			      gpointer clicked_cb_user_data)
+ {
+ 	GtkWidget *button;
++	gulong clicked_handler = 0;
+ 
+ 	if (GTK_IS_TOGGLE_ACTION (action))
+ 		button = gtk_toggle_button_new_with_label (label);
+@@ -194,6 +256,11 @@ header_bar_button_add_action (EHeaderBarButton *header_bar_button,
+ 
+ 	gtk_box_pack_start (GTK_BOX (header_bar_button), button, FALSE, FALSE, 0);
+ 
++	if (clicked_cb) {
++		clicked_handler = g_signal_connect_object (
++			button, "clicked", clicked_cb, clicked_cb_user_data, 0);
++	}
++
+ 	if (action) {
+ 		e_binding_bind_property_full (
+ 			action, "sensitive",
+@@ -203,10 +270,17 @@ header_bar_button_add_action (EHeaderBarButton *header_bar_button,
+ 			NULL, NULL, NULL);
+ 
+ 		if (GTK_IS_TOGGLE_ACTION (action)) {
+-			e_binding_bind_property (
+-				action, "active",
+-				button, "active",
+-				G_BINDING_SYNC_CREATE);
++			ToggleActionData *tad;
++
++			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
++				gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
++
++			tad = g_new0 (ToggleActionData, 1);
++			tad->button_weakref = e_weak_ref_new (button);
++			tad->handler_id = clicked_handler;
++
++			g_signal_connect_data (action, "notify::active",
++				G_CALLBACK (header_button_action_notify_active_cb), tad, toggle_action_data_free, 0);
+ 		}
+ 
+ 		header_bar_button_update_button_for_action (GTK_BUTTON (button), action);
+@@ -278,16 +352,14 @@ header_bar_button_constructed (GObject *object)
+ 
+ 	header_bar_button->priv->button = header_bar_button_add_action (header_bar_button,
+ 		header_bar_button->priv->label,
+-		header_bar_button->priv->action);
++		header_bar_button->priv->action,
++		G_CALLBACK (header_bar_button_clicked),
++		header_bar_button);
+ 
+ 	/* TODO: GTK4 port: do not use linked buttons
+ 	 * https://developer.gnome.org/hig/patterns/containers/header-bars.html#button-grouping */
+ 	style_context = gtk_widget_get_style_context (GTK_WIDGET (header_bar_button));
+ 	gtk_style_context_add_class (style_context, "linked");
+-
+-	g_signal_connect_swapped (
+-		header_bar_button->priv->button, "clicked",
+-		G_CALLBACK (header_bar_button_clicked), header_bar_button);
+ }
+ 
+ static void
+@@ -393,17 +465,11 @@ e_header_bar_button_add_action (EHeaderBarButton *header_bar_button,
+ 				const gchar *label,
+ 				GtkAction *action)
+ {
+-	GtkWidget *button;
+-
+ 	g_return_if_fail (E_IS_HEADER_BAR_BUTTON (header_bar_button));
+ 	g_return_if_fail (GTK_IS_ACTION (action));
+ 
+-	button = header_bar_button_add_action (header_bar_button, label, action);
+-
+-	g_signal_connect_object (
+-		button, "clicked",
+-		G_CALLBACK (gtk_action_activate), action,
+-		G_CONNECT_SWAPPED);
++	header_bar_button_add_action (header_bar_button, label, action,
++		G_CALLBACK (header_bar_button_action_activate_cb), action);
+ }
+ 
+ /**
+-- 
+2.37.3
+
diff --git a/evolution.spec b/evolution.spec
index ffc4a0a..cd131bd 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.46.0
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -52,6 +52,8 @@ Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+Patch01: 0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch
+
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -571,6 +573,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 23 2022 Milan Crha  - 3.46.0-2
+- Resolves: #2129068 (Busy loop when opening composer window)
+
 * Fri Sep 16 2022 Milan Crha  - 3.46.0-1
 - Update to 3.46.0
 

From 067799c686d89018a38e6792ecac49352206bef0 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 21 Oct 2022 08:38:47 +0200
Subject: [PATCH 782/844] Update to 3.46.1

---
 ...rButton-Avoid-busy-loop-on-toggle-ac.patch | 174 ------------------
 evolution.spec                                |   9 +-
 sources                                       |   2 +-
 3 files changed, 6 insertions(+), 179 deletions(-)
 delete mode 100644 0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch

diff --git a/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch b/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch
deleted file mode 100644
index c9f600c..0000000
--- a/0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch
+++ /dev/null
@@ -1,174 +0,0 @@
-diff --git a/src/e-util/e-headerbar-button.c b/src/e-util/e-headerbar-button.c
-index 70dad04173..248a278ea4 100644
---- a/src/e-util/e-headerbar-button.c
-+++ b/src/e-util/e-headerbar-button.c
-@@ -136,8 +136,10 @@ header_bar_button_update_button (EHeaderBarButton *header_bar_button)
- }
- 
- static void
--header_bar_button_clicked (EHeaderBarButton *header_bar_button)
-+header_bar_button_clicked (GtkWidget *button,
-+			   gpointer user_data)
- {
-+	EHeaderBarButton *header_bar_button = user_data;
- 	GtkAction *action;
- 
- 	if (header_bar_button->priv->action == NULL)
-@@ -149,6 +151,15 @@ header_bar_button_clicked (EHeaderBarButton *header_bar_button)
- 		gtk_action_activate (action);
- }
- 
-+static void
-+header_bar_button_action_activate_cb (GObject *button,
-+				      gpointer user_data)
-+{
-+	GtkAction *action = user_data;
-+
-+	gtk_action_activate (action);
-+}
-+
- static void
- header_bar_button_set_prefer_item (EHeaderBarButton *self,
- 				   const gchar *prefer_item)
-@@ -178,12 +189,63 @@ header_bar_button_transform_sensitive_cb (GBinding *binding,
- 	return TRUE;
- }
- 
-+typedef struct _ToggleActionData {
-+	GWeakRef *button_weakref;
-+	gulong handler_id;
-+} ToggleActionData;
-+
-+static void
-+toggle_action_data_free (gpointer ptr,
-+			 GClosure *closure)
-+{
-+	ToggleActionData *tad = ptr;
-+
-+	if (tad) {
-+		e_weak_ref_free (tad->button_weakref);
-+		g_free (tad);
-+	}
-+}
-+
-+static void
-+header_button_action_notify_active_cb (GObject *action,
-+				       GParamSpec *param,
-+				       gpointer user_data)
-+{
-+	ToggleActionData *tad = user_data;
-+	GtkToggleButton *button;
-+	gboolean active = FALSE;
-+
-+	button = g_weak_ref_get (tad->button_weakref);
-+	if (!button)
-+		return;
-+
-+	g_object_get (action, "active", &active, NULL);
-+
-+	/* The "clicked" callback calls gtk_action_activate(), which, in case
-+	   of the toggle action, means to flip the option, thus it calls a notification
-+	   about action's 'active' property change, which leads back here, causing
-+	   a busy loop though the signal handlers. Blocking the handler breaks the loop. */
-+	if (tad->handler_id)
-+		g_signal_handler_block (button, tad->handler_id);
-+
-+	if ((gtk_toggle_button_get_active (button) ? 1 : 0) != (active ? 1 : 0))
-+		gtk_toggle_button_set_active (button, active);
-+
-+	if (tad->handler_id)
-+		g_signal_handler_unblock (button, tad->handler_id);
-+
-+	g_clear_object (&button);
-+}
-+
- static GtkWidget *
- header_bar_button_add_action (EHeaderBarButton *header_bar_button,
- 			      const gchar *label,
--			      GtkAction *action)
-+			      GtkAction *action,
-+			      GCallback clicked_cb,
-+			      gpointer clicked_cb_user_data)
- {
- 	GtkWidget *button;
-+	gulong clicked_handler = 0;
- 
- 	if (GTK_IS_TOGGLE_ACTION (action))
- 		button = gtk_toggle_button_new_with_label (label);
-@@ -194,6 +256,11 @@ header_bar_button_add_action (EHeaderBarButton *header_bar_button,
- 
- 	gtk_box_pack_start (GTK_BOX (header_bar_button), button, FALSE, FALSE, 0);
- 
-+	if (clicked_cb) {
-+		clicked_handler = g_signal_connect_object (
-+			button, "clicked", clicked_cb, clicked_cb_user_data, 0);
-+	}
-+
- 	if (action) {
- 		e_binding_bind_property_full (
- 			action, "sensitive",
-@@ -203,10 +270,17 @@ header_bar_button_add_action (EHeaderBarButton *header_bar_button,
- 			NULL, NULL, NULL);
- 
- 		if (GTK_IS_TOGGLE_ACTION (action)) {
--			e_binding_bind_property (
--				action, "active",
--				button, "active",
--				G_BINDING_SYNC_CREATE);
-+			ToggleActionData *tad;
-+
-+			gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
-+				gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)));
-+
-+			tad = g_new0 (ToggleActionData, 1);
-+			tad->button_weakref = e_weak_ref_new (button);
-+			tad->handler_id = clicked_handler;
-+
-+			g_signal_connect_data (action, "notify::active",
-+				G_CALLBACK (header_button_action_notify_active_cb), tad, toggle_action_data_free, 0);
- 		}
- 
- 		header_bar_button_update_button_for_action (GTK_BUTTON (button), action);
-@@ -278,16 +352,14 @@ header_bar_button_constructed (GObject *object)
- 
- 	header_bar_button->priv->button = header_bar_button_add_action (header_bar_button,
- 		header_bar_button->priv->label,
--		header_bar_button->priv->action);
-+		header_bar_button->priv->action,
-+		G_CALLBACK (header_bar_button_clicked),
-+		header_bar_button);
- 
- 	/* TODO: GTK4 port: do not use linked buttons
- 	 * https://developer.gnome.org/hig/patterns/containers/header-bars.html#button-grouping */
- 	style_context = gtk_widget_get_style_context (GTK_WIDGET (header_bar_button));
- 	gtk_style_context_add_class (style_context, "linked");
--
--	g_signal_connect_swapped (
--		header_bar_button->priv->button, "clicked",
--		G_CALLBACK (header_bar_button_clicked), header_bar_button);
- }
- 
- static void
-@@ -393,17 +465,11 @@ e_header_bar_button_add_action (EHeaderBarButton *header_bar_button,
- 				const gchar *label,
- 				GtkAction *action)
- {
--	GtkWidget *button;
--
- 	g_return_if_fail (E_IS_HEADER_BAR_BUTTON (header_bar_button));
- 	g_return_if_fail (GTK_IS_ACTION (action));
- 
--	button = header_bar_button_add_action (header_bar_button, label, action);
--
--	g_signal_connect_object (
--		button, "clicked",
--		G_CALLBACK (gtk_action_activate), action,
--		G_CONNECT_SWAPPED);
-+	header_bar_button_add_action (header_bar_button, label, action,
-+		G_CALLBACK (header_bar_button_action_activate_cb), action);
- }
- 
- /**
--- 
-2.37.3
-
diff --git a/evolution.spec b/evolution.spec
index cd131bd..b178dba 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.46.0
-Release: 2%{?dist}
+Version: 3.46.1
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -52,8 +52,6 @@ Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
-Patch01: 0001-I-2037-EHeaderBarButton-Avoid-busy-loop-on-toggle-ac.patch
-
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -573,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Oct 21 2022 Milan Crha  - 3.46.1-1
+- Update to 3.46.1
+
 * Fri Sep 23 2022 Milan Crha  - 3.46.0-2
 - Resolves: #2129068 (Busy loop when opening composer window)
 
diff --git a/sources b/sources
index 7919952..963bda9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.46.0.tar.xz) = 58b532711196e7c79cffa2357245743562a94fd9629718066ba16a26889fb45f94992e4cc3cf0d3911356b700abecb05099c5c854749db282a241321c0d0c605
+SHA512 (evolution-3.46.1.tar.xz) = 20b6a5663ec6ab43af6ec7c15a64b1d1070f8488aaebd3fbaca4b4cc8b70bf4b8087b047e5b75e37273818b8d1d6bde5139c708284626e9d3c15b83dc09f5d3b

From d27f3a36182ca4f4367d4247be60ceaef25b57c3 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Thu, 10 Nov 2022 11:09:19 +0100
Subject: [PATCH 783/844] Update License tag to SPDX

---
 evolution.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index b178dba..738f81d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -46,7 +46,7 @@ Name: evolution
 Version: 3.46.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
-License: GPLv2+ and GFDL
+License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
 Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh

From f53283e4b62c959946a134a56343f33616923d4a Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 2 Dec 2022 13:29:40 +0100
Subject: [PATCH 784/844] Update to 3.46.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 738f81d..2ee5819 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.46.1
+Version: 3.46.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Dec 02 2022 Milan Crha  - 3.46.2-1
+- Update to 3.46.2
+
 * Fri Oct 21 2022 Milan Crha  - 3.46.1-1
 - Update to 3.46.1
 
diff --git a/sources b/sources
index 963bda9..4d53445 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.46.1.tar.xz) = 20b6a5663ec6ab43af6ec7c15a64b1d1070f8488aaebd3fbaca4b4cc8b70bf4b8087b047e5b75e37273818b8d1d6bde5139c708284626e9d3c15b83dc09f5d3b
+SHA512 (evolution-3.46.2.tar.xz) = f5621640503a36ee00cce4f7075d58e743c7438e019d6a26883315ea24b90c4d92c37d9c8b6d97315f5388d14aa21911883e2d06ad5a66ca20568d13cab45734

From f4bcb14fb9bb366f902221c89ad6c04764a25c6a Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 6 Jan 2023 11:05:51 +0100
Subject: [PATCH 785/844] Update to 3.47.1

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 2ee5819..9a64099 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.46.2
+Version: 3.47.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.46/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.47/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -571,6 +571,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 06 2023 Milan Crha  - 3.47.1-1
+- Update to 3.47.1
+
 * Fri Dec 02 2022 Milan Crha  - 3.46.2-1
 - Update to 3.46.2
 
diff --git a/sources b/sources
index 4d53445..ce99999 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.46.2.tar.xz) = f5621640503a36ee00cce4f7075d58e743c7438e019d6a26883315ea24b90c4d92c37d9c8b6d97315f5388d14aa21911883e2d06ad5a66ca20568d13cab45734
+SHA512 (evolution-3.47.1.tar.xz) = b5f5eee98fb93cd4c3eba15dfe35bce99847a62cfb291b7c53a23526c93327e4bbea8b68f60acdf773d8985809fbada23edb5d599a12e16eaee62c74c12e379a

From f8afc027ec0af2d237bbb12008796e5fc93cc8b5 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 6 Jan 2023 12:08:27 +0100
Subject: [PATCH 786/844] Add a new module-appearance-settings.so into the file
 list

---
 evolution.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evolution.spec b/evolution.spec
index 9a64099..31d0be6 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -402,6 +402,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %dir %{_libdir}/evolution/modules
 %{_libdir}/evolution/modules/module-accounts-window.so
 %{_libdir}/evolution/modules/module-addressbook.so
+%{_libdir}/evolution/modules/module-appearance-settings.so
 %{_libdir}/evolution/modules/module-backup-restore.so
 %{_libdir}/evolution/modules/module-book-config-carddav.so
 %{_libdir}/evolution/modules/module-book-config-google.so

From 99431c4c71e4208367d6e97fbb5cca91185dc672 Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Thu, 19 Jan 2023 02:51:58 +0000
Subject: [PATCH 787/844] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 31d0be6..f4581e3 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.47.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -572,6 +572,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Thu Jan 19 2023 Fedora Release Engineering  - 3.47.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
+
 * Fri Jan 06 2023 Milan Crha  - 3.47.1-1
 - Update to 3.47.1
 

From 214296725222242cc6a948a7b8d055e3d7cacc8b Mon Sep 17 00:00:00 2001
From: Jens Petersen 
Date: Fri, 27 Jan 2023 23:19:09 +0800
Subject: [PATCH 788/844] rebuild f38 against newer cmark

---
 evolution.spec | 154 +++++++++++++++++++++++++------------------------
 1 file changed, 78 insertions(+), 76 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index f4581e3..1b081db 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.47.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -572,6 +572,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 27 2023 Jens Petersen  - 3.47.1-3
+- rebuild f38 against newer cmark
+
 * Thu Jan 19 2023 Fedora Release Engineering  - 3.47.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
@@ -2567,23 +2570,23 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Wed Jan 25 2006 David Malcolm  - 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 
+- 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 
+- 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 
+- 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. 
+  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  - 2.5.4-10
@@ -2593,11 +2596,11 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 - fix multilib issue with shlib bonobo components (bug 156982)
 
 * Thu Jan 12 2006 David Malcolm  - 2.5.4-8
-- avoid multiple initialization of NetworkManager connections (patch 807, 
+- avoid multiple initialization of NetworkManager connections (patch 807,
   gnome bug #326785)
 
 * Thu Jan 12 2006 David Malcolm  - 2.5.4-7
-- updated alarm notification patch(patch 806, #177546, #177666, #177667, 
+- updated alarm notification patch(patch 806, #177546, #177666, #177667,
   #177670)
 
 * Thu Jan 12 2006 Christopher Aillon  - 2.5.4-6
@@ -2613,9 +2616,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Tue Jan 10 2006 David Malcolm  - 2.5.4-3
 - updated patch 800 to include patch for memo conduit (untested at this stage);
-  renaming from evolution-2.5.2-fix-conduits.patch to 
-  evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo 
-  conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to 
+  renaming from evolution-2.5.2-fix-conduits.patch to
+  evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo
+  conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to
   evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160)
 - switch the build-time dep for the audio-inline plugin from gstreamer-devel to
   gstreamer08-devel to better reflect the test in the tarball's configure.in
@@ -2651,20 +2654,20 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 - bump evo_major from 2.4 to 2.6
 - updated patch 107
 - updated patch 108
-- updated patch 800, replacing 
-  rh-161817-attach-116019-conduit_pilot_link_updates.diff with 
+- updated patch 800, replacing
+  rh-161817-attach-116019-conduit_pilot_link_updates.diff with
   evolution-2.5.2-fix-conduits.patch.  Not yet complete.
 - disable pilot support for now (see #175160)
 - added hula plugin to list of packaged plugins
 - generalize gconf schema packaging to support changing evo_major
 
 * Fri Dec  2 2005 David Malcolm  - 2.4.2-2
-- force regeneration of the intltool files to prevent a problem where the 
+- force regeneration of the intltool files to prevent a problem where the
   tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the
-  latest shipped copy of intltool, which resulted in a broken intltool-merge 
-  script when the tree was reautotooled.  (appears that the tarball was built 
+  latest shipped copy of intltool, which resulted in a broken intltool-merge
+  script when the tree was reautotooled.  (appears that the tarball was built
   with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to
-  @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that 
+  @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that
   change)
 
 * Tue Nov 29 2005 David Malcolm  - 2.4.2-1
@@ -2703,7 +2706,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Tue Oct  4 2005 David Malcolm  - 2.4.1-1
 - 2.4.1
-- regenerate patch 101 to handle conflict in 
+- regenerate patch 101 to handle conflict in
   calendar/gui.print.c: print_week_day_event introduced by fix to upstream bug
   244981 (end date added while printing in the week view); bump patch name from
   version 5 to version 6
@@ -2714,7 +2717,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Wed Sep  7 2005 David Malcolm  - 2.4.0-1
 - 2.4.0
-- Removed patch to fix implicit function declarations (patch 110, added in 
+- Removed patch to fix implicit function declarations (patch 110, added in
   2.3.8-1) as this is now upstream.
 
 * Thu Sep  1 2005 David Malcolm  - 2.3.8-4
@@ -2730,7 +2733,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Tue Aug 23 2005 David Malcolm  - 2.3.8-1
 - 2.3.8
-- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the 
+- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the
   problems arising (patch 110)
 
 * Tue Aug 16 2005 David Malcolm  - 2.3.7-3
@@ -2750,14 +2753,14 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 - rebuild with new gnutls
 
 * Tue Aug  2 2005 David Malcolm  - 2.3.6.1-4
-- Added patch to show correct mimetype for OpenOffice.org files when guessing 
+- Added patch to show correct mimetype for OpenOffice.org files when guessing
   type for attachments with mimetype "application/octet-stream" (#164957)
 
 * Mon Aug  1 2005 David Malcolm  - 2.3.6.1-3
 - Improved version of evolution-2.3.5.1-fix-150458.patch (#150458)
 
 * Sat Jul 30 2005 David Malcolm  2.3.6.1-2
-- Fixed version numbers in GConf schema files (#164622); added 
+- Fixed version numbers in GConf schema files (#164622); added
   apps-evolution-mail-prompts-checkdefault-2.4.schemas
 
 * Fri Jul 29 2005 David Malcolm  - 2.3.6.1-1
@@ -2765,9 +2768,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 
 * Thu Jul 28 2005 David Malcolm  - 2.3.6-1
 - 2.3.6
-- Bump evolution-data-server requirement to 1.3.6 (needed for 
+- Bump evolution-data-server requirement to 1.3.6 (needed for
   CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
-- Removed libgal2[-devel] dependencies; the code has been moved into the 
+- Removed libgal2[-devel] dependencies; the code has been moved into the
   evolution tarball
 
 * Thu Jul 28 2005 David Malcolm  - 2.3.5.1-2
@@ -2810,13 +2813,13 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 - added evolution-2.2.2-fix-new-mail-notify.patch to CVS
 
 * Thu May  5 2005 David Malcolm  - 2.2.2-4
-- Removed explicit mozilla_build_version; instead use pkg-config to determine 
+- Removed explicit mozilla_build_version; instead use pkg-config to determine
 the path to the NSS/NSPR headers.
-- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12; 
+- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12;
 patches depend on this)
-- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus 
-versions is in the upstream tarball; but configure.in disables the plugin for 
-dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions, 
+- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus
+versions is in the upstream tarball; but configure.in disables the plugin for
+dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions,
 and run autoconf at the start of the build) (#156328)
 
 * Sat Apr 30 2005 David Malcolm  - 2.2.2-3
@@ -2874,7 +2877,7 @@ and run autoconf at the start of the build) (#156328)
   The libraries are always located in the libdir
   However, the headers are in /usr/include/mozilla-%%{mozilla_build_version}
   and so they move each time the mozilla version changes.
-  So we no longer have an explicit mozilla run-time requirement in the specfile; 
+  So we no longer have an explicit mozilla run-time requirement in the specfile;
   a requirement on the appropriate NSS and NSPR .so files is automagically generated on build.
   We have an explicit, exact build-time version, so that we can find the headers (without
   invoking an RPM query from the spec file; to do so is considered bad practice)
@@ -2948,7 +2951,7 @@ and run autoconf at the start of the build) (#156328)
    XB69079 - Data repeated after save with bad date format (Siva)
    XB66854 - Some strings are missed to translation (Rodney)
 
- * Calendar 	
+ * Calendar
    XB47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney)
    XB68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP)
    XB67403 - wrong alarm time displayed (Rodrigo)
@@ -2962,9 +2965,9 @@ and run autoconf at the start of the build) (#156328)
    XB69776 - Signed Mail with attachments displays everything with multipart/boundaries stuff (Michael)
    XB69615 - delete certificate after viewing smime message (Michael)
    XB69109 - EHLO or HELO with ip addresses does not conform rfc 821  (Michael)
-   XB69982 - During Newsgroup list refresh, it crashes (Michael) 
-   XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur) 
-   XB68556 - NNTP with SSL won't work, even with stunnel (Michael) 
+   XB69982 - During Newsgroup list refresh, it crashes (Michael)
+   XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur)
+   XB68556 - NNTP with SSL won't work, even with stunnel (Michael)
    XB69145 - toplevel message/rfc822 parts are broken for IMAP (Michael)
    XB69241 - base64 attachement holding PGP block (Jeff)
    XB67895 - nntp support not asking for password (Michael)
@@ -3121,7 +3124,7 @@ and run autoconf at the start of the build) (#156328)
 * Wed Feb 18 2004 Jeremy Katz  - 1.5.4-1
 - 1.5.4
 
-* Tue Feb 17 2004 Jeremy Katz  
+* Tue Feb 17 2004 Jeremy Katz 
 - buildrequire e-d-s-devel instead of e-d-s (#114712)
 - enable nntp support (#114802)
 
@@ -3151,13 +3154,13 @@ and run autoconf at the start of the build) (#156328)
 - fix title on composer save dialog (#108159)
 
 * Mon Oct 27 2003 Jeremy Katz  1.4.5-6
-- Make imap command length shorter to avoid choking some imap servers 
+- Make imap command length shorter to avoid choking some imap servers
   (notably cyrus-imap).
 - Make wombat session managed so that we don't hit weird bonobo activation
   things.  This adds a dependency on $DISPLAY for wombat.  (#106826)
 
 * Sun Oct 19 2003 Jeremy Katz  1.4.5-5
-- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without 
+- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without
   IPv6 support
 - add patch from upstream with reply-to-list shortcut (Ctrl-l)
 
@@ -3172,37 +3175,37 @@ and run autoconf at the start of the build) (#156328)
   * Use proper function for IPV6 reverse lookups (X#46006)
   * Allow timezone offset to be up to 14 hours (X#49357)
 
-* Mon Oct 13 2003 Jeremy Katz  
-- add patch from upstream CVS to fix SMTP syntax problems (#106630) 
+* Mon Oct 13 2003 Jeremy Katz 
+- add patch from upstream CVS to fix SMTP syntax problems (#106630)
 - really remove duplicate menu entry (#103826)
 
-* Mon Oct  6 2003 Jeremy Katz  
+* Mon Oct  6 2003 Jeremy Katz 
 - make redhat-email.desktop symlink relative (#104391)
 
-* Wed Sep 24 2003 Jeremy Katz  
+* Wed Sep 24 2003 Jeremy Katz 
 - add ipv6 support per dwmw2's request
 
 * Tue Sep 23 2003 Jeremy Katz  1.4.5-2
 - 1.4.5
 
-* Wed Sep 17 2003 Jeremy Katz  
+* Wed Sep 17 2003 Jeremy Katz 
 - move static libs into -devel (#104399)
 
 * Tue Sep 16 2003 Jeremy Katz  1.4.4-7
 - filter types are gtypes, not ints (#103934)
 
 * Wed Sep 10 2003 Jeremy Katz  1.4.4-6
-- fix from upstream (will be in 1.4.5) to fix menu merging in the 
+- fix from upstream (will be in 1.4.5) to fix menu merging in the
   composer with new libbonobo
 
-* Fri Sep  5 2003 Jeremy Katz  
+* Fri Sep  5 2003 Jeremy Katz 
 - remove the desktop file in Office (#103826)
 
 * Tue Sep  2 2003 Jeremy Katz  1.4.4-5
-- patch from upstream to fix display of some mails in 
+- patch from upstream to fix display of some mails in
   different charsets (#102899)
 - add requires on newer version of ORBit2 (#103386)
-- add patch from upstream (extracted by George Karabin) to use gnome-vfs 
+- add patch from upstream (extracted by George Karabin) to use gnome-vfs
   mime icon lookup where available (#102553)
 
 * Fri Aug 22 2003 Jeremy Katz  1.4.4-4
@@ -3214,7 +3217,7 @@ and run autoconf at the start of the build) (#156328)
 * Mon Aug  4 2003 Jeremy Katz  1.4.4-1
 - 1.4.4
 
-* Wed Jul 30 2003 Jeremy Katz  
+* Wed Jul 30 2003 Jeremy Katz 
 - buildrequires fixup from Ville Skytta (#101325)
 
 * Thu Jul 24 2003 Jeremy Katz  1.4.3-6
@@ -3232,10 +3235,10 @@ and run autoconf at the start of the build) (#156328)
 * Thu Jul 10 2003 Jeremy Katz  1.4.3-1
 - 1.4.3
 
-* Thu Jun 19 2003 Jeremy Katz  
+* Thu Jun 19 2003 Jeremy Katz 
 - make gal version dep more explicit
 
-* Fri Jun 13 2003 Jeremy Katz  
+* Fri Jun 13 2003 Jeremy Katz 
 - fix desktop file (#97162)
 
 * Tue Jun 10 2003 Jeremy Katz  1.4.0-2
@@ -3251,7 +3254,7 @@ and run autoconf at the start of the build) (#156328)
 * Thu Jun  5 2003 Jeremy Katz  1.3.92-2
 - rebuild
 
-* Wed Jun  4 2003 Jeremy Katz  
+* Wed Jun  4 2003 Jeremy Katz 
 - buildrequires gettext (#92276)
 
 * Sun May 25 2003 Jeremy Katz  1.3.92-1
@@ -3270,13 +3273,13 @@ and run autoconf at the start of the build) (#156328)
 * Tue Apr 22 2003 Jeremy Katz 
 - add a /usr/bin/evolution symlink
 
-* Mon Apr 21 2003 Jeremy Katz  
+* Mon Apr 21 2003 Jeremy Katz 
 - fix gnome-spell version requirement
 
 * Wed Apr 16 2003 Jeremy Katz  1.3.2-1
 - add trivial fix for evolution-mail schema key (ximian #41419)
 
-* Tue Apr 15 2003 Jeremy Katz  
+* Tue Apr 15 2003 Jeremy Katz 
 - update to 1.3
 - don't build with pilot support for now
 - don't redhat-ify the summary prefs for now
@@ -3293,7 +3296,7 @@ and run autoconf at the start of the build) (#156328)
 * Thu Apr  3 2003 Jeremy Katz  1.2.2-6
 - add a few cleanups for 64bit cleanliness (#86347)
 
-* Sun Mar 30 2003 Jeremy Katz  
+* Sun Mar 30 2003 Jeremy Katz 
 - add some buildrequires (#87612)
 
 * Mon Mar 24 2003 Jeremy Katz  1.2.3-1
@@ -3303,14 +3306,14 @@ and run autoconf at the start of the build) (#156328)
 - security patches from upstream
   - sanity check UUEncoding header before decoding (CAN-2003-0128)
   - don't decode doubly UUEncoded content (CAN-2003-0129)
-  - don't use a bonobo component to display things without registered 
+  - don't use a bonobo component to display things without registered
     handlers (CAN-2003-0130)
 
 * Mon Feb 24 2003 Elliot Lee  1.2.2-4
 - debuginfo rebuild
 
 * Thu Feb 20 2003 Jeremy Katz  1.2.2-3
-- memleak patch had some bits that weren't supposed to be there.  update 
+- memleak patch had some bits that weren't supposed to be there.  update
   to newer from upstream.
 - fix directory checking in proxy patch
 
@@ -3321,7 +3324,7 @@ and run autoconf at the start of the build) (#156328)
 
 * Fri Feb  7 2003 Jeremy Katz  1.2.2-1
 - 1.2.2
-- build on x86_64 
+- build on x86_64
 
 * Wed Jan 22 2003 Tim Powers 
 - rebuilt
@@ -3343,7 +3346,7 @@ and run autoconf at the start of the build) (#156328)
 
 * Thu Dec 12 2002 Jeremy Katz  1.2.0-6
 - require a newer soup, the old one Has Bugs (tm)
-- excludearch x86_64; getting a R_X86_64_32S relocation in libical 
+- excludearch x86_64; getting a R_X86_64_32S relocation in libical
   although everything appears to be built with -fPIC correctly
 
 * Tue Dec 10 2002 Jeremy Katz  1.2.0-5
@@ -3353,7 +3356,7 @@ and run autoconf at the start of the build) (#156328)
 - add upstream patch to handle LDAPv3 better
 - add upstream patch to fix shell memory leaks
 - add upstream patch to fix ldap scope selection
-- build with openssl instead of mozilla-nss since it's available on 
+- build with openssl instead of mozilla-nss since it's available on
   more platforms
 - build on all arches
 
@@ -3364,7 +3367,7 @@ and run autoconf at the start of the build) (#156328)
 - disable pilot support for mainframe
 
 * Mon Nov 18 2002 Jeremy Katz  1.2.0-2
-- macro-ify the mozilla version to make it easier to build against 
+- macro-ify the mozilla version to make it easier to build against
   newer mozillas with headers in new locations
 - buildrequire pilot-link-devel (#78077)
 - drop uneeded ldapv3 patch (toshok says 1.2 already handles this)
@@ -3417,18 +3420,18 @@ and run autoconf at the start of the build) (#156328)
 
 * Tue Jul  9 2002 Jeremy Katz  1.0.8-3
 - remove static and libtool archives for importers and camel-providers (#68222)
-- do desktop-file-install magic 
+- do desktop-file-install magic
 - remove dead sites from summary list (#64522)
-- support openldap protocol version 3 based off of Nalin's autofs changes 
+- support openldap protocol version 3 based off of Nalin's autofs changes
 
 * Mon Jul  8 2002 Jeremy Katz  1.0.8-2
 - fix openldap-devel buildrequire
 
 * Mon Jul  1 2002 Jeremy Katz  1.0.8-1
-- 1.0.8 
+- 1.0.8
 
 * Thu Jun 27 2002 Jeremy Katz  1.0.7-2
-- include patch to omf files from otaylor@redhat.com to fix 
+- include patch to omf files from otaylor@redhat.com to fix
   scrollkeeper validation errors
 
 * Sun Jun 23 2002 Jeremy Katz  1.0.7-1
@@ -3443,19 +3446,19 @@ and run autoconf at the start of the build) (#156328)
 
 * Fri May  3 2002 Jeremy Katz  1.0.3-6
 - add patch to fix spool unread counts (#64198)
-- build with the fix for the crasher mail sent to 
+- build with the fix for the crasher mail sent to
   evolution-list (ximian #24140)
 
 * Mon Apr 15 2002 Jeremy Katz  1.0.3-4
-- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl 
+- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl
   since it's been committed to the branch and fixes the problem for me
-- include patch from tagoh(at)redhat.com to change the default charset 
+- include patch from tagoh(at)redhat.com to change the default charset
   for Japanese to ISO-2022-JP (#63214)
 
 * Wed Apr 10 2002 Jeremy Katz  1.0.3-3
 - minor tweaks to the redhatify patch
 - make accepting appointments sent to mailing lists work
-- use the RFC specified LDAP attribs for freebusy and calendarURI 
+- use the RFC specified LDAP attribs for freebusy and calendarURI
   in addressbook
 - fix a crash in the startup wizard
 
@@ -3470,7 +3473,7 @@ and run autoconf at the start of the build) (#156328)
 - put correct path to nspr includes on configure command line
 
 * Mon Mar 11 2002 Jeremy Katz  1.0.2-3
-- mozilla 0.9.9 has nspr and nss subpackages, hooray!  rip out the static 
+- mozilla 0.9.9 has nspr and nss subpackages, hooray!  rip out the static
   libnss linkage and just link against what is provided dynamically
 - kill the -devel subpackage since it's of questionable use
 - explicitly require mozilla-nss and mozilla-nspr packages to make it easier
@@ -3491,7 +3494,7 @@ and run autoconf at the start of the build) (#156328)
 - add pilot support
 
 * Sun Jan 13 2002 Jeremy Katz  1.0.1-2
-- rebuild without mozilla-psm in the buildroot so libnss is linked 
+- rebuild without mozilla-psm in the buildroot so libnss is linked
   statically as intended
 
 * Sat Jan 12 2002 Jeremy Katz  1.0.1-1
@@ -3502,7 +3505,7 @@ and run autoconf at the start of the build) (#156328)
 
 * Tue Dec 18 2001 Jeremy Katz  1.0-2
 - really disable news
-- add patch from Jens Petersen  to hopefully get 
+- add patch from Jens Petersen  to hopefully get
   builds working with autoconf 2.52
 - conditionalize static libnss stuff so that it can go away when we
   have a mozilla with shared libnss
@@ -3529,8 +3532,8 @@ and run autoconf at the start of the build) (#156328)
 
 * Sat Nov 17 2001 Jeremy Katz 
 - we can build on ia64 since we're using openssl instead of nspr
-- disable non-functional nntp support 
-- 0.99.2 (rc2) 
+- disable non-functional nntp support
+- 0.99.2 (rc2)
 
 * Fri Nov  9 2001 Jeremy Katz 
 - add explicit requires on current bonobo, oaf, and GConf to help people
@@ -3538,7 +3541,7 @@ and run autoconf at the start of the build) (#156328)
 - s/Copyright/License/
 
 * Thu Nov  8 2001 Jeremy Katz 
-- add a patch to revert changes to camel-tcp-stream-openssl; appears to 
+- add a patch to revert changes to camel-tcp-stream-openssl; appears to
   fix the SSL hangs
 
 * Wed Nov  7 2001 Jeremy Katz 
@@ -3572,4 +3575,3 @@ and run autoconf at the start of the build) (#156328)
 
 * Mon Aug 06 2001 David Sainty 
 - First spec file for evolution.
-

From 03d14d0dde93db331df9d71f70d954a2cd30541d Mon Sep 17 00:00:00 2001
From: Jens Petersen 
Date: Mon, 30 Jan 2023 12:40:38 +0800
Subject: [PATCH 789/844] rebuild

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 1b081db..f3a122f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.47.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -572,6 +572,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Jan 30 2023 Jens Petersen  - 3.47.1-4
+- rebuild
+
 * Fri Jan 27 2023 Jens Petersen  - 3.47.1-3
 - rebuild f38 against newer cmark
 

From 5f594361b0609aadcaf74774e915da85f2921a42 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 10 Feb 2023 09:18:28 +0100
Subject: [PATCH 790/844] Update to 3.47.2

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index f3a122f..b730169 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.47.1
-Release: 4%{?dist}
+Version: 3.47.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -572,6 +572,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Feb 10 2023 Milan Crha  - 3.47.2-1
+- Update to 3.47.2
+
 * Mon Jan 30 2023 Jens Petersen  - 3.47.1-4
 - rebuild
 
diff --git a/sources b/sources
index ce99999..5861a14 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.47.1.tar.xz) = b5f5eee98fb93cd4c3eba15dfe35bce99847a62cfb291b7c53a23526c93327e4bbea8b68f60acdf773d8985809fbada23edb5d599a12e16eaee62c74c12e379a
+SHA512 (evolution-3.47.2.tar.xz) = 1e8d97d4788fcbb88204411f8c0732cd07070ef1128a8d6a6fa137a5ebbde2bf763222bb7f58724d5cc405b2b91729eace298ce69f75dd0ebc6d7a4db5bc58fb

From 128b437b5940efbbcc61f5690050b3f14e02ad66 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 3 Mar 2023 08:28:39 +0100
Subject: [PATCH 791/844] Update to 3.47.3; Resolves: #2142385 (Properly apply
 TEMP_HOME compile time option for Flatpak)

---
 evolution.spec | 16 +++++++++++++---
 sources        |  2 +-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index b730169..422e58e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.47.2
+Version: 3.47.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -287,7 +287,14 @@ fi
 %global tnef_flags -DENABLE_YTNEF=OFF
 %endif
 
-CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations"; export CFLAGS
+%if 0%{?flatpak}
+%global temp_home "-DTEMP_HOME=1"
+%else
+%global temp_home ""
+%endif
+
+CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home"
+export CFLAGS
 
 %cmake -G "Unix Makefiles" \
 	-DENABLE_MAINTAINER_MODE=OFF \
@@ -296,7 +303,6 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated
 	-DENABLE_PLUGINS=all \
 	%if 0%{?flatpak}
 	"-DWITH_WMCLASS_OVERRIDE=evolution.bin" \
-	"-DTEMP_HOME=1" \
 	%endif
 	%{nil}
 
@@ -572,6 +578,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 03 2023 Milan Crha  - 3.47.3-1
+- Update to 3.47.3
+- Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak)
+
 * Fri Feb 10 2023 Milan Crha  - 3.47.2-1
 - Update to 3.47.2
 
diff --git a/sources b/sources
index 5861a14..6f88242 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.47.2.tar.xz) = 1e8d97d4788fcbb88204411f8c0732cd07070ef1128a8d6a6fa137a5ebbde2bf763222bb7f58724d5cc405b2b91729eace298ce69f75dd0ebc6d7a4db5bc58fb
+SHA512 (evolution-3.47.3.tar.xz) = 82432ef614ff0dd302c16670f80121979f6e9756360b5213cd6b7753bc48a6fd7d6d8c981a52fe9eaf63dbc17034accc59d2595ab803c6329da1c3240870a565

From 465dc8b55254b846160a7aa105f0c852d8f0c805 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 17 Mar 2023 08:03:42 +0100
Subject: [PATCH 792/844] Update to 3.48.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 422e58e..dd04b83 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.47.3
+Version: 3.48.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.47/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.48/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 17 2023 Milan Crha  - 3.48.0-1
+- Update to 3.48.0
+
 * Fri Mar 03 2023 Milan Crha  - 3.47.3-1
 - Update to 3.47.3
 - Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak)
diff --git a/sources b/sources
index 6f88242..55e0558 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.47.3.tar.xz) = 82432ef614ff0dd302c16670f80121979f6e9756360b5213cd6b7753bc48a6fd7d6d8c981a52fe9eaf63dbc17034accc59d2595ab803c6329da1c3240870a565
+SHA512 (evolution-3.48.0.tar.xz) = a57b2df1eb0aac7f10244b1c8b520a2ac6442699763c992820653bc758a9fd775ab290b0a2c39cb51805b4db9dfbbf0510f29085844406eae66c676c7c5671f4

From 2839058c81f73bd4f77e733dd7e56fbbf5fc8d27 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 31 Mar 2023 12:36:26 +0200
Subject: [PATCH 793/844] flatpak: Stop disabling WebKitGTK's sandbox

The WebKitGTK 2.40.0 ignores the environment variable and only claims
a warning on the console, thus remove it.
---
 flatpak-evolution-wrapper.sh.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/flatpak-evolution-wrapper.sh.in b/flatpak-evolution-wrapper.sh.in
index 1b42f20..6a311fc 100644
--- a/flatpak-evolution-wrapper.sh.in
+++ b/flatpak-evolution-wrapper.sh.in
@@ -5,7 +5,6 @@ if [ "$1" = "--quit" -o "$1" = "--force-shutdown" ]; then
 else
    export BOGOFILTER_DIR="${XDG_DATA_HOME}/bogofilter/"
    export GIO_USE_NETWORK_MONITOR=base
-   export WEBKIT_FORCE_SANDBOX=0
    gsettings reset org.gnome.evolution-data-server network-monitor-gio-name
 
    LINES=$(gdbus call --session --dest org.freedesktop.DBus --object-path /org/freedesktop/DBus --method org.freedesktop.DBus.ListNames | grep @SOURCES_SERVICE@ | wc -l)

From 85f99bf210dc42e93c82cedd51d0840d2b613644 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 21 Apr 2023 08:47:40 +0200
Subject: [PATCH 794/844] Update to 3.48.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index dd04b83..9bf32ea 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.48.0
+Version: 3.48.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Apr 21 2023 Milan Crha  - 3.48.1-1
+- Update to 3.48.1
+
 * Fri Mar 17 2023 Milan Crha  - 3.48.0-1
 - Update to 3.48.0
 
diff --git a/sources b/sources
index 55e0558..d8a4c52 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.48.0.tar.xz) = a57b2df1eb0aac7f10244b1c8b520a2ac6442699763c992820653bc758a9fd775ab290b0a2c39cb51805b4db9dfbbf0510f29085844406eae66c676c7c5671f4
+SHA512 (evolution-3.48.1.tar.xz) = b7f1932eff3197e3ed167be56f374fface058fcf373831d17f3211b4aa5c4561139c7a0d737af3b0b6ca2bf6bf8941c259b8eb17f678bbaacc60956059910857

From a0a96af9e3a5cdd232bdae8b0c5c68fbe0a4e722 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 26 May 2023 08:07:33 +0200
Subject: [PATCH 795/844] Update to 3.48.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 9bf32ea..4b9cd9d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.48.1
+Version: 3.48.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri May 26 2023 Milan Crha  - 3.48.2-1
+- Update to 3.48.2
+
 * Fri Apr 21 2023 Milan Crha  - 3.48.1-1
 - Update to 3.48.1
 
diff --git a/sources b/sources
index d8a4c52..dbb3d2f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.48.1.tar.xz) = b7f1932eff3197e3ed167be56f374fface058fcf373831d17f3211b4aa5c4561139c7a0d737af3b0b6ca2bf6bf8941c259b8eb17f678bbaacc60956059910857
+SHA512 (evolution-3.48.2.tar.xz) = d6d0af82fa31550a5657854c310ee2a00892bb9d0b7e3ace419880426315e66bc6c02dc6b7d3c4559e23d02b340e84054fc1e54fedeb08cddd035e9140f24a85

From 833a21f7e0e9cfb56264f1b3ce38d0a212229f66 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 29 May 2023 17:06:25 +0200
Subject: [PATCH 796/844] Add upstream fix for a regression on mail preview
 panel sometimes growing indefinitely

---
 ...content-sometimes-grows-indefinitely.patch | 44 +++++++++++++++++++
 evolution.spec                                |  8 +++-
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch

diff --git a/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch b/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch
new file mode 100644
index 0000000..1707281
--- /dev/null
+++ b/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch
@@ -0,0 +1,44 @@
+diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
+index b0eab4ac09..c811c479db 100644
+--- a/data/webkit/e-web-view.js
++++ b/data/webkit/e-web-view.js
+@@ -760,6 +760,20 @@ Evo.EnsureMainDocumentInitialized = function()
+ 	Evo.initializeAndPostContentLoaded(null);
+ }
+ 
++Evo.mailDisplayGetScrollbarHeight = function()
++{
++	if (Evo.mailDisplayCachedScrollbarHeight != undefined)
++		return Evo.mailDisplayCachedScrollbarHeight;
++
++	var el = document.createElement("div");
++	el.style.cssText = "overflow:scroll; visibility:hidden; position:absolute;";
++	document.body.appendChild(el);
++	Evo.mailDisplayCachedScrollbarHeight = el.offsetHeight - el.clientHeight
++	el.remove();
++
++	return Evo.mailDisplayCachedScrollbarHeight;
++}
++
+ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
+ {
+ 	if (!doc)
+@@ -779,7 +793,8 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
+ 
+ 	if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight)
+ 		doc.defaultView.frameElement.height = 10;
+-	doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? 20 : 0);
++	doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 +
++		(doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0);
+ }
+ 
+ Evo.MailDisplayUpdateIFramesHeight = function()
+@@ -1186,7 +1201,7 @@ Evo.mailDisplaySizeChanged = function(entries, observer)
+ 			if (value < entry.target.ownerDocument.scrollingElement.scrollHeight)
+ 				value = entry.target.ownerDocument.scrollingElement.scrollHeight;
+ 			if (entry.target.ownerDocument.scrollingElement.scrollWidth > entry.target.ownerDocument.scrollingElement.clientWidth)
+-				value += 20;
++				value += Evo.mailDisplayGetScrollbarHeight();
+ 			entry.target.ownerDocument.defaultView.frameElement.height = value;
+ 		}
+ 	}
diff --git a/evolution.spec b/evolution.spec
index 4b9cd9d..c77b8ff 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.48.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -52,6 +52,9 @@ Source: http://download.gnome.org/sources/%{name}/3.48/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+# https://gitlab.gnome.org/GNOME/evolution/-/issues/2380
+Patch01: 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch
+
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -578,6 +581,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon May 29 2023 Milan Crha  - 3.48.2-2
+- Add upstream fix for a regression on mail preview panel sometimes growing indefinitely
+
 * Fri May 26 2023 Milan Crha  - 3.48.2-1
 - Update to 3.48.2
 

From 6118b98b2fe857907eea037266993ccd0b3d4cb6 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Tue, 30 May 2023 08:26:40 +0200
Subject: [PATCH 797/844] Add patch to workaround recursion in iframe height
 computation in mail preview

---
 ...around-recursion-in-iframe-height-co.patch | 99 +++++++++++++++++++
 evolution.spec                                |  8 +-
 2 files changed, 106 insertions(+), 1 deletion(-)
 create mode 100644 0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch

diff --git a/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch b/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch
new file mode 100644
index 0000000..5b9fe96
--- /dev/null
+++ b/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch
@@ -0,0 +1,99 @@
+diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
+index c811c479db..032287fd73 100644
+--- a/data/webkit/e-web-view.js
++++ b/data/webkit/e-web-view.js
+@@ -760,6 +760,24 @@ Evo.EnsureMainDocumentInitialized = function()
+ 	Evo.initializeAndPostContentLoaded(null);
+ }
+ 
++Evo.mailDisplaySetIFrameHeight = function(iframe, height, forWidth, force)
++{
++	if (!force && iframe.hasAttribute("x-evo-height-for-width") && iframe.hasAttribute("x-evo-cached-height")) {
++		var heightForWidth = parseInt(iframe.getAttribute("x-evo-height-for-width"));
++		if (heightForWidth == forWidth) {
++			var cachedHeight = parseInt(iframe.getAttribute("x-evo-cached-height"));
++			if (cachedHeight > 0) {
++				iframe.height = cachedHeight;
++				return;
++			}
++		}
++	}
++
++	iframe.setAttribute("x-evo-height-for-width", forWidth);
++	iframe.setAttribute("x-evo-cached-height", height);
++	iframe.height = height;
++}
++
+ Evo.mailDisplayGetScrollbarHeight = function()
+ {
+ 	if (Evo.mailDisplayCachedScrollbarHeight != undefined)
+@@ -779,7 +797,7 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
+ 	if (!doc)
+ 		return;
+ 
+-	var ii, iframes;
++	var ii, iframes, force = false;
+ 
+ 	iframes = doc.getElementsByTagName("iframe");
+ 
+@@ -791,20 +809,27 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
+ 	if (!doc.scrollingElement || !doc.defaultView || !doc.defaultView.frameElement)
+ 		return;
+ 
+-	if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight)
++	if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight) {
+ 		doc.defaultView.frameElement.height = 10;
+-	doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 +
+-		(doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0);
++		force = true;
++	}
++
++	Evo.mailDisplaySetIFrameHeight(doc.defaultView.frameElement, doc.scrollingElement.scrollHeight + 2 +
++		(doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0),
++		doc.scrollingElement.clientWidth, force);
+ }
+ 
+ Evo.MailDisplayUpdateIFramesHeight = function()
+ {
++	var scrollx = document.defaultView ? document.defaultView.scrollX : -1;
+ 	var scrolly = document.defaultView ? document.defaultView.scrollY : -1;
+ 
+ 	Evo.mailDisplayUpdateIFramesHeightRecursive(document);
+ 
+-	if (scrolly != -1 && document.defaultView.scrollY != scrolly)
+-		document.defaultView.scrollTo(0, scrolly);
++	if (scrollx != -1 && scrolly != -1 && (
++	    document.defaultView.scrollX != scrollx ||
++	    document.defaultView.scrollY != scrolly))
++		document.defaultView.scrollTo(scrollx, scrolly);
+ 
+ 	Evo.mailDisplayResizeContentToPreviewWidth();
+ 	Evo.mailDisplayUpdateMagicSpacebarState();
+@@ -1194,6 +1219,9 @@ Evo.unsetHTMLColors = function(doc)
+ 
+ Evo.mailDisplaySizeChanged = function(entries, observer)
+ {
++	var scrollx = document.defaultView ? document.defaultView.scrollX : -1;
++	var scrolly = document.defaultView ? document.defaultView.scrollY : -1;
++
+ 	for (const entry of entries) {
+ 		if (entry.target.ownerDocument.defaultView.frameElement && entry.borderBoxSize?.length > 0) {
+ 			var value = entry.borderBoxSize[0].blockSize;
+@@ -1202,9 +1230,15 @@ Evo.mailDisplaySizeChanged = function(entries, observer)
+ 				value = entry.target.ownerDocument.scrollingElement.scrollHeight;
+ 			if (entry.target.ownerDocument.scrollingElement.scrollWidth > entry.target.ownerDocument.scrollingElement.clientWidth)
+ 				value += Evo.mailDisplayGetScrollbarHeight();
+-			entry.target.ownerDocument.defaultView.frameElement.height = value;
++			Evo.mailDisplaySetIFrameHeight(entry.target.ownerDocument.defaultView.frameElement, value,
++				entry.target.ownerDocument.scrollingElement.clientWidth, false);
+ 		}
+ 	}
++
++	if (scrollx != -1 && scrolly != -1 && (
++	    document.defaultView.scrollX != scrollx ||
++	    document.defaultView.scrollY != scrolly))
++		document.defaultView.scrollTo(scrollx, scrolly);
+ }
+ 
+ Evo.MailDisplayBindDOM = function(iframe_id, markCitationColor)
+
diff --git a/evolution.spec b/evolution.spec
index c77b8ff..72556cc 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.48.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -55,6 +55,9 @@ Source2: flatpak-evolution-wrapper.sh.in
 # https://gitlab.gnome.org/GNOME/evolution/-/issues/2380
 Patch01: 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch
 
+# https://gitlab.gnome.org/GNOME/evolution/-/issues/2382
+Patch02: 0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch
+
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -581,6 +584,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue May 30 2023 Milan Crha  - 3.48.2-3
+- Add patch to workaround recursion in iframe height computation in mail preview
+
 * Mon May 29 2023 Milan Crha  - 3.48.2-2
 - Add upstream fix for a regression on mail preview panel sometimes growing indefinitely
 

From b2c19b10ca55c353d72900eac5b8b7176aff01fa Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 2 Jun 2023 08:59:30 +0200
Subject: [PATCH 798/844] Update to 3.48.3

---
 ...content-sometimes-grows-indefinitely.patch | 44 ---------
 ...around-recursion-in-iframe-height-co.patch | 99 -------------------
 evolution.spec                                | 13 +--
 sources                                       |  2 +-
 4 files changed, 6 insertions(+), 152 deletions(-)
 delete mode 100644 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch
 delete mode 100644 0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch

diff --git a/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch b/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch
deleted file mode 100644
index 1707281..0000000
--- a/0001-Mail-Preview-content-sometimes-grows-indefinitely.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
-index b0eab4ac09..c811c479db 100644
---- a/data/webkit/e-web-view.js
-+++ b/data/webkit/e-web-view.js
-@@ -760,6 +760,20 @@ Evo.EnsureMainDocumentInitialized = function()
- 	Evo.initializeAndPostContentLoaded(null);
- }
- 
-+Evo.mailDisplayGetScrollbarHeight = function()
-+{
-+	if (Evo.mailDisplayCachedScrollbarHeight != undefined)
-+		return Evo.mailDisplayCachedScrollbarHeight;
-+
-+	var el = document.createElement("div");
-+	el.style.cssText = "overflow:scroll; visibility:hidden; position:absolute;";
-+	document.body.appendChild(el);
-+	Evo.mailDisplayCachedScrollbarHeight = el.offsetHeight - el.clientHeight
-+	el.remove();
-+
-+	return Evo.mailDisplayCachedScrollbarHeight;
-+}
-+
- Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
- {
- 	if (!doc)
-@@ -779,7 +793,8 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
- 
- 	if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight)
- 		doc.defaultView.frameElement.height = 10;
--	doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 + (doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? 20 : 0);
-+	doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 +
-+		(doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0);
- }
- 
- Evo.MailDisplayUpdateIFramesHeight = function()
-@@ -1186,7 +1201,7 @@ Evo.mailDisplaySizeChanged = function(entries, observer)
- 			if (value < entry.target.ownerDocument.scrollingElement.scrollHeight)
- 				value = entry.target.ownerDocument.scrollingElement.scrollHeight;
- 			if (entry.target.ownerDocument.scrollingElement.scrollWidth > entry.target.ownerDocument.scrollingElement.clientWidth)
--				value += 20;
-+				value += Evo.mailDisplayGetScrollbarHeight();
- 			entry.target.ownerDocument.defaultView.frameElement.height = value;
- 		}
- 	}
diff --git a/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch b/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch
deleted file mode 100644
index 5b9fe96..0000000
--- a/0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch
+++ /dev/null
@@ -1,99 +0,0 @@
-diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
-index c811c479db..032287fd73 100644
---- a/data/webkit/e-web-view.js
-+++ b/data/webkit/e-web-view.js
-@@ -760,6 +760,24 @@ Evo.EnsureMainDocumentInitialized = function()
- 	Evo.initializeAndPostContentLoaded(null);
- }
- 
-+Evo.mailDisplaySetIFrameHeight = function(iframe, height, forWidth, force)
-+{
-+	if (!force && iframe.hasAttribute("x-evo-height-for-width") && iframe.hasAttribute("x-evo-cached-height")) {
-+		var heightForWidth = parseInt(iframe.getAttribute("x-evo-height-for-width"));
-+		if (heightForWidth == forWidth) {
-+			var cachedHeight = parseInt(iframe.getAttribute("x-evo-cached-height"));
-+			if (cachedHeight > 0) {
-+				iframe.height = cachedHeight;
-+				return;
-+			}
-+		}
-+	}
-+
-+	iframe.setAttribute("x-evo-height-for-width", forWidth);
-+	iframe.setAttribute("x-evo-cached-height", height);
-+	iframe.height = height;
-+}
-+
- Evo.mailDisplayGetScrollbarHeight = function()
- {
- 	if (Evo.mailDisplayCachedScrollbarHeight != undefined)
-@@ -779,7 +797,7 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
- 	if (!doc)
- 		return;
- 
--	var ii, iframes;
-+	var ii, iframes, force = false;
- 
- 	iframes = doc.getElementsByTagName("iframe");
- 
-@@ -791,20 +809,27 @@ Evo.mailDisplayUpdateIFramesHeightRecursive = function(doc)
- 	if (!doc.scrollingElement || !doc.defaultView || !doc.defaultView.frameElement)
- 		return;
- 
--	if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight)
-+	if (doc.defaultView.frameElement.height == doc.scrollingElement.scrollHeight) {
- 		doc.defaultView.frameElement.height = 10;
--	doc.defaultView.frameElement.height = doc.scrollingElement.scrollHeight + 2 +
--		(doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0);
-+		force = true;
-+	}
-+
-+	Evo.mailDisplaySetIFrameHeight(doc.defaultView.frameElement, doc.scrollingElement.scrollHeight + 2 +
-+		(doc.scrollingElement.scrollWidth > doc.scrollingElement.clientWidth ? Evo.mailDisplayGetScrollbarHeight() : 0),
-+		doc.scrollingElement.clientWidth, force);
- }
- 
- Evo.MailDisplayUpdateIFramesHeight = function()
- {
-+	var scrollx = document.defaultView ? document.defaultView.scrollX : -1;
- 	var scrolly = document.defaultView ? document.defaultView.scrollY : -1;
- 
- 	Evo.mailDisplayUpdateIFramesHeightRecursive(document);
- 
--	if (scrolly != -1 && document.defaultView.scrollY != scrolly)
--		document.defaultView.scrollTo(0, scrolly);
-+	if (scrollx != -1 && scrolly != -1 && (
-+	    document.defaultView.scrollX != scrollx ||
-+	    document.defaultView.scrollY != scrolly))
-+		document.defaultView.scrollTo(scrollx, scrolly);
- 
- 	Evo.mailDisplayResizeContentToPreviewWidth();
- 	Evo.mailDisplayUpdateMagicSpacebarState();
-@@ -1194,6 +1219,9 @@ Evo.unsetHTMLColors = function(doc)
- 
- Evo.mailDisplaySizeChanged = function(entries, observer)
- {
-+	var scrollx = document.defaultView ? document.defaultView.scrollX : -1;
-+	var scrolly = document.defaultView ? document.defaultView.scrollY : -1;
-+
- 	for (const entry of entries) {
- 		if (entry.target.ownerDocument.defaultView.frameElement && entry.borderBoxSize?.length > 0) {
- 			var value = entry.borderBoxSize[0].blockSize;
-@@ -1202,9 +1230,15 @@ Evo.mailDisplaySizeChanged = function(entries, observer)
- 				value = entry.target.ownerDocument.scrollingElement.scrollHeight;
- 			if (entry.target.ownerDocument.scrollingElement.scrollWidth > entry.target.ownerDocument.scrollingElement.clientWidth)
- 				value += Evo.mailDisplayGetScrollbarHeight();
--			entry.target.ownerDocument.defaultView.frameElement.height = value;
-+			Evo.mailDisplaySetIFrameHeight(entry.target.ownerDocument.defaultView.frameElement, value,
-+				entry.target.ownerDocument.scrollingElement.clientWidth, false);
- 		}
- 	}
-+
-+	if (scrollx != -1 && scrolly != -1 && (
-+	    document.defaultView.scrollX != scrollx ||
-+	    document.defaultView.scrollY != scrolly))
-+		document.defaultView.scrollTo(scrollx, scrolly);
- }
- 
- Evo.MailDisplayBindDOM = function(iframe_id, markCitationColor)
-
diff --git a/evolution.spec b/evolution.spec
index 72556cc..7bf43e3 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.48.2
-Release: 3%{?dist}
+Version: 3.48.3
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -52,12 +52,6 @@ Source: http://download.gnome.org/sources/%{name}/3.48/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
-# https://gitlab.gnome.org/GNOME/evolution/-/issues/2380
-Patch01: 0001-Mail-Preview-content-sometimes-grows-indefinitely.patch
-
-# https://gitlab.gnome.org/GNOME/evolution/-/issues/2382
-Patch02: 0002-I-2382-Mail-Workaround-recursion-in-iframe-height-co.patch
-
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -584,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jun 02 2023 Milan Crha  - 3.48.3-1
+- Update to 3.48.3
+
 * Tue May 30 2023 Milan Crha  - 3.48.2-3
 - Add patch to workaround recursion in iframe height computation in mail preview
 
diff --git a/sources b/sources
index dbb3d2f..6b6274d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.48.2.tar.xz) = d6d0af82fa31550a5657854c310ee2a00892bb9d0b7e3ace419880426315e66bc6c02dc6b7d3c4559e23d02b340e84054fc1e54fedeb08cddd035e9140f24a85
+SHA512 (evolution-3.48.3.tar.xz) = 80af99d5351cc8303db1ed55f84473c1b8dd08eefa04370510a4fb249b3bb514e6c9ca2b650ef04b240c413b1e4f23388c5aa4493df74dc0ebabfdb115ceef58

From f1d990a2a3e1731ca4aad3d25f94606cfabae23f Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 30 Jun 2023 10:03:15 +0200
Subject: [PATCH 799/844] Update to 3.49.1

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 7bf43e3..1402bea 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.48.3
+Version: 3.49.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.48/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.49/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jun 30 2023 Milan Crha  - 3.49.1-1
+- Update to 3.49.1
+
 * Fri Jun 02 2023 Milan Crha  - 3.48.3-1
 - Update to 3.48.3
 
diff --git a/sources b/sources
index 6b6274d..7ce41f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.48.3.tar.xz) = 80af99d5351cc8303db1ed55f84473c1b8dd08eefa04370510a4fb249b3bb514e6c9ca2b650ef04b240c413b1e4f23388c5aa4493df74dc0ebabfdb115ceef58
+SHA512 (evolution-3.49.1.tar.xz) = 99cd6c2d0e514f70b29a83b58071ef2fe96741036b169d917ee8434ea651820e4e3371c83758992edb516af7bff0c0867836c3e1bd725537e8a5f5471b2b403c

From 62aa5fee9d8126572cc48e0962002428d9ac09fb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Wed, 19 Jul 2023 19:05:05 +0000
Subject: [PATCH 800/844] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild

Signed-off-by: Fedora Release Engineering 
---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 1402bea..07c55bf 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.49.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Wed Jul 19 2023 Fedora Release Engineering  - 3.49.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
 * Fri Jun 30 2023 Milan Crha  - 3.49.1-1
 - Update to 3.49.1
 

From 94b7d02ae660bf94a5a1c45e88a30263b086088d Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 4 Aug 2023 09:06:50 +0200
Subject: [PATCH 801/844] Update to 3.49.2

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 07c55bf..e27b57b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.49.1
-Release: 2%{?dist}
+Version: 3.49.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Aug 04 2023 Milan Crha  - 3.49.2-1
+- Update to 3.49.2
+
 * Wed Jul 19 2023 Fedora Release Engineering  - 3.49.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
 
diff --git a/sources b/sources
index 7ce41f6..3dd2eda 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.49.1.tar.xz) = 99cd6c2d0e514f70b29a83b58071ef2fe96741036b169d917ee8434ea651820e4e3371c83758992edb516af7bff0c0867836c3e1bd725537e8a5f5471b2b403c
+SHA512 (evolution-3.49.2.tar.xz) = d4a20003e85617ef4364034b23d694e91115c5ba8a40a986c33c481f6bfeb09da877779f5ab45ff02a57e747e97c3caccf54f04c8d6385543ead9c03ca097896

From 35b1e3939657641d0cab6f05418005162a46c9ef Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 1 Sep 2023 09:00:16 +0200
Subject: [PATCH 802/844] Update to 3.49.3

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index e27b57b..469e64d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.49.2
+Version: 3.49.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 01 2023 Milan Crha  - 3.49.3-1
+- Update to 3.49.3
+
 * Fri Aug 04 2023 Milan Crha  - 3.49.2-1
 - Update to 3.49.2
 
diff --git a/sources b/sources
index 3dd2eda..e1d6fe1 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.49.2.tar.xz) = d4a20003e85617ef4364034b23d694e91115c5ba8a40a986c33c481f6bfeb09da877779f5ab45ff02a57e747e97c3caccf54f04c8d6385543ead9c03ca097896
+SHA512 (evolution-3.49.3.tar.xz) = 3331603511e3c10062f0f73c84bdf3bb8ffa66f801dc6160e39379721868c4d0560c13b9ed519ce45562bff9ba94c5a39cc302fd7c726a3590bc904e2b72cec8

From cbd79785934a4d54b6478e1347feb5568f8965b2 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 15 Sep 2023 09:34:00 +0200
Subject: [PATCH 803/844] Update to 3.50.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 469e64d..26fdad5 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.49.3
+Version: 3.50.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.49/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.50/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 15 2023 Milan Crha  - 3.50.0-1
+- Update to 3.50.0
+
 * Fri Sep 01 2023 Milan Crha  - 3.49.3-1
 - Update to 3.49.3
 
diff --git a/sources b/sources
index e1d6fe1..4253f3a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.49.3.tar.xz) = 3331603511e3c10062f0f73c84bdf3bb8ffa66f801dc6160e39379721868c4d0560c13b9ed519ce45562bff9ba94c5a39cc302fd7c726a3590bc904e2b72cec8
+SHA512 (evolution-3.50.0.tar.xz) = 3a00a47ce7bec4a0e53f2c446f8ad0117c4c60db6e9a01f98fb4f2af38d0d54182020930e8c855af322ec3b563dcc1adfcaf42fdcc39a872f6de3480ba078106

From f343b7d042e3b2b2b16f27c1afc26f1e453738c3 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 20 Oct 2023 08:17:10 +0200
Subject: [PATCH 804/844] Update to 3.50.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 26fdad5..f8af7b5 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.50.0
+Version: 3.50.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Oct 20 2023 Milan Crha  - 3.50.1-1
+- Update to 3.50.1
+
 * Fri Sep 15 2023 Milan Crha  - 3.50.0-1
 - Update to 3.50.0
 
diff --git a/sources b/sources
index 4253f3a..062590b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.50.0.tar.xz) = 3a00a47ce7bec4a0e53f2c446f8ad0117c4c60db6e9a01f98fb4f2af38d0d54182020930e8c855af322ec3b563dcc1adfcaf42fdcc39a872f6de3480ba078106
+SHA512 (evolution-3.50.1.tar.xz) = 619346315fa9cedd2d3b0327f4d286d8515a9e2aa3e76c48692b4f6492b91b5d18965e8379201514213821a1e430a717c40e079907ceac340c8ab20bcc51d390

From 4a21eb4e738a86bf0f05df1609230abe0d8752e3 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 1 Dec 2023 08:37:48 +0100
Subject: [PATCH 805/844] Update to 3.50.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index f8af7b5..6a34578 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.50.1
+Version: 3.50.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Dec 01 2023 Milan Crha  - 3.50.2-1
+- Update to 3.50.2
+
 * Fri Oct 20 2023 Milan Crha  - 3.50.1-1
 - Update to 3.50.1
 
diff --git a/sources b/sources
index 062590b..6dc6510 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.50.1.tar.xz) = 619346315fa9cedd2d3b0327f4d286d8515a9e2aa3e76c48692b4f6492b91b5d18965e8379201514213821a1e430a717c40e079907ceac340c8ab20bcc51d390
+SHA512 (evolution-3.50.2.tar.xz) = 965693094e6f24ac9edb4a361d382d497bd63a48c8be6056bfbd04c27f7c88806256979e949c89aa1da7dac3114797962476d3804be49c6ca8f065c24acf9c87

From 96192b5ebe129bf4a0c06a35390075012185b4fc Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 5 Jan 2024 09:25:09 +0100
Subject: [PATCH 806/844] Update to 3.51.1

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 6a34578..7918940 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.50.2
+Version: 3.51.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.50/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.51/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -578,6 +578,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 05 2024 Milan Crha  - 3.51.1-1
+- Update to 3.51.1
+
 * Fri Dec 01 2023 Milan Crha  - 3.50.2-1
 - Update to 3.50.2
 
diff --git a/sources b/sources
index 6dc6510..10ce56f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.50.2.tar.xz) = 965693094e6f24ac9edb4a361d382d497bd63a48c8be6056bfbd04c27f7c88806256979e949c89aa1da7dac3114797962476d3804be49c6ca8f065c24acf9c87
+SHA512 (evolution-3.51.1.tar.xz) = a30b51d15fae683e7b1424da2b0c97ec7a487bb32b3c15f513bcf5cb87b8176b89d713f60f0a216bb7b085502b8eee88f066ddccaaf9d83dbab8e739a8a889ed

From 85ae6ddbcc881d3afc5eb3d660ead198e3f51886 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Mon, 8 Jan 2024 09:56:29 +0100
Subject: [PATCH 807/844] Add a patch to fix a build

---
 ...CFLAGS-returned-by-pkg-config-as-CMA.patch | 39 +++++++++++++++++++
 evolution.spec                                |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch

diff --git a/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch b/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch
new file mode 100644
index 0000000..c41134c
--- /dev/null
+++ b/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch
@@ -0,0 +1,39 @@
+From 5aed5e59e90b312b6c18de16eac9ef676425198f Mon Sep 17 00:00:00 2001
+Date: Mon, 8 Jan 2024 09:51:55 +0100
+Subject: [PATCH] build: Don't set CFLAGS returned by pkg-config as
+ CMAKE_REQUIRED_FLAGS
+
+The CMAKE_REQUIRED_FLAGS expects a string but the pkg-config value
+is a list.
+
+This had been addressed within https://bugzilla.gnome.org/show_bug.cgi?id=773659 ,
+but returned back afterwards.
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 39fdbd0a9d..43ae931282 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -760,7 +760,7 @@ endif(ENABLE_MARKDOWN)
+ # news-to-appdata
+ # ******************************
+ 
+-set(CMAKE_REQUIRED_FLAGS ${GNOME_PLATFORM_CFLAGS})
++set(CMAKE_REQUIRED_DEFINITIONS ${GNOME_PLATFORM_CFLAGS})
+ set(CMAKE_REQUIRED_INCLUDES ${GNOME_PLATFORM_INCLUDE_DIRS})
+ set(CMAKE_REQUIRED_LIBRARIES ${GNOME_PLATFORM_LDFLAGS})
+ file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/appdata-releases.txt" _output_filename)
+@@ -775,7 +775,7 @@ unset(_news_filename)
+ unset(_output_filename)
+ unset(CMAKE_REQUIRED_LIBRARIES)
+ unset(CMAKE_REQUIRED_INCLUDES)
+-unset(CMAKE_REQUIRED_FLAGS)
++unset(CMAKE_REQUIRED_DEFINITIONS)
+ 
+ if(NOT "${_news_to_appdata_result}" EQUAL "1")
+ 	message(FATAL_ERROR "Failed to run news-to-appdata")
+-- 
+2.41.0
+
diff --git a/evolution.spec b/evolution.spec
index 7918940..4083807 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -52,6 +52,8 @@ Source: http://download.gnome.org/sources/%{name}/3.51/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+Patch01: 0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch
+
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 

From dba1a573f915599094a71ba52a7e7bf5315add0f Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Fri, 19 Jan 2024 18:41:17 +0000
Subject: [PATCH 808/844] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 4083807..bc76f09 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.51.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -580,6 +580,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 19 2024 Fedora Release Engineering  - 3.51.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 05 2024 Milan Crha  - 3.51.1-1
 - Update to 3.51.1
 

From d66ffdba8c238efcf50e77582996d7513fe0365a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Wed, 24 Jan 2024 10:57:40 +0000
Subject: [PATCH 809/844] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index bc76f09..ef53528 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.51.1
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -580,6 +580,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Wed Jan 24 2024 Fedora Release Engineering  - 3.51.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Fri Jan 19 2024 Fedora Release Engineering  - 3.51.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 

From e6a9f7854c910e1a0488c580edbc290c229e6aef Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 9 Feb 2024 09:12:59 +0100
Subject: [PATCH 810/844] Update to 3.51.2

---
 ...CFLAGS-returned-by-pkg-config-as-CMA.patch | 39 -------------------
 evolution.spec                                | 10 +++--
 sources                                       |  2 +-
 3 files changed, 7 insertions(+), 44 deletions(-)
 delete mode 100644 0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch

diff --git a/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch b/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch
deleted file mode 100644
index c41134c..0000000
--- a/0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 5aed5e59e90b312b6c18de16eac9ef676425198f Mon Sep 17 00:00:00 2001
-Date: Mon, 8 Jan 2024 09:51:55 +0100
-Subject: [PATCH] build: Don't set CFLAGS returned by pkg-config as
- CMAKE_REQUIRED_FLAGS
-
-The CMAKE_REQUIRED_FLAGS expects a string but the pkg-config value
-is a list.
-
-This had been addressed within https://bugzilla.gnome.org/show_bug.cgi?id=773659 ,
-but returned back afterwards.
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 39fdbd0a9d..43ae931282 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -760,7 +760,7 @@ endif(ENABLE_MARKDOWN)
- # news-to-appdata
- # ******************************
- 
--set(CMAKE_REQUIRED_FLAGS ${GNOME_PLATFORM_CFLAGS})
-+set(CMAKE_REQUIRED_DEFINITIONS ${GNOME_PLATFORM_CFLAGS})
- set(CMAKE_REQUIRED_INCLUDES ${GNOME_PLATFORM_INCLUDE_DIRS})
- set(CMAKE_REQUIRED_LIBRARIES ${GNOME_PLATFORM_LDFLAGS})
- file(TO_NATIVE_PATH "${CMAKE_BINARY_DIR}/appdata-releases.txt" _output_filename)
-@@ -775,7 +775,7 @@ unset(_news_filename)
- unset(_output_filename)
- unset(CMAKE_REQUIRED_LIBRARIES)
- unset(CMAKE_REQUIRED_INCLUDES)
--unset(CMAKE_REQUIRED_FLAGS)
-+unset(CMAKE_REQUIRED_DEFINITIONS)
- 
- if(NOT "${_news_to_appdata_result}" EQUAL "1")
- 	message(FATAL_ERROR "Failed to run news-to-appdata")
--- 
-2.41.0
-
diff --git a/evolution.spec b/evolution.spec
index ef53528..643bf86 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.51.1
-Release: 3%{?dist}
+Version: 3.51.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -52,8 +52,6 @@ Source: http://download.gnome.org/sources/%{name}/3.51/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
-Patch01: 0001-build-Don-t-set-CFLAGS-returned-by-pkg-config-as-CMA.patch
-
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -471,6 +469,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/libevolution-calendar-importers.so
 %{_libdir}/evolution/libevolution-mail-importers.so
 %{_libdir}/evolution/libevolution-mail.so
+%{_libdir}/evolution/libevolution-rss-common.so
 %{_libdir}/evolution/libevolution-smime.so
 %{_libdir}/evolution/libgnomecanvas.so
 
@@ -580,6 +579,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Feb 09 2024 Milan Crha  - 3.51.2-1
+- Update to 3.51.2
+
 * Wed Jan 24 2024 Fedora Release Engineering  - 3.51.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
 
diff --git a/sources b/sources
index 10ce56f..c90ba0a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.51.1.tar.xz) = a30b51d15fae683e7b1424da2b0c97ec7a487bb32b3c15f513bcf5cb87b8176b89d713f60f0a216bb7b085502b8eee88f066ddccaaf9d83dbab8e739a8a889ed
+SHA512 (evolution-3.51.2.tar.xz) = 304f484fa83bac4d74bfc38122317c1b1d1147d2932671fddf09bd77b75980368b413703614b89b6fc4e11190fbf5f83ae6e1b14384c2aad3c2cc9b01cbefda0

From 5ab7ebe2d6acc1471306389568a86f60e03aac31 Mon Sep 17 00:00:00 2001
From: "Owen W. Taylor" 
Date: Fri, 1 Mar 2024 09:39:10 +0100
Subject: [PATCH 811/844] Add patch to fix backup tool for F39-style Flatpaks

With the F39 Flatpak, the EDS D-Bus service name prefix is set at container
creation time, instead of at build time, so instead of looking for
service file that exactly matches the service name we got from
pkg-config, look for one that includes that service name as a substring.
---
 configurable-dbus-prefix.patch | 42 ++++++++++++++++++++++++++++++++++
 evolution.spec                 | 22 ++++++++++++++++--
 2 files changed, 62 insertions(+), 2 deletions(-)
 create mode 100644 configurable-dbus-prefix.patch

diff --git a/configurable-dbus-prefix.patch b/configurable-dbus-prefix.patch
new file mode 100644
index 0000000..be23739
--- /dev/null
+++ b/configurable-dbus-prefix.patch
@@ -0,0 +1,42 @@
+diff -up evolution-3.48.1 evolution-3.48
+diff -up evolution-3.48.1/docs/evolution.1 evolution-3.48.1/docs/evolution
+diff -up evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1 evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c
+--- evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c.1	2023-11-27 13:12:25.099463743 -0500
++++ evolution-3.48.1/src/modules/backup-restore/evolution-backup-tool.c	2023-11-27 13:14:38.640243434 -0500
+@@ -674,7 +674,7 @@ get_source_manager_reload_command (void)
+ 			g_string_free (tmp, TRUE);
+ 			tmp = NULL;
+ 
+-			base_filename = g_strdup (EDS_SOURCES_DBUS_SERVICE_NAME);
++			base_filename = g_ascii_strdown (EDS_SOURCES_DBUS_SERVICE_NAME, -1);
+ 
+ 			if (!base_filename || !*base_filename) {
+ 				g_free (base_filename);
+@@ -690,14 +690,16 @@ get_source_manager_reload_command (void)
+ 
+ 			while (!tmp) {
+ 				const gchar *name;
++				gchar *name_down;
+ 
+ 				name = g_dir_read_name (dir);
++				name_down = g_ascii_strdown (name, -1);
+ 
+ 				if (!name)
+ 					break;
+ 
+-				if (g_ascii_strncasecmp (name, base_filename, base_filename_len) == 0 &&
+-				    g_ascii_strncasecmp (name + strlen (name) - 8, ".service", 8) == 0) {
++				if (strstr (name_down, base_filename) != NULL &&
++				    strncmp (name_down + strlen (name) - 8, ".service", 8) == 0) {
+ 					gchar *filename;
+ 
+ 					filename = g_strconcat ("$DBUSDATADIR", G_DIR_SEPARATOR_S, name, NULL);
+@@ -724,6 +726,8 @@ get_source_manager_reload_command (void)
+ 						g_free (str);
+ 					}
+ 				}
++
++				g_free (name_down);
+ 			}
+ 
+ 			g_free (base_filename);
diff --git a/evolution.spec b/evolution.spec
index 643bf86..4815eec 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.51.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -52,6 +52,12 @@ Source: http://download.gnome.org/sources/%{name}/3.51/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+# 0-99: General patches
+
+# 100-199: Flatpak-specific patches
+# https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144
+Patch100: configurable-dbus-prefix.patch
+
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -241,7 +247,15 @@ the functionality of the installed %{name} package.
 %endif
 
 %prep
-%autosetup -p1 -S gendiff
+%autosetup -p1 -S gendiff -N
+
+# General patches
+%autopatch -p1 -m 0 -M 99
+
+# Flatpak-specific patches
+%if 0%{?flatpak}
+%autopatch -p1 -m 100 -M 199
+%endif
 
 # Remove the welcome email from Novell
 for inbox in src/mail/default/*/Inbox; do
@@ -579,6 +593,10 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 01 2024 Owen Taylor  - 3.51.2-2
+- Add patch to fix backup tool for F39-style Flatpaks where the
+  EDS D-Bus service name prefix is set at container creation time.
+
 * Fri Feb 09 2024 Milan Crha  - 3.51.2-1
 - Update to 3.51.2
 

From 6aba648d1d1db1afd4b2f2a436d98048b05ad3e1 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 1 Mar 2024 09:43:05 +0100
Subject: [PATCH 812/844] Update to 3.51.3

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 4815eec..b5fc7e6 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.51.2
-Release: 2%{?dist}
+Version: 3.51.3
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 01 2024 Milan Crha  - 3.51.3-1
+- Update to 3.51.3
+
 * Fri Mar 01 2024 Owen Taylor  - 3.51.2-2
 - Add patch to fix backup tool for F39-style Flatpaks where the
   EDS D-Bus service name prefix is set at container creation time.
diff --git a/sources b/sources
index c90ba0a..e9e2f05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.51.2.tar.xz) = 304f484fa83bac4d74bfc38122317c1b1d1147d2932671fddf09bd77b75980368b413703614b89b6fc4e11190fbf5f83ae6e1b14384c2aad3c2cc9b01cbefda0
+SHA512 (evolution-3.51.3.tar.xz) = 5ed519daa05b8ace934a0fa4e1074e97dd2945911f002357c8429cd1bd26fc889d2936eb0f01144369a603410f988012d45209e53abbbaada93c5b0e3b806917

From 4b9b71db693b6f3f76362fd64ad0e4e8b947fdf4 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 15 Mar 2024 08:10:01 +0100
Subject: [PATCH 813/844] Update to 3.52.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index b5fc7e6..21bfc62 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.51.3
+Version: 3.52.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.51/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.52/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 15 2024 Milan Crha  - 3.52.0-1
+- Update to 3.52.0
+
 * Fri Mar 01 2024 Milan Crha  - 3.51.3-1
 - Update to 3.51.3
 
diff --git a/sources b/sources
index e9e2f05..e75bce0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.51.3.tar.xz) = 5ed519daa05b8ace934a0fa4e1074e97dd2945911f002357c8429cd1bd26fc889d2936eb0f01144369a603410f988012d45209e53abbbaada93c5b0e3b806917
+SHA512 (evolution-3.52.0.tar.xz) = bc18350a720997271bf6f7f10c900c564709d26b61f0a65113aab8e699554e20785c5843eed5c495c9d8e049fef2c9282220c9b88ec6571dabe8d9ec3fccf2ed

From 920b04003df72274a6cafb507df376923cc1a22b Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Tue, 26 Mar 2024 16:50:24 +0100
Subject: [PATCH 814/844] Update URL to point to the new Wiki space

---
 evolution.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 21bfc62..d09aceb 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -47,7 +47,7 @@ Version: 3.52.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
-URL: https://wiki.gnome.org/Apps/Evolution
+URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
 Source: http://download.gnome.org/sources/%{name}/3.52/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in

From 66d7a4c6a2b39a1f4c20158a74373def90c97987 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 19 Apr 2024 08:45:15 +0200
Subject: [PATCH 815/844] Update to 3.52.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d09aceb..cfb978a 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.52.0
+Version: 3.52.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Apr 19 2024 Milan Crha  - 3.52.1-1
+- Update to 3.52.1
+
 * Fri Mar 15 2024 Milan Crha  - 3.52.0-1
 - Update to 3.52.0
 
diff --git a/sources b/sources
index e75bce0..1601922 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.52.0.tar.xz) = bc18350a720997271bf6f7f10c900c564709d26b61f0a65113aab8e699554e20785c5843eed5c495c9d8e049fef2c9282220c9b88ec6571dabe8d9ec3fccf2ed
+SHA512 (evolution-3.52.1.tar.xz) = 3fefb1b11ab164d85cd95ef1973dea8fe60ecd26f8617097a0d6843ee40db9bfe44df92e7b6ecf3afd1da4ac8e2c1e2c3144faf439d0dcf9bf677a6f842cb043

From dac6de3858ff17568051dfc578d9ecb76b591993 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 24 May 2024 08:19:36 +0200
Subject: [PATCH 816/844] Update to 3.52.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index cfb978a..75a02d8 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.52.1
+Version: 3.52.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri May 24 2024 Milan Crha  - 3.52.2-1
+- Update to 3.52.2
+
 * Fri Apr 19 2024 Milan Crha  - 3.52.1-1
 - Update to 3.52.1
 
diff --git a/sources b/sources
index 1601922..0b83061 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.52.1.tar.xz) = 3fefb1b11ab164d85cd95ef1973dea8fe60ecd26f8617097a0d6843ee40db9bfe44df92e7b6ecf3afd1da4ac8e2c1e2c3144faf439d0dcf9bf677a6f842cb043
+SHA512 (evolution-3.52.2.tar.xz) = 03db78da682216ccf96e873968c284ff1c52211d74c0d121c853747075d591d39d8b8be46dfbe9aab289ad10adff71a4cef382e23d6c577ac6b7dfd2c0c350be

From 3fb2d0402b663756d4e5f9c5bfed5d6e6e105b3c Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 28 Jun 2024 09:59:06 +0200
Subject: [PATCH 817/844] Update to 3.53.1

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 75a02d8..629de8b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.52.2
+Version: 3.53.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
-Source: http://download.gnome.org/sources/%{name}/3.52/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.53/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jun 28 2024 Milan Crha  - 3.53.1-1
+- Update to 3.53.1
+
 * Fri May 24 2024 Milan Crha  - 3.52.2-1
 - Update to 3.52.2
 
diff --git a/sources b/sources
index 0b83061..af3f33f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.52.2.tar.xz) = 03db78da682216ccf96e873968c284ff1c52211d74c0d121c853747075d591d39d8b8be46dfbe9aab289ad10adff71a4cef382e23d6c577ac6b7dfd2c0c350be
+SHA512 (evolution-3.53.1.tar.xz) = dbd5ae68ca857e095323f6582e882761fa7db21c8c3ac1a87c00b652f71937904f38e4eb7554a172d53759472c46cdf6c2a1e22378d31b5ea4c84a62d0a9bb3a

From 94619c361f460aea06d207732bf2c29e5990bccb Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Wed, 17 Jul 2024 22:31:30 +0000
Subject: [PATCH 818/844] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 629de8b..d0aeaf7 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.53.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Wed Jul 17 2024 Fedora Release Engineering  - 3.53.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
+
 * Fri Jun 28 2024 Milan Crha  - 3.53.1-1
 - Update to 3.53.1
 

From 2097a6e4edc25368613d9716670291df1368b165 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 2 Aug 2024 08:49:15 +0200
Subject: [PATCH 819/844] Update to 3.53.2

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index d0aeaf7..2334128 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.53.1
-Release: 2%{?dist}
+Version: 3.53.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Aug 02 2024 Milan Crha  - 3.53.2-1
+- Update to 3.53.2
+
 * Wed Jul 17 2024 Fedora Release Engineering  - 3.53.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
 
diff --git a/sources b/sources
index af3f33f..4720c6f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.53.1.tar.xz) = dbd5ae68ca857e095323f6582e882761fa7db21c8c3ac1a87c00b652f71937904f38e4eb7554a172d53759472c46cdf6c2a1e22378d31b5ea4c84a62d0a9bb3a
+SHA512 (evolution-3.53.2.tar.xz) = 62ad602790fcb6aa5d9adc4a79ee0e7d998f89e09ac0c3ec8a8930e40d1e6bf76d701a4e57e59de1b9cf94c820aa5c8b01a261dbab54d6246e2e2bef43da1289

From d3e47d3088bc09fb06e01fd0bc9fd2c4ee86a05f Mon Sep 17 00:00:00 2001
From: David King 
Date: Mon, 26 Aug 2024 19:52:02 +0100
Subject: [PATCH 820/844] Rebuild against gspell

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 2334128..9dd1c71 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.53.2
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Mon Aug 26 2024 David King  - 3.53.2-2
+- Rebuild against gspell
+
 * Fri Aug 02 2024 Milan Crha  - 3.53.2-1
 - Update to 3.53.2
 

From 5343d971e18d1449f3ccddffcee1e216ee8aea80 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 30 Aug 2024 04:08:45 +0200
Subject: [PATCH 821/844] Update to 3.53.3

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 9dd1c71..731b333 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.53.2
-Release: 2%{?dist}
+Version: 3.53.3
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Aug 30 2024 Milan Crha  - 3.53.3-1
+- Update to 3.53.3
+
 * Mon Aug 26 2024 David King  - 3.53.2-2
 - Rebuild against gspell
 
diff --git a/sources b/sources
index 4720c6f..9af84d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.53.2.tar.xz) = 62ad602790fcb6aa5d9adc4a79ee0e7d998f89e09ac0c3ec8a8930e40d1e6bf76d701a4e57e59de1b9cf94c820aa5c8b01a261dbab54d6246e2e2bef43da1289
+SHA512 (evolution-3.53.3.tar.xz) = 49ba3e7b6676918b22bdfd126ae7197074f5fd197b30d574ce4e8d2f94edb03396c97abb2792007a3c7db43de64e7e573206dc7da65a1f01865d6c31405aade3

From 3dd073cda3c81850c79aff2c0e2b26bc4f0f6a28 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 13 Sep 2024 10:16:48 +0200
Subject: [PATCH 822/844] Update to 3.54.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 731b333..b9aea02 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.53.3
+Version: 3.54.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
-Source: http://download.gnome.org/sources/%{name}/3.53/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.54/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Sep 13 2024 Milan Crha  - 3.54.0-1
+- Update to 3.54.0
+
 * Fri Aug 30 2024 Milan Crha  - 3.53.3-1
 - Update to 3.53.3
 
diff --git a/sources b/sources
index 9af84d0..c5d66a5 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.53.3.tar.xz) = 49ba3e7b6676918b22bdfd126ae7197074f5fd197b30d574ce4e8d2f94edb03396c97abb2792007a3c7db43de64e7e573206dc7da65a1f01865d6c31405aade3
+SHA512 (evolution-3.54.0.tar.xz) = 03c715aeaab5e4728467f378ae4609726ea4b66ecf2975d7f94897e1cdddb5a89dd4a6cdc49b6661874ab9f20f82ce6641cfdb463272708b2adabcd89cfa1ff1

From 9743ead8f31e8ba6bfe5e8626bc4c4897952274a Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 18 Oct 2024 09:28:03 +0200
Subject: [PATCH 823/844] Update to 3.54.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index b9aea02..7c01e5c 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.54.0
+Version: 3.54.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Oct 18 2024 Milan Crha  - 3.54.1-1
+- Update to 3.54.1
+
 * Fri Sep 13 2024 Milan Crha  - 3.54.0-1
 - Update to 3.54.0
 
diff --git a/sources b/sources
index c5d66a5..c98e2ad 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.54.0.tar.xz) = 03c715aeaab5e4728467f378ae4609726ea4b66ecf2975d7f94897e1cdddb5a89dd4a6cdc49b6661874ab9f20f82ce6641cfdb463272708b2adabcd89cfa1ff1
+SHA512 (evolution-3.54.1.tar.xz) = d9b1e7bdd6c572080c09c5bb608e3d14fa2b044754f45296aaff7973a34176623c1ba92bfb43ee9d346d46aac73f4039cb2460b16babc22cd7d3cf28d2c90ffa

From c028e25e36c8a23d546014205ebd589ef4fd1ebb Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 22 Nov 2024 09:14:31 +0100
Subject: [PATCH 824/844] Update to 3.54.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 7c01e5c..f152fbf 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.54.1
+Version: 3.54.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Nov 22 2024 Milan Crha  - 3.54.2-1
+- Update to 3.54.2
+
 * Fri Oct 18 2024 Milan Crha  - 3.54.1-1
 - Update to 3.54.1
 
diff --git a/sources b/sources
index c98e2ad..76ccf8d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.54.1.tar.xz) = d9b1e7bdd6c572080c09c5bb608e3d14fa2b044754f45296aaff7973a34176623c1ba92bfb43ee9d346d46aac73f4039cb2460b16babc22cd7d3cf28d2c90ffa
+SHA512 (evolution-3.54.2.tar.xz) = 7f9f0b48ea88c9c07c05bc7439f2c97ea5449c968823ef899d17451202849edfe69c4ca1bc8316980d5ea9e03fa395f727900c2bbe90c5639f09339f8ec79e00

From d148c78e2afaa35a9c06381d9c67a8c2d4729e7c Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Tue, 7 Jan 2025 08:45:47 +0100
Subject: [PATCH 825/844] Update to 3.55.1

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index f152fbf..b84aacb 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.54.2
+Version: 3.55.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
-Source: http://download.gnome.org/sources/%{name}/3.54/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.55/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue Jan 07 2025 Milan Crha  - 3.55.1-1
+- Update to 3.55.1
+
 * Fri Nov 22 2024 Milan Crha  - 3.54.2-1
 - Update to 3.54.2
 
diff --git a/sources b/sources
index 76ccf8d..de680c4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.54.2.tar.xz) = 7f9f0b48ea88c9c07c05bc7439f2c97ea5449c968823ef899d17451202849edfe69c4ca1bc8316980d5ea9e03fa395f727900c2bbe90c5639f09339f8ec79e00
+SHA512 (evolution-3.55.1.tar.xz) = 56346f911e607843f11d869257c3f4a011cadbadb71aed4175ede3a4e949f9ec548c5acf8cbd78aa30f0f7fbb86e02d5aeaf23ffeae85c5f437bf7a059668f54

From 75da879e46e2226694a136962694ff68dd81f96a Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Thu, 16 Jan 2025 17:34:52 +0000
Subject: [PATCH 826/844] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index b84aacb..840fd37 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.55.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Thu Jan 16 2025 Fedora Release Engineering  - 3.55.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
+
 * Tue Jan 07 2025 Milan Crha  - 3.55.1-1
 - Update to 3.55.1
 

From 142e8b59ce02456e9eb71c58c209458c4e7e2133 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 31 Jan 2025 15:50:29 +0100
Subject: [PATCH 827/844] Update to 3.55.2

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 840fd37..ec8f671 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.55.1
-Release: 2%{?dist}
+Version: 3.55.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Jan 31 2025 Milan Crha  - 3.55.2-1
+- Update to 3.55.2
+
 * Thu Jan 16 2025 Fedora Release Engineering  - 3.55.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
 
diff --git a/sources b/sources
index de680c4..e59c935 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.55.1.tar.xz) = 56346f911e607843f11d869257c3f4a011cadbadb71aed4175ede3a4e949f9ec548c5acf8cbd78aa30f0f7fbb86e02d5aeaf23ffeae85c5f437bf7a059668f54
+SHA512 (evolution-3.55.2.tar.xz) = 2cadd0de104a360cff34e9a7936e77e5daa5809cae805299543a5c6980b825aa4973805f1347b87b2492b0eef0f06fb73b79abf7d6d75c9bf4db42e79d75393c

From 2b76adb6fb1aae8bd6a0b57849449c35b8ebb462 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 28 Feb 2025 11:57:16 +0100
Subject: [PATCH 828/844] Update to 3.55.3

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index ec8f671..3d9d7d6 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.55.2
+Version: 3.55.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Feb 28 2025 Milan Crha  - 3.55.3-1
+- Update to 3.55.3
+
 * Fri Jan 31 2025 Milan Crha  - 3.55.2-1
 - Update to 3.55.2
 
diff --git a/sources b/sources
index e59c935..8f7dcec 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.55.2.tar.xz) = 2cadd0de104a360cff34e9a7936e77e5daa5809cae805299543a5c6980b825aa4973805f1347b87b2492b0eef0f06fb73b79abf7d6d75c9bf4db42e79d75393c
+SHA512 (evolution-3.55.3.tar.xz) = bb597845ca6a42d8204f8c6aa4e30c2668146e9295a33d769b39dfd0cb15af3b35b6cdd97318118c47adefe29eb91a8defdedbd0c6c67b1a517ed4dbc98bc448

From 1b2dcdb7747758e06ad3c9179de827431ecada8b Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 14 Mar 2025 09:36:01 +0100
Subject: [PATCH 829/844] Update to 3.56.0

---
 evolution.spec | 7 +++++--
 sources        | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 3d9d7d6..145711d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.55.3
+Version: 3.56.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
-Source: http://download.gnome.org/sources/%{name}/3.55/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.56/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -593,6 +593,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Mar 14 2025 Milan Crha  - 3.56.0-1
+- Update to 3.56.0
+
 * Fri Feb 28 2025 Milan Crha  - 3.55.3-1
 - Update to 3.55.3
 
diff --git a/sources b/sources
index 8f7dcec..332c41c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.55.3.tar.xz) = bb597845ca6a42d8204f8c6aa4e30c2668146e9295a33d769b39dfd0cb15af3b35b6cdd97318118c47adefe29eb91a8defdedbd0c6c67b1a517ed4dbc98bc448
+SHA512 (evolution-3.56.0.tar.xz) = e64c08b802fff9cc40eb53f7dcbbf96d8a25a79ae58c8540e551f3df35ee31cd29f14278ff2a3104343efd6cb2b827da56929f6d241d6f67ef93efa76fc333c7

From 399118cf1a9099a9321d429fa91ad93a4afbb490 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 14 Mar 2025 10:38:33 +0100
Subject: [PATCH 830/844] Temporarily adapt to CMake macro changes

Related to https://src.fedoraproject.org/rpms/cmake/pull-request/45
---
 evolution.spec | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 145711d..bd61012 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -53,6 +53,7 @@ Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
 # 0-99: General patches
+# enable corresponding autopatch below to make them applied
 
 # 100-199: Flatpak-specific patches
 # https://gitlab.gnome.org/GNOME/evolution-data-server/-/merge_requests/144
@@ -250,7 +251,7 @@ the functionality of the installed %{name} package.
 %autosetup -p1 -S gendiff -N
 
 # General patches
-%autopatch -p1 -m 0 -M 99
+# %%autopatch -p1 -m 0 -M 99
 
 # Flatpak-specific patches
 %if 0%{?flatpak}
@@ -318,6 +319,13 @@ export CFLAGS
 	%if 0%{?flatpak}
 	"-DWITH_WMCLASS_OVERRIDE=evolution.bin" \
 	%endif
+	-DINCLUDE_INSTALL_DIR:PATH=%{_includedir} \
+	-DLIB_INSTALL_DIR:PATH=%{_libdir} \
+	-DSYSCONF_INSTALL_DIR:PATH=%{_sysconfdir} \
+	-DSHARE_INSTALL_PREFIX:PATH=%{_datadir} \
+	%if "%{?_lib}" == "lib64"
+		-DLIB_SUFFIX=64 \
+	%endif
 	%{nil}
 
 %cmake_build

From b763edfc690342907f4d68097059af4ece15e9e8 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 11 Apr 2025 08:46:32 +0200
Subject: [PATCH 831/844] Update to 3.56.1

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index bd61012..e7821d8 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.56.0
+Version: 3.56.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -601,6 +601,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri Apr 11 2025 Milan Crha  - 3.56.1-1
+- Update to 3.56.1
+
 * Fri Mar 14 2025 Milan Crha  - 3.56.0-1
 - Update to 3.56.0
 
diff --git a/sources b/sources
index 332c41c..bb3fb26 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.56.0.tar.xz) = e64c08b802fff9cc40eb53f7dcbbf96d8a25a79ae58c8540e551f3df35ee31cd29f14278ff2a3104343efd6cb2b827da56929f6d241d6f67ef93efa76fc333c7
+SHA512 (evolution-3.56.1.tar.xz) = 5bef3024bd81bd63bc6b727fada5dd6d2278e0ed358521a878297d036e0af6dfbc36fef7d8bd33097beeef5c43279d70c544cf886895f5b13bdb44653317df9f

From eac5f5381a9fe312776601e30a851ae11e36b1ca Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 23 May 2025 21:01:46 +0200
Subject: [PATCH 832/844] Update to 3.56.2

---
 evolution.spec | 5 ++++-
 sources        | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index e7821d8..4c3aee7 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.56.1
+Version: 3.56.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
@@ -601,6 +601,9 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Fri May 23 2025 Milan Crha  - 3.56.2-1
+- Update to 3.56.2
+
 * Fri Apr 11 2025 Milan Crha  - 3.56.1-1
 - Update to 3.56.1
 
diff --git a/sources b/sources
index bb3fb26..205c7cd 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.56.1.tar.xz) = 5bef3024bd81bd63bc6b727fada5dd6d2278e0ed358521a878297d036e0af6dfbc36fef7d8bd33097beeef5c43279d70c544cf886895f5b13bdb44653317df9f
+SHA512 (evolution-3.56.2.tar.xz) = ccfd0c4d8edd5efe2f94bac47459fb9b9b3020f8b1d3bb71057c5600f8ec764b18cd0bb451a37d5ee0e0f68e48873478e8714e919beeab8609754cc9d25dcdef

From a167a13c49ec51436aa98dedf38f4707dc59e9b5 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 27 Jun 2025 08:59:40 +0200
Subject: [PATCH 833/844] Update to 3.57.1

---
 evolution.spec | 3130 +-----------------------------------------------
 sources        |    2 +-
 2 files changed, 4 insertions(+), 3128 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 4c3aee7..3aa2991 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.56.2
+Version: 3.57.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
-Source: http://download.gnome.org/sources/%{name}/3.56/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.57/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
@@ -601,3128 +601,4 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
-* Fri May 23 2025 Milan Crha  - 3.56.2-1
-- Update to 3.56.2
-
-* Fri Apr 11 2025 Milan Crha  - 3.56.1-1
-- Update to 3.56.1
-
-* Fri Mar 14 2025 Milan Crha  - 3.56.0-1
-- Update to 3.56.0
-
-* Fri Feb 28 2025 Milan Crha  - 3.55.3-1
-- Update to 3.55.3
-
-* Fri Jan 31 2025 Milan Crha  - 3.55.2-1
-- Update to 3.55.2
-
-* Thu Jan 16 2025 Fedora Release Engineering  - 3.55.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
-
-* Tue Jan 07 2025 Milan Crha  - 3.55.1-1
-- Update to 3.55.1
-
-* Fri Nov 22 2024 Milan Crha  - 3.54.2-1
-- Update to 3.54.2
-
-* Fri Oct 18 2024 Milan Crha  - 3.54.1-1
-- Update to 3.54.1
-
-* Fri Sep 13 2024 Milan Crha  - 3.54.0-1
-- Update to 3.54.0
-
-* Fri Aug 30 2024 Milan Crha  - 3.53.3-1
-- Update to 3.53.3
-
-* Mon Aug 26 2024 David King  - 3.53.2-2
-- Rebuild against gspell
-
-* Fri Aug 02 2024 Milan Crha  - 3.53.2-1
-- Update to 3.53.2
-
-* Wed Jul 17 2024 Fedora Release Engineering  - 3.53.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
-
-* Fri Jun 28 2024 Milan Crha  - 3.53.1-1
-- Update to 3.53.1
-
-* Fri May 24 2024 Milan Crha  - 3.52.2-1
-- Update to 3.52.2
-
-* Fri Apr 19 2024 Milan Crha  - 3.52.1-1
-- Update to 3.52.1
-
-* Fri Mar 15 2024 Milan Crha  - 3.52.0-1
-- Update to 3.52.0
-
-* Fri Mar 01 2024 Milan Crha  - 3.51.3-1
-- Update to 3.51.3
-
-* Fri Mar 01 2024 Owen Taylor  - 3.51.2-2
-- Add patch to fix backup tool for F39-style Flatpaks where the
-  EDS D-Bus service name prefix is set at container creation time.
-
-* Fri Feb 09 2024 Milan Crha  - 3.51.2-1
-- Update to 3.51.2
-
-* Wed Jan 24 2024 Fedora Release Engineering  - 3.51.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 19 2024 Fedora Release Engineering  - 3.51.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 05 2024 Milan Crha  - 3.51.1-1
-- Update to 3.51.1
-
-* Fri Dec 01 2023 Milan Crha  - 3.50.2-1
-- Update to 3.50.2
-
-* Fri Oct 20 2023 Milan Crha  - 3.50.1-1
-- Update to 3.50.1
-
-* Fri Sep 15 2023 Milan Crha  - 3.50.0-1
-- Update to 3.50.0
-
-* Fri Sep 01 2023 Milan Crha  - 3.49.3-1
-- Update to 3.49.3
-
-* Fri Aug 04 2023 Milan Crha  - 3.49.2-1
-- Update to 3.49.2
-
-* Wed Jul 19 2023 Fedora Release Engineering  - 3.49.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Fri Jun 30 2023 Milan Crha  - 3.49.1-1
-- Update to 3.49.1
-
-* Fri Jun 02 2023 Milan Crha  - 3.48.3-1
-- Update to 3.48.3
-
-* Tue May 30 2023 Milan Crha  - 3.48.2-3
-- Add patch to workaround recursion in iframe height computation in mail preview
-
-* Mon May 29 2023 Milan Crha  - 3.48.2-2
-- Add upstream fix for a regression on mail preview panel sometimes growing indefinitely
-
-* Fri May 26 2023 Milan Crha  - 3.48.2-1
-- Update to 3.48.2
-
-* Fri Apr 21 2023 Milan Crha  - 3.48.1-1
-- Update to 3.48.1
-
-* Fri Mar 17 2023 Milan Crha  - 3.48.0-1
-- Update to 3.48.0
-
-* Fri Mar 03 2023 Milan Crha  - 3.47.3-1
-- Update to 3.47.3
-- Resolves: #2142385 (Properly apply TEMP_HOME compile time option for Flatpak)
-
-* Fri Feb 10 2023 Milan Crha  - 3.47.2-1
-- Update to 3.47.2
-
-* Mon Jan 30 2023 Jens Petersen  - 3.47.1-4
-- rebuild
-
-* Fri Jan 27 2023 Jens Petersen  - 3.47.1-3
-- rebuild f38 against newer cmark
-
-* Thu Jan 19 2023 Fedora Release Engineering  - 3.47.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Fri Jan 06 2023 Milan Crha  - 3.47.1-1
-- Update to 3.47.1
-
-* Fri Dec 02 2022 Milan Crha  - 3.46.2-1
-- Update to 3.46.2
-
-* Fri Oct 21 2022 Milan Crha  - 3.46.1-1
-- Update to 3.46.1
-
-* Fri Sep 23 2022 Milan Crha  - 3.46.0-2
-- Resolves: #2129068 (Busy loop when opening composer window)
-
-* Fri Sep 16 2022 Milan Crha  - 3.46.0-1
-- Update to 3.46.0
-
-* Fri Sep 02 2022 Milan Crha  - 3.45.3-1
-- Update to 3.45.3
-- Obsolete evolution-rss
-
-* Fri Aug 05 2022 Milan Crha  - 3.45.2-1
-- Update to 3.45.2
-
-* Thu Jul 21 2022 Fedora Release Engineering  - 3.45.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Jul 19 2022 Milan Crha  - 3.45.1-1
-- Update to 3.45.1
-
-* Fri Jul 01 2022 Milan Crha  - 3.44.3-1
-- Update to 3.44.3
-
-* Fri May 27 2022 Milan Crha  - 3.44.2-1
-- Update to 3.44.2
-
-* Fri Apr 22 2022 Milan Crha  - 3.44.1-1
-- Update to 3.44.1
-
-* Fri Mar 18 2022 Milan Crha  - 3.44.0-1
-- Update to 3.44.0
-
-* Fri Mar 04 2022 Milan Crha  - 3.43.3-1
-- Update to 3.43.3
-
-* Fri Feb 11 2022 Milan Crha  - 3.43.2-1
-- Update to 3.43.2
-
-* Thu Jan 20 2022 Fedora Release Engineering  - 3.43.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Fri Jan 07 2022 Milan Crha  - 3.43.1-1
-- Update to 3.43.1
-
-* Fri Dec 03 2021 Milan Crha  - 3.42.2-1
-- Update to 3.42.2
-
-* Fri Oct 29 2021 Milan Crha  - 3.42.1-1
-- Update to 3.42.1
-
-* Fri Sep 17 2021 Milan Crha  - 3.42.0-1
-- Update to 3.42.0
-
-* Fri Sep 03 2021 Milan Crha  - 3.41.3-1
-- Update to 3.41.3
-
-* Fri Aug 13 2021 Milan Crha  - 3.41.2-1
-- Update to 3.41.2
-
-* Wed Jul 21 2021 Fedora Release Engineering  - 3.41.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Fri Jul 09 2021 Milan Crha  - 3.41.1-1
-- Update to 3.41.1
-
-* Fri Jun 04 2021 Milan Crha  - 3.40.2-1
-- Update to 3.40.2
-
-* Fri Apr 30 2021 Milan Crha  - 3.40.1-1
-- Update to 3.40.1
-
-* Fri Mar 19 2021 Milan Crha  - 3.40.0-1
-- Update to 3.40.0
-
-* Fri Mar 12 2021 Milan Crha  - 3.39.3-1
-- Update to 3.39.3
-
-* Fri Feb 12 2021 Milan Crha  - 3.39.2-1
-- Update to 3.39.2
-
-* Tue Jan 26 2021 Fedora Release Engineering  - 3.39.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Fri Jan 08 2021 Milan Crha  - 3.39.1-1
-- Update to 3.39.1
-
-* Fri Nov 20 2020 Milan Crha  - 3.38.2-1
-- Update to 3.38.2
-
-* Fri Oct 02 2020 Milan Crha  - 3.38.1-1
-- Update to 3.38.1
-
-* Sat Sep 26 2020 Adrian Reber  - 3.38.0-2
-- Rebuilt for protobuf 3.13
-
-* Fri Sep 11 2020 Milan Crha  - 3.38.0-1
-- Update to 3.38.0
-
-* Fri Sep 04 2020 Milan Crha  - 3.37.92-1
-- Update to 3.37.92
-
-* Fri Aug 07 2020 Milan Crha  - 3.37.90-1
-- Update to 3.37.90
-
-* Mon Jul 27 2020 Fedora Release Engineering  - 3.37.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Fri Jul 03 2020 Milan Crha  - 3.37.3-1
-- Update to 3.37.3
-
-* Tue Jun 23 2020 Adam Williamson  - 3.37.2-2
-- Backport several fixes for annoying bugs from mainline
-
-* Fri May 29 2020 Milan Crha  - 3.37.2-1
-- Update to 3.37.2
-
-* Fri Apr 24 2020 Milan Crha  - 3.37.1-1
-- Update to 3.37.1
-
-* Fri Mar 27 2020 Milan Crha  - 3.36.1-1
-- Update to 3.36.1
-
-* Fri Mar 06 2020 Milan Crha  - 3.36.0-1
-- Update to 3.36.0
-
-* Fri Feb 28 2020 Milan Crha  - 3.35.92-1
-- Update to 3.35.92
-
-* Fri Feb 14 2020 Milan Crha  - 3.35.91-1
-- Update to 3.35.91
-
-* Fri Jan 31 2020 Milan Crha  - 3.35.90-1
-- Update to 3.35.90
-
-* Tue Jan 28 2020 Fedora Release Engineering  - 3.35.3-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Thu Jan 16 2020 Kalev Lember  - 3.35.3-3
-- Rebuilt for libgnome-desktop soname bump
-
-* Mon Jan 06 2020 Milan Crha  - 3.35.3-2
-- Enable TNEF support for Fedora
-
-* Fri Jan 03 2020 Milan Crha  - 3.35.3-1
-- Update to 3.35.3
-
-* Fri Nov 22 2019 Milan Crha  - 3.35.2-1
-- Update to 3.35.2
-
-* Fri Oct 11 2019 Milan Crha  - 3.35.1-1
-- Update to 3.35.1
-
-* Mon Oct 07 2019 Milan Crha  - 3.34.1-1
-- Update to 3.34.1
-
-* Mon Sep 09 2019 Milan Crha  - 3.34.0-1
-- Update to 3.34.0
-
-* Mon Sep 02 2019 Milan Crha  - 3.33.92-1
-- Update to 3.33.92
-
-* Mon Aug 19 2019 Milan Crha  - 3.33.91-1
-- Update to 3.33.91
-
-* Mon Aug 05 2019 Milan Crha  - 3.33.90-1
-- Update to 3.33.90
-
-* Thu Jul 25 2019 Fedora Release Engineering  - 3.33.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Sun Jul 21 2019 Kalev Lember  - 3.33.4-2
-- Rebuilt for libgnome-desktop soname bump
-
-* Mon Jul 15 2019 Milan Crha  - 3.33.4-1
-- Update to 3.33.4
-
-* Mon Jul 08 2019 Kalev Lember  - 3.33.3-2
-- Rebuilt for libgweather soname bump
-
-* Mon Jun 17 2019 Milan Crha  - 3.33.3-1
-- Update to 3.33.3
-
-* Mon May 20 2019 Milan Crha  - 3.33.2-1
-- Update to 3.33.2
-
-* Mon Apr 22 2019 Milan Crha  - 3.33.1-1
-- Update to 3.33.1
-
-* Mon Apr 08 2019 Milan Crha  - 3.32.1-1
-- Update to 3.32.1
-
-* Mon Mar 11 2019 Milan Crha  - 3.32.0-1
-- Update to 3.32.0
-
-* Mon Mar 04 2019 Milan Crha  - 3.31.92-1
-- Update to 3.31.92
-
-* Mon Feb 18 2019 Milan Crha  - 3.31.91-1
-- Update to 3.31.91
-
-* Mon Feb 04 2019 Milan Crha  - 3.31.90-1
-- Update to 3.31.90
-
-* Thu Jan 31 2019 Fedora Release Engineering  - 3.31.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Jan 07 2019 Milan Crha  - 3.31.4-1
-- Update to 3.31.4
-
-* Mon Dec 10 2018 Milan Crha  - 3.31.3-1
-- Update to 3.31.3
-
-* Mon Nov 12 2018 Milan Crha  - 3.31.2-1
-- Update to 3.31.2
-
-* Fri Oct 26 2018 Milan Crha  - 3.31.1-2
-- Obsolete evolution-tests subpackage
-- Add BuildRequires/Requires for 'killall' binary
-
-* Mon Oct 08 2018 Milan Crha  - 3.31.1-1
-- Update to 3.31.1
-
-* Mon Sep 24 2018 Milan Crha  - 3.30.1-1
-- Update to 3.30.1
-- Remove patch for GNOME Evolution issue #86 (fixed upstream)
-- Disable tests subpackage - it uses python2 and it is unmaintained upstream
-- Remove BuildRequires on bogofilter and spamassassin
-
-* Mon Sep 03 2018 Milan Crha  - 3.30.0-1
-- Update to 3.30.0
-- Add patch for GNOME Evolution issue #86 (Quoting of plain text mail into HTML mode mangles deeper levels)
-
-* Mon Aug 27 2018 Milan Crha  - 3.29.92-1
-- Update to 3.29.92
-
-* Mon Aug 13 2018 Milan Crha  - 3.29.91-1
-- Update to 3.29.91
-
-* Mon Jul 30 2018 Milan Crha  - 3.29.90-1
-- Update to 3.29.90
-
-* Mon Jul 16 2018 Milan Crha  - 3.29.4-1
-- Update to 3.29.4
-- Change dependencies of the tests subpackage and do not precompile the scripts there
-
-* Fri Jul 13 2018 Fedora Release Engineering  - 3.29.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jun 18 2018 Milan Crha  - 3.29.3-1
-- Update to 3.29.3
-
-* Mon May 21 2018 Milan Crha  - 3.29.2-1
-- Update to 3.29.2
-
-* Mon Apr 16 2018 Milan Crha  - 3.29.1-1
-- Update to 3.29.1
-- Remove fix to strip closing > from URLs when linkifying (BGO#795108) (Fixed upstream)
-
-* Tue Apr 10 2018 Adam Williamson  - 3.28.1-2
-- Backport fix to strip closing > from URLs when linkifying (BGO#795108)
-
-* Mon Apr 09 2018 Milan Crha  - 3.28.1-1
-- Update to 3.28.1
-
-* Mon Mar 12 2018 Milan Crha  - 3.28.0-1
-- Update to 3.28.0
-
-* Mon Mar 05 2018 Milan Crha  - 3.27.92-1
-- Update to 3.27.92
-
-* Mon Feb 19 2018 Milan Crha  - 3.27.91-1
-- Update to 3.27.91
-
-* Tue Feb 13 2018 Björn Esser  - 3.27.90-3
-- Rebuild against newer gnome-desktop3 package
-
-* Fri Feb 09 2018 Igor Gnatenko  - 3.27.90-2
-- Escape macros in %%changelog
-
-* Tue Feb 06 2018 Milan Crha  - 3.27.90-1
-- Update to 3.27.90
-- Properly obsolete evolution-perl subpackage
-
-* Mon Feb 05 2018 Kalev Lember  - 3.27.4-2
-- Rebuilt for libgweather soname bump
-
-* Mon Jan 08 2018 Milan Crha  - 3.27.4-1
-- Update to 3.27.4
-
-* Sat Jan 06 2018 Igor Gnatenko  - 3.27.3-2
-- Remove obsolete scriptlets
-- Add explicit dependency on evolution-data-server (RH bug #1524416)
-
-* Mon Dec 11 2017 Milan Crha  - 3.27.3-1
-- Update to 3.27.3
-
-* Mon Nov 13 2017 Milan Crha  - 3.27.2-1
-- Update to 3.27.2
-
-* Wed Nov 08 2017 Milan Crha  - 3.27.1-2
-- Rebuild for newer libical
-
-* Mon Oct 16 2017 Milan Crha  - 3.27.1-1
-- Update to 3.27.1
-
-* Mon Oct 02 2017 Milan Crha  - 3.26.1-1
-- Update to 3.26.1
-
-* Mon Sep 11 2017 Milan Crha  - 3.26.0-1
-- Update to 3.26.0
-
-* Mon Sep 04 2017 Milan Crha  - 3.25.92.2-1
-- Update to 3.25.92.2
-
-* Mon Sep 04 2017 Milan Crha  - 3.25.92-1
-- Update to 3.25.92
-
-* Tue Aug 22 2017 Ville Skyttä  - 3.25.91-2
-- Install COPYING as %%license
-
-* Mon Aug 21 2017 Milan Crha  - 3.25.91-1
-- Update to 3.25.91
-
-* Mon Aug 07 2017 Milan Crha  - 3.25.90-1
-- Update to 3.25.90
-
-* Wed Aug 02 2017 Fedora Release Engineering  - 3.25.4-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
-
-* Mon Jul 31 2017 Florian Weimer  - 3.25.4-3
-- Rebuild with binutils fix for ppc64le (#1475636)
-
-* Wed Jul 26 2017 Fedora Release Engineering  - 3.25.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Mon Jul 17 2017 Milan Crha  - 3.25.4-1
-- Update to 3.25.4
-
-* Mon Jun 19 2017 Milan Crha  - 3.25.3-1
-- Update to 3.25.3
-
-* Mon May 22 2017 Milan Crha  - 3.25.2-1
-- Update to 3.25.2
-
-* Thu Apr 27 2017 Milan Crha  - 3.25.1-2
-- Split translations into separate package
-
-* Mon Apr 24 2017 Milan Crha  - 3.25.1-1
-- Update to 3.25.1
-
-* Mon Apr 10 2017 Milan Crha  - 3.24.1-1
-- Update to 3.24.1
-
-* Mon Mar 20 2017 Milan Crha  - 3.24.0-1
-- Update to 3.24.0
-
-* Mon Mar 13 2017 Milan Crha  - 3.23.92-1
-- Update to 3.23.92
-
-* Mon Feb 27 2017 Milan Crha  - 3.23.91-1
-- Update to 3.23.91
-
-* Mon Feb 13 2017 Milan Crha  - 3.23.90-1
-- Update to 3.23.90
-
-* Fri Feb 10 2017 Fedora Release Engineering  - 3.23.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Jan 16 2017 Milan Crha  - 3.23.4-1
-- Update to 3.23.4
-
-* Mon Dec 12 2016 Milan Crha  - 3.23.3-1
-- Update to 3.23.3
-
-* Mon Nov 21 2016 Milan Crha  - 3.23.2-1
-- Update to 3.23.2
-
-* Sun Nov 06 2016 Filipe Rosset  - 3.23.1-2
-- Rebuild for newer highlight
-
-* Mon Oct 24 2016 Milan Crha  - 3.23.1-1
-- Update to 3.23.1
-
-* Thu Oct 13 2016 Milan Crha  - 3.22.1-2
-- Add patch for GNOME bug #772803 (Inline images cause busy loop on Reply in WebKitWebProcess)
-
-* Mon Oct 10 2016 Milan Crha  - 3.22.1-1
-- Update to 3.22.1
-
-* Mon Sep 19 2016 Milan Crha  - 3.22.0-1
-- Update to 3.22.0
-- Add gnome-autoar dependency
-
-* Mon Sep 12 2016 Milan Crha  - 3.21.92-1
-- Update to 3.21.92
-- Remove patch for "Adapt to WebKit Unstable DOM API changes" (fixed upstream)
-
-* Thu Sep 01 2016 Tomas Popela  - 3.21.91-2
-- Adapt to WebKit Unstable DOM API changes
-
-* Mon Aug 29 2016 Milan Crha  - 3.21.91-1
-- Update to 3.21.91
-
-* Mon Aug 15 2016 Milan Crha  - 3.21.90-1
-- Update to 3.21.90
-
-* Mon Jul 18 2016 Milan Crha  - 3.21.4-1
-- Update to 3.21.4
-- Remove the "perl" subpackage (code moved to the evolution-data-server)
-
-* Mon Jun 20 2016 Milan Crha  - 3.21.3-1
-- Update to 3.21.3
-
-* Mon May 23 2016 Milan Crha  - 3.21.2-1
-- Update to 3.21.2
-
-* Mon Apr 25 2016 Milan Crha  - 3.21.1-1
-- Update to 3.21.1
-
-* Fri Apr 15 2016 David Tardon  - 3.20.1-2
-- rebuild for ICU 57.1
-
-* Mon Apr 11 2016 Milan Crha  - 3.20.1-1
-- Update to 3.20.1
-
-* Mon Mar 21 2016 Milan Crha  - 3.20.0-1
-- Update to 3.20.0
-
-* Mon Mar 14 2016 Milan Crha  - 3.19.92-1
-- Update to 3.19.92
-
-* Mon Feb 29 2016 Milan Crha  - 3.19.91-1
-- Update to 3.19.91
-- Remove patch for GNOME bug 761883 (Fixed upstream)
-
-* Thu Feb 18 2016 Milan Crha  - 3.19.90-2
-- Add patch for GNOME bug 761883 (Typo in the previous fix)
-
-* Mon Feb 15 2016 Milan Crha  - 3.19.90-1
-- Update to 3.19.90
-
-* Wed Feb 03 2016 Fedora Release Engineering  - 3.19.4-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Mon Jan 18 2016 David Tardon  - 3.19.4-2
-- rebuild for libical 2.0.0
-
-* Mon Jan 18 2016 Milan Crha  - 3.19.4-1
-- Update to 3.19.4
-
-* Mon Dec 14 2015 Milan Crha  - 3.19.3-1
-- Update to 3.19.3
-
-* Mon Nov 23 2015 Milan Crha  - 3.19.2-1
-- Update to 3.19.2
-
-* Mon Oct 26 2015 Milan Crha  - 3.19.1-1
-- Update to 3.19.1
-
-* Mon Oct 12 2015 Milan Crha  - 3.18.1-1
-- Update to 3.18.1
-
-* Mon Sep 21 2015 Milan Crha  - 3.18.0-1
-- Update to 3.18.0
-
-* Mon Sep 14 2015 Milan Crha  - 3.17.92-1
-- Update to 3.17.92
-- Add pkgconfig(iso-codes) into BuildRequires
-
-* Mon Aug 31 2015 Milan Crha  - 3.17.91-1
-- Update to 3.17.91
-
-* Mon Aug 17 2015 Milan Crha  - 3.17.90-1
-- Update to 3.17.90
-
-* Wed Jul 22 2015 Milan Crha  - 3.17.4-2
-- Rebuild for newer gnome-desktop3
-
-* Mon Jul 20 2015 Milan Crha  - 3.17.4-1
-- Update to 3.17.4
-
-* Mon Jun 22 2015 Milan Crha  - 3.17.3-1
-- Update to 3.17.3
-- Disable help build when gtk-doc is disabled
-
-* Wed Jun 17 2015 Fedora Release Engineering  - 3.17.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Mon May 25 2015 Milan Crha  - 3.17.2-1
-- Update to 3.17.2
-- Remove patch for a removal of an e-cell-renderer-color gtk-doc leftover (fixed upstream)
-
-* Mon Apr 27 2015 Milan Crha  - 3.17.1-1
-- Update to 3.17.1
-- Add patch for a removal of an e-cell-renderer-color gtk-doc leftover
-
-* Mon Apr 13 2015 Milan Crha  - 3.16.1-1
-- Update to 3.16.1
-
-* Mon Mar 23 2015 Milan Crha  - 3.16.0-1
-- Update to 3.16.0
-
-* Mon Mar 16 2015 Milan Crha  - 3.15.92-1
-- Update to 3.15.92
-- Remove obsolete patches (one unused and one fixed upstream)
-
-* Mon Mar 02 2015 Milan Crha  - 3.15.91-1
-- Update to 3.15.91
-
-* Mon Feb 16 2015 Milan Crha  - 3.13.90-1
-- Update to 3.13.90
-- Remove WebKit composer patches (fixed upstream)
-
-* Mon Feb 02 2015 Tomas Popela  - 3.13.10-2
-- Backport the WebKit composer patches
-
-* Mon Jan 26 2015 Milan Crha  - 3.13.10-1
-- Update to 3.13.10
-
-* Mon Dec 22 2014 Milan Crha  - 3.13.9-1
-- Update to 3.13.9
-
-* Mon Nov 24 2014 Milan Crha  - 3.13.8-1
-- Update to 3.13.8
-
-* Mon Oct 27 2014 Milan Crha  - 3.13.7-1
-- Update to 3.13.7
-
-* Mon Sep 22 2014 Milan Crha  - 3.13.6-1
-- Update to 3.13.6
-
-* Mon Aug 25 2014 Milan Crha  - 3.13.5-1
-- Update to 3.13.5
-- Remove patch to add missing tests files in the distribution tarball (fixed upstream)
-
-* Sat Aug 16 2014 Fedora Release Engineering  - 3.13.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
-
-* Wed Jul 30 2014 Milan Crha  - 3.13.4-1
-- Update to 3.13.4
-- Introduce tests subpackage with installed tests
-- Add patch to add missing tests files in the distribution tarball
-- Remove patch to drop gnome-icon-theme dependency (fixed upstream)
-
-* Mon Jul 14 2014 Milan Crha  - 3.12.4-1
-- Update to 3.12.4
-- Remove patch to fix folder names in Mail view's folder tree (fixed upstream)
-- Remove patch to fix colors in preview (fixed upstream)
-
-* Thu Jun 26 2014 Milan Crha  - 3.12.3-3
-- Add upstream patch to fix folder names in Mail view's folder tree
-- Add upstream patch to fix colors in preview
-
-* Mon Jun 09 2014 Milan Crha  - 3.12.3-2
-- Drop gnome-icon-theme dependency
-
-* Mon Jun 09 2014 Milan Crha  - 3.12.3-1
-- Update to 3.12.3
-
-* Sat Jun 07 2014 Fedora Release Engineering  - 3.12.2-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Mon May 12 2014 Milan Crha  - 3.12.2-1
-- Update to 3.12.2
-
-* Wed Apr 16 2014 Adam Williamson  - 3.12.1-2
-- rebuild for new libgdata
-
-* Mon Apr 14 2014 Milan Crha  - 3.12.1-1
-- Update to 3.12.1
-
-* Mon Mar 24 2014 Milan Crha  - 3.12.0-1
-- Update to 3.12.0
-
-* Mon Mar 17 2014 Milan Crha  - 3.11.92-1
-- Update to 3.11.92
-
-* Mon Mar 03 2014 Milan Crha  - 3.11.91-1
-- Update to 3.11.91
-
-* Wed Feb 19 2014 Kalev Lember  - 3.11.90-2
-- Rebuilt for libgnome-desktop soname bump
-
-* Mon Feb 17 2014 Milan Crha  - 3.11.90-1
-- Update to 3.11.90
-
-* Mon Feb 03 2014 Milan Crha  - 3.11.5-2
-- Drop krb5 dependency
-
-* Mon Feb 03 2014 Milan Crha  - 3.11.5-1
-- Update to 3.11.5
-
-* Fri Jan 17 2014 Adam Williamson  - 3.11.4-2
-- backport a couple of crasher fixes from upstream master
-
-* Mon Jan 13 2014 Milan Crha  - 3.11.4-1
-- Update to 3.11.4
-
-* Thu Nov 21 2013 Milan Crha  - 3.11.2-2
-- Rebuild for new libical (RH bug #1023020)
-
-* Mon Nov 18 2013 Milan Crha  - 3.11.2-1
-- Update to 3.11.2
-- Conditionally build help subpackage
-- Disable compiler warnings about deprecated symbols
-
-* Mon Nov 11 2013 Milan Crha  - 3.11.1-2
-- Hide more help-related widgets when evolution-help is not installed
-
-* Tue Oct 22 2013 Matthew Barnes  - 3.11.1-1
-- Update to 3.11.1
-
-* Mon Oct 14 2013 Milan Crha  - 3.10.1-1
-- Update to 3.10.1
-- Remove the dependency on libytnef, which apparently isn't needed for
-  the PST importer and disable the experimental TNEF attachments plugin
-- Avoid help launch with F1 when evolution-help is not installed
-
-* Mon Sep 23 2013 Milan Crha  - 3.10.0-1
-- Update to 3.10.0
-- Remove explicit Requires on libpst in pst subpackage
-
-* Mon Sep 16 2013 Milan Crha  - 3.9.92-1
-- Update to 3.9.92
-
-* Tue Sep 03 2013 Kalev Lember  - 3.9.91-2
-- Rebuilt for libgnome-desktop soname bump
-
-* Mon Sep 02 2013 Milan Crha  - 3.9.91-1
-- Update to 3.9.91
-
-* Fri Aug 23 2013 Milan Crha  - 3.9.90-2
-- Split developer documentation into evolution-devel-docs subpackage
-
-* Mon Aug 19 2013 Milan Crha  - 3.9.90-1
-- Update to 3.9.90
-
-* Tue Aug 06 2013 Adam Williamson  - 3.9.5-3
-- rebuild for new libgweather
-
-* Thu Aug 01 2013 Petr Pisar  - 3.9.5-2
-- Perl 5.18 rebuild
-
-* Mon Jul 29 2013 Milan Crha  - 3.9.5-1
-- Update to 3.9.5
-
-* Wed Jul 17 2013 Matthew Barnes  - 3.9.4-3
-- Work around a crash caught by -fstack-protector-strong.
-
-* Wed Jul 17 2013 Petr Pisar  - 3.9.4-2
-- Perl 5.18 rebuild
-
-* Mon Jul 08 2013 Milan Crha  - 3.9.4-1
-- Update to 3.9.4
-
-* Sat Jun 22 2013 Matthias Clasen  - 3.9.3-3
-- Don't install ChangeLog
-- Trim %%changelog
-
-* Fri Jun 21 2013 Kalev Lember  - 3.9.3-2
-- Rebuilt for libgweather 3.9.3 soname bump
-
-* Mon Jun 17 2013 Milan Crha  - 3.9.3-1
-- Update to 3.9.3
-
-* Mon May 27 2013 Milan Crha  - 3.9.2-1
-- Update to 3.9.2
-
-* Fri May 24 2013 Rex Dieter  3.9.1-2
-- rebuild (libical)
-
-* Mon Apr 29 2013 Milan Crha  - 3.9.1-1
-- Update to 3.9.1
-
-* Mon Mar 25 2013 Milan Crha  - 3.8.0-1
-- Update to 3.8.0
-
-* Mon Mar 18 2013 Milan Crha  - 3.7.92-1
-- Update to 3.7.92
-
-* Mon Mar 04 2013 Milan Crha  - 3.7.91-1
-- Update to 3.7.91
-
-* Wed Feb 20 2013 Kalev Lember  - 3.7.90-2
-- Rebuilt for libgnome-desktop soname bump
-
-* Mon Feb 18 2013 Milan Crha  - 3.7.90-1
-- Update to 3.7.90
-
-* Mon Feb 04 2013 Milan Crha  - 3.7.5-1
-- Update to 3.7.5
-
-* Fri Jan 18 2013 Milan Crha  - 3.7.4-1
-- Correct help-context patch test path (Red Had bug #901341)
-
-* Mon Jan 14 2013 Milan Crha  - 3.7.4-1
-- Update to 3.7.4
-- Add --add-missing to automake call
-
-* Tue Jan 01 2013 Matthew Barnes  - 3.7.3.2-3
-- Re-enable translation size reduction (RH bug #628073 is long fixed).
-
-* Thu Dec 20 2012 Kalev Lember  - 3.7.3.2-2
-- Rebuilt for libgnome-desktop3 3.7.3 soname bump
-
-* Wed Dec 19 2012 Matthew Barnes  - 3.7.3.2-1
-- Update to 3.7.3.2
-- Remove obsolete BuildRequires:
-    bison
-    dbus-glib-devel
-    libSM-devel
-    rarian-compat
-
-* Mon Nov 19 2012 Milan Crha  - 3.7.2-1
-- Update to 3.7.2
-
-* Fri Nov 09 2012 Matthew Barnes  - 3.7.1-2
-- Drop unique3-devel BR, it's an ancient artifact.
-
-* Mon Oct 22 2012 Milan Crha  - 3.7.1-1
-- Update to 3.7.1
-
-* Mon Sep 24 2012 Matthew Barnes  - 3.6.0-1
-- Update to 3.6.0
-- Remove patch for GNOME #678408 (fixed upstream).
-
-* Mon Sep 24 2012 Bastien Nocera  3.5.92-4
-- Use GStreamer 1.0 instead of 0.10
-
-* Sat Sep 22 2012 Adam Williamson  - 3.5.92-3
-- backport fix for BGO #678408 (broken message display)
-
-* Wed Sep 19 2012 Kalev Lember  - 3.5.92-2
-- Fix evolution-NetworkManager obsoletes
-
-* Mon Sep 17 2012 Milan Crha  - 3.5.92-1
-- Update to 3.5.92
-
-* Mon Sep 03 2012 Milan Crha  - 3.5.91-1
-- Update to 3.5.91
-
-* Mon Aug 20 2012 Milan Crha  - 3.5.90-1
-- Update to 3.5.90
-- Remove patches for BGO #678408 and #681321 (fixed upstream)
-- Add itstool and yelp-tools into BuildRequires
-
-* Wed Aug 15 2012 Adam Williamson  - 3.5.5-2
-- backport the fix for BGO #678408 and #681321 (libxml2 build)
-
-* Mon Aug 06 2012 Milan Crha  - 3.5.5-1
-- Update to 3.5.5
-
-* Thu Jul 19 2012 Fedora Release Engineering  - 3.5.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
-
-* Mon Jul 16 2012 Milan Crha  - 3.5.4-1
-- Update to 3.5.4
-- Enable weather plugin (fixed upstream)
-
-* Wed Jun 27 2012 Matthias Clasen  - 2.5.3.1-4
-- Temporarily disable weather plugin (not ported to new libgweather yet)
-
-* Tue Jun 26 2012 Matthew Barnes  - 2.5.3.1-3
-- Temporarily change e-d-s req in devel subpackage.
-
-* Tue Jun 26 2012 Matthew Barnes  - 3.5.3.1-2
-- Remove unnecessary Requires: evolution-data-server.
-
-* Mon Jun 25 2012 Matthew Barnes  - 3.5.3.1-1
-- Update to 3.5.3.1 (3.5.3, no build for you!)
-
-* Mon Jun 25 2012 Matthew Barnes  - 3.5.3-1
-- Update to 3.5.3
-- Drop BR: GConf2-devel  \o/
-
-* Fri Jun  8 2012 Matthias Clasen  - 3.5.2-2
-- Rebuild against new gnome-desktop
-
-* Mon Jun 04 2012 Milan Crha  - 3.5.2-1
-- Update to 3.5.2
-
-* Sun Apr 29 2012 Matthew Barnes  - 3.5.1-1
-- Update to 3.5.1
-- Add BR: webkitgtk3-devel
-
-* Tue Apr 24 2012 Kalev Lember  - 3.4.1-2
-- Silence rpm scriptlet output
-
-* Mon Apr 16 2012 Milan Crha  - 3.4.1-1
-- Update to 3.4.1
-
-* Tue Mar 27 2012 Milan Crha  - 3.4.0.1-1
-- Update to 3.4.0.1
-
-* Mon Mar 19 2012 Milan Crha  - 3.3.92-1
-- Update to 3.3.92
-
-* Tue Mar 06 2012 Milan Crha  - 3.3.91-1
-- Update to 3.3.91
-
-* Mon Feb 20 2012 Milan Crha  - 3.3.90-1
-- Update to 3.3.90
-
-* Mon Feb 06 2012 Milan Crha  - 3.3.5-1
-- Update to 3.3.5
-
-* Thu Jan 19 2012 Matthew Barnes  - 3.3.4-2
-- Keep all GSettings schema files in the main evolution package, even the
-  ones for the Bogofilter and Spamassassin subpackages, since we just have
-  one .convert file and missing schemas makes gsettings-data-convert crash.
-
-* Mon Jan 16 2012 Milan Crha  - 3.3.4-1
-- Update to 3.3.4
-
-* Fri Jan 13 2012 Fedora Release Engineering  - 3.3.3-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Mon Dec 19 2011 Milan Crha  - 3.3.3-1
-- Update to 3.3.3
-
-* Mon Nov 21 2011 Milan Crha  - 3.3.2-1
-- Update to 3.3.2
-- Remove patch to not call g_thread_init() (fixed upstream)
-
-* Fri Oct 28 2011 Matthew Barnes  - 3.3.1-2
-- Fix detection of evolution-help (not using OMF files anymore).
-
-* Mon Oct 24 2011 Milan Crha  - 3.3.1-1
-- Update to 3.3.1
-- Add patch to not call g_thread_init()
-
-* Mon Sep 26 2011 Milan Crha  - 3.2.0-1
-- Update to 3.2.0
-- Manage properly schemas files for evolution-bogofilter/spamassassin
-
-* Mon Sep 19 2011 Milan Crha  - 3.1.92-1
-- Update to 3.1.92
-
-* Mon Sep 05 2011 Milan Crha  - 3.1.91-1
-- Update to 3.1.91
-
-* Mon Aug 29 2011 Milan Crha  - 3.1.90-1
-- Update to 3.1.90
-
-* Mon Aug 15 2011 Milan Crha  - 3.1.5-1
-- Update to 3.1.5
-
-* Sat Jul 23 2011 Matthew Barnes  - 3.1.4-1
-- Update to 3.1.4
-
-* Mon Jul 04 2011 Matthew Barnes  - 3.1.3-1
-- Update to 3.1.3
-- Remove patch for building against libgdata-0.9.0 (fixed upstream).
-
-* Wed Jun 15 2011 Milan Crha  - 3.1.2-2
-- Rebuild against newer gnome-desktop3
-
-* Tue Jun 14 2011 Milan Crha  - 3.1.2-1
-- Update to 3.1.2
-- Add patch by Philip Withnall to build against libgdata-0.9.0
-- Add patch to enable GLib deprecated stuff (due to G_CONST_RETURN deprecation)
-
-* Tue May 17 2011 Milan Crha  - 3.1.1-3
-- Keep libevolution-mail-settings.so* from the previous change,
-  it is still used by other parts of evolution.
-
-* Mon May 09 2011 Matthew Barnes  - 3.1.1-2
-- Drop the "Email Settings" capplet.
-
-* Mon May 09 2011 Milan Crha  - 3.1.1-1
-- Update to 3.1.1
-- Drop groupwise plugin, as it was split out upstream
-
-* Mon Apr 04 2011 Milan Crha  - 3.0.0-1
-- Update to 3.0.0
-
-* Mon Mar 21 2011 Milan Crha  - 2.91.92-1
-- Update to 2.91.92
-
-* Mon Mar 14 2011 Matthew Barnes  - 2.91.91-3
-- Remove some unnecessary BuildRequires:
-  gtkimageview-devel: No release available for gtk3.
-  libgnomecanvas-devel: Evolution bundles its own libgnomecanvas now.
-
-* Fri Mar 11 2011 Matthew Barnes  - 2.91.91-2
-- Split off an evolution-NetworkManager subpackage containing the NM
-  integration module.  Users that choose to bypass NetworkManager can
-  uninstall this subpackage so Evolution doesn't insist it's offline.
-
-* Mon Mar 07 2011 Milan Crha  - 2.91.91-1
-- Update to 2.91.91
-
-* Mon Feb 21 2011 Milan Crha  - 2.91.90-1
-- Update to 2.91.90
-
-* Fri Feb 11 2011 Matthew Barnes  - 2.91.6.2-1
-- Update to 2.91.6.2
-- Fixes build breakage when using GTK+ 3.0.
-
-* Tue Feb 08 2011 Fedora Release Engineering  - 2.91.6.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Tue Feb 08 2011 Matthew Barnes  - 2.91.6.1-2
-- Evolution uses gtk3 now; re-enable libnotify.
-
-* Wed Feb  2 2011 Matthias Clasen  - 2.91.6.1-1
-- Update to 2.91.6.1
-
-* Mon Jan 31 2011 Milan Crha  - 2.91.6-1
-- Update to 2.91.6
-- Require gtk3
-- Remove patch for Red Hat bug #657254 (fixed upstream)
-
-* Fri Jan 21 2011 Dan Williams  - 2.91.5-4
-- Fix crash at shutdown by finishing tasks before cleaning up (rh #657254)
-
-* Tue Jan 18 2011 Matthias Clasen  - 2.91.5-3
-- Rebuild against newer libgdata
-
-* Thu Jan 13 2011 Matthias Clasen  - 2.91.5-2
-- Drop gnome-themes dependency
-
-* Mon Jan 10 2011 Milan Crha  - 2.91.5-1
-- Update to 2.91.5
-
-* Mon Dec 20 2010 Milan Crha  - 2.91.4-1
-- Update to 2.91.4
-
-* Mon Nov 29 2010 Milan Crha  - 2.91.3-1
-- Update to 2.91.3
-- Remove patch for Red Hat bug #176400 (fixed upstream)
-
-* Mon Nov 08 2010 Milan Crha  - 2.91.2-1
-- Update to 2.91.2
-
-* Fri Nov 05 2010 Milan Crha  - 2.91.1-3
-- Rebuild against newer libxml2
-- Disable libnotify, it's gtk3 only, but evolution is not
-
-* Wed Nov  3 2010 Matthias Clasen  - 2.91.1-2
-- Rebuild against new libnotify
-
-* Mon Oct 18 2010 Milan Crha  - 2.91.1-1
-- Update to 2.91.1
-
-* Mon Oct 11 2010 Milan Crha  - 2.91.0-1
-- Update to 2.91.0
-- Remove patch for Gnome bug #626066 (fixed upstream)
-
-* Wed Sep 29 2010 jkeating - 2.31.92-3
-- Rebuilt for gcc bug 634757
-
-* Tue Sep 14 2010 Milan Crha  - 2.31.92-2.fc15
-- Add patch for Gnome bug #626066 (login to NSS on demand)
-
-* Mon Sep 13 2010 Milan Crha  - 2.31.92-1.fc15
-- Update to 2.31.92
-
-* Mon Aug 30 2010 Milan Crha  - 2.31.91-1.fc14
-- Update to 2.31.91
-- Remove msgmerge calls due to a floating point exception there
-
-* Mon Aug 16 2010 Matthew Barnes  - 2.31.90-1.fc14
-- Update to 2.31.90
-
-* Fri Aug 06 2010 Matthew Barnes  - 2.31.6-2.fc14
-- Fix handling of migrated signature files.
-
-* Tue Aug 03 2010 Matthew Barnes  - 2.31.6-1.fc14
-- Update to 2.31.6
-- Drop dbus-glib requirement.
-- Bump glib2 requirement to 2.25.12.
-- Roll back evo_base_version to 2.32.
-- Add clutter-gtk requirement (for express mode).
-- Remove gtk-compat macro patch (fixed upstream).
-
-* Thu Jul 22 2010 Matthew Barnes  - 2.31.5-2.fc14
-- Add patch to fix startup crash in gtk-compat macros.
-
-* Tue Jul 13 2010 Milan Crha  - 2.31.5-1.fc14
-- Update to 2.31.5
-- Remove 'conduit' (removed upstream)
-
-* Mon Jun 07 2010 Milan Crha  - 2.31.3-1.fc14
-- Update to 2.31.3
-
-* Fri May 28 2010 Matthew Barnes  - 2.31.2-2.fc14
-- Evolution Express supercedes Anjal.
-- No need to undefine GNOME_DISABLE_DEPRECATED.
-- Remove nntp_support flag; that got moved to E-D-S ages ago.
-- Remove exchange_support flag; it's all in evolution-exchange now.
-
-* Mon May 24 2010 Milan Crha  - 2.31.2-1.fc14
-- Update to 2.31.2
-- Bump gtkhtml3 requirement to 3.31.2
-
-* Fri May 07 2010 Matthew Barnes  - 2.31.1-2.fc14
-- Require yelp in evolution-help (RH bug #589555).
-- Add patch for RH bug #589555 (hide Help->Contents if evolution-help
-  is not installed).
-
-* Mon May 03 2010 Milan Crha  - 2.31.1-1.fc14
-- Update to 2.31.1
-
-* Tue Feb 09 2010 Milan Crha  - 2.29.90-2.fc13
-- Rebuild against evolution-data-server-2.29.90-3
-
-* Mon Feb 08 2010 Milan Crha  - 2.29.90-1.fc13
-- Update to 2.29.90
-- Removed unneeded BuildRequires.
-
-* Fri Jan 29 2010 Matthew Barnes  - 2.29.6-2.fc13
-- Bump gtkhtml3 requirement to 3.29.6.
-
-* Mon Jan 25 2010 Milan Crha  - 2.29.6-1.fc13
-- Update to 2.29.6
-- Remove patch for Gnome bug #606874 (fixed upstream).
-- Add rarian-compat to BuildRequires for Scrollkeeper.
-
-* Mon Jan 18 2010 Matthias Clasen  - 2.29.5-2.fc13
-- Rebuild against new gnome-desktop
-
-* Tue Jan 12 2010 Milan Crha  - 2.29.5-1.fc13
-- Update to 2.29.5
-- Add patch for Gnome bug #606874 (mktemp removed in glibc-2.11.90-8)
-
-* Tue Dec 22 2009 Matthew Barnes  - 2.29.4-2.fc13
-- Update Scrollkeeper and Icon Cache scriptlets to conform to guidelines.
-  (see: http://fedoraproject.org/wiki/Packaging:ScriptletSnippets)
-
-* Mon Dec 21 2009 Milan Crha  - 2.29.4-1.fc13
-- Update to 2.29.4
-- Remove patch for missing m4 files from tarball (fixed upstream).
-
-* Mon Nov 30 2009 Milan Crha  - 2.29.3-1.fc13
-- Update to 2.29.3
-- Add patch for missing m4 files from tarball.
-- Disable autoreconf call.
-
-* Tue Nov 17 2009 Matthew Barnes  - 2.29.2-1.fc13
-- Update to 2.29.2
-- Synchronize spec file with my kill-bonobo test package.
-
-* Tue Oct 27 2009 Matthew Barnes  - 2.29.1-1.fc13
-- Update to 2.29.1
-- Bump evo_major to 2.30.
-- Drop Bonobo + ORBit dependency (yay!).
-- Remove option to use OpenSSL instead of NSS.
-- Uninstall GConf schemas during %%pre and %%preun.
-
-* Mon Sep 21 2009 Milan Crha  - 2.28.0-1.fc12
-- Update to 2.28.0
-
-* Mon Sep 07 2009 Milan Crha  - 2.27.92-1.fc12
-- Update to 2.27.92
-
-* Mon Aug 24 2009 Milan Crha  - 2.27.91-1.fc12
-- Update to 2.27.91
-- Remove patch for GNOME bug #591414 (fixed upstream).
-
-* Fri Aug 14 2009 Matthew Barnes  - 2.27.90-3.fc12
-- Add patch for GNOME bug #591414 (calendar library linked as module).
-
-* Tue Aug 11 2009 Milan Crha  - 2.27.90-2.fc12
-- Build requires gnome-desktop-devel >= 2.26
-- New library libevolution-cal-shared.so
-
-* Mon Aug 10 2009 Milan Crha  - 2.27.90-1.fc12
-- Update to 2.27.90
-
-* Tue Jul 28 2009 Milan Crha  - 2.27.5-3.fc12
-- Enable pst-import plugin (RH bug #493049)
-
-* Tue Jul 28 2009 Matthew Barnes  - 2.27.5-2.fc12
-- Move libeconduit.so into the conduits subpackage to see if that
-  untangles us from gnome-pilot.
-
-* Mon Jul 27 2009 Milan Crha  - 2.27.5-1.fc12
-- Update to 2.27.5
-- Remove pst import plugin patch (fixed upstream).
-- Remove work around deprecation of g_mount_unmount (fixed upstream).
-
-* Fri Jul 24 2009 Fedora Release Engineering  - 2.27.4-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Mon Jul 13 2009 Matthew Barnes  - 2.27.4-1.fc12
-- Update to 2.27.4
-- Work around deprecation of g_mount_unmount().
-
-* Fri Jul 10 2009 Matthew Barnes  - 2.27.3-5.fc11
-- Add an evolution-pst subpackage for the PST importer plugin.
-- Disabled until libpst settles on an API.
-
-* Thu Jul 02 2009 Matthew Barnes  - 2.27.3-4.fc12
-- Add BR for libpst-devel and libytnef-devel (RH bug #493049).
-- Add patch to build pst-import plugin against current libpst.
-- libpst's API broke again so disable the BR's for now.
-- Specify the gettext package when calling intltool-update.
-
-* Wed Jul 01 2009 Milan Crha  - 2.27.3-3.fc12
-- Rebuild against newer gcc
-
-* Tue Jun 23 2009 Matthew Barnes  - 2.27.3-2.fc12
-- Add patch to allow Anjal to build.
-
-* Mon Jun 15 2009 Matthew Barnes  - 2.27.3-1.fc12
-- Update to 2.27.3
-
-* Sun Jun 14 2009 Matthias Clasen  - 2.27.2-2.fc12
-- Don't make -perl own directories that are already owned by the base package
-
-* Fri May 29 2009 Matthew Barnes  - 2.27.2-1.fc12
-- Update to 2.27.2
-- Patch broken libevolution-mail-shared library.
-- Remove strict_build_settings since the settings are used upstream now.
-
-* Mon May 04 2009 Matthew Barnes  - 2.27.1-1.fc12
-- Update to 2.27.1
-- Bump evo_major to 2.28.
-- Temporarily disable EDS_DISABLE_DEPRECATED due to GNOME bug #569652.
-
-* Mon Apr 27 2009 Matthias Clasen  - 2.26.1-2.fc11
-- Don't drop schemas translations from po files
-
-* Wed Apr 15 2009 Matthew Barnes  - 2.26.1.1-1.fc11
-- Update to 2.26.1.1
-- Remove patch for GNOME bug #578685 (fixed upstream).
-
-* Tue Apr 14 2009 Matthew Barnes  - 2.26.1-2.fc11
-- Add patch for GNOME bug #578685 (attachment bar crasher).
-
-* Mon Apr 13 2009 Matthew Barnes  - 2.26.1-1.fc11
-- Update to 2.26.1
-
-* Fri Apr 10 2009 Matthias Clasen  - 2.26.0-3.fc11
-- Fix directory ownership
-
-* Thu Apr 02 2009 Matthew Barnes  - 2.26.0-2.fc11
-- Require libpst.
-
-* Mon Mar 16 2009 Matthew Barnes  - 2.26.0-1.fc11
-- Update to 2.26.0
-
-* Mon Mar 02 2009 Matthew Barnes  - 2.25.92-1.fc11
-- Update to 2.25.92
-
-* Tue Feb 24 2009 Fedora Release Engineering  - 2.25.91-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Sun Feb 22 2009 Matthias Clasen  - 2.25.91-2.fc11
-- Actually make the help subpackage noarch
-
-* Mon Feb 16 2009 Matthew Barnes  - 2.25.91-1.fc11
-- Update to 2.25.91
-
-* Sat Feb 14 2009 Matthias Clasen  - 2.25.90-3.fc11
-- Make the help subpackage noarch
-
-* Fri Feb 06 2009 Matthew Barnes  - 2.25.90-2.fc11
-- Update BuildRoot, License, Source and URL tags.
-- Require gnome-common so we don't have to patch it out.
-
-* Mon Feb 02 2009 Matthew Barnes  - 2.25.90-1.fc11
-- Update to 2.25.90
-
-* Mon Jan 19 2009 Matthew Barnes  - 2.25.5-1.fc11
-- Update to 2.25.5
-- Ditch eds_version and use our own version.  This will keep evolution
-  and evolution-data-server versions in lockstep from now on.
-
-* Mon Jan 05 2009 Matthew Barnes  - 2.25.4-1.fc11
-- Update to 2.25.4
-- Bump eds_version to 2.25.4.
-- Bump libgweather_version to 2.25.4.
-
-* Mon Dec 15 2008 Matthew Barnes  - 2.25.3.1-1.fc11
-- Update to 2.25.3.1
-- New BR: libgweather-devel
-- Remove patch for GNOME bug #552583 (fixed upstream).
-- Bump the gtkhtml and gtk2 minimum versions.
-
-* Tue Dec 09 2008 Matthew Barnes  - 2.25.2-2.fc11
-- Add patch for GNOME bug #552583 (fix account URI comparisons).
-
-* Mon Dec 01 2008 Matthew Barnes  - 2.25.2-1.fc11
-- Update to 2.25.2
-- Bump eds_version to 2.25.2.
-
-* Thu Nov 20 2008 Matthew Barnes  - 2.25.1-2.fc11
-- Fix a typo (RH bug #472358).
-
-* Mon Nov 03 2008 Matthew Barnes  - 2.25.1-1.fc11
-- Update to 2.25.1
-- Bump evo_major to 2.26.
-- Bump eds_version to 2.25.1.
-
-* Tue Oct 21 2008 Matthew Barnes  - 2.24.1-2.fc10
-- Bump eds_version to 2.24.1 (unfortunately).
-
-* Tue Oct 21 2008 Matthew Barnes  - 2.24.1-1.fc10
-- Update to 2.24.1
-
-* Wed Oct  8 2008 Matthias Clasen   - 2.24.0-3
-- Save space in the -help package by not shipping multiple copies
-  of each screenshot
-
-* Thu Sep 25 2008 Matthew Barnes  - 2.24.0-2.fc10
-- Strip unneeded translations from .mo files (RH bug #463887).
-- Split Perl-based utilities into a "perl" subpackage (RH bug #462345).
-
-* Mon Sep 22 2008 Matthew Barnes  - 2.24.0-1.fc10
-- Update to 2.24.0
-
-* Mon Sep 08 2008 Matthew Barnes  - 2.23.92-1.fc10
-- Update to 2.23.92
-
-* Mon Sep 01 2008 Matthew Barnes  - 2.23.91-1.fc10
-- Update to 2.23.91
-- Bump eds_version to 2.23.91
-
-* Mon Aug 25 2008 Matthew Barnes  - 2.23.90-2.fc10
-- Bump gtkhtml_version to 3.23.5 (RH bug #460076).
-
-* Wed Aug 20 2008 Matthew Barnes  - 2.23.90-1.fc10
-- Update to 2.23.90
-- Bump eds_version to 2.23.90.1
-
-* Mon Aug 04 2008 Matthew Barnes  - 2.23.6-1.fc10
-- Update to 2.23.6
-
-* Tue Jul 22 2008 Matthew Barnes  - 2.23.5-1.fc10
-- Update to 2.23.5
-- Bump eds_version to 2.23.5.
-
-* Fri Jul 18 2008 Tom "spot" Callaway  - 2.23.4-3.fc10
-- fix license tag
-- fix patches to apply with fuzz=0
-
-* Thu Jun 19 2008 Matthew Barnes  - 2.23.4-2.fc10
-- Don't ship the unfinished "Custom Header" plugin.
-
-* Mon Jun 16 2008 Matthew Barnes  - 2.23.4-1.fc10
-- Update to 2.23.4
-- Remove patches for RH bug #449925 (fixed upstream).
-
-* Fri Jun 06 2008 Matthew Barnes  - 2.23.3.1-4.fc10
-- Use a less pretentious summary.
-
-* Fri Jun 06 2008 Matthew Barnes  - 2.23.3.1-3.fc10
-- Remove the gnome-spell requirement.
-
-* Wed Jun 04 2008 Matthew Barnes  - 2.23.3.1-2.fc10
-- Add patches for RH bug #449925 (buffer overflow vulnerabilities).
-
-* Mon Jun 02 2008 Matthew Barnes  - 2.23.3.1-1.fc10
-- Update to 2.23.3.1
-- Bump eds_version to 2.23.3.
-
-* Mon May 12 2008 Matthew Barnes  - 2.23.2-1.fc10
-- Update to 2.23.2
-- Remove enchant-devel requirement.
-- Remove patch for RH bug #437208 (fixed upstream).
-
-* Mon Apr 28 2008 Matthew Barnes  - 2.23.1-2.fc10
-- Explicitly require enchant-devel, even though I shouldn't need to.
-
-* Mon Apr 21 2008 Matthew Barnes  - 2.23.1-1.fc10
-- Update to 2.23.1
-- Bump evo_major to 2.22.
-- Bump eds_version to 2.23.1.
-- Bump glib2_version to 2.16.0.
-- Bump gtkhtml_version to 3.19.1.
-- Add gvfs requirement.
-- Drop gnomevfs2 requirement.
-- Remove patch for RH bug #164957 (obsolete).
-
-* Mon Apr 07 2008 Matthew Barnes  - 2.22.1-1.fc9
-- Update to 2.22.1
-- Remove patch for GNOME bug #524310 (fixed upstream).
-
-* Tue Mar 25 2008 Dan Williams  - 2.22.0-4.fc9
-- Add patch for GNOME bug #524310
-
-* Fri Mar 14 2008 Matthew Barnes  - 2.22.0-3.fc9
-- Explicit require evolution-data-server since its shared object names
-  still can't be trusted (RH bug #426511).
-
-* Fri Mar 14 2008 Matthew Barnes  - 2.22.0-2.fc9
-- Add patch for RH bug #437208 (tracking network status).
-
-* Mon Mar 10 2008 Matthew Barnes  - 2.22.0-1.fc9
-- Update to 2.22.0
-- Remove patch for CVE-2008-0072 (fixed upstream).
-
-* Tue Mar 04 2008 Matthew Barnes  - 2.21.92-2.fc9
-- Add patch for CVE-2008-0072 (format string vulnerability).
-
-* Mon Feb 25 2008 Matthew Barnes  - 2.21.92-1.fc9
-- Update to 2.21.92
-- Bump eds_version to 2.21.92.
-
-* Wed Feb 13 2008 Matthew Barnes  - 2.21.91-2.fc9
-- Rebuild against libsoup 2.3.2.
-
-* Mon Feb 11 2008 Matthew Barnes  - 2.21.91-1.fc9
-- Update to 2.21.91
-- Bump eds_version to 2.21.91.
-- Remove patch for GNOME bug #240073 (fixed upstream).
-
-* Sat Feb 02 2008 Matthew Barnes  - 2.21.90-4.fc9
-- Remove some obsolete configure options:
-  --enable-file-chooser, --enable-file-locking, --enable-dot-locking
-- Remove gnome-doc-utils work-around for GNOME bug #427939 (fixed upstream).
-- Remove patch for RH bug #215478 (fixed upstream).
-
-* Tue Jan 29 2008 Matthew Barnes  - 2.21.90-3.fc9
-- Add patch to address the recent deprecation of G_GNUC_FUNCTION.
-
-* Tue Jan 29 2008 Matthew Barnes  - 2.21.90-2.fc9
-- Add patch for GNOME bug #240073 (don't strikeout Click to Add in tasks).
-
-* Mon Jan 28 2008 Matthew Barnes  - 2.21.90-1.fc9
-- Update to 2.21.90
-- Update build requirements.
-- Remove patch for GNOME #363695 (obsolete/problematic).
-- Remove patch for GNOME #509741 (fixed upstream).
-
-* Tue Jan 15 2008 Matthew Barnes  - 2.21.5-2.fc9
-- Add patch for GNOME bug #509741 (crash on startup).
-
-* Mon Jan 14 2008 Matthew Barnes  - 2.21.5-1.fc9
-- Update to 2.21.5
-- The backup-restore plugin is stable again.
-- Remove patch for RH bug #154360 (fixed upstream).
-- Remove patch for RH bug #166231 (obsolete, possibly fixed upstream).
-- Remove patch for RH bug #178295 (fixed upstream).
-- Remove patch for GNOME bug #362638 (fixed upstream).
-- Remove patch for GNOME bug #504030 (fixed upstream).
-- Remove patch for GNOME bug #507311 (fixed upstream).
-
-* Sat Jan 05 2008 Matthew Barnes  - 2.21.4-2.fc9
-- Add patch for GNOME bug #507311 (send Bug Buddy reports to the new
-  BugBuddyBugs Bugzilla component).
-
-* Mon Dec 17 2007 Matthew Barnes  - 2.21.4-1.fc9
-- Update to 2.21.4
-- Expunge unused patches.
-- Bump eds_version to 2.21.4 for new Camel functions.
-
-* Mon Dec 10 2007 Matthew Barnes  - 2.21.3-4.fc9
-- Split junk filtering plugins into evolution-bogofilter and
-  evolution-spamassassin subpackages, each of which requires the
-  necessary backend packages.  (RH bug #377381)
-
-* Wed Dec 05 2007 Matthew Barnes  - 2.21.3-3.fc9
-- Bump eds_version to 2.21.3 and gtkhtml_version to 3.17.3.
-
-* Tue Dec  4 2007 Matthias Clasen  - 2.21.3-2
-- Rebuild against new openssl
-
-* Mon Dec 03 2007 Matthew Barnes  - 2.21.3-1.fc9
-- Update to 2.21.3
-- Remove patch for RH bug #215467 (fixed upstream).
-- Remove patch for GNOME bug #499920 (fixed upstream).
-
-* Sat Dec 01 2007 Matthew Barnes  - 2.21.2-4.fc9
-- Fix a corrupted patch that caused GNOME bug #499291.
-
-* Thu Nov 29 2007 Matthew Barnes  - 2.21.2-3.fc9
-- Add patch for GNOME bug #499920 (invalid #include).
-
-* Fri Nov 23 2007 Matthew Barnes  - 2.21.2-2.fc9
-- Rebuild against newer libpisync.so.
-
-* Mon Nov 12 2007 Matthew Barnes  - 2.21.2-1.fc9
-- Update to 2.21.2
-
-* Tue Oct 30 2007 Matthew Barnes  - 2.21.1-2.fc9
-- Attempt to split the gnome-pilot stuff into a separate
-  evolution-conduits subpackage (RH bug #178155).
-
-* Mon Oct 29 2007 Matthew Barnes  - 2.21.1-1.fc9
-- Update to 2.21.1
-- Remove redundant requirements.
-- Bump EDS requirement to 2.21.1.
-- Bump gtkhtml requirement to 3.17.1.
-- Backup/restore plugin got moved from standard to experimental.
-- Revert the per-component menu items (RH bug #222105, #241462, #293771).
-- Show the switcher buttons by default (RH bug #186403).
-- Alter the desktop file Name and Comment.
-- Disable patch for GNOME bug #376991 for now.  It may be contributing
-  to password prompting problems as described in RH bug #296671.
-- Remove patch for GNOME bug #417999 (fixed upstream).
-- Remove patch for GNOME bug #476040 (fixed upstream).
-- Remove patch for GNOME bug #477045 (fixed upstream).
-
-* Mon Oct 15 2007 Matthew Barnes  - 2.12.1-2.fc8
-- Fix a broken zoom icon.
-
-* Mon Oct 15 2007 Milan Crha  - 2.12.1-1.fc8
-- Update to 2.12.1
-- Add files for the new backup-restore plugin.
-
-* Tue Oct 09 2007 Matthew Barnes  - 2.12.0-7.fc8
-- Revise patch for GNOME bug #477045 (more icon tweaks).
-
-* Fri Oct 05 2007 Matthew Barnes  - 2.12.0-6.fc8
-- Require libbonobo >= 2.16.0 (RH bug #213823).
-
-* Thu Oct 04 2007 Matthew Barnes  - 2.12.0-5.fc8
-- Require gnome-themes (RH bug #235617).
-
-* Wed Oct 03 2007 Matthew Barnes  - 2.12.0-4.fc8
-- Revise patch for GNOME bug #477045 (run-time warnings when composing mail).
-
-* Wed Sep 19 2007 Matthew Barnes  - 2.12.0-3.fc8
-- Re-enable the inline audio plugin since it now uses GStreamer 0.10.
-
-* Wed Sep 19 2007 Matthew Barnes  - 2.12.0-2.fc8
-- Revise patch for GNOME bug #477045 (less-zealous icon renaming).
-
-* Mon Sep 17 2007 Matthew Barnes  - 2.12.0-1.fc8
-- Update to 2.12.0
-- Remove patch for RH bug #182247 (fixed upstream).
-
-* Sat Sep 15 2007 Matthew Barnes  - 2.11.92-4.fc8
-- Add patch for GNOME bug #477045 (use standard icon names).
-
-* Tue Sep 11 2007 Matthew Barnes  - 2.11.92-3.fc8
-- Add patch for GNOME bug #476040 (fix attachment icon).
-
-* Sat Sep  8 2007 Matthias Clasen  - 2.11.92-2.fc8
-- Split off an evolution-help package
-
-* Mon Sep 03 2007 Matthew Barnes  - 2.11.92-1.fc8
-- Update to 2.11.92
-
-* Wed Aug 29 2007 Matthew Barnes  - 2.11.91-3.fc8
-- Revise patch for GNOME bug #362638 to fix GNOME bug #357175
-  (Evolution fails to close after IMAP alert has been displayed).
-
-* Tue Aug 28 2007 Matthew Barnes  - 2.11.91-2.fc8
-- Fix compilation breakage caused by our strict build settings.
-
-* Tue Aug 28 2007 Milan Crha  - 2.11.91-1.fc8
-- Update to 2.11.91
-- Removed patch for RH bug #157400 / GNOME bug #303877 (fixed upstream).
-- Removed patch for RH bug #157505 / GNOME bug #303878 (fixed upstream).
-- Removed patch for RH bug #161885 / GNOME bug #309166 (fixed upstream).
-- Removed patch for RH bug #202751 / GNOME bug #355766 (fixed upstream).
-- Removed patch for RH bug #218898 / GNOME bug #385414 (fixed upstream).
-- Removed patch for RH bug #253348 / GNOME bug #467883 (fixed upstream).
-
-* Thu Aug 23 2007 Matthew Barnes  - 2.11.90-4.fc8
-- Obsolete the evolution-bogofilter package.
-
-* Mon Aug 20 2007 Matthew Barnes  - 2.11.90-3.fc8
-- Revise patch for GNOME bug #417999 to fix GNOME bug #447591
-  (Automatic Contacts combo boxes don't work).
-
-* Sat Aug 18 2007 Matthew Barnes  - 2.11.90-2.fc8
-- Add patch for RH bug #253348 (crash on startup).
-
-* Wed Aug 15 2007 Matthew Barnes  - 2.11.90-1.fc8
-- Update to 2.11.90
-
-* Wed Aug  8 2007 Matthias Clasen  - 2.11.6.1-2
-- Update the license field
-- Use %%find_lang for help files
-
-* Wed Aug 01 2007 Matthew Barnes  - 2.11.6.1-1.fc8
-- Update to 2.11.6.1
-
-* Tue Jul 31 2007 Matthew Barnes  - 2.11.6-1.fc8
-- Update to 2.11.6
-- Remove patch for GNOME bug #380534 (fixed upstream).
-
-* Fri Jul 27 2007 Matthew Barnes  - 2.11.5-3.fc8
-- Add patch for GNOME bug #380534 (clarify version requirements).
-
-* Mon Jul 16 2007 Matthew Barnes  - 2.11.5-2.fc8
-- Remove spamassassin requirement since it's optional.
-
-* 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 #363638 to fix RH bug #245289 (frequent hangs).
-
-* Mon Jun 18 2007 Matthew Barnes  - 2.11.4-1.fc8
-- Update to 2.11.4
-- Remove patch for GNOME bug #447727 (fixed upstream).
-
-* Thu Jun 14 2007 Matthew Barnes  - 2.11.3-5.fc8
-- Add patch for GNOME bug #447727 (remove EClippedLabel).
-
-* Wed Jun 06 2007 Matthew Barnes  - 2.11.3-4.fc8
-- Revise patch for GNOME bug #362638 to fix RH bug #240507 (hang on exit).
-
-* Wed Jun 06 2007 Matthew Barnes  - 2.11.3-3.fc8
-- Remove some debug messages that accidentally slipped in.
-
-* Tue Jun 05 2007 Matthew Barnes  - 2.11.3-2.fc8
-- Fix an invalid g_free() that was causing lock-ups.
-
-* Mon Jun 04 2007 Matthew Barnes  - 2.11.3-1.fc8
-- Update to 2.11.3
-- Evolution no longer has versioned file names.
-- Remove patch for RH bug #202289 (fixed upstream).
-- Remove patch for RH bug #235878 (fixed upstream).
-- Remove patch for RH bug #238155 (fixed upstream).
-- Remove patch for RH bug #240147 (fixed upstream).
-
-* Thu May 31 2007 Matthew Barnes  - 2.11.2-2.fc8
-- Evolution no longer requires libgnomeprint[ui].
-
-* Fri May 18 2007 Matthew Barnes  - 2.11.2-1.fc8
-- Update to 2.11.2
-- Bump evo_major to 2.12.
-- Bump eds_version to 1.11.0.
-- Update files with new plugins and icons.
-- Remove patch for RH bug #190359 (fixed upstream).
-- Remove patch for RH bug #218801 (fixed upstream).
-- Remove patch for RH bug #234315 (fixed upstream).
-- Remove patch for RH bug #236399 (fixed upstream).
-- Remove patch for RH bug #236860 (fixed upstream).
-- Remove patch for RH bug #238551 (fixed upstream).
-- Remove patch for GNOME bug #373837 (fixed upstream).
-- Remove patch for GNOME bug #373116 (fixed upstream).
-- Remove patch for GNOME bug #418971 (fixed upstream).
-- Remove patch for GNOME bug #419469 (fixed upstream).
-- Remove patch for GNOME bug #419524 (fixed upstream).
-- Remove evolution-2.6.0-prototypes.patch (obsolete).
-
-* Wed May 16 2007 Matthew Barnes  - 2.10.1-17.fc7
-- Revise patch for GNOME bug #362638 to fix RH bug #237206
-  (certificate prompt causes crash, again).
-
-* Tue May 15 2007 Matthew Barnes  - 2.10.1-16.fc7
-- Add patch for RH bug #240147 (Send/Receive dialog layout).
-
-* Mon May 14 2007 Matthew Barnes  - 2.10.1-15.fc7
-- Revise patch for RH bug #236860 to match upstream's solution.
-
-* Mon May 14 2007 Matthew Barnes  - 2.10.1-14.fc7
-- Revise patch for RH bug #238155 (crash on startup).
-
-* Mon May 07 2007 Matthew Barnes  - 2.10.1-13.fc7
-- Add patch for RH bug #238155 (crash on startup).
-
-* Tue May 01 2007 Matthew Barnes  - 2.10.1-12.fc7
-- Add patch for RH bug #238551 (incorrect attachment count).
-
-* Tue May 01 2007 Matthew Barnes  - 2.10.1-10.fc7
-- Revise patch for GNOME bug #363695 to fix RH bug #238497
-  (crash sorting "To" column).
-
-* Mon Apr 30 2007 Matthew Barnes  - 2.10.1-9.fc7
-- Revise some patches so that we don't have to run autoreconf.
-- Remove patch for GNOME bug #427939 (use a different work-around).
-
-* Fri Apr 27 2007 Matthew Barnes  - 2.10.1-8.fc7
-- Add patch for RH bug #236399 (en_CA attribution format).
-
-* Mon Apr 23 2007 Matthew Barnes  - 2.10.1-7.fc7
-- Remove the welcome email from evolution@novell.com (bug #179427).
-
-* Sun Apr 22 2007 Matthew Barnes  - 2.10.1-6.fc7
-- Add patch for RH bug #236860 (launching from clock applet).
-
-* Sat Apr 21 2007 Matthias Clasen  - 2.10.1-5
-- Don't install INSTALL
-
-* Sat Apr 14 2007 Matthew Barnes  - 2.10.1-4.fc7
-- Add patch for RH bug #234315 (fix saving attachments).
-
-* Fri Apr 13 2007 Matthew Barnes  - 2.10.1-3.fc7
-- Add patch for RH bug #235878 (make Help->Contents work again).
-
-* Tue Apr 10 2007 Matthew Barnes  - 2.10.1-2.fc7
-- Revise patch for GNOME bug #362638 to fix RH bug #235096
-  (crash when displaying a mail server message to user).
-
-* Mon Apr 09 2007 Matthew Barnes  - 2.10.1-1.fc7
-- Update to 2.10.1
-- Fix buggy gnome-doc-utils.make (GNOME bug #427939).
-- Remove patch for CVE-2007-1002 (fixed upstream).
-- Remove patch for RH bug #231767 (fixed upstream).
-- Remove patch for RH bug #235056 (fixed upstream).
-- Remove patch for GNOME bug #352713 (fixed upstream).
-
-* Wed Apr 04 2007 Matthew Barnes  - 2.10.0-10.fc7
-- Add patch for GNOME bug #352713 (improve folder tree updates).
-
-* Tue Apr 03 2007 Matthew Barnes  - 2.10.0-9.fc7
-- Require libxml2-devel in evolution-devel package (RH bug #235056).
-- Add libxml-2.0 requirement to evolution-plugin-2.10.pc.
-
-* Tue Apr 03 2007 Matthew Barnes  - 2.10.0-8.fc7
-- Revise patch for GNOME bug #419524 to fix RH bug #235082
-  (crash in initial account setup wizard).
-
-* Mon Apr 02 2007 Matthew Barnes  - 2.10.0-7.fc7
-- Add patch for RH bug #231767 (allow mail-notification to build).
-
-* Fri Mar 30 2007 Matthew Barnes  - 2.10.0-6.fc7
-- Revise patch for GNOME bug #362638 (deprecate EThread).
-
-* Thu Mar 29 2007 Matthew Barnes  - 2.10.0-5.fc7
-- CVE-2007-1002 (Shared memo categories format string vulnerability)
-- Add -Wdeclaration-after-statement to strict build settings.
-
-* Mon Mar 26 2007 Matthew Barnes  - 2.10.0-4.fc7
-- Run gtk-update-icon-cache in %%post and %%postun (RH bug #234018).
-
-* Sat Mar 17 2007 Matthew Barnes  - 2.10.0-3.fc7
-- Add flag to disable deprecated Camel symbols.
-- Add patch for GNOME bug #419469 (refactor shell/main.c).
-- Add patch for GNOME bug #419524 (use GLib's i18n macros).
-- Add patch for GNOME bug #418971 (drop support for GLib < 2.8).
-
-* Wed Mar 14 2007 Matthew Barnes  - 2.10.0-2.fc7
-- Add patch for GNOME bug #417999 (use ESourceComboBox).
-
-* Mon Mar 12 2007 Matthew Barnes  - 2.10.0-1.fc7
-- Update to 2.10.0.
-- Add patch for GNOME bug #376991 (refactor password handling).
-
-* Mon Feb 26 2007 Matthew Barnes  - 2.9.92-1.fc7
-- Update to 2.9.92.
-- Require gtkhtml3 >= 3.13.92.
-- Add missing libgnomeprintui22 requirements.
-- Remove patch for GNOME bug #350253 (fixed upstream).
-- Remove patch for GNOME bug #356177 (fixed upstream).
-- Remove patch for GNOME bug #360946 (fixed upstream).
-- Remove evolution-2.5.4-move-autosave-file.patch (fixed upstream).
-- Add minimum version to intltool requirement (currently >= 0.35.5).
-
-* Thu Feb 15 2007 Matthew Barnes  - 2.9.91-3.fc7
-- Revise patch for GNOME bug #362638 to fix RH bug #220714
-  (certificate prompt causes crash).
-
-* Tue Feb 13 2007 Matthew Barnes  - 2.9.91-2.fc7
-- Require GConf2 in post.
-- Require scrollkeeper in post and postun.
-
-* Mon Feb 12 2007 Matthew Barnes  - 2.9.91-1.fc7
-- Update to 2.9.91
-- Require gtkhtml3 >= 3.13.6.
-- Add files for new imap-features plugin.
-- Add flag to disable deprecated Pango symbols.
-- Remove patch for GNOME bug #357216 (fixed upstream).
-- Remove patch for GNOME bug #359979 (fixed upstream).
-
-* Fri Jan 26 2007 Matthew Barnes  - 2.9.5-4.fc7
-- Compile with the -fno-strict-aliasing flag, which will hopefully improve
-  reliability until the illegal type-punning is fixed (RH bug #224552).
-
-* Sun Jan 21 2007 Matthew Barnes  - 2.9.5-3.fc7
-- Revise evolution-2.7.1-no-gnome-common.patch so that we no longer
-  have to run autoconf before building.
-- Revise evolution-2.5.4-fix-conduit-dir.patch so that we no longer
-  have to run automake before building.
-
-* Wed Jan 10 2007 Matthew Barnes  - 2.9.5-2.fc7
-- Add patch for GNOME bug #359979 (change EMsgPort semantics).
-
-* Mon Jan 08 2007 Matthew Barnes  - 2.9.5-1.fc7
-- Update to 2.9.5
-- Remove pilot-link-0.12 patch (fixed upstream).
-- Remove patch for RH bug #215466 and #218589 (fixed upstream).
-- Remove patch for RH bug #215695 (fixed upstream).
-
-* Sat Dec 30 2006 Matthew Barnes  - 2.9.4-4.fc7
-- Add Requires evolution-data-server-devel to devel subpackage
-  (RH bug #218889).
-
-* Thu Dec 21 2006 Matthew Barnes  - 2.9.4-3.fc7
-- Add patch for RH bug #218898 (viewing message source).
-
-* Wed Dec 20 2006 Matthew Barnes  - 2.9.4-2.fc7
-- Revise patch for RH bug #202751 (printing of indic languages).
-
-* Tue Dec 19 2006 Matthew Barnes  - 2.9.4-1.fc7
-- Update to 2.9.4
-- Bump eds_version to 1.9.4 due to soname changes.
-- Remove patch for GNOME bug #382431 (fixed upstream).
-
-* Fri Dec 15 2006 Matthew Barnes  - 2.9.3-5.fc7
-- Add patch for GNOME bug #373116 (use GtkColorButton).
-
-* Fri Dec 15 2006 Matthew Barnes  - 2.9.3-4.fc7
-- Disable patch for RH bug #216537, which caused RH bug #219228.
-
-* Tue Dec 12 2006 Matthew Barnes  - 2.9.3-3.fc7
-- Revise patch for RH bug #215466 to also fix RH bug #218589.
-
-* Mon Dec 11 2006 Matthew Barnes  - 2.9.3-2.fc7
-- Add patch for RH bug #215467 (missing meeting participants).
-
-* Sat Dec 09 2006 Matthew Barnes  - 2.9.3-1.fc7
-- Update to 2.9.3
-- Configure with scrollkeeper disabled.
-- Disable automake portability checking.
-- Ship our own icons from gnome-icon-theme.
-- BuildRequires: gnome-doc-utils >= 0.8.0
-- Add patch for RH bug #215478 (Maildir and MH accounts).
-- Add patch for RH bug #215695 (crashes w/o mail accounts).
-- Add patch for RH bug #216537 (viewing attachments).
-- Add patch for RH bug #218801 (count unread messages first).
-- Add patch for GNOME bug #350253 (ship our own icons).
-- Add patch for GNOME bug #382431 (implicit function declaration).
-- Revise patch for GNOME bug #360946 (improved "about" dialog).
-- Remove patch for GNOME bug #357970 (fixed upstream).
-
-* Tue Nov 28 2006 Matthew Barnes  - 2.9.2-3.fc7
-- Add patch to port evolution conduits to pilot-link 0.12.
-- Add patch for RH bug #215466 (optional meeting participants).
-- Add patch for GNOME bug #373837 (use GtkFontButton).
-- Remove patch for GNOME bug #343331 (fixed upstream).
-
-* Tue Nov 07 2006 Matthew Barnes  - 2.9.2-2.fc7
-- Revise patch for RH bug #202751 and re-enable it.
-
-* Mon Nov 06 2006 Matthew Barnes  - 2.9.2-1.fc7
-- Update to 2.9.2
-- Remove patch for Gnome.org bug #360240 (fixed upstream).
-- Remove patch for Gnome.org bug #360619 (fixed upstream).
-
-* Mon Nov 06 2006 Matthew Barnes  - 2.9.1-3.fc7
-- Add patch for RH bug #176400 (reset calendar IM context).
-- Add patch for RH bug #182247 (calendar input glitch).
-
-* Fri Oct 20 2006 Matthew Barnes  - 2.9.1-2.fc7
-- Add patch for Gnome.org bug #356177 (deprecate EMutex).
-- Add patch for Gnome.org bug #363695 (deprecate EStrv/EPoolv).
-- Disable patch for RH bug #202751 (unwanted side-effects).
-
-* Mon Oct 16 2006 Matthew Barnes  - 2.9.1-1.fc7
-- Update to 2.9.1
-- Bump eds_version to 1.9.1, evo_major to 2.10.
-- Remove patch for Gnome.org bug #359236 (fixed upstream).
-
-* Mon Oct 16 2006 Matthew Barnes  - 2.8.1-4.fc7
-- Another typo.
-
-* Mon Oct 16 2006 Matthew Barnes  - 2.8.1-3.fc7
-- Fix a typo in setting up .desktop symlinks.
-
-* Mon Oct 16 2006 Matthew Barnes  - 2.8.1-2.fc7
-- Forgot to check-in one of the patches.
-
-* Mon Oct 16 2006 Matthew Barnes  - 2.8.1-1.fc7
-- Update to 2.8.1
-- Use stricter build settings.
-- Make .desktop symlinks absolute (RH bug #209322).
-- Add patch for RH bug #202751 (printing of indic languages).
-- Add patch for Gnome.org bug #357970 (deprecated GLib / GDK symbols).
-- Add patch for Gnome.org bug #359236 (search state crash).
-- Add patch for Gnome.org bug #360240 ("unused variable" warnings).
-- Add patch for Gnome.org bug #360619 ("incompatible pointer type" warnings).
-- Add patch for Gnome.org bug #360946 (improved "about" dialog).
-- Add patch for Gnome.org bug #362638 (deprecate EThread).
-- Update patch for RH bug #211058 (partially fixed upstream).
-- Remove patch for RH bug #201307 (fixed upstream).
-- Remove patch for RH bug #205576 (fixed upstream).
-- Remove patch for Gnome.org bug #351332 (fixed upstream).
-- Remove patch for Gnome.org bug #352450 (fixed upstream).
-- Remove patch for Gnome.org bug #353472 (fixed upstream).
-- Remove patch for Gnome.org bug #356811 (fixed upstream).
-
-* Sun Oct 01 2006 Jesse Keating  - 2.8.0-7.fc6
-- rebuilt for unwind info generation, broken in gcc-4.1.1-21
-
-* Thu Sep 21 2006 Matthew Barnes  - 2.8.0-6.fc6
-- Add patch for RH bug #205576 (message deletion in thread view).
-
-* Wed Sep 20 2006 Matthew Barnes  - 2.8.0-5.fc6
-- Add patch for Gnome.org bug #356811 (lingering file on uninstall).
-
-* Tue Sep 19 2006 Matthew Barnes  - 2.8.0-4.fc6
-- Bump eds_version to 1.8.0.
-
-* Wed Sep 13 2006 Matthew Barnes  - 2.8.0-3.fc6
-- Add patch for RH bug #161885.
-
-* Wed Sep 13 2006 Matthew Barnes  - 2.8.0-2.fc6
-- Add patch for RH bug #201307.
-
-* Mon Sep  4 2006 Matthew Barnes  - 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  - 2.7.92-8.fc6
-- Add patch for RH bug #203036.
-- Disable notification-cleanups patch.
-
-* Tue Aug 29 2006 Matthew Barnes  - 2.7.92-7.fc6
-- Add patch for Gnome.org bug #353472.
-
-* Mon Aug 28 2006 Matthew Barnes  - 2.7.92-6.fc6
-- Add another hunk to the patch for RH bug #201541.
-- Add patch for RH bug #202289.
-
-* Mon Aug 28 2006 Matthew Barnes  - 2.7.92-5.fc6
-- Add patch for RH bug #201541.
-
-* Wed Aug 23 2006 Matthew Barnes  - 2.7.92-4.fc6
-- Add patches for Gnome.org bug #352450.
-
-* Tue Aug 22 2006 Matthew Barnes  - 2.7.92-3.fc6
-- Replace my patch for RH bug #202383 with a better one from upstream.
-- Add patch for Gnome.org bug #352423.
-
-* Mon Aug 21 2006 Matthew Barnes  - 2.7.92-2.fc6
-- Add patch for Gnome.org bug #352248 (and remember to commit it).
-
-* Mon Aug 21 2006 Matthew Barnes  - 2.7.92-1.fc6
-- Update to 2.7.92
-- Remove patch for RH bug #197834 (fixed upstream).
-- Update patch for Gnome.org bug #351332 (partially fixed upstream).
-
-* Tue Aug 15 2006 Matthew Barnes  - 2.7.91-5.fc6
-- Drop the bug-buddy dependency since it's not required for Evolution to run.
-
-* Mon Aug 14 2006 Matthew Barnes  - 2.7.91-4
-- Add patch for RH bug #201831.
-
-* Mon Aug 14 2006 Matthew Barnes  - 2.7.91-3
-- Consolidate "missing declarations" patches.
-- Add patch for RH bug #202383.
-
-* Fri Aug 11 2006 Matthew Barnes  - 2.7.91-2
-- Add patch for RH bug #197868.
-
-* Mon Aug  7 2006 Matthew Barnes  - 2.7.91-1
-- Update to 2.7.91
-- Update patch for RH bug #197834 for use with bug-buddy 2.15.90.
-- Require bug-buddy >= 2.15.90.
-
-* Fri Aug  4 2006 Matthew Barnes  - 2.7.90-6
-- Update to 2.7.90
-- Require evolution-data-server-1.7.90.1.
-
-* Wed Aug  2 2006 Matthew Barnes  - 2.7.4-5
-- Remove patch for RH bug #167157, as it fixed it the wrong way.
-- The real fix for #167157 is in evolution-data-server-1.7.4-5.
-- No longer packaging unused patches.
-
-* Mon Jul 31 2006 Matthew Barnes  - 2.7.4-4
-- Add patch for RH bug #178295.
-- Add patch for RH bug #167157.
-
-* Tue Jul 18 2006 Matthew Barnes  - 2.7.4-3
-- Clean up spec file, renumber patches.
-- Add BuildRequires for dbus-glib-devel.
-- Rebuild to pick up new D-Bus.
-
-* Thu Jul 13 2006 Matthew Barnes  - 2.7.4-2
-- Update patch for RH bug #157400.
-- Update patch for RH bug #157505.
-
-* Wed Jul 12 2006 Matthew Barnes  - 2.7.4-1
-- Update to 2.7.4
-- Remove evo-calendar-print-with-pango-7.patch (fixed upstream).
-- Remove patch for Gnome.org bug #345677 (fixed upstream).
-- Remove patch for RH bug #175596 (fixed upstream).
-
-* Wed Jul 12 2006 Jesse Keating  - 2.7.3-10.1
-- rebuild
-
-* Tue Jul 11 2006 Matthew Barnes  - 2.7.3-10
-- Update patch for RH bug #190359.
-
-* Fri Jul  7 2006 Matthew Barnes  - 2.7.3-9
-- Make "Submit Bug Report" menu item work again (RH #197384).
-
-* Thu Jul  6 2006 Matthew Barnes  - 2.7.3-8
-- Add patch for RH bug #166231 (also addresses #131227 and #157391).
-
-* Thu Jun 29 2006 Matthew Barnes  - 2.7.3-7
-- Add patch for RH bug #157400, reorder some patch #'s.
-
-* Thu Jun 29 2006 Matthew Barnes  - 2.7.3-6
-- Properly capitalize "Message->Mailing List" menu items (RH #175596).
-
-* Tue Jun 27 2006 Matthew Barnes  - 2.7.3-5
-- Add patch for Gnome.org bug #211058 for Trever Adams to test.
-
-* Mon Jun 26 2006 Matthew Barnes  - 2.7.3-4
-- Add patch for RH bug #157505 for QE testing.
-
-* Thu Jun 22 2006 Matthew Barnes  - 2.7.3-3
-- Fix bad type in schema file (Gnome.org #345677).
-
-* Wed Jun 14 2006 Tomas Mraz  - 2.7.3-2
-- rebuilt with new gnutls
-
-* Tue Jun 13 2006 Matthias Clasen   - 2.7.3-1
-- Update to 2.7.3
-
-* Mon May 29 2006 Dan Williams  - 2.7.2.1-4
-- Don't crash on quit when trying to save window size (Gnome.org #343331)
-
-* Tue May 23 2006 Matthew Barnes  2.7.2.1-3
-- Port evolution-2.7.1-notification-cleanups.patch to new libnotify API.
-- Require libnotify >= 0.4.
-
-* Fri May 19 2006 Matthew Barnes  - 2.7.2.1-2
-- Require specific versions of GNU Autotools packages for building.
-- Add evolution-2.7.2-preedit-gnome.bz-264485.patch (Mayank Jain).
-- Various spec file cleanups.
-- Pick up new libnotify.
-
-* Wed May 17 2006 Matthew Barnes  - 2.7.2.1-1
-- Update to 2.7.2.1
-- Remove nss/nspr hunk from evolution-2.7.1-no-gnome-common.patch
-  (fixed upstream).
-
-* Fri May 12 2006 Matthew Barnes  - 2.7.1-1
-- Update to 2.7.1
-- Bump evo_major from 2.6 to 2.8
-- Upstream evolution.desktop renamed evolution-%%{evo_major}.desktop.
-- Upstream evolution.keys renamed evolution-%%{evo_major}.keys.
-- Upstream evolution.mime renamed evolution-%%{evo_major}.mime.
-- Update line numbers in evolution-2.5.2-no-gnome-common.patch and
-  evolution-2.5.5.1-notification-cleanups.patch and rename them to
-  version 2.7.1.
-
-* Wed May  3 2006 Matthew Barnes  - 2.6.1-3
-- rebuilt
-
-* Mon Apr 10 2006 Matthias Clasen  - 2.6.1-2
-- Update to 2.6.1
-
-* Thu Mar 30 2006 Caolan McNamara  - 2.6.0-2
-- rebuild against reverted pilot-link
-- disable evolution-2.5.4-fix-conduits.patch for reversion to pilot-link 0.11.8
-
-* Mon Mar 13 2006 Ray Strode  - 2.6.0-1
-- 2.6.0
-- turn on the "error on missing prototypes" check thing
-
-* Mon Feb 27 2006 Ray Strode  - 2.5.92-1
-- 2.5.92
-
-* Tue Feb 14 2006 David Malcolm  - 2.5.91-1
-- 2.5.91
-- updated patch 101 to track upstream changes to calendar printing code
-- remove uptreamed patch 807 (NM multiple initialization assertion)
-- readded the mail-to-task plugin XML UI file
-- bump e-d-s req to 1.5.91
-
-* Fri Feb 10 2006 Jesse Keating  - 2.5.90-2.1
-- bump again for double-long bug on ppc(64)
-
-* Thu Feb  9 2006 Christopher Aillon  - 2.5.90-2
-- Disable the inline audio plugin for now since it uses gstreamer08
-
-* Tue Feb 07 2006 Jesse Keating  - 2.5.90-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Mon Jan 30 2006 David Malcolm  - 2.5.90-1
-- 2.5.90
-- trimmed patches 805 and 808, as parts of these got merged upstream
-- trimmed and regenerated patch 806 to track upstream
-- removed the mail-to-task plugin XML UI file
-
-* Sat Jan 28 2006 David Malcolm  - 2.5.5.1-2
-- added missing patch
-
-* Wed Jan 25 2006 David Malcolm  - 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  - 2.5.4-10
-- fix fix for multilib issue with shlib bonobo components (bug 156982)
-
-* Wed Jan 18 2006 Ray Strode  - 2.5.4-9
-- fix multilib issue with shlib bonobo components (bug 156982)
-
-* Thu Jan 12 2006 David Malcolm  - 2.5.4-8
-- avoid multiple initialization of NetworkManager connections (patch 807,
-  gnome bug #326785)
-
-* Thu Jan 12 2006 David Malcolm  - 2.5.4-7
-- updated alarm notification patch(patch 806, #177546, #177666, #177667,
-  #177670)
-
-* Thu Jan 12 2006 Christopher Aillon  - 2.5.4-6
-- Remove unneeded Requires: notify-daemon
-
-* Thu Jan 12 2006 Christopher Aillon  - 2.5.4-5
-- Update BR to libnotify-devel
-
-* Wed Jan 11 2006 David Malcolm  - 2.5.4-4
-- ported alarm notification code to the new libnotify API (patch 806, #177546)
-- added libnotify_support macro
-- added explicit notify-daemon requirement as a workaround for bug #177535
-
-* Tue Jan 10 2006 David Malcolm  - 2.5.4-3
-- updated patch 800 to include patch for memo conduit (untested at this stage);
-  renaming from evolution-2.5.2-fix-conduits.patch to
-  evolution-2.5.4-fix-conduits.patch; extended patch 802 to handle the memo
-  conduit; renaming from evolution-2.2.2-fix-conduit-dir.patch to
-  evolution-2.5.4-fix-conduit-dir.patch; re-enable conduits in build (#175160)
-- switch the build-time dep for the audio-inline plugin from gstreamer-devel to
-  gstreamer08-devel to better reflect the test in the tarball's configure.in
-
-* Wed Jan  4 2006 David Malcolm  - 2.5.4-2
-- added optional build-time requirement on NetworkManager-glib-devel
-- update patch 805 to cover a missing declaration in Network Manager support
-
-* Tue Jan  3 2006 David Malcolm  - 2.5.4-1
-- 2.5.4
-- update patch 107 to track underlying code changes; rename from
-  evolution-2.2.2-move-autosave-file.patch to
-  evolution-2.5.4-move-autosave-file.patch
-- added patch to fix more missing declarations (patch 805)
-- added files for publish-calendar plugin
-
-* Mon Dec 19 2005 David Malcolm  - 2.5.3-1
-- 2.5.3
-- Updated patch 106 (evolution-2.2.2-commit-enter-on-calendar.patch) so that it
-  still applies cleanly
-
-* Thu Dec 15 2005 Christopher Aillon  2.5.2-2
-- Require nspr and nss instead of mozilla-nspr and mozilla-nss
-- Update no-gnome-common patch to work with standalone nss package
-
-* Fri Dec 09 2005 Jesse Keating 
-- rebuilt
-
-* Wed Dec  7 2005 David Malcolm  - 2.5.2-1
-- 2.5.2
-- bump gtkhtml requirement from 3.7.6 to 3.9.2
-- bump eds requirement from 1.4.1.1 to 1.5.2
-- bump evo_major from 2.4 to 2.6
-- updated patch 107
-- updated patch 108
-- updated patch 800, replacing
-  rh-161817-attach-116019-conduit_pilot_link_updates.diff with
-  evolution-2.5.2-fix-conduits.patch.  Not yet complete.
-- disable pilot support for now (see #175160)
-- added hula plugin to list of packaged plugins
-- generalize gconf schema packaging to support changing evo_major
-
-* Fri Dec  2 2005 David Malcolm  - 2.4.2-2
-- force regeneration of the intltool files to prevent a problem where the
-  tarball copy of intltool-merge.in was out of sync with the intltool.m4 in the
-  latest shipped copy of intltool, which resulted in a broken intltool-merge
-  script when the tree was reautotooled.  (appears that the tarball was built
-  with a CVS copy of intltool where @EXPANDED_LIBDIR@ had been renamed to
-  @INTLTOOL_LIBDIR@, but our aclocal/intltool.m4 doesn't yet reflect that
-  change)
-
-* Tue Nov 29 2005 David Malcolm  - 2.4.2-1
-- 2.4.2
-- explicitly list the plugins that are packaged (#166234)
-- added build-time requirement on gstreamer-devel to cope with audio-inline
-  plugin
-
-* Tue Nov 29 2005 David Malcolm  - 2.4.1-8
-- add -DLDAP_DEPRECATED to CFLAGS (#172999)
-
-* Wed Oct 26 2005 David Malcolm  - 2.4.1-7
-- Added a patch (110) to hide the component switcher buttons by default on new
-  windows (#170799) by patching the GConf schema.
-- Made list of installed schemas explicit.
-- Own the plugins subdirectory
-
-* Tue Oct 25 2005 David Malcolm  - 2.4.1-6
-- use 4 separate .desktop files from the redhat-menus package, rather than the
-  current single one; bump the redhat-menus requirement accordingly (from 1.13
-  to 5.0.4); introduce a macro for this requirement.
-
-* Mon Oct 24 2005 David Malcolm  - 2.4.1-5
-- fix removal of upstream .desktop file (broke on upgrade to Evolution 2.2, and
-  continued to be broken with 2.3/2.4) (#103826, again)
-
-* Tue Oct 18 2005 David Malcolm  - 2.4.1-4
-- updated patch 804 to declare e_calendar_table_process_completed_tasks
-
-* Tue Oct 18 2005 David Malcolm  - 2.4.1-3
-- added patch (804: evolution-2.4.1-fix-missing-declarations.patch) to fix
-  missing declaration (thanks to Peter Robinson)
-
-* Mon Oct 17 2005 David Malcolm  - 2.4.1-2
-- bump e-d-s requirement to 1.4.1.1
-
-* Tue Oct  4 2005 David Malcolm  - 2.4.1-1
-- 2.4.1
-- regenerate patch 101 to handle conflict in
-  calendar/gui.print.c: print_week_day_event introduced by fix to upstream bug
-  244981 (end date added while printing in the week view); bump patch name from
-  version 5 to version 6
-- removed patch 804 (conduits-multi-day-crash); this is now in upstream tarball
-
-* Wed Sep 14 2005 Jeremy Katz  - 2.4.0-2
-- rebuild for mozilla on ppc64
-
-* Wed Sep  7 2005 David Malcolm  - 2.4.0-1
-- 2.4.0
-- Removed patch to fix implicit function declarations (patch 110, added in
-  2.3.8-1) as this is now upstream.
-
-* Thu Sep  1 2005 David Malcolm  - 2.3.8-4
-- Enable exchange support when configuring, so that the exchange-operations
-  plugin gets built.
-
-* Fri Aug 26 2005 David Malcolm  - 2.3.8-3
-- Added patch for #157074 (patch 804)
-
-* Fri Aug 26 2005 David Malcolm  - 2.3.8-2
-- Move -Werror-implicit-function-declaration from configuration to the make
-  stage, to avoid breaking configuration tests.
-
-* Tue Aug 23 2005 David Malcolm  - 2.3.8-1
-- 2.3.8
-- add -Werror-implicit-function-declaration to CFLAGS and a patch to fix the
-  problems arising (patch 110)
-
-* Tue Aug 16 2005 David Malcolm  - 2.3.7-3
-- Introduce macro for gnome-pilot dependency, bumping from 2.0.6 to 2.0.13
-- Add obsoletion of libgal2/libgal2-devel (dependency was removed in 2.3.6-1);
-  based on the last EVR of the libgal2 package in CVS, 2:2.5.3-2
-
-* Mon Aug 15 2005 David Malcolm  - 2.3.7-2
-- rebuild
-
-* Tue Aug  9 2005 David Malcolm  - 2.3.7-1
-- 2.3.7
-- Bump evolution-data-server requirement from 1.3.6 to 1.3.7
-- Bump gtkhtml3 requirement from 3.6.2 to 3.7.6
-
-* Mon Aug  8 2005 Tomas Mraz  - 2.3.6.1-5
-- rebuild with new gnutls
-
-* Tue Aug  2 2005 David Malcolm  - 2.3.6.1-4
-- Added patch to show correct mimetype for OpenOffice.org files when guessing
-  type for attachments with mimetype "application/octet-stream" (#164957)
-
-* Mon Aug  1 2005 David Malcolm  - 2.3.6.1-3
-- Improved version of evolution-2.3.5.1-fix-150458.patch (#150458)
-
-* Sat Jul 30 2005 David Malcolm  2.3.6.1-2
-- Fixed version numbers in GConf schema files (#164622); added
-  apps-evolution-mail-prompts-checkdefault-2.4.schemas
-
-* Fri Jul 29 2005 David Malcolm  - 2.3.6.1-1
-- 2.3.6.1
-
-* Thu Jul 28 2005 David Malcolm  - 2.3.6-1
-- 2.3.6
-- Bump evolution-data-server requirement to 1.3.6 (needed for
-  CAL_STATIC_CAPABILITY_HAS_UNACCEPTED_MEETING)
-- Removed libgal2[-devel] dependencies; the code has been moved into the
-  evolution tarball
-
-* Thu Jul 28 2005 David Malcolm  - 2.3.5.1-2
-- added experimental patch to port ETable printing to use Pango (#150458)
-
-* Mon Jul 25 2005 David Malcolm  - 2.3.5.1-1
-- 2.3.5.1
-- Update evo_major from 2.2 to 2.4
-- Updated evo-calendar-print-with-pango- patch from version 4 to 5
-- Removed Patch105: evolution-2.2.2-fix-new-mail-notify.patch as configure.in
-  in this branch tests for existance for dbus-glib-1, rather than max-version.
-- Removed Patch801: gb-309138-attach-48417-fix-evo-conduit-memleaks.patch as
-  this is now in upstream tarball.
-- Removed evolution-calendar-importers and evolution-addressbook-importers
-  directories.
-- Updated evolution-2.2.2-no-gnome-common.patch to include a patch to rename
-  mozilla-nspr to nspr
-
-* Tue Jun 28 2005 David Malcolm  - 2.2.2-11.fc5
-- Remove GNOME_COMPILE_WARNINGS from configure.in (since gnome-common might not be available when we rerun the autotools; patch 803)
-
-* Tue Jun 28 2005 David Malcolm  - 2.2.2-10.fc5
-- Moved .conduit files to libdir/gnome-pilot/conduits, rather than beneath datadir, to match gnome-pilot (patch 802)
-
-* Mon Jun 27 2005 David Malcolm  - 2.2.2-9.fc5
-- Replaced patch to port conduits to pilot-link-0.12 with Mark G Adams's version of same (#161817)
-- Added Mark G Adams's memory leak fix (patch 801)
-
-* Mon Jun  6 2005 David Malcolm  - 2.2.2-8
-- Added Ivan Gyurdiev's patch to move autosave files inside the .evolution
-  directory
-
-* Thu May 26 2005 David Malcolm  - 2.2.2-7
-- Added Akira Tagoh's patch for calendar keypress handling (#154360)
-
-* Mon May 23 2005 David Malcolm  - 2.2.2-6
-- Remove static versions of libraries
-
-* Thu May  5 2005 David Malcolm  - 2.2.2-5
-- added evolution-2.2.2-fix-new-mail-notify.patch to CVS
-
-* Thu May  5 2005 David Malcolm  - 2.2.2-4
-- Removed explicit mozilla_build_version; instead use pkg-config to determine
-the path to the NSS/NSPR headers.
-- Use a macro to express requirement on pilot-link (was 1:0.11.4, now 0.12;
-patches depend on this)
-- Re-enabled the new-mail-notify plugin (my patch to handle differing DBus
-versions is in the upstream tarball; but configure.in disables the plugin for
-dbus versions > 0.23; patched configure.in to allow arbitrary DBus versions,
-and run autoconf at the start of the build) (#156328)
-
-* Sat Apr 30 2005 David Malcolm  - 2.2.2-3
-- updated mozilla_build_version to 1.7.7
-
-* Sat Apr 30 2005 David Malcolm  - 2.2.2-2
-- Finished porting conduits to pilot-link-0.12 API; re-enabled pilot support (#152172)
-
-* Mon Apr 11 2005 David Malcolm  - 2.2.2-1
-- 2.2.2
-- updated evo-calendar-print-with-pango-4.patch to handle upstream change to print_comp_item
-- removed patch for XB73912; now in upstream tarball
-- removed patch to new-mail-notify; generalised fix to cope with various DBus API versions is now upstream
-- removed patch for XB73844; now in upstream tarball
-- Update requirements:
-  - gtkhtml3 from 3.6.1 to 3.6.2
-  - libgal2 from 2.4.1 to 2.4.2
-  - eds from 1.2.1 to 1.2.2
-
-* Wed Mar 23 2005 David Malcolm  - 2.2.1.1-2
-- Add patch for upstream bug XB73844 (should now be able to accept meeting requests)
-
-* Fri Mar 18 2005 David Malcolm  - 2.2.1.1-1
-- 2.1.1.1
-
-* Thu Mar 17 2005 David Malcolm  - 2.2.1-1
-- 2.2.1
-- Updated requirements:
-  * gtkhtml3 from 3.6.0 to 3.6.1
-  * libgal2 from 2.4.0 to 2.4.1
-  * eds from 1.2.0 to 1.2.1
-- Added rum-time requirement on gnome-vfs2; updated version requirement from 2.0 to 2.4
-- The new-mail-notify plugin will not be built for now since the upstream configure test now checks for dbus-glib-1 version <= 0.23.4 (to minimise problems caused by the API change)
-
-* Mon Mar 14 2005 David Malcolm  - 2.2.0-10
-- disabled pilot-link support for now so that we have an evolution package; more patching is needed to get this to work with pilot-link-0.12
-
-* Mon Mar 14 2005 David Malcolm  - 2.2.0-9
-- another attempt at porting to pilot-link 0.12
-
-* Mon Mar 14 2005 David Malcolm  - 2.2.0-8
-- Added patch to deal with changes to pilot-link from 0.11->0.12
-
-* Mon Mar 14 2005 David Malcolm  - 2.2.0-7
-- use 0.31 rather than 0.31.0 for DBus version
-
-* Mon Mar 14 2005 David Malcolm  - 2.2.0-6
-- rebuilt against pilot-link-0.12
-- added versioning to the requirement on dbus (>=0.31)
-
-* Thu Mar 10 2005 David Malcolm  - 2.2.0-5
-- Added patch for changes to DBus API in version 0.31 (#150671)
-- Removed explicit run-time spec-file requirement on mozilla.
-  The Mozilla NSS API/ABI stabilised by version 1.7.3
-  The libraries are always located in the libdir
-  However, the headers are in /usr/include/mozilla-%%{mozilla_build_version}
-  and so they move each time the mozilla version changes.
-  So we no longer have an explicit mozilla run-time requirement in the specfile;
-  a requirement on the appropriate NSS and NSPR .so files is automagically generated on build.
-  We have an explicit, exact build-time version, so that we can find the headers (without
-  invoking an RPM query from the spec file; to do so is considered bad practice)
-- Introduced mozilla_build_version, to replace mozilla_version
-
-* Wed Mar  9 2005 Christopher Aillon  - 2.2.0-4
-- Depend on mozilla 1.7.6
-
-* Wed Mar  9 2005 David Malcolm  - 2.2.0-3
-- added patch from upstream for bug XB-73192, fixing missing "Mark as Read/Unread" context menu items
-
-* Tue Mar  8 2005 David Malcolm  - 2.2.0-2
-- actually add source tarball this time
-
-* Tue Mar  8 2005 David Malcolm  - 2.2.0-1
-- 2.2.0
-- Removed patch for GCC 4 fix as this is now in upstream tarball
-- Updated requirements:
-  * gtkhtml3 from 3.5.7 to 3.6.0
-  * libgal2 from 2.3.5 to 2.4.0
-  * eds from 1.1.6 to 1.2.0
-
-* Tue Mar  8 2005 David Malcolm  - 2.1.6-3
-- rebuild (to use latest DBus library)
-
-* Tue Mar  1 2005 David Malcolm  - 2.1.6-2
-- added patch to fix build with GCC4
-
-* Tue Mar  1 2005 David Malcolm  - 2.1.6-1
-- Update from upstream unstable 2.1.6 to 2.1.6
-- Added patches to fix calendar and addressbook printing for non-Roman scripts (#138075)
-- Added explicit requirement on libgnomeprint22 >= 2.8.0
-- Added BuildRequires: gtk-doc
-- Updated requirements:
-  * gtkhtml3 from 3.5.6 to 3.5.7
-  * libgal2 from 2.3.4 to 2.3.5
-  * eds from 1.1.5 to 1.1.6
-
-* Wed Feb  9 2005 David Malcolm  - 2.1.5-1
-- Update from upstream unstable 2.1.4 to 2.1.5
-- Updated requirements:
-  * gtkhtml3 from 3.5.4 to 3.5.6
-  * libgal2 from 2.3.3 to 2.3.4
-  * eds from 1.1.4.1 to 1.1.5
-- Removed explicit packaging of weather icons as these are now below DATADIR/evolution/2.2 rather than DATADIR/evolution-2.2
-
-* Wed Jan 26 2005 David Malcolm  - 2.1.4-1
-- Update from upstream stable 2.0.3 to unstable 2.1.4
-- Updated evo_major from 2.0 to 2.2
-- Removed camel packaging as this has been moved to evolution-data-server for Evolution 2.2
-- Added plugins to the packaged files
-- Added weather icons to the packaged files
-- Updated requirements:
-  * gtkhtml3 from 3.3.2 to 3.5.4
-  * libgal2 from 2.2.4 to 2.3.3
-  * eds from 1.0.3 to 1.1.4.1
-  * libsoup from 2.2.0 to 2.2.2
-- Added built-time requirement on atk-devel
-- Enable all plugins for now
-- Added requirement on dbus (for the new-mail-notify plugin)
-- Enable gtk-doc
-- Updated GConf schema name suffixes from 2.0 to 2.2
-
-* Sun Dec 19 2004 Christopher Aillon  2.0.3-2
-- Rebuild against mozilla 1.7.5
-
-* Wed Dec 15 2004 David Malcolm  - 2.0.3-1
-- Update from upstream 2.0.2 to 2.0.3 with these bug fixes:
- * Addressbook
-   XB67656 - almost the same email address are considrered identical (Siva)
-   XB69079 - Data repeated after save with bad date format (Siva)
-   XB66854 - Some strings are missed to translation (Rodney)
-
- * Calendar
-   XB47529 - Date in reminder window appears in UTF-8 in non-UTF-8 locale (Rodney)
-   XB68707 - Events ending at 12:00 AM show as ending at 12:00 pm (JP)
-   XB67403 - wrong alarm time displayed (Rodrigo)
-   XB68077 - appointment dialog re-size (Rodrigo)
-   - leak fixes (Chen)
-   - sensitize menu items in list view properly (JP)
-   - redraw display when 24hr time setting changes (JP)
-
- * Mail
-   XB69533 - Unable to subscribe to the alt hierarchy (Michael)
-   XB69776 - Signed Mail with attachments displays everything with multipart/boundaries stuff (Michael)
-   XB69615 - delete certificate after viewing smime message (Michael)
-   XB69109 - EHLO or HELO with ip addresses does not conform rfc 821  (Michael)
-   XB69982 - During Newsgroup list refresh, it crashes (Michael)
-   XB69446 - Mail shown as attachment if some headers are upper case (S. Caglar Onur)
-   XB68556 - NNTP with SSL won't work, even with stunnel (Michael)
-   XB69145 - toplevel message/rfc822 parts are broken for IMAP (Michael)
-   XB69241 - base64 attachement holding PGP block (Jeff)
-   XB67895 - nntp support not asking for password (Michael)
-   XB67898 - Use of symbolic port-names is not guaranteed to work everywhere (Michael)
-   XB69851 - remember password check doesn't stick (Michael)
-   XB69623 - Moving a message from an IMAP INBOX to an IMAP folder caused crash (Radek)
-   XB69339 - postscript and some other attachments not visable (Michael)
-   XB69579 - vFoldersXBUNMATCHED generates errors (Michael)
-   XB68958 - current message forgotten in vfolders (Michael)
-   XB68974 - Wizard doesn't store smtp auth settings (Michael)
-   XB67496 - html email not rendered in preview pane (Michael)
-   XB67014 - Checking supported auth types doesn't work with new SSL certificate (Michael)
-   XB68006 - Evo crashed after viewing previously-sent email and copying URL from it (Michael)
-   XB68787 - Crash when migrating 1.4 data to 2.0.2 (Michael)
-   XB67622 - SMTP auth usernames containing % character fail (Jeff)
-   - fix pthread_key_delete args (Julio M. Merino Vidal)
-- Removed patch for "Unmatched" vfolder properties dialog (#141458) as this is now in upstream tarball (XB69579 above)
-- Update dependency on e-d-s from 1.0.2 to 1.0.3
-- Update dependency on libgal2 from 2.2.3 to 2.2.4
-
-* Wed Dec  1 2004 David Malcolm  - 2.0.2-6
-- Fix broken properties dialog for "Unmatched" vfolder (#141458)
-
-* Wed Oct 27 2004 Christopher Aillon  - 2.0.2-4
-- Re-enable s390(x)
-
-* Fri Oct 22 2004 David Malcolm  - 2.0.2-3
-- added requirement on gnutls/gnutls-devel
-
-* Fri Oct 22 2004 David Malcolm  - 2.0.2-2
-- Fix for #132050 (no entry for Evolution in the menus): use the new redhat-evolution.desktop file provided by redhat-menus-1.13
-
-* Tue Oct 12 2004 David Malcolm  - 2.0.2-1
-- Update from 2.0.1 to 2.0.2
-- Updated dependency on e-d-s from 1.0.1 to 1.0.2
-- Updated dependency on libgal2 from 2.2.2 to 2.2.3
-- Updated dependency on gtkhtml3 from 3.3.0 to 3.3.2
-- ppc's mozilla dependency is now in line with the other architectures at 1.7.3
-
-* Sat Oct  9 2004 David Malcolm 
-- disable s390/s390x for now
-
-* Fri Oct  8 2004 David Malcolm  - 2.0.1-3
-- Fix for #135135, updating the fix for #103826 that removes the evolution.desktop file in "Office"; the file to delete had been renamed to evolution-2.0.desktop
-- Added requirement on redhat-menus, since this supplies the target of our .desktop symlink
-
-* Tue Sep 28 2004 David Malcolm  - 2.0.1-2
-- update mozilla dependency from 1.7.2 to 1.7.3, apart from on ppc (and on s390 and s390x, which remain at 1.6, and on ppc64 where it isn't available at all)
-
-* Tue Sep 28 2004 David Malcolm  - 2.0.1-1
-- Update from 2.0.0 to 2.0.1
-- Updated dependency on e-d-s from 1.0.0 to 1.0.1
-- Updated dependency on libgal2 from 2.2.0 to 2.2.2
-
-* Mon Sep 20 2004 David Malcolm  - 2.0.0-2
-- rebuilt
-
-* Tue Sep 14 2004 David Malcolm  - 2.0.0-1
-- Update from 1.5.94.1 to 2.0.0
-- Change source FTP location from 1.5 to 2.0
-- Updated dependency on e-d-s from 0.0.99 to 1.0.0
-- Documentation has now moved from 1.5 to 2.0
-
-* Tue Aug 31 2004 David Malcolm  - 1.5.94.1-1
-- updated tarball from 1.5.93 to 1.5.94.1
-- the BASE_VERSION in the configure.in script has finally been updated from 1.5 to 2.0 (affects OAFIIDs, install dirs, binary names etc); updated evo_major and various other parts of the spec-file to reflect this; however documentation is still 1.5 in upstream tarball
-- updated dependency on libgal2 from 2:2.1.14 to 2:2.2.0
-- updated dependency on libsoup from 2.1.13 to 2.2.0
-- updated dependency on e-d-s from 0.0.98 to 0.0.99
-
-* Tue Aug 17 2004 David Malcolm  - 1.5.93-2
-- updated gnome-icon-theme requirement from 1.2.0 to 1.3.6 to fix problem with missing stock icons (bz #130142)
-
-* Mon Aug 16 2004 David Malcolm  - 1.5.93-1
-- updated tarball from 1.5.92.2 to 1.5.93
-- removed filechooser patch - this is now in the upstream tarball, with a test at configuration time; it was autodetected and enabled in my test build; I've explicitly enabled it to be certain.
-- updated dependency on libgal2 from 2:2.1.13 to 2:2.1.14
-- updated dependency on libsoup from 2.1.12 to 2.1.13
-- updated dependency on e-d-s from 0.0.97 to 0.0.98
-
-* Wed Aug 11 2004 David Malcolm  - 1.5.92.2-2
-- Increased mozilla_version from 1.7 to 1.7.2 so that the NSS test looks in the correct place
-
-* Wed Aug 11 2004 David Malcolm  - 1.5.92.2-1
-- updated tarball from 1.5.92.1 to 1.5.92.2
-
-* Wed Aug  4 2004 David Malcolm  - 1.5.92.1-1
-- updated tarball from 1.5.91 to 1.5.92.1
-- added a dependency on gnome-icon-theme
-- updated dependency on libgal2 from 2:2.1.11 to 2:2.1.13
-- updated dependency on gtkhtml3 from 3.1.17 to 3.3.0
-- updated dependency on libsoup from 2.1.11 to 2.1.12
-- updated dependency on e-d-s from 0.0.95 to 0.0.97
-
-* Mon Jul 26 2004 David Malcolm  - 1.5.91-1
-- 1.5.91
-
-* Thu Jul  8 2004 Jeremy Katz  - 1.5.90-5
-- use mozilla 1.7 on platforms where it's available
-- check to make sure the appropriate mozilla headers exist if using
-  mozilla nss for ssl or fail the build
-
-* Thu Jul  8 2004 David Malcolm 
-- rebuilt
-
-* Wed Jul  7 2004 David Malcolm 
-- rebuilt
-
-* Tue Jul  6 2004 David Malcolm  - 1.5.90-2
-- Fixed sources file
-
-* Tue Jul  6 2004 David Malcolm  - 1.5.90-1
-- 1.5.90; updated requirements on gtkhtml3, libgal2, and e-d-s
-
-* Thu Jun 17 2004 David Malcolm  - 1.5.9.2-1
-- 1.5.9.2
-
-* Tue Jun 15 2004 Elliot Lee 
-- rebuilt
-
-* Tue Jun  8 2004 David Malcolm  - 1.5.9.1-3
-- Replaced /usr/lib with %%{_libdir} in mozills_nss ssl_flags
-
-* Mon Jun  7 2004 David Malcolm  - 1.5.9.1-2
-- updated filechooser patch again
-
-* Mon Jun  7 2004 David Malcolm  - 1.5.9.1-1
-- 1.5.9.1; updated filechooser patch
-
-* Wed May 26 2004 David Malcolm  - 1.5.8-3
-- added ORBit2 and spamassassin requirements
-
-* Mon May 24 2004 David Malcolm  - 1.5.8-2
-- Fixed up filechooser patch and re-enabled it
-
-* Fri May 21 2004 David Malcolm  - 1.5.8-1
-- 1.5.8; added explicit libbonoboui requirement; disabled filechooser patch for now
-
-* Tue May  4 2004 David Malcolm  - 1.5.7-3
-- Added GtkFileChooser patch based on work by Carlos Garnacho Parro (http://lists.ximian.com/archives/public/evolution-patches/2004-March/004867.html); added requirement for GTK 2.4
-
-* Thu Apr 22 2004 David Malcolm  - 1.5.7-2
-- added emfv signal fix patch and fix for defaults in switch statements on gcc3.4
-
-* Wed Apr 21 2004 David Malcolm  - 1.5.7-1
-- 1.5.7
-
-* Wed Mar 10 2004 Jeremy Katz  - 1.5.5-1
-- 1.5.5
-
-* Tue Mar 02 2004 Elliot Lee 
-- rebuilt
-
-* Wed Feb 18 2004 Jeremy Katz  - 1.5.4-1
-- 1.5.4
-
-* Tue Feb 17 2004 Jeremy Katz 
-- buildrequire e-d-s-devel instead of e-d-s (#114712)
-- enable nntp support (#114802)
-
-* Fri Feb 13 2004 Elliot Lee 
-- rebuilt
-
-* Tue Jan 27 2004 Jeremy Katz  1.5.3-1
-- 1.5.3
-
-* Wed Jan 21 2004 Jeremy Katz  1.5.2-2
-- size_t/int mismatch compile fix for 64bit platforms
-
-* Wed Jan 14 2004 Jeremy Katz  1.5.2-0
-- 1.5.2
-- add patch to fix gconf warning with schema
-
-* Sun Jan  4 2004 Jeremy Katz  1.5.1-0
-- 1.5.1
-- temporarily disable redhatify patch
-- use mozilla-nss for SSL
-- fix schema names
-
-* Thu Nov  6 2003 Jeremy Katz  1.4.5-8
-- fall back to HELO for ESMTP (#108753)
-
-* Tue Oct 28 2003 Jeremy Katz  1.4.5-7
-- fix title on composer save dialog (#108159)
-
-* Mon Oct 27 2003 Jeremy Katz  1.4.5-6
-- Make imap command length shorter to avoid choking some imap servers
-  (notably cyrus-imap).
-- Make wombat session managed so that we don't hit weird bonobo activation
-  things.  This adds a dependency on $DISPLAY for wombat.  (#106826)
-
-* Sun Oct 19 2003 Jeremy Katz  1.4.5-5
-- use AI_ADDRCONFIG to avoid returning IPv6 addresses on hosts without
-  IPv6 support
-- add patch from upstream with reply-to-list shortcut (Ctrl-l)
-
-* Wed Oct 15 2003 Jeremy Katz  1.4.5-4
-- really, really remove duplicate menu entry (#103826)
-
-* Tue Oct 14 2003 Jeremy Katz  1.4.5-3
-- Pull in some patches from upstream CVS
-  * Avoid division by zero with POP (X#41610)
-  * Don't mangle headers (X#33545)
-  * Prefix IPV6 numeric hosts properly (X#46006, #105028)
-  * Use proper function for IPV6 reverse lookups (X#46006)
-  * Allow timezone offset to be up to 14 hours (X#49357)
-
-* Mon Oct 13 2003 Jeremy Katz 
-- add patch from upstream CVS to fix SMTP syntax problems (#106630)
-- really remove duplicate menu entry (#103826)
-
-* Mon Oct  6 2003 Jeremy Katz 
-- make redhat-email.desktop symlink relative (#104391)
-
-* Wed Sep 24 2003 Jeremy Katz 
-- add ipv6 support per dwmw2's request
-
-* Tue Sep 23 2003 Jeremy Katz  1.4.5-2
-- 1.4.5
-
-* Wed Sep 17 2003 Jeremy Katz 
-- move static libs into -devel (#104399)
-
-* Tue Sep 16 2003 Jeremy Katz  1.4.4-7
-- filter types are gtypes, not ints (#103934)
-
-* Wed Sep 10 2003 Jeremy Katz  1.4.4-6
-- fix from upstream (will be in 1.4.5) to fix menu merging in the
-  composer with new libbonobo
-
-* Fri Sep  5 2003 Jeremy Katz 
-- remove the desktop file in Office (#103826)
-
-* Tue Sep  2 2003 Jeremy Katz  1.4.4-5
-- patch from upstream to fix display of some mails in
-  different charsets (#102899)
-- add requires on newer version of ORBit2 (#103386)
-- add patch from upstream (extracted by George Karabin) to use gnome-vfs
-  mime icon lookup where available (#102553)
-
-* Fri Aug 22 2003 Jeremy Katz  1.4.4-4
-- include static libs (#102834)
-
-* Wed Aug  6 2003 Jeremy Katz  1.4.4-3
-- add a -devel subpackage (#99376)
-
-* Mon Aug  4 2003 Jeremy Katz  1.4.4-1
-- 1.4.4
-
-* Wed Jul 30 2003 Jeremy Katz 
-- buildrequires fixup from Ville Skytta (#101325)
-
-* Thu Jul 24 2003 Jeremy Katz  1.4.3-6
-- include tagoh's patch for printing cjk contacts (committed upstream, #99374)
-
-* Tue Jul 22 2003 Nalin Dahyabhai  1.4.3-5
-- rebuild
-
-* Tue Jul 15 2003 Jeremy Katz  1.4.3-4
-- build on all arches again
-
-* Mon Jul 14 2003 Jeremy Katz  1.4.3-3
-- rebuild
-
-* Thu Jul 10 2003 Jeremy Katz  1.4.3-1
-- 1.4.3
-
-* Thu Jun 19 2003 Jeremy Katz 
-- make gal version dep more explicit
-
-* Fri Jun 13 2003 Jeremy Katz 
-- fix desktop file (#97162)
-
-* Tue Jun 10 2003 Jeremy Katz  1.4.0-2
-- rebuild
-- excludearch ppc64 for now
-
-* Mon Jun  9 2003 Jeremy Katz  1.4.0-1
-- 1.4.0
-
-* Thu Jun 05 2003 Elliot Lee 
-- rebuilt
-
-* Thu Jun  5 2003 Jeremy Katz  1.3.92-2
-- rebuild
-
-* Wed Jun  4 2003 Jeremy Katz 
-- buildrequires gettext (#92276)
-
-* Sun May 25 2003 Jeremy Katz  1.3.92-1
-- 1.3.92
-
-* Wed May  7 2003 Jeremy Katz  1.3.3-2
-- fix default for /schemas/apps/evolution/mail/display/mime_types
-
-* Tue May  6 2003 Jeremy Katz  1.3.3-1
-- 1.3.3
-
-* Sun May  4 2003 Jeremy Katz  1.3.2-2
-- enable pilot support
-- add redhatify patch back
-
-* Tue Apr 22 2003 Jeremy Katz 
-- add a /usr/bin/evolution symlink
-
-* Mon Apr 21 2003 Jeremy Katz 
-- fix gnome-spell version requirement
-
-* Wed Apr 16 2003 Jeremy Katz  1.3.2-1
-- add trivial fix for evolution-mail schema key (ximian #41419)
-
-* Tue Apr 15 2003 Jeremy Katz 
-- update to 1.3
-- don't build with pilot support for now
-- don't redhat-ify the summary prefs for now
-
-* Sun Apr  6 2003 Jeremy Katz  1.2.4-2
-- fix krb5 libdir for lib64 systems
-
-* Sun Apr  6 2003 Jeremy Katz  1.2.4-1
-- update to 1.2.4
-
-* Thu Apr  3 2003 Jeremy Katz  1.2.2-7
-- oops, fix a tyop
-
-* Thu Apr  3 2003 Jeremy Katz  1.2.2-6
-- add a few cleanups for 64bit cleanliness (#86347)
-
-* Sun Mar 30 2003 Jeremy Katz 
-- add some buildrequires (#87612)
-
-* Mon Mar 24 2003 Jeremy Katz  1.2.3-1
-- update to 1.2.3
-
-* Wed Mar 19 2003 Jeremy Katz  1.2.2-5
-- security patches from upstream
-  - sanity check UUEncoding header before decoding (CAN-2003-0128)
-  - don't decode doubly UUEncoded content (CAN-2003-0129)
-  - don't use a bonobo component to display things without registered
-    handlers (CAN-2003-0130)
-
-* Mon Feb 24 2003 Elliot Lee  1.2.2-4
-- debuginfo rebuild
-
-* Thu Feb 20 2003 Jeremy Katz  1.2.2-3
-- memleak patch had some bits that weren't supposed to be there.  update
-  to newer from upstream.
-- fix directory checking in proxy patch
-
-* Thu Feb 20 2003 Jeremy Katz  1.2.2-2
-- add missing build dep (#84388)
-- add patch from upstream for evolution-mail memleak
-- add patch from upstream to use the gnome2 proxy settings by default
-
-* Fri Feb  7 2003 Jeremy Katz  1.2.2-1
-- 1.2.2
-- build on x86_64
-
-* Wed Jan 22 2003 Tim Powers 
-- rebuilt
-
-* Tue Jan  7 2003 Nalin Dahyabhai  1.2.1-4
-- rebuild
-
-* Fri Jan  3 2003 Nalin Dahyabhai 
-- if building with OpenSSL, attempt to get cflags and ldflags from pkgconfig
-
-* Thu Jan  2 2003 Jeremy Katz  1.2.1-3
-- we don't want to use native POSIX threads for mutexes in db3, override them
-
-* Mon Dec 16 2002 Tim Powers  1.2.1-2
-- rebuild
-
-* Fri Dec 13 2002 Jeremy Katz  1.2.1-1
-- update to 1.2.1
-
-* Thu Dec 12 2002 Jeremy Katz  1.2.0-6
-- require a newer soup, the old one Has Bugs (tm)
-- excludearch x86_64; getting a R_X86_64_32S relocation in libical
-  although everything appears to be built with -fPIC correctly
-
-* Tue Dec 10 2002 Jeremy Katz  1.2.0-5
-- patch for multilib krb5
-
-* Mon Dec  2 2002 Jeremy Katz  1.2.0-4
-- add upstream patch to handle LDAPv3 better
-- add upstream patch to fix shell memory leaks
-- add upstream patch to fix ldap scope selection
-- build with openssl instead of mozilla-nss since it's available on
-  more platforms
-- build on all arches
-
-* Fri Nov 22 2002 Jeremy Katz 
-- require bonobo-conf, not -devel (#78398)
-
-* Wed Nov 20 2002 Florian La Roche  1.2.0-3
-- disable pilot support for mainframe
-
-* Mon Nov 18 2002 Jeremy Katz  1.2.0-2
-- macro-ify the mozilla version to make it easier to build against
-  newer mozillas with headers in new locations
-- buildrequire pilot-link-devel (#78077)
-- drop uneeded ldapv3 patch (toshok says 1.2 already handles this)
-- drop unneeded patch for ordering of the libdb checks
-- add fejj's patch to always subscribe to the inbox from evolution-patches
-
-* Tue Nov 12 2002 Jeremy Katz  1.2.0-1
-- 1.2.0
-
-* Sat Nov  2 2002 Jeremy Katz  1.1.90-2
-- reenable pilot support
-- redhatify
-
-* Fri Nov  1 2002 Jeremy Katz  1.1.90-1
-- update to 1.1.90
-
-* Thu Oct 31 2002 Jeremy Katz 
-- include mozilla epochs in requires (#74577)
-- add build requires on newer oaf (#76801)
-
-* Thu Oct 24 2002 Jeremy Katz  1.1.2-1
-- update to 1.1.2
-- remove unpackaged files from the buildrooot
-- disable pilot support for now
-
-* Tue Sep  3 2002 Jeremy Katz  1.0.8-10
-- add freetype-devel to build requires (#73319)
-
-* Mon Sep  2 2002 Owen Taylor 
-- Fix a problem where evolution-mail right click items corrupted the stack
-  (#67992)
-
-* Thu Aug 29 2002 Jeremy Katz  1.0.8-9
-- don't install two desktop files (#72871)
-
-* Wed Aug 28 2002 Preston Brown  1.0.8-8
-- absolute symlink .desktop file (#72913)
-
-* Thu Aug 22 2002 han Ngo  1.0.8-7
-- rebuild against new pilot-link
-
-* Sat Aug 10 2002 Florian La Roche 
-- bzip2 source
-
-* Tue Aug  6 2002 Than Ngo  1.0.8-5
-- rebuild against new pilot-link-0.11.2
-
-* Thu Jul 18 2002 Jeremy Katz  1.0.8-4
-- rebuild against new gnome-pilot
-
-* Tue Jul  9 2002 Jeremy Katz  1.0.8-3
-- remove static and libtool archives for importers and camel-providers (#68222)
-- do desktop-file-install magic
-- remove dead sites from summary list (#64522)
-- support openldap protocol version 3 based off of Nalin's autofs changes
-
-* Mon Jul  8 2002 Jeremy Katz  1.0.8-2
-- fix openldap-devel buildrequire
-
-* Mon Jul  1 2002 Jeremy Katz  1.0.8-1
-- 1.0.8
-
-* Thu Jun 27 2002 Jeremy Katz  1.0.7-2
-- include patch to omf files from otaylor@redhat.com to fix
-  scrollkeeper validation errors
-
-* Sun Jun 23 2002 Jeremy Katz  1.0.7-1
-- update to 1.0.7
-- excludearch alpha while mozilla isn't being built there
-
-* Sun May 26 2002 Tim Powers  1.0.5-2
-- automated rebuild
-
-* Mon May 13 2002 Jeremy Katz  1.0.5-1
-- update to 1.0.5
-
-* Fri May  3 2002 Jeremy Katz  1.0.3-6
-- add patch to fix spool unread counts (#64198)
-- build with the fix for the crasher mail sent to
-  evolution-list (ximian #24140)
-
-* Mon Apr 15 2002 Jeremy Katz  1.0.3-4
-- include fejj(at)ximian.com's patch to fix the EINPROGRESS error with ssl
-  since it's been committed to the branch and fixes the problem for me
-- include patch from tagoh(at)redhat.com to change the default charset
-  for Japanese to ISO-2022-JP (#63214)
-
-* Wed Apr 10 2002 Jeremy Katz  1.0.3-3
-- minor tweaks to the redhatify patch
-- make accepting appointments sent to mailing lists work
-- use the RFC specified LDAP attribs for freebusy and calendarURI
-  in addressbook
-- fix a crash in the startup wizard
-
-* Sun Mar 31 2002 Jeremy Katz  1.0.3-2
-- move desktop file to /etc/X11/applnk (#62399)
-
-* Sun Mar 24 2002 Jeremy Katz  1.0.3-1
-- update to evolution 1.0.3
-- change summary view to show a recent errata list by default
-
-* Thu Mar 14 2002 Jeremy Katz 
-- put correct path to nspr includes on configure command line
-
-* Mon Mar 11 2002 Jeremy Katz  1.0.2-3
-- mozilla 0.9.9 has nspr and nss subpackages, hooray!  rip out the static
-  libnss linkage and just link against what is provided dynamically
-- kill the -devel subpackage since it's of questionable use
-- explicitly require mozilla-nss and mozilla-nspr packages to make it easier
-  to resolve the requirements
-
-* Thu Feb 21 2002 Jeremy Katz  1.0.2-2
-- rebuild in new environment
-- temporarily exclude on ia64 again
-
-* Thu Jan 31 2002 Jeremy Katz  1.0.2-1
-- update to 1.0.2
-
-* Mon Jan 28 2002 Jeremy Katz  1.0.1-4
-- build on ia64 now that mozilla exists for ia64
-
-* Sun Jan 27 2002 Jeremy Katz  1.0.1-3
-- rebuild in new environment
-- add pilot support
-
-* Sun Jan 13 2002 Jeremy Katz  1.0.1-2
-- rebuild without mozilla-psm in the buildroot so libnss is linked
-  statically as intended
-
-* Sat Jan 12 2002 Jeremy Katz  1.0.1-1
-- update to 1.0.1
-- patch for autoconf 2.52 accepted upstream
-- include man page
-- use --with-sub-version=" (%%{version}-%%{release})"
-
-* Tue Dec 18 2001 Jeremy Katz  1.0-2
-- really disable news
-- add patch from Jens Petersen  to hopefully get
-  builds working with autoconf 2.52
-- conditionalize static libnss stuff so that it can go away when we
-  have a mozilla with shared libnss
-
-* Thu Dec  6 2001 Jeremy Katz  1.0-1.7.2
-- add patches off of branch for:
-  * do not show up as Preview Release in version string
-  * have next/previous work with multiple selected messages
-- build without pilot support
-
-* Mon Dec  3 2001 Jeremy Katz  1.0-1
-- and bump to 1.0
-
-* Sun Dec  2 2001 Jeremy Katz 
-- let's build with an included copy of libnss now since OpenSSL is support
-  is disabled on the 1.0 branch
-- build with --enable-dot-locking=no
-- excludearch ia64 again now that we need libnspr
-
-* Mon Nov 26 2001 Jeremy Katz 
-- build with gnome-pilot and krb5 support
-- conditionalize ldap, pilot and krb5 support
-- clean up buildrequires some
-
-* Sat Nov 17 2001 Jeremy Katz 
-- we can build on ia64 since we're using openssl instead of nspr
-- disable non-functional nntp support
-- 0.99.2 (rc2)
-
-* Fri Nov  9 2001 Jeremy Katz 
-- add explicit requires on current bonobo, oaf, and GConf to help people
-  help themselves
-- s/Copyright/License/
-
-* Thu Nov  8 2001 Jeremy Katz 
-- add a patch to revert changes to camel-tcp-stream-openssl; appears to
-  fix the SSL hangs
-
-* Wed Nov  7 2001 Jeremy Katz 
-- fix filelist to include libical zoneinfo
-- add devel subpackage with includes and static libs
-
-* Mon Nov  5 2001 Jeremy Katz 
-- updated to 0.99.0 aka 1.0 RC1
-
-* Tue Oct 23 2001 Havoc Pennington 
-- 0.16 snagged from Ximian GNOME
-
-* Fri Oct  5 2001 Havoc Pennington 
-- initial build based on David Sainty's specfile
-
-* Thu Oct 04 2001 David Sainty 
-- Updated to 0.15.99, 20011004 from cvs.
-
-* Wed Sep 05 2001 David Sainty 
-- Updated to 0.13.99, 20010905 from cvs.
-
-* Mon Sep 03 2001 David Sainty 
-- Updated to 0.13.99, 20010903 from cvs.
-- Fixed Requires + BuildRequires
-
-* Mon Aug 06 2001 David Sainty 
-- Updated to 0.12.99, 20010806 from cvs.
-
-* Mon Aug 06 2001 David Sainty 
-- Relocated libical* from /usr/lib due to kdepim, -2
-
-* Mon Aug 06 2001 David Sainty 
-- First spec file for evolution.
+%autochangelog
diff --git a/sources b/sources
index 205c7cd..92d5a08 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.56.2.tar.xz) = ccfd0c4d8edd5efe2f94bac47459fb9b9b3020f8b1d3bb71057c5600f8ec764b18cd0bb451a37d5ee0e0f68e48873478e8714e919beeab8609754cc9d25dcdef
+SHA512 (evolution-3.57.1.tar.xz) = b7f5c209c8f204b0af6d0b2048a57265b7ff34a2675c0ffec4db009771e69c430376589456d810f6c73dff98999ef94d02642d25c5695dca53166d37ac02ef6e

From 8d7c63d472dfeec4570efafad7787183708c1b26 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Thu, 17 Jul 2025 09:59:42 +0200
Subject: [PATCH 834/844] Do not force a CMake build system generator

---
 evolution.spec | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 3aa2991..309e2df 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -99,7 +99,6 @@ BuildRequires: gtk-doc
 BuildRequires: highlight
 BuildRequires: intltool >= %{intltool_version}
 BuildRequires: itstool
-BuildRequires: make
 BuildRequires: pkgconfig
 BuildRequires: yelp-tools
 
@@ -311,8 +310,7 @@ fi
 CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated-declarations %temp_home"
 export CFLAGS
 
-%cmake -G "Unix Makefiles" \
-	-DENABLE_MAINTAINER_MODE=OFF \
+%cmake -DENABLE_MAINTAINER_MODE=OFF \
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
 	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \
 	-DENABLE_PLUGINS=all \

From cc74a292b6dd3ad34a69b4a36119b7504625d3bc Mon Sep 17 00:00:00 2001
From: Fedora Release Engineering 
Date: Wed, 23 Jul 2025 20:11:10 +0000
Subject: [PATCH 835/844] Rebuilt for
 https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild

---
 evolution.spec | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 309e2df..babb50d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.57.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@@ -599,4 +599,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Wed Jul 23 2025 Fedora Release Engineering  - 3.57.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
+
 %autochangelog

From 1ec7fe02ac1e6e6e509b5d4d7497994bb09e3c95 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 1 Aug 2025 09:45:19 +0200
Subject: [PATCH 836/844] Update to 3.57.2

---
 evolution.spec | 7 ++-----
 sources        | 2 +-
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index babb50d..1268c96 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,8 +43,8 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.57.1
-Release: 2%{?dist}
+Version: 3.57.2
+Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
@@ -599,7 +599,4 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
-* Wed Jul 23 2025 Fedora Release Engineering  - 3.57.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
-
 %autochangelog
diff --git a/sources b/sources
index 92d5a08..82f4abf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.57.1.tar.xz) = b7f5c209c8f204b0af6d0b2048a57265b7ff34a2675c0ffec4db009771e69c430376589456d810f6c73dff98999ef94d02642d25c5695dca53166d37ac02ef6e
+SHA512 (evolution-3.57.2.tar.xz) = eaa7911f48b8d0db33850b18685c14d2f189d58c4d727188a9371594e63363c562493625cc1a2056034be6fc3e8a7fda2de4cbd7ab99343389bba9da63c17424

From b150c7f93f17a1abab4eaea5893fd359873fff0a Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 1 Aug 2025 10:18:26 +0200
Subject: [PATCH 837/844] Appdata file renamed to
 org.gnome.Evolution.metainfo.xml

[skip changelog]
---
 evolution.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 1268c96..6a6fce7 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -405,7 +405,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_bindir}/evolution.bin
 %endif
 
-%{_datadir}/metainfo/org.gnome.Evolution.appdata.xml
+%{_datadir}/metainfo/org.gnome.Evolution.metainfo.xml
 
 # Desktop files:
 %{_datadir}/applications/org.gnome.Evolution.desktop

From b6316f0d61fd919392683d75f8335a4df19964f5 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 29 Aug 2025 09:05:27 +0200
Subject: [PATCH 838/844] Update to 3.57.3

---
 evolution.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 6a6fce7..89242f0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.57.2
+Version: 3.57.3
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
diff --git a/sources b/sources
index 82f4abf..6440788 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.57.2.tar.xz) = eaa7911f48b8d0db33850b18685c14d2f189d58c4d727188a9371594e63363c562493625cc1a2056034be6fc3e8a7fda2de4cbd7ab99343389bba9da63c17424
+SHA512 (evolution-3.57.3.tar.xz) = aa4dca74b21f42d611c96d945c30d852c4025768c27f60a57285791093b6a2e6264fa27e674b50a28e22658bb882f1b9a13d2c2d68b30e6894c7cb92b0613ab8

From 9a02da726bdcd6a02345e66c8dacdf65b712a519 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 12 Sep 2025 09:54:38 +0200
Subject: [PATCH 839/844] Update to 3.58.0

---
 evolution.spec | 4 ++--
 sources        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 89242f0..6542c1b 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.57.3
+Version: 3.58.0
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
-Source: http://download.gnome.org/sources/%{name}/3.57/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.58/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
diff --git a/sources b/sources
index 6440788..40bb72e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.57.3.tar.xz) = aa4dca74b21f42d611c96d945c30d852c4025768c27f60a57285791093b6a2e6264fa27e674b50a28e22658bb882f1b9a13d2c2d68b30e6894c7cb92b0613ab8
+SHA512 (evolution-3.58.0.tar.xz) = 7f4c0d77929cacf58256f9897e4ab23c1003721c70e48c7a7f7f176dad8554aef7696a01b056f5519c583c2f2db4cf22d1c295a3b5c12fdd4d987cb92c98f6d6

From e96e01d89c6dff96a44289c343fcad93c4328887 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 10 Oct 2025 09:37:56 +0200
Subject: [PATCH 840/844] Update to 3.58.1

---
 evolution.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 6542c1b..6a048b5 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.58.0
+Version: 3.58.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
diff --git a/sources b/sources
index 40bb72e..5056bd6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.58.0.tar.xz) = 7f4c0d77929cacf58256f9897e4ab23c1003721c70e48c7a7f7f176dad8554aef7696a01b056f5519c583c2f2db4cf22d1c295a3b5c12fdd4d987cb92c98f6d6
+SHA512 (evolution-3.58.1.tar.xz) = fedec9db00389c6a38162862e306182ccd301df6be8403b34c8bcbce4ef497a5243a7da153d8b037ba68df864839857d775a058d8783a3b26830fcf2e11396c2

From 0b85490400a0a423c028983a4e1e3da3082fb4a2 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 21 Nov 2025 11:28:24 +0100
Subject: [PATCH 841/844] Update to 3.58.2

---
 evolution.spec | 2 +-
 sources        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index 6a048b5..a0e04ae 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,7 +43,7 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.58.1
+Version: 3.58.2
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
diff --git a/sources b/sources
index 5056bd6..058f272 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.58.1.tar.xz) = fedec9db00389c6a38162862e306182ccd301df6be8403b34c8bcbce4ef497a5243a7da153d8b037ba68df864839857d775a058d8783a3b26830fcf2e11396c2
+SHA512 (evolution-3.58.2.tar.xz) = 6fe7fc2a780296b7c30a46e327df4b12458607476b86327d89377fc6e97e9aa57bed250430e03a64430f0b352a3b2395b59550f0cdc343857238d71bc05c15b1

From 984c082a4a81d58158905843a90e2e6fb8c31111 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Fri, 2 Jan 2026 11:04:08 +0100
Subject: [PATCH 842/844] Update to 3.59.1

---
 evolution.spec | 4 ++--
 sources        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/evolution.spec b/evolution.spec
index a0e04ae..3b136d5 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -43,12 +43,12 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.58.2
+Version: 3.59.1
 Release: 1%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home
-Source: http://download.gnome.org/sources/%{name}/3.58/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.59/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
diff --git a/sources b/sources
index 058f272..b11ec23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.58.2.tar.xz) = 6fe7fc2a780296b7c30a46e327df4b12458607476b86327d89377fc6e97e9aa57bed250430e03a64430f0b352a3b2395b59550f0cdc343857238d71bc05c15b1
+SHA512 (evolution-3.59.1.tar.xz) = 26d6d4dfcdbc3d89f88d9e24096c7ff910d221119def75d7f80a397f682be96860726832c7c62b46769ce9cfcc15e5844cbcc016facc9b21b4eb9bbb2c17360d

From a485cde8d21544c01600838187a97c25f62a9d29 Mon Sep 17 00:00:00 2001
From: Milan Crha 
Date: Sun, 4 Jan 2026 09:45:06 +0100
Subject: [PATCH 843/844] Add libevcardeditor.so

[skip changelog]
---
 evolution.spec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/evolution.spec b/evolution.spec
index 3b136d5..25ebda4 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -480,6 +480,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %{_libdir}/evolution/libecontactlisteditor.so
 %{_libdir}/evolution/libecontactprint.so
 %{_libdir}/evolution/libemail-engine.so
+%{_libdir}/evolution/libevcardeditor.so
 %{_libdir}/evolution/libevolution-mail-formatter.so
 %{_libdir}/evolution/libevolution-shell.so
 %{_libdir}/evolution/libessmime.so

From 7c43580f7767f6abc68574dbf1d307ec1570f137 Mon Sep 17 00:00:00 2001
From: Jens Petersen 
Date: Mon, 5 Jan 2026 16:15:40 +0800
Subject: [PATCH 844/844] rebuild for F44
 https://fedoraproject.org/wiki/Changes/cmark-0.31

---
 evolution.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evolution.spec b/evolution.spec
index 25ebda4..527cd79 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 3.59.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPL-2.0-or-later AND GFDL-1.3-or-later
 URL: https://gitlab.gnome.org/GNOME/evolution/-/wikis/home