Showing desktop icons as expected, patch thanks to Lucas Paul <reilithion@gmail.com> , bug #327545

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 61 insertions, 2 deletions

diff --git a/lxde-base/lxde-common/ChangeLog b/lxde-base/lxde-common/ChangeLog
index 5e22e10134d2..b4b933376ac2 100644
--- a/lxde-base/lxde-common/ChangeLog
+++ b/lxde-base/lxde-common/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for lxde-base/lxde-common
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.14 2010/02/28 18:34:40 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.15 2010/07/29 13:59:53 vostorga Exp $
+
+*lxde-common-0.5.0-r1 (29 Jul 2010)
+
+  29 Jul 2010; Víctor Ostorga <vostorga@gentoo.org>
+  +lxde-common-0.5.0-r1.ebuild,
+  +files/lxde-common-0.5.0-desktop-icons.patch:
+  Showing desktop icons as expected, patch thanks to Lucas Paul
+  <reilithion@gmail.com> , bug #327545
 
   28 Feb 2010; nixnut <nixnut@gentoo.org> lxde-common-0.5.0.ebuild:
   ppc stable #306433
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index ee28ca0c8a3d..b2b8522c0b3b 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -1,7 +1,9 @@
+AUX lxde-common-0.5.0-desktop-icons.patch 324 RMD160 52d38ac767232e0814bc5a191e7dfd360558ff8b SHA1 f90e10cdc2019c492ad00a48c8d65a2067458fea SHA256 f57a3d4a0a89c65d3e5ba29197cb4e4db05eec8cb75186d5eacccb09c1c1210e
 AUX lxde-common-0.5.0-session-fix.patch 455 RMD160 37de48c1dbc492f57121576551552846f9fac72d SHA1 db00750b7a899e77ef0ea75ae4484e2fa98a6d90 SHA256 927c3383337a79f50445ae633a4a4b0560a238b3fa701fbef65363d5810b9cb6
 DIST lxde-common-0.4.2.tar.bz2 5195797 RMD160 98cad69ab46c15007fec4d40f7bd901ea6d8c8bd SHA1 401f9d4256c254fb258e860c1a316a06947deabe SHA256 02c9be77d4cb0c6842624c976f322439e87b4372ab1e7996baf791c7bdad779f
 DIST lxde-common-0.5.0.tar.gz 903916 RMD160 f0780b0fb99879e0c318537fe0ea62c42bb7818b SHA1 01a95b9f125616a0f195de4bef7255452b86d1e9 SHA256 db427817070172be349709604944ba7024ac56e5c87f687b7c3f97be58a1e80a
 EBUILD lxde-common-0.4.2.ebuild 674 RMD160 6adfc9e5fc2af1ee7da93f6b74bafe1d43b74e63 SHA1 103e2e28e5aa70dd2858702856ecb8d777689d80 SHA256 23832b60389e4fd55899947cb3baae8f1d62463047feb75d6887920770ead501
+EBUILD lxde-common-0.5.0-r1.ebuild 1099 RMD160 eb30fffdbcf9dc5cdfc2208b209ff7bf7dea0ac0 SHA1 1acdafc46e8c26379763be3a5970f5e30edba5a8 SHA256 8d15536d61d7fe621afe6103bd9d73aaf02b7eaf861991174f25587ee1d4328a
 EBUILD lxde-common-0.5.0.ebuild 1043 RMD160 76cf5018560b99a6d09ebb6b8835c3723e94d9de SHA1 11f5888c86262e71beda65a1bfcfdac5e9ede176 SHA256 3dacf0e6c855d242564a221f108774dde5319a4594155a2c762f893921290c71
-MISC ChangeLog 1901 RMD160 d1146690d0f39f104877e76dce744d45357547a0 SHA1 7fb7eb7817ffcf4e09b5f7c6a3704d9607838864 SHA256 3feff7b9060e7edb92936290654a052df7059b5b9857fc8743a8482b6596c292
+MISC ChangeLog 2177 RMD160 27ad3fde9d7c5effa73d2644be49b4c6964303ad SHA1 6a225ecf723e54a469d12f78d44217e28a663599 SHA256 9d848c04528c969f9a0eba7f3c7b094c5d83ee9b2753af754cc0e3ddf7667d9c
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
diff --git a/lxde-base/lxde-common/files/lxde-common-0.5.0-desktop-icons.patch b/lxde-base/lxde-common/files/lxde-common-0.5.0-desktop-icons.patch
new file mode 100644
index 000000000000..b96a06ef3671
--- /dev/null
+++ b/lxde-base/lxde-common/files/lxde-common-0.5.0-desktop-icons.patch
@@ -0,0 +1,8 @@
+diff -NrU5 lxde-common-0.5.0.original/autostart lxde-common-0.5.0/autostart
+--- lxde-common-0.5.0.original/autostart	2009-07-14 13:39:53.000000000 +0200
++++ lxde-common-0.5.0/autostart	2010-07-29 15:42:14.585488801 +0200
+@@ -1,3 +1,3 @@
+ @xscreensaver -no-splash
+ @lxpanel --profile LXDE
+-@pcmanfm -d
++@pcmanfm -d --desktop
diff --git a/lxde-base/lxde-common/lxde-common-0.5.0-r1.ebuild b/lxde-base/lxde-common/lxde-common-0.5.0-r1.ebuild
new file mode 100644
index 000000000000..036e2102ac7c
--- /dev/null
+++ b/lxde-base/lxde-common/lxde-common-0.5.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/lxde-common-0.5.0-r1.ebuild,v 1.1 2010/07/29 13:59:53 vostorga Exp $
+
+EAPI="1"
+
+inherit eutils
+
+DESCRIPTION="LXDE Session default configuration files and nuoveXT2 iconset"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+IUSE=""
+
+RDEPEND="x11-libs/gtk+:2"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/gettext"
+PDEPEND="lxde-base/lxde-icon-theme"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${P}-session-fix.patch
+	epatch "${FILESDIR}"/${P}-desktop-icons.patch
+}
+
+src_install () {
+	emake DESTDIR="${D}" install || die "emake install failed"
+	dodoc AUTHORS ChangeLog README || die "dodoc failed"
+}
+
+pkg_postinst() {
+	elog "${P} has renamed the configuration file name to"
+	elog "/etc/xdg/lxsession/LXDE/desktop.conf"
+	elog "Keep in mind you have to migrate your custom settings"
+	elog "from /etc/xdg/lxsession/LXDE/config"
+}