r2566 - in /unstable/evolution-mapi/debian: changelog patches/ patches/openchange_pidtag_api.patch patches/series
jordi at users.alioth.debian.org
jordi at users.alioth.debian.org
Sat Apr 26 16:22:24 UTC 2014
Author: jordi
Date: Sat Apr 26 16:22:24 2014
New Revision: 2566
URL: http://svn.debian.org/wsvn/pkg-evolution/?sc=1&rev=2566
Log:
Add openchange_pidtag_api.patch: Adapt to openchange API changes.
Added:
unstable/evolution-mapi/debian/patches/
unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch
unstable/evolution-mapi/debian/patches/series
Modified:
unstable/evolution-mapi/debian/changelog
Modified: unstable/evolution-mapi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/changelog?rev=2566&op=diff
==============================================================================
--- unstable/evolution-mapi/debian/changelog (original)
+++ unstable/evolution-mapi/debian/changelog Sat Apr 26 16:22:24 2014
@@ -3,6 +3,7 @@
* New upstream release.
* Upload to unstable.
* Bump e-d-s build dependencies to 3.12.1.
+ * Add openchange_pidtag_api.patch: Adapt to openchange API changes.
-- Jordi Mallach <jordi at debian.org> Sat, 26 Apr 2014 14:14:21 +0200
Added: unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch?rev=2566&op=file
==============================================================================
--- unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch (added)
+++ unstable/evolution-mapi/debian/patches/openchange_pidtag_api.patch Sat Apr 26 16:22:24 2014
@@ -0,0 +1,125 @@
+Author: Jordi Mallach <jordi at debian.org>
+Description: Adapt to openchange API changes.
+
+Index: evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-fast-transfer.c
+===================================================================
+--- evolution-mapi-3.12.1.orig/src/libexchangemapi/e-mapi-fast-transfer.c 2014-03-24 10:28:56.000000000 +0100
++++ evolution-mapi-3.12.1/src/libexchangemapi/e-mapi-fast-transfer.c 2014-04-26 18:19:44.114781001 +0200
+@@ -107,9 +107,9 @@
+
+ /* g_print ("\tMarker: %s (0x%08x)\n", get_proptag_name (marker), marker); */
+ switch (marker) {
+- case PidTagStartMessage:
++ case StartMessage:
+ if (data->object) {
+- g_debug ("%s: PidTagStartMessage: out of order, previous object not finished yet", G_STRFUNC);
++ g_debug ("%s: StartMessage: out of order, previous object not finished yet", G_STRFUNC);
+ e_mapi_object_finish_read (data->object);
+ stop = !process_parsed_object (data);
+ e_mapi_object_free (data->object);
+@@ -134,9 +134,9 @@
+ data->current_streamed_properties_count = &data->object->streamed_properties_count;
+ data->marker = marker;
+ break;
+- case PidTagEndMessage:
++ case EndMessage:
+ if (!data->object) {
+- g_debug ("%s: PidTagEndMessage no object started", G_STRFUNC);
++ g_debug ("%s: EndMessage no object started", G_STRFUNC);
+ } else {
+ e_mapi_object_finish_read (data->object);
+ stop = !process_parsed_object (data);
+@@ -154,9 +154,9 @@
+ }
+ data->marker = 0;
+ break;
+- case PidTagStartRecip:
++ case StartRecip:
+ if (!data->current_object) {
+- g_debug ("%s: PidTagStartRecip no object started", G_STRFUNC);
++ g_debug ("%s: StartRecip no object started", G_STRFUNC);
+ } else {
+ EMapiRecipient *recipient;
+
+@@ -173,16 +173,16 @@
+ }
+ data->marker = marker;
+ break;
+- case PidTagEndToRecip:
++ case EndToRecip:
+ data->current_properties = NULL;
+ data->current_streamed_mem_ctx = NULL;
+ data->current_streamed_properties = NULL;
+ data->current_streamed_properties_count = NULL;
+ data->marker = 0;
+ break;
+- case PidTagNewAttach:
++ case NewAttach:
+ if (!data->current_object) {
+- g_debug ("%s: PidTagNewAttach no object started", G_STRFUNC);
++ g_debug ("%s: NewAttach no object started", G_STRFUNC);
+ } else {
+ EMapiAttachment *attachment;
+
+@@ -199,20 +199,20 @@
+ }
+ data->marker = marker;
+ break;
+- case PidTagEndAttach:
++ case EndAttach:
+ data->current_properties = NULL;
+ data->current_streamed_mem_ctx = NULL;
+ data->current_streamed_properties = NULL;
+ data->current_streamed_properties_count = NULL;
+ data->marker = 0;
+ break;
+- case PidTagStartEmbed:
++ case StartEmbed:
+ if (!data->current_object) {
+- g_debug ("%s: PidTagStartEmbed no object started", G_STRFUNC);
++ g_debug ("%s: StartEmbed no object started", G_STRFUNC);
+ } else if (!data->current_object->attachments) {
+- g_debug ("%s: PidTagStartEmbed no attachment started", G_STRFUNC);
++ g_debug ("%s: StartEmbed no attachment started", G_STRFUNC);
+ } else if (data->current_object->attachments->embedded_object) {
+- g_debug ("%s: PidTagStartEmbed attachment has embedded object already", G_STRFUNC);
++ g_debug ("%s: StartEmbed attachment has embedded object already", G_STRFUNC);
+ } else {
+ EMapiObject *object;
+
+@@ -228,11 +228,11 @@
+ }
+ data->marker = marker;
+ break;
+- case PidTagEndEmbed:
++ case EndEmbed:
+ if (!data->current_object) {
+- g_debug ("%s: PidTagEndEmbed no object started", G_STRFUNC);
++ g_debug ("%s: EndEmbed no object started", G_STRFUNC);
+ } else if (!data->current_object->parent) {
+- g_debug ("%s: PidTagEndEmbed no parent object", G_STRFUNC);
++ g_debug ("%s: EndEmbed no parent object", G_STRFUNC);
+ } else {
+ e_mapi_object_finish_read (data->current_object);
+ data->current_object = data->current_object->parent;
+@@ -397,7 +397,7 @@
+ data.current_streamed_mem_ctx = data.object;
+ data.current_streamed_properties = &data.object->streamed_properties;
+ data.current_streamed_properties_count = &data.object->streamed_properties_count;
+- data.marker = PidTagStartMessage;
++ data.marker = StartMessage;
+ }
+
+ parser = fxparser_init (data.mem_ctx, &data);
+@@ -491,9 +491,9 @@
+ }
+
+ if (!(transfer_flags & E_MAPI_FAST_TRANSFER_FLAG_ATTACHMENTS))
+- add (PidTagMessageAttachments);
++ add (MessageAttachments);
+ if (!(transfer_flags & E_MAPI_FAST_TRANSFER_FLAG_RECIPIENTS))
+- add (PidTagMessageRecipients);
++ add (MessageRecipients);
+
+ #undef add
+
Added: unstable/evolution-mapi/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-evolution/unstable/evolution-mapi/debian/patches/series?rev=2566&op=file
==============================================================================
--- unstable/evolution-mapi/debian/patches/series (added)
+++ unstable/evolution-mapi/debian/patches/series Sat Apr 26 16:22:24 2014
@@ -0,0 +1 @@
+openchange_pidtag_api.patch
More information about the pkg-evolution-commits
mailing list