diff --git a/.cvsignore b/.cvsignore index ef2609f..d15d288 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -libbonobo-2.20.0.tar.bz2 +libbonobo-2.20.1.tar.bz2 diff --git a/libbonobo.spec b/libbonobo.spec index aa194df..fb72f83 100644 --- a/libbonobo.spec +++ b/libbonobo.spec @@ -5,7 +5,7 @@ Summary: Bonobo component system Name: libbonobo -Version: 2.20.0 +Version: 2.20.1 Release: 1%{?dist} URL: http://ftp.gnome.org Source0: http://download.gnome.org/sources/libbonobo/2.20/%{name}-%{version}.tar.bz2 @@ -26,10 +26,6 @@ Obsoletes: bonobo-activation Provides: bonobo-activation = %{version}-%{release} Patch0: libbonobo-2.13.1-multishlib.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=476398 -Patch1: list-leak.patch -# http://bugzilla.gnome.org/show_bug.cgi?id=476448 -Patch2: notify-leak.patch %description Bonobo is a component system based on CORBA, used by the GNOME desktop. @@ -62,9 +58,6 @@ use Bonobo. %patch0 -p1 -b .multishlib %endif -%patch1 -p1 -b .list-leak -%patch2 -p1 -b .notify-leak - %build intltoolize -f aclocal @@ -129,6 +122,10 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/gtk-doc/html/bonobo-activation %changelog +* Mon Oct 15 2007 Matthias Clasen - 2.20.1-1 +- Update to 2.20.1 (memory leak fixes, translation updates) +- Drop upstreamed patches + * Mon Sep 17 2007 Matthias Clasen - 2.20.0-1 - Update to 2.20.0 diff --git a/list-leak.patch b/list-leak.patch deleted file mode 100644 index a555eaf..0000000 --- a/list-leak.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff -up libbonobo-2.19.6/activation-server/object-directory-load.c.list-leak libbonobo-2.19.6/activation-server/object-directory-load.c ---- libbonobo-2.19.6/activation-server/object-directory-load.c.list-leak 2007-09-12 18:41:20.000000000 -0400 -+++ libbonobo-2.19.6/activation-server/object-directory-load.c 2007-09-12 21:33:20.000000000 -0400 -@@ -483,7 +483,8 @@ od_end_element (GMarkupParseContext *con - info->cur_prop->v._u.value_stringv._buffer = - CORBA_sequence_CORBA_string_allocbuf (len); - -- for (i = 0, p = g_list_reverse (info->cur_items); p; p = p->next, i++) -+ info->cur_items = g_list_reverse (info->cur_items); -+ for (i = 0, p = info->cur_items; p; p = p->next, i++) - info->cur_prop->v._u. - value_stringv._buffer[i] = p->data; - g_list_free (info->cur_items); -@@ -509,7 +510,8 @@ od_end_element (GMarkupParseContext *con - info->cur_server->props._buffer = - CORBA_sequence_Bonobo_ActivationProperty_allocbuf (len); - -- for (i = 0, p = g_list_reverse (info->cur_props); p; p = p->next, i++) { -+ info->cur_props = g_list_reverse (info->cur_props); -+ for (i = 0, p = info->cur_props; p; p = p->next, i++) { - Bonobo_ActivationProperty_copy (&info->cur_server->props._buffer[i], - (Bonobo_ActivationProperty *) p->data); - CORBA_free (p->data); diff --git a/notify-leak.patch b/notify-leak.patch deleted file mode 100644 index 66a2c8b..0000000 --- a/notify-leak.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up libbonobo-2.19.6/activation-server/activation-context-corba.c.notify-leak libbonobo-2.19.6/activation-server/activation-context-corba.c ---- libbonobo-2.19.6/activation-server/activation-context-corba.c.notify-leak 2007-09-13 01:28:07.000000000 -0400 -+++ libbonobo-2.19.6/activation-server/activation-context-corba.c 2007-09-13 01:27:08.000000000 -0400 -@@ -324,6 +324,8 @@ activation_clients_cache_notify (void) - CORBA_Object_release (l2->data, &ev); - CORBA_exception_free (&ev); - } -+ -+ g_slist_free (notify); - } - - gboolean diff --git a/sources b/sources index ffbf71b..f151423 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -5656fc628f2b327cfdcab493a8f95f7f libbonobo-2.20.0.tar.bz2 +76e52d1c39e6ef1079c757c21f06f5ff libbonobo-2.20.1.tar.bz2