summaryrefslogtreecommitdiffstats
path: root/databases/evolution-data-server/files
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-14 18:33:48 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2006-10-14 18:33:48 +0800
commit1b3327761c8bcb98d89b529daeae9600844b4361 (patch)
tree0be1cd4eb5fec6661da4798906b0d9bd522e794f /databases/evolution-data-server/files
parenta65aedbb59fd9dfb33a4633611777da99ec4dcd5 (diff)
downloadmarcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.gz
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.bz2
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.lz
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.xz
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.tar.zst
marcuscom-ports-1b3327761c8bcb98d89b529daeae9600844b4361.zip
Clean out MarcusCom after the big import into ports.
Next stop, GNOME 2.17. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@7799 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases/evolution-data-server/files')
-rw-r--r--databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c53
-rw-r--r--databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c13
-rw-r--r--databases/evolution-data-server/files/patch-calendar_libical_configure11
-rw-r--r--databases/evolution-data-server/files/patch-camel_camel-net-utils.c24
-rw-r--r--databases/evolution-data-server/files/patch-configure44
-rw-r--r--databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c11
6 files changed, 0 insertions, 156 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
deleted file mode 100644
index b39a8fe3c..000000000
--- a/databases/evolution-data-server/files/extra-patch-libedataserver_e-msgport.c
+++ /dev/null
@@ -1,53 +0,0 @@
---- 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
deleted file mode 100644
index 51f468867..000000000
--- a/databases/evolution-data-server/files/patch-addressbook_backends_ldap_e-book-backend-ldap.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-calendar_libical_configure b/databases/evolution-data-server/files/patch-calendar_libical_configure
deleted file mode 100644
index 19028e5d4..000000000
--- a/databases/evolution-data-server/files/patch-calendar_libical_configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- calendar/libical/configure.orig Sun Dec 26 16:54:57 2004
-+++ calendar/libical/configure Sun Dec 26 16:55:23 2004
-@@ -19736,7 +19736,7 @@
-
-
-
--if test "x$USE_MAINTAINER_MODE" == xyes; then
-+if test "x$USE_MAINTAINER_MODE" = xyes; then
- DEV="yes"
- echo "$as_me:$LINENO: result: Setting up for development: -Wall, flex, bison" >&5
- echo "${ECHO_T}Setting up for development: -Wall, flex, bison" >&6
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
deleted file mode 100644
index 17bddca39..000000000
--- a/databases/evolution-data-server/files/patch-camel_camel-net-utils.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- 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-configure b/databases/evolution-data-server/files/patch-configure
deleted file mode 100644
index 91d8b09b9..000000000
--- a/databases/evolution-data-server/files/patch-configure
+++ /dev/null
@@ -1,44 +0,0 @@
---- configure.orig Sun Dec 25 01:57:35 2005
-+++ configure Sun Dec 25 01:58:23 2005
-@@ -23542,6 +23542,14 @@
- SOFTOKN3_LIB=''
- LIBEXECDIR_IN_SERVER_FILE='../../../libexec'
- ;;
-+*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=''
-@@ -27317,7 +27325,7 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <netdb.h>
--
-+ #include <stdio.h>
-
- int
- main ()
-@@ -27565,7 +27573,7 @@
- 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
-@@ -31483,7 +31491,7 @@
- imagesdir="$datadir/pixmaps/evolution-data-server-$BASE_VERSION"
-
-
--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
deleted file mode 100644
index 62532da02..000000000
--- a/databases/evolution-data-server/files/patch-libedataserverui_e-source-option-menu.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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>
-