diff options
| -rw-r--r-- | meta/conf/distro/poky.conf | 2 | ||||
| -rwxr-xr-x | meta/packages/matchbox-keyboard/files/80matchboxkeyboard | 6 | ||||
| -rw-r--r-- | meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb | 17 |
3 files changed, 14 insertions, 11 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf index 739b46af8..5c4eed89d 100644 --- a/meta/conf/distro/poky.conf +++ b/meta/conf/distro/poky.conf @@ -80,7 +80,7 @@ SRCDATE_ipkg-link ?= "20050930" SRCDATE_matchbox-common ?= "20070417" SRCDATE_matchbox-config-gtk ?= "20070417" SRCDATE_matchbox-desktop ?= "20070531" -SRCDATE_matchbox-keyboard ?= "20070529" +SRCDATE_matchbox-keyboard ?= "20070603" SRCDATE_matchbox-panel ?= "20060727" SRCDATE_matchbox-panel-manager ?= "20060612" SRCDATE_matchbox-panel-2 ?= "20070529" 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/ |