summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-04-12 11:14:22 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-04-14 10:58:33 +0100
commitcb45ef33fbf181f3289cb5cd4febb91d52b1f560 (patch)
tree6e2afcaff495e276e07222b68553a11ffa0dff1d
parent69e20cade69af6b7563581a6f03e95667ab09c43 (diff)
downloadpoky-cb45ef33fbf181f3289cb5cd4febb91d52b1f560.tar.gz
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]. (From OE-Core rev: 9bc3a29ef14d12f439dece287454af8966d47062) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/0001-desktop-file-Hide-the-keyboard-from-app-list.patch33
-rw-r--r--meta/recipes-sato/matchbox-keyboard/files/single-instance.patch23
-rw-r--r--meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb2
3 files changed, 34 insertions, 24 deletions
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 @@
1From 38da4cd575edb7463cfff241afff64c2f66ea09a Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 12 Apr 2016 09:40:37 +0300
4Subject: [PATCH] desktop file: Hide the keyboard from app list
5
6matchbox-keyboard is not a normal app and there's no need to start
7it via the desktop app grid when using Sato desktop:
8* when there's no hardware keyboard, the panel applet can be used to
9 show/hide the daemonized matchbox-keyboard
10* when there is a hardware keyboard, matchbox-keyboard can still be
11 started for debug purposes from command line or the applet can be
12 enabled by editing /etc/formfactor/machconfig
13
14So hide the keyboard from the desktop app list.
15
16Upstream-Status: Inappropriate [configuration]
17Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
18---
19 matchbox-keyboard.desktop | 1 +
20 1 file changed, 1 insertion(+)
21
22diff --git a/matchbox-keyboard.desktop b/matchbox-keyboard.desktop
23index c092bfe..613d349 100644
24--- a/matchbox-keyboard.desktop
25+++ b/matchbox-keyboard.desktop
26@@ -6,3 +6,4 @@ Type=Application
27 Icon=matchbox-keyboard.png
28 Categories=Panel;Utility;MB
29 X-MB-INPUT-MECHANSIM=True
30+NoDisplay=true
31--
322.1.4
33
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 @@
1Multiple matchbox-keyboard instances would occupy whole screen and cause X
2window segfault(Bug 509). Making matchbox-keyboard singleton is one work
3around.
4
5This patch allow only one instance of matchbox-keyboard based on some mechanism
6in matchbox-desktop. In future, an applet and GTK-IM modules in
7matchbox-keyboard can be used to automatically map/unmap the virtual keyboard
8on demand.
9
10Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
11
12Upstream-Status: Inappropriate [configuration]
13
14Index: matchbox-keyboard/matchbox-keyboard.desktop
15===================================================================
16--- matchbox-keyboard.orig/matchbox-keyboard.desktop 2010-12-22 20:41:40.000000000 +0800
17+++ matchbox-keyboard/matchbox-keyboard.desktop 2010-12-22 20:42:12.000000000 +0800
18@@ -6,3 +6,5 @@
19 Icon=matchbox-keyboard.png
20 Categories=Panel;Utility;MB
21 X-MB-INPUT-MECHANSIM=True
22+X-MB-SingleInstance=true
23+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}"
15PR = "r4" 15PR = "r4"
16 16
17SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ 17SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \
18 file://single-instance.patch \ 18 file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \
19 file://80matchboxkeyboard.sh" 19 file://80matchboxkeyboard.sh"
20 20
21S = "${WORKDIR}/git" 21S = "${WORKDIR}/git"