Do not start pcmanfm with -d option. Bug #367639

Package-Manager: portage-2.1.9.47/cvs/Linux x86_64

4 files changed, 72 insertions, 4 deletions

diff --git a/lxde-base/lxde-common/ChangeLog b/lxde-base/lxde-common/ChangeLog
index d5a3a26c6c50..aef58829861a 100644
--- a/lxde-base/lxde-common/ChangeLog
+++ b/lxde-base/lxde-common/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for lxde-base/lxde-common
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.20 2011/03/07 20:33:35 klausman Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxde-common/ChangeLog,v 1.21 2011/05/18 10:11:51 hwoarang Exp $
+
+*lxde-common-0.5.0-r2 (18 May 2011)
+
+  18 May 2011; Markos Chandras <hwoarang@gentoo.org>
+  +lxde-common-0.5.0-r2.ebuild, files/lxde-common-0.5.0-desktop-icons.patch:
+  Do not start pcmanfm with -d option. Bug #367639
 
   07 Mar 2011; Tobias Klausmann <klausman@gentoo.org>
   lxde-common-0.5.0-r1.ebuild:
diff --git a/lxde-base/lxde-common/Manifest b/lxde-base/lxde-common/Manifest
index d5e84f79bd03..22f6290651fb 100644
--- a/lxde-base/lxde-common/Manifest
+++ b/lxde-base/lxde-common/Manifest
@@ -1,9 +1,30 @@
-AUX lxde-common-0.5.0-desktop-icons.patch 324 RMD160 52d38ac767232e0814bc5a191e7dfd360558ff8b SHA1 f90e10cdc2019c492ad00a48c8d65a2067458fea SHA256 f57a3d4a0a89c65d3e5ba29197cb4e4db05eec8cb75186d5eacccb09c1c1210e
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
+AUX lxde-common-0.5.0-desktop-icons.patch 321 RMD160 82991e034b370ae210482cbdcdc02dd18999c623 SHA1 9389d688a967a4aa9a7d4e24e052c74a07a194a2 SHA256 9782b33a9ae0af28b4ec40f1234583de68062a9a52edfe6b7c61287a46f4e26c
 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 1102 RMD160 8d05a3c188837b40337a763dbb56f182820c2c9a SHA1 81614deefd53b3f657bef106c85bd051a99c248b SHA256 fc4245216f2f20b0980f2d05bafe8f8ce6287dfea9cfd68666eb9d5f82533f11
+EBUILD lxde-common-0.5.0-r2.ebuild 1106 RMD160 72ba4f97301d5b85f1f3b608af49c36ada16991e SHA1 991f6ad1d2e0fa0fa929fe46508f52472cadf4ef SHA256 a56f760017b104743950dca32a7cef268b57b18cc45ac1a744d682ce0f6a50bf
 EBUILD lxde-common-0.5.0.ebuild 1043 RMD160 76cf5018560b99a6d09ebb6b8835c3723e94d9de SHA1 11f5888c86262e71beda65a1bfcfdac5e9ede176 SHA256 3dacf0e6c855d242564a221f108774dde5319a4594155a2c762f893921290c71
-MISC ChangeLog 2743 RMD160 70807360a2f890d69414ef6212f090b247f8b713 SHA1 e06100340fedaeb94b8d41fea34aebc9e7901afa SHA256 5871dc7bef2d1b8d082f54fefa8972fb559d3359df5e08e0b22d04168e41952d
+MISC ChangeLog 2962 RMD160 4a4a7e7392dafb9b2a3715fc2ee16416a8b564c4 SHA1 65f1360bfe5e8d9a2df8936a453764b0bdc7c96f SHA256 f4f79580003d2cd3a6c0a56be4953a6fd3ce006a1caf7ba2d41ee21b13c6c378
 MISC metadata.xml 159 RMD160 35036c133a5c9c7edccc3cdfed5789092f884048 SHA1 bdf1b7cc6ffbdd223b6f05aa072e857dfc981c4f SHA256 09574ccad15f69d5367ecbb1a491cd636fb88582f69987d2ec217109dfe8befb
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQIcBAEBCgAGBQJN05vFAAoJEPqDWhW0r/LC4IIQAI4iSa65mJViG9tjRSKF4kG+
+Vg24g77ssMgz9o1IF6vAOo1l29kbGHs9wpul1W7GmZqoWqTXoVydrm9deJAxkryV
+huHIRm7AXxTgEKoNelqO9SAeh7QPEK+UYhrxB3Xns4zCR4TbGHCHFQRVlICziQx3
+UtRsgX/hJWYJLRfnLoOTXtgU6AFvCtsbuEhYzxGANjCKxjEoHI02a3HPVwJLb1QP
+gP/Opq0xSfxGOqQw37D1BydPQT0hQDf5G/DwYEWLQXFqOTUpQQ54ktLJ/YSCOYhm
+S/Twfr96Yl67QpHenz2UcjBfyZuH2aiRIuBmEtCEaXINSGTFDUtdm47vQXpOzrAF
+42ICCiQ5Kx9OkiVoFFcxD0DIQWRwjC3b+FTJi5maz7Subjey24GL6ERKGLXQ6YPx
+uy0Tn3uiPaVm4Th622R3ajYKQyrhBhzdHGLBwswd9eeQenQc6oUKj5zk2OQfZU/8
+Ry0PQZqFPVvKPw6ZttWYgJNipzRyTk91Oj0w7cfGhoDnDpopKcR5gRyQUA7r0BEw
+2ZTX/dJzklPqy8+WgslGmhXEvg8W9RNmkHWcwsm7W/DwUJjgSbfPene/b6DQdkWv
+6wjY7w/9fzjjb99gVX3Pb2NgYAVxgtqxe0s9+dTSue0npAqrJAGDJHTs629fEuRo
+Kd3d8rRw9bkJRNgmCyJB
+=0fll
+-----END PGP SIGNATURE-----
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
index b96a06ef3671..c751ae64dba3 100644
--- 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
@@ -5,4 +5,4 @@ diff -NrU5 lxde-common-0.5.0.original/autostart lxde-common-0.5.0/autostart
  @xscreensaver -no-splash
  @lxpanel --profile LXDE
 -@pcmanfm -d
-+@pcmanfm -d --desktop
++@pcmanfm --desktop
diff --git a/lxde-base/lxde-common/lxde-common-0.5.0-r2.ebuild b/lxde-base/lxde-common/lxde-common-0.5.0-r2.ebuild
new file mode 100644
index 000000000000..9cd379b45783
--- /dev/null
+++ b/lxde-base/lxde-common/lxde-common-0.5.0-r2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2011 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-r2.ebuild,v 1.1 2011/05/18 10:11:51 hwoarang 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="~alpha ~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"
+}