diff options
| author |   Markos Chandras <hwoarang@gentoo.org> | 2011-07-27 14:14:37 +0000 |
|---|---|---|
| committer | Markos Chandras <hwoarang@gentoo.org> | 2011-07-27 14:14:37 +0000 |
| commit | b406c6bfbce5ae2f9aa6d3135c6d49d7700d5cfc (patch) | |
| tree | 56174a50fb865b79ae584241e200831ebf3442f3 /lxde-base/lxsession | |
| parent | [profiles] Mask KDE SC 4.7.0 untill official release (diff) | |
| download | gentoo-2-b406c6bfbce5ae2f9aa6d3135c6d49d7700d5cfc.tar.gz gentoo-2-b406c6bfbce5ae2f9aa6d3135c6d49d7700d5cfc.tar.bz2 gentoo-2-b406c6bfbce5ae2f9aa6d3135c6d49d7700d5cfc.zip | |
Add upstream patch to fix segfault on startup
(Portage version: 2.2.0_alpha46/cvs/Linux x86_64)
Diffstat (limited to 'lxde-base/lxsession')
| -rw-r--r-- | lxde-base/lxsession/ChangeLog | 8 | ||||
| -rw-r--r-- | lxde-base/lxsession/files/lxsession-0.4.6-fix-segfault.patch | 24 | ||||
| -rw-r--r-- | lxde-base/lxsession/lxsession-0.4.6-r1.ebuild (renamed from lxde-base/lxsession/lxsession-0.4.6.ebuild) | 8 |
3 files changed, 38 insertions, 2 deletions
diff --git a/lxde-base/lxsession/ChangeLog b/lxde-base/lxsession/ChangeLog index 94d239b27358..1b3d37b2bd8e 100644 --- a/lxde-base/lxsession/ChangeLog +++ b/lxde-base/lxsession/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for lxde-base/lxsession # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.31 2011/07/26 22:12:42 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.32 2011/07/27 14:14:37 hwoarang Exp $ + +*lxsession-0.4.6-r1 (27 Jul 2011) + + 27 Jul 2011; Markos Chandras <hwoarang@gentoo.org> -lxsession-0.4.6.ebuild, + +lxsession-0.4.6-r1.ebuild, +files/lxsession-0.4.6-fix-segfault.patch: + Add upstream patch to fix segfault on startup 26 Jul 2011; Markos Chandras <hwoarang@gentoo.org> lxsession-0.4.6.ebuild: Make it EAPI4 diff --git a/lxde-base/lxsession/files/lxsession-0.4.6-fix-segfault.patch b/lxde-base/lxsession/files/lxsession-0.4.6-fix-segfault.patch new file mode 100644 index 000000000000..eb903ba204fb --- /dev/null +++ b/lxde-base/lxsession/files/lxsession-0.4.6-fix-segfault.patch @@ -0,0 +1,24 @@ +From 82e5901fb68acfead807b8e824310edda2437744 Mon Sep 17 00:00:00 2001 +From: Julien Lavergne <julien.lavergne@gmail.com> +Date: Sun, 24 Jul 2011 01:14:03 +0200 +Subject: [PATCH] Fix crash on start + +--- + lxsession/xdg-autostart.c | 1 - + 1 files changed, 0 insertions(+), 1 deletions(-) + +diff --git a/lxsession/xdg-autostart.c b/lxsession/xdg-autostart.c +index 39f0d2a..b0f922a 100644 +--- a/lxsession/xdg-autostart.c ++++ b/lxsession/xdg-autostart.c +@@ -283,7 +283,6 @@ static void get_autostart_files_in_dir( GHashTable* hash, const char* de_name, c + path = g_build_filename( dir_path, name, NULL ); + g_hash_table_replace( hash, g_strdup(name), path ); + } +- g_free( name ); + } + g_dir_close( dir ); + } +-- +1.7.0.1 + diff --git a/lxde-base/lxsession/lxsession-0.4.6.ebuild b/lxde-base/lxsession/lxsession-0.4.6-r1.ebuild index c3819b407da0..23b2650e1194 100644 --- a/lxde-base/lxsession/lxsession-0.4.6.ebuild +++ b/lxde-base/lxsession/lxsession-0.4.6-r1.ebuild @@ -1,9 +1,11 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.6.ebuild,v 1.2 2011/07/26 22:12:42 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.6-r1.ebuild,v 1.1 2011/07/27 14:14:37 hwoarang Exp $ EAPI="4" +inherit eutils + DESCRIPTION="LXDE session manager (lite version)" HOMEPAGE="http://lxde.sf.net/" SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz" @@ -26,6 +28,10 @@ DEPEND="${COMMON_DEPEND} sys-devel/gettext x11-proto/xproto" +src_prepare() { + epatch "${FILESDIR}"/${P}-fix-segfault.patch +} + src_configure() { econf \ --disable-dependency-tracking \ |