summaryrefslogtreecommitdiff
path: root/meta/packages/matchbox-keyboard
diff options
context:
space:
mode:
Diffstat (limited to 'meta/packages/matchbox-keyboard')
-rwxr-xr-xmeta/packages/matchbox-keyboard/files/80matchboxkeyboard6
-rw-r--r--meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb17
2 files changed, 13 insertions, 10 deletions
diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
index 60d9ff0e5..8af3bd59a 100755
--- a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
+++ b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
@@ -10,9 +10,8 @@ if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
CMD="matchbox-keyboard -d -o portrait"
fi
-elif [ "$HAVE_KEYBOARD" = "1" ]; then
- # Have a physical keyboard, nothing to do
- exit
+elif [ "$HAVE_KEYBOARD" = "0" ]; then
+ CMD="matchbox-keyboard -d"
fi
# Delay to make sure the window manager is active
@@ -20,4 +19,3 @@ fi
if [ "$CMD" ]; then
(sleep 2 && $CMD) &
fi
-
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index a179883a5..20461a40d 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -1,10 +1,10 @@
DESCRIPTION = "Matchbox virtual keyboard for X11"
LICENSE = "GPL"
-DEPENDS = "libfakekey expat libxft gtk+"
+DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
RDEPENDS = "formfactor"
SECTION = "x11"
PV = "0.0+svn${SRCDATE}"
-PR = "r5"
+PR = "r7"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
file://80matchboxkeyboard"
@@ -13,17 +13,22 @@ S = "${WORKDIR}/${PN}"
inherit autotools pkgconfig gettext
-EXTRA_OECONF = "--disable-cairo --enable-gtk-im"
+EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
-PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg"
+PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \
+ matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
FILES_${PN} = "${bindir}/* \
- ${sysconfdir} \
+ ${sysconfdir} \
${datadir}/applications \
${datadir}/pixmaps \
${datadir}/matchbox-keyboard"
+
FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
-FILES_matchbox-keyboard-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
+FILES_matchbox-keyboard-im-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
+
+FILES_matchbox-keyboard-applet = "${libdir}/matchbox-panel/*.so"
+FILES_matchbox-keyboard-applet-dbg += "${libdir}/matchbox-panel/.debug"
do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d/