mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-09-16 09:49:35 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update matchbox-keyboard srcdate, enable and package the GTK+ input method, and include it by default on Akita

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1747 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2007-05-17 11:16:45 +00:00
parent d7fca4c40d
commit e5b3d85ae0
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
meta/conf/distro/poky.conf
View File

@@ -85,7 +85,7 @@ SRCDATE_matchbox-common ?= "20070417"
SRCDATE_matchbox-config-gtk ?= "20070417" SRCDATE_matchbox-config-gtk ?= "20070417"
SRCDATE_matchbox-desktop ?= "20060612" SRCDATE_matchbox-desktop ?= "20060612"
SRCDATE_matchbox-desktop-2 ?= "20070417" SRCDATE_matchbox-desktop-2 ?= "20070417"
SRCDATE_matchbox-keyboard ?= "20070417" SRCDATE_matchbox-keyboard ?= "20070516"
SRCDATE_matchbox-panel ?= "20060727" SRCDATE_matchbox-panel ?= "20060727"
SRCDATE_matchbox-panel-manager ?= "20060612" SRCDATE_matchbox-panel-manager ?= "20060612"
SRCDATE_matchbox-panel-2 ?= "20070417" SRCDATE_matchbox-panel-2 ?= "20070417"
@@ -196,7 +196,7 @@ DISTRO_FEATURES_cmx270 = "alsa bluetooth ext2 irda pcmcia usbgadget usbhost"
POKY_EXTRA_RDEPENDS = "" POKY_EXTRA_RDEPENDS = ""
POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config" POKY_EXTRA_RDEPENDS_qemuarm = "qemu-config"
POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config" POKY_EXTRA_RDEPENDS_qemux86 = "qemu-config"
POKY_EXTRA_RDEPENDS_akita = "pointercal" POKY_EXTRA_RDEPENDS_akita = "pointercal matchbox-keyboard-im"
DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}" DISTRO_EXTRA_RDEPENDS += "${POKY_EXTRA_RDEPENDS}"

31
meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
View File

@@ -1,9 +1,9 @@
DESCRIPTION = "Matchbox virtual keyboard for X11" DESCRIPTION = "Matchbox virtual keyboard for X11"
LICENSE = "GPL" LICENSE = "GPL"
DEPENDS = "libfakekey expat libxft" DEPENDS = "libfakekey expat libxft gtk+"
SECTION = "x11" SECTION = "x11"
PV = "0.0+svn${SRCDATE}" PV = "0.0+svn${SRCDATE}"
PR="r2" PR="r3"
SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http"
@@ -12,9 +12,32 @@ S = "${WORKDIR}/${PN}"
inherit autotools pkgconfig gettext inherit autotools pkgconfig gettext
EXTRA_OECONF = "--disable-cairo" EXTRA_OECONF = "--disable-cairo --enable-gtk-im"
PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg"
FILES_${PN} = "${bindir}/* \ FILES_${PN} = "${bindir}/* \
${datadir}/applications \ ${datadir}/applications \
${datadir}/pixmaps \ ${datadir}/pixmaps \
${datadir}/matchbox-keyboard" ${datadir}/matchbox-keyboard"
FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
FILES_matchbox-keyboard-dbg = "${libdir}/gtk-2.0/*/immodules/.debug"
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
}