From 9bc3a29ef14d12f439dece287454af8966d47062 Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen Date: Tue, 12 Apr 2016 11:14:22 +0300 Subject: matchbox-keyboard: Hide desktop launcher Add patch that hides the keyboard desktop launcher, remove patch that tries and fails to make the keyboard a single-instance application. The desktop launcher of matchbox-keyboard is a source of far more problems than solutions: As an example there's supposed to be only one instance running at a time but we give the user several ways to start multiple instances (and the Matchbox WM Single-Instance implementation is broken by both design and implementation). After this patch the only instance of matchbox-keyboard is the daemonized one that can be shown/hidden with the panel applet (when there is not hardware keyboard). If an additional matchbox-keyboard needs to be started for debug reasons, it can still be done from command line. Fixes [YOCTO #3093]. Signed-off-by: Jussi Kukkonen Signed-off-by: Ross Burton --- ...ktop-file-Hide-the-keyboard-from-app-list.patch | 33 ++++++++++++++++++++++ .../matchbox-keyboard/files/single-instance.patch | 23 --------------- .../matchbox-keyboard/matchbox-keyboard_git.bb | 2 +- 3 files changed, 34 insertions(+), 24 deletions(-) create mode 100644 meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch delete mode 100644 meta/recipes-sato/matchbox-keyboard/files/single-instance.patch (limited to 'meta/recipes-sato') diff --git a/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch b/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch new file mode 100644 index 0000000000..6b7a5cfecb --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch @@ -0,0 +1,33 @@ +From 38da4cd575edb7463cfff241afff64c2f66ea09a Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Tue, 12 Apr 2016 09:40:37 +0300 +Subject: [PATCH] desktop file: Hide the keyboard from app list + +matchbox-keyboard is not a normal app and there's no need to start +it via the desktop app grid when using Sato desktop: +* when there's no hardware keyboard, the panel applet can be used to + show/hide the daemonized matchbox-keyboard +* when there is a hardware keyboard, matchbox-keyboard can still be + started for debug purposes from command line or the applet can be + enabled by editing /etc/formfactor/machconfig + +So hide the keyboard from the desktop app list. + +Upstream-Status: Inappropriate [configuration] +Signed-off-by: Jussi Kukkonen +--- + matchbox-keyboard.desktop | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/matchbox-keyboard.desktop b/matchbox-keyboard.desktop +index c092bfe..613d349 100644 +--- a/matchbox-keyboard.desktop ++++ b/matchbox-keyboard.desktop +@@ -6,3 +6,4 @@ Type=Application + Icon=matchbox-keyboard.png + Categories=Panel;Utility;MB + X-MB-INPUT-MECHANSIM=True ++NoDisplay=true +-- +2.1.4 + diff --git a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch b/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch deleted file mode 100644 index 18b6c41746..0000000000 --- a/meta/recipes-sato/matchbox-keyboard/files/single-instance.patch +++ /dev/null @@ -1,23 +0,0 @@ -Multiple matchbox-keyboard instances would occupy whole screen and cause X -window segfault(Bug 509). Making matchbox-keyboard singleton is one work -around. - -This patch allow only one instance of matchbox-keyboard based on some mechanism -in matchbox-desktop. In future, an applet and GTK-IM modules in -matchbox-keyboard can be used to automatically map/unmap the virtual keyboard -on demand. - -Signed-off-by: Zhai Edwin - -Upstream-Status: Inappropriate [configuration] - -Index: matchbox-keyboard/matchbox-keyboard.desktop -=================================================================== ---- matchbox-keyboard.orig/matchbox-keyboard.desktop 2010-12-22 20:41:40.000000000 +0800 -+++ matchbox-keyboard/matchbox-keyboard.desktop 2010-12-22 20:42:12.000000000 +0800 -@@ -6,3 +6,5 @@ - Icon=matchbox-keyboard.png - Categories=Panel;Utility;MB - X-MB-INPUT-MECHANSIM=True -+X-MB-SingleInstance=true -+StartupNotify=true diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb index 183cba231a..eba1970ee6 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb @@ -15,7 +15,7 @@ PV = "0.0+git${SRCPV}" PR = "r4" SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ - file://single-instance.patch \ + file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ file://80matchboxkeyboard.sh" S = "${WORKDIR}/git" -- cgit 1.2.3-korg