diff options
author | Victor Ostorga <vostorga@gentoo.org> | 2010-12-27 00:39:22 +0000 |
---|---|---|
committer | Victor Ostorga <vostorga@gentoo.org> | 2010-12-27 00:39:22 +0000 |
commit | b88e2d90865b2234a738b12679613dcb213e8245 (patch) | |
tree | 7a1645078c54c2c6623dd177f71eed1c9ee5ba29 /lxde-base/lxpanel | |
parent | Add fixes from upstream for incremental #349164 by Robin Johnson and verify #... (diff) | |
download | gentoo-2-b88e2d90865b2234a738b12679613dcb213e8245.tar.gz gentoo-2-b88e2d90865b2234a738b12679613dcb213e8245.tar.bz2 gentoo-2-b88e2d90865b2234a738b12679613dcb213e8245.zip |
Dropping references to non-installed apps in default config file, bug #347912
(Portage version: 2.1.8.3/cvs/Linux i686)
Diffstat (limited to 'lxde-base/lxpanel')
-rw-r--r-- | lxde-base/lxpanel/ChangeLog | 7 | ||||
-rw-r--r-- | lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch | 20 | ||||
-rw-r--r-- | lxde-base/lxpanel/lxpanel-0.5.6.ebuild | 9 |
3 files changed, 34 insertions, 2 deletions
diff --git a/lxde-base/lxpanel/ChangeLog b/lxde-base/lxpanel/ChangeLog index 87d758f16a6e..df5c5a715194 100644 --- a/lxde-base/lxpanel/ChangeLog +++ b/lxde-base/lxpanel/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for lxde-base/lxpanel # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.23 2010/10/15 21:21:25 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/ChangeLog,v 1.24 2010/12/27 00:39:21 vostorga Exp $ + + 27 Dec 2010; Víctor Ostorga <vostorga@gentoo.org> lxpanel-0.5.6.ebuild, + +files/lxpanel-0.5.6-broken-apps.patch: + Dropping references to non-installed apps in default config file, bug + #347912 15 Oct 2010; Victor Ostorga <vostorga@gentoo.org> lxpanel-0.5.6.ebuild: Dropping .la files diff --git a/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch b/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch new file mode 100644 index 000000000000..16cda10915aa --- /dev/null +++ b/lxde-base/lxpanel/files/lxpanel-0.5.6-broken-apps.patch @@ -0,0 +1,20 @@ +diff -NrU5 lxpanel-0.5.6.original/data/default/panels/panel.in lxpanel-0.5.6/data/default/panels/panel.in +--- lxpanel-0.5.6.original/data/default/panels/panel.in 2010-02-08 00:37:52.000000000 -0600 ++++ lxpanel-0.5.6/data/default/panels/panel.in 2010-12-26 12:49:42.000000000 -0600 +@@ -50,16 +50,10 @@ + type = launchbar + Config { + Button { + id=pcmanfm.desktop + } +- Button { +- id=gnome-terminal.desktop +- } +- Button { +- id=firefox.desktop +- } + } + } + + Plugin { + type = space diff --git a/lxde-base/lxpanel/lxpanel-0.5.6.ebuild b/lxde-base/lxpanel/lxpanel-0.5.6.ebuild index cb353a9302b5..b1f8c0735772 100644 --- a/lxde-base/lxpanel/lxpanel-0.5.6.ebuild +++ b/lxde-base/lxpanel/lxpanel-0.5.6.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.6.ebuild,v 1.3 2010/10/15 21:21:25 vostorga Exp $ +# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxpanel/lxpanel-0.5.6.ebuild,v 1.4 2010/12/27 00:39:21 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}-symbol-alarm.patch + epatch "${FILESDIR}"/${P}-broken-apps.patch eautoreconf } @@ -46,3 +47,9 @@ src_install () { # Get rid of the .la files. find "${D}" -name '*.la' -delete } + +pkg_postinst() { + elog "If you have problems with broken icons shown in the main panel," + elog "you will have to configure panel settings via its menu." + elog "This will not be an issue with first time installations." +} |