[arch-commits] CVS update of extra/lib/libepc (PKGBUILD libepc-avahi-free-check.patch)

[Jan de Groot]

    Date: Friday, March 21, 2008 @ 18:09:03
  Author: jgc
    Path: /home/cvs-extra/extra/lib/libepc

   Added: libepc-avahi-free-check.patch (1.1)
Modified: PKGBUILD (1.1 -> 1.2)

upgpkg: libepc 0.3.4-2
    Do not assert to death when trying to free a NULL pointer because avahi is not running


-------------------------------+
 PKGBUILD                      |   12 +++++++-----
 libepc-avahi-free-check.patch |   14 ++++++++++++++
 2 files changed, 21 insertions(+), 5 deletions(-)


Index: extra/lib/libepc/PKGBUILD
diff -u extra/lib/libepc/PKGBUILD:1.1 extra/lib/libepc/PKGBUILD:1.2
--- extra/lib/libepc/PKGBUILD:1.1	Sun Mar 16 10:28:28 2008
+++ extra/lib/libepc/PKGBUILD	Fri Mar 21 18:09:03 2008
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD,v 1.1 2008/03/16 14:28:28 jgc Exp $
+# $Id: PKGBUILD,v 1.2 2008/03/21 22:09:03 jgc Exp $
 # Maintainer: Jan de Groot <jgc at archlinux.org>
 
 pkgname=libepc
 pkgver=0.3.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Easy Publish and Consume Library"
 arch=(i686 x86_64)
 license=('LGPL')
+url="http://live.gnome.org/libepc"
 depends=('gtk2>=2.12.9' 'avahi>=0.6.20' 'libsoup>=2.4.0')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2)
 options=('!libtool' '!makeflags')
-url="http://live.gnome.org/libepc"
-md5sums=('5384bcb26c9186fbd3e5c0daaeb63775')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/0.3/${pkgname}-${pkgver}.tar.bz2
+	libepc-avahi-free-check.patch)
+md5sums=('5384bcb26c9186fbd3e5c0daaeb63775' '31761c1165d9b0b61df38049165779ff')
 
 build() {
   cd ${startdir}/src/${pkgname}-${pkgver}
+  patch -Np0 -i ${startdir}/src/libepc-avahi-free-check.patch || return 1
   ./configure --prefix=/usr --sysconfdir=/etc \
               --localstatedir=/var --disable-static || return 1
   make || return 1
Index: extra/lib/libepc/libepc-avahi-free-check.patch
diff -u /dev/null extra/lib/libepc/libepc-avahi-free-check.patch:1.1
--- /dev/null	Fri Mar 21 18:09:04 2008
+++ extra/lib/libepc/libepc-avahi-free-check.patch	Fri Mar 21 18:09:03 2008
@@ -0,0 +1,14 @@
+--- libepc/service-monitor.c.orig	2008-03-21 22:03:38.000000000 +0000
++++ libepc/service-monitor.c	2008-03-21 22:04:44.000000000 +0000
+@@ -307,7 +307,10 @@
+ 
+   while (self->priv->browsers)
+     {
+-      avahi_service_browser_free (self->priv->browsers->data);
++      if (self->priv->browsers->data != NULL)
++        {
++          avahi_service_browser_free (self->priv->browsers->data);
++	}
+       self->priv->browsers = g_slist_delete_link (self->priv->browsers, self->priv->browsers);
+     }
+