[arch-commits] CVS update of extra/gnome/libbonobo (PKGBUILD bonobo-fix-leaks.patch)

[Jan de Groot]

    Date: Thursday, September 20, 2007 @ 13:43:33
  Author: jgc
    Path: /home/cvs-extra/extra/gnome/libbonobo

   Added: bonobo-fix-leaks.patch (1.1)
Modified: PKGBUILD (1.18 -> 1.19)

upgpkg: libbonobo 2.20.0-1
Update for GNOME 2.20, add memleak patches from SVN


------------------------+
 PKGBUILD               |   26 ++++++++++++--------------
 bonobo-fix-leaks.patch |   44 ++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 56 insertions(+), 14 deletions(-)


Index: extra/gnome/libbonobo/PKGBUILD
diff -u extra/gnome/libbonobo/PKGBUILD:1.18 extra/gnome/libbonobo/PKGBUILD:1.19
--- extra/gnome/libbonobo/PKGBUILD:1.18	Sun Apr 22 09:52:11 2007
+++ extra/gnome/libbonobo/PKGBUILD	Thu Sep 20 13:43:33 2007
@@ -1,31 +1,29 @@
-# $Id: PKGBUILD,v 1.18 2007/04/22 13:52:11 jgc Exp $
+# $Id: PKGBUILD,v 1.19 2007/09/20 17:43:33 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libbonobo
-pkgver=2.18.0
-pkgrel=2
+pkgver=2.20.0
+pkgrel=1
 pkgdesc="A set of language and system independant CORBA interfaces for creating reusable components"
 arch=(i686 x86_64)
 license=('GPL' 'LGPL')
-depends=('orbit2>=2.14.7-2')
+depends=('orbit2>=2.14.9' 'libxml2>=2.6.30')
 makedepends=('perlxml' 'pkgconfig')
-options=('nolibtool')
+options=('!libtool')
 backup=('etc/bonobo-activation/bonobo-activation-config.xml')
 replaces=('bonobo-activation')
 url="http://www.gnome.org"
-source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.18/libbonobo-${pkgver}.tar.bz2
-	bgo416393.patch
-	bgo427992.patch
-	bonobo-activation-config.xml)
+source=(http://ftp.gnome.org/pub/gnome/sources/libbonobo/2.20/libbonobo-${pkgver}.tar.bz2
+	bonobo-activation-config.xml
+	bonobo-fix-leaks.patch)
 install=libbonobo.install
-md5sums=('8f0676e63420abf622f799cdd24ed9cc' '6bd6645ad8da177b3563069cad9e3552'
-	 'a3e4e402e7020dedb0a89e99c754f275')
-
+md5sums=('5656fc628f2b327cfdcab493a8f95f7f'
+         '6392efaca30a26f826eafc4b8ccbc01f'
+         '4713f56ebae1c1ca1c666b31a16755be')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np2 -i ${startdir}/src/bgo416393.patch || return 1
-  patch -Np2 -i ${startdir}/src/bgo427992.patch || return 1
+  patch -Np1 -i ${startdir}/src/bonobo-fix-leaks.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static \
 	      --libexecdir=/usr/lib/bonobo
Index: extra/gnome/libbonobo/bonobo-fix-leaks.patch
diff -u /dev/null extra/gnome/libbonobo/bonobo-fix-leaks.patch:1.1
--- /dev/null	Thu Sep 20 13:43:33 2007
+++ extra/gnome/libbonobo/bonobo-fix-leaks.patch	Thu Sep 20 13:43:33 2007
@@ -0,0 +1,44 @@
+--- trunk/activation-server/activation-context-corba.c	2007/09/18 16:51:55	3403
++++ trunk/activation-server/activation-context-corba.c	2007/09/18 16:54:14	3404
+@@ -324,6 +324,8 @@
+                 CORBA_Object_release (l2->data, &ev);
+                 CORBA_exception_free (&ev);
+         }
++
++	g_slist_free (notify);
+ }
+ 
+ gboolean
+--- trunk/bonobo-activation/bonobo-activation-activate.c	2007/09/17 12:08:18	3402
++++ trunk/bonobo-activation/bonobo-activation-activate.c	2007/09/18 16:51:55	3403
+@@ -797,7 +797,7 @@
+ {
+ 	int                        i;
+ 
+-	g_return_if_fail (name != NULL);
++	g_return_val_if_fail (name != NULL, NULL);
+ 
+ 	for (i = 0; i < activation_environment->_length; i++) {
+ 		if (strcmp (activation_environment->_buffer [i].name, name) == 0) {
+--- trunk/activation-server/object-directory-load.c	2007/09/17 12:08:18	3402
++++ trunk/activation-server/object-directory-load.c	2007/09/18 16:51:55	3403
+@@ -483,7 +483,8 @@
+                         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 @@
+                         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);