diff options
Diffstat (limited to 'databases/evolution-data-server/files')
5 files changed, 30 insertions, 96 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 b39a8fe3cc88..000000000000 --- 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-Makefile.in b/databases/evolution-data-server/files/patch-Makefile.in deleted file mode 100644 index ec1efa7ac942..000000000000 --- a/databases/evolution-data-server/files/patch-Makefile.in +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile.in.orig 2008-01-14 19:13:06.000000000 -0500 -+++ Makefile.in 2008-01-14 19:13:15.000000000 -0500 -@@ -353,7 +353,7 @@ AUTOMAKE_OPTIONS = 1.6 - DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc - @WITH_LIBDB_FALSE@LIBDB = libdb - @ENABLE_CALENDAR_TRUE@CALENDAR_DIR = calendar --SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src docs art po -+SUBDIRS = $(LIBDB) win32 libedataserver servers camel addressbook $(CALENDAR_DIR) libedataserverui src art po - DIST_SUBDIRS = win32 libedataserver servers camel addressbook calendar libedataserverui src docs art po - changelogs = \ - ChangeLog 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 index 51f468867330..b7266a514fb5 100644 --- 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 @@ -1,6 +1,6 @@ ---- 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 { +--- addressbook/backends/ldap/e-book-backend-ldap.c.orig 2007-12-14 15:23:50.000000000 +0100 ++++ addressbook/backends/ldap/e-book-backend-ldap.c 2007-12-21 11:29:01.000000000 +0100 +@@ -358,8 +358,8 @@ /* misc fields */ STRING_PROP (E_CONTACT_HOMEPAGE_URL, "labeledURI"), @@ -8,6 +8,6 @@ - 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), + 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_src_libical_icaltz-util.c b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c index c183e3b79a94..766abb5425d9 100644 --- a/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c +++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c @@ -1,5 +1,5 @@ ---- calendar/libical/src/libical/icaltz-util.c.orig 2007-11-25 21:29:25.000000000 -0500 -+++ calendar/libical/src/libical/icaltz-util.c 2008-01-07 20:24:12.000000000 -0500 +--- calendar/libical/src/libical/icaltz-util.c.orig 2007-08-24 02:48:28.000000000 -0400 ++++ calendar/libical/src/libical/icaltz-util.c 2007-08-27 16:23:59.000000000 -0400 @@ -23,6 +23,15 @@ #include <string.h> #if defined(sun) && defined(__SVR4) @@ -16,27 +16,3 @@ #else #include <byteswap.h> #include <endian.h> -@@ -328,7 +337,10 @@ icaltzutil_fetch_timezone (const char *l - icalprop = icalproperty_new_tzname (types [zidx].zname); - icalcomponent_add_property (std_comp, icalprop); - -- trans = transitions [stdidx] + types [zidx].gmtoff; -+ if (num_trans) -+ trans = transitions [stdidx] + types [zidx].gmtoff; -+ else -+ trans = types [zidx].gmtoff; - icaltime = icaltime_from_timet (trans, 0); - dtstart = icaltime; - dtstart.year = 1970; -@@ -369,7 +381,10 @@ icaltzutil_fetch_timezone (const char *l - icalprop = icalproperty_new_tzname (types [zidx].zname); - icalcomponent_add_property (dst_comp, icalprop); - -- trans = transitions [dstidx] + types [zidx].gmtoff; -+ if (num_trans) -+ trans = transitions [dstidx] + types [zidx].gmtoff; -+ else -+ trans = types [zidx].gmtoff; - icaltime = icaltime_from_timet (trans, 0); - dtstart = icaltime; - dtstart.year = 1970; diff --git a/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in new file mode 100644 index 000000000000..f5b6fa2735d8 --- /dev/null +++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in @@ -0,0 +1,22 @@ +--- docs/reference/camel/Makefile.in.orig 2007-12-21 11:30:30.000000000 +0100 ++++ docs/reference/camel/Makefile.in 2007-12-21 11:55:58.000000000 +0100 +@@ -123,7 +123,7 @@ + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + HAVE_JW = @HAVE_JW@ +-HTML_DIR = $(datadir)/gtk-doc/html ++HTML_DIR = $(prefix)/share/doc + ICONV_CFLAGS = @ICONV_CFLAGS@ + ICONV_LIBS = @ICONV_LIBS@ + IDL_INCLUDES = @IDL_INCLUDES@ +@@ -690,8 +690,8 @@ + done; \ + echo '-- Installing $(srcdir)/html/index.sgml' ; \ + $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \ +- which gtkdoc-rebase >/dev/null && \ +- gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ ++# which gtkdoc-rebase >/dev/null && \ ++# gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$(DESTDIR)$(TARGET_DIR) ; \ + fi + + uninstall-local: |