summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2007-06-02 17:04:49 +0000
committerRoss Burton <ross@openedhand.com>2007-06-02 17:04:49 +0000
commit030f86e0a45c99e2bfa4ecdf7d17e5c90715e252 (patch)
treeaf8be6ee339ca01a4546d53a97a935030422648a
parenta5eb370699cf769af2fc5709fd9f49aa022fbd12 (diff)
downloadpoky-030f86e0a45c99e2bfa4ecdf7d17e5c90715e252.tar.gz
Bump matchbox-keyboard srcdate, build the panel applet, and hopefully make the startup script work on the N800
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1847 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/distro/poky.conf2
-rwxr-xr-xmeta/packages/matchbox-keyboard/files/80matchboxkeyboard6
-rw-r--r--meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb17
3 files changed, 14 insertions, 11 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index 739b46af8c..5c4eed89d2 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -80,7 +80,7 @@ SRCDATE_ipkg-link ?= "20050930"
80SRCDATE_matchbox-common ?= "20070417" 80SRCDATE_matchbox-common ?= "20070417"
81SRCDATE_matchbox-config-gtk ?= "20070417" 81SRCDATE_matchbox-config-gtk ?= "20070417"
82SRCDATE_matchbox-desktop ?= "20070531" 82SRCDATE_matchbox-desktop ?= "20070531"
83SRCDATE_matchbox-keyboard ?= "20070529" 83SRCDATE_matchbox-keyboard ?= "20070603"
84SRCDATE_matchbox-panel ?= "20060727" 84SRCDATE_matchbox-panel ?= "20060727"
85SRCDATE_matchbox-panel-manager ?= "20060612" 85SRCDATE_matchbox-panel-manager ?= "20060612"
86SRCDATE_matchbox-panel-2 ?= "20070529" 86SRCDATE_matchbox-panel-2 ?= "20070529"
diff --git a/meta/packages/matchbox-keyboard/files/80matchboxkeyboard b/meta/packages/matchbox-keyboard/files/80matchboxkeyboard
index 60d9ff0e5d..8af3bd59a5 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
10 elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then 10 elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
11 CMD="matchbox-keyboard -d -o portrait" 11 CMD="matchbox-keyboard -d -o portrait"
12 fi 12 fi
13elif [ "$HAVE_KEYBOARD" = "1" ]; then 13elif [ "$HAVE_KEYBOARD" = "0" ]; then
14 # Have a physical keyboard, nothing to do 14 CMD="matchbox-keyboard -d"
15 exit
16fi 15fi
17 16
18# Delay to make sure the window manager is active 17# Delay to make sure the window manager is active
@@ -20,4 +19,3 @@ fi
20if [ "$CMD" ]; then 19if [ "$CMD" ]; then
21 (sleep 2 && $CMD) & 20 (sleep 2 && $CMD) &
22fi 21fi
23
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index a179883a58..20461a40d7 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -1,10 +1,10 @@
1DESCRIPTION = "Matchbox virtual keyboard for X11" 1DESCRIPTION = "Matchbox virtual keyboard for X11"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "libfakekey expat libxft gtk+" 3DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
4RDEPENDS = "formfactor" 4RDEPENDS = "formfactor"
5SECTION = "x11" 5SECTION = "x11"
6PV = "0.0+svn${SRCDATE}" 6PV = "0.0+svn${SRCDATE}"
7PR = "r5" 7PR = "r7"
8 8
9SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ 9SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \
10 file://80matchboxkeyboard" 10 file://80matchboxkeyboard"
@@ -13,17 +13,22 @@ S = "${WORKDIR}/${PN}"
13 13
14inherit autotools pkgconfig gettext 14inherit autotools pkgconfig gettext
15 15
16EXTRA_OECONF = "--disable-cairo --enable-gtk-im" 16EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
17 17
18PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg" 18PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \
19 matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
19 20
20FILES_${PN} = "${bindir}/* \ 21FILES_${PN} = "${bindir}/* \
21 ${sysconfdir} \ 22 ${sysconfdir} \
22 ${datadir}/applications \ 23 ${datadir}/applications \
23 ${datadir}/pixmaps \ 24 ${datadir}/pixmaps \
24 ${datadir}/matchbox-keyboard" 25 ${datadir}/matchbox-keyboard"
26
25FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so" 27FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
26FILES_matchbox-keyboard-dbg += "${libdir}/gtk-2.0/*/immodules/.debug" 28FILES_matchbox-keyboard-im-dbg += "${libdir}/gtk-2.0/*/immodules/.debug"
29
30FILES_matchbox-keyboard-applet = "${libdir}/matchbox-panel/*.so"
31FILES_matchbox-keyboard-applet-dbg += "${libdir}/matchbox-panel/.debug"
27 32
28do_install_append () { 33do_install_append () {
29 install -d ${D}/${sysconfdir}/X11/Xsession.d/ 34 install -d ${D}/${sysconfdir}/X11/Xsession.d/