diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2014-10-29 15:40:37 +0100 |
|---|---|---|
| committer | Stefan Agner <stefan.agner@toradex.com> | 2014-10-29 15:53:12 +0100 |
| commit | f940b80f92c3ef8829a66599731a0b59bec32561 (patch) | |
| tree | 92498b947bece5aa0fc0c7737446d5b57ce9a1d5 | |
| parent | b829ca954637c4e614aff96f40e7eb76b4cd6e05 (diff) | |
lxsession: fix Hibernate button, gets disabled now
The Hibernate function doesn't exist in our kernels, using DBus
and systemd-logind, the lxsession should determine whether there
is Hibernate support or not. However, due to a bug in the result
parsing of lxsession, this did not work properly. Add patch to
fix this issue.
| -rw-r--r-- | recipes-lxde/lxsession/lxsession-0.4.9.2/0001-lxsession-logout-fix-dbus-string-value-check-for-sys.patch | 31 | ||||
| -rw-r--r-- | recipes-lxde/lxsession/lxsession_0.4.9.2.bb | 3 |
2 files changed, 33 insertions, 1 deletions
diff --git a/recipes-lxde/lxsession/lxsession-0.4.9.2/0001-lxsession-logout-fix-dbus-string-value-check-for-sys.patch b/recipes-lxde/lxsession/lxsession-0.4.9.2/0001-lxsession-logout-fix-dbus-string-value-check-for-sys.patch new file mode 100644 index 0000000..624d036 --- /dev/null +++ b/recipes-lxde/lxsession/lxsession-0.4.9.2/0001-lxsession-logout-fix-dbus-string-value-check-for-sys.patch @@ -0,0 +1,31 @@ +From 2b320b7f64fa04d59a04b00b2f0877c6d3427252 Mon Sep 17 00:00:00 2001 +From: Stefan Agner <stefan.agner@toradex.com> +Date: Wed, 29 Oct 2014 14:35:25 +0100 +Subject: [PATCH] lxsession-logout: fix dbus string value check for systemd + +The string values have not been checked to be equal to "yes" or +"challenge", but to be other than equal. This is always true because +we compare two different strings. Fix the check, either "yes" or +"challenge" need to be returned to return TRUE now. + +Upstream-Status: submitted +--- + lxsession-logout/lxsession-logout-dbus-interface.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lxsession-logout/lxsession-logout-dbus-interface.c b/lxsession-logout/lxsession-logout-dbus-interface.c +index 3404615..6dde18a 100644 +--- a/lxsession-logout/lxsession-logout-dbus-interface.c ++++ b/lxsession-logout/lxsession-logout-dbus-interface.c +@@ -189,7 +189,7 @@ systemd_query (const gchar *function, gboolean default_result, GError **error) + if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(s)"))) + { + g_variant_get (result, "(s)", &str); +- if (g_strcmp0 (str, "yes") || g_strcmp0 (str, "challenge")) ++ if (!g_strcmp0 (str, "yes") || !g_strcmp0 (str, "challenge")) + function_result = TRUE; + else + function_result = default_result; +-- +2.1.2 + diff --git a/recipes-lxde/lxsession/lxsession_0.4.9.2.bb b/recipes-lxde/lxsession/lxsession_0.4.9.2.bb index ab51589..e39c40d 100644 --- a/recipes-lxde/lxsession/lxsession_0.4.9.2.bb +++ b/recipes-lxde/lxsession/lxsession_0.4.9.2.bb @@ -2,7 +2,7 @@ DESCRIPTION = "LXDE session manager" HOMEPAGE = "http://lxde.sf.net/" SECTION = "x11" -PR = "r2" +PR = "r3" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=a76102f7f48780284bee49e6edaeb5a9" @@ -14,6 +14,7 @@ RDEPENDS_{PN} = "${COMMON_DEPENDS} upower dbus-x11" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/${PN}-${PV}.tar.gz" SRC_URI += "file://lxsession-logout-git-62bfec81f6c50083423b8501a94be80125396966.patch" SRC_URI += "file://lxsession-configure-ac.patch" +SRC_URI += "file://0001-lxsession-logout-fix-dbus-string-value-check-for-sys.patch" SRC_URI[md5sum] = "bc3eb71936dbdf813e9ac2f00ab948f0" SRC_URI[sha256sum] = "eff03e573b561cabe81c5d015d825e3d998e98d6621040113d7df471c8b9cfb4" |