From d0e95b34f8a526797d9979abfeb3c85d166c1c80 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <hrw@openedhand.com>
Date: Mon, 11 Feb 2008 14:22:23 +0000
Subject: matchbox-keyboard: autostart keyboard on keyboardless devices

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3744 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 meta/packages/matchbox-keyboard/files/80matchboxkeyboard | 6 +++---
 meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'meta')

diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
index 8af3bd59a..06d45bb9c 100755
--- a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
+++ b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
@@ -4,14 +4,14 @@
 
 CMD=""
 
-if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
+if [ "$HAVE_KEYBOARD" = "0" ]; then
+    CMD="matchbox-keyboard -d"
+elif [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
     if [ "$HAVE_KEYBOARD_PORTRAIT" = "1" -a "$HAVE_KEYBOARD_LANDSCAPE" = "0" ]; then
         CMD="matchbox-keyboard -d -o landscape"
     elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
         CMD="matchbox-keyboard -d -o portrait"
     fi
-elif [ "$HAVE_KEYBOARD" = "0" ]; then
-    CMD="matchbox-keyboard -d"
 fi
 					
 # Delay to make sure the window manager is active
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 400e16ace..205c0fc0d 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -4,6 +4,7 @@ DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
 RDEPENDS = "formfactor"
 SECTION = "x11"
 PV = "0.0+svnr${SRCREV}"
+PR = "r1"
 
 SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
            file://configure_fix.patch;patch=1;maxrev=1819 \
-- 
cgit v1.2.3