Fix for bug #496880

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x39E7AB2E

4 files changed, 195 insertions, 15 deletions

diff --git a/lxde-base/lxsession/ChangeLog b/lxde-base/lxsession/ChangeLog
index cb0cf6389640..25b4353389d3 100644
--- a/lxde-base/lxsession/ChangeLog
+++ b/lxde-base/lxsession/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for lxde-base/lxsession
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.52 2014/01/05 06:27:11 nullishzero Exp $
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/ChangeLog,v 1.53 2014/01/09 06:41:41 nullishzero Exp $
+
+*lxsession-0.4.9.2-r3 (09 Jan 2014)
+
+  09 Jan 2014; Pavel Kazakov <nullishzero@gentoo.org>
+  +files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch,
+  +lxsession-0.4.9.2-r3.ebuild:
+  Fix for bug #496880
 
 *lxsession-0.4.9.2-r2 (05 Jan 2014)
 
diff --git a/lxde-base/lxsession/Manifest b/lxde-base/lxsession/Manifest
index cb2de2c1873a..d52bc4931273 100644
--- a/lxde-base/lxsession/Manifest
+++ b/lxde-base/lxsession/Manifest
@@ -2,29 +2,31 @@
 Hash: SHA256
 
 AUX lxsession-0.4.9.2-configure.patch 368 SHA256 71bd6b90c7261eb23cc0e0adad086dd857a9436745454af8fa23150d18a9818d SHA512 a3b85e1405bb8f93794dd17de5b17cd8aa1e7b03356648447081e8802264b0c5c5b879f40b6f4ffe7428b25555020757da8a2d8f2e99351c0c2b31a58d282faf WHIRLPOOL fdfdcccaca78f17d3a76854dcecbcff5835f3e7b7d970537046338cd567f5bf5d204ec5eab2ba62f89f5c12891134a180527e21d63173ff38bf3e2135fc707e1
+AUX lxsession-0.4.9.2-fix-logind-dbus-calls.patch 3033 SHA256 ed66db0e2c622d71a667bd88e54165f05c54c2564809a205df4846c15fa65d8a SHA512 17b594573a0010be64dbba4b03ac1c51ce7bd6d4c984812168d09e2d78507a9420788c9c37e53d3399a983c62127b1cbd658005b4410db5c40b961ba5b031095 WHIRLPOOL 855936767467979601c03b5e685dfa5e7c8a149dc0634902d552808e9ef1fdcdb1bf091787422e622fa89cf7a5dfe53ee904f9e89cc832637f2b4a49288131a7
 AUX lxsession-0.4.9.2-makefile.patch 462 SHA256 d7683ed44e93d65d06c07852116efb10af24ba831119aba33c6853901eeeab32 SHA512 7343a6c1413246c76e6be52c9abe99d50753e3f894838d2ea4928973e0a76d7e03aff0d97a8288ed67ad43568b06fdd676968a5d13d8d5d198da7efaa571507d WHIRLPOOL 93d27e7499c53371a6e668faa726403ca8268f6a279efc26b96f2d786e15c3ab7988b700afbc8c209fe7850af528c87d1b58ea61542608ee8dd4b8d5cb23b46c
 DIST lxsession-0.4.6.1.tar.gz 407100 SHA256 bd6a7ef3c0ba4b9eedf3c58624dbce8bbbba3b179abbc552bf10c2830eec3ee1 SHA512 eea554ba70b3fd278b7ce0bb2d278241dff26eaccf74f2a4a0a9846515688fd5dd846c97f29c71139a0c3b95bc5e906efc4673f0cd79d8db427894dff5524f16 WHIRLPOOL 235d6c2e8a622a4460d767d5b6af22710f17060fffea18ac5cedaeb4dc9f70dc77872d486caa9d7256c379f160755ac7b8299e7836fd513675b65d1c979b900a
 DIST lxsession-0.4.9.2.tar.gz 745637 SHA256 eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4 SHA512 cffcd15faab79ad165f969edf65b6b106c5b4405b78e6c102a74ab96da9cf61b781d0be7587849ce56672ae3015e8f63bc1b84465f5ec0084c299ec588992172 WHIRLPOOL 5a5c172cda30a4690d82a4a8acd3b983cbcc60ed71fefdfbfbb97e8b4363f4c26825267a0bd45c71589c2dd180f9699a2d05dd759fe23bcfdd5e9d3a10ccdda2
 EBUILD lxsession-0.4.6.1.ebuild 1032 SHA256 f4b370644992af47a61562c1fc0007f7d0e543a3b3f32f23916a63aa90bb6cca SHA512 4fef19b4509d19fd4d40331a34ae374ea1c56f9d0f69f665334b60ec060e9855006408dafaabf908a916afb1457bbc88f174f380d32dfe8283105842819ee9a1 WHIRLPOOL 95fdc47d78bf0f3341003add98fcd9811c594523fa4278685dceb01b7411eafcd02c4eed46cfea7ed5593ae5c3f35eea64fd88872771b27a156a510249543190
 EBUILD lxsession-0.4.9.2-r1.ebuild 1263 SHA256 1ca0c2a61fdc9916f090b86e13bf92ece9e7c47c29ba12e96ca5362d7d4f348f SHA512 bffb0ab204ca2548db35f5a54c85a1df92965a43dfcb9e3c2d0631a936c97efc34304ce57a636b03ee34bf362abee39263959a2506fa477398aba869935b4175 WHIRLPOOL ac2a82250390185902280868158f59023c88a0a3151ca712ad7d45db66997e75ec19a512c01e337e91146193f707e602fdc0c2ba3b372965117982cb5fb46d7c
 EBUILD lxsession-0.4.9.2-r2.ebuild 1328 SHA256 e8bbe8f7b34ba06855f8be1183058134525c17d228ef3c9f8c6409f143abd668 SHA512 f17d73a2880f0eef853dcffd4e30dcca6cee8b445646128b4213acb45c7473d7dabbe5e0e0b8c278d438781f2c3c5af6bab3ef5bcd0849129dfada70eb348f73 WHIRLPOOL ac6f05e98396877dd22ef6d947c295384571b067d698657442b5c86889e132018da1ac5686a1c5a8af6769604d38f9a44faaf4476e24f88b5a4ab477e619ddb6
+EBUILD lxsession-0.4.9.2-r3.ebuild 1399 SHA256 ea69d6342b40ca72b53e8336dddd9600b5e278bc6a4e357b503da6d8b59288f3 SHA512 0bde7865268ba1d901709e5cded91a04484f1be7a4e822fc478d300b79b2bbb417ebb2bea4b8a855ffb9b6bfb6a42d28f43cb7879d140b5ef9ac8d8913860529 WHIRLPOOL 5840ebd0fe9c8d7212d861d59563824fa81eb31e13f4eebbed3ffe897f688c9750dd96a9e50632713fb2dfdb3fe23f7534a37abcd60d8f6a3cd346a7128ee34d
 EBUILD lxsession-0.4.9.2.ebuild 1244 SHA256 cb8262bb3e0a68c0b1a8dee7a16de2a2074135cfe8c59cfdb817c145878db91e SHA512 8538d6744e7f9f525eb54e5750cbe385a6ad5e365f428c2ebb83d46ad320b6f5f8b8c41e7f7b0b8ff9effa75dca9f5c7e4ff73d7f39ce50e0ccbc9a9b2500113 WHIRLPOOL 5dd4be4caec517db7357c98a05aa4b7a88eef0cfb8e374e841b55b13a1f37f087e6397a5c66d081a2a45f773d9a9e31c9591a78cf78663554ca9ca590d161cf4
-MISC ChangeLog 7342 SHA256 e896cdc2fa84071a8595647810b59f829003357a4ffd35f8b00cfb7eac24bd74 SHA512 fe92bcb25abcf4aacc6e56134f42f748370e9d1fcc734a15870b1011fea97828f2285cff1c5d1a7807b0ecbb809243c1e35a5f843efb9248f422a99d818ce4a5 WHIRLPOOL 9c63bd35e0178ccf8aa61e9d05980487f762f41baa0c466b0819b3edd92e21e2f51226fa2ddfa87cd76e7ecb6a019e1427e88ca710d47b86f784b3706f7dd8b6
+MISC ChangeLog 7544 SHA256 ac7f734ec9b0ebf1554bf74c7f179f2a491101f4ac5705214c9cd9d4ba2c6978 SHA512 5c42fa6ff9a80cda88ce3824fc63d1a5700c4f3dbf3fcd0be7ce644bcb77d8f44d8d4d5aec50c59f4a14c552f318a91f66c1047b07dd7e56c3cd383c2d500ca2 WHIRLPOOL 45835869f760a4ffc56a091f7cdb4d545758ed385e2f8e99ef397ee1bd9dfc05253f621e08f11b641cbbbe772ae044a725c0beff30b615cc94257dd8782fc544
 MISC metadata.xml 273 SHA256 81ec974708665ad78687d951d92cc04365d3cc14e29f7bffe7b44a7feae00b0e SHA512 377b077e8df5d96050c07d631ad60535b28a307e40554ff8772e2baf1ac509caadb0a843f33a16ed98b677d547526b2045ee8b8d36ba1324f1b2d8c8be87d382 WHIRLPOOL a93a8996b05319db10902fa49ec30fa605c73e8e93bd6fe02ede29b3b08fa4786d9034729475935fa6b826486c72a7b3504a21255a1b68d2467fc45ab51f8c2c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSyPtFAAoJENb1ecI556suSQkP/2ZMEp5K0hJFZv522I2w9S7H
-y8ApnR7aDIMw4wLTlHzUGEk8eW8bTVGc39N+lelCLO71Qfbt2pEy1ivSfoYQUTpF
-r1keEm2Yu8jyC3HGtvdOHLuJjsizuC7dpwE/S9SGqpeKhCP5GqVclVtXVuzw0kP0
-sTgx5LBKojRlruoyQS7lm9TwmZ6WEHUcWP/Ti0ZoKu5Bxed40RTpdgFhkhOScU3X
-fI0CL99B9mGgACDBYGBgRQx8xS7KFNWngOu7QtJ9vGPcPLPb9Q6QHF5y0yJSv99y
-ZbMagN4ELF73Ufon+ipbH+1QCSzIS5TsylLWFRsU5LB8hoEk9aFAPkJKm/GarS0E
-HnmWI3KmTTePGwI9iKcvQF80/kg7NeEGG22zhF26ye6FrOlKGjGkzp7+Iift6nZ7
-dVLnNWhBDA2cfPQ/BEodPE6nls21bvYYEGm/aTHIDsf8z4dr4r+TWvHxdGkLoBew
-WL4xPuhSM/7+B/b7mr0XLELdM0E1wyw+GkuTXjXXS5DhEmXBi+/8bC9LkcRyQB7b
-b8OU6der1Kfkr72O8c7aRs+AMaCp0QvTGRe2wwldaN0tnuepve2imbnDP6PKlf9u
-ma4pmIvympJ8etWs04VCXge20qCto+5Gw3hdaZu1tekoGivYzY6WsXU/v3iM7aIu
-mXx30e2ZyXS329kzDftQ
-=b+wf
+iQIcBAEBCAAGBQJSzkSrAAoJENb1ecI556susUYP/2l896MXG/qGIt2Rr0NOfuXL
+c0xXm8UHNzW3QGipC4kXmN2FLjbbKZl1CEkTRjIEwhueWqOQXEl1IURRdVweN5Qg
+Dn8c+5TAhboXVrv990suBRkGPblW0QqscfPwHDLbTbu0QU5YXlv79wuKxcpmH3Yc
+mDLxgLsiPt1zAXRxjRe6IqChe694NGNGg/M+ZYmwz6afvpZCcA0IZhnfgR/Rpfze
+boeIIPiJnVXD/Y5OH2hCDOa+1PuvVFYm1dGTvhO4ENYoWpWlyfn4nmGCDuX2H/7A
+HYfi++vOl101+v05DIQLBsROueHI72Y3eWEkhsSYIs3a8Eh/hSg7say0dbLt1Kig
+4npaMxJtv2UjquGVYd5No42vyYGA1D34xihNRr2kG4PZJtj6MkDN41rXHh+MMDbk
+qEGSNTGvTASUkFduWxhuoW+W7DR5eN3s18k6nJG9aRd+UrywsU0O2SbOtCtnswld
+DM4A+H3+a/ivBEq/76oRKkG3c4DSSMiL6QDZWIy+/gVZDyiwfXJzz9s7BsOhrVbi
+8lMkUCQ1zv2/nPlfnhO+K4cGuxCj//rfdwv3A/nB+CxahKE5wrCrt7knF+tDqKyI
+q5oXLszVLQnFuivxCu5gISJMCI4qWWEnRkiZku5QnPawirDJ/Xo22ps9BqHKyA6Y
+vxMe/0+42/IYoS6DASbO
+=Y6XH
 -----END PGP SIGNATURE-----
diff --git a/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch
new file mode 100644
index 000000000000..91d15836241a
--- /dev/null
+++ b/lxde-base/lxsession/files/lxsession-0.4.9.2-fix-logind-dbus-calls.patch
@@ -0,0 +1,111 @@
+Taken from: 
+http://svnweb.mageia.org/packages/cauldron/lxsession/current/SOURCES/lxsession-0.4.9.2-fix-logind-dbus-calls.patch?revision=549605&view=co&pathrev=549606
+
+--- lxsession-0.4.9.2/lxsession-logout/dbus-interface.c.0000	2013-04-12 22:02:19.000000000 +0100
++++ lxsession-0.4.9.2/lxsession-logout/dbus-interface.c	2013-11-05 11:00:34.038965063 +0000
+@@ -244,10 +244,11 @@
+     return function_result;
+ }
+ 
+-static void
+-logind_call_function (const gchar *function, gboolean value, GError **error)
++static char *
++logind_call_function (const gchar *function)
+ {
+     GVariant *result;
++    GError *err = NULL;
+ 
+     if (!logind_proxy)
+     {
+@@ -258,20 +259,28 @@
+                                                       "/org/freedesktop/login1",
+                                                       "org.freedesktop.login1.Manager",
+                                                       NULL,
+-                                                      error);
++                                                      &err);
++        if (err != NULL)
++            g_error_free(err);
+         if (!logind_proxy)
+-            return;
++            return NULL;
+     }
+ 
+     result = g_dbus_proxy_call_sync (logind_proxy,
+                                      function,
+-                                     g_variant_new ("(b)", value),
++                                     g_variant_new ("(b)", TRUE),
+                                      G_DBUS_CALL_FLAGS_NONE,
+                                      -1,
+                                      NULL,
+-                                     error);
+-    g_variant_unref (result);
+-    return;
++                                     &err);
++    if (result)
++        g_variant_unref (result);
++    if (err != NULL) {
++        char *r = strdup(err->message);
++        g_error_free(err);
++        return r;
++    }
++    return NULL;
+ }
+ 
+ gboolean
+@@ -280,10 +289,10 @@
+     return logind_query ("CanPowerOff", FALSE, NULL);
+ }
+ 
+-void
+-dbus_logind_PowerOff (GError **error)
++char *
++dbus_logind_PowerOff (void)
+ {
+-    logind_call_function ("PowerOff", TRUE, error);
++    return logind_call_function ("PowerOff");
+ }
+ 
+ gboolean
+@@ -292,10 +301,10 @@
+     return logind_query ("CanReboot", FALSE, NULL);
+ }
+ 
+-void
+-dbus_logind_Reboot (GError **error)
++char *
++dbus_logind_Reboot (void)
+ {
+-    logind_call_function ("Reboot", TRUE, error);
++    return logind_call_function ("Reboot");
+ }
+ 
+ gboolean
+@@ -304,10 +313,10 @@
+     return logind_query ("CanSuspend", FALSE, NULL);
+ }
+ 
+-void
+-dbus_logind_Suspend (GError **error)
++char *
++dbus_logind_Suspend (void)
+ {
+-    logind_call_function ("Suspend", TRUE, error);
++    return logind_call_function ("Suspend");
+ }
+ 
+ gboolean
+@@ -316,10 +325,10 @@
+     return logind_query ("CanHibernate", FALSE, NULL);
+ }
+ 
+-void
+-dbus_logind_Hibernate (GError **error)
++char *
++dbus_logind_Hibernate (void)
+ {
+-    logind_call_function ("Hibernate", TRUE, error);
++    return logind_call_function ("Hibernate");
+ }
+ 
+ /*** ConsoleKit mechanism ***/
+
diff --git a/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
new file mode 100644
index 000000000000..75ec101b90be
--- /dev/null
+++ b/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/lxde-base/lxsession/lxsession-0.4.9.2-r3.ebuild,v 1.1 2014/01/09 06:41:41 nullishzero Exp $
+
+EAPI=5
+
+VALA_MIN_API_VERSION="0.14"
+VALA_MAX_API_VERSION="0.20"
+
+inherit vala autotools eutils
+
+DESCRIPTION="LXDE session manager (lite version)"
+HOMEPAGE="http://lxde.sf.net/"
+SRC_URI="mirror://sourceforge/lxde/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~ppc ~x86 ~arm-linux ~x86-linux"
+SLOT="0"
+# upower USE flag is enabled by default in the desktop profile
+IUSE="nls upower"
+
+COMMON_DEPEND="dev-libs/glib:2
+	dev-libs/libgee:0
+	dev-libs/dbus-glib
+	lxde-base/lxde-common
+	sys-auth/polkit
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	sys-apps/dbus"
+RDEPEND="${COMMON_DEPEND}
+	!lxde-base/lxsession-edit
+	sys-apps/lsb-release
+	upower? ( sys-power/upower )"
+DEPEND="${COMMON_DEPEND}
+	$(vala_depend)
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/pkgconfig
+	x11-proto/xproto"
+
+DOCS="AUTHORS ChangeLog README"
+
+src_prepare() {
+	# bug #488082
+	epatch "${FILESDIR}"/${P}-makefile.patch
+
+	# bug #497100
+	epatch "${FILESDIR}"/${P}-configure.patch
+
+	# bug #496880
+	epatch "${FILESDIR}"/${P}-fix-logind-dbus-calls.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	# dbus is used for restart/shutdown (CK, logind?), and suspend/hibernate (UPower)
+	econf \
+		$(use_enable nls)
+}