Ensure that all plugins have e_lib_plugin_enable defined so that

Evolution starts in a few seconds instead of a few minutes on NetBSD.

29 files changed, 492 insertions, 3 deletions

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index fcdc3bcc73b..b329c7360bb 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.157 2010/01/18 09:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.158 2010/02/19 22:48:13 roy Exp $
 
 DISTNAME=		evolution-2.28.2
-PKGREVISION=		2
+PKGREVISION=		3
 CATEGORIES=		mail time gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/evolution/2.28/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index 043b201b230..d77950ad4cc 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,9 +1,36 @@
-$NetBSD: distinfo,v 1.72 2009/12/16 18:00:23 drochner Exp $
+$NetBSD: distinfo,v 1.73 2010/02/19 22:48:13 roy Exp $
 
 SHA1 (evolution-2.28.2.tar.bz2) = 19e970417cc91c82a5279cfe5dd7262d9d4c3319
 RMD160 (evolution-2.28.2.tar.bz2) = 6e5f5ae60563fdaa9daa4c78f780cfa556770043
 Size (evolution-2.28.2.tar.bz2) = 29735192 bytes
 SHA1 (patch-ab) = b56533feb1bf7d3c3eabf905a50a54e7f27f5b1c
+SHA1 (patch-ca) = f67561447b6051f70d495df890bc65e8416c511d
+SHA1 (patch-cb) = 02449e5b7989af88cc02bf9013d4748648e36046
+SHA1 (patch-cc) = 92d1990b7d228da741e8257fcab569d69f18bd8a
+SHA1 (patch-cd) = 31ce3c8954af07477b551abb3c01261af074cd8f
+SHA1 (patch-ce) = 95d67c612faeaa1b2998bd86aee8b5d8ede653ea
+SHA1 (patch-cf) = d0077fa9d02000cfc23d8218fcb2baf2a1e61f1a
+SHA1 (patch-cg) = df0760ca4f57d6d44c23d313d2d6810e345afafe
+SHA1 (patch-ch) = 85c31baaee399aae39230e0979a75f16c8e4dac3
+SHA1 (patch-ci) = ffa4ddb9c9c40e942c72e2d11bc474b698ee1513
+SHA1 (patch-cj) = d45c2c4a6371b141db3a02c7a8f50866d69c99cd
+SHA1 (patch-ck) = 7c7705e7a079cfe3ab8e9547786aa026be7e86df
+SHA1 (patch-cl) = 83a00a4b0471670a33c2d6fd51d3bc4c3d0ea341
+SHA1 (patch-cm) = a004c5456e1a8b2fbbdb99791185b4175ceac546
+SHA1 (patch-cn) = 6d0bf2e43c463613374c2644477a36efa6e71058
+SHA1 (patch-co) = 0071a8eb18ea57f24749cf532331aef37018eaec
+SHA1 (patch-cp) = cc0c3d134bd2a747a4024580f711b8ac511e6a2f
+SHA1 (patch-cq) = 4a00b7e5ed422bb1e057967207ed885250129bb6
+SHA1 (patch-cr) = a176efd68421d5591a5837df840982d7c612a712
+SHA1 (patch-cs) = 09df5b7d2b226b1e42eacd8fa9becf8098d77943
+SHA1 (patch-ct) = c82eb6d4704a71298841f4e3f0b5874a2850ad59
+SHA1 (patch-cu) = 4124133aa32ee2a23dc1ca710dc073f4ffdc17df
+SHA1 (patch-cv) = 1dc3b44452879a666c4f5acbb847897a4e96b66e
+SHA1 (patch-cw) = 8ea346f4f7e95351d0d2ee9ae2bfb40c3be4f06f
+SHA1 (patch-cx) = 8f70dffa5c9342d641df0f813a6b4d34361f933e
+SHA1 (patch-cy) = 31f5f95d90054f6e88d07bf650348a2c51fe11b8
+SHA1 (patch-cz) = 2b175c7409a7de919445a65ffbd6848bbe2bf42d
+SHA1 (patch-da) = 2bf34f62983139d7fa13a5a782fe955dabcc93ae
 SHA1 (patch-ya) = f21a92e93394ad76166f2da09ee21cbddb043576
 SHA1 (patch-yb) = 6d09dceb5405b29cde657eea6fa0fbd004a8bd1f
 SHA1 (patch-yc) = dc97fda0d5fc05df37274192466702e7fe9da4e0
diff --git a/mail/evolution/patches/patch-ca b/mail/evolution/patches/patch-ca
new file mode 100644
index 00000000000..58fafb15fce
--- /dev/null
+++ b/mail/evolution/patches/patch-ca
@@ -0,0 +1,17 @@
+--- plugins/addressbook-file/addressbook-file.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/addressbook-file/addressbook-file.c	2010-02-19 10:00:39.000000000 +0000
+@@ -25,6 +25,14 @@
+ #include <libedataserver/e-source.h>
+ #include <string.h>
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ GtkWidget *e_book_file_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
+ 
+ GtkWidget *
diff --git a/mail/evolution/patches/patch-cb b/mail/evolution/patches/patch-cb
new file mode 100644
index 00000000000..ec65348177f
--- /dev/null
+++ b/mail/evolution/patches/patch-cb
@@ -0,0 +1,17 @@
+--- plugins/audio-inline/audio-inline.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/audio-inline/audio-inline.c	2010-02-19 10:05:00.000000000 +0000
+@@ -38,6 +38,14 @@
+ 
+ #define d(x)
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ void org_gnome_audio_inline_format (gpointer ep, EMFormatHookTarget *t);
+ 
+ static volatile gint org_gnome_audio_class_id_counter = 0;
diff --git a/mail/evolution/patches/patch-cc b/mail/evolution/patches/patch-cc
new file mode 100644
index 00000000000..8ffd830fb57
--- /dev/null
+++ b/mail/evolution/patches/patch-cc
@@ -0,0 +1,17 @@
+--- plugins/backup-restore/backup-restore.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/backup-restore/backup-restore.c	2010-02-19 10:05:59.000000000 +0000
+@@ -51,6 +51,14 @@
+ 	BR_START = 1<<1
+ }br_flags;
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ static void
+ backup (const gchar *filename, gboolean restart)
+ {
diff --git a/mail/evolution/patches/patch-cd b/mail/evolution/patches/patch-cd
new file mode 100644
index 00000000000..c224628fe1a
--- /dev/null
+++ b/mail/evolution/patches/patch-cd
@@ -0,0 +1,17 @@
+--- plugins/calendar-file/calendar-file.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/calendar-file/calendar-file.c	2010-02-19 10:06:46.000000000 +0000
+@@ -27,6 +27,14 @@
+ #include <glib/gi18n.h>
+ #include <string.h>
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ static void
+ location_changed (GtkFileChooserButton *widget, ESource *source)
+ {
diff --git a/mail/evolution/patches/patch-ce b/mail/evolution/patches/patch-ce
new file mode 100644
index 00000000000..87e14efcfca
--- /dev/null
+++ b/mail/evolution/patches/patch-ce
@@ -0,0 +1,17 @@
+--- plugins/calendar-http/calendar-http.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/calendar-http/calendar-http.c	2010-02-19 10:07:24.000000000 +0000
+@@ -33,6 +33,14 @@
+ GtkWidget * e_calendar_http_secure (EPlugin *epl, EConfigHookItemFactoryData *data);
+ GtkWidget *e_calendar_http_auth (EPlugin *epl, EConfigHookItemFactoryData *data);
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ /* replaces all '@' with '%40' in str; returns newly allocated string */
+ static gchar *
+ replace_at_sign (const gchar *str)
diff --git a/mail/evolution/patches/patch-cf b/mail/evolution/patches/patch-cf
new file mode 100644
index 00000000000..bb3df703fe0
--- /dev/null
+++ b/mail/evolution/patches/patch-cf
@@ -0,0 +1,16 @@
+--- plugins/copy-tool/copy-tool.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/copy-tool/copy-tool.c	2010-02-19 10:08:30.000000000 +0000
+@@ -40,6 +40,13 @@
+ #include "camel/camel-url.h"
+ 
+ void org_gnome_copy_tool_copy_address(gpointer ep, EMPopupTargetURI *t);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ void
+ org_gnome_copy_tool_copy_address(gpointer ep, EMPopupTargetURI *t)
diff --git a/mail/evolution/patches/patch-cg b/mail/evolution/patches/patch-cg
new file mode 100644
index 00000000000..b53297686e6
--- /dev/null
+++ b/mail/evolution/patches/patch-cg
@@ -0,0 +1,16 @@
+--- plugins/default-mailer/default-mailer.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/default-mailer/default-mailer.c	2010-02-19 10:09:06.000000000 +0000
+@@ -36,6 +36,13 @@
+ #define EVOLUTION_MAILTO_COMMAND "evolution --component=mail %s"
+ 
+ void org_gnome_default_mailer_check_default (EPlugin *ep, ESEventTargetUpgrade *target);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static gboolean
+ evolution_is_default_mailer (const gchar *mailto_command)
diff --git a/mail/evolution/patches/patch-ch b/mail/evolution/patches/patch-ch
new file mode 100644
index 00000000000..64f93ddbb4c
--- /dev/null
+++ b/mail/evolution/patches/patch-ch
@@ -0,0 +1,21 @@
+--- plugins/default-source/default-source.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/default-source/default-source.c	2010-02-19 10:09:52.000000000 +0000
+@@ -30,9 +30,18 @@
+ #include <libedataserver/e-source.h>
+ #include <glib/gi18n.h>
+ #include <string.h>
++
+ GtkWidget* org_gnome_default_book (EPlugin *epl, EConfigHookItemFactoryData *data);
+ void commit_default_calendar (EPlugin *epl, EConfigTarget *target);
+ void commit_default_book (EPlugin *epl, EConfigTarget *target);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ void
+ commit_default_calendar (EPlugin *epl, EConfigTarget *target)
+ {
diff --git a/mail/evolution/patches/patch-ci b/mail/evolution/patches/patch-ci
new file mode 100644
index 00000000000..11fb286997e
--- /dev/null
+++ b/mail/evolution/patches/patch-ci
@@ -0,0 +1,17 @@
+--- plugins/external-editor/external-editor.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/external-editor/external-editor.c	2010-02-19 10:10:23.000000000 +0000
+@@ -66,6 +66,14 @@
+ /* used to track when the external editor is active */
+ static GThread *editor_thread;
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ void
+ ee_editor_command_changed (GtkWidget *textbox)
+ {
diff --git a/mail/evolution/patches/patch-cj b/mail/evolution/patches/patch-cj
new file mode 100644
index 00000000000..c14dff7d246
--- /dev/null
+++ b/mail/evolution/patches/patch-cj
@@ -0,0 +1,16 @@
+--- plugins/face/face.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/face/face.c	2010-02-19 10:10:39.000000000 +0000
+@@ -36,6 +36,13 @@
+ 
+ gboolean	e_plugin_ui_init		(GtkUIManager *ui_manager,
+ 						 EMsgComposer *composer);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static void
+ action_face_cb (GtkAction *action,
diff --git a/mail/evolution/patches/patch-ck b/mail/evolution/patches/patch-ck
new file mode 100644
index 00000000000..956a49ff55e
--- /dev/null
+++ b/mail/evolution/patches/patch-ck
@@ -0,0 +1,17 @@
+--- plugins/folder-unsubscribe/folder-unsubscribe.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/folder-unsubscribe/folder-unsubscribe.c	2010-02-19 10:11:06.000000000 +0000
+@@ -46,6 +46,14 @@
+ 	gchar *uri;
+ };
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ static gchar *
+ folder_unsubscribe_desc (struct _folder_unsub_t *msg)
+ {
diff --git a/mail/evolution/patches/patch-cl b/mail/evolution/patches/patch-cl
new file mode 100644
index 00000000000..8252fd1c7bc
--- /dev/null
+++ b/mail/evolution/patches/patch-cl
@@ -0,0 +1,16 @@
+--- plugins/groupwise-features/addressbook-groupwise.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/groupwise-features/addressbook-groupwise.c	2010-02-19 10:14:02.000000000 +0000
+@@ -28,6 +28,13 @@
+ 
+ void commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target);
+ GtkWidget *e_book_groupwise_dummy (EPlugin *epl, EConfigHookItemFactoryData *data);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ void
+ commit_groupwise_addressbook (EPlugin *epl, EConfigTarget *target)
diff --git a/mail/evolution/patches/patch-cm b/mail/evolution/patches/patch-cm
new file mode 100644
index 00000000000..8bf9f2e5243
--- /dev/null
+++ b/mail/evolution/patches/patch-cm
@@ -0,0 +1,16 @@
+--- plugins/imap-features/imap-headers.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/imap-features/imap-headers.c	2010-02-19 10:20:02.000000000 +0000
+@@ -64,6 +64,13 @@
+ void imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data);
+ void imap_headers_commit (EPlugin *efp, EConfigHookItemFactoryData *data);
+ GtkWidget * org_gnome_imap_headers (EPlugin *epl, EConfigHookItemFactoryData *data);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ void
+ imap_headers_abort (EPlugin *efp, EConfigHookItemFactoryData *data)
diff --git a/mail/evolution/patches/patch-cn b/mail/evolution/patches/patch-cn
new file mode 100644
index 00000000000..bd3806750a5
--- /dev/null
+++ b/mail/evolution/patches/patch-cn
@@ -0,0 +1,16 @@
+--- plugins/ipod-sync/ipod-sync.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/ipod-sync/ipod-sync.c	2010-02-19 10:20:31.000000000 +0000
+@@ -53,6 +53,13 @@
+ void org_gnome_sync_tasks (EPlugin *ep, ECalPopupTargetSource *target);
+ void org_gnome_sync_memos (EPlugin *ep, ECalPopupTargetSource *target);
+ void org_gnome_sync_addressbook (EPlugin *ep, EABPopupTargetSource *target);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static void
+ display_error_message (GtkWidget *parent, const gchar *message)
diff --git a/mail/evolution/patches/patch-co b/mail/evolution/patches/patch-co
new file mode 100644
index 00000000000..3d8cfe1feb9
--- /dev/null
+++ b/mail/evolution/patches/patch-co
@@ -0,0 +1,23 @@
+--- plugins/itip-formatter/itip-formatter.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/itip-formatter/itip-formatter.c	2010-02-19 10:21:46.000000000 +0000
+@@ -142,6 +142,7 @@
+ void format_itip (EPlugin *ep, EMFormatHookTarget *target);
+ GtkWidget *itip_formatter_page_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
+ static void itip_attachment_frame(EMFormat *emf, CamelStream *stream, EMFormatPURI *puri);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
+ 
+ typedef struct {
+ 	struct _itip_puri *puri;
+@@ -157,6 +158,12 @@
+ 
+ static gboolean check_is_instance (icalcomponent *icalcomp);
+ 
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ static icalproperty *
+ find_attendee (icalcomponent *ical_comp, const gchar *address)
+ {
diff --git a/mail/evolution/patches/patch-cp b/mail/evolution/patches/patch-cp
new file mode 100644
index 00000000000..52627c08d99
--- /dev/null
+++ b/mail/evolution/patches/patch-cp
@@ -0,0 +1,17 @@
+--- plugins/mail-account-disable/mail-account-disable.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/mail-account-disable/mail-account-disable.c	2010-02-19 10:22:12.000000000 +0000
+@@ -46,6 +46,14 @@
+ 	{ E_POPUP_ITEM, (gchar *) "40.emc.04", (gchar *) N_("Proxy _Logout"), mail_account_disable, NULL, NULL, 0, EM_POPUP_FOLDER_STORE }
+ };
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ static void
+ popup_free (EPopup *ep, GSList *items, gpointer data)
+ {
diff --git a/mail/evolution/patches/patch-cq b/mail/evolution/patches/patch-cq
new file mode 100644
index 00000000000..f9e06c6d5b4
--- /dev/null
+++ b/mail/evolution/patches/patch-cq
@@ -0,0 +1,17 @@
+--- plugins/mailing-list-actions/mailing-list-actions.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/mailing-list-actions/mailing-list-actions.c	2010-02-19 10:22:42.000000000 +0000
+@@ -87,6 +87,14 @@
+ 	gchar * uri;
+ } emla_action_data;
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ void emla_list_action (EPlugin *item, EMMenuTargetSelect* sel, EmlaAction action)
+ {
+ 	emla_action_data *data;
diff --git a/mail/evolution/patches/patch-cr b/mail/evolution/patches/patch-cr
new file mode 100644
index 00000000000..141f856877c
--- /dev/null
+++ b/mail/evolution/patches/patch-cr
@@ -0,0 +1,16 @@
+--- plugins/mark-all-read/mark-all-read.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/mark-all-read/mark-all-read.c	2010-02-19 10:23:03.000000000 +0000
+@@ -44,6 +44,13 @@
+ void org_gnome_mark_all_read (EPlugin *ep, EMPopupTargetFolder *target);
+ static void mar_got_folder (gchar *uri, CamelFolder *folder, gpointer data);
+ static void mar_all_sub_folders (CamelStore *store, CamelFolderInfo *fi, CamelException *ex);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static void
+ button_clicked_cb (GtkButton *button,
diff --git a/mail/evolution/patches/patch-cs b/mail/evolution/patches/patch-cs
new file mode 100644
index 00000000000..292e89596ab
--- /dev/null
+++ b/mail/evolution/patches/patch-cs
@@ -0,0 +1,16 @@
+--- plugins/mono/mono-plugin.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/mono/mono-plugin.c	2010-02-19 10:23:31.000000000 +0000
+@@ -49,6 +49,13 @@
+ #define epm ((EPluginMono *)ep)
+ 
+ gpointer  load_plugin_type_register_function (gpointer a, gpointer b);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static gchar *
+ get_xml_prop(xmlNodePtr node, const gchar *id)
diff --git a/mail/evolution/patches/patch-ct b/mail/evolution/patches/patch-ct
new file mode 100644
index 00000000000..1b2b5df684b
--- /dev/null
+++ b/mail/evolution/patches/patch-ct
@@ -0,0 +1,17 @@
+--- plugins/profiler/profiler.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/profiler/profiler.c	2010-02-19 10:23:59.000000000 +0000
+@@ -32,6 +32,14 @@
+ #include <glib.h>
+ #include <e-util/e-profile-event.h>
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ void
+ org_gnome_evolution_profiler_event(EPlugin *ep, EProfileEventTarget *t)
+ {
diff --git a/mail/evolution/patches/patch-cu b/mail/evolution/patches/patch-cu
new file mode 100644
index 00000000000..bc555602333
--- /dev/null
+++ b/mail/evolution/patches/patch-cu
@@ -0,0 +1,16 @@
+--- plugins/python/python-plugin-loader.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/python/python-plugin-loader.c	2010-02-19 10:29:40.000000000 +0000
+@@ -42,6 +42,13 @@
+ #define epp ((EPluginPython *)ep)
+ 
+ gpointer  load_plugin_type_register_function (gpointer a, gpointer b);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static gchar *
+ get_xml_prop(xmlNodePtr node, const gchar *id)
diff --git a/mail/evolution/patches/patch-cv b/mail/evolution/patches/patch-cv
new file mode 100644
index 00000000000..a284894bbca
--- /dev/null
+++ b/mail/evolution/patches/patch-cv
@@ -0,0 +1,16 @@
+--- plugins/save-calendar/save-calendar.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/save-calendar/save-calendar.c	2010-02-19 10:24:36.000000000 +0000
+@@ -49,6 +49,13 @@
+ void org_gnome_save_calendar (EPlugin *ep, ECalPopupTargetSource *target);
+ void org_gnome_save_tasks (EPlugin *ep, ECalPopupTargetSource *target);
+ void org_gnome_save_memos (EPlugin *ep, ECalPopupTargetSource *target);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static void
+ extra_widget_foreach_hide (GtkWidget *widget, gpointer data)
diff --git a/mail/evolution/patches/patch-cw b/mail/evolution/patches/patch-cw
new file mode 100644
index 00000000000..5266057ec7d
--- /dev/null
+++ b/mail/evolution/patches/patch-cw
@@ -0,0 +1,16 @@
+--- plugins/select-one-source/select-one-source.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/select-one-source/select-one-source.c	2010-02-19 10:24:55.000000000 +0000
+@@ -31,6 +31,13 @@
+ #include <calendar/gui/e-cal-popup.h>
+ 
+ void org_gnome_select_one_source (EPlugin *ep, ECalPopupTargetSource *target);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ void
+ org_gnome_select_one_source (EPlugin *ep, ECalPopupTargetSource *target)
diff --git a/mail/evolution/patches/patch-cx b/mail/evolution/patches/patch-cx
new file mode 100644
index 00000000000..272337d38fa
--- /dev/null
+++ b/mail/evolution/patches/patch-cx
@@ -0,0 +1,23 @@
+--- plugins/startup-wizard/startup-wizard.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/startup-wizard/startup-wizard.c	2010-02-19 10:25:21.000000000 +0000
+@@ -34,6 +34,7 @@
+ #include "mail/em-account-editor.h"
+ #include "calendar/gui/calendar-config.h"
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
+ void startup_wizard (EPlugin *ep, ESEventTargetUpgrade *target);
+ GtkWidget *startup_wizard_importer_page (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
+ gboolean startup_wizard_check (EPlugin *ep, EConfigHookPageCheckData *check_data);
+@@ -46,6 +47,12 @@
+ static GtkWidget *import_dialog, *import_progress, *import_label;
+ static GSList *import_iterator, *import_importers;
+ 
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ G_GNUC_NORETURN static void
+ startup_wizard_delete (void) {
+ 	gtk_main_quit ();
diff --git a/mail/evolution/patches/patch-cy b/mail/evolution/patches/patch-cy
new file mode 100644
index 00000000000..e4ac1fde697
--- /dev/null
+++ b/mail/evolution/patches/patch-cy
@@ -0,0 +1,16 @@
+--- plugins/subject-thread/subject-thread.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/subject-thread/subject-thread.c	2010-02-19 10:25:38.000000000 +0000
+@@ -36,6 +36,13 @@
+ #define GCONF_KEY "/apps/evolution/mail/display/thread_subject"
+ 
+ GtkWidget *org_gnome_subject_thread_factory (EPlugin *ep, EConfigHookItemFactoryData *hook_data);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static void
+ toggled_cb (GtkWidget *widget, EConfig *config)
diff --git a/mail/evolution/patches/patch-cz b/mail/evolution/patches/patch-cz
new file mode 100644
index 00000000000..66c3536adda
--- /dev/null
+++ b/mail/evolution/patches/patch-cz
@@ -0,0 +1,17 @@
+--- plugins/templates/templates.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/templates/templates.c	2010-02-19 10:26:03.000000000 +0000
+@@ -102,6 +102,14 @@
+ static gboolean clue_foreach_check_isempty (GtkTreeModel *model, GtkTreePath
+ 					*path, GtkTreeIter *iter, UIData *ui);
+ 
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
++
+ static void
+ selection_changed (GtkTreeSelection *selection, UIData *ui)
+ {
diff --git a/mail/evolution/patches/patch-da b/mail/evolution/patches/patch-da
new file mode 100644
index 00000000000..f3e714613c9
--- /dev/null
+++ b/mail/evolution/patches/patch-da
@@ -0,0 +1,16 @@
+--- plugins/vcard-inline/vcard-inline.c	2010-02-19 08:21:55.000000000 +0000
++++ plugins/vcard-inline/vcard-inline.c	2010-02-19 10:26:24.000000000 +0000
+@@ -53,6 +53,13 @@
+ 
+ /* Forward Declarations */
+ void org_gnome_vcard_inline_format (gpointer ep, EMFormatHookTarget *target);
++gint e_plugin_lib_enable (EPluginLib *ep, gint enable);
++
++gint
++e_plugin_lib_enable (EPluginLib *ep, gint enable)
++{
++	return 0;
++}
+ 
+ static void
+ org_gnome_vcard_inline_pobject_free (EMFormatHTMLPObject *object)