[arch-commits] CVS update of extra/gnome/libbonobo (4 files)
Jan de Groot
jgc at archlinux.org
Wed Oct 17 18:06:01 UTC 2007
Date: Wednesday, October 17, 2007 @ 14:06:01
Author: jgc
Path: /home/cvs-extra/extra/gnome/libbonobo
Modified: PKGBUILD (1.19 -> 1.20)
Removed: bgo416393.patch (1.1) bgo427992.patch (1.1)
bonobo-fix-leaks.patch (1.1)
upgpkg: libbonobo 2.20.1-1
Remove outdated patches
------------------------+
PKGBUILD | 15 ++++++---------
bgo416393.patch | 41 -----------------------------------------
bgo427992.patch | 12 ------------
bonobo-fix-leaks.patch | 44 --------------------------------------------
4 files changed, 6 insertions(+), 106 deletions(-)
Index: extra/gnome/libbonobo/PKGBUILD
diff -u extra/gnome/libbonobo/PKGBUILD:1.19 extra/gnome/libbonobo/PKGBUILD:1.20
--- extra/gnome/libbonobo/PKGBUILD:1.19 Thu Sep 20 13:43:33 2007
+++ extra/gnome/libbonobo/PKGBUILD Wed Oct 17 14:06:01 2007
@@ -1,29 +1,26 @@
-# $Id: PKGBUILD,v 1.19 2007/09/20 17:43:33 jgc Exp $
+# $Id: PKGBUILD,v 1.20 2007/10/17 18:06:01 jgc Exp $
# Maintainer: Jan de Groot <jgc at archlinux.org>
pkgname=libbonobo
-pkgver=2.20.0
+pkgver=2.20.1
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.9' 'libxml2>=2.6.30')
+depends=('orbit2>=2.14.10' 'libxml2>=2.6.30')
makedepends=('perlxml' 'pkgconfig')
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.20/libbonobo-${pkgver}.tar.bz2
- bonobo-activation-config.xml
- bonobo-fix-leaks.patch)
+ bonobo-activation-config.xml)
install=libbonobo.install
-md5sums=('5656fc628f2b327cfdcab493a8f95f7f'
- '6392efaca30a26f826eafc4b8ccbc01f'
- '4713f56ebae1c1ca1c666b31a16755be')
+md5sums=('76e52d1c39e6ef1079c757c21f06f5ff'
+ '6392efaca30a26f826eafc4b8ccbc01f')
build() {
cd ${startdir}/src/${pkgname}-${pkgver}
- 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/bgo416393.patch
diff -u extra/gnome/libbonobo/bgo416393.patch:1.1 extra/gnome/libbonobo/bgo416393.patch:removed
--- extra/gnome/libbonobo/bgo416393.patch:1.1 Sun Apr 22 09:52:11 2007
+++ extra/gnome/libbonobo/bgo416393.patch Wed Oct 17 14:06:01 2007
@@ -1,41 +0,0 @@
---- branches/gnome-2-18/activation-server/object-directory-corba.c 2007/03/12 13:54:46 3353
-+++ branches/gnome-2-18/activation-server/object-directory-corba.c 2007/03/23 14:56:24 3356
-@@ -389,6 +389,7 @@
- int i, serverinfo_env_idx;
- const Bonobo_ActivationEnvironment *client_env;
- const Bonobo_StringList *serverinfo_env = NULL;
-+ ClientContext *client_context;
-
- array = g_array_new (FALSE, FALSE, sizeof (Bonobo_ActivationEnvValue));
-
-@@ -396,7 +397,16 @@
- for (i = 0; i < environment->_length; ++i)
- g_array_append_val (array, environment->_buffer[i]);
-
-- if (client == CORBA_OBJECT_NIL)
-+ if (G_UNLIKELY (client == CORBA_OBJECT_NIL))
-+ goto exit;
-+
-+ client_context = ((ClientContext *) g_hash_table_lookup
-+ (od->client_contexts, client));
-+ if (G_UNLIKELY (!client_context))
-+ goto exit;
-+
-+ client_env = client_context->env;
-+ if (G_UNLIKELY (!client_env))
- goto exit;
-
- /* scan through server properties */
-@@ -417,12 +427,6 @@
- goto exit;
-
- /* do the actual merging */
-- client_env = ((ClientContext *) g_hash_table_lookup
-- (od->client_contexts, client))->env;
--
-- if (!client_env)
-- goto exit;
--
- for (serverinfo_env_idx = 0;
- serverinfo_env_idx < serverinfo_env->_length; ++serverinfo_env_idx)
- {
Index: extra/gnome/libbonobo/bgo427992.patch
diff -u extra/gnome/libbonobo/bgo427992.patch:1.1 extra/gnome/libbonobo/bgo427992.patch:removed
--- extra/gnome/libbonobo/bgo427992.patch:1.1 Sun Apr 22 09:52:11 2007
+++ extra/gnome/libbonobo/bgo427992.patch Wed Oct 17 14:06:01 2007
@@ -1,12 +0,0 @@
---- branches/gnome-2-18/bonobo-activation/bonobo-activation-activate.c 2007/03/12 13:54:46 3353
-+++ branches/gnome-2-18/bonobo-activation/bonobo-activation-activate.c 2007/04/10 11:47:54 3364
-@@ -817,8 +817,7 @@
- activation_environment._release = TRUE;
-
- for (i = 0; i < activation_environment._length - 1; i++)
-- Bonobo_ActivationEnvValue_copy (
-- &activation_environment._buffer [i], &old_buffer [i]);
-+ activation_environment._buffer[i] = old_buffer[i];
-
- Bonobo_ActivationEnvValue_set (&activation_environment._buffer [i], name, value);
-
Index: extra/gnome/libbonobo/bonobo-fix-leaks.patch
diff -u extra/gnome/libbonobo/bonobo-fix-leaks.patch:1.1 extra/gnome/libbonobo/bonobo-fix-leaks.patch:removed
--- extra/gnome/libbonobo/bonobo-fix-leaks.patch:1.1 Thu Sep 20 13:43:33 2007
+++ extra/gnome/libbonobo/bonobo-fix-leaks.patch Wed Oct 17 14:06:01 2007
@@ -1,44 +0,0 @@
---- 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);
More information about the arch-commits
mailing list