[106696] trunk/dports/gnome/evolution-data-server

[devans at macports.org]

Revision: 106696
          https://trac.macports.org/changeset/106696
Author:   devans at macports.org
Date:     2013-06-05 10:01:40 -0700 (Wed, 05 Jun 2013)
Log Message:
-----------
evolution-data-server: libxml2 API changes, closes #39296, maintainer timeout.

Modified Paths:
--------------
    trunk/dports/gnome/evolution-data-server/Portfile

Added Paths:
-----------
    trunk/dports/gnome/evolution-data-server/files/patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff
    trunk/dports/gnome/evolution-data-server/files/patch-servers-google-libgdata-gdata-entry.c.diff

Modified: trunk/dports/gnome/evolution-data-server/Portfile
===================================================================
--- trunk/dports/gnome/evolution-data-server/Portfile	2013-06-05 16:32:33 UTC (rev 106695)
+++ trunk/dports/gnome/evolution-data-server/Portfile	2013-06-05 17:01:40 UTC (rev 106696)
@@ -5,7 +5,7 @@
 
 name            evolution-data-server
 version         2.30.3
-revision        4
+revision        5
 set branch      [join [lrange [split ${version} .] 0 1] .]
 description     Addressbook and calender libs for GNOME.
 long_description    Evolution Data Server provides a central location for \
@@ -38,7 +38,9 @@
 use_bzip2       yes
 
 patchfiles      patch-configure.ac.diff \
-                patch-m4-evo_krb5_support.m4.diff
+                patch-m4-evo_krb5_support.m4.diff \
+                patch-servers-google-libgdata-gdata-entry.c.diff \
+                patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff
 
 # Delete this once upstream actually fixes configure.ac
 # See https://trac.macports.org/ticket/34599
@@ -60,6 +62,7 @@
         --with-nss-includes=${prefix}/include/nss \
         --with-nss-libs=${prefix}/lib/nss \
         --with-krb5=/usr \
+        --disable-silent-rules \
         --disable-schemas-install
 
 #

Added: trunk/dports/gnome/evolution-data-server/files/patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff	                        (rev 0)
+++ trunk/dports/gnome/evolution-data-server/files/patch-calendar-backends-caldav-e-cal-backend-caldav.c.diff	2013-06-05 17:01:40 UTC (rev 106696)
@@ -0,0 +1,46 @@
+--- calendar/backends/caldav/e-cal-backend-caldav.c.orig	2010-07-18 10:42:46.000000000 -0700
++++ calendar/backends/caldav/e-cal-backend-caldav.c	2013-06-02 14:32:50.000000000 -0700
+@@ -1038,8 +1038,8 @@
+ 	soup_message_set_request (message,
+ 				  "application/xml",
+ 				  SOUP_MEMORY_COPY,
+-				  (gchar *) buf->buffer->content,
+-				  buf->buffer->use);
++				  (gchar *) xmlBufContent(buf->buffer),
++                                  xmlBufUse(buf->buffer));
+ 
+ 	/* Send the request now */
+ 	send_and_handle_redirection (priv->session, message, NULL);
+@@ -1180,8 +1180,8 @@
+ 	soup_message_set_request (message,
+ 				  "application/xml",
+ 				  SOUP_MEMORY_COPY,
+-				  (gchar *) buf->buffer->content,
+-				  buf->buffer->use);
++				  (gchar *) xmlBufContent(buf->buffer),
++                                  xmlBufUse(buf->buffer)); 
+ 
+ 	/* Send the request now */
+ 	send_and_handle_redirection (priv->session, message, NULL);
+@@ -1502,8 +1502,8 @@
+ 	soup_message_set_request (message,
+ 				  "application/xml",
+ 				  SOUP_MEMORY_COPY,
+-				  (gchar *) buf->buffer->content,
+-				  buf->buffer->use);
++				  (gchar *) xmlBufContent(buf->buffer),
++                                  xmlBufUse(buf->buffer));
+ 
+ 	/* Send the request now */
+ 	send_and_handle_redirection (priv->session, message, NULL);
+@@ -1552,8 +1552,8 @@
+ 		soup_message_set_request (message,
+ 				  "application/xml",
+ 				  SOUP_MEMORY_COPY,
+-				  (gchar *) buf->buffer->content,
+-				  buf->buffer->use);
++				  (gchar *) xmlBufContent(buf->buffer),
++                                  xmlBufUse(buf->buffer));
+ 
+ 		/* Send the request now */
+ 		send_and_handle_redirection (priv->session, message, NULL);

Added: trunk/dports/gnome/evolution-data-server/files/patch-servers-google-libgdata-gdata-entry.c.diff
===================================================================
--- trunk/dports/gnome/evolution-data-server/files/patch-servers-google-libgdata-gdata-entry.c.diff	                        (rev 0)
+++ trunk/dports/gnome/evolution-data-server/files/patch-servers-google-libgdata-gdata-entry.c.diff	2013-06-05 17:01:40 UTC (rev 106696)
@@ -0,0 +1,14 @@
+--- servers/google/libgdata/gdata-entry.c.orig	2010-06-20 05:15:47.000000000 -0700
++++ servers/google/libgdata/gdata-entry.c	2013-06-02 14:25:37.000000000 -0700
+@@ -877,9 +877,9 @@
+ 		xmlOutputBufferFlush (buf);
+ 
+ 		if (buf->conv == NULL)
+-			xmlString = g_strdup ((gchar *)buf->buffer->content);
++			xmlString = g_strdup ((gchar *)xmlBufContent(buf->buffer));
+ 		else
+-			xmlString = g_strdup ((gchar *)buf->conv->content);
++			xmlString = g_strdup ((gchar *)xmlBufContent(buf->conv));
+ 		xmlOutputBufferClose (buf);
+ 	}
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130605/66c90b55/attachment.html>