summaryrefslogtreecommitdiff
path: root/mail/evolution/files
diff options
context:
space:
mode:
Diffstat (limited to 'mail/evolution/files')
-rw-r--r--mail/evolution/files/fix-plugins.sh49
-rw-r--r--mail/evolution/files/patch-aa45
-rw-r--r--mail/evolution/files/patch-mail_em-migrate.c11
-rw-r--r--mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c19
-rw-r--r--mail/evolution/files/patch-plugins_exchange-operations_Makefile.in10
5 files changed, 86 insertions, 48 deletions
diff --git a/mail/evolution/files/fix-plugins.sh b/mail/evolution/files/fix-plugins.sh
new file mode 100644
index 000000000000..76216fa1ab67
--- /dev/null
+++ b/mail/evolution/files/fix-plugins.sh
@@ -0,0 +1,49 @@
+#!/bin/sh
+
+plugin_srcs="addressbook-file/addressbook-file.c attachment-reminder/attachment-reminder.c audio-inline/audio-inline.c backup-restore/backup-restore.c bbdb/bbdb.c bogo-junk-plugin/bf-junk-filter.c caldav/caldav-source.c calendar-file/calendar-file.c calendar-http/calendar-http.c calendar-weather/calendar-weather.c contacts-map/contacts-map.c default-mailer/default-mailer.c default-source/default-source.c email-custom-header/email-custom-header.c external-editor/external-editor.c face/face.c google-account-setup/google-source.c groupwise-features/install-shared.c hula-account-setup/hula-account-setup.c image-inline/image-inline.c imap-features/imap-headers.c itip-formatter/itip-formatter.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 plugin-manager/plugin-manager.c prefer-plain/prefer-plain.c profiler/profiler.c pst-import/pst-importer.c publish-calendar/publish-calendar.c sa-junk-plugin/em-junk-filter.c save-calendar/save-calendar.c startup-wizard/startup-wizard.c subject-thread/subject-thread.c templates/templates.c tnef-attachments/tnef-plugin.c vcard-inline/vcard-inline.c webdav-account-setup/webdav-contacts-source.c"
+
+module_srcs="addressbook/evolution-module-addressbook.c calendar/evolution-module-calendar.c mail/evolution-module-mail.c plugin-lib/evolution-module-plugin-lib.c plugin-mono/evolution-module-plugin-mono.c plugin-python/evolution-module-plugin-python.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-aa b/mail/evolution/files/patch-aa
index 44b3591906fe..3b9eb70943d4 100644
--- a/mail/evolution/files/patch-aa
+++ b/mail/evolution/files/patch-aa
@@ -1,10 +1,20 @@
---- configure.orig 2009-08-24 11:10:44.000000000 +0200
-+++ configure 2009-08-24 11:13:05.000000000 +0200
-@@ -16389,6 +16389,16 @@ case "$host" in
- SOFTOKN3_LIB=''
- HAL_REQUIREMENT=''
+--- configure.orig 2009-12-26 20:42:20.000000000 +0100
++++ configure 2009-12-26 20:49:17.000000000 +0100
+@@ -4329,7 +4329,7 @@
+ -Wdeclaration-after-statement
+ -Werror-implicit-function-declaration
+ -Wformat-security -Winit-self
+- -Wmissing-declarations -Wmissing-include-dirs
++ -Wmissing-declarations
+ -Wmissing-noreturn -Wnested-externs -Wpointer-arith
+ -Wredundant-decls -Wundef -Wwrite-strings"
+ flags_supported=""
+@@ -16441,6 +16441,16 @@
+ CHAMPLAIN_REQUIREMENT=''
+ GEOCLUE_REQUIREMENT=''
;;
-+*freebsd*) os_win32=no
++*freebsd*)
++ os_win32=no
+ NO_UNDEFINED=''
+ SOCKET_LIBS=''
+ SOEXT='.so'
@@ -12,12 +22,11 @@
+ BF_JUNK_PLUGIN=bogo-junk-plugin
+ DL_LIB=''
+ SOFTOKN3_LIB='-lsoftokn3'
-+ HAL_REQUIREMENT='hal'
+ ;;
*)
os_win32=no
- NO_UNDEFINED=''
-@@ -18403,6 +18413,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+ NO_UNDEFINED='-no-undefined'
+@@ -18544,6 +18554,7 @@
#include <sys/socket.h>
#include <netinet/in.h>
#include <netdb.h>
@@ -25,21 +34,3 @@
#define BUFSIZE (sizeof(struct hostent)+10)
-@@ -22101,7 +22112,7 @@ if test "x${with_krb5}" != "xno"; then
- LIBS_save="$LIBS"
-
- mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
-- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt"
- sunlibs="-lkrb5 -lgss"
- { $as_echo "$as_me:$LINENO: checking for Kerberos 5" >&5
- $as_echo_n "checking for Kerberos 5... " >&6; }
-@@ -30112,7 +30123,7 @@ componentdir="$privlibdir/components"
- idldir='${datadir}'/idl/evolution-$BASE_VERSION
-
-
--serverdir="$libdir/bonobo/servers"
-+serverdir="$prefix/libdata/bonobo/servers"
-
-
- evolutionuidir="$privdatadir/ui"
diff --git a/mail/evolution/files/patch-mail_em-migrate.c b/mail/evolution/files/patch-mail_em-migrate.c
deleted file mode 100644
index e2df9c618799..000000000000
--- a/mail/evolution/files/patch-mail_em-migrate.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mail/em-migrate.c.orig 2007-12-15 16:58:56.000000000 +0100
-+++ mail/em-migrate.c 2007-12-21 16:17:32.000000000 +0100
-@@ -1493,7 +1493,7 @@
- ut.actime = st.st_atime;
- ut.modtime = st.st_mtime;
- utime (dest, &ut);
-- chmod (dest, st.st_mode);
-+ chmod (dest, st.st_mode | S_IWUSR);
-
- return 0;
-
diff --git a/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c b/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
new file mode 100644
index 000000000000..0df6bd970168
--- /dev/null
+++ b/mail/evolution/files/patch-modules_addressbook_evolution-module-addressbook.c
@@ -0,0 +1,19 @@
+--- 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;
++}
diff --git a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in b/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in
deleted file mode 100644
index 2ecb540021ca..000000000000
--- a/mail/evolution/files/patch-plugins_exchange-operations_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/exchange-operations/Makefile.in.orig 2008-04-27 23:58:09.000000000 -0400
-+++ plugins/exchange-operations/Makefile.in 2008-04-28 00:02:31.000000000 -0400
-@@ -463,6 +463,7 @@ liborg_gnome_exchange_operations_la_LIBA
- $(top_builddir)/calendar/gui/libevolution-calendar.la \
- $(top_builddir)/mail/libevolution-mail.la \
- $(top_builddir)/addressbook/gui/component/libevolution-addressbook.la \
-+ -Wl,--no-as-needed,$(top_builddir)/addressbook/gui/component/.libs/libevolution-addressbook.so \
- $(CAMEL_EXCHANGE_LIBS) \
- $(EVOLUTION_MAIL_LIBS)
-
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 11:50:49 +0000