diff options
Diffstat (limited to 'databases/evolution-data-server/files')
7 files changed, 75 insertions, 148 deletions
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 new file mode 100644 index 000000000000..766abb5425d9 --- /dev/null +++ b/databases/evolution-data-server/files/patch-calendar_libical_src_libical_icaltz-util.c @@ -0,0 +1,18 @@ +--- 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) + #include <sys/byteorder.h> ++#elif defined(__FreeBSD__) ++#include <sys/endian.h> ++#define __BYTE_ORDER _BYTE_ORDER ++#define __LITTLE_ENDIAN _LITTLE_ENDIAN ++#define __BIG_ENDIAN _BIG_ENDIAN ++ ++#define bswap_16 bswap16 ++#define bswap_32 bswap32 ++#define bswap_64 bswap64 + #else + #include <byteswap.h> + #include <endian.h> diff --git a/databases/evolution-data-server/files/patch-camel_camel-block-file.h b/databases/evolution-data-server/files/patch-camel_camel-block-file.h new file mode 100644 index 000000000000..bb155e24ad65 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_camel-block-file.h @@ -0,0 +1,10 @@ +--- camel/camel-block-file.h.orig Tue May 15 01:48:42 2007 ++++ camel/camel-block-file.h Tue May 15 01:49:00 2007 +@@ -21,6 +21,7 @@ + #ifndef _CAMEL_BLOCK_FILE_H + #define _CAMEL_BLOCK_FILE_H + ++#include <sys/types.h> + #include <camel/camel-object.h> + #include <glib.h> + #include <libedataserver/e-msgport.h> diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c new file mode 100644 index 000000000000..e00b57db0780 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-specials.c @@ -0,0 +1,10 @@ +--- camel/providers/imap4/camel-imap4-specials.c.orig Thu May 17 18:11:10 2007 ++++ camel/providers/imap4/camel-imap4-specials.c Thu May 17 18:11:17 2007 +@@ -22,6 +22,7 @@ + #include <config.h> + #endif + ++#include <glib.h> + #include <string.h> + + #include "camel-imap4-specials.h" diff --git a/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c new file mode 100644 index 000000000000..55db1a65dcf0 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_providers_imap4_camel-imap4-summary.c @@ -0,0 +1,19 @@ +--- camel/providers/imap4/camel-imap4-summary.c.orig Mon May 7 01:01:31 2007 ++++ camel/providers/imap4/camel-imap4-summary.c Mon May 7 01:05:32 2007 +@@ -1148,6 +1148,7 @@ static CamelIMAP4Command * + imap4_summary_fetch_flags (CamelFolderSummary *summary) + { + CamelFolder *folder = summary->folder; ++ CamelIMAP4Summary *imap4_summary = (CamelIMAP4Summary *) summary; + struct imap4_fetch_all_t *fetch; + CamelMessageInfo *info[2]; + CamelIMAP4Engine *engine; +@@ -1479,7 +1480,7 @@ camel_imap4_summary_flush_updates (Camel + } + } else { + /* need to fetch new envelopes */ +- first = scount + 1; ++ seqid = scount + 1; + } + + if (seqid != 0 && seqid <= imap4_summary->exists) { diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure index f62645e708e2..1ef8d776b127 100644 --- a/databases/evolution-data-server/files/patch-configure +++ b/databases/evolution-data-server/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Tue Apr 10 23:42:25 2007 -+++ configure Wed Apr 11 00:04:30 2007 -@@ -24550,6 +24550,14 @@ case "$host" in +--- configure.orig Mon Jun 18 23:55:48 2007 ++++ configure Mon Jun 18 23:56:20 2007 +@@ -24562,6 +24562,14 @@ case "$host" in # AC_CACHE_VAL(have_addrinfo, [have_addrinfo=yes]) # AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations]) ;; @@ -15,7 +15,7 @@ *) os_win32=no NO_UNDEFINED='' SOCKET_LIBS='' -@@ -28749,7 +28758,7 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -28651,7 +28659,7 @@ cat >>conftest.$ac_ext <<_ACEOF #include <sys/socket.h> #include <netinet/in.h> #include <netdb.h> @@ -24,16 +24,16 @@ int main () -@@ -29039,7 +29048,7 @@ if test "x${with_krb5}" != "xno"; then +@@ -28982,7 +28990,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" + sunlibs="-lkrb5 -lgss" { 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 +@@ -33825,7 +33833,7 @@ idldir='${datadir}'/idl/evolution-data-s imagesdir='${datadir}'/pixmaps/evolution-data-server 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..417b438a7b34 --- /dev/null +++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in @@ -0,0 +1,11 @@ +--- docs/reference/camel/Makefile.in.orig 2007-10-15 09:28:28.000000000 -0400 ++++ docs/reference/camel/Makefile.in 2007-10-15 09:29:49.000000000 -0400 +@@ -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@ diff --git a/databases/evolution-data-server/files/patch-fix-maildir b/databases/evolution-data-server/files/patch-fix-maildir deleted file mode 100644 index db2563e0e040..000000000000 --- a/databases/evolution-data-server/files/patch-fix-maildir +++ /dev/null @@ -1,141 +0,0 @@ -Index: camel/providers/local/camel-local-provider.c -=================================================================== ---- camel/providers/local/camel-local-provider.c (revision 7830) -+++ camel/providers/local/camel-local-provider.c (working copy) -@@ -56,7 +56,7 @@ - N_("For storing local mail in MH-like mail directories."), - "mail", - CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL, -- CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, -+ CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, - mh_conf_entries, - /* ... */ - }; -@@ -74,7 +74,7 @@ - N_("For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."), - "mail", - CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL, -- CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, -+ CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR |CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, - mbox_conf_entries, - /* ... */ - }; -@@ -96,7 +96,7 @@ - N_("For storing local mail in maildir directories."), - "mail", - CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE | CAMEL_PROVIDER_IS_LOCAL, -- CAMEL_URL_NEED_PATH | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, -+ CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, - maildir_conf_entries, - /* ... */ - }; -@@ -110,9 +110,9 @@ - { CAMEL_PROVIDER_CONF_END } - }; - --static CamelProvider spool_provider = { -+static CamelProvider spool_file_provider = { - "spool", -- N_("Standard Unix mbox spool or directory"), -+ N_("Standard Unix mbox spool file"), - N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."), - "mail", - CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE, -@@ -121,6 +121,17 @@ - /* ... */ - }; - -+static CamelProvider spool_directory_provider = { -+ "spooldir", -+ N_("Standard Unix mbox spool directory"), -+ N_("For reading and storing local mail in external standard mbox spool files.\nMay also be used to read a tree of Elm, Pine, or Mutt style folders."), -+ "mail", -+ CAMEL_PROVIDER_IS_SOURCE | CAMEL_PROVIDER_IS_STORAGE, -+ CAMEL_URL_NEED_PATH | CAMEL_URL_NEED_PATH_DIR | CAMEL_URL_PATH_IS_ABSOLUTE | CAMEL_URL_FRAGMENT_IS_PATH, -+ spool_conf_entries, -+ /* ... */ -+}; -+ - #endif - - /* build a canonical 'path' */ -@@ -234,13 +245,19 @@ - camel_provider_register(&mbox_provider); - - #ifndef G_OS_WIN32 -- spool_conf_entries[0].value = path; /* default path - same as mbox */ -- spool_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type (); -- spool_provider.url_hash = local_url_hash; -- spool_provider.url_equal = local_url_equal; -- spool_provider.translation_domain = GETTEXT_PACKAGE; -- camel_provider_register(&spool_provider); -- -+ spool_conf_entries[0].value = path; /* default path - same as mbox; it's for both file and directory */ -+ spool_file_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type (); -+ spool_file_provider.url_hash = local_url_hash; -+ spool_file_provider.url_equal = local_url_equal; -+ spool_file_provider.translation_domain = GETTEXT_PACKAGE; -+ camel_provider_register(&spool_file_provider); -+ -+ spool_directory_provider.object_types[CAMEL_PROVIDER_STORE] = camel_spool_store_get_type (); -+ spool_directory_provider.url_hash = local_url_hash; -+ spool_directory_provider.url_equal = local_url_equal; -+ spool_directory_provider.translation_domain = GETTEXT_PACKAGE; -+ camel_provider_register(&spool_directory_provider); -+ - path = getenv("MAILDIR"); - maildir_conf_entries[0].value = path ? path : ""; /* default path */ - maildir_provider.object_types[CAMEL_PROVIDER_STORE] = camel_maildir_store_get_type (); -Index: camel/providers/local/ChangeLog -=================================================================== ---- camel/providers/local/ChangeLog (revision 7830) -+++ camel/providers/local/ChangeLog (working copy) -@@ -1,3 +1,12 @@ -+2007-06-18 Milan Crha <mcrha@redhat.com> -+ -+ ** Fix for bug #352346 -+ -+ * camel-local-provider.c: (camel_provider_module_init): -+ New provider spool_file_provider with virtual protocol 'spooldir' -+ and set CAMEL_URL_NEED_PATH_DIR; registering this provider -+ as copy for spool files. -+ - 2007-06-06 Jeffrey Stedfast <fejj@novell.com> - - Robustness fix while making sure the code would properly handle -Index: camel/ChangeLog -=================================================================== ---- camel/ChangeLog (revision 7830) -+++ camel/ChangeLog (working copy) -@@ -1,3 +1,11 @@ -+2007-06-18 Milan Crha <mcrha@redhat.com> -+ -+ ** Fix for bug #352346 -+ -+ * camel-provider.h: Added new constants CAMEL_URL_PART_PATH_DIR and -+ CAMEL_URL_NEED_PATH_DIR; when CAMEL_URL_NEED_PATH_DIR is set, then -+ in editor dialog is choosing file, without it directory. -+ - 2007-06-14 Philip Van Hoof <pvanhoof@gnome.org> - - * camel-net-utils.c: Memory leak fix -Index: camel/camel-provider.h -=================================================================== ---- camel/camel-provider.h (revision 7830) -+++ camel/camel-provider.h (working copy) -@@ -81,6 +81,7 @@ - #define CAMEL_URL_PART_HOST (1 << 3) - #define CAMEL_URL_PART_PORT (1 << 4) - #define CAMEL_URL_PART_PATH (1 << 5) -+#define CAMEL_URL_PART_PATH_DIR (1 << 6) - - #define CAMEL_URL_PART_NEED 8 - #define CAMEL_URL_PART_HIDDEN (CAMEL_URL_PART_NEED + 8) -@@ -104,6 +105,7 @@ - #define CAMEL_URL_NEED_HOST (CAMEL_URL_PART_HOST << CAMEL_URL_PART_NEED) - #define CAMEL_URL_NEED_PORT (CAMEL_URL_PART_PORT << CAMEL_URL_PART_NEED) - #define CAMEL_URL_NEED_PATH (CAMEL_URL_PART_PATH << CAMEL_URL_PART_NEED) -+#define CAMEL_URL_NEED_PATH_DIR (CAMEL_URL_PART_PATH_DIR << CAMEL_URL_PART_NEED) - - #define CAMEL_URL_HIDDEN_USER (CAMEL_URL_PART_USER << CAMEL_URL_PART_HIDDEN) - #define CAMEL_URL_HIDDEN_AUTH (CAMEL_URL_PART_AUTH << CAMEL_URL_PART_HIDDEN) |