summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/conf/distro/poky.conf4
-rw-r--r--meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb31
2 files changed, 29 insertions, 6 deletions
diff --git a/meta/conf/distro/poky.conf b/meta/conf/distro/poky.conf
index feaf962d97..4b8790bee5 100644
--- a/meta/conf/distro/poky.conf
+++ b/meta/conf/distro/poky.conf
@@ -85,7 +85,7 @@ SRCDATE_matchbox-common ?= "20070417"
85SRCDATE_matchbox-config-gtk ?= "20070417" 85SRCDATE_matchbox-config-gtk ?= "20070417"
86SRCDATE_matchbox-desktop ?= "20060612" 86SRCDATE_matchbox-desktop ?= "20060612"
87SRCDATE_matchbox-desktop-2 ?= "20070417" 87SRCDATE_matchbox-desktop-2 ?= "20070417"
88SRCDATE_matchbox-keyboard ?= "20070417" 88SRCDATE_matchbox-keyboard ?= "20070516"
89SRCDATE_matchbox-panel ?= "20060727" 89SRCDATE_matchbox-panel ?= "20060727"
90SRCDATE_matchbox-panel-manager ?= "20060612" 90SRCDATE_matchbox-panel-manager ?= "20060612"
91SRCDATE_matchbox-panel-2 ?= "20070417" 91SRCDATE_matchbox-panel-2 ?= "20070417"
@@ -196,7 +196,7 @@ DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
196POKY_EXTRA_RDEPENDS = "" 196POKY_EXTRA_RDEPENDS = ""
197POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" 197POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
198POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" 198POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
199POKY_EXTRA_RDEPENDS_akita = "pointercal" 199POKY_EXTRA_RDEPENDS_akita = "pointercal matchbox-keyboard-im"
200 200
201DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" 201DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"
202 202
diff --git a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 4cea81a2ea..ac03f11e2d 100644
--- a/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -1,9 +1,9 @@
1DESCRIPTION = "Matchbox virtual keyboard for X11" 1DESCRIPTION = "Matchbox virtual keyboard for X11"
2LICENSE = "GPL" 2LICENSE = "GPL"
3DEPENDS = "libfakekey expat libxft" 3DEPENDS = "libfakekey expat libxft gtk+"
4SECTION = "x11" 4SECTION = "x11"
5PV = "0.0+svn${SRCDATE}" 5PV = "0.0+svn${SRCDATE}"
6PR="r2" 6PR="r3"
7 7
8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" 8SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
9 9
@@ -12,9 +12,32 @@ S = "${WORKDIR}/${PN}"
12 12
13inherit autotools pkgconfig gettext 13inherit autotools pkgconfig gettext
14 14
15EXTRA_OECONF = "--disable-cairo" 15EXTRA_OECONF = "--disable-cairo --enable-gtk-im"
16
17PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg"
16 18
17FILES_${PN} = "${bindir}/* \ 19FILES_${PN} = "${bindir}/* \
18 ${datadir}/applications \ 20 ${datadir}/applications \
19 ${datadir}/pixmaps \ 21 ${datadir}/pixmaps \
20 ${datadir}/matchbox-keyboard" 22 ${datadir}/matchbox-keyboard"
23
24FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
25
26FILES_matchbox-keyboard-dbg = "${libdir}/gtk-2.0/*/immodules/.debug"
27
28
29pkg_postinst_matchbox-keyboard-im () {
30if [ "x$D" != "x" ]; then
31 exit 1
32fi
33
34gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
35}
36
37pkg_postrm_matchbox-keyboard-im () {
38if [ "x$D" != "x" ]; then
39 exit 1
40fi
41
42gtk-query-immodules-2.0 > /etc/gtk-2.0/gtk.immodules
43}