diff options
| author |   Victor Ostorga <vostorga@gentoo.org> | 2009-08-29 13:47:22 +0000 |
|---|---|---|
| committer | Victor Ostorga <vostorga@gentoo.org> | 2009-08-29 13:47:22 +0000 |
| commit | 84d592b53c999b2cd7cd49db8083802713db07ca (patch) | |
| tree | 7deadaaea2e65aaa862728eb21e1f36f5ee4376e /lxde-base | |
| parent | Fix issues, see ChangeLog (diff) | |
| download | gentoo-2-84d592b53c999b2cd7cd49db8083802713db07ca.tar.gz gentoo-2-84d592b53c999b2cd7cd49db8083802713db07ca.tar.bz2 gentoo-2-84d592b53c999b2cd7cd49db8083802713db07ca.zip | |
Fixing segfault when battery applet is enabled but battery removed , bug #281093
(Portage version: 2.1.6.13/cvs/Linux i686)
Diffstat (limited to 'lxde-base')
| -rw-r--r-- | lxde-base/lxpanel/ChangeLog | 7 | ||||
| -rw-r--r-- | lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch | 14 | ||||
| -rw-r--r-- | lxde-base/lxpanel/lxpanel-0.5.3.ebuild | 3 |
3 files changed, 22 insertions, 2 deletions
diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog index 2d64ce87505f..4b17f1d083cf 100644 --- a/lxde-base/lxpanel/ChangeLog +++ b/lxde-base/lxpanel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for lxde-base/lxpanel # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.8 2009/08/11 15:14:44 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.9 2009/08/29 13:47:15 vostorga Exp $ + + 29 Aug 2009; Víctor Ostorga <vostorga@gentoo.org> lxpanel-0.5.3.ebuild, + +files/lxpanel-0.5.3-battery.patch: + Fixing segfault when battery applet is enabled but battery removed , bug + #281093 *lxpanel-0.5.3 (11 Aug 2009) diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch b/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch new file mode 100644 index 000000000000..1e6ad47e0dcd --- /dev/null +++ b/lxde-base/lxpanel/files/lxpanel-0.5.3-battery.patch @@ -0,0 +1,14 @@ +--- trunk/lxpanel/src/plugins/batt/batt_sys.c 2009/06/16 22:09:10 1617 ++++ trunk/lxpanel/src/plugins/batt/batt_sys.c 2009/08/19 07:40:45 1950 +@@ -271,8 +271,10 @@ + if ( b->type_battery == TRUE ) + break; + /* ignore non-batteries */ +- else ++ else { + g_free(b); ++ b = NULL; ++ } + } + g_dir_close( dir ); + return b; diff --git a/lxde-base/lxpanel/lxpanel-0.5.3.ebuild b/lxde-base/lxpanel/lxpanel-0.5.3.ebuild index 19373d6117ab..256171b4fae1 100644 --- a/lxde-base/lxpanel/lxpanel-0.5.3.ebuild +++ b/lxde-base/lxpanel/lxpanel-0.5.3.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.3.ebuild,v 1.1 2009/08/11 15:14:44 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.3.ebuild,v 1.2 2009/08/29 13:47:15 vostorga Exp $ EAPI="2" inherit eutils autotools @@ -28,6 +28,7 @@ DEPEND="${RDEPEND} src_prepare() { epatch "${FILESDIR}"/${PN}-0.5.1-sandbox.patch + epatch "${FILESDIR}"/${P}-battery.patch eautoreconf } |