diff options
4 files changed, 77 insertions, 1 deletions
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc index 8310d47a22..b0a2edf812 100644 --- a/conf/distro/include/sane-srcdates.inc +++ b/conf/distro/include/sane-srcdates.inc @@ -28,7 +28,7 @@ SRCDATE_libfakekey ?= "20051101" SRCDATE_matchbox-common ?= "20060612" SRCDATE_matchbox-config-gtk ?= "20060612" SRCDATE_matchbox-desktop ?= "20060612" -SRCDATE_matchbox-keyboard ?= "20060725" +SRCDATE_matchbox-keyboard ?= "20070816" SRCDATE_matchbox-panel ?= "20060612" SRCDATE_matchbox-panel-manager ?= "20060612" SRCDATE_matchbox-stroke ?= "20060612" diff --git a/packages/matchbox-keyboard/files/80matchboxkeyboard b/packages/matchbox-keyboard/files/80matchboxkeyboard new file mode 100644 index 0000000000..a30ddb01ad --- /dev/null +++ b/packages/matchbox-keyboard/files/80matchboxkeyboard @@ -0,0 +1,20 @@ +#!/bin/sh + +CMD="" + +if [ "$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 +else + CMD="matchbox-keyboard -d" +fi + + +# Delay to make sure the window manager is active + +if [ "$CMD" ]; then + (sleep 2 && $CMD) & +fi diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb new file mode 100644 index 0000000000..4f59b646dc --- /dev/null +++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -0,0 +1,54 @@ +DESCRIPTION = "Matchbox virtual keyboard for X11" +LICENSE = "GPL" +DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" +RCONFLICTS = matchbox-keyboard +RPROVIDES = matchbox-keyboard +#DEFAULT_PREFERENCE = "-1" +SECTION = "x11" +PV = "0.0+svn${SRCDATE}" +PR = "r0" + +SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ + file://80matchboxkeyboard" + +S = "${WORKDIR}/matchbox-keyboard" + +inherit autotools pkgconfig gettext + +EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" + +PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \ + matchbox-keyboard-applet matchbox-keyboard-applet-dbg" + +FILES_${PN} = "${bindir}/* \ + ${sysconfdir} \ + ${datadir}/applications \ + ${datadir}/pixmaps \ + ${datadir}/matchbox-keyboard" + +FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so" +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/ + install -m 755 ${WORKDIR}/80matchboxkeyboard ${D}/${sysconfdir}/X11/Xsession.d/ +} + +pkg_postinst_matchbox-keyboard-im () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} + +pkg_postrm_matchbox-keyboard-im () { +if [ "x$D" != "x" ]; then + exit 1 +fi + +gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules +} diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb index 57d0b413a9..4a19ba1b2a 100644 --- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -1,6 +1,8 @@ DESCRIPTION = "Matchbox virtual keyboard for X11" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" +RCONFLICTS = matchbox-keyboard-inputmethod +RPROVIDES = matchbox-keyboard-inputmethod SECTION = "x11" PV = "0.0+svn${SRCDATE}" PR="r5" |