4 files changed, 10 insertions, 86 deletions
diff --git a/mail/evolution/files/fix-plugins.sh b/mail/evolution/files/fix-plugins.sh
deleted file mode 100644
index b0171dcb5d0a..000000000000
--- a/mail/evolution/files/fix-plugins.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/sh
-
-plugin_srcs="attachment-reminder/attachment-reminder.c bbdb/bbdb.c dbx-import/dbx-importer.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c image-inline/image-inline.c mail-notification/mail-notification.c mail-to-task/mail-to-task.c mailing-list-actions/mailing-list-actions.c mark-all-read/mark-all-read.c pst-import/pst-importer.c publish-calendar/publish-calendar.c save-calendar/save-calendar.c templates/templates.c"
-
-module_srcs="addressbook/evolution-module-addressbook.c audio-inline/evolution-module-audio-inline.c backup-restore/evolution-backup-tool.c bogofilter/evolution-bogofilter.c book-config-google/evolution-book-config-google.c book-config-ldap/evolution-book-config-ldap.c book-config-local/evolution-book-config-local.c book-config-webdav/evolution-book-config-webdav.c cal-config-caldav/evolution-cal-config-caldav.c cal-config-contacts/evolution-cal-config-contacts.c cal-config-google/evolution-cal-config-google.c cal-config-local/evolution-cal-config-local.c cal-config-weather/evolution-cal-config-weather.c cal-config-webcal/evolution-cal-config-webcal.c calendar/evolution-module-calendar.c composer-autosave/evolution-composer-autosave.c imap-features/evolution-imap-features.c itip-formatter/itip-view.c itip-formatter/plugin/config-ui.c mail-config/evolution-mail-config.c mail/evolution-module-mail.c mailto-handler/evolution-mailto-handler.c mdn/evolution-mdn.c offline-alert/evolution-offline-alert.c online-accounts/evolution-online-accounts.c plugin-lib/evolution-module-plugin-lib.c plugin-manager/evolution-plugin-manager.c prefer-plain/evolution-module-prefer-plain.c prefer-plain/plugin/config-ui.c spamassassin/evolution-spamassassin.c startup-wizard/evolution-startup-wizard.c text-highlight/languages.c tnef-attachment/evolution-module-tnef-attachment.c vcard-inline/evolution-module-vcard-inline.c web-inspector/evolution-web-inspector.c"
-
-WRKSRC=$1
-
-for i in ${plugin_srcs}; do
-    if [ ! -f ${WRKSRC}/plugins/${i} ]; then
-	echo "WARNING: Failed to find plugin source file ${WRKSRC}/plugins/${i}"
-	continue
-    fi
-    cp ${WRKSRC}/plugins/${i} ${WRKSRC}/plugins/${i}.bak
-    printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/plugins/${i}
-    printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/plugins/${i}
-    printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/plugins/${i}
-    printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/plugins/${i}
-    dir=$(dirname ${WRKSRC}/plugins/${i})
-    if ! grep -q e_plugin_lib_enable ${dir}/*.c; then
-	printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i}
-	printf "gint e_plugin_lib_enable (EPlugin *ep, gint enable);\n" >> ${WRKSRC}/plugins/${i}
-	printf "gint\ne_plugin_lib_enable (EPlugin *ep, gint enable) {\n\treturn 0;\n}\n" >> ${WRKSRC}/plugins/${i}
-    fi
-    if ! grep -q e_plugin_lib_get_configure_widget ${dir}/*.c; then
-	printf "#include <e-util/e-config.h>\n" >> ${WRKSRC}/plugins/${i}
-	printf "GtkWidget *e_plugin_lib_get_configure_widget (EPlugin *plugin);\n" >> ${WRKSRC}/plugins/${i}
-	printf "GtkWidget *\ne_plugin_lib_get_configure_widget (EPlugin *plugin) {\n\treturn NULL;\n}" >> ${WRKSRC}/plugins/${i}
-    fi
-done
-
-for i in ${module_srcs}; do
-    if [ ! -f ${WRKSRC}/modules/${i} ]; then
-	echo "WARNING: Failed to find module source file ${WRKSRC}/modules/${i}"
-	continue
-    fi
-    cp ${WRKSRC}/modules/${i} ${WRKSRC}/modules/${i}.bak
-    dir=$(dirname ${WRKSRC}/modules/${i})
-    if ! grep -q g_module_check_init ${dir}/*.c; then
-        printf "const char * g_module_check_init (gpointer module);\n" >> ${WRKSRC}/modules/${i}
-        printf "const char *\ng_module_check_init (gpointer module) {\n\treturn NULL;\n}\n" >> ${WRKSRC}/modules/${i}
-    fi
-    if ! grep g_module_unload ${dir}/*.c; then
-        printf "void g_module_unload (gpointer module);\n" >> ${WRKSRC}/modules/${i}
-        printf "void\ng_module_unload (gpointer module) {\n\treturn;\n}\n" >> ${WRKSRC}/modules/${i}
-    fi
-done
-
diff --git a/mail/evolution/files/patch-CMakeLists.txt b/mail/evolution/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..990927751b35
--- /dev/null
+++ b/mail/evolution/files/patch-CMakeLists.txt
@@ -0,0 +1,10 @@
+--- CMakeLists.txt.orig	2017-06-08 20:52:16.741243000 +0200
++++ CMakeLists.txt	2017-06-08 20:52:25.747544000 +0200
+@@ -329,6 +329,7 @@
+ # ******************************
+ 
+ set(CMAKE_REQUIRED_LIBRARIES "-liconv")
++set(CMAKE_REQUIRED_FLAGS "-L/usr/local/lib")
+ CHECK_C_SOURCE_COMPILES("#include <iconv.h>
+ 			#include <stdlib.h>
+ 			int main(void) { iconv_t cd; cd = iconv_open (\"UTF-8\", \"ISO-8859-1\"); return 0; }" HAVE_LIBICONV)
diff --git a/mail/evolution/files/patch-configure b/mail/evolution/files/patch-configure
deleted file mode 100644
index 1c7bafc75817..000000000000
--- a/mail/evolution/files/patch-configure
+++ /dev/null
@@ -1,19 +0,0 @@
---- configure.orig	2011-01-26 18:09:29.000000000 +0000
-+++ configure	2011-01-26 18:11:16.000000000 +0000
-@@ -15450,6 +15450,16 @@
- 	CHAMPLAIN_REQUIREMENT=''
- 	GEOCLUE_REQUIREMENT=''
- 	;;
-+*freebsd*)
-+	os_win32=no
-+	NO_UNDEFINED=''
-+	SOCKET_LIBS=''
-+	SOEXT='.so'
-+	SA_JUNK_PLUGIN=sa-junk-plugin
-+	BF_JUNK_PLUGIN=bogo-junk-plugin
-+	DL_LIB=''
-+	SOFTOKN3_LIB='-lsoftokn3'
-+	;;
- *)
- 	os_win32=no
- 	NO_UNDEFINED='-no-undefined'
diff --git a/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c b/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
deleted file mode 100644
index 0df6bd970168..000000000000
--- a/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- modules/addressbook/evolution-module-addressbook.c.orig	2010-04-11 12:47:18.000000000 -0400
-+++ modules/addressbook/evolution-module-addressbook.c	2010-04-11 12:48:06.000000000 -0400
-@@ -47,3 +47,16 @@ G_MODULE_EXPORT void
- e_module_unload (GTypeModule *type_module)
- {
- }
-+
-+G_MODULE_EXPORT const gchar *
-+g_module_check_init (GModule *module)
-+{
-+	/* FIXME Until addressbook is split into a module library and a
-+	 *       reusable shared library, prevent the module from
-+	 *       being unloaded.  Unloading the module resets all
-+	 *       static variables, which screws up foo_get_type()
-+	 *       functions among other things. */
-+	g_module_make_resident (module);
-+
-+	return NULL;
-+}