diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-06-07 20:52:42 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-06-07 20:52:42 +0800 |
commit | f52968f74b9004e134fdece423e2f910cd2cc954 (patch) | |
tree | 26d4b1c0ac2e2f5c4dc9427601d13287ddcbc86a /databases/evolution-data-server/files | |
parent | f3d3fa7cacfe33d7d98ccc6a938842803b02cbd9 (diff) | |
download | marcuscom-ports-f52968f74b9004e134fdece423e2f910cd2cc954.tar marcuscom-ports-f52968f74b9004e134fdece423e2f910cd2cc954.tar.gz marcuscom-ports-f52968f74b9004e134fdece423e2f910cd2cc954.tar.bz2 marcuscom-ports-f52968f74b9004e134fdece423e2f910cd2cc954.tar.lz marcuscom-ports-f52968f74b9004e134fdece423e2f910cd2cc954.tar.xz marcuscom-ports-f52968f74b9004e134fdece423e2f910cd2cc954.tar.zst marcuscom-ports-f52968f74b9004e134fdece423e2f910cd2cc954.zip |
Update to 2.31.3.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14206 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'databases/evolution-data-server/files')
7 files changed, 123 insertions, 0 deletions
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 000000000..bb155e24a --- /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_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_providers_imapx_Makefile.in b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in new file mode 100644 index 000000000..0e1321d75 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_providers_imapx_Makefile.in @@ -0,0 +1,13 @@ +Our gperf (2.7.2) doesn't understand --output-file. + +--- camel/providers/imapx/Makefile.in.orig 2010-04-26 14:33:56.000000000 +0200 ++++ camel/providers/imapx/Makefile.in 2010-04-26 14:35:10.000000000 +0200 +@@ -914,7 +914,7 @@ uninstall-am: uninstall-camel_providerDA + + + camel-imapx-tokenise.h: camel-imapx-tokens.txt +- @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< --output-file=$@ ++ @GPERF@ -H imapx_hash -N imapx_tokenise_struct -L ANSI-C -o -t -k1,$$ $< > $@ + + -include $(top_srcdir)/git.mk + diff --git a/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt b/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt new file mode 100644 index 000000000..8ce6381e9 --- /dev/null +++ b/databases/evolution-data-server/files/patch-camel_providers_imapx_camel-imapx-tokens.txt @@ -0,0 +1,8 @@ +--- camel/providers/imapx/camel-imapx-tokens.txt.orig 2010-04-26 14:25:22.000000000 +0200 ++++ camel/providers/imapx/camel-imapx-tokens.txt 2010-04-26 14:25:32.000000000 +0200 +@@ -1,5 +1,3 @@ +-/* This contains all of the keywords we care about. These +- can be converted to an id very efficiently */ + struct _imapx_keyword {const gchar *name; camel_imapx_id_t id; }; + struct _imapx_keyword *imapx_tokenise_struct (register const char *str, register unsigned int len); + %% diff --git a/databases/evolution-data-server/files/patch-configure b/databases/evolution-data-server/files/patch-configure new file mode 100644 index 000000000..527384093 --- /dev/null +++ b/databases/evolution-data-server/files/patch-configure @@ -0,0 +1,17 @@ +--- configure.orig 2009-12-25 20:21:00.000000000 +0100 ++++ configure 2009-12-25 20:21:01.000000000 +0100 +@@ -15968,6 +15968,14 @@ + _ACEOF + + ;; ++*freebsd*) ++ os_win32=no ++ NO_UNDEFINED='' ++ SOCKET_LIBS='' ++ DL_LIB='' ++ SOFTOKN3_LIB='-lsoftokn3' ++ LIBEXECDIR_IN_SERVER_FILE="$libexecdir" ++ ;; + *) + os_win32=no + NO_UNDEFINED='' 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 000000000..69da393ce --- /dev/null +++ b/databases/evolution-data-server/files/patch-docs_reference_camel_Makefile.in @@ -0,0 +1,11 @@ +--- docs/reference/camel/Makefile.in.orig 2009-07-27 22:42:25.000000000 +0200 ++++ docs/reference/camel/Makefile.in 2009-07-27 22:42:50.000000000 +0200 +@@ -137,7 +137,7 @@ GNOME_PLATFORM_LIBS = @GNOME_PLATFORM_LI + GOBJECT_QUERY = @GOBJECT_QUERY@ + GREP = @GREP@ + HAVE_JW = @HAVE_JW@ +-HTML_DIR = $(datadir)/gtk-doc/html ++HTML_DIR = $(datadir)/doc + ICONV_LIBS = @ICONV_LIBS@ + IDL_INCLUDES = @IDL_INCLUDES@ + INSTALL = @INSTALL@ diff --git a/databases/evolution-data-server/files/patch-libedataserverui_e-source-selector.c b/databases/evolution-data-server/files/patch-libedataserverui_e-source-selector.c new file mode 100644 index 000000000..c40bec6b2 --- /dev/null +++ b/databases/evolution-data-server/files/patch-libedataserverui_e-source-selector.c @@ -0,0 +1,40 @@ +Very very hacky patch. Seems GSEAL screws up somehow. +Review after next gtk (2.12.2) update. + +--- libedataserverui/e-source-selector.c.orig 2010-06-07 13:37:26.000000000 +0200 ++++ libedataserverui/e-source-selector.c 2010-06-07 14:06:35.000000000 +0200 +@@ -965,10 +965,12 @@ + pos = GTK_TREE_VIEW_DROP_INTO_OR_BEFORE; + gtk_tree_view_set_drag_dest_row (tree_view, path, pos); + +- if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE) ++/* if (gdk_drag_context_get_actions (context) & GDK_ACTION_MOVE) */ ++ if (context->_g_sealed__action & GDK_ACTION_MOVE) + action = GDK_ACTION_MOVE; + else +- action = gdk_drag_context_get_suggested_action (context); ++ action = context->_g_sealed__suggested_action; ++/* action = gdk_drag_context_get_suggested_action (context);*/ + + exit: + if (path != NULL) +@@ -1034,7 +1036,8 @@ + + tree_view = GTK_TREE_VIEW (widget); + model = gtk_tree_view_get_model (tree_view); +- delete = (gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE); ++/* delete = (gdk_drag_context_get_selected_action (context) == GDK_ACTION_MOVE); */ ++ delete = (context->_g_sealed__action == GDK_ACTION_MOVE); + + if (!gtk_tree_view_get_dest_row_at_pos (tree_view, x, y, &path, NULL)) + goto exit; +@@ -1049,7 +1052,8 @@ + + g_signal_emit ( + widget, signals[DATA_DROPPED], 0, selection_data, +- object, gdk_drag_context_get_selected_action (context), ++/* object, gdk_drag_context_get_selected_action (context), */ ++ object, context->_g_sealed__action, + info, &success); + + exit: |