diff options
Diffstat (limited to 'databases/evolution-data-server/files')
6 files changed, 175 insertions, 0 deletions
diff --git a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c new file mode 100644 index 000000000..b39a8fe3c --- /dev/null +++ b/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c @@ -0,0 +1,53 @@ +--- libedataserver/e-msgport.c.orig Sat Dec 10 07:31:28 2005 ++++ libedataserver/e-msgport.c Mon Dec 19 02:19:10 2005 +@@ -1069,9 +1069,18 @@ thread_dispatch(void *din) + void e_thread_put(EThread *e, EMsg *msg) + { + pthread_t id; ++ pthread_attr_t attr; + EMsg *dmsg = NULL; + + pthread_mutex_lock(&e->mutex); ++ pthread_attr_init(&attr); ++ /* Give us a 1 MB thread stacksize on 32-bit architectures, and ++ * a 2 MB thread stacksize on 64-bit architectures. */ ++ if (sizeof (void *) == 8) { ++ pthread_attr_setstacksize(&attr, 0x200000); ++ } else { ++ pthread_attr_setstacksize(&attr, 0x100000); ++ } + + /* the caller forgot to tell us what to do, well, we can't do anything can we */ + if (e->received == NULL) { +@@ -1110,13 +1119,14 @@ void e_thread_put(EThread *e, EMsg *msg) + e_msgport_put(e->server_port, msg); + if (e->waiting == 0 + && g_list_length(e->id_list) < e->queue_limit +- && pthread_create(&id, NULL, thread_dispatch, e) == 0) { ++ && pthread_create(&id, &attr, thread_dispatch, e) == 0) { + struct _thread_info *info = g_malloc0(sizeof(*info)); + t(printf("created NEW thread %" G_GUINT64_FORMAT "\n", e_util_pthread_id(id))); + info->id = id; + info->busy = TRUE; + e->id_list = g_list_append(e->id_list, info); + } ++ pthread_attr_destroy(&attr); + pthread_mutex_unlock(&e->mutex); + return; + } +@@ -1125,13 +1135,14 @@ void e_thread_put(EThread *e, EMsg *msg) + if (!e->have_thread) { + int err; + +- if ((err = pthread_create(&e->id, NULL, thread_dispatch, e)) != 0) { ++ if ((err = pthread_create(&e->id, &attr, thread_dispatch, e)) != 0) { + g_warning("Could not create dispatcher thread, message queued?: %s", strerror(err)); + } else { + e->have_thread = TRUE; + } + } + ++ pthread_attr_destroy(&attr); + pthread_mutex_unlock(&e->mutex); + + if (dmsg) { diff --git a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c new file mode 100644 index 000000000..51f468867 --- /dev/null +++ b/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c @@ -0,0 +1,13 @@ +--- addressbook/backends/ldap/e-book-backend-ldap.c.orig Fri Sep 9 16:06:37 2005 ++++ addressbook/backends/ldap/e-book-backend-ldap.c Fri Sep 9 16:08:21 2005 +@@ -301,8 +301,8 @@ struct prop_info { + + /* misc fields */ + STRING_PROP (E_CONTACT_HOMEPAGE_URL, "labeledURI"), +- /* map nickname to displayName */ +- STRING_PROP (E_CONTACT_NICKNAME, "displayName"), ++ /* map nickname to nickname */ ++ STRING_PROP (E_CONTACT_NICKNAME, "nickname"), + E_STRING_PROP (E_CONTACT_SPOUSE, "spouseName"), + E_STRING_PROP (E_CONTACT_NOTE, "note"), + E_COMPLEX_PROP (E_CONTACT_ANNIVERSARY, "anniversary", anniversary_populate, anniversary_ber, anniversary_compare), diff --git a/databases/evolution-data-server/files/patch-camel_camel-net-utils.c b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c new file mode 100644 index 000000000..17bddca39 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_camel-net-utils.c @@ -0,0 +1,24 @@ +--- camel/camel-net-utils.c.orig Tue Dec 21 13:38:52 2004 ++++ camel/camel-net-utils.c Tue Dec 21 13:40:34 2004 +@@ -143,12 +143,21 @@ + case EAI_SERVICE: + return NO_DATA; + break; ++#ifdef EAI_ADDRFAMILY + case EAI_ADDRFAMILY: + return NO_ADDRESS; + break; ++#endif ++#if defined(EAI_NODATA) && EAI_NODATA != EAI_NONAME + case EAI_NODATA: + return NO_DATA; + break; ++#endif ++#ifdef EAI_NOFAMILY ++ case EAI_NOFAMILY: ++ return NO_ADDRESS; ++ break; ++#endif + case EAI_MEMORY: + return ENOMEM; + break; diff --git a/databases/evolution-data-server/files/patch-camel_camel-object.c b/databases/evolution-data-server/files/patch-camel_camel-object.c new file mode 100644 index 000000000..9aef5b739 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_camel-object.c @@ -0,0 +1,22 @@ +--- camel/camel-object.c.orig Wed Oct 18 15:53:34 2006 ++++ camel/camel-object.c Wed Oct 18 15:55:01 2006 +@@ -457,7 +457,7 @@ + } + + /* we batch up the properties and set them in one go */ +- if (!(argv = g_try_malloc ((gulong)(sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]))))) ++ if (!(argv = g_try_malloc ((guint32)(sizeof (*argv) + (count - CAMEL_ARGV_MAX) * sizeof (argv->argv[0]))))) + return -1; + + argv->argc = 0; +@@ -537,8 +537,8 @@ + + count = g_slist_length(props); + +- arggetv = g_malloc0(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0])); +- argv = g_malloc0(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0])); ++ arggetv = g_malloc0((guint32)(sizeof(*arggetv) + (count - CAMEL_ARGV_MAX) * sizeof(arggetv->argv[0]))); ++ argv = g_malloc0((guint32)(sizeof(*argv) + (count - CAMEL_ARGV_MAX) * sizeof(argv->argv[0]))); + l = props; + i = 0; + while (l) { diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure new file mode 100644 index 000000000..3609d850e --- /dev/null +++ b/databases/evolution-data-server/files/patch-configure @@ -0,0 +1,52 @@ +--- configure.orig Tue Apr 10 23:42:25 2007 ++++ configure Wed Apr 11 00:04:30 2007 +@@ -24550,6 +24550,14 @@ case "$host" in + # AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes]) + # AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations]) + ;; ++*freebsd*) ++ os_win32=no ++ NO_UNDEFINED='' ++ SOCKET_LIBS='' ++ DL_LIB='' ++ SOFTOKN3_LIB='-lsoftokn3' ++ LIBEXECDIR_IN_SERVER_FILE="$libexecdir" ++ ;; + *) os_win32=no + NO_UNDEFINED='' + SOCKET_LIBS='' +@@ -25364,6 +25372,7 @@ int main (int argc, char **argv) + { + iconv_t cd; + cd = iconv_open ("UTF-8", "ISO-8859-1"); ++ return (0); + } + + _ACEOF +@@ -28749,7 +28758,7 @@ cat >>conftest.$ac_ext <<_ACEOF + #include <sys/socket.h> + #include <netinet/in.h> + #include <netdb.h> +- ++ #include <stdio.h> + + int + main () +@@ -29039,7 +29048,7 @@ if test "x${with_krb5}" != "xno"; then + LDFLAGS_save="$LDFLAGS" + + mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5" +- heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi" ++ heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi -lcrypt" + { echo "$as_me:$LINENO: checking for Kerberos 5" >&5 + echo $ECHO_N "checking for Kerberos 5... $ECHO_C" >&6; } + if test "${ac_cv_lib_kerberos5+set}" = set; then +@@ -33857,7 +33866,7 @@ idldir='${datadir}'/idl/evolution-data-s + imagesdir='${datadir}'/pixmaps/evolution-data-server + + +-serverdir="$libdir/bonobo/servers" ++serverdir="$prefix/libdata/bonobo/servers" + + + extensiondir='${libdir}'/evolution-data-server-$API_VERSION/extensions diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c new file mode 100644 index 000000000..62532da02 --- /dev/null +++ b/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c @@ -0,0 +1,11 @@ +--- libedataserverui/e-source-option-menu.c.orig Tue Nov 23 13:50:14 2004 ++++ libedataserverui/e-source-option-menu.c Tue Nov 23 13:50:33 2004 +@@ -24,6 +24,8 @@ + #include <config.h> + #endif + ++#include <sys/types.h> ++ + #include <gtk/gtkmenu.h> + #include <gtk/gtkmenuitem.h> + |