diff options
| author |   Hongxu Jia <hongxu.jia@windriver.com> | 2019-06-28 23:22:56 +0800 |
|---|---|---|
| committer |   Khem Raj <raj.khem@gmail.com> | 2019-07-10 09:24:32 -0700 |
| commit | 19c7cbc51a35df478089b315c9a9977389a0717c (patch) | |
| tree | 939dd009cc0fffd2ccacd5a40a390edb8239e758 /meta-xfce | |
| parent | 310df900fb0cc9acd939a04501941c38a45114aa (diff) | |
| download | meta-openembedded-contrib-19c7cbc51a35df478089b315c9a9977389a0717c.tar.gz | |
xfce4-panel: use lxdm to replace dm-tool
OE does not support lightdm but lxdm,
so use lxdm to replace dm-tool
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-xfce')
| -rw-r--r-- | meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch | 49 | ||||
| -rw-r--r-- | meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.5.bb | 1 |
2 files changed, 50 insertions, 0 deletions
diff --git a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch new file mode 100644 index 0000000000..b06e26e91d --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch @@ -0,0 +1,49 @@ +From b80108f01b1425427f98341168ea44c4b1a5a2cf Mon Sep 17 00:00:00 2001 +From: Hongxu Jia <hongxu.jia@windriver.com> +Date: Fri, 28 Jun 2019 16:02:13 +0800 +Subject: [PATCH] use lxdm to replace dm-tool + +OE does not support lightdm but lxdm, +so use lxdm to replace dm-tool + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> +--- + plugins/actions/actions.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/plugins/actions/actions.c b/plugins/actions/actions.c +index 474798e..63eb41d 100644 +--- a/plugins/actions/actions.c ++++ b/plugins/actions/actions.c +@@ -905,12 +905,12 @@ actions_plugin_actions_allowed (void) + GError *error = NULL; + + /* check for commands we use */ +- path = g_find_program_in_path ("dm-tool"); ++ path = g_find_program_in_path ("lxdm"); + if (path != NULL) + PANEL_SET_FLAG (allow_mask, ACTION_TYPE_SWITCH_USER); + else + { +- /* check for gdmflexiserver if dm-tool is not present */ ++ /* check for gdmflexiserver if lxdm is not present */ + g_free (path); + path = g_find_program_in_path ("gdmflexiserver"); + if (path != NULL) +@@ -1027,9 +1027,9 @@ actions_plugin_action_activate (GtkWidget *widget, + break; + + case ACTION_TYPE_SWITCH_USER: +- path = g_find_program_in_path ("dm-tool"); ++ path = g_find_program_in_path ("lxdm"); + if (path != NULL) +- succeed = g_spawn_command_line_async ("dm-tool switch-to-greeter", &error); ++ succeed = g_spawn_command_line_async ("lxdm -c USER_SWITCH", &error); + else + succeed = g_spawn_command_line_async ("gdmflexiserver", &error); + g_free (path); +-- +2.8.1 + diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.5.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.5.bb index a4b200a7e8..cebddf6f9f 100644 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.5.bb +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.13.5.bb @@ -12,6 +12,7 @@ SRC_URI[md5sum] = "376e360fb87095edaea7df8ca34fe6a7" SRC_URI[sha256sum] = "0d05b6dd8c91c154a364a3e31583c5f423c33e26d44d43cc409165f7d578ca15" SRC_URI += " \ file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ + file://0001-use-lxdm-to-replace-dm-tool.patch \ " python populate_packages_prepend() { |