empathy: add 2.28.2

gnome-doc-utils: add 0.19.2
telepathy-glib: add 0.7.37

6 files changed, 140 insertions, 5 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index cce202729e..04eb0dc263 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -6266,6 +6266,10 @@ sha256=5e73cfe9bbe862391386b4d60776a22fc765c48fe9f2bfad17ebd691571da2b9
 md5=1edc492c0fd339dc30f0a443adad5fbe
 sha256=bb3b3663b11e3e573a13dd1b51d8a5b02797a43c53a64efc529f6604f40503c7
 
+[http://ftp.gnome.org/pub/GNOME/sources/empathy/2.28/empathy-2.28.2.tar.bz2]
+md5=8d578d82d1e51dc8c83642b81c0fb65a
+sha256=8f1dc1cbf7bda0dcb9804d5aa5d5d0e625c35dee10bfba7050aa3a8b6d491f3b
+
 [http://download.berlios.de/emul/emul-1.0.5.tar.gz]
 md5=f713b4d3c6a733b429de2673e4427483
 sha256=b91c7fb6420f6787d34b88b1e0d2e705e1006b5bce17235356f84a3c14329612
@@ -9562,6 +9566,10 @@ sha256=19b5b4425bc578af8a1c58b61f1b9a416743d0b1fae3356cd9a0071f1f66632c
 md5=5934c08d12407d8233416343cd73df24
 sha256=6bb8ec068558e380aff1e3f0aa130b52161ad68f8d495fce45c55783bbba9076
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.19/gnome-doc-utils-0.19.2.tar.bz2]
+md5=e2509ab1a7719902cf544cb288df438d
+sha256=ee5798361e4396269820aa7571bcf173e77c454ed2b1a38b9fc1dcbd7f58abae
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-doc-utils/0.7/gnome-doc-utils-0.7.1.tar.bz2]
 md5=21fe881ab473fdc9246c36bd8ef929b0
 sha256=5b51e0dfae64e7f48883fce6657fcf47a03f6429e2c67024203e31cc29032a22
@@ -18546,6 +18554,10 @@ sha256=e88295f9d6fe792784ea7dd546a12b0e7bb96b023d4248e728a43eb6ad885135
 md5=14b3f971348f4d59ae8b8362d8eb15ff
 sha256=272ac90813e4301873d46229b216622bb7bc6a0b3adb15577b20b5083f92a169
 
+[http://download.berlios.de/mapnik/mapnik-0.6.1.tar.bz2]
+md5=44093af694321ef2034b1fd2edc998c9
+sha256=59b1c19817ed65ba8f0d3a2ac8f06ecf5c12f452d10170fa04f6824ea257437f
+
 [http://www.maradns.org/download/1.0/maradns-1.0.39.tar.bz2]
 md5=5ac39978f55ecaf6e887cd5be027b1c3
 sha256=4ac5940d25a9b5a52d0ff1f8223bb85462f9cfcceb4ac547e3ca9b6690aad394
@@ -26166,6 +26178,10 @@ sha256=49dca0428d69f43c856800967b2def8c890cd322fbdd0aa47c227aec5820a690
 md5=ae67d4fe42c7e337813754cb5927b6cc
 sha256=7bf25e050e8b8ceb983c1cad6b4e38892b052f6da82df3b7aec7b2ea50a8702e
 
+[http://telepathy.freedesktop.org/releases/telepathy-glib/telepathy-glib-0.7.37.tar.gz]
+md5=681b5b82fc3ec65d86a6cb409ec38e5d
+sha256=7ae86c8f17cb00e827a0bb60b03345984b3065a33db3d119527d41993a09443d
+
 [http://telepathy.freedesktop.org/releases/telepathy-idle/telepathy-idle-0.1.2.tar.gz]
 md5=21bfda9e1fa12e25b4173deb9ffd0b5d
 sha256=3ed0cb5dd687e4d9fa838a318f9ef12a8c221894ff188687c27625f0ac3bce82
diff --git a/recipes/gnome/gnome-doc-utils.inc b/recipes/gnome/gnome-doc-utils.inc
index 8858dac05d..00231a941c 100644
--- a/recipes/gnome/gnome-doc-utils.inc
+++ b/recipes/gnome/gnome-doc-utils.inc
@@ -1,16 +1,15 @@
 LICENSE = "GPL LGPL"
 DEPENDS = "libxml2 libxslt libxslt-native"
 
-INC_PR = "r2"
+INC_PR = "r3"
 
 inherit gnome
 
 EXTRA_OECONF = "--disable-scrollkeeper ac_cv_path_PYTHON=${bindir}/python"
 
-do_stage() {
-	mkdir -p  ${STAGING_DATADIR}/xml/gnome/xslt/
-	cp -pPr ${S}/xslt/* ${STAGING_DATADIR}/xml/gnome/xslt/
-	autotools_stage_all
+do_install_append() {
+	mkdir -p  ${D}${datadir}/xml/gnome/xslt/
+	cp -pPr ${S}/xslt/* ${D}${datadir}/xml/gnome/xslt/
 }
 
 FILES_${PN} += "${datadir}/xml*"
diff --git a/recipes/gnome/gnome-doc-utils_0.19.2.bb b/recipes/gnome/gnome-doc-utils_0.19.2.bb
new file mode 100644
index 0000000000..d501a7db4c
--- /dev/null
+++ b/recipes/gnome/gnome-doc-utils_0.19.2.bb
@@ -0,0 +1,3 @@
+require gnome-doc-utils.inc
+
+PR = "${INC_PR}.0"
diff --git a/recipes/telepathy/empathy/fix-xml-threadbreakage.patch b/recipes/telepathy/empathy/fix-xml-threadbreakage.patch
new file mode 100644
index 0000000000..17077f78ea
--- /dev/null
+++ b/recipes/telepathy/empathy/fix-xml-threadbreakage.patch
@@ -0,0 +1,81 @@
+From: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: Wed, 13 Jan 2010 10:28:29 +0000 (+0000)
+Subject: Call xmlCleanupParser() only once when exiting (#600693)
+X-Git-Url: http://git.collabora.co.uk/?p=user%2Fcassidy%2Fempathy;a=commitdiff_plain;h=9ab430b106fb724e63a201eff3d391214650f279
+
+Call xmlCleanupParser() only once when exiting (#600693)
+
+This function should only be called when exiting the application as it cleans
+up the memory allocated by the library itself.
+
+Thanks to Lennart for pointing this out.
+---
+
+diff --git a/libempathy-gtk/empathy-plist.c b/libempathy-gtk/empathy-plist.c
+index 4cc392b..73d3146 100644
+--- a/libempathy-gtk/empathy-plist.c
++++ b/libempathy-gtk/empathy-plist.c
+@@ -294,7 +294,6 @@ empathy_plist_parse_from_file (const char *filename)
+ 	parsed_doc = empathy_plist_parse (root_element);
+ 
+ 	xmlFreeDoc (doc);
+-	xmlCleanupParser ();
+ 
+ 	return parsed_doc;
+ }
+@@ -329,7 +328,6 @@ empathy_plist_parse_from_memory (const char *data, gsize len)
+ 	parsed_doc = empathy_plist_parse (root_element);
+ 
+ 	xmlFreeDoc (doc);
+-	xmlCleanupParser ();
+ 
+ 	return parsed_doc;
+ }
+diff --git a/libempathy/empathy-chatroom-manager.c b/libempathy/empathy-chatroom-manager.c
+index 7d80b94..0f06132 100644
+--- a/libempathy/empathy-chatroom-manager.c
++++ b/libempathy/empathy-chatroom-manager.c
+@@ -123,7 +123,6 @@ chatroom_manager_file_save (EmpathyChatroomManager *manager)
+ 	xmlSaveFormatFileEnc (priv->file, doc, "utf-8", 1);
+ 	xmlFreeDoc (doc);
+ 
+-	xmlCleanupParser ();
+ 	xmlMemoryDump ();
+ 
+ 	return TRUE;
+diff --git a/libempathy/empathy-contact-groups.c b/libempathy/empathy-contact-groups.c
+index 22d81d0..9ddc562 100644
+--- a/libempathy/empathy-contact-groups.c
++++ b/libempathy/empathy-contact-groups.c
+@@ -220,7 +220,6 @@ contact_groups_file_save (void)
+ 	xmlSaveFormatFileEnc (file, doc, "utf-8", 1);
+ 	xmlFreeDoc (doc);
+ 
+-	xmlCleanupParser ();
+ 	xmlMemoryDump ();
+ 
+ 	g_free (file);
+diff --git a/libempathy/empathy-irc-network-manager.c b/libempathy/empathy-irc-network-manager.c
+index ad72680..8170a5f 100644
+--- a/libempathy/empathy-irc-network-manager.c
++++ b/libempathy/empathy-irc-network-manager.c
+@@ -712,7 +712,6 @@ irc_network_manager_file_save (EmpathyIrcNetworkManager *self)
+   xmlSaveFormatFileEnc (priv->user_file, doc, "utf-8", 1);
+   xmlFreeDoc (doc);
+ 
+-  xmlCleanupParser ();
+   xmlMemoryDump ();
+ 
+   priv->have_to_save = FALSE;
+diff --git a/src/empathy.c b/src/empathy.c
+index 82f62dd..9665405 100644
+--- a/src/empathy.c
++++ b/src/empathy.c
+@@ -1005,6 +1005,7 @@ main (int argc, char *argv[])
+   g_object_unref (unique_app);
+ 
+   notify_uninit ();
++  xmlCleanupParser ();
+ 
+   return EXIT_SUCCESS;
+ }
diff --git a/recipes/telepathy/empathy_2.28.2.bb b/recipes/telepathy/empathy_2.28.2.bb
new file mode 100644
index 0000000000..c1e715f433
--- /dev/null
+++ b/recipes/telepathy/empathy_2.28.2.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "Empathy: a Telepathy based IM client"
+HOMEPAGE = "http://blogs.gnome.org/view/xclaesse/2007/04/26/0"
+LICENSE = "GPL"
+DEPENDS = "libcanberra telepathy-farsight gnome-doc-utils python-native telepathy-python telepathy-mission-control libtelepathy telepathy-glib gtk+ gconf libglade eds-dbus"
+RDEPENDS = "telepathy-mission-control"
+RRECOMMENDS = "telepathy-gabble"
+
+inherit gnome
+
+SRC_URI += "file://fix-xml-threadbreakage.patch;patch=1"
+
+PARALLEL_MAKE = ""
+
+PACKAGES =+ "empathy-scrollkeeper-junk"
+FILES_empathy-scrollkeeper-junk = "/var/lib/scrollkeeper"
+
+FILES_${PN} += "${datadir}/mission-control/profiles/*.profile \
+        ${datadir}/dbus-1/services/*.service \
+        ${datadir}/telepathy/ \
+	${datadir}/icons \
+	${libdir}/python*"
+
+FILES_${PN}-dbg += "${libdir}/python*/*/.debug"
+
diff --git a/recipes/telepathy/telepathy-glib_0.7.37.bb b/recipes/telepathy/telepathy-glib_0.7.37.bb
new file mode 100644
index 0000000000..05c27abca2
--- /dev/null
+++ b/recipes/telepathy/telepathy-glib_0.7.37.bb
@@ -0,0 +1,12 @@
+DESCRIPTION = "Telepathy framework - GLib library"
+HOMEPAGE = "http://telepathy.freedesktop.org/wiki/"
+DEPENDS = "glib-2.0 dbus libxslt-native python-native dbus-native"
+LICENSE = "LGPL"
+
+SRC_URI = "http://telepathy.freedesktop.org/releases/telepathy-glib/${P}.tar.gz "
+
+inherit autotools
+
+FILES_${PN} += "${datadir}/telepathy \
+		${datadir}/dbus-1"
+