rpms/empathy/F-12 xmlCleanupParser.patch, NONE, 1.1 empathy.spec, 1.90, 1.91

[Brian Pepple]

Author: bpepple

Update of /cvs/pkgs/rpms/empathy/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18157

Modified Files:
	empathy.spec 
Added Files:
	xmlCleanupParser.patch 
Log Message:
* Wed Jan 13 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.28.2-2
- Add patch to fix misuse of xmlCleanupParser. (#532307)


xmlCleanupParser.patch:
 libempathy-gtk/empathy-plist.c           |    2 --
 libempathy/empathy-chatroom-manager.c    |    1 -
 libempathy/empathy-contact-groups.c      |    1 -
 libempathy/empathy-irc-network-manager.c |    1 -
 src/empathy.c                            |    1 +
 5 files changed, 1 insertion(+), 5 deletions(-)

--- NEW FILE xmlCleanupParser.patch ---
diff -urp empathy-2.28.2.OLD/libempathy/empathy-chatroom-manager.c empathy-2.28.2/libempathy/empathy-chatroom-manager.c
--- empathy-2.28.2.OLD/libempathy/empathy-chatroom-manager.c	2009-12-14 10:17:49.000000000 -0500
+++ empathy-2.28.2/libempathy/empathy-chatroom-manager.c	2010-01-13 09:27:43.949906512 -0500
@@ -123,7 +123,6 @@ chatroom_manager_file_save (EmpathyChatr
 	xmlSaveFormatFileEnc (priv->file, doc, "utf-8", 1);
 	xmlFreeDoc (doc);
 
-	xmlCleanupParser ();
 	xmlMemoryDump ();
 
 	return TRUE;
diff -urp empathy-2.28.2.OLD/libempathy/empathy-contact-groups.c empathy-2.28.2/libempathy/empathy-contact-groups.c
--- empathy-2.28.2.OLD/libempathy/empathy-contact-groups.c	2009-12-14 10:17:49.000000000 -0500
+++ empathy-2.28.2/libempathy/empathy-contact-groups.c	2010-01-13 09:28:06.290905516 -0500
@@ -220,7 +220,6 @@ contact_groups_file_save (void)
 	xmlSaveFormatFileEnc (file, doc, "utf-8", 1);
 	xmlFreeDoc (doc);
 
-	xmlCleanupParser ();
 	xmlMemoryDump ();
 
 	g_free (file);
diff -urp empathy-2.28.2.OLD/libempathy/empathy-irc-network-manager.c empathy-2.28.2/libempathy/empathy-irc-network-manager.c
--- empathy-2.28.2.OLD/libempathy/empathy-irc-network-manager.c	2009-12-14 10:17:49.000000000 -0500
+++ empathy-2.28.2/libempathy/empathy-irc-network-manager.c	2010-01-13 09:28:46.797905995 -0500
@@ -712,7 +712,6 @@ irc_network_manager_file_save (EmpathyIr
   xmlSaveFormatFileEnc (priv->user_file, doc, "utf-8", 1);
   xmlFreeDoc (doc);
 
-  xmlCleanupParser ();
   xmlMemoryDump ();
 
   priv->have_to_save = FALSE;
diff -urp empathy-2.28.2.OLD/libempathy-gtk/empathy-plist.c empathy-2.28.2/libempathy-gtk/empathy-plist.c
--- empathy-2.28.2.OLD/libempathy-gtk/empathy-plist.c	2009-10-20 11:25:40.000000000 -0400
+++ empathy-2.28.2/libempathy-gtk/empathy-plist.c	2010-01-13 09:27:17.081907251 -0500
@@ -294,7 +294,6 @@ empathy_plist_parse_from_file (const cha
 	parsed_doc = empathy_plist_parse (root_element);
 
 	xmlFreeDoc (doc);
-	xmlCleanupParser ();
 
 	return parsed_doc;
 }
@@ -329,7 +328,6 @@ empathy_plist_parse_from_memory (const c
 	parsed_doc = empathy_plist_parse (root_element);
 
 	xmlFreeDoc (doc);
-	xmlCleanupParser ();
 
 	return parsed_doc;
 }
diff -urp empathy-2.28.2.OLD/src/empathy.c empathy-2.28.2/src/empathy.c
--- empathy-2.28.2.OLD/src/empathy.c	2009-12-14 10:17:49.000000000 -0500
+++ empathy-2.28.2/src/empathy.c	2010-01-13 09:29:45.095906551 -0500
@@ -1005,6 +1005,7 @@ main (int argc, char *argv[])
   g_object_unref (unique_app);
 
   notify_uninit ();
+  xmlCleanupParser ();
 
   return EXIT_SUCCESS;
 }


Index: empathy.spec
===================================================================
RCS file: /cvs/pkgs/rpms/empathy/F-12/empathy.spec,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -p -r1.90 -r1.91
--- empathy.spec	16 Dec 2009 16:53:05 -0000	1.90
+++ empathy.spec	13 Jan 2010 15:17:34 -0000	1.91
@@ -14,7 +14,7 @@
 
 Name:		empathy
 Version:	2.28.2
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -33,6 +33,8 @@ Patch1:		%{name}-broken-pkgconfig.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=592853
 Patch3:		presence-icons.patch
 Patch5:		%{name}-broken-nm.patch
+# https://bugzilla.gnome.org/show_bug.cgi?id=600693
+Patch6:		xmlCleanupParser.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -137,6 +139,7 @@ bindings to the libempathy and libempath
 %patch1 -p1 -b .pkgconfig
 %patch3 -p1 -b .presence-icons
 %patch5 -p1 -b .nm
+%patch6 -p1 -b .xmlcleanupparser
 
 # force these to be regenerated
 rm data/empathy.desktop
@@ -237,6 +240,9 @@ fi
 %{python_sitearch}/empathy*.so
 
 %changelog
+* Wed Jan 13 2010 Brian Pepple <bpepple at fedoraproject.org> - 2.28.2-2
+- Add patch to fix misuse of xmlCleanupParser. (#532307)
+
 * Mon Dec 14 2009 Brian Pepple <bpepple at fedoraproject.org> - 2.28.2-1
 - Update to 2.28.2.
 - See http://download.gnome.org/sources/empathy/2.28/empathy-2.28.2.news