summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorPhilip Balister <philip@balister.org>2007-08-17 14:01:51 +0000
committerPhilip Balister <philip@balister.org>2007-08-17 14:01:51 +0000
commit3354e1310d6bf79bf8d6586fdcdf1361ae4036fd (patch)
tree90aead14fbf2c527544de8a0840dfb514454cb16 /packages
parentf4b67ec65d123d332f4630b4a47b7a74e7c20c49 (diff)
parenta2dced2b4fd2e0fe1d2d5a60079d9743b8814f19 (diff)
merge of '8f0990c1c2ac36fbc06162157be83ae04403f8c6'
and 'f4c81cd8dcea8c89262f32820d6f3764c5622e2a'
Diffstat (limited to 'packages')
-rw-r--r--packages/matchbox-keyboard/files/80matchboxkeyboard20
-rw-r--r--packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb54
-rw-r--r--packages/matchbox-keyboard/matchbox-keyboard_svn.bb2
-rw-r--r--packages/python/python-pygtk-1.2_0.6.12.bb9
-rw-r--r--packages/python/python-pyode_1.0.0.bb1
-rw-r--r--packages/tasks/task-openmoko.bb5
6 files changed, 87 insertions, 4 deletions
diff --git a/packages/matchbox-keyboard/files/80matchboxkeyboard b/packages/matchbox-keyboard/files/80matchboxkeyboard
new file mode 100644
index 0000000000..a30ddb01ad
--- /dev/null
+++ b/packages/matchbox-keyboard/files/80matchboxkeyboard
@@ -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="matchbox-keyboard -d -o landscape"
+ elif [ "$HAVE_KEYBOARD_LANDSCAPE" = "1" -a "$HAVE_KEYBOARD_PORTRAIT" = "0" ]; then
+ CMD="matchbox-keyboard -d -o portrait"
+ fi
+else
+ CMD="matchbox-keyboard -d"
+fi
+
+
+# Delay to make sure the window manager is active
+
+if [ "$CMD" ]; then
+ (sleep 2 && $CMD) &
+fi
diff --git a/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
new file mode 100644
index 0000000000..4f59b646dc
--- /dev/null
+++ b/packages/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb
@@ -0,0 +1,54 @@
+DESCRIPTION = "Matchbox virtual keyboard for X11"
+LICENSE = "GPL"
+DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2"
+RCONFLICTS = matchbox-keyboard
+RPROVIDES = matchbox-keyboard
+#DEFAULT_PREFERENCE = "-1"
+SECTION = "x11"
+PV = "0.0+svn${SRCDATE}"
+PR = "r0"
+
+SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \
+ file://80matchboxkeyboard"
+
+S = "${WORKDIR}/matchbox-keyboard"
+
+inherit autotools pkgconfig gettext
+
+EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet"
+
+PACKAGES += "matchbox-keyboard-im matchbox-keyboard-im-dbg \
+ matchbox-keyboard-applet matchbox-keyboard-applet-dbg"
+
+FILES_${PN} = "${bindir}/* \
+ ${sysconfdir} \
+ ${datadir}/applications \
+ ${datadir}/pixmaps \
+ ${datadir}/matchbox-keyboard"
+
+FILES_matchbox-keyboard-im = "${libdir}/gtk-2.0/*/immodules/*.so"
+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 () {
+ install -d ${D}/${sysconfdir}/X11/Xsession.d/
+ install -m 755 ${WORKDIR}/80matchboxkeyboard ${D}/${sysconfdir}/X11/Xsession.d/
+}
+
+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
+}
diff --git a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
index 57d0b413a9..4a19ba1b2a 100644
--- a/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
+++ b/packages/matchbox-keyboard/matchbox-keyboard_svn.bb
@@ -1,6 +1,8 @@
DESCRIPTION = "Matchbox virtual keyboard for X11"
LICENSE = "GPL"
DEPENDS = "libfakekey expat libxft"
+RCONFLICTS = matchbox-keyboard-inputmethod
+RPROVIDES = matchbox-keyboard-inputmethod
SECTION = "x11"
PV = "0.0+svn${SRCDATE}"
PR="r5"
diff --git a/packages/python/python-pygtk-1.2_0.6.12.bb b/packages/python/python-pygtk-1.2_0.6.12.bb
index 3b538ef83e..90f8cb3821 100644
--- a/packages/python/python-pygtk-1.2_0.6.12.bb
+++ b/packages/python/python-pygtk-1.2_0.6.12.bb
@@ -5,17 +5,22 @@ LICENSE = "LGPL"
DEPENDS = "gtk+-1.2"
RDEPENDS = "python-shell python-re"
SRCNAME = "pygtk"
-PR = "ml0"
+PR = "r1"
SRC_URI = "ftp://ftp.gtk.org/pub/gtk/python/v1.2/${SRCNAME}-${PV}.tar.gz \
- file://remove-imlib-et-al;patch=1"
+ file://remove-imlib-et-al;patch=1 \
+ file://acinclude.m4"
+
S = "${WORKDIR}/${SRCNAME}-${PV}"
inherit autotools pkgconfig distutils-base
+EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
+
FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
do_configure_prepend() {
+ install -m 0644 ${WORKDIR}/acinclude.m4 ${S}/
echo ${LDFLAGS} > /tmp/ldflags
rm -f aclocal.m4
}
diff --git a/packages/python/python-pyode_1.0.0.bb b/packages/python/python-pyode_1.0.0.bb
index f0d5c9ec6f..95dc0228e3 100644
--- a/packages/python/python-pyode_1.0.0.bb
+++ b/packages/python/python-pyode_1.0.0.bb
@@ -3,6 +3,7 @@ an open-source physics engine. PyODE also includes an XODE parser."
SECTION = "devel/python"
PRIORITY = "optional"
LICENSE = "LGPL"
+DEPENDS = "ode"
SRCNAME = "PyODE"
SRC_URI = "${SOURCEFORGE_MIRROR}/pyode/${SRCNAME}-${PV}.tar.bz2"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 56e26cdb32..a7739d8c01 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
SECTION = "openmoko/base"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r56"
+PR = "r57"
ALLOW_EMPTY = "1"
PACKAGE_ARCH = "all"
@@ -83,7 +83,8 @@ RDEPENDS_task-openmoko-base = "\
matchbox-panel-2-applets \
matchbox-applet-inputmanager \
# openmoko-appmanager \
- matchbox-keyboard \
+ matchbox-keyboard-inputmethod \
+ matchbox-keyboard-im \
matchbox-stroke \
openmoko-terminal2 \
openmoko-keyboard \