Version bump fixing tests, a lot of bugs and allowing Google Contacts' user defined fields to have empty names, upstream bug #648058.

Package-Manager: portage-2.1.9.46/cvs/Linux x86_64

4 files changed, 188 insertions, 2 deletions

diff --git a/dev-libs/libgdata/ChangeLog b/dev-libs/libgdata/ChangeLog
index 32fe90951d64..f5dda430a726 100644
--- a/dev-libs/libgdata/ChangeLog
+++ b/dev-libs/libgdata/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for dev-libs/libgdata
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.28 2011/03/22 18:52:37 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/ChangeLog,v 1.29 2011/04/20 12:41:54 pacho Exp $
+
+*libgdata-0.8.1 (20 Apr 2011)
+
+  20 Apr 2011; Pacho Ramos <pacho@gentoo.org> +libgdata-0.8.1.ebuild,
+  +files/libgdata-0.8.1-empty-names.patch:
+  Version bump fixing tests, a lot of bugs and allowing Google Contacts' user
+  defined fields to have empty names, upstream bug #648058.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org> libgdata-0.8.0.ebuild:
   Marking libgdata-0.8.0 ppc stable for bug 353436
diff --git a/dev-libs/libgdata/Manifest b/dev-libs/libgdata/Manifest
index a6fad62c5fd4..c6a276297e1e 100644
--- a/dev-libs/libgdata/Manifest
+++ b/dev-libs/libgdata/Manifest
@@ -1,10 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX libgdata-0.8.1-empty-names.patch 5173 RMD160 9acdbca20a3f7f146a372826c710362f624723bb SHA1 45e94481032149d95f17a0fbe44226e21fe9a71b SHA256 c7f1f7d380775e7b7e8756f58fb221bb04aec77de4e95b3b9f5f70bb7e0d7add
 DIST libgdata-0.6.4.tar.bz2 1003963 RMD160 cfd61e279dc5a6d3afc36bd5c5de9925ab3045d1 SHA1 b464d798797fa6c9a52ad2dab3cd122702c76294 SHA256 56c3f3cbd0bf8c410ebdff2d8a57eeb1db7dbc1bb342bf6f43f89700ef517d9d
 DIST libgdata-0.6.5.tar.bz2 1015870 RMD160 2a10241064e1848406fcf132927fec5594f50996 SHA1 d6a78525b15b320086b7483e18bd9be6cb4e9e86 SHA256 dcb82f7162d69549512444376da2cdea65650ee4dae4d00eed7fbbd3387ddf2c
 DIST libgdata-0.6.6.tar.bz2 1040702 RMD160 5d3f8ee7c4897cfe12a634a472a44ce122666fc6 SHA1 2fe2f02be38662103eca19ae1edd7be56bffbc9e SHA256 cf6de3b60443faaf8e9c3b4c4b160c22a48df7925c1c793a7bb71d3d746f69f5
 DIST libgdata-0.8.0.tar.bz2 1240410 RMD160 4a5dd9dd291e487be846443daad8f1f4af2f6843 SHA1 3d0beebfb248d8d684762492755c3e195220f929 SHA256 1a816dda7de8ce162e00cc1c782a5ae25230a36d56c590a67d86848058797c9f
+DIST libgdata-0.8.1.tar.bz2 1201616 RMD160 ff56052332399e29a0a615d9128524cb2a178d47 SHA1 e0526fafeda6ef5d92afbdea08f715a07942ac84 SHA256 080be3e677e6098d0f1bbcbaf8e474b4b94fad8a0d07b5a2969c3ab95b68d0b9
 EBUILD libgdata-0.6.4.ebuild 1803 RMD160 5bd610add7215686431b6906848c39d9480232b5 SHA1 aaf67c22534163c24d509449cfa93c41c38e4540 SHA256 3e55ccf31e67def80d6fd83dee659d9e8123301923d1e1017844994ae547394c
 EBUILD libgdata-0.6.5.ebuild 1527 RMD160 9dc1df344db0a3949b488c1fb80cca74d4d9babf SHA1 dc24fd35cca26d902bcae1af8e6e0e7a4adcc347 SHA256 9ad9732353fd626fb84595ce6bcd40a1a4df8fa3285034125cbcb8450446ba14
 EBUILD libgdata-0.6.6.ebuild 1550 RMD160 f1fc7b704f82d05de642e750f0f212251a07a446 SHA1 48cd283eb9a26c386305c489428e594c5a8f8753 SHA256 87d38d8bb50db61473320fb9556071bf19e797dbdb9c3c20097185ccb239ef23
 EBUILD libgdata-0.8.0.ebuild 1618 RMD160 961836d0262133dc529c114f83d4383a3323acf2 SHA1 de6817401e1121150c931d68c9afa1b8f2b36c38 SHA256 b3c1d02a7391a60d84c4015c91de6765e9118955b3aa01b4053d44273c59620d
-MISC ChangeLog 3993 RMD160 45b94da48914221cd917fbaef3b8e8e889158a7f SHA1 a14843115d4a3aa3dc50a32892e754d86897d4e3 SHA256 7381bbfdc599ab6514ab9ec08c903e7cf91de633b3c9c71560b9d80b9b8b06c8
+EBUILD libgdata-0.8.1.ebuild 1759 RMD160 471bd4a48af6612a2e6949d947047004b258e38c SHA1 5feedc6dedc7cdbe40b17cee2771a1c68c6291ea SHA256 e295a0227eb9aaa5906df7f50deece78cfde65407103073160031d529fb1c0fc
+MISC ChangeLog 4275 RMD160 081d27bba07f43d1fbb61293b4ac194406e3ad03 SHA1 550c8b7fcf25d9bd6d02d0d7c6efff24ac14c3f8 SHA256 272f4a6ba1a7315b968d2aa5d5e836864a40f47c71cdfb13d7eb4019d9e6b3ba
 MISC metadata.xml 277 RMD160 2ffb105a089a3b759ddef20bf72b06362a1d1c63 SHA1 82aa8cfe90fb0c9f7c02f295d2802d41ad2af380 SHA256 3d52f90556a9db4ad09f2fbe34e2d25b21f345e474e829ac84669d49cb64c8bb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk2u1JcACgkQCaWpQKGI+9RQlQCghWhMy7WoUrvn6aTwtKjSAtlm
+5jkAn02wDMnin57w3/fEY/a8Zq7gMtQb
+=W8Ig
+-----END PGP SIGNATURE-----
diff --git a/dev-libs/libgdata/files/libgdata-0.8.1-empty-names.patch b/dev-libs/libgdata/files/libgdata-0.8.1-empty-names.patch
new file mode 100644
index 000000000000..1eef41eb1de0
--- /dev/null
+++ b/dev-libs/libgdata/files/libgdata-0.8.1-empty-names.patch
@@ -0,0 +1,102 @@
+From 400a4e74f5a506ddff07605a93aa7412262fea38 Mon Sep 17 00:00:00 2001
+From: Philip Withnall <philip@tecnocode.co.uk>
+Date: Tue, 19 Apr 2011 08:13:01 +0000
+Subject: Bug 648058 — Doesn't allow empty names for user defined fields
+
+Allow Google Contacts' user defined fields to have empty names. Test cases
+updated. Closes: bgo#648058
+---
+diff --git a/gdata/services/contacts/gdata-contacts-contact.c b/gdata/services/contacts/gdata-contacts-contact.c
+index bedb2c8..33b20c6 100644
+--- a/gdata/services/contacts/gdata-contacts-contact.c
++++ b/gdata/services/contacts/gdata-contacts-contact.c
+@@ -896,8 +896,9 @@ parse_xml (GDataParsable *parsable, xmlDoc *doc, xmlNode *node, gpointer user_da
+ 			/* gContact:userDefinedField */
+ 			xmlChar *name, *value;
+ 
++			/* Note that while we require the property to be present, we don't require it to be non-empty. See bgo#648058 */
+ 			name = xmlGetProp (node, (xmlChar*) "key");
+-			if (name == NULL || *name == '\0') {
++			if (name == NULL) {
+ 				xmlFree (name);
+ 				return gdata_parser_error_required_property_missing (node, "key", error);
+ 			}
+@@ -2843,6 +2844,8 @@ gdata_contacts_contact_set_extended_property (GDataContactsContact *self, const
+  * Gets the value of a user-defined field of the contact. User-defined fields are settable by the user through the Google Contacts web interface,
+  * in contrast to extended properties, which are visible and settable only through the GData interface.
+  *
++ * The @name of the field may not be %NULL, but may be an empty string.
++ *
+  * Return value: the field's value, or %NULL
+  *
+  * Since: 0.7.0
+@@ -2851,7 +2854,7 @@ const gchar *
+ gdata_contacts_contact_get_user_defined_field (GDataContactsContact *self, const gchar *name)
+ {
+ 	g_return_val_if_fail (GDATA_IS_CONTACTS_CONTACT (self), NULL);
+-	g_return_val_if_fail (name != NULL && *name != '\0', NULL);
++	g_return_val_if_fail (name != NULL, NULL);
+ 	return g_hash_table_lookup (self->priv->user_defined_fields, name);
+ }
+ 
+@@ -2881,6 +2884,8 @@ gdata_contacts_contact_get_user_defined_fields (GDataContactsContact *self)
+  * Sets the value of a contact's user-defined field. User-defined field names are unique (but of the client's choosing),
+  * and reusing the same field name will result in the old value of that field being overwritten.
+  *
++ * The @name of the field may not be %NULL, but may be an empty string.
++ *
+  * To unset a field, set @value to %NULL.
+  *
+  * Since: 0.7.0
+@@ -2889,7 +2894,7 @@ void
+ gdata_contacts_contact_set_user_defined_field (GDataContactsContact *self, const gchar *name, const gchar *value)
+ {
+ 	g_return_if_fail (GDATA_IS_CONTACTS_CONTACT (self));
+-	g_return_if_fail (name != NULL && *name != '\0');
++	g_return_if_fail (name != NULL);
+ 
+ 	if (value == NULL) {
+ 		/* Removing a field */
+diff --git a/gdata/tests/contacts.c b/gdata/tests/contacts.c
+index e22184f..37c0a68 100644
+--- a/gdata/tests/contacts.c
++++ b/gdata/tests/contacts.c
+@@ -276,6 +276,7 @@ test_insert_simple (gconstpointer service)
+ 	gdata_contacts_contact_set_user_defined_field (contact, "Favourite colour", "Blue");
+ 	gdata_contacts_contact_set_user_defined_field (contact, "Owes me", "£10");
+ 	gdata_contacts_contact_set_user_defined_field (contact, "My notes", "");
++	gdata_contacts_contact_set_user_defined_field (contact, "", "Foo"); /* bgo#648058 */
+ 
+ 	/* Check the properties of the object */
+ 	g_object_get (G_OBJECT (contact),
+@@ -374,6 +375,7 @@ test_insert_simple (gconstpointer service)
+ 				"<gContact:userDefinedField key='Favourite colour' value='Blue'/>"
+ 				"<gContact:userDefinedField key='Owes me' value='£10'/>"
+ 				"<gContact:userDefinedField key='My notes' value=''/>"
++				"<gContact:userDefinedField key='' value='Foo'/>" /* bgo#648058 */
+ 				"<gContact:hobby>Rowing</gContact:hobby>"
+ 				"<gContact:nickname>Big J</gContact:nickname>"
+ 				"<gContact:birthday when='--01-01'/>"
+@@ -510,10 +512,11 @@ test_insert_simple (gconstpointer service)
+ 	g_assert_cmpstr (gdata_contacts_contact_get_user_defined_field (new_contact, "Favourite colour"), ==, "Blue");
+ 	g_assert_cmpstr (gdata_contacts_contact_get_user_defined_field (new_contact, "Owes me"), ==, "£10");
+ 	g_assert_cmpstr (gdata_contacts_contact_get_user_defined_field (new_contact, "My notes"), ==, "");
++	g_assert_cmpstr (gdata_contacts_contact_get_user_defined_field (new_contact, ""), ==, "Foo");
+ 
+ 	properties = gdata_contacts_contact_get_user_defined_fields (new_contact);
+ 	g_assert (properties != NULL);
+-	g_assert_cmpuint (g_hash_table_size (properties), ==, 3);
++	g_assert_cmpuint (g_hash_table_size (properties), ==, 4);
+ 
+ 	/* Groups */
+ 	list = gdata_contacts_contact_get_groups (new_contact);
+@@ -1298,7 +1301,6 @@ test_parser_error_handling (void)
+ 	TEST_XML_ERROR_HANDLING ("<gContact:userDefinedField/>"); /* no key or value */
+ 	TEST_XML_ERROR_HANDLING ("<gContact:userDefinedField key='foo'/>"); /* no value */
+ 	TEST_XML_ERROR_HANDLING ("<gContact:userDefinedField value='bar'/>"); /* no key */
+-	TEST_XML_ERROR_HANDLING ("<gContact:userDefinedField key='' value='bar'/>"); /* empty key */
+ 
+ 	/* gContact:groupMembershipInfo */
+ 	TEST_XML_ERROR_HANDLING ("<gContact:groupMembershipInfo/>");
+--
+cgit v0.9
diff --git a/dev-libs/libgdata/libgdata-0.8.1.ebuild b/dev-libs/libgdata/libgdata-0.8.1.ebuild
new file mode 100644
index 000000000000..cfb57e11bd8b
--- /dev/null
+++ b/dev-libs/libgdata/libgdata-0.8.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-libs/libgdata/libgdata-0.8.1.ebuild,v 1.1 2011/04/20 12:41:54 pacho Exp $
+
+EAPI="3"
+GCONF_DEBUG="yes"
+
+inherit eutils gnome2
+
+DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
+HOMEPAGE="http://live.gnome.org/libgdata"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="doc gnome +introspection"
+
+# gtk+ is needed for gdk
+RDEPEND=">=dev-libs/glib-2.19:2
+	|| (
+		>=x11-libs/gdk-pixbuf-2.14:2
+		>=x11-libs/gtk+-2.14:2 )
+	>=dev-libs/libxml2-2:2
+	>=net-libs/libsoup-2.26.1:2.4[introspection?]
+	gnome? ( >=net-libs/libsoup-gnome-2.26.1:2.4[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7 )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	doc? ( >=dev-util/gtk-doc-1.14 )"
+
+pkg_setup() {
+	DOCS="AUTHORS ChangeLog HACKING NEWS README"
+	G2CONF="${G2CONF}
+		--disable-static
+		$(use_enable gnome)
+		$(use_enable introspection)"
+}
+
+src_prepare() {
+	gnome2_src_prepare
+
+	# Disable tests requiring network access, bug #307725
+	sed -e '/^TEST_PROGS = / s:\(.*\):TEST_PROGS = general perf\nOLD_\1:' \
+		-i gdata/tests/Makefile.in || die "network test disable failed"
+
+	# Allow Google Contacts' user defined fields to have empty names, upstream bug #648058
+	epatch "${FILESDIR}/${P}-empty-names.patch"
+}
+
+src_test() {
+	unset ORBIT_SOCKETDIR
+	unset DBUS_SESSION_BUS_ADDRESS
+	dbus-launch emake check || die "emake check failed"
+}
+
+pkg_preinst() {
+	gnome2_pkg_preinst
+	preserve_old_lib /usr/$(get_libdir)/libgdata.so.7
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+	preserve_old_lib_notify /usr/$(get_libdir)/libgdata.so.7
+}