2.32.3-r3: add patch to fix build failure with libxml2-2.9 (bug #448798). 3.6.3: propagate ~arm keyword from 3.6.2-r1.

Package-Manager: portage-2.2.0_alpha163/cvs/Linux x86_64
Manifest-Sign-Key: 0xCF0ADD61

5 files changed, 153 insertions, 7 deletions

diff --git a/gnome-extra/evolution-data-server/ChangeLog b/gnome-extra/evolution-data-server/ChangeLog
index 2339e0d7b80c..830e329663d1 100644
--- a/gnome-extra/evolution-data-server/ChangeLog
+++ b/gnome-extra/evolution-data-server/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-extra/evolution-data-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.353 2013/02/02 22:36:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/ChangeLog,v 1.354 2013/02/20 14:44:58 tetromino Exp $
+
+  20 Feb 2013; Alexandre Rostovtsev <tetromino@gentoo.org>
+  evolution-data-server-2.32.3-r3.ebuild,
+  +files/evolution-data-server-2.32.3-libxml2-2.9.patch,
+  evolution-data-server-3.6.3.ebuild:
+  2.32.3-r3: add patch to fix build failure with libxml2-2.9 (bug #448798).
+  3.6.3: propagate ~arm keyword from 3.6.2-r1.
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org>
   evolution-data-server-3.6.2-r1.ebuild:
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index 80289a1527e6..f501443e97e9 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX calentry.schema 3661 SHA256 107d60463833d5ceb5f752335dd07fef303093c58a51fb03405fed5837999431 SHA512 56606848319539b8c9af732a5d572db44e2d7da433b1689ef7f14a283880951e10d5fc39f27245a7ddc8f0cb2e7563a757060020c17e5411f875cae10b119834 WHIRLPOOL 2255a4b0b98f55476388bb97ac5bf1bf2b7107b56c2a93f55142e7ae0892c8f93874fd0731663362bacb4ad85302a6cb8a22a7228bba0724fb45d1eb37f406a1
 AUX e-d-s-camel-skip-failing-test.patch 660 SHA256 f89f7635e9a5ddc2aa2f713a6d7eb9322f3416f8f9ad1cba1a113f65a1eaacb5 SHA512 c5bd8e1d86c000dc9dcfe0ab4d78df7d064fafb650c086b31e5b15e4e2ea269627eaf19b9743b7354e32a60e0aced19979d1c84be329b557cfcd23e019765121 WHIRLPOOL c21875187b5e86c9ca712b3d29cb81c2e9c923e08690fdbf12b86d8aa06e01707478230d67b855a0035c4dfa6e667a63d0ee5bbacd36ca9a1d99b7132fd7c90a
 AUX evolution-data-server-2.31-gentoo_etc_services.patch 1350 SHA256 1dae07ed5cb124c2da6e0d28f4e64555b6fb2bc012ceee3506f0af6e3e41102a SHA512 738d5c38239a509949f49d2b6c8cee1bf9996ca501b0daaae9b194bb8a487c0841e80fcbb467ff0fcd6369c3e78154619c48459bd559700a66e4033ce88cecb2 WHIRLPOOL 027c8020ba7f2d1d4f6a7b43dffbdbddd29c0c28e7082aee8a9c653f3fb78f78789da45481aaca0250b5c8905bc2ba78cdeb535a2b426b2e97c7ba79409f4f7c
@@ -5,6 +8,7 @@ AUX evolution-data-server-2.32.3-g_thread_init.patch 5091 SHA256 23d3bd95ab952dd
 AUX evolution-data-server-2.32.3-gmodule-explicit.patch 2137 SHA256 cb936b70909a9a6588de0c8ba8b1c2fe2f9a5b288620c40d992774a9302f05df SHA512 cb6b4cc2bc8c825de2d7073f3e874d98860bba8b0aad1f042f5069516733995faa713a6ea85907770f42df0204a55b1745da2a142b6f272f6b482d55533189fc WHIRLPOOL d8e727759ace5e110fcf146bfe1df54f1abaab797465485d012bad537a9550404885a107beab02f8e78aa9e317a47ac1178e03fcab03a83be72e889414db1ce4
 AUX evolution-data-server-2.32.3-imap-move.patch 2647 SHA256 8effa465fc2913f22f030d66f9726a6e9dcf327f7abbf1774b1bfb9f4cc1c40f SHA512 f3def00fcf4b392b1e4f9c5d222897ea5f0f767557d7a790f72bab76c994332c273d27af509d5037519b872dffacd85a8cf204a4c2b2b38b3fc68719a3346c3c WHIRLPOOL c9428f28c92c24522fa46f572e030435ef807aea049186c3e20b300c1948521b08f2f88b6b22fa7567d14929eed7332ba3e8d923cda0a64b9655921d2372f716
 AUX evolution-data-server-2.32.3-libical-0.48.patch 920 SHA256 7d38183419b479502623382252be86fabd707a8dbb1f1ff20c6e5e07207dad11 SHA512 112f1722e5ca8e763ed8a16bb73c7dd86d90e40baa50df2fe6fbc094c0db8305b4f7f057d60301626cd4c784279dfaf45aa6ede0a5ea6cdc6b236464568f0bb3 WHIRLPOOL 5192f3bceed1d17806f057849518b9e0e1ed5f482a9e111bfc6fc90aad6af96325951ced570753d4b7025f7b568cafbf85632b09184a50a58c1c5fc2b5611748
+AUX evolution-data-server-2.32.3-libxml2-2.9.patch 4438 SHA256 db65f8053098409e13a59365cbe4c6a0ae1edcfd7e850330ac0dc9edf74daf7c SHA512 e76d902e3be48324024dec5a5f3898c1d21f0900a4787df85612e557503a5f3982227f72dddfa340c11e4d1e4d0fbeca58efa75e10feb44adcf2cf9fe64b0b89 WHIRLPOOL 666e1f356ff5f5f6fb5c9c5630e88b0b4fb2af445ad7eae6838ee66154efa5d8da33cc243c59ed870196c12cf0e207e72e48049b0065af428e2ca310826e15fa
 AUX fix_relink_command.pl 4074 SHA256 f6da0e687f7e64eab82671def4b7445602d1bf64e9b56c3c188d43fadc7dabc2 SHA512 bb6d512f00e976c708395d9552aaa30afab17ad09c04e57488a11505565542396f450d9121c6ff0d8becca84778ade24873a39fcc785aa62e523fc038f1fe054 WHIRLPOOL e94d4b6c51936b9184401cf36f7cf108cbec2f806bf0a4660289cdd7ebe8a370bb396f77d9cb9d463c741eeaacb655c7771f113b0a79f7b429b4569d1e28e43a
 DIST evolution-data-server-2.32.3-patches.tar.xz 24072 SHA256 7b1f29fad87a7e868736380c69880a29ddf5d4bd365734df53042e4bc9e8b0fa SHA512 20e12257e7153d074f20c158fc16a5a8feed8e9ed34035c6d752e31ca5b21436e08d767433aa16b885ad0aa8a95b18b41f79c80f2b30db42a5af402082882d55 WHIRLPOOL 660000ccaa0160325b92cf26ea031c96190645ce4bd2a6fc83b03411c6a2bb7f7aadc0ca0a493e1ff386fd4ac4471035af2da0decb436db7f8cf74b792ac4bd2
 DIST evolution-data-server-2.32.3.tar.bz2 4322281 SHA256 744026a745b711b3e393b61fed21c4926d1b10a3aa7da64f4b33a3e3bf5b085c SHA512 863ccea7717a7fe743155513e74fc8ea35f558702bd4ff1075e15d1a36c1ecd9d5e285bd2a81245d680c05cf0521029583134b4e1d12668244042df3f5e62dfb WHIRLPOOL 3c56210f477901c3ea2d4712e631d219969cb113ff1c4cba3fcefccb67fed363a6207025b46922b9c1f6ba3427b962b5e0565c6b1441249c74b29afa314e3580
@@ -13,9 +17,20 @@ DIST evolution-data-server-3.6.2-gentoo-patches.tar.xz 12836 SHA256 38ac40ca3fb1
 DIST evolution-data-server-3.6.2.tar.xz 3953424 SHA256 bc94d8b9f1a6fb81a630cf38abec303b87a87ce2fd880f9519c23e5de2ce88f0 SHA512 9cce9ec36327e24e011f2c4f627c7a9df86cf2b3ddfee5fd2e9c4b45224d81e18ff4991afcdfe6e609232b189b7464c5135f3e94bbade25cabaf1127e7f15a87 WHIRLPOOL a1ccd75c4f23b589ea38c1e90776d3485571899733250a03c78ca7cf5ca66da25f56af95f5c7cd3372631e32e56ca4c875fd8be09567e1c9e0f86c5c6d7e68b3
 DIST evolution-data-server-3.6.3.tar.xz 4073908 SHA256 37a0d0d4f6c8515e70e34f1e7e1f457f4c7736f35ba0f18c4b4bca0a17db7de0 SHA512 c22fc555857c60bdac671cdd53bfec4f7d63398c2f690ef540ca1dda5c3d06d49fde5a9310a1d12c1ad93de48dc507ead1342c3e0d9958b81d65b8f8714ce25b WHIRLPOOL 54dd5a904bb4e94baeeff68fb29ac0329ec80e3d845fe4b7f5795c9cabb67d061e194abced022cfee5f150fb06b36814fff744d9720d75e5cb938184e877147e
 EBUILD evolution-data-server-2.32.3-r2.ebuild 4951 SHA256 3ebf16a907aad5c9ce1cbe68f43050165e25230f1fedf2976e2a1cda4e991dbe SHA512 0f191c89d2ea6e463cfa3a12ca5b922b2d842d0ec5651ad933cd7e08d42de23358e46a8374390897265296efd028bedac2bd9cd619673d33c7c38eca04d4d01c WHIRLPOOL 89fb49855e1663268927bda04eaed7e79977a426ea89302c218b145ec5f30f314ca470d980159aa26b231d0f31c06295b9dd058964d459bb36b3a447088b69df
-EBUILD evolution-data-server-2.32.3-r3.ebuild 5060 SHA256 a915529d17bb2bbcdd9883421339305e7d4494d83400d54d7bd6f73150a042d0 SHA512 1380d8cf96390fbe5921a3b5aef5e44d41eaa265928dabe90b0dbb7fba0e3d551f9ef5f2349331cd836ab349eee7ccb21b366523938b14ba9c728198b6e452d8 WHIRLPOOL d6037b68928cd6e540e7ce8c83c63aaca36c3517a1f33ffd6e7e01c5d438df28a744448f6823dc1602c9256882af14df498354e619dc5fd892d2a4a4d961414d
+EBUILD evolution-data-server-2.32.3-r3.ebuild 5168 SHA256 626975b9db8771998fb93c629d41e643c2a1047cacbdc9f2b3ccaa2901d73422 SHA512 8a46a4bfe37d934f32eb384108e8e1217d0dcabad524ea1a91ed10080561f1a3a5f53ad3e494a94633fc18fdacb1d7637520aef5c365de9b743fd3e17dd0bbe4 WHIRLPOOL 98316328b794fd327b3c37bdf7cfc5b6f9a2d0193d78d6191ab095311a1303db25583a5584ed413b7141cc8803ab51bd6b98b95a04c94ac14031e92d7fcfe63c
 EBUILD evolution-data-server-3.4.4.ebuild 4012 SHA256 75dcfdca52053e7c936d13d563cc493fd73401767206ffb43ac9f6f2f8325a92 SHA512 52f0f9e3fbeb02da98c7e7ed03ac0c8f49e15e933a78022bd716c7ee6b93ac62ed4e5e7f8b22c758c1dd00d032389e3fb5fe9434ef8bf456f7d9979434aa6379 WHIRLPOOL 30d08e070075b5ef35b3d41eeeada12b05fb2a20c67bdb87e7abc7935cf352fc496deb5e411a0652cebd9211439c1f80cb7a176f5845d178fa90728db969879a
 EBUILD evolution-data-server-3.6.2-r1.ebuild 4119 SHA256 510d47e8a37aa4ec1262b2960aaa310c962f008280bcb7d65c584fb7ac23b7e8 SHA512 b477c2db4c9a2fafdf5051be3aeaf17b8bd2e7955a4cb0254d8ac027901a8deaeada474cffd72dd119f401916261e63775ce5690be175116abfbf158b1fba603 WHIRLPOOL 173392b6e46de0deda00f6345ce79c862c8df566ba058c2092d7ec0386e600dd3c8e917bdcff30d11b1bf94cba3638ddb988abe2a46d66cd93a84576a10476e7
-EBUILD evolution-data-server-3.6.3.ebuild 3996 SHA256 42bfb676eeca11f0eb369ae2efa0787e900fdedfa31d729e9c77527b206f14cb SHA512 09c1b4189d272bb52f0d3b310b7f73e98c8a0e3e64caa7b37dc15e11cb765ce1c9eba3f0726ff918757ed568f5b20b761549512cb333873a5a4a79e1bb478836 WHIRLPOOL dea1736fd1d6eb30413517770aee4517e402dce02c45a8e69d85fd85cc8b1c957117381d0e8129a6562c06155161c9b94388f3d5945b515379a7bf4eb6d44f57
-MISC ChangeLog 69907 SHA256 5dd51c266758ea928586ed58d1852a990cef30be1b4e5b42124393bb66f6e9da SHA512 709974ddef8229549495aaba34a955ed6e6203441dbcf151298d3a5830124101232cbda38b233fe0415543c2348c8686fc01b950414fcb439c55a044f10ab57c WHIRLPOOL 8414ad461aaf80832390535d8c79d14fe482f18ecb37adf807ffe2d526cf454e7ba2ce8c31f20a2edc7055f01ca199f3fdcdb60b0af7d8e0914d857506e124ce
+EBUILD evolution-data-server-3.6.3.ebuild 4001 SHA256 fedad84fb1c53a7ec5c2434e6e13fdb567ea46f8d1d36977de08d5d8a1d4c307 SHA512 890224e64768c554c7313407fe0c942e9ce610afdb6d22ab7609fe87e295c1b74bba96ccf66ed8ec6dd570f05e0ddfcfbb42aff4fe5e0d195506d656d4ecaf89 WHIRLPOOL 63864ebd9d47aa702729e91e74d7ac3260c8ec5b517d42b21aa59bf50b1e9e40f8cd619c2de2b8eeedf631cd3b568b7814d840b9b67cfa41f9755042a4dfa60d
+MISC ChangeLog 70233 SHA256 65220e9cb6af13725660233f0503bb332fd1016cb337e405c171a21625198199 SHA512 c3dd1cbb0651d043b81faea3847757c2fbf6c1a733aa4feca4f4691150a307e9633bde874cf09b5e4957bce6790c51c196823a514efed5c5fe6fc56022ba1060 WHIRLPOOL 046335633b2cc21500bb504eb77cbb045f47cba18ef9364e131bdb856b2b59b6361cb18c5e8e976f6bfbeb41a880a6eeb90e3845cab1e49d8b400b6ca83171c4
 MISC metadata.xml 506 SHA256 3b17f5d3335559ed8198c33f0866c39d854a452218344082d4453dddf555710b SHA512 4916d65f5fc5ccf4ddb5bd12717e3d839e01240df064c0b485f106713aa28573dd9a79944d2f4db0371fd766f8ff2938580b91fc90d2a72e44b9829f4e026b89 WHIRLPOOL 6b863b456d3e3c87a88cfcdfaaa105b4620524d840af99cafb9a70ea6ae619113e3c5e9575f3f7d4e487a695aa26aa3246e79c36059fa555f158d5fc3923a86a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRJOFsAAoJEJ0WA1zPCt1hpPMH/3BzJMQTLmCg92IyLep6zTxM
+vlublLowJHvgBPaav/Dsu0UaLYxA6EVO0AaoanNiwo4I/OdWLXa0TnR1JLxtZ6QB
+hVkJ4OmTDlWnwvD10jsQqd2MPxMOtL/c4ceLuo1ZBrSyQ/AEAbRN+b70D2yyvv/X
+OQhAA4THZbE8M2fT++H34seQekoOG34BPucRwJG+JpiEcRV14BuzfKF0un5SMqnT
+USulvxEqcSyuDJUZ6oee72PMLGTmYStb52fnymIoptcuHAge1T2R25IkeqJoEMlm
+ZJBtii4TkoPbiNzboRJOda9rDygICFGqJ2sJAiMXnwAIDxVQ4ABAZqliJm5tXQ8=
+=eoTy
+-----END PGP SIGNATURE-----
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild
index fe254129e297..7298e646aa95 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild,v 1.1 2013/01/22 19:59:23 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-2.32.3-r3.ebuild,v 1.2 2013/02/20 14:44:58 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -95,6 +95,9 @@ src_prepare() {
 	# Upstream bug #669003 - CalDAV: Cannot modify calendar object (libical 0.48)
 	epatch "${FILESDIR}/${P}-libical-0.48.patch"
 
+	# Fix building with libxml2-2.9, backported from eds-3.6
+	epatch "${FILESDIR}/${P}-libxml2-2.9.patch"
+
 	# /usr/include/db.h is always db-1 on FreeBSD
 	# so include the right dir in CPPFLAGS
 	append-cppflags "-I$(db_includedir)"
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild
index cecc6959e7ae..f6078dfabddd 100644
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild
+++ b/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild,v 1.1 2013/01/22 03:47:14 tetromino Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-extra/evolution-data-server/evolution-data-server-3.6.3.ebuild,v 1.2 2013/02/20 14:44:58 tetromino Exp $
 
 EAPI="5"
 GCONF_DEBUG="no"
@@ -20,7 +20,7 @@ SLOT="0/40" # subslot = libcamel-1.2 soname version
 IUSE="api-doc-extras +gnome-online-accounts +introspection ipv6 ldap kerberos vala +weather"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
 
 RDEPEND=">=dev-libs/glib-2.32:2
 	>=x11-libs/gtk+-3.2:3
diff --git a/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch
new file mode 100644
index 000000000000..765e4aea8ca1
--- /dev/null
+++ b/gnome-extra/evolution-data-server/files/evolution-data-server-2.32.3-libxml2-2.9.patch
@@ -0,0 +1,121 @@
+From 9792cbd0f131a972e132a60fa59c89244dea793d Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Mon, 13 Aug 2012 09:50:50 -0400
+Subject: [PATCH] Bug 681321 - Support both old and new-buf libxml2 APIs
+
+libxml2 changed the API for xmlOutputBuffer incompatibly.
+See https://mail.gnome.org/archives/desktop-devel-list/2012-August/msg00004.html
+---
+ calendar/backends/caldav/e-cal-backend-caldav.c | 35 +++++++++++++++++++------
+ 1 file changed, 27 insertions(+), 8 deletions(-)
+
+diff --git a/calendar/backends/caldav/e-cal-backend-caldav.c b/calendar/backends/caldav/e-cal-backend-caldav.c
+index 80c5a39..4343857 100644
+--- a/calendar/backends/caldav/e-cal-backend-caldav.c
++++ b/calendar/backends/caldav/e-cal-backend-caldav.c
+@@ -499,6 +499,19 @@ quote_etag (const gchar *etag)
+ 	return ret;
+ }
+ 
++static gconstpointer
++compat_libxml_output_buffer_get_content (xmlOutputBufferPtr buf,
++                                         gsize *out_len)
++{
++#ifdef LIBXML2_NEW_BUFFER
++	*out_len = xmlOutputBufferGetSize (buf);
++	return xmlOutputBufferGetContent (buf);
++#else
++	*out_len = buf->buffer->use;
++	return buf->buffer->content;
++#endif
++}
++
+ /* ************************************************************************* */
+ 
+ static gboolean
+@@ -1035,6 +1048,8 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
+ 	xmlDocPtr		  doc;
+ 	xmlNodePtr		  root, node;
+ 	xmlNsPtr		  ns, nsdav;
++	gconstpointer		  buf_content;
++	gsize			  buf_size;
+ 	gboolean		  result = TRUE;
+ 
+ 	g_return_val_if_fail (cbdav != NULL, TRUE);
+@@ -1069,11 +1084,11 @@ check_calendar_changed_on_server (ECalBackendCalDAV *cbdav)
+ 	soup_message_headers_append (message->request_headers,
+ 				     "Depth", "0");
+ 
++	buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
+ 	soup_message_set_request (message,
+ 				  "application/xml",
+ 				  SOUP_MEMORY_COPY,
+-				  (gchar *) buf->buffer->content,
+-				  buf->buffer->use);
++				  buf_content, buf_size);
+ 
+ 	/* Send the request now */
+ 	send_and_handle_redirection (priv->session, message, NULL);
+@@ -1131,6 +1146,8 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint
+ 	xmlDocPtr            doc;
+ 	xmlNsPtr             nsdav;
+ 	xmlNsPtr             nscd;
++	gconstpointer        buf_content;
++	gsize                buf_size;
+ 	gboolean             result;
+ 
+ 	priv = E_CAL_BACKEND_CALDAV_GET_PRIVATE (cbdav);
+@@ -1211,11 +1228,11 @@ caldav_server_list_objects (ECalBackendCalDAV *cbdav, CalDAVObject **objs, gint
+ 	soup_message_headers_append (message->request_headers,
+ 				     "Depth", "1");
+ 
++	buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
+ 	soup_message_set_request (message,
+ 				  "application/xml",
+ 				  SOUP_MEMORY_COPY,
+-				  (gchar *) buf->buffer->content,
+-				  buf->buffer->use);
++				  buf_content, buf_size);
+ 
+ 	/* Send the request now */
+ 	send_and_handle_redirection (priv->session, message, NULL);
+@@ -1499,6 +1516,8 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
+ 	xmlDocPtr doc;
+ 	xmlNodePtr root, node;
+ 	xmlNsPtr nsdav;
++	gconstpointer buf_content;
++	gsize buf_size;
+ 	gchar *owner = NULL;
+ 
+ 	g_return_val_if_fail (cbdav != NULL, FALSE);
+@@ -1527,11 +1546,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
+ 	soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
+ 	soup_message_headers_append (message->request_headers, "Depth", "0");
+ 
++	buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
+ 	soup_message_set_request (message,
+ 				  "application/xml",
+ 				  SOUP_MEMORY_COPY,
+-				  (gchar *) buf->buffer->content,
+-				  buf->buffer->use);
++				  buf_content, buf_size);
+ 
+ 	/* Send the request now */
+ 	send_and_handle_redirection (priv->session, message, NULL);
+@@ -1577,11 +1596,11 @@ caldav_receive_schedule_outbox_url (ECalBackendCalDAV *cbdav)
+ 		soup_message_headers_append (message->request_headers, "User-Agent", "Evolution/" VERSION);
+ 		soup_message_headers_append (message->request_headers, "Depth", "0");
+ 
++		buf_content = compat_libxml_output_buffer_get_content (buf, &buf_size);
+ 		soup_message_set_request (message,
+ 				  "application/xml",
+ 				  SOUP_MEMORY_COPY,
+-				  (gchar *) buf->buffer->content,
+-				  buf->buffer->use);
++				  buf_content, buf_size);
+ 
+ 		/* Send the request now */
+ 		send_and_handle_redirection (priv->session, message, NULL);
+-- 
+1.8.1.2
+