mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

Bump matchbox-keyboard srcdate, build the panel applet, and hopefully make the startup script work on the N800

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1847 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Ross Burton
2007-06-02 17:04:49 +00:00
parent a5eb370699
commit 030f86e0a4
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/distro/poky.conf
+1 -1
View File
@@ -80,7 +80,7 @@ SRCDATE_ipkg-link ?= "20050930"
SRCDATE_matchbox-common ?= "20070417" SRCDATE_matchbox-common ?= "20070417"
SRCDATE_matchbox-config-gtk ?= "20070417" SRCDATE_matchbox-config-gtk ?= "20070417"
SRCDATE_matchbox-desktop ?= "20070531" SRCDATE_matchbox-desktop ?= "20070531"
SRCDATE_matchbox-keyboard ?= "20070529" SRCDATE_matchbox-keyboard ?= "20070603"
SRCDATE_matchbox-panel ?= "20060727" SRCDATE_matchbox-panel ?= "20060727"
SRCDATE_matchbox-panel-manager ?= "20060612" SRCDATE_matchbox-panel-manager ?= "20060612"
SRCDATE_matchbox-panel-2 ?= "20070529" SRCDATE_matchbox-panel-2 ?= "20070529"
meta/packages/matchbox-keyboard/files/80matchboxkeyboard
+2 -4
View File
@@ -10,9 +10,8 @@ if [ "$DISPLAY_CAN_ROTATE" = "1" ]; then
elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
CMD="matchbox-keyboard -d -o portrait" CMD="matchbox-keyboard -d -o portrait"
fi fi
elif [ "$HAVE_KEYBOARD" = "1" ]; then elif [ "$HAVE_KEYBOARD" = "0" ]; then
# Have a physical keyboard, nothing to do CMD="matchbox-keyboard -d"
exit
fi fi
# Delay to make sure the window manager is active # Delay to make sure the window manager is active
@@ -20,4 +19,3 @@ fi
if [ "$CMD" ]; then if [ "$CMD" ]; then
(sleep 2 && $CMD) & (sleep 2 && $CMD) &
fi fi
meta/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+11 -6
View File
@@ -1,10 +1,10 @@
DESCRIPTION = "Matchbox virtual keyboard for X11" DESCRIPTION = "Matchbox virtual keyboard for X11"
LICENSE = "GPL" LICENSE = "GPL"
DEPENDS = "libfakekey expat libxft gtk+" DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
RDEPENDS = "formfactor" RDEPENDS = "formfactor"
SECTION = "x11" SECTION = "x11"
PV = "0.0+svn${SRCDATE}" PV = "0.0+svn${SRCDATE}"
PR = "r5" PR = "r7"
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 \
file://80matchboxkeyboard" file://80matchboxkeyboard"
@@ -13,17 +13,22 @@ S = "${WORKDIR}/${PN}"
inherit autotools pkgconfig gettext inherit autotools pkgconfig gettext
EXTRA_OECONF = "--disable-cairo --enable-gtk-im" EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg" PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \
matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
FILES_${PN} = "${bindir}/* \ FILES_${PN} = "${bindir}/* \
${sysconfdir} \ ${sysconfdir} \
${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-im = "${libdir}/gtk-2.0/*/immodules/*.so"
FILES_matchbox-keyboard-dbg += "${libdir}/gtk-2.0/*/immodules/.debug" 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 () { do_install_append () {
install -d ${D}/${sysconfdir}/X11/Xsession.d/ install -d ${D}/${sysconfdir}/X11/Xsession.d/