matchbox: use release version 1.0 rather than svn checkout. disable composite.

Signed-off-by: Rene Wagner <rw@handhelds.org>

diff --git a/org.handhelds.familiar/conf/distro/preferred-gpe-versions-2.7.inc b/org.handhelds.familiar/conf/distro/preferred-gpe-versions-2.7.inc
index f1521af0442f86cdf7c83bfd9d26de59e6ede7e4..3f5d50c62ad4d35340ec06653610d9f5fdb23cbe 100644 (file)
--- a/org.handhelds.familiar/conf/distro/preferred-gpe-versions-2.7.inc
+++ b/org.handhelds.familiar/conf/distro/preferred-gpe-versions-2.7.inc
@@ -6,12 +6,12 @@
 PREFERRED_PROVIDER_gconf=gconf-dbus
 PREFERRED_PROVIDER_gnome-vfs=gnome-vfs-dbus
 
-#specify versions, as the header says :)
+#specify versions
 PREFERRED_VERSION_libmatchbox ?= "1.8"
 PREFERRED_VERSION_matchbox ?= "0.9.1"
 PREFERRED_VERSION_matchbox-common ?= "0.9.1"
 PREFERRED_VERSION_matchbox-desktop ?= "0.9.1"
-PREFERRED_VERSION_matchbox-wm ?= "0.9.5+cvs-${CVSDATE}"
+PREFERRED_VERSION_matchbox-wm ?= "1.0"
 PREFERRED_VERSION_matchbox-panel ?= "0.9.2"
 PREFERRED_VERSION_matchbox-applet-inputmanager ?= "0.6"
 PREFERRED_VERSION_atk ?= "1.9.0"

diff --git a/org.handhelds.familiar/packages/matchbox-wm/matchbox-wm_1.0.bb b/org.handhelds.familiar/packages/matchbox-wm/matchbox-wm_1.0.bb
new file mode 100644 (file)
index 0000000..6720eea
--- /dev/null
+++ b/org.handhelds.familiar/packages/matchbox-wm/matchbox-wm_1.0.bb
@@ -0,0 +1,31 @@
+SECTION = "x11/wm"
+DESCRIPTION = "Matchbox window manager"
+LICENSE = "GPL"
+DEPENDS = "libmatchbox x11 xext xcomposite libxfixes xdamage libxrender startup-notification expat gconf matchbox-common"
+RDEPENDS = "matchbox-common"
+
+SRC_URI = "http://projects.o-hand.com/matchbox/sources/matchbox-window-manager/1.0/matchbox-window-manager-${PV}.tar.gz \
+          file://kbdconfig"
+
+S = "${WORKDIR}/matchbox-window-manager-${PV}"
+
+inherit autotools pkgconfig update-alternatives
+
+ALTERNATIVE_NAME = "x-window-manager"
+ALTERNATIVE_LINK = "${bindir}/x-window-manager"
+ALTERNATIVE_PATH = "${bindir}/matchbox-session"
+ALTERNATIVE_PRIORITY = "10"
+
+FILES_${PN} = "${bindir} \
+               ${datadir}/matchbox \
+               ${sysconfdir}/matchbox \
+               ${datadir}/themes/blondie/matchbox \
+               ${datadir}/themes/Default/matchbox \
+               ${datadir}/themes/MBOpus/matchbox"
+
+EXTRA_OECONF = "--enable-startup-notification --disable-xrm"
+
+do_install_prepend() {
+       install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig
+}
+