summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xmeta/packages/matchbox-keyboard/files/80matchboxkeyboard6
-rw-r--r--meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb1
2 files changed, 4 insertions, 3 deletions
diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
index 8af3bd59a5..06d45bb9c0 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 400e16ace4..205c0fc0d3 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 \