From f514c950eac5ccf78b0fad1616affa468b763326 Mon Sep 17 00:00:00 2001 From: Andreas Müller Date: Fri, 27 Sep 2019 00:32:06 +0200 Subject: xfce4-panel: upgrade 4.14.0 -> 4.14.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * important bugfix release: systray draws icons properly when compositing is disabled * while at it renumber patches Signed-off-by: Andreas Müller Acked-by: Kai Kang Signed-off-by: Khem Raj --- .../files/0001-use-lxdm-to-replace-dm-tool.patch | 49 ---------------------- .../files/0002-use-lxdm-to-replace-dm-tool.patch | 49 ++++++++++++++++++++++ .../recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb | 41 ------------------ .../recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb | 41 ++++++++++++++++++ 4 files changed, 90 insertions(+), 90 deletions(-) delete mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch delete mode 100644 meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb create mode 100644 meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb 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 deleted file mode 100644 index b06e26e91d..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-panel/files/0001-use-lxdm-to-replace-dm-tool.patch +++ /dev/null @@ -1,49 +0,0 @@ -From b80108f01b1425427f98341168ea44c4b1a5a2cf Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -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 ---- - 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/files/0002-use-lxdm-to-replace-dm-tool.patch b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch new file mode 100644 index 0000000000..b06e26e91d --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-panel/files/0002-use-lxdm-to-replace-dm-tool.patch @@ -0,0 +1,49 @@ +From b80108f01b1425427f98341168ea44c4b1a5a2cf Mon Sep 17 00:00:00 2001 +From: Hongxu Jia +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 +--- + 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.14.0.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb deleted file mode 100644 index 749c3fea48..0000000000 --- a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.0.bb +++ /dev/null @@ -1,41 +0,0 @@ -SUMMARY = "Xfce4 Panel" -SECTION = "x11" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" -DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" - -inherit xfce gtk-doc gobject-introspection distro_features_check remove-libtool - -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI[md5sum] = "940e8b430e28093a2e56e390055bcd51" -SRC_URI[sha256sum] = "d5f8f3bd7e142139987e5e62cda26135a424baabb5e47aa0c23b4169d0a66ef4" -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() { - plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') - plugin_name = d.expand('${PN}-plugin-%s') - do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, - '${PN} plugin for %s', extra_depends='', prepend=True, - aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', - '${sysconfdir}/xdg/xfce/panel/%s-*', - '${datadir}/icons/hicolor/48x48/apps/*-%s.png', - '${bindir}/*%s*']) -} - -PACKAGES_DYNAMIC += "^${PN}-plugin-.*" - -PACKAGES =+ "${PN}-gtk3" - -FILES_${PN} += "${libdir}/xfce4/panel/migrate \ - ${libdir}/xfce4/panel/wrapper-1.0" - -FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" - -FILES_${PN}-gtk3 = " \ - ${libdir}/libxfce4panel-2.0${SOLIBS} \ - ${libdir}/xfce4/panel/wrapper-2.0 \ -" diff --git a/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb new file mode 100644 index 0000000000..a1b571e686 --- /dev/null +++ b/meta-xfce/recipes-xfce/xfce4-panel/xfce4-panel_4.14.1.bb @@ -0,0 +1,41 @@ +SUMMARY = "Xfce4 Panel" +SECTION = "x11" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=26a8bd75d8f8498bdbbe64a27791d4ee" +DEPENDS = "garcon exo gtk+3 cairo virtual/libx11 libxml2 libwnck3 vala-native" + +inherit xfce gtk-doc gobject-introspection distro_features_check remove-libtool + +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI[md5sum] = "3323588f1c18f04891e013243da1e355" +SRC_URI[sha256sum] = "9c3c78b49ddfac7d42a804e6a6ad9d22ad64ec60bbe17d8724bc52d3e3f6d114" +SRC_URI += " \ + file://0001-windowmenu-do-not-display-desktop-icon-when-no-windo.patch \ + file://0002-use-lxdm-to-replace-dm-tool.patch \ +" + +python populate_packages_prepend() { + plugin_dir = d.expand('${libdir}/xfce4/panel/plugins/') + plugin_name = d.expand('${PN}-plugin-%s') + do_split_packages(d, plugin_dir, '^lib(.*).so$', plugin_name, + '${PN} plugin for %s', extra_depends='', prepend=True, + aux_files_pattern=['${datadir}/xfce4/panel/plugins/%s.desktop', + '${sysconfdir}/xdg/xfce/panel/%s-*', + '${datadir}/icons/hicolor/48x48/apps/*-%s.png', + '${bindir}/*%s*']) +} + +PACKAGES_DYNAMIC += "^${PN}-plugin-.*" + +PACKAGES =+ "${PN}-gtk3" + +FILES_${PN} += "${libdir}/xfce4/panel/migrate \ + ${libdir}/xfce4/panel/wrapper-1.0" + +FILES_${PN}-dev += "${libdir}/xfce4/panel/plugins/*.la" + +FILES_${PN}-gtk3 = " \ + ${libdir}/libxfce4panel-2.0${SOLIBS} \ + ${libdir}/xfce4/panel/wrapper-2.0 \ +" -- cgit 1.2.3-korg