diff options
Diffstat (limited to 'meta/recipes-sato/matchbox-keyboard/files')
-rwxr-xr-x | meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg | 23 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch | 13 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg new file mode 100755 index 0000000000..43c5d3ed6a --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/files/80matchboxkeyboard.shbg | |||
@@ -0,0 +1,23 @@ | |||
1 | #!/bin/sh | ||
2 | |||
3 | . /etc/formfactor/config | ||
4 | |||
5 | CMD="" | ||
6 | |||
7 | if [ "$HAVE_KEYBOARD" = "0" ]; then | ||
8 | CMD="matchbox-keyboard -d" | ||
9 | elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then | ||
10 | if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then | ||
11 | CMD="matchbox-keyboard -d -o landscape" | ||
12 | elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then | ||
13 | CMD="matchbox-keyboard -d -o portrait" | ||
14 | fi | ||
15 | fi | ||
16 | |||
17 | |||
18 | if [ "$CMD" ]; then | ||
19 | # Delay to make sure the window manager is active | ||
20 | # by waiting for the desktop to say its finished loading | ||
21 | dbus-wait org.matchbox_project.desktop Loaded | ||
22 | exec $CMD | ||
23 | fi | ||
diff --git a/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch new file mode 100644 index 0000000000..52cea0e8f7 --- /dev/null +++ b/meta/recipes-sato/matchbox-keyboard/files/configure_fix.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: matchbox-window-manager/configure.ac | ||
2 | =================================================================== | ||
3 | --- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 | ||
4 | +++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000 | ||
5 | @@ -283,7 +283,7 @@ | ||
6 | yes) | ||
7 | |||
8 | case "$expat" in | ||
9 | - yes) | ||
10 | + yes|"") | ||
11 | EXPAT_LIBS="-lexpat" | ||
12 | ;; | ||
13 | *) | ||