Apply upstream patch for bug #412025. Thanks to everyone who contributed and tested

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

4 files changed, 130 insertions, 2 deletions

diff --git a/lxde-base/lxdm/ChangeLog b/lxde-base/lxdm/ChangeLog
index 8173ac3bf148..ea7bffcab781 100644
--- a/lxde-base/lxdm/ChangeLog
+++ b/lxde-base/lxdm/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxdm
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.14 2012/05/04 05:50:38 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/ChangeLog,v 1.15 2012/05/07 09:58:01 hwoarang Exp $
+
+*lxdm-0.4.1-r5 (07 May 2012)
+
+  07 May 2012; Markos Chandras <hwoarang@gentoo.org>
+  +files/lxdm-0.4.1-event-check.patch, +lxdm-0.4.1-r5.ebuild:
+  Apply upstream patch for bug #412025. Thanks to everyone who contributed and
+  tested
 
   04 May 2012; Jeff Horelick <jdhore@gentoo.org> lxdm-0.3.0-r1.ebuild,
   lxdm-0.3.0-r3.ebuild, lxdm-0.4.1-r1.ebuild, lxdm-0.4.1-r2.ebuild,
diff --git a/lxde-base/lxdm/Manifest b/lxde-base/lxdm/Manifest
index 5fde9e24d933..0a03475aa50e 100644
--- a/lxde-base/lxdm/Manifest
+++ b/lxde-base/lxdm/Manifest
@@ -1,7 +1,11 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX lxdm-0.3.0-consolekit-disable.patch 272 RMD160 2f0a98002f85ca47b529cc9ae530b6907100b85b SHA1 810371ac3319c3ebcc39e420a2b64d00ee27210b SHA256 b23a338405f6d01a9a93e7afaaf95a91cb8e5f36d2b864d955f0dcc452f8680a
 AUX lxdm-0.3.0-pam_console-disable.patch 260 RMD160 fa8fb4bd2d0d57235924bb241688b491988fccb3 SHA1 820ef218b6f379bc63c8f24cd43e58fc75769004 SHA256 0e9dbcf422b8db8e559015fb7d50fa0c73006c2f5550f6832b2ba36e38b3c0e0
 AUX lxdm-0.3.0-properly-load-session-settings-using-dmrc-entry-as-pointer-for-xsessions-dir-file.patch 932 RMD160 752138f9d851080e9a8a31838c6ca95b0a0bf97b SHA1 d4e9525483494ab87a61d852c42e8186d0aeaf7e SHA256 d3ad21a7643b86706d5d7f4ec4cf09dbe9805e3eea95c4c035abbf5049ff0c10
 AUX lxdm-0.4.1-configure-add-pam.patch 1410 RMD160 a753542f639ed85a679985edfb14ed47c075d3d3 SHA1 a8eff61c224ba6ff4d3cdb2736b720ac5e74fed6 SHA256 22d9a569755acd1ffadc23939b6b2d0845f0956efafda31b3a91dbd5580a5815
+AUX lxdm-0.4.1-event-check.patch 704 RMD160 df3c5119664729c153e2d25e9a5b2ac5f0b9e5f9 SHA1 1ef60ab15f8796eaf121d39ac7b289d977f0fa36 SHA256 f5e2e29c7ea307959c4fb3e34433bb63de3efef5e14be11e4c6dfeedb1cdacb1
 AUX lxdm-0.4.1-git-fix-null-pointer-deref.patch 1560 RMD160 d08dcf5f05df205649418ee932a05dcc94500a82 SHA1 67596f26225d36af8d165f31ca027a87d7fec799 SHA256 a33e3226c463bc445d7d27b11e34de8b09c7c1fdf44be8628d54334fd41b7ea3
 AUX lxdm-0.4.1-missing-pam-defines.patch 583 RMD160 3ead0a4f403dfb7b575f6d805bdad9b523184faa SHA1 a16908a83766d88f02dc2db69dc69cf8d39d53f6 SHA256 b9aa62fc73ce8f52f354388bcec0a03c228b40ba1a86e2aba1071501ecc1a5d8
 AUX lxdm-0.4.1-pam_console-disable.patch 344 RMD160 faa1026b361b4e5bf0b002651cb1bcf45f5f8800 SHA1 8169882a4bcdeeba34586d0fd5bd0dc3048556bc SHA256 51d1a0f0b5749e451e313df3bd3d08b3f5181f00eb01993973393c1b4dcd8ad2
@@ -12,5 +16,23 @@ EBUILD lxdm-0.3.0-r3.ebuild 1504 RMD160 3046777af893dcaca6c54f7340d6176edfb201eb
 EBUILD lxdm-0.4.1-r1.ebuild 1593 RMD160 7a773674e3c3b989537b51a12446d5acb4a2a2e0 SHA1 6df1de7037b54b9613b071ee3b3c80064653e68b SHA256 7dfaaac7e92e3701847184d0faef8b0f7e83575a2928e4f29668e4ba5697872c
 EBUILD lxdm-0.4.1-r2.ebuild 1578 RMD160 3c66fc9d7477c15f3a83df7067860d0360432853 SHA1 1c8ccf65b185f0103d00a2a89f2b403f2482d687 SHA256 6a7e206c677c1919f5e5d1fc6a0553865e539c4a80b68901e847ce12b2447f4e
 EBUILD lxdm-0.4.1-r4.ebuild 1644 RMD160 e596ccb714058af1e2ce1d8b36c42c4e47002254 SHA1 8a19f0f8a232a81aa3ae0b50c5b738f650314b36 SHA256 74e525792887c8f8836976c7b4635465a3dbbf167490ff8324fca8914c2fe29a
-MISC ChangeLog 3164 RMD160 62b27a8bc9503db54c0e62732ab915e79343a8ee SHA1 fc9c713f89f70425ec28ce8115a8e6405fe516f2 SHA256 52e3e7a14c3fdf0fac970233dec1ddaf256d345425bfa68391131effe7bcb8aa
+EBUILD lxdm-0.4.1-r5.ebuild 1701 RMD160 8eec6e0e41ecbf68a0813e56fbdcdd99c6b08847 SHA1 1b7181de6bdac8303ece5aaa223fbf11c6391673 SHA256 f52680baf8b5b42e01d007d30fc9384bd89a2a20d250652ade8b26a907986f84
+MISC ChangeLog 3400 RMD160 692c39ffbb9d25e0dd24db3c3b5b46d66db0b6c7 SHA1 b4b89e14861fa279589b054679bbc3068b561a8b SHA256 4dc02d51f38473c4667f4f8ece485de456eb16f2e75cd4c8e16629d22ec89c6e
 MISC metadata.xml 307 RMD160 780146af5f44d5a94235167d9f27fa430e374101 SHA1 c018aecad3148053495b66d84c45f17bf7c5d5c6 SHA256 854f7a5d79f761b1a129a5f227d74854cd4a5e62827fe6022cddd8dfc2a4b264
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJPp5yvAAoJEPqDWhW0r/LCEbkQALv9Ssu1lJWxC80wgDexNXLB
+F6B3VVBYnZijI0I3dp08arceZAwvFAcO2Gpyc+V43VnUzBUpYaDB/BbvYSyjXeFL
+53vL8pp3LLSSLjaKq3qDG4S3FY+q110SQkE/BkshcaSSIwd4V5KL9dycyKprMZ5B
+hP6/hKsWmP5+/5UW2VtXmskXj+9foIkcqiKBcFw05TcJ1qrTmnwRaY5E8v21hYjs
+PSkd0H/uJWXeF8LNt5PFeWHJj5rDJ566WcsbCQszQoQcv7LkPPfTEf4ddhzav5C+
+Tu+3kyPrGq7Hk4jLrAFVyfcDFIkXl900t9HyzWE/6nZE/EabFFaW6N/1F/GtwqHu
+j9cVb11XmrLww+PincCjPL1A3lNl4+0hLykgoR1hNSr7/NKMFz+AzNRwHY+WzLmd
+uGbASAv/7eAPaHgw8/X0f93pkcK/BlIs7QHXd/6ZPs99aU5mQLRYJBG5DwX1ZDF8
+yKniabiGoJrXQtmauMAcr6wpO748TmDqu7DOYbmPRwrPw1pLjVkKYI/3vVDcGcD/
+Ua5/+9DNGEA94Vh3w9lYYiqcZ66v/GkqoqEqvNUASwCLXR5ho/5Ls3QEOc0wcZp9
+P1oyTAp4HpCMLY+fTetL3Hs0NapqrbXq/Xe8Kecae8Tr7JPCsVNYuom6DmBTJSmS
+WSzzL5oBSEHehvNH0XV5
+=pGEX
+-----END PGP SIGNATURE-----
diff --git a/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch b/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch
new file mode 100644
index 000000000000..4c2d5b35235f
--- /dev/null
+++ b/lxde-base/lxdm/files/lxdm-0.4.1-event-check.patch
@@ -0,0 +1,25 @@
+From d4e41ecb36a1ea29482b75674d804bb0f05540b2 Mon Sep 17 00:00:00 2001
+From: dgod <dgod.osa@gmail.com>
+Date: Sun, 25 Dec 2011 15:23:19 +0800
+Subject: [PATCH 1/1] fix event check bug caused cpu 100%
+
+---
+ src/lxcom.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/src/lxcom.c b/src/lxcom.c
+index 02763eb..18ee12e 100644
+--- a/src/lxcom.c
++++ b/src/lxcom.c
+@@ -89,7 +89,7 @@ static gboolean lxcom_prepare (GSource *source,gint *timeout)
+ 
+ static gboolean lxcom_check(GSource *source)
+ {
+-	return TRUE;
++	return (((LXComSource*)source)->poll.revents&G_IO_IN)?TRUE:FALSE;
+ }
+ 
+ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer user_data)
+-- 
+1.7.4.1
+
diff --git a/lxde-base/lxdm/lxdm-0.4.1-r5.ebuild b/lxde-base/lxdm/lxdm-0.4.1-r5.ebuild
new file mode 100644
index 000000000000..680763c2ecf2
--- /dev/null
+++ b/lxde-base/lxdm/lxdm-0.4.1-r5.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxdm/lxdm-0.4.1-r5.ebuild,v 1.1 2012/05/07 09:58:01 hwoarang Exp $
+
+EAPI="2"
+
+inherit eutils autotools
+
+DESCRIPTION="LXDE Display Manager"
+HOMEPAGE="http://lxde.org"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="debug gtk3 nls pam"
+
+RDEPEND="sys-auth/consolekit
+	x11-libs/libxcb
+	gtk3? ( x11-libs/gtk+:3 )
+	!gtk3? ( x11-libs/gtk+:2 )
+	nls? ( sys-devel/gettext )
+	pam? ( virtual/pam )"
+DEPEND="${RDEPEND}
+	>=dev-util/intltool-0.40
+	virtual/pkgconfig"
+
+src_prepare() {
+	# Upstream bug, tarball contains pre-made lxdm.conf
+	rm "${S}"/data/lxdm.conf || die
+
+	# There is consolekit
+	epatch "${FILESDIR}/${P}-pam_console-disable.patch"
+	# Fix null pointer dereference, backported from git
+	epatch "${FILESDIR}/${P}-git-fix-null-pointer-deref.patch"
+
+	epatch "${FILESDIR}"/${P}-configure-add-pam.patch
+
+	# 403999
+	epatch "${FILESDIR}"/${P}-missing-pam-defines.patch
+
+	# 412025
+	epatch "${FILESDIR}"/${P}-event-check.patch
+	# this replaces the bootstrap/autogen script in most packages
+	eautoreconf
+
+	# process LINGUAS
+	if use nls; then
+		einfo "Running intltoolize ..."
+		intltoolize --force --copy --automake || die
+		strip-linguas -i "${S}/po" || die
+	fi
+}
+src_configure() {
+	econf	--enable-password \
+		--with-x \
+		--with-xconn=xcb \
+		$(use_enable gtk3) \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_with pam)
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	dodoc AUTHORS README TODO || die
+}
+
+pkg_postinst() {
+	echo
+	elog "LXDM in the early stages of development!"
+	echo
+}