[oe-commits] org.oe.dev multitap-pad: multi-tap input method for GTK

[john_lee commit]

multitap-pad: multi-tap input method for GTK
* update moko-autorev and sane-srcrevs accordingly.

Author: john_lee at openmoko.com
Branch: org.openembedded.dev
Revision: 81f42ea2c95e199e78f68e0494f08c295db517de
ViewMTN: http://monotone.openembedded.org/revision/info/81f42ea2c95e199e78f68e0494f08c295db517de
Files:
1
packages/multitap-pad
packages/multitap-pad/files
packages/multitap-pad/files/80multitappad
packages/multitap-pad/multitap-pad_svn.bb
conf/distro/include/moko-autorev.inc
conf/distro/include/sane-srcrevs.inc
Diffs:

#
# mt diff -rf55b57b75efb79dc15f7433f4d4d58864aeb92a5 -r81f42ea2c95e199e78f68e0494f08c295db517de
#
#
#
# add_dir "packages/multitap-pad"
# 
# add_dir "packages/multitap-pad/files"
# 
# add_file "packages/multitap-pad/files/80multitappad"
#  content [b613cc7c89d800c205b89dd7013c4b3ba309b319]
# 
# add_file "packages/multitap-pad/multitap-pad_svn.bb"
#  content [8f2b626f58690dd52e509cacab5977c5f52270e2]
# 
# patch "conf/distro/include/moko-autorev.inc"
#  from [e5ef3940b2f93916030971ecf4bc5a84ca30aa58]
#    to [2dab818ae159df8b070151bdc5e908e8e7def5d5]
# 
# patch "conf/distro/include/sane-srcrevs.inc"
#  from [55a9bcc239d243dade8a3cc4da74e0133506f86e]
#    to [a20d33aa159aa14603577b5e5ffeebfd1c4b2c56]
#
============================================================
--- packages/multitap-pad/files/80multitappad	b613cc7c89d800c205b89dd7013c4b3ba309b319
+++ packages/multitap-pad/files/80multitappad	b613cc7c89d800c205b89dd7013c4b3ba309b319
@@ -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="multitap-pad -d -o landscape"
+    elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
+        CMD="multitap-pad -d -o portrait"
+    fi
+else
+    CMD="multitap-pad -d"
+fi
+
+
+# Delay to make sure the window manager is active
+
+if [ "$CMD" ]; then
+    (sleep 2 && $CMD) &
+fi
============================================================
--- packages/multitap-pad/multitap-pad_svn.bb	8f2b626f58690dd52e509cacab5977c5f52270e2
+++ packages/multitap-pad/multitap-pad_svn.bb	8f2b626f58690dd52e509cacab5977c5f52270e2
@@ -0,0 +1,47 @@
+DESCRIPTION = "Multi-tap input method for GTK"
+LICENSE = "GPL"
+DEPENDS = "libfakekey gtk+ matchbox-panel-2"
+RCONFLICTS = matchbox-keyboard-inputmethod
+SECTION = "x11"
+PV = "0.0+svnr${SRCREV}"
+
+SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \
+	file://80multitappad"
+
+inherit autotools pkgconfig
+
+S = "${WORKDIR}/${PN}"
+
+FILES_${PN} = "${bindir}/* \
+               ${libdir} \
+	       ${sysconfdir} \
+	       ${datadir}"
+
+FILES_${PN}-dbg += " ${libdir}/gtk-2.0/2.10.0/immodules/.debug \
+                     ${libdir}/matchbox-panel/.debug"
+
+FILES_${PN}-dev += " ${libdir}/gtk-2.0/2.10.0/immodules/*.a \
+                     ${libdir}/gtk-2.0/2.10.0/immodules/*.la \
+		     ${libdir}/matchbox-panel/*.a \
+		     ${libdir}/matchbox-panel/*.la"
+
+do_install_append () {
+	install -d ${D}/${sysconfdir}/X11/Xsession.d/
+	install -m 755 ${WORKDIR}/80multitappad ${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+pkg_postinst_multitap-pad () {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
+
+pkg_postrm_multitap-pad () {
+if [ "x$D" != "x" ]; then
+  exit 1
+fi
+
+gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
+}
============================================================
--- conf/distro/include/moko-autorev.inc	e5ef3940b2f93916030971ecf4bc5a84ca30aa58
+++ conf/distro/include/moko-autorev.inc	2dab818ae159df8b070151bdc5e908e8e7def5d5
@@ -10,6 +10,8 @@ SRCREV_pn-neod ?= "${AUTOREV}"
 SRCREV_pn-moko-gtk-engine ?= "${AUTOREV}"
 SRCREV_pn-neod ?= "${AUTOREV}"
 
+SRCREV_pn-multitap-pad ?= "${AUTOREV}"
+
 SRCREV_pn-openmoko-appmanager2 ?= "${AUTOREV}"
 SRCREV_pn-openmoko-appearance ?= "${AUTOREV}"
 SRCREV_pn-openmoko-browser2 ?= "${AUTOREV}"
============================================================
--- conf/distro/include/sane-srcrevs.inc	55a9bcc239d243dade8a3cc4da74e0133506f86e
+++ conf/distro/include/sane-srcrevs.inc	a20d33aa159aa14603577b5e5ffeebfd1c4b2c56
@@ -55,6 +55,7 @@ SRCREV_pn-mpd-alsa ?= "6952"
 SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-moko-gtk-engine ?= "3405"
 SRCREV_pn-mpd-alsa ?= "6952"
+SRCREV_pn-multitap-pad ?= "337"
 SRCREV_pn-neod ?= "3421"
 SRCREV_pn-oh-puzzles ?= "22"
 SRCREV_pn-osb-browser ?= "125"